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

chore: Resolve conflicts

Browse Source
This commit is contained in:
Deepesh Garg
2022-06-06 20:36:40 +05:30
parent b3cbcd871b
commit 60d378aed2
2 changed files with 0 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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;

5
erpnext/accounts/doctype/sales_invoice/sales_invoice.js
View File

@@ -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;