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

fix: Parent dimension filters in orders

Browse Source 
(cherry picked from commit 3f376cc3a5)

# Conflicts:
#	erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
#	erpnext/accounts/doctype/sales_invoice/sales_invoice.js
This commit is contained in:
Deepesh Garg
2022-06-02 13:57:54 +05:30
committed by Mergify
parent b31709c793
commit b3cbcd871b
7 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -45,9 +45,13 @@ 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;

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

@@ -53,8 +53,12 @@ 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;