From 7e7cc807a5ab6ee8b5dcf8e036d60d6181ebdd12 Mon Sep 17 00:00:00 2001 From: ljain112 Date: Fri, 25 Oct 2024 17:11:27 +0530 Subject: [PATCH 1/2] refactor: query for expense_account moved to setup hook in purchase invoice (cherry picked from commit a9ac0cc2238d420c518fdcbf69e8ed1defac7f2e) # Conflicts: # erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js --- .../doctype/purchase_invoice/purchase_invoice.js | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js index ff5550489c2..25d0f85ea6e 100644 --- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js @@ -25,6 +25,13 @@ erpnext.accounts.PurchaseInvoice = class PurchaseInvoice extends erpnext.buying. } }; }); + + this.frm.set_query("expense_account", "items", function () { + return { + query: "erpnext.controllers.queries.get_expense_account", + filters: { company: doc.company }, + }; + }); } onload() { @@ -469,6 +476,7 @@ cur_frm.fields_dict['select_print_heading'].get_query = function(doc, cdt, cdn) } } +<<<<<<< HEAD cur_frm.set_query("expense_account", "items", function(doc) { return { query: "erpnext.controllers.queries.get_expense_account", @@ -477,6 +485,9 @@ cur_frm.set_query("expense_account", "items", function(doc) { }); cur_frm.set_query("wip_composite_asset", "items", function() { +======= +cur_frm.set_query("wip_composite_asset", "items", function () { +>>>>>>> a9ac0cc223 (refactor: query for expense_account moved to setup hook in purchase invoice) return { filters: {'is_composite_asset': 1, 'docstatus': 0 } } From b81dc2bf5eac5e26d9b93dc9ca829f75ccfdcd32 Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Mon, 28 Oct 2024 09:55:04 +0530 Subject: [PATCH 2/2] chore: resolve conflict --- .../doctype/purchase_invoice/purchase_invoice.js | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js index 25d0f85ea6e..503eb751c41 100644 --- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js @@ -476,18 +476,7 @@ cur_frm.fields_dict['select_print_heading'].get_query = function(doc, cdt, cdn) } } -<<<<<<< HEAD -cur_frm.set_query("expense_account", "items", function(doc) { - return { - query: "erpnext.controllers.queries.get_expense_account", - filters: {'company': doc.company } - } -}); - cur_frm.set_query("wip_composite_asset", "items", function() { -======= -cur_frm.set_query("wip_composite_asset", "items", function () { ->>>>>>> a9ac0cc223 (refactor: query for expense_account moved to setup hook in purchase invoice) return { filters: {'is_composite_asset': 1, 'docstatus': 0 } }