ADUANASOFT/plantillas-proyectos
13
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/errores-legibles-tabla' into development

Browse Source
This commit is contained in:
AlexeerCT
2026-04-28 09:49:41 -05:00
parent cdf505cc7a 9797ec96f8
commit 356ea99b04
35 changed files with 962 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
backend/api/v1/modules/a24/balance_movements/models.py
View File

@@ -10,7 +10,7 @@ These 4 tables are ALL you need for balances:
a24.balance_movement ← the ledger (append-only, never UPDATE)
a24.discharge_header ← one discharge per export/SM/CTM event
a24.discharge_detail ← one row per (export line × import lot consumed)
a24.discharge_detail ← one row per (export line x import lot consumed)
a24.discharge_scrap ← mermas, desperdicios, destrucciones
Design rules:

6
backend/api/v1/modules/a24/discharges/models.py
View File

@@ -10,7 +10,7 @@ These 4 tables are ALL you need for balances:
a24.balance_movement ← the ledger (append-only, never UPDATE)
a24.discharge_header ← one discharge per export/SM/CTM event
a24.discharge_detail ← one row per (export line × import lot consumed)
a24.discharge_detail ← one row per (export line x import lot consumed)
a24.discharge_scrap ← mermas, desperdicios, destrucciones
Design rules:
@@ -156,7 +156,7 @@ class DischargeHeader(Base, TenantScopedMixin, TimestampMixin):
# The critical traceability link:
# "Export line X consumed Y units from import lot Z"
#
# One row per (export_line × import_lot) pair.
# One row per (export_line x import_lot) pair.
# A single export line can span multiple rows when PEPS pulls from
# more than one import lot.
#
@@ -168,7 +168,7 @@ class DischargeHeader(Base, TenantScopedMixin, TimestampMixin):
class DischargeDetail(Base, TenantScopedMixin, TimestampMixin):
"""
One row per (export line × import lot consumed).
One row per (export line x import lot consumed).
This is the traceability record the SAT asks for:
"Show me which import pedimento covered this export line."

2
backend/api/v1/modules/a76/invoices/exports/docs/REPO_exports_diagramas.md
View File

@@ -22,7 +22,7 @@ flowchart TD
V5 --> V6{¿TC de la factura\n== TC del catálogo?}
V6 -- No --> E4([❌ Error\nTipo de cambio incorrecto])
V6 -- Sí --> V7[Marcar todas las partidas\ncomo sin descarga]
V7 --> V8[Calcular valores por partida\nCosto × Cantidad × TC\nen pesos · dólares · moneda cuenta]
V7 --> V8[Calcular valores por partida\nCosto x Cantidad x TC\nen pesos · dólares · moneda cuenta]
V8 --> V9[Validar costo unitario · series · pesos]
V9 --> V10{¿Hay errores\nen partidas?}
V10 -- Sí --> E5([❌ Error\nCosto en cero o series faltantes])

2
backend/api/v1/modules/a76/invoices/exports/process/sub_process/assign_values.py
View File

@@ -117,7 +117,7 @@ def _assign_costs_per_line(
line.financial.unit_cost_usd = cost_usd
line.financial.unit_cost_mxn = cost_usd * line_tc
# Values are always: cost × qty
# Values are always: cost x qty
line.financial.value_mxn = (line.financial.unit_cost_mxn or Decimal(0)) * qty
line.financial.value_usd = (line.financial.unit_cost_usd or Decimal(0)) * qty
line.financial.value_mc = capture * qty

4
backend/api/v1/modules/a76/invoices/exports/process/sub_process/register_discharge_ledger.py
View File

@@ -5,7 +5,7 @@ Creates the full Annex-24 discharge record for one export invoice:
1. ONE DischargeHeader (one per export event)
2. N BalanceMovement rows (type=CONSUMPTION, one per lot consumed)
3. N DischargeDetail rows (one per export-line × import-lot pair),
3. N DischargeDetail rows (one per export-line x import-lot pair),
each referencing its BalanceMovement (design rule 3)
Design rules from a24.balance_movement (preserved here):
@@ -163,7 +163,7 @@ def register_discharge_ledger(
import_invoice_number_cache[lot.import_invoice_id] = origin_import_invoice
# ── 2. BalanceMovement (CONSUMPTION) ──────────────────────────
# Proportional value: consume / lot_consumed_total × lot_value
# Proportional value: consume / lot_consumed_total x lot_value
# lot_consumed_total == consume for single-lot entries (most cases)
value_me = _proportional_value(consume, consume, lot.value_me)
value_mn = _proportional_value(consume, consume, lot.value_mn)

2
backend/api/v1/modules/a76/invoices/exports/process/sub_process/review_limits.py
View File

@@ -86,7 +86,7 @@ def limit_weight(lines: List[Any]) -> tuple[Decimal, Decimal]:
return total_qty, total_net_weight
def limit_value(lines: List[Any]) -> Decimal:
"""Sums (unit_cost_capture × quantity) across all line items."""
"""Sums (unit_cost_capture x quantity) across all line items."""
total_value = Decimal(0)
for line in lines:
if line.financial and line.quantity:

2
backend/api/v1/modules/a76/invoices/imports/docs/REPO_imports_diagramas.md
View File

@@ -21,7 +21,7 @@ flowchart TD
V2 --> V3{¿Errores en\nclases o fracciones?}
V3 -- Sí --> E4([❌ Error\nClase o fracción inválida])
V3 -- No --> V4[Validar pesos por partida\nKGS o LBS según configuración]
V4 --> CALC[Calcular valores sin IVA\nCosto × Cantidad × TC\npesos · dólares · moneda cuenta]
V4 --> CALC[Calcular valores sin IVA\nCosto x Cantidad x TC\npesos · dólares · moneda cuenta]
CALC --> VL[Validar por cada partida\ncosto > 0 · clase activa\nparte activa · series · UMA]
VL --> VL2{¿Errores en\npartidas?}
VL2 -- Sí --> E5([❌ Error\nCosto cero · clase desactivada\nparte desactivada · series faltantes])

43
backend/api/v1/modules/a76/items/exports/validators/calculations.py
View File

@@ -239,27 +239,42 @@ def calculate_values(
if not result:
return
if not line.financial or not line.quantity:
return
currency, currency_type, exchange_rate = result
if currency_type in ("USD", "ME"):
currency = "foreign"
elif currency_type in ("MXN", "MN"):
currency = "local"
# Evitar None * None / NoneType * Decimal al guardar sin cantidad o sin costo capturado
qty = (
line.quantity.quantity
if line.quantity.quantity is not None
else Decimal("0")
)
capture = (
line.financial.unit_cost_capture
if line.financial.unit_cost_capture is not None
else Decimal("0")
)
if currency == "foreign": # ME
line.financial.unit_cost_usd = line.financial.unit_cost_capture
line.financial.value_usd = line.financial.unit_cost_usd * line.quantity.quantity
line.financial.unit_cost_mxn = line.financial.unit_cost_capture * (exchange_rate or 1)
line.financial.value_mxn = line.financial.unit_cost_mxn * line.quantity.quantity
line.financial.value_mc = line.financial.unit_cost_usd * line.quantity.quantity
line.financial.unit_cost_usd = capture
line.financial.value_usd = capture * qty
line.financial.unit_cost_mxn = capture * (exchange_rate or 1)
line.financial.value_mxn = line.financial.unit_cost_mxn * qty
line.financial.value_mc = capture * qty
elif currency == "local": # MN
line.financial.unit_cost_mxn = line.financial.unit_cost_capture
line.financial.value_mxn = line.financial.unit_cost_mxn * line.quantity.quantity
line.financial.unit_cost_usd = line.financial.unit_cost_capture / (exchange_rate or 1)
line.financial.value_usd = line.financial.unit_cost_usd * line.quantity.quantity
line.financial.value_mc = line.financial.unit_cost_usd * line.quantity.quantity
line.financial.unit_cost_mxn = capture
line.financial.value_mxn = line.financial.unit_cost_mxn * qty
line.financial.unit_cost_usd = capture / (exchange_rate or 1)
line.financial.value_usd = line.financial.unit_cost_usd * qty
line.financial.value_mc = line.financial.unit_cost_usd * qty
elif currency == "manual": # MC
line.financial.unit_cost_usd = line.financial.unit_cost_capture / (exchange_rate or 1)
line.financial.value_usd = line.financial.unit_cost_usd * line.quantity.quantity
line.financial.unit_cost_usd = capture / (exchange_rate or 1)
line.financial.value_usd = line.financial.unit_cost_usd * qty
line.financial.unit_cost_mxn = line.financial.unit_cost_usd * (exchange_rate or 1)
line.financial.value_mxn = line.financial.unit_cost_mxn * line.quantity.quantity
line.financial.value_mc = line.financial.unit_cost_capture * line.quantity.quantity
line.financial.value_mxn = line.financial.unit_cost_mxn * qty
line.financial.value_mc = capture * qty

1
backend/api/v1/modules/a76/items/exports/validators/update.py
View File

@@ -98,6 +98,7 @@ def validate_update(
line.financial.unit_cost_mxn = unit_cost_capture
quantity = line.quantity.quantity if line.quantity.quantity is not None else existing_line.quantity.quantity
quantity = quantity if quantity is not None else Decimal("0")
if line.financial.unit_cost_usd is not None:
line.financial.value_usd = line.financial.unit_cost_usd * quantity

39
backend/api/v1/modules/a76/items/imports/validators/calculations.py
View File

@@ -138,21 +138,32 @@ def calculate_values(
currency = "local"
# si currency_type es otro o None, se usa currency tal cual
qty = (
line.quantity.quantity
if line.quantity.quantity is not None
else Decimal("0")
)
capture = (
line.financial.unit_cost_capture
if line.financial.unit_cost_capture is not None
else Decimal("0")
)
if currency == "foreign":
line.financial.unit_cost_usd = line.financial.unit_cost_capture
line.financial.value_usd = line.financial.unit_cost_usd * line.quantity.quantity
line.financial.unit_cost_mxn = line.financial.unit_cost_capture * (exchange_rate or 1)
line.financial.value_mxn = line.financial.unit_cost_mxn * line.quantity.quantity
line.financial.value_mc = line.financial.unit_cost_usd * line.quantity.quantity
line.financial.unit_cost_usd = capture
line.financial.value_usd = capture * qty
line.financial.unit_cost_mxn = capture * (exchange_rate or 1)
line.financial.value_mxn = line.financial.unit_cost_mxn * qty
line.financial.value_mc = capture * qty
elif currency == "local":
line.financial.unit_cost_mxn = line.financial.unit_cost_capture
line.financial.value_mxn = line.financial.unit_cost_mxn * line.quantity.quantity
line.financial.unit_cost_usd = line.financial.unit_cost_capture / (exchange_rate or 1)
line.financial.value_usd = line.financial.unit_cost_usd * line.quantity.quantity
line.financial.value_mc = line.financial.unit_cost_usd * line.quantity.quantity
line.financial.unit_cost_mxn = capture
line.financial.value_mxn = line.financial.unit_cost_mxn * qty
line.financial.unit_cost_usd = capture / (exchange_rate or 1)
line.financial.value_usd = line.financial.unit_cost_usd * qty
line.financial.value_mc = line.financial.unit_cost_usd * qty
elif currency == "manual":
line.financial.unit_cost_usd = line.financial.unit_cost_capture / (exchange_rate or 1)
line.financial.value_usd = line.financial.unit_cost_usd * line.quantity.quantity
line.financial.unit_cost_usd = capture / (exchange_rate or 1)
line.financial.value_usd = line.financial.unit_cost_usd * qty
line.financial.unit_cost_mxn = line.financial.unit_cost_usd * (exchange_rate or 1)
line.financial.value_mxn = line.financial.unit_cost_mxn * line.quantity.quantity
line.financial.value_mc = line.financial.unit_cost_capture * line.quantity.quantity
line.financial.value_mxn = line.financial.unit_cost_mxn * qty
line.financial.value_mc = capture * qty

1
backend/api/v1/modules/a76/items/imports/validators/update.py
View File

@@ -95,6 +95,7 @@ def validate_update(
line.financial.unit_cost_mxn = unit_cost_capture
quantity = line.quantity.quantity if line.quantity.quantity is not None else existing_line.quantity.quantity
quantity = quantity if quantity is not None else Decimal("0")
if line.financial.unit_cost_usd is not None:
line.financial.value_usd = line.financial.unit_cost_usd * quantity

2
backend/api/v1/modules/a76/reports/movements/vencimiento/service.py
View File

@@ -327,7 +327,7 @@ def generate_vencimiento_csv(filters: VencimientoFilter, db: Session) -> bytes:
peso_saldo = peso_neto - peso_usado
# -- Valor según moneda (ME = foreign, MN = national) --
# Legacy (UsarDescargos=1): ValorUsado = (CantUsada × ValorOrig) / CantOrig (proporcional, igual que peso)
# Legacy (UsarDescargos=1): ValorUsado = (CantUsada x ValorOrig) / CantOrig (proporcional, igual que peso)
if use_me:
valor_orig = _d(row["C22"])
else: