nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-22 14:39:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: query for expense_account moved to setup hook in purchase invoice

Browse Source 
(cherry picked from commit a9ac0cc223)

# Conflicts:
#	erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
This commit is contained in:
ljain112
2024-10-25 17:11:27 +05:30
committed by Mergify
parent 895f1bff01
commit 7e7cc807a5
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
View File

@@ -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() { 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) { cur_frm.set_query("expense_account", "items", function(doc) {
return { return {
query: "erpnext.controllers.queries.get_expense_account", 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() {
=======
cur_frm.set_query("wip_composite_asset", "items", function () {
>>>>>>> a9ac0cc223 (refactor: query for expense_account moved to setup hook in purchase invoice)
return { return {
filters: {'is_composite_asset': 1, 'docstatus': 0 } filters: {'is_composite_asset': 1, 'docstatus': 0 }
} }