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

fix: resolve version 15 backport conflict

Browse Source
This commit is contained in:
Mihir Kandoi
2026-08-02 12:03:47 +05:30
parent 5a5e20e167
commit 00df8652e3
1 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
erpnext/controllers/taxes_and_totals.py
View File

@@ -184,20 +184,13 @@ class calculate_taxes_and_totals:
if self.doc.get("is_consolidated"): if self.doc.get("is_consolidated"):
return return
<<<<<<< HEAD
if not self.discount_amount_applied: if not self.discount_amount_applied:
do_not_round_fields = ["valuation_rate", "incoming_rate", "sales_incoming_rate"] do_not_round_fields = [
======= "valuation_rate",
do_not_round_fields = [ "incoming_rate",
"valuation_rate", "sales_incoming_rate",
"incoming_rate", "conversion_factor",
"sales_incoming_rate", ]
"conversion_factor",
]
for item in self.doc.items:
self.doc.round_floats_in(item, do_not_round_fields=do_not_round_fields)
self.calculate_item_rate(item)
>>>>>>> 269cc6ee3b (fix: preserve UOM conversion factor precision in transactions)
for item in self.doc.items: for item in self.doc.items:
self.doc.round_floats_in(item, do_not_round_fields=do_not_round_fields) self.doc.round_floats_in(item, do_not_round_fields=do_not_round_fields)