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

[fix] [minor] merge conflict fixes

Browse Source
This commit is contained in:
Akhilesh Darjee
2013-12-10 18:01:18 +05:30
parent 7b1d9409f1 4e677a3f52
commit aebb9f422b
14 changed files with 187 additions and 111 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

@@ -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