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

fix: renamed view types, added default

Browse Source
This commit is contained in:
Abhishek Balam 2020-05-09 22:09:02 +05:30
parent d543830a59
commit b59f2780eb
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.js
View File

@ -4,11 +4,12 @@
frappe.query_reports["Customer Acquisition and Loyalty"] = { frappe.query_reports["Customer Acquisition and Loyalty"] = {
"filters": [ "filters": [
{ {
"fieldname":"view_type", "fieldname": "view_type",
"label": __("View Type"), "label": __("View Type"),
"fieldtype": "Select", "fieldtype": "Select",
"default": "Time Series", "options": ["Monthly", "Territory Wise"],
"options": ["Time Series", "Territory Tree"] "default": "Monthly",
"reqd": 1
}, },
{ {
"fieldname":"company", "fieldname":"company",

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

@ -52,7 +52,7 @@ def execute(filters=None):
'width': 150 'width': 150
} }
] ]
if filters.get('view_type') == 'Territory Tree': if filters.get('view_type') == 'Territory Wise':
return get_data_by_territory(filters, common_columns) return get_data_by_territory(filters, common_columns)
else: else:
return get_data_by_time(filters, common_columns) return get_data_by_time(filters, common_columns)