From 8cb2c7a89cda33051c8dd705149ccfb1d53b4625 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Thu, 30 May 2019 18:13:11 +0530 Subject: [PATCH] fix: Set query for expense account in PO and PR --- .../buying/doctype/purchase_order/purchase_order.js | 8 ++++++++ .../stock/doctype/purchase_receipt/purchase_receipt.js | 10 +++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.js b/erpnext/buying/doctype/purchase_order/purchase_order.js index 019d0de4708..c032df32706 100644 --- a/erpnext/buying/doctype/purchase_order/purchase_order.js +++ b/erpnext/buying/doctype/purchase_order/purchase_order.js @@ -33,6 +33,14 @@ frappe.ui.form.on("Purchase Order", { } } }); + + frm.set_query("expense_account", "items", function() { + return { + query: "erpnext.controllers.queries.get_expense_account", + filters: {'company': frm.doc.company} + } + }); + }, refresh: function(frm) { diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js index d33c23e4b17..7a073996c74 100644 --- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js @@ -18,7 +18,15 @@ frappe.ui.form.on("Purchase Receipt", { "purchase_receipt": frm.doc.name } } - }) + }); + + frm.set_query("expense_account", "items", function() { + return { + query: "erpnext.controllers.queries.get_expense_account", + filters: {'company': frm.doc.company} + } + }); + }, onload: function(frm) { erpnext.queries.setup_queries(frm, "Warehouse", function() {