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

fix: show group warehouse in Sales Order (#30891) (#30893)

Browse Source 
(cherry picked from commit 91cd5f5d4a)

Co-authored-by: Ankush Menat <ankush@frappe.io>
This commit is contained in:
mergify[bot]
2022-05-05 11:07:11 +05:30
committed by GitHub
parent 59686093b4
commit c458e14e68
1 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -65,7 +65,11 @@ frappe.ui.form.on("Sales Order", {
frm.set_value('transaction_date', frappe.datetime.get_today()) frm.set_value('transaction_date', frappe.datetime.get_today())
} }
erpnext.queries.setup_queries(frm, "Warehouse", function() { erpnext.queries.setup_queries(frm, "Warehouse", function() {
return erpnext.queries.warehouse(frm.doc); return {
filters: [
["Warehouse", "company", "in", ["", cstr(frm.doc.company)]],
]
};
}); });
frm.set_query('project', function(doc, cdt, cdn) { frm.set_query('project', function(doc, cdt, cdn) {
@@ -77,7 +81,19 @@ frappe.ui.form.on("Sales Order", {
} }
}); });
erpnext.queries.setup_warehouse_query(frm); frm.set_query('warehouse', 'items', function(doc, cdt, cdn) {
let row = locals[cdt][cdn];
let query = {
filters: [
["Warehouse", "company", "in", ["", cstr(frm.doc.company)]],
]
};
if (row.item_code) {
query.query = "erpnext.controllers.queries.warehouse_query";
query.filters.push(["Bin", "item_code", "=", row.item_code]);
}
return query;
});
frm.ignore_doctypes_on_cancel_all = ['Purchase Order']; frm.ignore_doctypes_on_cancel_all = ['Purchase Order'];
}, },