From c8d85364b9b7a2588541f2973ba79ea954effbda Mon Sep 17 00:00:00 2001
From: ruthra kumar <ruthra@erpnext.com>
Date: Wed, 31 Jul 2024 16:42:33 +0530
Subject: [PATCH 1/2] fix: set query filters for sales / purchase tax template
 on PE

(cherry picked from commit 9fe47ac101fffeb701e9414b035c813feb0b5db2)

# Conflicts:
#	erpnext/accounts/doctype/payment_entry/payment_entry.js
---
 .../doctype/payment_entry/payment_entry.js    | 24 ++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.js b/erpnext/accounts/doctype/payment_entry/payment_entry.js
index ad1d200ec53..2d07daa5b96 100644
--- a/erpnext/accounts/doctype/payment_entry/payment_entry.js
+++ b/erpnext/accounts/doctype/payment_entry/payment_entry.js
@@ -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);

From e82c4413260991c46e671459283b2a55d20a94b9 Mon Sep 17 00:00:00 2001
From: ruthra kumar <ruthra@erpnext.com>
Date: Wed, 31 Jul 2024 17:14:26 +0530
Subject: [PATCH 2/2] chore: resolve conflict

---
 erpnext/accounts/doctype/payment_entry/payment_entry.js | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.js b/erpnext/accounts/doctype/payment_entry/payment_entry.js
index 2d07daa5b96..8ec055e28a4 100644
--- a/erpnext/accounts/doctype/payment_entry/payment_entry.js
+++ b/erpnext/accounts/doctype/payment_entry/payment_entry.js
@@ -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 () {
 			return {
 				filters: {
@@ -170,7 +166,6 @@ frappe.ui.form.on('Payment Entry', {
 	},
 	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);