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

Merge pull request #56884 from aerele/fix/v16-report-date-guard

Browse Source 
fix: validate mandatory date filters in reports
This commit is contained in:
Mihir Kandoi
2026-07-15 12:51:29 +05:30
committed by GitHub
parent fee3a6e0fd 3e8784f596
commit d5126dcad5
3 changed files with 30 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py
View File

@@ -21,11 +21,21 @@ class TDSComputationSummaryReport(TaxWithholdingDetailsReport):
AGGREGATE_FIELDS = ("total_amount", "tax_amount") AGGREGATE_FIELDS = ("total_amount", "tax_amount")
def validate_filters(self): 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")) frappe.throw(_("From Date must be before To Date"))
from_year = get_fiscal_year(self.filters.from_date)[0] from_year = get_fiscal_year(from_date)[0]
to_year = get_fiscal_year(self.filters.to_date)[0] to_year = get_fiscal_year(to_date)[0]
if from_year != to_year: if from_year != to_year:
frappe.throw(_("From Date and To Date lie in different Fiscal Year")) frappe.throw(_("From Date and To Date lie in different Fiscal Year"))

5
erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py
View File

@@ -30,6 +30,11 @@ def execute(filters=None):
_("Please select either the Item or Warehouse or Warehouse Type filter to generate the report.") _("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: if filters.from_date > filters.to_date:
frappe.throw(_("From Date must be before To Date")) frappe.throw(_("From Date must be before To Date"))

13
erpnext/stock/report/cogs_by_item_group/cogs_by_item_group.py
View File

@@ -34,7 +34,18 @@ def update_filters_with_account(filters: Filters) -> None:
def validate_filters(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")) frappe.throw(_("From Date must be before To Date"))