From 60d378aed231b47f13ebac20bd1eaf7d939a702b Mon Sep 17 00:00:00 2001 From: Deepesh Garg Date: Mon, 6 Jun 2022 20:36:40 +0530 Subject: [PATCH] chore: Resolve conflicts --- .../accounts/doctype/purchase_invoice/purchase_invoice.js | 6 ------ erpnext/accounts/doctype/sales_invoice/sales_invoice.js | 5 ----- 2 files changed, 11 deletions(-) diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js index 1616d36fc1d..0c2ec5ffa31 100644 --- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js @@ -45,13 +45,7 @@ erpnext.accounts.PurchaseInvoice = erpnext.buying.BuyingController.extend({ if (this.frm.doc.supplier && this.frm.doc.__islocal) { this.frm.trigger('supplier'); } -<<<<<<< HEAD - - erpnext.accounts.dimensions.setup_dimension_filters(this.frm, this.frm.doctype); }, -======= - } ->>>>>>> 3f376cc3a5 (fix: Parent dimension filters in orders) refresh: function(doc) { const me = this; diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js index 41773192805..a36872fb234 100644 --- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js @@ -53,12 +53,7 @@ erpnext.accounts.SalesInvoiceController = erpnext.selling.SellingController.exte me.frm.refresh_fields(); } erpnext.queries.setup_warehouse_query(this.frm); -<<<<<<< HEAD - erpnext.accounts.dimensions.setup_dimension_filters(this.frm, this.frm.doctype); }, -======= - } ->>>>>>> 3f376cc3a5 (fix: Parent dimension filters in orders) refresh: function(doc, dt, dn) { const me = this;