From 73a99441ca216a0a04b7498fa26bb6f4fa187ec0 Mon Sep 17 00:00:00 2001
From: Rohit Waghchaure <rohitw1991@gmail.com>
Date: Fri, 18 May 2018 16:39:08 +0530
Subject: [PATCH] Fixed get_query for default data in item

---
 erpnext/stock/doctype/item/item.js | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/erpnext/stock/doctype/item/item.js b/erpnext/stock/doctype/item/item.js
index 6332d71cf1..59e2f58dd8 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
+				}
 			}
 		}