schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: set query filters for sales / purchase tax template on PE

Browse Source 
(cherry picked from commit 9fe47ac101)

# Conflicts:
#	erpnext/accounts/doctype/payment_entry/payment_entry.js
This commit is contained in:
ruthra kumar
2024-07-31 16:42:33 +05:30
committed by Mergify
parent 64234a571e
commit c8d85364b9
1 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
erpnext/accounts/doctype/payment_entry/payment_entry.js
View File

@@ -145,10 +145,32 @@ frappe.ui.form.on('Payment Entry', {
filters: filters
};
});
},
<<<<<<< HEAD
refresh: function(frm) {
erpnext.hide_company();
=======
frm.set_query("sales_taxes_and_charges_template", function () {
return {
filters: {
company: frm.doc.company,
disabled: false,
},
};
});
frm.set_query("purchase_taxes_and_charges_template", function () {
return {
filters: {
company: frm.doc.company,
disabled: false,
},
};
});
},
refresh: function (frm) {
erpnext.hide_company(frm);
>>>>>>> 9fe47ac101 (fix: set query filters for sales / purchase tax template on PE)
frm.events.hide_unhide_fields(frm);
frm.events.set_dynamic_labels(frm);
frm.events.show_general_ledger(frm);