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

new parent updating logic, made requested changes

Browse Source
This commit is contained in:
Abhishek Balam 2020-05-12 15:25:35 +05:30
parent 87776c335b
commit 411b125906
1 changed files with 10 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -61,13 +61,13 @@ def get_data_by_time(filters, common_columns):
# key yyyy-mm # key yyyy-mm
columns = [ columns = [
{ {
'label': 'Year', 'label': _('Year'),
'fieldname': 'year', 'fieldname': 'year',
'fieldtype': 'Data', 'fieldtype': 'Data',
'width': 100 'width': 100
}, },
{ {
'label': 'Month', 'label': _('Month'),
'fieldname': 'month', 'fieldname': 'month',
'fieldtype': 'Data', 'fieldtype': 'Data',
'width': 100 'width': 100
@ -136,6 +136,7 @@ def get_data_by_territory(filters, common_columns):
repeat = customers_in[name]['repeat'] if condition else [0, 0.0] repeat = customers_in[name]['repeat'] if condition else [0, 0.0]
temp = { temp = {
'territory': name, 'territory': name,
'parent_territory': territory_dict[name]['parent'],
'indent': indent, 'indent': indent,
'new_customers': new[0], 'new_customers': new[0],
'repeat_customers': repeat[0], 'repeat_customers': repeat[0],
@ -146,34 +147,18 @@ def get_data_by_territory(filters, common_columns):
'bold': 0 if indent else 1 'bold': 0 if indent else 1
} }
data.append(temp) data.append(temp)
node_list = [x for x in territory_dict.keys() if territory_dict[x]['is_group'] == 0]
root_node = [x for x in territory_dict.keys() if territory_dict[x]['parent'] is None][0]
root_data = [x for x in data if x['territory'] == root_node][0]
for node in node_list: loop_data = sorted(data, key=lambda k: k['indent'], reverse=True)
data = update_groups(node, data, root_node, territory_dict)
for group in [x for x in territory_dict.keys() if territory_dict[x]['parent'] == root_node]: for ld in loop_data:
group_data = [x for x in data if x['territory'] == group][0] if ld['parent_territory']:
for key in group_data.keys(): parent_data = [x for x in data if x['territory'] == ld['parent_territory']][0]
if key not in ['indent', 'territory', 'bold']: for key in parent_data.keys():
root_data[key] += group_data[key] if key not in ['indent', 'territory', 'parent_territory', 'bold']:
parent_data[key] += ld[key]
return columns, data, None, None, None, 1 return columns, data, None, None, None, 1
def update_groups(node, data, root_node, territory_dict):
""" Adds values of child territories to parent node except root. """
parent_node = territory_dict[node]['parent']
if parent_node != root_node and parent_node:
node_data = [x for x in data if x['territory'] == node][0]
parent_data = [x for x in data if x['territory'] == parent_node][0]
for key in parent_data.keys():
if key not in ['indent', 'territory', 'bold']:
parent_data[key] += node_data[key]
return update_groups(parent_node, data, root_node, territory_dict)
else:
return data
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. """
company_condition = '' company_condition = ''