[fix] resolved merge conflicts

2026-05-21 05:59:18 +00:00 · 2018-05-15 13:02:40 +05:30
parent 686d5f219e 1b18bba04a
commit 62a59301ef
10 changed files with 100 additions and 36 deletions
--- a/erpnext/controllers/taxes_and_totals.py
+++ b/erpnext/controllers/taxes_and_totals.py
@@ -567,7 +567,8 @@ def get_itemised_tax_breakup_html(doc):
 			itemised_tax=itemised_tax,
 			itemised_taxable_amount=itemised_taxable_amount,
 			tax_accounts=tax_accounts,
-			company_currency=erpnext.get_company_currency(doc.company)
+			conversion_rate=doc.conversion_rate,
+			currency=doc.currency
 		)
 	)