nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-26 00:14:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Nabin Hait
2013-11-14 18:50:23 +05:30
parent 9e5da835ec 3d39b4c0d6
commit 7373a83043
5 changed files with 54 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,7 +17,6 @@ def execute(filters=None):
cam_map = get_costcenter_account_month_map(filters)
data = []
for cost_center, cost_center_items in cam_map.items():
for account, monthwise_data in cost_center_items.items():
row = [cost_center, account]
@@ -120,8 +119,7 @@ def get_costcenter_account_month_map(filters):
tav_dict.target = flt(ccd.budget_allocated) * month_percentage /100
for ad in actual_details.get(ccd.name, {}).get(ccd.account, []):
if ad.month_name == month and ad.account == ccd.account \
and ad.cost_center == ccd.name:
if ad.month_name == month:
tav_dict.actual += ad.debit - ad.credit
return cam_map