nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-18 00:55:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: make 'from_date' and 'to_date' mandatory

Browse Source 
(cherry picked from commit 3617b41b95)
This commit is contained in:
ruthra kumar
2024-08-05 10:10:25 +05:30
committed by Mergify
parent 703f58ceac
commit f7f191fe50
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
erpnext/crm/report/sales_pipeline_analytics/sales_pipeline_analytics.py
View File

@@ -21,7 +21,15 @@ class SalesPipelineAnalytics:
def __init__(self, filters=None):
self.filters = frappe._dict(filters or {})
def validate_filters(self):
if not self.filters.from_date:
frappe.throw(_("From Date is mandatory"))
if not self.filters.to_date:
frappe.throw(_("To Date is mandatory"))
def run(self):
self.validate_filters()
self.get_columns()
self.get_data()
self.get_chart_data()
@@ -147,10 +155,6 @@ class SalesPipelineAnalytics:
conditions.append(
["expected_closing", "between", [self.filters.get("from_date"), self.filters.get("to_date")]]
)
elif self.filters.get("from_date") and not self.filters.get("to_date"):
conditions.append(["expected_closing", ">=", self.filters.get("from_date")])
elif not self.filters.get("from_date") and self.filters.get("to_date"):
conditions.append(["expected_closing", "<=", self.filters.get("to_date")])
return conditions