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

Merge pull request #22210 from abhishekbalam/customer_acq_revenue_fix

Browse Source 
fix: Revenue and Customer Count only in date range in Customer Acq. Report
This commit is contained in:
Deepesh Garg 2020-06-18 11:55:09 +05:30 committed by GitHub
commit 8db89bfab6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,7 +5,7 @@ from __future__ import unicode_literals
import calendar import calendar
import frappe import frappe
from frappe import _ from frappe import _
from frappe.utils import cint, cstr from frappe.utils import cint, cstr, getdate
def execute(filters=None): def execute(filters=None):
common_columns = [ common_columns = [
@ -160,7 +160,7 @@ def get_data_by_territory(filters, common_columns):
return columns, data, None, None, None, 1 return columns, data, None, None, None, 1
def get_customer_stats(filters, tree_view=False): def get_customer_stats(filters, tree_view=False):
""" Calculates number of new and repeated customers. """ """ Calculates number of new and repeated customers and revenue. """
company_condition = '' company_condition = ''
if filters.get('company'): if filters.get('company'):
company_condition = ' and company=%(company)s' company_condition = ' and company=%(company)s'
@ -174,14 +174,14 @@ 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]})
if not si.customer in customers: # if filters.from_date <= si.posting_date.strftime('%Y-%m-%d'):
customers_in[key]['new'][0] += 1 if getdate(filters.from_date) <= getdate(si.posting_date):
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
customers_in[key]['repeat'][1] += si.base_grand_total
return customers_in return customers_in