Skip to content

Commit

Permalink
fix: set query filters for sales / purchase tax template on PE
Browse files Browse the repository at this point in the history
(cherry picked from commit 9fe47ac)

# Conflicts:
#	erpnext/accounts/doctype/payment_entry/payment_entry.js
  • Loading branch information
ruthra-kumar authored and mergify[bot] committed Jul 31, 2024
1 parent 64234a5 commit c8d8536
Showing 1 changed file with 23 additions and 1 deletion.
24 changes: 23 additions & 1 deletion erpnext/accounts/doctype/payment_entry/payment_entry.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit c8d8536

Please sign in to comment.