nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-04 12:49:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed accounts receivable for customer name

Browse Source
This commit is contained in:
Akhilesh Darjee
2014-01-03 12:44:00 +05:30
parent 5fbb757c2c
commit b0a9581e59
1 changed files with 31 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
accounts/report/accounts_receivable/accounts_receivable.py
View File

@@ -18,16 +18,23 @@ class AccountsReceivableReport(object):
return self.get_columns(), self.get_data() return self.get_columns(), self.get_data()
def get_columns(self): def get_columns(self):
return [ columns = [
"Posting Date:Date:80", "Account:Link/Account:150", "Posting Date:Date:80", "Account:Link/Account:150",
"Voucher Type::110", "Voucher No::120", "::30", "Voucher Type::110", "Voucher No::120", "::30",
"Due Date:Date:80", "Due Date:Date:80",
"Invoiced Amount:Currency:100", "Payment Received:Currency:100", "Invoiced Amount:Currency:100", "Payment Received:Currency:100",
"Outstanding Amount:Currency:100", "Age:Int:50", "0-30:Currency:100", "Outstanding Amount:Currency:100", "Age:Int:50", "0-30:Currency:100",
"30-60:Currency:100", "60-90:Currency:100", "90-Above:Currency:100", "30-60:Currency:100", "60-90:Currency:100", "90-Above:Currency:100"
"Customer:Link/Customer:200", "Territory:Link/Territory:80", "Remarks::200"
] ]
naming_by = self.get_selling_settings()
if naming_by[0].value == "Naming Series":
columns += ["Customer:Link/Customer:200"]
columns += ["Customer Name::110", "Territory:Link/Territory:80", "Remarks::200"]
return columns
def get_data(self): def get_data(self):
data = [] data = []
future_vouchers = self.get_entries_after(self.filters.report_date) future_vouchers = self.get_entries_after(self.filters.report_date)
@@ -45,7 +52,12 @@ class AccountsReceivableReport(object):
entry_date = due_date if self.filters.ageing_based_on == "Due Date" \ entry_date = due_date if self.filters.ageing_based_on == "Due Date" \
else gle.posting_date else gle.posting_date
row += get_ageing_data(self.age_as_on, entry_date, outstanding_amount) row += get_ageing_data(self.age_as_on, entry_date, outstanding_amount)
row += [self.get_customer(gle.account), self.get_territory(gle.account), gle.remarks]
naming_by = self.get_selling_settings()
if naming_by[0].value == "Naming Series":
row += [self.get_customer(gle.account)]
row += [self.get_customer_name(gle.account), self.get_territory(gle.account), gle.remarks]
data.append(row) data.append(row)
for i in range(0,len(data)): for i in range(0,len(data)):
@@ -54,6 +66,10 @@ class AccountsReceivableReport(object):
return data return data
def get_selling_settings(self):
return webnotes.conn.sql("""select value from `tabSingles` where
doctype='Selling Settings' and field='cust_master_name'""", as_dict=1)
def get_entries_after(self, report_date): def get_entries_after(self, report_date):
# returns a distinct list # returns a distinct list
return list(set([(e.voucher_type, e.voucher_no) for e in self.get_gl_entries() return list(set([(e.voucher_type, e.voucher_no) for e in self.get_gl_entries()
@@ -77,6 +93,9 @@ 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 ""
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):
@@ -85,10 +104,10 @@ class AccountsReceivableReport(object):
def get_account_map(self): def get_account_map(self):
if not hasattr(self, "account_map"): if not hasattr(self, "account_map"):
self.account_map = dict(((r.name, r) for r in webnotes.conn.sql("""select self.account_map = dict(((r.name, r) for r in webnotes.conn.sql("""select
account.name, customer.name as customer_name, customer.territory acc.name, cust.name as customer, cust.customer_name, cust.territory
from `tabAccount` account, `tabCustomer` customer from `tabAccount` acc, `tabCustomer` cust
where account.master_type="Customer" where acc.master_type="Customer"
and customer.name=account.master_name""", as_dict=True))) and cust.name=acc.master_name""", as_dict=True)))
return self.account_map return self.account_map