Set change amount automatically only if it is a cash transaction (#9065)
diff --git a/erpnext/controllers/taxes_and_totals.py b/erpnext/controllers/taxes_and_totals.py
index 822d50b..50f6b61 100644
--- a/erpnext/controllers/taxes_and_totals.py
+++ b/erpnext/controllers/taxes_and_totals.py
@@ -440,16 +440,16 @@
self.doc.conversion_rate, self.doc.precision("grand_total")) - self.doc.total_advance
- flt(self.doc.base_write_off_amount), self.doc.precision("grand_total"))
- if self.doc.doctype == "Sales Invoice":
+ if self.doc.doctype == "Sales Invoice":
self.doc.round_floats_in(self.doc, ["paid_amount"])
- paid_amount = self.doc.paid_amount \
- if self.doc.party_account_currency == self.doc.currency else self.doc.base_paid_amount
-
- change_amount = self.doc.change_amount \
- if self.doc.party_account_currency == self.doc.currency else self.doc.base_change_amount
-
self.calculate_write_off_amount()
self.calculate_change_amount()
+
+ paid_amount = self.doc.paid_amount \
+ if self.doc.party_account_currency == self.doc.currency else self.doc.base_paid_amount
+
+ change_amount = self.doc.change_amount \
+ if self.doc.party_account_currency == self.doc.currency else self.doc.base_change_amount
self.doc.outstanding_amount = flt(total_amount_to_pay - flt(paid_amount) +
flt(change_amount), self.doc.precision("outstanding_amount"))
@@ -475,7 +475,9 @@
def calculate_change_amount(self):
self.doc.change_amount = 0.0
self.doc.base_change_amount = 0.0
- if self.doc.paid_amount > self.doc.grand_total:
+ if self.doc.paid_amount > self.doc.grand_total and not self.doc.is_return \
+ and any([d.type == "Cash" for d in self.doc.payments]):
+
self.doc.change_amount = flt(self.doc.paid_amount - self.doc.grand_total +
self.doc.write_off_amount, self.doc.precision("change_amount"))