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

fix: enhance dispatch address query logic and add supplier address query

Browse Source 
(cherry picked from commit 9a859e54b6)
This commit is contained in:
Karm Soni
2025-04-14 18:06:44 +05:30
committed by Mergify
parent 1fe1563dab
commit 290f0b94e5
2 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
erpnext/public/js/controllers/buying.js
View File

@@ -57,13 +57,11 @@ erpnext.buying = {
if(this.frm.get_field('dispatch_address')) {
this.frm.set_query("dispatch_address", () => {
if(this.frm.doc.supplier) {
return {
query: 'frappe.contacts.doctype.address.address.address_query',
filters: { link_doctype: 'Supplier', link_name: this.frm.doc.supplier }
};
} else
return erpnext.queries.dispatch_address_query(this.frm.doc)
if(this.frm.doc.is_return){
return erpnext.queries.company_address_query(this.frm.doc);
}
return erpnext.queries.supplier_address_query(this.frm.doc);
});
}
}

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

@@ -112,6 +112,23 @@ $.extend(erpnext.queries, {
};
},
supplier_address_query: function (doc) {
if (!doc.supplier) {
cur_frm.scroll_to_field("supplier");
frappe.show_alert({
message: __("Please set {0} first.", [
__(frappe.meta.get_label(doc.doctype, "supplier", doc.name)),
]),
indicator: "orange",
});
}
return {
query: "frappe.contacts.doctype.address.address.address_query",
filters: { link_doctype: "Supplier", link_name: doc.supplier },
};
},
dispatch_address_query: function (doc) {
var filters = { link_doctype: "Company", link_name: doc.company || "" };
var is_drop_ship = doc.items.some((item) => item.delivered_by_supplier);