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

chore: resolve conflict

Browse Source
This commit is contained in:
ruthra kumar
2024-10-28 09:55:04 +05:30
parent 7e7cc807a5
commit b81dc2bf5e
1 changed files with 0 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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() {
=======
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 }
} }