From e0f6b3edbe5463a3106c80260bd9b33277b832f8 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Thu, 13 Feb 2014 18:43:18 +0530 Subject: [PATCH] minor fixes in account receivable/payable --- accounts/report/accounts_payable/accounts_payable.py | 4 ++-- accounts/report/accounts_receivable/accounts_receivable.py | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/accounts/report/accounts_payable/accounts_payable.py b/accounts/report/accounts_payable/accounts_payable.py index 1bd8a9f323..0948b7ac66 100644 --- a/accounts/report/accounts_payable/accounts_payable.py +++ b/accounts/report/accounts_payable/accounts_payable.py @@ -51,10 +51,10 @@ def execute(filters=None): ageing_based_on_date = gle.posting_date row += get_ageing_data(age_on, ageing_based_on_date, outstanding_amount) + \ - [account_map.get(gle.account).get("supplier") or ""] + [account_map.get(gle.account, {}).get("supplier") or ""] if supplier_naming_by == "Naming Series": - row += [account_map.get(gle.account).get("supplier_name") or ""] + row += [account_map.get(gle.account, {}).get("supplier_name") or ""] row += [account_supplier_type_map.get(gle.account), gle.remarks] data.append(row) diff --git a/accounts/report/accounts_receivable/accounts_receivable.py b/accounts/report/accounts_receivable/accounts_receivable.py index f23193274a..b06e8ebb4d 100644 --- a/accounts/report/accounts_receivable/accounts_receivable.py +++ b/accounts/report/accounts_receivable/accounts_receivable.py @@ -101,13 +101,13 @@ class AccountsReceivableReport(object): return flt(gle.debit) - flt(gle.credit) - payment_received def get_customer(self, account): - return self.get_account_map().get(account).get("customer") or "" + return self.get_account_map().get(account, {}).get("customer") or "" def get_customer_name(self, account): - return self.get_account_map().get(account).get("customer_name") or "" + return self.get_account_map().get(account, {}).get("customer_name") or "" def get_territory(self, account): - return self.get_account_map().get(account).get("territory") or "" + return self.get_account_map().get(account, {}).get("territory") or "" def get_account_map(self): if not hasattr(self, "account_map"):