From 2a2346422d55773a38ff3101c6f1a547314b8024 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Wed, 27 Jul 2016 13:07:52 +0530 Subject: [PATCH] [fix] Set amounts only if party and bank account exists --- erpnext/accounts/doctype/payment_entry/payment_entry.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.py b/erpnext/accounts/doctype/payment_entry/payment_entry.py index 28978cdbaf..3eed70cbcc 100644 --- a/erpnext/accounts/doctype/payment_entry/payment_entry.py +++ b/erpnext/accounts/doctype/payment_entry/payment_entry.py @@ -251,8 +251,8 @@ class PaymentEntry(AccountsController): self.unallocated_amount = party_amount - self.total_allocated_amount def set_difference_amount(self): - base_unallocated_amount = flt(self.unallocated_amount) * \ - (self.source_exchange_rate if self.payment_type=="Receive" else self.target_exchange_rate) + base_unallocated_amount = flt(self.unallocated_amount) * (flt(self.source_exchange_rate) + if self.payment_type=="Receive" else flt(self.target_exchange_rate)) base_party_amount = flt(self.base_total_allocated_amount) + flt(base_unallocated_amount) @@ -672,7 +672,7 @@ def get_payment_entry(dt, dn, party_amount=None, bank_account=None, bank_amount= pe.setup_party_account_field() pe.set_missing_values() - if bank: + if party_account and bank: pe.set_exchange_rate() pe.set_amounts() return pe \ No newline at end of file