diff --git a/erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py b/erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py index 554a669512a..5ce369d6cd3 100644 --- a/erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py +++ b/erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py @@ -5,6 +5,8 @@ import frappe from frappe import _ from frappe.query_builder.functions import IfNull +from erpnext.accounts.report.utils import validate_mandatory_date_range + class TaxWithholdingDetailsReport: party_types = ("Customer", "Supplier") @@ -25,11 +27,7 @@ class TaxWithholdingDetailsReport: return self.get_columns(), self.get_data() def validate_filters(self): - if not self.filters.from_date or not self.filters.to_date: - frappe.throw(_("From Date and To Date are required")) - - if self.filters.from_date > self.filters.to_date: - frappe.throw(_("From Date must be before To Date")) + validate_mandatory_date_range(self.filters) def get_data(self): self.entries = self.get_entries_query().run(as_dict=True) 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..7c4ed86756a 100644 --- a/erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py +++ b/erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py @@ -21,8 +21,7 @@ class TDSComputationSummaryReport(TaxWithholdingDetailsReport): AGGREGATE_FIELDS = ("total_amount", "tax_amount") def validate_filters(self): - if self.filters.from_date > self.filters.to_date: - frappe.throw(_("From Date must be before To Date")) + super().validate_filters() from_year = get_fiscal_year(self.filters.from_date)[0] to_year = get_fiscal_year(self.filters.to_date)[0] diff --git a/erpnext/accounts/report/utils.py b/erpnext/accounts/report/utils.py index 8d1730ab294..3661e787f41 100644 --- a/erpnext/accounts/report/utils.py +++ b/erpnext/accounts/report/utils.py @@ -1,4 +1,5 @@ import frappe +from frappe import _ from frappe.query_builder.custom import ConstantColumn from frappe.query_builder.functions import Sum from frappe.utils import flt, formatdate, get_datetime_str, get_table_name @@ -16,6 +17,19 @@ from erpnext.setup.utils import get_exchange_rate __exchange_rates = {} +def validate_mandatory_date_range(filters, from_field="from_date", to_field="to_date"): + from_date = filters.get(from_field) + to_date = filters.get(to_field) + + 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")) + + def get_currency(filters): """ Returns a dictionary containing currency information. The keys of the dict are 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 e3ce254b590..03154816a90 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 @@ -7,6 +7,7 @@ from frappe import _ from frappe.utils import add_to_date, cint, flt, get_datetime, get_table_name, getdate from pypika import functions as fn +from erpnext.accounts.report.utils import validate_mandatory_date_range from erpnext.deprecation_dumpster import deprecated from erpnext.stock.doctype.stock_closing_entry.stock_closing_entry import StockClosing from erpnext.stock.doctype.warehouse.warehouse import apply_warehouse_filter @@ -30,8 +31,7 @@ def execute(filters=None): _("Please select either the Item or Warehouse or Warehouse Type filter to generate the report.") ) - if filters.from_date > filters.to_date: - frappe.throw(_("From Date must be before To Date")) + validate_mandatory_date_range(filters) float_precision = cint(frappe.db.get_default("float_precision")) or 3 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..afae69c6ce0 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 @@ -9,6 +9,7 @@ from frappe import _ from frappe.utils import date_diff from erpnext.accounts.report.general_ledger.general_ledger import get_gl_entries +from erpnext.accounts.report.utils import validate_mandatory_date_range Filters = frappe._dict Row = frappe._dict @@ -34,8 +35,7 @@ def update_filters_with_account(filters: Filters) -> None: def validate_filters(filters: Filters) -> None: - if filters.from_date > filters.to_date: - frappe.throw(_("From Date must be before To Date")) + validate_mandatory_date_range(filters) def get_columns() -> Columns: