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

fix territory count

Browse Source
This commit is contained in:
Abhishek Balam 2020-06-12 11:38:07 +05:30
parent 72450d2af3
commit 996b306cda
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py
View File

@ -174,17 +174,15 @@ def get_customer_stats(filters, tree_view=False):
filters, as_dict=1): filters, as_dict=1):
key = si.territory if tree_view else si.posting_date.strftime('%Y-%m') key = si.territory if tree_view else si.posting_date.strftime('%Y-%m')
new_or_repeat = 'new' if si.customer not in customers else 'repeat'
customers_in.setdefault(key, {'new': [0, 0.0], 'repeat': [0, 0.0]}) customers_in.setdefault(key, {'new': [0, 0.0], 'repeat': [0, 0.0]})
revenue_condition = (filters.from_date <= si.posting_date.strftime('%Y-%m-%d')) revenue_condition = (filters.from_date <= si.posting_date.strftime('%Y-%m-%d'))
if not si.customer in customers:
customers_in[key]['new'][0] += 1
if revenue_condition: if revenue_condition:
customers_in[key]['new'][1] += si.base_grand_total customers_in[key][new_or_repeat][0] += 1
customers_in[key][new_or_repeat][1] += si.base_grand_total
if new_or_repeat == 'new':
customers.append(si.customer) customers.append(si.customer)
else:
customers_in[key]['repeat'][0] += 1
if revenue_condition:
customers_in[key]['repeat'][1] += si.base_grand_total
return customers_in return customers_in