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

[fix] [minor] variance reports fixes

Browse Source
This commit is contained in:
Akhilesh Darjee 2013-11-13 17:27:35 +05:30
parent bfe264be8c
commit d2d210dc68
3 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

6
selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py
View File

@ -121,14 +121,12 @@ def get_salesperson_item_month_map(filters):
for ad in achieved_details.get(sd.name, {}).get(sd.item_group, []):
if (filters["target_on"] == "Quantity"):
tav_dict.target = flt(sd.target_qty) * month_percentage / 100
if ad.month_name == month and get_item_group(ad.item_code) == sd.item_group \
and ad.sales_person == sd.name:
if ad.month_name == month:
tav_dict.achieved += ad.qty
if (filters["target_on"] == "Amount"):
tav_dict.target = flt(sd.target_amount) * month_percentage / 100
if ad.month_name == month and get_item_group(ad.item_code) == sd.item_group \
and ad.sales_person == sd.name:
if ad.month_name == month:
tav_dict.achieved += ad.amount
return sim_map

6
selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py
View File

@ -119,14 +119,12 @@ def get_territory_item_month_map(filters):
for ad in achieved_details.get(td.name, {}).get(td.item_group, []):
if (filters["target_on"] == "Quantity"):
tav_dict.target = flt(td.target_qty) * month_percentage / 100
if ad.month_name == month and get_item_group(ad.item_code) == td.item_group \
and ad.territory == td.name:
if ad.month_name == month:
tav_dict.achieved += ad.qty
if (filters["target_on"] == "Amount"):
tav_dict.target = flt(td.target_amount) * month_percentage / 100
if ad.month_name == month and get_item_group(ad.item_code) == td.item_group \
and ad.territory == td.name:
if ad.month_name == month:
tav_dict.achieved += ad.amount
return tim_map