nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-26 16:34:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Remove duplicate inherited method (#46030)

Browse Source 
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 a700345cee)

# Conflicts:
#	erpnext/public/js/controllers/transaction.js
This commit is contained in:
Corentin Forler
2025-03-05 11:08:05 +01:00
committed by Mergify
parent 506dd3c6b9
commit 0db7e8fbc1
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/public/js/controllers/transaction.js
View File

@@ -742,6 +742,7 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
}); });
} }
<<<<<<< HEAD
add_taxes_from_item_tax_template(item_tax_map) { add_taxes_from_item_tax_template(item_tax_map) {
let me = this; 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) { serial_no(doc, cdt, cdn) {
var me = this; var me = this;
var item = frappe.get_doc(cdt, cdn); var item = frappe.get_doc(cdt, cdn);