Merge origin/development: resolved conflicts in scripts/init_first_time.sh, backend/api/v1/modules/a76/invoices/services.py, .gitignore and others

This commit is contained in:
hreyes
2026-02-27 11:46:16 -07:00
169 changed files with 20436 additions and 2257 deletions

View File

@@ -35,6 +35,7 @@ from .reports.importacion.facturas.routes import router as invoices_reports_rout
from .reports.importacion.consolidados.routes import router as consolidated_reports_router
from .reports.importacion.packing_list.routes import router as packing_list_router
from .reports.exportacion.aviso_consolidado.routes import router as aviso_consolidado_export_router
from .reports.movements.invoices.routes import router as movement_invoices_router
from .reports.exportacion.descargo.routes import router as discharge_reports_router
from .manifests.manifest.routes import router as manifests_router
from .manifests.driver.routes import router as manifest_drivers_router
@@ -44,7 +45,6 @@ from .reports.importacion.transmission.temporal.MAINX30.routes import router as
from .reports.importacion.transmission.definitive.MAINX30.routes import router as transmission_definitive_router
# Router principal
router = APIRouter()
@@ -101,6 +101,13 @@ router.include_router(
tags=["a76 / reports"]
)
router.include_router(
movement_invoices_router,
prefix="/a76/reports/movements/invoices",
tags=["a76 / reports"]
)
router.include_router(
discharge_reports_router,
prefix="/a76/reports/exportacion/descargo",
@@ -145,4 +152,4 @@ router.include_router(
# Registrar router de bitácora
from .audit_log.router import router as audit_log_router
router.include_router(audit_log_router, prefix="/a76/audit-log", tags=["Audit Log"])
router.include_router(audit_log_router, prefix="/a76/audit-log", tags=["Audit Log"])