diff --git a/erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py b/erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py index 3ab3986b013..b6fc77fd1c4 100644 --- a/erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py +++ b/erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py @@ -21,11 +21,21 @@ class TDSComputationSummaryReport(TaxWithholdingDetailsReport): AGGREGATE_FIELDS = ("total_amount", "tax_amount") def validate_filters(self): - if self.filters.from_date > self.filters.to_date: + from_date = self.filters.from_date + to_date = self.filters.to_date + if not from_date or not to_date: + frappe.throw( + _("{0} and {1} are mandatory").format( + frappe.bold(_("From Date")), + frappe.bold(_("To Date")), + ) + ) + + if from_date > to_date: frappe.throw(_("From Date must be before To Date")) - from_year = get_fiscal_year(self.filters.from_date)[0] - to_year = get_fiscal_year(self.filters.to_date)[0] + from_year = get_fiscal_year(from_date)[0] + to_year = get_fiscal_year(to_date)[0] if from_year != to_year: frappe.throw(_("From Date and To Date lie in different Fiscal Year")) diff --git a/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py b/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py index fb49b060fb7..01533e9d414 100644 --- a/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +++ b/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py @@ -30,6 +30,11 @@ def execute(filters=None): _("Please select either the Item or Warehouse or Warehouse Type filter to generate the report.") ) + if not filters.from_date or not filters.to_date: + frappe.throw( + _("{0} and {1} are mandatory").format(frappe.bold(_("From Date")), frappe.bold(_("To Date"))) + ) + if filters.from_date > filters.to_date: frappe.throw(_("From Date must be before To Date")) diff --git a/erpnext/stock/report/cogs_by_item_group/cogs_by_item_group.py b/erpnext/stock/report/cogs_by_item_group/cogs_by_item_group.py index 000aca9f43e..a325a6ca89e 100644 --- a/erpnext/stock/report/cogs_by_item_group/cogs_by_item_group.py +++ b/erpnext/stock/report/cogs_by_item_group/cogs_by_item_group.py @@ -34,7 +34,18 @@ def update_filters_with_account(filters: Filters) -> None: def validate_filters(filters: Filters) -> None: - if filters.from_date > filters.to_date: + from_date = filters.from_date + to_date = filters.to_date + + if not from_date or not to_date: + frappe.throw( + _("{0} and {1} are mandatory").format( + frappe.bold(_("From Date")), + frappe.bold(_("To Date")), + ) + ) + + if from_date > to_date: frappe.throw(_("From Date must be before To Date"))