Fix Tally ODBC selector GUID and workspace FY mirror defaults

This commit is contained in:
A R R R Associates
2026-09-07 12:38:50 +05:30
parent a4a749f014
commit 532ddf736b
5 changed files with 82 additions and 14 deletions
+18 -3
View File
@@ -67,6 +67,19 @@ def _financial_year_for_date(value: date | None = None) -> str:
return f"{start_year}-{str(start_year + 1)[-2:]}"
def _active_financial_year(request: Request) -> str:
"""Return the FY selected in the ERP workspace header."""
value = (
request.session.get("active_financial_year")
or getattr(request.state, "year_code", None)
or ""
)
value = str(value or "").strip()
if re.fullmatch(r"\d{4}-\d{2}", value):
return value
return _financial_year_for_date()
def _financial_year_bounds(financial_year: str) -> tuple[date, date]:
match = re.fullmatch(r"(\d{4})-(\d{2})", str(financial_year or "").strip())
if not match:
@@ -237,13 +250,14 @@ def tally_tool(
live_result = None
analysis_history = []
command_error = error or ""
selected_financial_year = str(financial_year or _financial_year_for_date()).strip()
workspace_financial_year = _active_financial_year(request)
selected_financial_year = str(financial_year or workspace_financial_year).strip()
try:
selected_fy_start, selected_fy_end = _financial_year_bounds(selected_financial_year)
except Exception:
selected_financial_year = _financial_year_for_date()
selected_financial_year = workspace_financial_year
selected_fy_start, selected_fy_end = _financial_year_bounds(selected_financial_year)
mirror_fy_options = _financial_year_options(_financial_year_for_date(), 7)
mirror_fy_options = _financial_year_options(workspace_financial_year, 7)
should_query_agent = bool(refresh or selected_client)
if refresh:
@@ -309,6 +323,7 @@ def tally_tool(
transaction_date_from=transaction_date_from,
transaction_date_to=transaction_date_to,
selected_financial_year=selected_financial_year,
workspace_financial_year=workspace_financial_year,
mirror_fy_options=mirror_fy_options,
command_error=command_error,
analysis_history=analysis_history,