Rakseeibra/arrr-erp
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add versioned Client FY Accounting Mirrors

Browse Source
This commit is contained in:
A R R R Associates
2026-09-19 12:19:33 +05:30
parent f20b79ff70
commit f6776cc96a
11 changed files with 457 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/modules/accounting/accounting_mirror_models.py
+7 -1
View File
@@ -21,7 +21,8 @@ class AccountingMirrorRegistry(CommonBase):
"tenant_id",
"client_id",
"financial_year",
name="uq_accounting_mirror_registry_client_fy",
"version_no",
name="uq_accounting_mirror_registry_client_fy_version",
),
)
@@ -40,9 +41,14 @@ class AccountingMirrorRegistry(CommonBase):
voucher_to_date: Mapped[date | None] = mapped_column(Date, nullable=True)
file_size_bytes: Mapped[int] = mapped_column(BigInteger, nullable=False, default=0)
version_no: Mapped[int] = mapped_column(Integer, nullable=False, default=1, index=True)
is_current: Mapped[bool] = mapped_column(Boolean, nullable=False, default=True, index=True)
status: Mapped[str] = mapped_column(String(30), nullable=False, default="active", index=True)
is_active: Mapped[bool] = mapped_column(Boolean, nullable=False, default=True, index=True)
replacement_count: Mapped[int] = mapped_column(Integer, nullable=False, default=0)
supersedes_mirror_id: Mapped[int | None] = mapped_column(
ForeignKey("accounting_mirror_registry.id", ondelete="SET NULL"), nullable=True, index=True
)
created_by_user_id: Mapped[int | None] = mapped_column(ForeignKey("users.id", ondelete="SET NULL"), nullable=True)
last_synced_by_user_id: Mapped[int | None] = mapped_column(ForeignKey("users.id", ondelete="SET NULL"), nullable=True)
app/modules/accounting/accounting_mirror_registry.py
-181
View File
@@ -1,181 +0,0 @@
from __future__ import annotations
from datetime import date, datetime, timezone
from pathlib import Path
import re
from typing import Any
from sqlalchemy import select
from app.modules.accounting.accounting_mirror_models import AccountingMirrorRegistry
def _utcnow() -> datetime:
return datetime.now(timezone.utc)
def _fy_key(value: str) -> int:
match = re.fullmatch(r"(\d{4})-(\d{2})", str(value or "").strip())
return int(match.group(1)) if match else -1
def _get_any_mirror(db, tenant_id: int, client_id: int, financial_year: str) -> AccountingMirrorRegistry | None:
return db.execute(
select(AccountingMirrorRegistry).where(
AccountingMirrorRegistry.tenant_id == int(tenant_id),
AccountingMirrorRegistry.client_id == int(client_id),
AccountingMirrorRegistry.financial_year == str(financial_year or "").strip(),
)
).scalar_one_or_none()
def get_registered_mirror(db, tenant_id: int, client_id: int, financial_year: str) -> AccountingMirrorRegistry | None:
row = _get_any_mirror(db, tenant_id, client_id, financial_year)
return row if row and row.is_active and row.status == "active" else None
def list_registered_mirrors(db, tenant_id: int, client_id: int) -> list[AccountingMirrorRegistry]:
rows = db.execute(
select(AccountingMirrorRegistry).where(
AccountingMirrorRegistry.tenant_id == int(tenant_id),
AccountingMirrorRegistry.client_id == int(client_id),
AccountingMirrorRegistry.is_active.is_(True),
)
).scalars().all()
return sorted(rows, key=lambda row: _fy_key(row.financial_year), reverse=True)
def _parse_iso_date(value: Any) -> date | None:
text = str(value or "").strip()
if not text:
return None
try:
return date.fromisoformat(text[:10])
except Exception:
return None
def _parse_iso_datetime(value: Any) -> datetime | None:
text = str(value or "").strip()
if not text:
return None
try:
parsed = datetime.fromisoformat(text.replace("Z", "+00:00"))
return parsed if parsed.tzinfo else parsed.replace(tzinfo=timezone.utc)
except Exception:
return None
def upsert_registered_mirror(
db,
*,
tenant_id: int,
client_id: int,
financial_year: str,
accounting_relative_dir: str,
storage_node_id: int | None,
mirror: dict[str, Any] | None = None,
job: dict[str, Any] | None = None,
requested_by_user_id: int | None = None,
replacement: bool = False,
) -> AccountingMirrorRegistry:
mirror = dict(mirror or {})
job = dict(job or {})
company = dict(mirror.get("company") or {})
voucher_period = dict(mirror.get("voucher_period") or {})
row = _get_any_mirror(db, tenant_id, client_id, financial_year)
created = row is None
if row is None:
row = AccountingMirrorRegistry(
tenant_id=int(tenant_id),
client_id=int(client_id),
financial_year=str(financial_year).strip(),
accounting_relative_dir=str(accounting_relative_dir or "").strip(),
mirror_file_name=f"client_{int(client_id):08d}.act",
created_by_user_id=requested_by_user_id,
)
db.add(row)
row.storage_node_id = int(storage_node_id) if storage_node_id else None
row.accounting_relative_dir = str(accounting_relative_dir or row.accounting_relative_dir or "").strip()
row.mirror_file_name = Path(str(job.get("accounting_db_path") or row.mirror_file_name or f"client_{int(client_id):08d}.act")).name
row.company_name = str(
job.get("company_name")
or company.get("company_name")
or row.company_name
or ""
).strip()
row.company_guid = str(
job.get("tally_guid")
or company.get("company_guid")
or row.company_guid
or ""
).strip()
row.voucher_from_date = _parse_iso_date(voucher_period.get("from_date")) or row.voucher_from_date
row.voucher_to_date = _parse_iso_date(voucher_period.get("to_date")) or row.voucher_to_date
try:
row.file_size_bytes = int(mirror.get("size_bytes") or row.file_size_bytes or 0)
except Exception:
pass
row.status = "active"
row.is_active = True
row.last_synced_by_user_id = requested_by_user_id
row.last_synced_at_utc = (
_parse_iso_datetime(job.get("finished_at_utc"))
or _parse_iso_datetime(job.get("updated_at_utc"))
or _utcnow()
)
if replacement and not created:
row.replacement_count = int(row.replacement_count or 0) + 1
row.updated_at_utc = _utcnow()
db.flush()
return row
def sync_discovered_mirrors(
db,
*,
tenant_id: int,
client_id: int,
storage_node_id: int | None,
discovered: list[dict[str, Any]],
requested_by_user_id: int | None = None,
) -> list[AccountingMirrorRegistry]:
output: list[AccountingMirrorRegistry] = []
discovered_fys: set[str] = set()
for item in discovered or []:
fy = str(item.get("financial_year") or "").strip()
relative_dir = str(item.get("accounting_relative_dir") or "").strip()
mirror = dict(item.get("mirror") or {})
if not re.fullmatch(r"\d{4}-\d{2}", fy) or not relative_dir or not mirror.get("ready"):
continue
discovered_fys.add(fy)
row = upsert_registered_mirror(
db,
tenant_id=tenant_id,
client_id=client_id,
financial_year=fy,
accounting_relative_dir=relative_dir,
storage_node_id=storage_node_id,
mirror=mirror,
job=item,
requested_by_user_id=requested_by_user_id,
replacement=False,
)
output.append(row)
existing = db.execute(
select(AccountingMirrorRegistry).where(
AccountingMirrorRegistry.tenant_id == int(tenant_id),
AccountingMirrorRegistry.client_id == int(client_id),
AccountingMirrorRegistry.is_active.is_(True),
)
).scalars().all()
for row in existing:
if row.financial_year not in discovered_fys:
row.status = "missing"
row.is_active = False
row.updated_at_utc = _utcnow()
db.commit()
return output
app/modules/accounting/accounting_mirror_service.py
+302
View File
@@ -1,8 +1,14 @@
from __future__ import annotations
from typing import Any
from datetime import date, datetime, timezone
from pathlib import Path
import re
from sqlalchemy import select, func
from app.modules.accounting.agent_bridge import request_agent_command
from app.modules.accounting.accounting_mirror_models import AccountingMirrorRegistry
DEFAULT_QUERY_TIMEOUT_SECONDS = 45
@@ -728,3 +734,299 @@ def sundry_creditors_aging(
"current_mirror": current.get("mirror") or {},
"follow_up_mirror": later.get("mirror") or {},
}
# ---------------------------------------------------------------------------
# Accounting Mirror metadata/version helpers
# Kept inside the existing Accounting module/service so every downstream tool
# resolves Client + FY mirrors through one source of truth.
# ---------------------------------------------------------------------------
def _mirror_utcnow() -> datetime:
return datetime.now(timezone.utc)
def _mirror_fy_key(value: str) -> int:
match = re.fullmatch(r"(\d{4})-(\d{2})", str(value or "").strip())
return int(match.group(1)) if match else -1
def _parse_mirror_date(value: Any) -> date | None:
text = str(value or "").strip()
if not text:
return None
try:
return date.fromisoformat(text[:10])
except Exception:
return None
def _parse_mirror_datetime(value: Any) -> datetime | None:
text = str(value or "").strip()
if not text:
return None
try:
parsed = datetime.fromisoformat(text.replace("Z", "+00:00"))
return parsed if parsed.tzinfo else parsed.replace(tzinfo=timezone.utc)
except Exception:
return None
def get_current_accounting_mirror(db, tenant_id: int, client_id: int, financial_year: str) -> AccountingMirrorRegistry | None:
return db.execute(
select(AccountingMirrorRegistry).where(
AccountingMirrorRegistry.tenant_id == int(tenant_id),
AccountingMirrorRegistry.client_id == int(client_id),
AccountingMirrorRegistry.financial_year == str(financial_year or "").strip(),
AccountingMirrorRegistry.is_current.is_(True),
AccountingMirrorRegistry.is_active.is_(True),
AccountingMirrorRegistry.status == "active",
)
).scalar_one_or_none()
def get_registered_mirror(db, tenant_id: int, client_id: int, financial_year: str) -> AccountingMirrorRegistry | None:
"""Backward-compatible name used by existing Accounting tools."""
return get_current_accounting_mirror(db, tenant_id, client_id, financial_year)
def list_accounting_mirror_versions(db, tenant_id: int, client_id: int, financial_year: str) -> list[AccountingMirrorRegistry]:
rows = db.execute(
select(AccountingMirrorRegistry).where(
AccountingMirrorRegistry.tenant_id == int(tenant_id),
AccountingMirrorRegistry.client_id == int(client_id),
AccountingMirrorRegistry.financial_year == str(financial_year or "").strip(),
).order_by(AccountingMirrorRegistry.version_no.desc(), AccountingMirrorRegistry.id.desc())
).scalars().all()
return list(rows)
def list_registered_mirrors(db, tenant_id: int, client_id: int) -> list[AccountingMirrorRegistry]:
rows = db.execute(
select(AccountingMirrorRegistry).where(
AccountingMirrorRegistry.tenant_id == int(tenant_id),
AccountingMirrorRegistry.client_id == int(client_id),
AccountingMirrorRegistry.is_current.is_(True),
AccountingMirrorRegistry.is_active.is_(True),
AccountingMirrorRegistry.status == "active",
)
).scalars().all()
return sorted(rows, key=lambda row: _mirror_fy_key(row.financial_year), reverse=True)
def next_accounting_mirror_version(db, tenant_id: int, client_id: int, financial_year: str) -> int:
value = db.execute(
select(func.max(AccountingMirrorRegistry.version_no)).where(
AccountingMirrorRegistry.tenant_id == int(tenant_id),
AccountingMirrorRegistry.client_id == int(client_id),
AccountingMirrorRegistry.financial_year == str(financial_year or "").strip(),
)
).scalar_one_or_none()
return int(value or 0) + 1
def register_accounting_mirror_version(
db,
*,
tenant_id: int,
client_id: int,
financial_year: str,
accounting_relative_dir: str,
storage_node_id: int | None,
mirror: dict[str, Any] | None = None,
job: dict[str, Any] | None = None,
requested_by_user_id: int | None = None,
version_no: int | None = None,
archived_previous_file_name: str = "",
) -> AccountingMirrorRegistry:
mirror = dict(mirror or {})
job = dict(job or {})
company = dict(mirror.get("company") or {})
voucher_period = dict(mirror.get("voucher_period") or {})
fy = str(financial_year or "").strip()
current = get_current_accounting_mirror(db, tenant_id, client_id, fy)
target_version = int(version_no or next_accounting_mirror_version(db, tenant_id, client_id, fy))
# Idempotent status polling: if this version was already registered, update it
# instead of creating another row.
row = db.execute(
select(AccountingMirrorRegistry).where(
AccountingMirrorRegistry.tenant_id == int(tenant_id),
AccountingMirrorRegistry.client_id == int(client_id),
AccountingMirrorRegistry.financial_year == fy,
AccountingMirrorRegistry.version_no == target_version,
)
).scalar_one_or_none()
if row is None:
row = AccountingMirrorRegistry(
tenant_id=int(tenant_id),
client_id=int(client_id),
financial_year=fy,
version_no=target_version,
is_current=True,
is_active=True,
status="active",
accounting_relative_dir=str(accounting_relative_dir or "").strip(),
mirror_file_name=Path(str(job.get("accounting_db_path") or f"client_{int(client_id):08d}.act")).name,
created_by_user_id=requested_by_user_id,
supersedes_mirror_id=(int(current.id) if current else None),
)
db.add(row)
db.flush()
if current and int(current.id) != int(row.id):
current.is_current = False
current.status = "superseded"
current.updated_at_utc = _mirror_utcnow()
if archived_previous_file_name:
current.mirror_file_name = Path(str(archived_previous_file_name)).name
current.replacement_count = int(current.replacement_count or 0) + 1
# Ensure no other row remains current for the same Client/FY.
others = db.execute(
select(AccountingMirrorRegistry).where(
AccountingMirrorRegistry.tenant_id == int(tenant_id),
AccountingMirrorRegistry.client_id == int(client_id),
AccountingMirrorRegistry.financial_year == fy,
AccountingMirrorRegistry.id != int(row.id),
AccountingMirrorRegistry.is_current.is_(True),
)
).scalars().all()
for other in others:
other.is_current = False
if other.status == "active":
other.status = "superseded"
other.updated_at_utc = _mirror_utcnow()
row.storage_node_id = int(storage_node_id) if storage_node_id else None
row.accounting_relative_dir = str(accounting_relative_dir or row.accounting_relative_dir or "").strip()
row.mirror_file_name = Path(str(job.get("accounting_db_path") or row.mirror_file_name or f"client_{int(client_id):08d}.act")).name
row.company_name = str(job.get("company_name") or company.get("company_name") or row.company_name or "").strip()
row.company_guid = str(job.get("tally_guid") or company.get("company_guid") or row.company_guid or "").strip()
row.voucher_from_date = _parse_mirror_date(voucher_period.get("from_date")) or row.voucher_from_date
row.voucher_to_date = _parse_mirror_date(voucher_period.get("to_date")) or row.voucher_to_date
try:
row.file_size_bytes = int(mirror.get("size_bytes") or row.file_size_bytes or 0)
except Exception:
pass
row.status = "active"
row.is_active = True
row.is_current = True
row.last_synced_by_user_id = requested_by_user_id
row.last_synced_at_utc = _parse_mirror_datetime(job.get("finished_at_utc")) or _parse_mirror_datetime(job.get("updated_at_utc")) or _mirror_utcnow()
row.updated_at_utc = _mirror_utcnow()
db.flush()
return row
def upsert_registered_mirror(
db,
*,
tenant_id: int,
client_id: int,
financial_year: str,
accounting_relative_dir: str,
storage_node_id: int | None,
mirror: dict[str, Any] | None = None,
job: dict[str, Any] | None = None,
requested_by_user_id: int | None = None,
replacement: bool = False,
) -> AccountingMirrorRegistry:
"""Compatibility/backfill helper.
Discovery of a pre-versioning canonical mirror creates/updates v1 only when no
current row exists. A successful explicit replacement is registered through
register_accounting_mirror_version() with the job's requested version.
"""
fy = str(financial_year or "").strip()
current = get_current_accounting_mirror(db, tenant_id, client_id, fy)
if replacement:
return register_accounting_mirror_version(
db,
tenant_id=tenant_id,
client_id=client_id,
financial_year=fy,
accounting_relative_dir=accounting_relative_dir,
storage_node_id=storage_node_id,
mirror=mirror,
job=job,
requested_by_user_id=requested_by_user_id,
version_no=int((job or {}).get("mirror_version_no") or 0) or None,
archived_previous_file_name=str((job or {}).get("archived_previous_file_name") or ""),
)
if current:
# Refresh metadata for the current physical canonical mirror without
# manufacturing another version during discovery/status polling.
current.storage_node_id = int(storage_node_id) if storage_node_id else None
current.accounting_relative_dir = str(accounting_relative_dir or current.accounting_relative_dir or "").strip()
current.company_name = str(((mirror or {}).get("company") or {}).get("company_name") or current.company_name or "").strip()
current.company_guid = str(((mirror or {}).get("company") or {}).get("company_guid") or current.company_guid or "").strip()
current.file_size_bytes = int((mirror or {}).get("size_bytes") or current.file_size_bytes or 0)
current.updated_at_utc = _mirror_utcnow()
db.flush()
return current
return register_accounting_mirror_version(
db,
tenant_id=tenant_id,
client_id=client_id,
financial_year=fy,
accounting_relative_dir=accounting_relative_dir,
storage_node_id=storage_node_id,
mirror=mirror,
job=job,
requested_by_user_id=requested_by_user_id,
version_no=1,
)
def sync_discovered_mirrors(
db,
*,
tenant_id: int,
client_id: int,
storage_node_id: int | None,
discovered: list[dict[str, Any]],
requested_by_user_id: int | None = None,
) -> list[AccountingMirrorRegistry]:
output: list[AccountingMirrorRegistry] = []
discovered_fys: set[str] = set()
for item in discovered or []:
fy = str(item.get("financial_year") or "").strip()
relative_dir = str(item.get("accounting_relative_dir") or "").strip()
mirror = dict(item.get("mirror") or {})
if not re.fullmatch(r"\d{4}-\d{2}", fy) or not relative_dir or not mirror.get("ready"):
continue
discovered_fys.add(fy)
row = upsert_registered_mirror(
db,
tenant_id=tenant_id,
client_id=client_id,
financial_year=fy,
accounting_relative_dir=relative_dir,
storage_node_id=storage_node_id,
mirror=mirror,
job=item,
requested_by_user_id=requested_by_user_id,
replacement=False,
)
output.append(row)
# Only current rows are availability indicators. Historical/superseded
# versions are intentionally left untouched.
current_rows = db.execute(
select(AccountingMirrorRegistry).where(
AccountingMirrorRegistry.tenant_id == int(tenant_id),
AccountingMirrorRegistry.client_id == int(client_id),
AccountingMirrorRegistry.is_current.is_(True),
AccountingMirrorRegistry.is_active.is_(True),
)
).scalars().all()
for row in current_rows:
if row.financial_year not in discovered_fys:
row.status = "missing"
row.is_active = False
row.updated_at_utc = _mirror_utcnow()
db.commit()
return output
app/modules/accounting/creditors_aging_ui.py
+1 -1
View File
@@ -13,7 +13,7 @@ from app.core.db.common import CommonSessionLocal
from app.core.security.csrf import get_or_create_csrf_token
from app.core.templating import templates
from app.modules.accounting.accounting_mirror_service import AccountingMirrorError, sundry_creditors_aging
from app.modules.accounting.accounting_mirror_registry import (
from app.modules.accounting.accounting_mirror_service import (
get_registered_mirror,
list_registered_mirrors,
sync_discovered_mirrors,
app/modules/accounting/templates/accounting/tally.html
+6 -4
View File
@@ -292,7 +292,7 @@
<div class="mt-4 rounded-xl border border-amber-200 bg-amber-50 px-4 py-3 text-sm text-amber-900"><strong>Before export:</strong> open the mapped company in TallyPrime and set Tally's active period (Alt+F2) to cover the full period you want exported. The ODBC mirror reads Tally's active period; the ERP does not change Tally's period automatically.</div>
<div id="mirrorRegistryStatus" class="mt-3 rounded-xl border border-slate-200 bg-slate-50 px-4 py-3 text-sm text-slate-700">
{% if selected_mirror_registration %}
<strong>Mirror registered:</strong> FY {{ selected_mirror_registration.financial_year }}{% if selected_mirror_registration.company_name %} · {{ selected_mirror_registration.company_name }}{% endif %}{% if selected_mirror_registration.last_synced_at_utc %} · last synced {{ selected_mirror_registration.last_synced_at_utc.strftime('%d-%m-%Y %H:%M') }}{% endif %}. Creating this FY again will ask for replacement confirmation.
<strong>Mirror available:</strong> FY {{ selected_mirror_registration.financial_year }} · Version {{ selected_mirror_registration.version_no }}{% if selected_mirror_registration.company_name %} · {{ selected_mirror_registration.company_name }}{% endif %}{% if selected_mirror_registration.last_synced_at_utc %} · last synced {{ selected_mirror_registration.last_synced_at_utc.strftime('%d-%m-%Y %H:%M') }}{% endif %}. Creating this FY again creates a new version and keeps the earlier version.
{% else %}
<strong>No registered mirror for FY {{ selected_financial_year }}.</strong> Creating the mirror will register it to this client and financial year for Accounting/Audit tools.
{% endif %}
@@ -321,7 +321,7 @@
</label>
<label class="text-sm font-medium text-slate-700">From Date<input id="mirrorDateFrom" type="date" name="date_from" required value="{{ transaction_date_from }}" class="mt-1 w-full rounded-xl border border-slate-300 bg-white px-3 py-2 text-sm" /></label>
<label class="text-sm font-medium text-slate-700">To Date<input id="mirrorDateTo" type="date" name="date_to" required value="{{ transaction_date_to }}" class="mt-1 w-full rounded-xl border border-slate-300 bg-white px-3 py-2 text-sm" /></label>
<button id="fullExportButton" type="submit" class="rounded-xl bg-emerald-700 px-4 py-2 text-sm font-semibold text-white hover:bg-emerald-800">Mirror Tally to SQLite</button>
<button id="fullExportButton" type="submit" class="rounded-xl bg-emerald-700 px-4 py-2 text-sm font-semibold text-white hover:bg-emerald-800">{% if selected_mirror_registration %}Create New Version{% else %}Mirror Tally to SQLite{% endif %}</button>
</form>
<div class="mt-3 flex flex-wrap items-center gap-3 text-sm">
<button type="button" id="mirrorPreviousFY" class="rounded-lg border border-slate-300 bg-white px-3 py-1.5 font-semibold text-slate-700">Use Previous FY</button>
@@ -630,8 +630,10 @@ document.addEventListener("DOMContentLoaded", function () {
if(!r.ok||!d.ok)return;
if(registryStatus){
registryStatus.innerHTML=d.exists
? '<strong>Mirror registered:</strong> FY '+fy.value+(d.company_name?' · '+d.company_name:'')+(d.last_synced_at?' · last synced '+new Date(d.last_synced_at).toLocaleString():'')+'. Creating this FY again will ask for replacement confirmation.'
? '<strong>Mirror available:</strong> FY '+fy.value+' · Version '+(d.version_no||1)+(d.company_name?' · '+d.company_name:'')+(d.last_synced_at?' · last synced '+new Date(d.last_synced_at).toLocaleString():'')+'. Creating it again will create a new version and retain the current version.'
: '<strong>No registered mirror for FY '+fy.value+'.</strong> Creating the mirror will register it to this client and financial year for Accounting/Audit tools.';
const exportButton=document.getElementById('fullExportButton');
if(exportButton) exportButton.textContent=d.exists?'Create New Version':'Mirror Tally to SQLite';
}
}catch(e){}
}
@@ -648,7 +650,7 @@ document.addEventListener("DOMContentLoaded", function () {
if(!r.ok||!d.ok){ mirrorForm.submit(); return; }
if(d.exists){
const label=(d.client_name||'this client')+' - FY '+fy.value;
const ok=window.confirm('An Accounting Mirror already exists for '+label+'.\n\nReplace the existing mirror?\n\nThe current mirror will remain active if the new export fails.');
const ok=window.confirm('An Accounting Mirror already exists for '+label+'.\n\nCreate a new mirror version?\n\nThe current version will be preserved and remains active if the new export fails.');
if(!ok)return;
if(replaceField)replaceField.value='1';
}
app/modules/accounting/ui.py
+34 -9
View File
@@ -22,9 +22,12 @@ from app.modules.core.rbac.deps import get_user_permissions, get_user_roles
from app.modules.core.rbac.permission_guard import require_permission
from app.modules.documents.services import build_document_scope, get_active_storage_node_for_branch, client_folder_parts, sanitize_segment
from app.modules.accounting.agent_bridge import request_agent_command
from app.modules.accounting.accounting_mirror_registry import (
from app.modules.accounting.accounting_mirror_service import (
get_registered_mirror,
list_registered_mirrors,
list_accounting_mirror_versions,
next_accounting_mirror_version,
register_accounting_mirror_version,
sync_discovered_mirrors,
upsert_registered_mirror,
)
@@ -342,6 +345,10 @@ def tally_tool(
get_registered_mirror(db, scope.tenant_id, int(selected_client.id), selected_financial_year)
if selected_client else None
)
selected_mirror_versions = (
list_accounting_mirror_versions(db, scope.tenant_id, int(selected_client.id), selected_financial_year)
if selected_client else []
)
return _render(
request,
@@ -366,6 +373,7 @@ def tally_tool(
mirror_fy_options=mirror_fy_options,
registered_mirrors=registered_mirrors,
selected_mirror_registration=selected_mirror_registration,
selected_mirror_versions=selected_mirror_versions,
command_error=command_error,
analysis_history=analysis_history,
)
@@ -850,6 +858,8 @@ def mirror_registration_status(request: Request, client_id: int, financial_year:
"client_name": client.client_name,
"company_name": (row.company_name if row else str((mirror.get("company") or {}).get("company_name") or "")),
"last_synced_at": (row.last_synced_at_utc.isoformat() if row and row.last_synced_at_utc else ""),
"version_no": (int(row.version_no) if row else 0),
"version_count": (len(list_accounting_mirror_versions(db, scope.tenant_id, int(client.id), financial_year)) if row else 0),
})
finally:
db.close()
@@ -913,15 +923,19 @@ def start_full_accounting_export(
replace_confirmed = str(replace_existing or "").strip().lower() in {"1", "true", "yes", "on"}
if (existing_registration or existing_file) and not replace_confirmed:
current_version = int(existing_registration.version_no) if existing_registration else 1
message = (
f"An Accounting Mirror already exists for {client.client_name} - FY {target_fy}. "
"Use Replace Existing Mirror to refresh it; the current mirror will remain active if the new export fails."
f"An Accounting Mirror already exists for {client.client_name} - FY {target_fy} as version {current_version}. "
"Use Create New Version to refresh it; the existing version remains available if the new export fails."
)
return RedirectResponse(
url=f"/tools/tally?client_id={client.id}&financial_year={quote(target_fy)}&error={quote(message)}",
status_code=303,
)
current_version_no = int(existing_registration.version_no) if existing_registration else (1 if existing_file else 0)
mirror_version_no = (current_version_no + 1) if (existing_registration or existing_file) else 1
result = request_agent_command(
node.node_code, "accounting_full_export_start",
{
@@ -930,6 +944,8 @@ def start_full_accounting_export(
"date_from": start.isoformat(), "date_to": end.isoformat(),
"requested_by_user_id": int(user.id), "timeout_seconds": 1800,
"replacement_requested": bool(existing_registration or existing_file),
"previous_version_no": current_version_no,
"mirror_version_no": mirror_version_no,
}, timeout_seconds=20,
)
if not result.get("ok"):
@@ -967,12 +983,21 @@ def full_accounting_export_status(request: Request, client_id: int, financial_ye
if re.fullmatch(r"\d{4}-\d{2}", fy):
storage_payload = _accounting_storage_payload(client, fy)
try:
upsert_registered_mirror(
db, tenant_id=scope.tenant_id, client_id=int(client.id), financial_year=fy,
accounting_relative_dir=storage_payload["accounting_relative_dir"], storage_node_id=int(node.id),
mirror=job.get("mirror") or {}, job=job, requested_by_user_id=int(user.id),
replacement=bool(job.get("replacement_requested")),
)
if bool(job.get("replacement_requested")):
register_accounting_mirror_version(
db, tenant_id=scope.tenant_id, client_id=int(client.id), financial_year=fy,
accounting_relative_dir=storage_payload["accounting_relative_dir"], storage_node_id=int(node.id),
mirror=job.get("mirror") or {}, job=job, requested_by_user_id=int(user.id),
version_no=int(job.get("mirror_version_no") or 0) or None,
archived_previous_file_name=str(job.get("archived_previous_file_name") or ""),
)
else:
upsert_registered_mirror(
db, tenant_id=scope.tenant_id, client_id=int(client.id), financial_year=fy,
accounting_relative_dir=storage_payload["accounting_relative_dir"], storage_node_id=int(node.id),
mirror=job.get("mirror") or {}, job=job, requested_by_user_id=int(user.id),
replacement=False,
)
db.commit()
except Exception:
db.rollback()
app/modules/documents/agent_package.py
+1 -1
View File
@@ -4,7 +4,7 @@ import io
from pathlib import Path
import zipfile
ERP_LOCAL_AGENT_VERSION = "1.26.18"
ERP_LOCAL_AGENT_VERSION = "1.26.19"
ERP_LOCAL_AGENT_NAME = "ERP Local Agent"
RUNTIME_ROOT = Path(__file__).resolve().parent / "local_agent_runtime"
_DETERMINISTIC_ZIP_TIMESTAMP = (2026, 1, 1, 0, 0, 0)
app/modules/documents/local_agent_runtime/erp_local_agent/__init__.py
+1 -1
View File
@@ -1,2 +1,2 @@
__version__ = "1.26.18"
__version__ = "1.26.19"
AGENT_NAME = "ERP Local Agent"
app/modules/documents/local_agent_runtime/erp_local_agent/accounting_store.py
+19
View File
@@ -239,6 +239,25 @@ class LocalAccountingStore:
def exists(self, client_id: int) -> bool:
return self.db_path(client_id).is_file()
def archive_current_mirror_version(self, client_id: int, version_no: int) -> Path | None:
"""Preserve the current canonical .act before a new mirror version is published.
The canonical client_<id>.act remains untouched until the verified new
export is atomically published. The archive is therefore a historical
copy, not a destructive move.
"""
version = int(version_no or 0)
if version <= 0:
return None
source = self.db_path(client_id)
if not source.is_file():
return None
archive = source.with_name(f"{source.stem}_v{version}{source.suffix}")
if archive.exists():
return archive
self._sqlite_backup(source, archive)
return archive
# HISTORICAL_ACT_SCHEMA_AUTO_UPGRADE_V1
def _ensure_historical_schema_compatibility(
app/modules/documents/local_agent_runtime/erp_local_agent/commands.py
+14
View File
@@ -4327,6 +4327,10 @@ class AgentCommandProcessor:
"accounting_relative_dir": str(payload.get("accounting_relative_dir") or "").strip(),
"requested_by_user_id": requested_by,
"replacement_requested": bool(payload.get("replacement_requested")),
"previous_version_no": int(payload.get("previous_version_no") or 0),
"mirror_version_no": int(payload.get("mirror_version_no") or 1),
"archived_previous_file_name": "",
"archived_previous_path": "",
"date_from": date_from, "date_to": date_to, "rows": {},
"started_at_utc": now, "updated_at_utc": now, "finished_at_utc": "",
"error": "", "mirror_db_path": "", "accounting_db_path": str(self.store.db_path(client_id)),
@@ -4384,8 +4388,18 @@ class AgentCommandProcessor:
f"Expected directory '{expected_dir}', resolved '{bound_db}'."
)
archived_previous = None
if bool(payload.get("replacement_requested")):
previous_version_no = int(payload.get("previous_version_no") or 0)
if previous_version_no > 0:
archived_previous = self.store.archive_current_mirror_version(client_id, previous_version_no)
publish(
status="running", percent=2, stage="Starting",
previous_version_no=int(payload.get("previous_version_no") or 0),
mirror_version_no=int(payload.get("mirror_version_no") or 1),
archived_previous_file_name=(archived_previous.name if archived_previous else ""),
archived_previous_path=(str(archived_previous) if archived_previous else ""),
message=(
"Starting read-only ODBC export from TallyPrime for "
f"FY {requested_fy or 'selected period'} into {bound_db}."