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

fixed conflict

Browse Source
This commit is contained in:
Nabin Hait 2014-02-14 13:42:41 +05:30
commit 8ae051cb39
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/accounts/report/accounts_payable/accounts_payable.py
View File

@ -51,10 +51,10 @@ def execute(filters=None):
ageing_based_on_date = gle.posting_date ageing_based_on_date = gle.posting_date
row += get_ageing_data(age_on, ageing_based_on_date, outstanding_amount) + \ 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": 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] row += [account_supplier_type_map.get(gle.account), gle.remarks]
data.append(row) data.append(row)

6
erpnext/accounts/report/accounts_receivable/accounts_receivable.py
View File

@ -101,13 +101,13 @@ class AccountsReceivableReport(object):
return flt(gle.debit) - flt(gle.credit) - payment_received return flt(gle.debit) - flt(gle.credit) - payment_received
def get_customer(self, account): 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): 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): 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): def get_account_map(self):
if not hasattr(self, "account_map"): if not hasattr(self, "account_map"):