From 6f574cd60f47a9d763549cbfc9f0e8a7496f3ddb Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Thu, 11 Feb 2016 14:27:28 +0530 Subject: [PATCH] [minor] do not commit pay-to-recd from in journal entry --- .../accounts/doctype/journal_entry/journal_entry.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.py b/erpnext/accounts/doctype/journal_entry/journal_entry.py index 55e846be52..4b5ce43857 100644 --- a/erpnext/accounts/doctype/journal_entry/journal_entry.py +++ b/erpnext/accounts/doctype/journal_entry/journal_entry.py @@ -356,18 +356,20 @@ class JournalEntry(AccountsController): def set_print_format_fields(self): total_amount = 0.0 bank_account_currency = None - self.pay_to_recd_from = None + pay_to_recd_from = None for d in self.get('accounts'): if d.party_type and d.party: - if not self.pay_to_recd_from: - self.pay_to_recd_from = frappe.db.get_value(d.party_type, d.party, + if not pay_to_recd_from: + pay_to_recd_from = frappe.db.get_value(d.party_type, d.party, "customer_name" if d.party_type=="Customer" else "supplier_name") elif frappe.db.get_value("Account", d.account, "account_type") in ["Bank", "Cash"]: total_amount += (d.debit_in_account_currency or d.credit_in_account_currency) bank_account_currency = d.account_currency - if not self.pay_to_recd_from: + if pay_to_recd_from: + self.pay_to_recd_from = pay_to_recd_from + else: total_amount = 0 self.set_total_amount(total_amount, bank_account_currency)