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

fix: restore missing change from develop branch

Browse Source
This commit is contained in:
Saqib Ansari
2022-02-10 10:28:51 +05:30
parent 41b7c5f92d
commit 503cc65db4
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py
View File

@@ -186,11 +186,10 @@ class POSInvoiceMergeLog(Document):
if not found: if not found:
payments.append(payment) payments.append(payment)
if doc.rounding_adjustment or doc.base_rounding_adjustment: rounding_adjustment += doc.rounding_adjustment
rounding_adjustment += doc.rounding_adjustment rounded_total += doc.rounded_total
rounded_total += doc.rounded_total base_rounding_adjustment += doc.base_rounding_adjustment
base_rounding_adjustment += doc.base_rounding_adjustment base_rounded_total += doc.base_rounded_total
base_rounded_total += doc.base_rounded_total
if loyalty_points_sum: if loyalty_points_sum: