fixed conflict
diff --git a/erpnext/accounts/report/accounts_payable/accounts_payable.py b/erpnext/accounts/report/accounts_payable/accounts_payable.py
index 07cca73..a7858fe 100644
--- a/erpnext/accounts/report/accounts_payable/accounts_payable.py
+++ b/erpnext/accounts/report/accounts_payable/accounts_payable.py
@@ -51,10 +51,10 @@
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/erpnext/accounts/report/accounts_receivable/accounts_receivable.py b/erpnext/accounts/report/accounts_receivable/accounts_receivable.py
index 9fa972d..3be33ba 100644
--- a/erpnext/accounts/report/accounts_receivable/accounts_receivable.py
+++ b/erpnext/accounts/report/accounts_receivable/accounts_receivable.py
@@ -101,13 +101,13 @@
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"):