From 2123b97d3131130cfcbdf084312f88d6cd908c10 Mon Sep 17 00:00:00 2001 From: Zlash65 Date: Fri, 5 Oct 2018 12:26:32 +0530 Subject: [PATCH 1/2] add get_query for revenue and expense account --- erpnext/stock/doctype/item/item.js | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/erpnext/stock/doctype/item/item.js b/erpnext/stock/doctype/item/item.js index 2fe106e4c6..86615d40bc 100644 --- a/erpnext/stock/doctype/item/item.js +++ b/erpnext/stock/doctype/item/item.js @@ -271,6 +271,24 @@ $.extend(erpnext.item, { } } + frm.fields_dict['deferred_revenue_account'].get_query = function(doc) { + return { + filters: { + 'root_type': 'Liability', + "is_group": 0 + } + } + } + + frm.fields_dict['deferred_expense_account'].get_query = function(doc) { + return { + filters: { + 'root_type': 'Asset', + "is_group": 0 + } + } + } + frm.fields_dict.customer_items.grid.get_field("customer_name").get_query = function(doc, cdt, cdn) { return { query: "erpnext.controllers.queries.customer_query" } } From 32206029aca5d999c5d5fe43010694486e584e1a Mon Sep 17 00:00:00 2001 From: Shreya Shah Date: Fri, 5 Oct 2018 14:14:33 +0530 Subject: [PATCH 2/2] Fix Codacy --- erpnext/stock/doctype/item/item.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/erpnext/stock/doctype/item/item.js b/erpnext/stock/doctype/item/item.js index 86615d40bc..b3141e87fa 100644 --- a/erpnext/stock/doctype/item/item.js +++ b/erpnext/stock/doctype/item/item.js @@ -271,7 +271,7 @@ $.extend(erpnext.item, { } } - frm.fields_dict['deferred_revenue_account'].get_query = function(doc) { + frm.fields_dict['deferred_revenue_account'].get_query = function() { return { filters: { 'root_type': 'Liability', @@ -280,7 +280,7 @@ $.extend(erpnext.item, { } } - frm.fields_dict['deferred_expense_account'].get_query = function(doc) { + frm.fields_dict['deferred_expense_account'].get_query = function() { return { filters: { 'root_type': 'Asset', @@ -725,4 +725,4 @@ frappe.ui.form.on("UOM Conversion Detail", { }); } } -}) \ No newline at end of file +})