From 996b306cdae6417492e9866ab3dfca27943c9d72 Mon Sep 17 00:00:00 2001 From: Abhishek Balam Date: Fri, 12 Jun 2020 11:38:07 +0530 Subject: [PATCH] fix territory count --- .../customer_acquisition_and_loyalty.py | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py b/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py index 0ab6eda647..4288b52aca 100644 --- a/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +++ b/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py @@ -174,17 +174,15 @@ def get_customer_stats(filters, tree_view=False): filters, as_dict=1): 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]}) 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: - customers_in[key]['new'][1] += si.base_grand_total + if revenue_condition: + 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) - else: - customers_in[key]['repeat'][0] += 1 - if revenue_condition: - customers_in[key]['repeat'][1] += si.base_grand_total return customers_in \ No newline at end of file