diff --git a/erpnext/stock/doctype/item/item.js b/erpnext/stock/doctype/item/item.js index 6332d71cf11..59e2f58dd8d 100644 --- a/erpnext/stock/doctype/item/item.js +++ b/erpnext/stock/doctype/item/item.js @@ -216,15 +216,19 @@ var set_customer_group = function(frm, cdt, cdn) { $.extend(erpnext.item, { setup_queries: function(frm) { - frm.fields_dict["item_defaults"].grid.get_field("expense_account").get_query = function(doc) { + frm.fields_dict["item_defaults"].grid.get_field("expense_account").get_query = function(doc, cdt, cdn) { + const row = locals[cdt][cdn]; return { query: "erpnext.controllers.queries.get_expense_account", + filters: { company: row.company } } } - frm.fields_dict["item_defaults"].grid.get_field("income_account").get_query = function(doc) { + frm.fields_dict["item_defaults"].grid.get_field("income_account").get_query = function(doc, cdt, cdn) { + const row = locals[cdt][cdn]; return { - query: "erpnext.controllers.queries.get_income_account" + query: "erpnext.controllers.queries.get_income_account", + filters: { company: row.company } } } @@ -238,9 +242,13 @@ $.extend(erpnext.item, { } } - frm.fields_dict["item_defaults"].grid.get_field("selling_cost_center").get_query = function(doc) { + frm.fields_dict["item_defaults"].grid.get_field("selling_cost_center").get_query = function(doc, cdt, cdn) { + const row = locals[cdt][cdn]; return { - filters: { "is_group": 0 } + filters: { + "is_group": 0, + "company": row.company + } } } @@ -271,9 +279,13 @@ $.extend(erpnext.item, { return { query: "erpnext.controllers.queries.supplier_query" } } - frm.fields_dict["item_defaults"].grid.get_field("default_warehouse").get_query = function(doc) { + frm.fields_dict["item_defaults"].grid.get_field("default_warehouse").get_query = function(doc, cdt, cdn) { + const row = locals[cdt][cdn]; return { - filters: { "is_group": 0 } + filters: { + "is_group": 0, + "company": row.company + } } }