Merge branch 'develop' into fix-consolidation-precision-error

2022-09-04 13:18:10 +05:30
parent e9b0c7177f 0efc6a9abe
commit 1a61d4e8a8
44 changed files with 575 additions and 377 deletions
--- a/erpnext/controllers/taxes_and_totals.py
+++ b/erpnext/controllers/taxes_and_totals.py
@@ -41,6 +41,7 @@ class calculate_taxes_and_totals(object):
 		if self.doc.apply_discount_on == "Grand Total" and self.doc.get("is_cash_or_non_trade_discount"):
 			self.doc.grand_total -= self.doc.discount_amount
 			self.doc.base_grand_total -= self.doc.base_discount_amount
+			self.set_rounded_total()

 		self.calculate_shipping_charges()