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

Merge branch 'develop' of github.com:webnotes/erpnext into reports

Browse Source
This commit is contained in:
Nabin Hait
2013-12-16 15:18:34 +05:30
parent 4a8930fc67 c55b55d959
commit ea4f66791e
33 changed files with 152 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -85,7 +85,7 @@ class AccountsReceivableReport(object):
def get_account_map(self):
if not hasattr(self, "account_map"):
self.account_map = dict(((r.name, r) for r in webnotes.conn.sql("""select
account.name, customer.customer_name, customer.territory
account.name, customer.name as customer_name, customer.territory
from `tabAccount` account, `tabCustomer` customer
where account.master_type="Customer"
and customer.name=account.master_name""", as_dict=True)))

4
accounts/report/budget_variance_report/budget_variance_report.py
View File

@@ -121,6 +121,6 @@ def get_costcenter_account_month_map(filters):
for ad in actual_details.get(ccd.name, {}).get(ccd.account, []):
if ad.month_name == month:
tav_dict.actual += ad.debit - ad.credit
tav_dict.actual += flt(ad.debit) - flt(ad.credit)
return cam_map
return cam_map