From 503cc65db4ed9cf4b920971195bb32109d7d92d2 Mon Sep 17 00:00:00 2001 From: Saqib Ansari Date: Thu, 10 Feb 2022 10:28:51 +0530 Subject: [PATCH] fix: restore missing change from develop branch --- .../pos_invoice_merge_log/pos_invoice_merge_log.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py b/erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py index 08c3bc71553..40ab0c50deb 100644 --- a/erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py +++ b/erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py @@ -186,11 +186,10 @@ class POSInvoiceMergeLog(Document): if not found: payments.append(payment) - if doc.rounding_adjustment or doc.base_rounding_adjustment: - rounding_adjustment += doc.rounding_adjustment - rounded_total += doc.rounded_total - base_rounding_adjustment += doc.base_rounding_adjustment - base_rounded_total += doc.base_rounded_total + rounding_adjustment += doc.rounding_adjustment + rounded_total += doc.rounded_total + base_rounding_adjustment += doc.base_rounding_adjustment + base_rounded_total += doc.base_rounded_total if loyalty_points_sum: