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

fix: unify company address query in sales transactions (backport #44361) (#44366)

Browse Source 
* fix: unify company address query in sales transactions (backport #44361)

* style: add whitespace
This commit is contained in:
Raffael Meyer
2024-11-26 21:11:27 +01:00
committed by GitHub
parent aa442da2f6
commit fef7cfb888
5 changed files with 6 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
erpnext/accounts/doctype/sales_invoice/sales_invoice.js
View File

@@ -667,20 +667,6 @@ frappe.ui.form.on('Sales Invoice', {
}
}
frm.set_query('company_address', function(doc) {
if(!doc.company) {
frappe.throw(__('Please set Company'));
}
return {
query: 'frappe.contacts.doctype.address.address.address_query',
filters: {
link_doctype: 'Company',
link_name: doc.company
}
};
});
frm.set_query('pos_profile', function(doc) {
if(!doc.company) {
frappe.throw(_('Please set Company'));

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

@@ -85,9 +85,13 @@ $.extend(erpnext.queries, {
},
company_address_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.address.address.address_query",
filters: { is_your_company_address: 1, link_doctype: "Company", link_name: doc.company || "" },
filters: { link_doctype: "Company", link_name: doc.company },
};
},

14
erpnext/selling/doctype/quotation/quotation.js
View File

@@ -20,20 +20,6 @@ frappe.ui.form.on('Quotation', {
frm.set_df_property('packed_items', 'cannot_add_rows', true);
frm.set_df_property('packed_items', 'cannot_delete_rows', true);
frm.set_query('company_address', function(doc) {
if(!doc.company) {
frappe.throw(__('Please set Company'));
}
return {
query: 'frappe.contacts.doctype.address.address.address_query',
filters: {
link_doctype: 'Company',
link_name: doc.company
}
};
});
},
refresh: function(frm) {

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

@@ -21,20 +21,6 @@ frappe.ui.form.on("Sales Order", {
frm.set_indicator_formatter('item_code',
function(doc) { return (doc.stock_qty<=doc.delivered_qty) ? "green" : "orange" })
frm.set_query('company_address', function(doc) {
if(!doc.company) {
frappe.throw(__('Please set Company'));
}
return {
query: 'frappe.contacts.doctype.address.address.address_query',
filters: {
link_doctype: 'Company',
link_name: doc.company
}
};
})
frm.set_query("bom_no", "items", function(doc, cdt, cdn) {
var row = locals[cdt][cdn];
return {

1
erpnext/selling/sales_common.js
View File

@@ -40,6 +40,7 @@ erpnext.selling.SellingController = class SellingController extends erpnext.Tran
me.frm.set_query('customer_address', erpnext.queries.address_query);
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);
erpnext.accounts.dimensions.setup_dimension_filters(me.frm, me.frm.doctype);