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

chore: resolve conflict

Browse Source
This commit is contained in:
ruthra kumar
2024-07-31 17:14:26 +05:30
parent c8d85364b9
commit e82c441326
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -146,10 +146,6 @@ frappe.ui.form.on('Payment Entry', {
}; };
}); });
<<<<<<< HEAD
refresh: function(frm) {
erpnext.hide_company();
=======
frm.set_query("sales_taxes_and_charges_template", function () { frm.set_query("sales_taxes_and_charges_template", function () {
return { return {
filters: { filters: {
@@ -170,7 +166,6 @@ frappe.ui.form.on('Payment Entry', {
}, },
refresh: function (frm) { refresh: function (frm) {
erpnext.hide_company(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.hide_unhide_fields(frm);
frm.events.set_dynamic_labels(frm); frm.events.set_dynamic_labels(frm);
frm.events.show_general_ledger(frm); frm.events.show_general_ledger(frm);