Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[minor] do not commit pay-to-recd from in journal entry

Browse Source
This commit is contained in:
Rushabh Mehta 2016-02-11 14:27:28 +05:30
parent 4bef7a3a52
commit 6f574cd60f
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
erpnext/accounts/doctype/journal_entry/journal_entry.py
View File

@ -356,18 +356,20 @@ class JournalEntry(AccountsController):
def set_print_format_fields(self): def set_print_format_fields(self):
total_amount = 0.0 total_amount = 0.0
bank_account_currency = None bank_account_currency = None
self.pay_to_recd_from = None pay_to_recd_from = None
for d in self.get('accounts'): for d in self.get('accounts'):
if d.party_type and d.party: if d.party_type and d.party:
if not self.pay_to_recd_from: if not pay_to_recd_from:
self.pay_to_recd_from = frappe.db.get_value(d.party_type, d.party, pay_to_recd_from = frappe.db.get_value(d.party_type, d.party,
"customer_name" if d.party_type=="Customer" else "supplier_name") "customer_name" if d.party_type=="Customer" else "supplier_name")
elif frappe.db.get_value("Account", d.account, "account_type") in ["Bank", "Cash"]: 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) total_amount += (d.debit_in_account_currency or d.credit_in_account_currency)
bank_account_currency = d.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 total_amount = 0
self.set_total_amount(total_amount, bank_account_currency) self.set_total_amount(total_amount, bank_account_currency)