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

fixed accounts receivable

Browse Source
This commit is contained in:
Akhilesh Darjee 2014-01-03 12:58:04 +05:30
parent b0a9581e59
commit b4eba77f7b
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,9 +26,8 @@ class AccountsReceivableReport(object):
"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"
] ]
naming_by = self.get_selling_settings() if self.get_customer_naming() == "Naming Series":
if naming_by[0].value == "Naming Series":
columns += ["Customer:Link/Customer:200"] columns += ["Customer:Link/Customer:200"]
columns += ["Customer Name::110", "Territory:Link/Territory:80", "Remarks::200"] columns += ["Customer Name::110", "Territory:Link/Territory:80", "Remarks::200"]
@ -53,8 +52,7 @@ class AccountsReceivableReport(object):
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)
naming_by = self.get_selling_settings() if self.get_customer_naming() == "Naming Series":
if naming_by[0].value == "Naming Series":
row += [self.get_customer(gle.account)] row += [self.get_customer(gle.account)]
row += [self.get_customer_name(gle.account), self.get_territory(gle.account), gle.remarks] row += [self.get_customer_name(gle.account), self.get_territory(gle.account), gle.remarks]
@ -66,9 +64,8 @@ class AccountsReceivableReport(object):
return data return data
def get_selling_settings(self): def get_customer_naming(self):
return webnotes.conn.sql("""select value from `tabSingles` where return webnotes.conn.get_value("Selling Settings", None, "cust_master_name")
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