From 0db7e8fbc10d265c874f98eeabee1b5678634192 Mon Sep 17 00:00:00 2001
From: Corentin Forler <10946971+cogk@users.noreply.github.com>
Date: Wed, 5 Mar 2025 11:08:05 +0100
Subject: [PATCH] refactor: Remove duplicate inherited method (#46030)

The method add_taxes_from_item_tax_template is defined identically in the erpnext.taxes_and_totals class, that erpnext.TransactionController extends.

(cherry picked from commit a700345cee73ab7ba51e067572302d0d4dc5af7f)

# Conflicts:
#	erpnext/public/js/controllers/transaction.js
---
 erpnext/public/js/controllers/transaction.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js
index a98cb450eb3..92f5602d4d8 100644
--- a/erpnext/public/js/controllers/transaction.js
+++ b/erpnext/public/js/controllers/transaction.js
@@ -742,6 +742,7 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
 		});
 	}
 
+<<<<<<< HEAD
 	add_taxes_from_item_tax_template(item_tax_map) {
 		let me = this;
 
@@ -762,6 +763,8 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
 		}
 	}
 
+=======
+>>>>>>> a700345cee (refactor: Remove duplicate inherited method (#46030))
 	serial_no(doc, cdt, cdn) {
 		var me = this;
 		var item = frappe.get_doc(cdt, cdn);