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

Merge pull request #1264 from akhileshdarjee/hotfix

Browse Source 
fixed accounts receivable for customer name
This commit is contained in:
Nabin Hait 2014-01-02 23:53:30 -08:00
commit 528eb4e4ff
1 changed files with 34 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,20 +15,28 @@ class AccountsReceivableReport(object):
else self.filters.report_date else self.filters.report_date
def run(self): def run(self):
return self.get_columns(), self.get_data() customer_naming_by = webnotes.conn.get_value("Selling Settings", None, "cust_master_name")
return self.get_columns(customer_naming_by), self.get_data(customer_naming_by)
def get_columns(self): def get_columns(self, customer_naming_by):
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" "Customer:Link/Customer:200"
] ]
def get_data(self): if customer_naming_by == "Naming Series":
columns += ["Customer Name::110"]
columns += ["Territory:Link/Territory:80", "Remarks::200"]
return columns
def get_data(self, customer_naming_by):
data = [] data = []
future_vouchers = self.get_entries_after(self.filters.report_date) future_vouchers = self.get_entries_after(self.filters.report_date)
for gle in self.get_entries_till(self.filters.report_date): for gle in self.get_entries_till(self.filters.report_date):
@ -42,18 +50,23 @@ class AccountsReceivableReport(object):
gle.voucher_type, gle.voucher_no, due_date, gle.voucher_type, gle.voucher_no, due_date,
invoiced_amount, payment_received, invoiced_amount, payment_received,
outstanding_amount] outstanding_amount]
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] [self.get_customer(gle.account)]
if customer_naming_by == "Naming Series":
row += [self.get_customer_name(gle.account)]
row += [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)):
data[i].insert(4, """<a href="%s"><i class="icon icon-share" style="cursor: pointer;"></i></a>""" \ data[i].insert(4, """<a href="%s"><i class="icon icon-share" style="cursor: pointer;"></i></a>""" \
% ("/".join(["#Form", data[i][2], data[i][3]]),)) % ("/".join(["#Form", data[i][2], data[i][3]]),))
return data return data
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,18 +90,21 @@ 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):
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"):
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
@ -147,7 +163,7 @@ class AccountsReceivableReport(object):
def execute(filters=None): def execute(filters=None):
return AccountsReceivableReport(filters).run() return AccountsReceivableReport(filters).run()
def get_ageing_data(age_as_on, entry_date, outstanding_amount): def get_ageing_data(age_as_on, entry_date, outstanding_amount):
# [0-30, 30-60, 60-90, 90-above] # [0-30, 30-60, 60-90, 90-above]
outstanding_range = [0.0, 0.0, 0.0, 0.0] outstanding_range = [0.0, 0.0, 0.0, 0.0]
@ -164,4 +180,4 @@ def get_ageing_data(age_as_on, entry_date, outstanding_amount):
if index is None: index = 3 if index is None: index = 3
outstanding_range[index] = outstanding_amount outstanding_range[index] = outstanding_amount
return [age] + outstanding_range return [age] + outstanding_range