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

[Fixed] Merge conflict fixed

Browse Source
This commit is contained in:
Akhilesh Darjee
2013-06-21 13:09:18 +05:30
parent 1ded5c618e 2ef637b346
commit 64c8e28423
9 changed files with 143 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -115,11 +115,12 @@ def get_costcenter_account_month_map(filters):
for month in tdd:
cam_map.setdefault(ccd.name, {}).setdefault(ccd.account, {})\
.setdefault(month, webnotes._dict({
"target": 0.0, "actual": 0.0, "variance": 0.0
"target": 0.0, "actual": 0.0
}))
tav_dict = cam_map[ccd.name][ccd.account][month]
tav_dict.target = flt(ccd.budget_allocated)*(tdd[month]["percentage_allocation"]/100)
tav_dict.target = flt(ccd.budget_allocated) * \
(tdd[month]["percentage_allocation"]/100)
for ad in actual_details:
if ad.month_name == month and ad.account == ccd.account \