schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: add Company Contact Person in selling transactions (backport #44362) (#44397)

Browse Source 
* feat: add Company Contact Person in selling transactions (#44362)

(cherry picked from commit f6776c7d6b)

* chore: resolve conflicts

---------

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
This commit is contained in:
mergify[bot]
2024-11-27 17:09:09 +01:00
committed by GitHub
parent 627a50e7bc
commit 78ab44ce1a
7 changed files with 62 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
erpnext/accounts/doctype/pos_invoice/pos_invoice.json
View File

@@ -48,6 +48,7 @@
"shipping_address",
"company_address",
"company_address_display",
"company_contact_person",
"currency_and_price_list",
"currency",
"conversion_rate",
@@ -1557,12 +1558,19 @@
"fieldname": "update_billed_amount_in_delivery_note",
"fieldtype": "Check",
"label": "Update Billed Amount in Delivery Note"
},
{
"fieldname": "company_contact_person",
"fieldtype": "Link",
"label": "Company Contact Person",
"options": "Contact",
"print_hide": 1
}
],
"icon": "fa fa-file-text",
"is_submittable": 1,
"links": [],
"modified": "2024-03-20 16:00:34.268756",
"modified": "2024-11-26 13:10:50.309570",
"modified_by": "Administrator",
"module": "Accounts",
"name": "POS Invoice",

12
erpnext/accounts/doctype/sales_invoice/sales_invoice.json
View File

@@ -160,8 +160,9 @@
"dispatch_address",
"company_address_section",
"company_address",
"company_addr_col_break",
"company_address_display",
"company_addr_col_break",
"company_contact_person",
"terms_tab",
"payment_schedule_section",
"ignore_default_payment_terms_template",
@@ -2171,6 +2172,13 @@
"label": "Update Outstanding for Self",
"no_copy": 1,
"print_hide": 1
},
{
"fieldname": "company_contact_person",
"fieldtype": "Link",
"label": "Company Contact Person",
"options": "Contact",
"print_hide": 1
}
],
"icon": "fa fa-file-text",
@@ -2183,7 +2191,7 @@
"link_fieldname": "consolidated_invoice"
}
],
"modified": "2024-07-18 15:30:39.428519",
"modified": "2024-11-26 12:34:09.110690",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Sales Invoice",

11
erpnext/public/js/queries.js
View File

@@ -64,6 +64,17 @@ $.extend(erpnext.queries, {
}
},
company_contact_query: function (doc) {
if (!doc.company) {
frappe.throw(__("Please set {0}", [__(frappe.meta.get_label(doc.doctype, "company", doc.name))]));
}
return {
query: "frappe.contacts.doctype.contact.contact.contact_query",
filters: { link_doctype: "Company", link_name: doc.company },
};
},
address_query: function (doc) {
if (frappe.dynamic_link) {
if (!doc[frappe.dynamic_link.fieldname]) {

12
erpnext/selling/doctype/quotation/quotation.json
View File

@@ -95,8 +95,9 @@
"shipping_address",
"company_address_section",
"company_address",
"column_break_87",
"company_address_display",
"column_break_87",
"company_contact_person",
"terms_tab",
"payment_schedule_section",
"payment_terms_template",
@@ -1066,13 +1067,20 @@
"fieldname": "named_place",
"fieldtype": "Data",
"label": "Named Place"
},
{
"fieldname": "company_contact_person",
"fieldtype": "Link",
"label": "Company Contact Person",
"options": "Contact",
"print_hide": 1
}
],
"icon": "fa fa-shopping-cart",
"idx": 82,
"is_submittable": 1,
"links": [],
"modified": "2024-03-20 16:04:21.567847",
"modified": "2024-11-26 12:43:29.293637",
"modified_by": "Administrator",
"module": "Selling",
"name": "Quotation",

14
erpnext/selling/doctype/sales_order/sales_order.json
View File

@@ -112,8 +112,9 @@
"dispatch_address",
"col_break46",
"company_address",
"column_break_92",
"company_address_display",
"column_break_92",
"company_contact_person",
"payment_schedule_section",
"payment_terms_section",
"payment_terms_template",
@@ -1626,13 +1627,20 @@
"fieldname": "named_place",
"fieldtype": "Data",
"label": "Named Place"
},
{
"fieldname": "company_contact_person",
"fieldtype": "Link",
"label": "Company Contact Person",
"options": "Contact",
"print_hide": 1
}
],
"icon": "fa fa-file-text",
"idx": 105,
"is_submittable": 1,
"links": [],
"modified": "2024-05-23 16:35:54.905804",
"modified": "2024-11-26 12:42:06.872527",
"modified_by": "Administrator",
"module": "Selling",
"name": "Sales Order",
@@ -1711,4 +1719,4 @@
"title_field": "customer_name",
"track_changes": 1,
"track_seen": 1
}
}

1
erpnext/selling/sales_common.js
View File

@@ -41,6 +41,7 @@ erpnext.selling.SellingController = class SellingController extends erpnext.Tran
me.frm.set_query('shipping_address_name', erpnext.queries.address_query);
me.frm.set_query('dispatch_address_name', erpnext.queries.dispatch_address_query);
me.frm.set_query('company_address', erpnext.queries.company_address_query);
me.frm.set_query('company_contact_person', erpnext.queries.company_contact_query);
erpnext.accounts.dimensions.setup_dimension_filters(me.frm, me.frm.doctype);

12
erpnext/stock/doctype/delivery_note/delivery_note.json
View File

@@ -109,8 +109,9 @@
"dispatch_address",
"company_address_section",
"company_address",
"column_break_101",
"company_address_display",
"column_break_101",
"company_contact_person",
"terms_tab",
"tc_name",
"terms",
@@ -1395,13 +1396,20 @@
"fieldname": "named_place",
"fieldtype": "Data",
"label": "Named Place"
},
{
"fieldname": "company_contact_person",
"fieldtype": "Link",
"label": "Company Contact Person",
"options": "Contact",
"print_hide": 1
}
],
"icon": "fa fa-truck",
"idx": 146,
"is_submittable": 1,
"links": [],
"modified": "2024-03-20 16:05:02.854990",
"modified": "2024-11-26 12:44:28.258215",
"modified_by": "Administrator",
"module": "Stock",
"name": "Delivery Note",