diff --git a/backend/api/v1/modules/a76/clients_and_providers/dto.py b/backend/api/v1/modules/a76/clients_and_providers/dto.py index 292d9e41..e461addd 100644 --- a/backend/api/v1/modules/a76/clients_and_providers/dto.py +++ b/backend/api/v1/modules/a76/clients_and_providers/dto.py @@ -6,7 +6,9 @@ Reemplaza schemas.py siguiendo enfoque DDD y estilo NestJS from decimal import Decimal from typing import List, Literal, Optional -from pydantic import BaseModel, Field +from pydantic import BaseModel, Field, model_validator + +from .validators import is_valid_rfc, is_valid_tax_id # DTOs para dirección @@ -54,7 +56,6 @@ class ClientProviderProgramsDTO(BaseModel): manufacturer_id: Optional[str] = Field( None, max_length=25, description="Manufacturer ID" ) - tax_id: Optional[str] = Field(None, max_length=30, description="Tax ID") broker: Optional[str] = Field(None, max_length=6, description="Broker") import_broker: Optional[str] = Field( None, max_length=6, description="Import broker" @@ -116,7 +117,6 @@ class ClientProviderCreateDTO(BaseModel): ) position: Optional[str] = Field(None, max_length=30, description="Position") incoterm: Optional[str] = Field(None, max_length=19, description="Incoterm") - is_national_provider: Optional[bool] = None is_active: Optional[bool] = Field(None, description="Enabled/Disabled status") # Nested DTOs @@ -127,6 +127,24 @@ class ClientProviderCreateDTO(BaseModel): None, description="Programs information" ) + @model_validator(mode="after") + def validate_rfc_or_tax_id_format(self): + rfc = self.rfc + if not rfc or not (rfc := (rfc or "").strip()): + return self + proc = (self.type_nat_foreign or "N").strip().upper()[:1] + if proc == "E": + if not is_valid_tax_id(rfc): + raise ValueError( + "El TAX-ID debe tener formato: 2 dígitos, guión y resto (ej. 12-3456789). Máx 30 caracteres." + ) + else: + if not is_valid_rfc(rfc): + raise ValueError( + "El RFC no tiene el formato correcto. Ejemplo: XAXX010101000." + ) + return self + class Config: from_attributes = True @@ -157,7 +175,6 @@ class ClientProviderUpdateDTO(BaseModel): ) position: Optional[str] = Field(None, max_length=30, description="Position") incoterm: Optional[str] = Field(None, max_length=19, description="Incoterm") - is_national_provider: Optional[bool] = None is_active: Optional[bool] = Field(None, description="Enabled/Disabled status") # Nested DTOs @@ -168,6 +185,24 @@ class ClientProviderUpdateDTO(BaseModel): None, description="Programs information" ) + @model_validator(mode="after") + def validate_rfc_or_tax_id_format(self): + rfc = self.rfc + if not rfc or not (rfc := (rfc or "").strip()): + return self + proc = (self.type_nat_foreign or "N").strip().upper()[:1] + if proc == "E": + if not is_valid_tax_id(rfc): + raise ValueError( + "El TAX-ID debe tener formato: 2 dígitos, guión y resto (ej. 12-3456789). Máx 30 caracteres." + ) + else: + if not is_valid_rfc(rfc): + raise ValueError( + "El RFC no tiene el formato correcto. Ejemplo: XAXX010101000." + ) + return self + class Config: from_attributes = True @@ -189,7 +224,6 @@ class ClientProviderResponseDTO(BaseModel): responsible: Optional[str] = None position: Optional[str] = None incoterm: Optional[str] = None - is_national_provider: Optional[bool] = None is_active: Optional[bool] = None tenant_id: int company_id: int diff --git a/backend/api/v1/modules/a76/clients_and_providers/models.py b/backend/api/v1/modules/a76/clients_and_providers/models.py index db5544ca..6333449d 100644 --- a/backend/api/v1/modules/a76/clients_and_providers/models.py +++ b/backend/api/v1/modules/a76/clients_and_providers/models.py @@ -45,6 +45,7 @@ class ClientProvider(Base, TenantScopedMixin, TimestampMixin): type_nat_foreign: Mapped[Optional[str]] = mapped_column(String(1)) # TIPO NACIONAL/EXTRANJERO name: Mapped[Optional[str]] = mapped_column(String(256)) short_name: Mapped[Optional[str]] = mapped_column(String(10)) + # Identificador fiscal único: RFC (nacional) o TAX-ID (extranjero); no usar programs.tax_id para lo mismo rfc: Mapped[Optional[str]] = mapped_column(String(30)) curp: Mapped[Optional[str]] = mapped_column(String(19)) client_or_provider: Mapped[ClientOrProviderEnum] = mapped_column(PgEnum(ClientOrProviderEnum, name="entity_client_or_provider", create_type=True, native_enum=True),nullable=False) @@ -55,7 +56,6 @@ class ClientProvider(Base, TenantScopedMixin, TimestampMixin): responsible: Mapped[Optional[str]] = mapped_column(String(80)) position: Mapped[Optional[str]] = mapped_column(String(30)) incoterm: Mapped[Optional[str]] = mapped_column(String(19)) - is_national_provider: Mapped[Optional[bool]] = mapped_column(Boolean) is_active: Mapped[Optional[bool]] = mapped_column(Boolean) # Relationships @@ -140,7 +140,6 @@ class ClientProviderPrograms(Base, TenantScopedMixin, TimestampMixin): prosec_authorization: Mapped[Optional[str]] = mapped_column(String(20)) secon_auth_date: Mapped[Optional[int]] = mapped_column(Integer) manufacturer_id: Mapped[Optional[str]] = mapped_column(String(25)) - tax_id: Mapped[Optional[str]] = mapped_column(String(30)) broker: Mapped[Optional[str]] = mapped_column(String(6)) import_broker: Mapped[Optional[str]] = mapped_column(String(6)) transfer_key: Mapped[Optional[str]] = mapped_column(String(8)) diff --git a/backend/api/v1/modules/a76/clients_and_providers/validators.py b/backend/api/v1/modules/a76/clients_and_providers/validators.py new file mode 100644 index 00000000..523bec74 --- /dev/null +++ b/backend/api/v1/modules/a76/clients_and_providers/validators.py @@ -0,0 +1,27 @@ +""" +Validadores de formato para RFC (Nacional) y TAX-ID (Extranjero) en clientes y proveedores. +""" + +import re + +# Formato RFC México: 3-4 letras (A-Z, &, Ñ), 6 dígitos (fecha), 3 caracteres homoclave. Ej: XAXX010101000 +RFC_PATTERN = re.compile(r"^[A-Z&Ñ]{3,4}\d{6}[A-Z0-9]{3}$", re.IGNORECASE) + +# TAX-ID extranjero: 2 dígitos, guión, resto alfanumérico. Ej: 12-3456789 (EIN US). Total máx 30. +TAX_ID_PATTERN = re.compile(r"^\d{2}-[A-Z0-9]{1,27}$", re.IGNORECASE) + + +def is_valid_rfc(value: str) -> bool: + """Valida formato RFC mexicano. Acepta cadena vacía/None como inválida (no opcional aquí).""" + if not value or not isinstance(value, str): + return False + normalized = value.strip().upper() + return bool(normalized and RFC_PATTERN.match(normalized)) + + +def is_valid_tax_id(value: str) -> bool: + """Valida formato TAX-ID (extranjero): 2 dígitos, guión y resto alfanumérico. Ej: 12-3456789.""" + if not value or not isinstance(value, str): + return False + normalized = value.strip() + return bool(normalized and len(normalized) <= 30 and TAX_ID_PATTERN.match(normalized)) diff --git a/backend/api/v1/modules/a76/layouts_csv/classes/template_config.py b/backend/api/v1/modules/a76/layouts_csv/classes/template_config.py index f4d9d2e5..cc6009bd 100644 --- a/backend/api/v1/modules/a76/layouts_csv/classes/template_config.py +++ b/backend/api/v1/modules/a76/layouts_csv/classes/template_config.py @@ -12,6 +12,22 @@ from ..common.cell_value import cell_to_str # Valores que indican que la primera fila es cabecera (primera columna normalizada) FIRST_COLUMN_HEADER_VALUES = ("CLAVE CLASE", "CLASE") +_ENCODING_FALLBACKS: Tuple[str, ...] = ("utf-8-sig", "utf-8", "cp1252", "latin-1") + + +def _read_text_sample(file_path: str, sample_bytes: int = 2048) -> str: + with open(file_path, "rb") as f: + raw = f.read(sample_bytes) + last_err: Optional[Exception] = None + for enc in _ENCODING_FALLBACKS: + try: + return raw.decode(enc) + except Exception as e: + last_err = e + if last_err: + raise last_err + return "" + def detect_headers_or_data( file_path: str, @@ -26,8 +42,15 @@ def detect_headers_or_data( - Si no -> has_header=False, fieldnames=TEMPLATE_DOWNLOAD_HEADERS (la primera fila es dato). """ try: - with open(file_path, "r", encoding=encoding) as f: - sample = f.read(2048) + # `encoding` se mantiene por compatibilidad; si falla, hacemos fallback para CSVs tipo Excel (cp1252/latin-1). + if encoding and encoding.lower() not in ("auto", "detect"): + try: + with open(file_path, "r", encoding=encoding) as f: + sample = f.read(2048) + except Exception: + sample = _read_text_sample(file_path, sample_bytes=2048) + else: + sample = _read_text_sample(file_path, sample_bytes=2048) except Exception: return None, True lines = sample.splitlines() diff --git a/backend/api/v1/modules/a76/layouts_csv/clients_and_providers/common/common_validators.py b/backend/api/v1/modules/a76/layouts_csv/clients_and_providers/common/common_validators.py index 42f41ae9..06f50b76 100644 --- a/backend/api/v1/modules/a76/layouts_csv/clients_and_providers/common/common_validators.py +++ b/backend/api/v1/modules/a76/layouts_csv/clients_and_providers/common/common_validators.py @@ -3,11 +3,16 @@ Validadores reutilizables para import CSV de clientes y proveedores. Paridad Clarion: procedencia E/N, tipo C/P/A, clave máx 8, SECON, Prosec, Vinculación, Es Empresa Certificada, Transformador/SubMaq, desfase. """ +import re from typing import Dict, Any, Optional from api.v1.modules.a76.clients_and_providers.models import ClientOrProviderEnum RFC_MAX = 30 + +# Formato RFC México: 3-4 letras, 6 dígitos, 3 homoclave. TAX-ID: 2 dígitos, guión, resto. Ej: 12-3456789. +RFC_PATTERN = re.compile(r"^[A-Z&Ñ]{3,4}\d{6}[A-Z0-9]{3}$", re.IGNORECASE) +TAX_ID_PATTERN = re.compile(r"^\d{2}-[A-Z0-9]{1,27}$", re.IGNORECASE) NAME_MAX = 256 SHORT_NAME_MAX = 10 # Clarion: Col C máx 8 caracteres @@ -29,6 +34,36 @@ def check_required_max(row: Dict[str, Any], col: str, max_len: int, line_num: in return None +def check_rfc_format(row: Dict[str, Any], line_num: int) -> Optional[Dict[str, Any]]: + """Col E (RFC): si tiene valor, debe cumplir formato RFC México.""" + val = (row.get("RFC") or "").strip() + if not val: + return None + if not RFC_PATTERN.match(val.upper()): + return { + "line": line_num, + "col": "RFC", + "msg": "El formato del RFC es inválido.", + "solution": "Capturar en la columna E un RFC con formato válido (ej. XAXX010101000).", + } + return None + + +def check_tax_id_format(row: Dict[str, Any], line_num: int) -> Optional[Dict[str, Any]]: + """Col E (TAX-ID): 2 dígitos, guión y resto alfanumérico. Ej: 12-3456789. Máx 30 caracteres.""" + val = (row.get("RFC") or "").strip() + if not val: + return None + if len(val) > 30 or not TAX_ID_PATTERN.match(val): + return { + "line": line_num, + "col": "RFC", + "msg": "El formato del TAX-ID es inválido.", + "solution": "Capturar en la columna E un TAX-ID con formato: 2 dígitos, guión y resto (ej. 12-3456789). Máx 30 caracteres.", + } + return None + + def check_max_length(row: Dict[str, Any], col: str, max_len: int, line_num: int) -> Optional[Dict[str, Any]]: val = (row.get(col) or "").strip() if not val: diff --git a/backend/api/v1/modules/a76/layouts_csv/clients_and_providers/common/mappers.py b/backend/api/v1/modules/a76/layouts_csv/clients_and_providers/common/mappers.py index c281f814..be64f05b 100644 --- a/backend/api/v1/modules/a76/layouts_csv/clients_and_providers/common/mappers.py +++ b/backend/api/v1/modules/a76/layouts_csv/clients_and_providers/common/mappers.py @@ -43,7 +43,6 @@ MAX_LEN = { "prosec_authorization": 20, "secon_authorization": 20, "manufacturer_id": 25, - "tax_id_programs": 30, "broker": 6, "import_broker": 6, "transfer_key": 8, @@ -85,11 +84,15 @@ def row_to_client_provider_data( """ Mapea fila normalizada a datos para ClientProvider, ClientProviderAddress y ClientProviderPrograms. Devuelve (cp_data, address_data_or_none, programs_data_or_none). - Para compatibilidad con Clarion: se requiere RFC o SHORT_NAME para considerar la fila válida. + Identificador fiscal unificado: solo se guarda en ClientProvider.rfc (RFC o TAX-ID según procedencia). + Se toma de columna RFC (E); si viene vacía y hay TAX_ID_PROGRAMS (AB), se usa esa para la misma columna rfc. """ - rfc = _str_or_none(row_norm.get("RFC"), MAX_LEN["rfc"]) + rfc_col = _str_or_none(row_norm.get("RFC"), MAX_LEN["rfc"]) + tax_id_programs_col = _str_or_none(row_norm.get("TAX_ID_PROGRAMS"), MAX_LEN["rfc"]) + # Una sola columna: identificador fiscal en cp.rfc (nacional=RFC, extranjero=TAX-ID) + rfc_unified = rfc_col or tax_id_programs_col short_name = _str_or_none(row_norm.get("SHORT_NAME"), MAX_LEN["short_name"]) - if not rfc and not short_name: + if not rfc_unified and not short_name: return ({}, None, None) client_or_provider = parse_client_or_provider(row_norm.get("TIPO")) or ClientOrProviderEnum.BOTH @@ -110,7 +113,7 @@ def row_to_client_provider_data( cp_data = { "tenant_id": tenant_id, "company_id": company_id, - "rfc": rfc or None, + "rfc": rfc_unified or None, "name": _str_or_none(row_norm.get("NOMBRE"), MAX_LEN["name"]), "short_name": short_name, "curp": _str_or_none(row_norm.get("CURP"), MAX_LEN["curp"]), @@ -124,7 +127,6 @@ def row_to_client_provider_data( "position": _str_or_none(row_norm.get("POSICION"), MAX_LEN["position"]), "incoterm": _str_or_none(row_norm.get("INCOTERM"), MAX_LEN["incoterm"]), "is_active": parse_active(row_norm.get("ACTIVO")), - "is_national_provider": True if procedencia == "N" else (False if procedencia == "E" else None), } # Address @@ -174,12 +176,12 @@ def row_to_client_provider_data( tipo_prog or num_prog or fecha_secon is not None or prosec_val or num_aut_prosec or is_certified or reg_cert or _str_or_none(row_norm.get("MANUFACTURER_ID")) - or _str_or_none(row_norm.get("TAX_ID_PROGRAMS")) or _str_or_none(row_norm.get("BROKER_EXPO")) or _str_or_none(row_norm.get("BROKER_IMPO")) or _str_or_none(row_norm.get("CLAVE_TRANSFER")) or applied_proportion is not None ): + # Identificador fiscal solo en ClientProvider.rfc (columna única) programs_data = { "program": tipo_prog[:7] if tipo_prog else None, "program_number": num_prog, @@ -190,7 +192,6 @@ def row_to_client_provider_data( "is_certified_company": is_certified, "certified_company_registry": reg_cert, "manufacturer_id": _str_or_none(row_norm.get("MANUFACTURER_ID"), MAX_LEN["manufacturer_id"]), - "tax_id": _str_or_none(row_norm.get("TAX_ID_PROGRAMS"), MAX_LEN["tax_id_programs"]), "broker": _str_or_none(row_norm.get("BROKER_EXPO"), MAX_LEN["broker"]), "import_broker": _str_or_none(row_norm.get("BROKER_IMPO"), MAX_LEN["import_broker"]), "transfer_key": _str_or_none(row_norm.get("CLAVE_TRANSFER"), MAX_LEN["transfer_key"]), diff --git a/backend/api/v1/modules/a76/layouts_csv/clients_and_providers/validators/common.py b/backend/api/v1/modules/a76/layouts_csv/clients_and_providers/validators/common.py index 12b311a6..60e03c2b 100644 --- a/backend/api/v1/modules/a76/layouts_csv/clients_and_providers/validators/common.py +++ b/backend/api/v1/modules/a76/layouts_csv/clients_and_providers/validators/common.py @@ -13,6 +13,8 @@ from ..common.common_validators import ( CURP_MAX, check_required_max, check_max_length, + check_rfc_format, + check_tax_id_format, check_tipo_client_provider, check_procedencia, check_short_name_max_clarion, @@ -161,8 +163,23 @@ def validate_row_client_provider( if err: return err - # Compatibilidad: RFC requerido y longitudes (como antes) + # Identificador fiscal requerido: Nacional = RFC, Extranjero = TAX-ID (mismo campo "RFC" en layout). + procedencia = (row.get("PROCEDENCIA") or "").strip().upper()[:1] err = check_required_max(row, "RFC", RFC_MAX, line_num) + if err: + if procedencia == "E": + err = { + "line": line_num, + "col": "RFC", + "msg": "Requerido (TAX-ID)", + "solution": "Capturar el TAX-ID del cliente/proveedor extranjero en la columna E (RFC/TAX-ID).", + } + return err + # Validar formato según procedencia: RFC (N) o TAX-ID (E). + if procedencia == "N": + err = check_rfc_format(row, line_num) + elif procedencia == "E": + err = check_tax_id_format(row, line_num) if err: return err err = check_max_length(row, "NOMBRE", NAME_MAX, line_num) diff --git a/backend/api/v1/modules/a76/layouts_csv/common/csv_reader.py b/backend/api/v1/modules/a76/layouts_csv/common/csv_reader.py index 24359188..33060545 100644 --- a/backend/api/v1/modules/a76/layouts_csv/common/csv_reader.py +++ b/backend/api/v1/modules/a76/layouts_csv/common/csv_reader.py @@ -5,7 +5,7 @@ Si se pasa headerless_first_cell_values, se detecta si la primera fila es cabece """ import csv import io -from typing import Iterator, Tuple, Dict, Any, Optional, List, Set +from typing import Iterator, Tuple, Dict, Any, Optional, List, Set, Sequence def _normalize_empty_headers(headers: List[str]) -> List[str]: @@ -21,6 +21,32 @@ def _normalize_empty_headers(headers: List[str]) -> List[str]: return result +_ENCODING_FALLBACKS: Sequence[str] = ("utf-8-sig", "utf-8", "cp1252", "latin-1") + + +def _detect_text_encoding( + file_path: str, + encodings: Sequence[str] = _ENCODING_FALLBACKS, + sample_bytes: int = 8192, +) -> str: + """ + Detecta encoding por prueba de decodificación en un sample en binario. + Nota: latin-1 decodifica cualquier byte; por eso debe ir al final. + """ + with open(file_path, "rb") as f: + raw = f.read(sample_bytes) + last_err: Optional[Exception] = None + for enc in encodings: + try: + raw.decode(enc) + return enc + except Exception as e: + last_err = e + if last_err: + raise last_err + return "utf-8-sig" + + def iter_csv_rows( file_path: str, fieldnames: Optional[List[str]] = None, @@ -34,7 +60,8 @@ def iter_csv_rows( (quitando BOM, strip, upper) está en headerless_first_cell_values, se trata como dato y se usan fieldnames. headerless_second_cell_key_pattern se ignora si no se usa (reservado para otros layouts). """ - with open(file_path, "r", encoding="utf-8-sig") as f: + encoding = _detect_text_encoding(file_path) + with open(file_path, "r", encoding=encoding) as f: sample = f.read(2048) f.seek(0) try: @@ -91,6 +118,7 @@ def iter_csv_rows( def count_csv_rows(file_path: str, has_header: bool = True) -> int: """Cuenta filas del CSV. Si has_header=True (por defecto), no cuenta la cabecera.""" - with open(file_path, "r", encoding="utf-8-sig") as f: + encoding = _detect_text_encoding(file_path) + with open(file_path, "r", encoding=encoding) as f: total_lines = sum(1 for _ in f) return total_lines if not has_header else max(0, total_lines - 1) diff --git a/backend/api/v1/modules/a76/reports/exportacion/aviso_consolidado/service.py b/backend/api/v1/modules/a76/reports/exportacion/aviso_consolidado/service.py index 3671361f..2d3b3f4f 100644 --- a/backend/api/v1/modules/a76/reports/exportacion/aviso_consolidado/service.py +++ b/backend/api/v1/modules/a76/reports/exportacion/aviso_consolidado/service.py @@ -136,12 +136,8 @@ class AvisoConsolidadoExportacionService: if client_obj: # Fetch Address c_addr = db.query(ClientProviderAddress).filter(ClientProviderAddress.client_id == target_client_id).first() - # Fetch Fiscal Data (RFC) - c_prog = db.query(ClientProviderPrograms).filter(ClientProviderPrograms.client_id == target_client_id).first() - - c_rfc = "" - if c_prog and c_prog.tax_id: c_rfc = c_prog.tax_id - elif hasattr(client_obj, 'rfc'): c_rfc = client_obj.rfc + # Identificador fiscal único en ClientProvider.rfc (RFC o TAX-ID) + c_rfc = getattr(client_obj, "rfc", "") or "" c_dir_str = "DOMICILIO NO REGISTRADO" if c_addr: diff --git a/backend/api/v1/modules/a76/reports/importacion/consolidados/mex/service.py b/backend/api/v1/modules/a76/reports/importacion/consolidados/mex/service.py index 82e0c897..b35c8bc1 100644 --- a/backend/api/v1/modules/a76/reports/importacion/consolidados/mex/service.py +++ b/backend/api/v1/modules/a76/reports/importacion/consolidados/mex/service.py @@ -127,11 +127,7 @@ class ConsolidadoImportacionMexService: ciudad=(addr.city or "") if addr else "", estado=(addr.state or "") if addr else "", pais=(addr.country or "MEX") if addr else "MEX", - tax_id=( - prog.tax_id - if (prog and prog.tax_id) - else (getattr(main, "rfc", "") or "") - ), + tax_id=getattr(main, "rfc", "") or "", programa="IMMEX" if (prog and prog.program) else "", autorizacion=prog.program_number if prog else "", prosec=( diff --git a/backend/api/v1/modules/a76/reports/importacion/consolidados/temporary/mex/service.py b/backend/api/v1/modules/a76/reports/importacion/consolidados/temporary/mex/service.py index 17369185..a3949d07 100644 --- a/backend/api/v1/modules/a76/reports/importacion/consolidados/temporary/mex/service.py +++ b/backend/api/v1/modules/a76/reports/importacion/consolidados/temporary/mex/service.py @@ -82,7 +82,7 @@ class ConsolidadoImportacionMexService: ciudad=(addr.city or "") if addr else "", estado=(addr.state or "") if addr else "", pais=(addr.country or "MEX") if addr else "MEX", - tax_id=prog.tax_id if (prog and prog.tax_id) else (getattr(main, 'rfc', "") or ""), + tax_id=getattr(main, "rfc", "") or "", programa="IMMEX" if (prog and prog.program) else "", autorizacion=prog.program_number if prog else "", prosec=prog.prosec_authorization if (prog and prog.prosec and prog.prosec_authorization) else "", diff --git a/backend/api/v1/modules/a76/reports/importacion/facturas/mex/service.py b/backend/api/v1/modules/a76/reports/importacion/facturas/mex/service.py index 1163644e..185589d0 100644 --- a/backend/api/v1/modules/a76/reports/importacion/facturas/mex/service.py +++ b/backend/api/v1/modules/a76/reports/importacion/facturas/mex/service.py @@ -159,11 +159,7 @@ class FacturaImportacionMexService: ciudad=(addr.city or "") if addr else "", estado=(addr.state or "") if addr else "", pais=(addr.country or "MEX") if addr else "MEX", - tax_id=( - prog.tax_id - if (prog and prog.tax_id) - else (getattr(main, "rfc", "") or "") - ), + tax_id=getattr(main, "rfc", "") or "", programa="IMMEX" if (prog and prog.program) else "", autorizacion=prog.program_number if prog else "", prosec=( diff --git a/backend/api/v1/modules/a76/reports/importacion/facturas/temporary/mex/service.py b/backend/api/v1/modules/a76/reports/importacion/facturas/temporary/mex/service.py index b61c2c87..192dab8a 100644 --- a/backend/api/v1/modules/a76/reports/importacion/facturas/temporary/mex/service.py +++ b/backend/api/v1/modules/a76/reports/importacion/facturas/temporary/mex/service.py @@ -82,7 +82,7 @@ class FacturaImportacionMexService: ciudad=(addr.city or "") if addr else "", estado=(addr.state or "") if addr else "", pais=(addr.country or "MEX") if addr else "MEX", - tax_id=prog.tax_id if (prog and prog.tax_id) else (getattr(main, 'rfc', "") or ""), + tax_id=getattr(main, "rfc", "") or "", programa="IMMEX" if (prog and prog.program) else "", autorizacion=prog.program_number if prog else "", prosec=prog.prosec_authorization if (prog and prog.prosec and prog.prosec_authorization) else "", diff --git a/backend/api/v1/modules/a76/reports/importacion/facturas/usa/service.py b/backend/api/v1/modules/a76/reports/importacion/facturas/usa/service.py index 951a3135..9bd7c40d 100644 --- a/backend/api/v1/modules/a76/reports/importacion/facturas/usa/service.py +++ b/backend/api/v1/modules/a76/reports/importacion/facturas/usa/service.py @@ -153,11 +153,7 @@ class FacturaImportacionUsaService: ciudad=(addr.city or "") if addr else "", estado=(addr.state or "") if addr else "", pais=(addr.country or "USA") if addr else "USA", - tax_id=( - prog.tax_id - if (prog and prog.tax_id) - else (getattr(main, "rfc", "") or "") - ), + tax_id=getattr(main, "rfc", "") or "", programa="IMMEX" if (prog and prog.program) else "", autorizacion=prog.program_number if prog else "", prosec=( diff --git a/backend/api/v1/modules/a76/reports/importacion/packing_list/service.py b/backend/api/v1/modules/a76/reports/importacion/packing_list/service.py index 7238e369..8a74bbb3 100644 --- a/backend/api/v1/modules/a76/reports/importacion/packing_list/service.py +++ b/backend/api/v1/modules/a76/reports/importacion/packing_list/service.py @@ -103,7 +103,7 @@ class PackingListService: ciudad=(addr.city or "") if addr else "", estado=(addr.state or "") if addr else "", pais=(addr.country or "MEX") if addr else "MEX", - tax_id=prog.tax_id if (prog and prog.tax_id) else (getattr(main, 'rfc', "") or ""), + tax_id=getattr(main, "rfc", "") or "", programa="IMMEX" if (prog and prog.program) else "", autorizacion=prog.program_number if prog else "", prosec=prog.prosec_authorization if (prog and prog.prosec and prog.prosec_authorization) else "", diff --git a/backend/api/v1/modules/a76/reports/movements/invoices/services/database_helpers.py b/backend/api/v1/modules/a76/reports/movements/invoices/services/database_helpers.py index e6ab3db8..77954f96 100644 --- a/backend/api/v1/modules/a76/reports/movements/invoices/services/database_helpers.py +++ b/backend/api/v1/modules/a76/reports/movements/invoices/services/database_helpers.py @@ -108,22 +108,24 @@ class DatabaseHelper: if not client_code: return {"name": None, "rfc": None, "tax_id": None} - client_type = 'PROVIDER' if is_supplier else 'CLIENT' + # In our schema, enum values are lowercase: 'client', 'provider', 'both' + client_type = 'provider' if is_supplier else 'client' try: sql = text(""" - SELECT cp.name, cp.rfc, cpp.tax_id + SELECT cp.name, cp.rfc FROM a76.clients_and_providers cp - LEFT JOIN a76.clients_and_providers_programs cpp ON cpp.client_id = cp.id - WHERE cp.id = :client_code AND cp.client_or_provider = :client_type + WHERE cp.id = :client_code + AND (cp.client_or_provider = :client_type OR cp.client_or_provider = 'both') """) result = db.execute(sql, {"client_code": client_code, "client_type": client_type}).fetchone() if result: + # Unified identifier: cp.rfc contains either RFC (national) or TAX-ID (foreign) return { "name": result[0], "rfc": result[1], - "tax_id": result[2] + "tax_id": result[1], } else: logger.debug(f"Client {client_code} not found as {client_type}") diff --git a/frontend/src/lib/api/dashboard/a76/clients-providers.ts b/frontend/src/lib/api/dashboard/a76/clients-providers.ts index 3b904f29..ea7c2026 100644 --- a/frontend/src/lib/api/dashboard/a76/clients-providers.ts +++ b/frontend/src/lib/api/dashboard/a76/clients-providers.ts @@ -25,7 +25,6 @@ export interface ClientProviderPrograms { secon_auth_date?: number | null; // YYYYMMDD prosec?: number | null; manufacturer_id?: string | null; - tax_id?: string | null; ctpat_svi?: string | null; is_certified_company?: string | null; } @@ -45,8 +44,6 @@ export interface ClientProvider { responsible?: string | null; position?: string | null; - // Booleanos (Coincidiendo con la BD) - is_national_provider?: boolean | null; is_active?: boolean; // Relaciones Anidadas diff --git a/frontend/src/lib/components/dashboard/clients_and_providers/columns.ts b/frontend/src/lib/components/dashboard/clients_and_providers/columns.ts index b6dc5529..a779f66a 100644 --- a/frontend/src/lib/components/dashboard/clients_and_providers/columns.ts +++ b/frontend/src/lib/components/dashboard/clients_and_providers/columns.ts @@ -17,7 +17,7 @@ export function createColumns(onSuccess) { }, { accessorKey: "rfc", - header: "RFC", + header: "RFC / TAX-ID", cell: ({ row }) => { const snippet = createRawSnippet((getData) => { const { val } = getData(); diff --git a/frontend/src/lib/components/dashboard/clients_and_providers/create-edit-dialog.svelte b/frontend/src/lib/components/dashboard/clients_and_providers/create-edit-dialog.svelte index 811cba86..469de742 100644 --- a/frontend/src/lib/components/dashboard/clients_and_providers/create-edit-dialog.svelte +++ b/frontend/src/lib/components/dashboard/clients_and_providers/create-edit-dialog.svelte @@ -21,21 +21,26 @@ rfc: "", name: "", curp: "", - residence_country: "", - domicile_fiscal: "", - foreign_tax_id: "", + type_nat_foreign: "N", client_or_provider: "client", is_active: true, // Address fields - street: "", + streets: "", + exterior_number: "", + interior_number: "", neighborhood: "", + municipality: "", city: "", state: "", country: "", - zip_code: "", - // Programs fields - program_code: "", - authorization_date: "" + postal_code: "", + email: "", + phone: "", + contact: "", + // Programs fields (subset) + program: "", + program_number: "", + manufacturer_id: "" }); let loading = $state(false); @@ -48,43 +53,59 @@ rfc: item.rfc, name: item.name, curp: item.curp || "", - residence_country: item.residence_country || "", - domicile_fiscal: item.domicile_fiscal || "", - foreign_tax_id: item.foreign_tax_id || "", + type_nat_foreign: item.type_nat_foreign || "N", client_or_provider: item.client_or_provider || "client", is_active: item.is_active ?? true, - street: item.address?.street || "", + streets: item.address?.streets || "", + exterior_number: item.address?.exterior_number || "", + interior_number: item.address?.interior_number || "", neighborhood: item.address?.neighborhood || "", + municipality: item.address?.municipality || "", city: item.address?.city || "", state: item.address?.state || "", country: item.address?.country || "", - zip_code: item.address?.zip_code || "", - program_code: item.programs?.program_code || "", - authorization_date: item.programs?.authorization_date || "" + postal_code: item.address?.postal_code || "", + email: item.address?.email || "", + phone: item.address?.phone || "", + contact: item.address?.contact || "", + program: item.programs?.program || "", + program_number: item.programs?.program_number || "", + manufacturer_id: item.programs?.manufacturer_id || "" }; } else { formData = { rfc: "", name: "", curp: "", - residence_country: "", - domicile_fiscal: "", - foreign_tax_id: "", + type_nat_foreign: "N", client_or_provider: "client", is_active: true, - street: "", + streets: "", + exterior_number: "", + interior_number: "", neighborhood: "", + municipality: "", city: "", state: "", country: "", - zip_code: "", - program_code: "", - authorization_date: "" + postal_code: "", + email: "", + phone: "", + contact: "", + program: "", + program_number: "", + manufacturer_id: "" }; } }); const isEditing = $derived(!!item); + const isForeign = $derived((formData.type_nat_foreign || "N").toUpperCase() === "E"); + + // Validación de formato: RFC (Nacional) o TAX-ID (Extranjero) + const RFC_REGEX = /^[A-Z&Ñ]{3,4}\d{6}[A-Z0-9]{3}$/i; + // TAX-ID: 2 dígitos, guión, resto alfanumérico. Ej: 12-3456789. Máx 30 caracteres. + const TAX_ID_REGEX = /^\d{2}-[A-Z0-9]{1,27}$/i; async function handleSubmit(e: Event) { e.preventDefault(); @@ -94,6 +115,19 @@ return; } + const rfcVal = (formData.rfc || "").trim(); + if (isForeign) { + if (!TAX_ID_REGEX.test(rfcVal)) { + error = "El TAX-ID debe tener formato: 2 dígitos, guión y resto (ej. 12-3456789). Máx 30 caracteres."; + return; + } + } else { + if (!RFC_REGEX.test(rfcVal)) { + error = "El RFC no tiene el formato correcto. Ejemplo: XAXX010101000."; + return; + } + } + loading = true; error = null; @@ -104,23 +138,27 @@ rfc: formData.rfc, name: formData.name, curp: formData.curp || null, - residence_country: formData.residence_country || null, - domicile_fiscal: formData.domicile_fiscal || null, - foreign_tax_id: formData.foreign_tax_id || null, client_or_provider: formData.client_or_provider as "client" | "provider" | "both" | null, + type_nat_foreign: (formData.type_nat_foreign || null) as any, is_active: formData.is_active, address: { - street: formData.street || null, + streets: formData.streets || null, + exterior_number: formData.exterior_number || null, + interior_number: formData.interior_number || null, neighborhood: formData.neighborhood || null, + municipality: formData.municipality || null, city: formData.city || null, state: formData.state || null, country: formData.country || null, - zip_code: formData.zip_code || null, + postal_code: formData.postal_code || null, + email: formData.email || null, + phone: formData.phone || null, + contact: formData.contact || null, }, programs: { - program_code: formData.program_code || null, - authorization_date: formData.authorization_date || null, - + program: formData.program || null, + program_number: formData.program_number || null, + manufacturer_id: formData.manufacturer_id || null, } }; response = await clientsProvidersApi.update(item.id, companyStore.activeCompany.id, payload); @@ -129,22 +167,27 @@ rfc: formData.rfc, name: formData.name, curp: formData.curp || null, - residence_country: formData.residence_country || null, - domicile_fiscal: formData.domicile_fiscal || null, - foreign_tax_id: formData.foreign_tax_id || null, client_or_provider: formData.client_or_provider as "client" | "provider" | "both" | null, + type_nat_foreign: (formData.type_nat_foreign || null) as any, is_active: formData.is_active, address: { - street: formData.street || null, + streets: formData.streets || null, + exterior_number: formData.exterior_number || null, + interior_number: formData.interior_number || null, neighborhood: formData.neighborhood || null, + municipality: formData.municipality || null, city: formData.city || null, state: formData.state || null, country: formData.country || null, - zip_code: formData.zip_code || null, + postal_code: formData.postal_code || null, + email: formData.email || null, + phone: formData.phone || null, + contact: formData.contact || null, }, programs: { - program_code: formData.program_code || null, - authorization_date: formData.authorization_date || null, + program: formData.program || null, + program_number: formData.program_number || null, + manufacturer_id: formData.manufacturer_id || null, } }; response = await clientsProvidersApi.create(companyStore.activeCompany.id, payload); @@ -182,19 +225,24 @@ rfc: "", name: "", curp: "", - residence_country: "", - domicile_fiscal: "", - foreign_tax_id: "", + type_nat_foreign: "N", client_or_provider: "client", is_active: true, - street: "", + streets: "", + exterior_number: "", + interior_number: "", neighborhood: "", + municipality: "", city: "", state: "", country: "", - zip_code: "", - program_code: "", - authorization_date: "" + postal_code: "", + email: "", + phone: "", + contact: "", + program: "", + program_number: "", + manufacturer_id: "" }; error = null; } @@ -226,14 +274,27 @@

Información Básica

-
+
- + + +
+
+ @@ -292,48 +353,45 @@
- -
-

Información Fiscal

- -
- - -
- -
- - -
-
-

Dirección

- +
+
+
+ + +
+ +
+ + +
+
+
@@ -347,10 +405,10 @@
- +
+
+ + +
+
+ +
+
+ + +
+
+ + +
+
+ +
+ + +

Programas

-
+
- +
- + +
+ +
+ +
diff --git a/frontend/src/lib/components/dashboard/clients_and_providers/data-table-actions.svelte b/frontend/src/lib/components/dashboard/clients_and_providers/data-table-actions.svelte index 03550b05..291753a7 100644 --- a/frontend/src/lib/components/dashboard/clients_and_providers/data-table-actions.svelte +++ b/frontend/src/lib/components/dashboard/clients_and_providers/data-table-actions.svelte @@ -2,7 +2,7 @@ import EllipsisIcon from "@lucide/svelte/icons/ellipsis"; import { Button } from "$lib/components/ui/button/index.js"; import * as DropdownMenu from "$lib/components/ui/dropdown-menu/index.js"; - import type { ClientProvider } from "./columns.js"; + import type { ClientProvider } from "$lib/api/dashboard/a76/clients-providers"; import DetailsDialog from "./details-dialog.svelte"; import DeleteDialog from "./delete-dialog.svelte"; import { clientsProvidersApi } from "$lib/api/dashboard/a76/clients-providers"; @@ -29,6 +29,9 @@ navigator.clipboard.writeText(item.rfc); } + const isForeign = (cp: ClientProvider) => + (cp.type_nat_foreign || "N").toUpperCase() === "E"; + function handleViewDetails() { showDetailsDialog = true; } @@ -77,7 +80,7 @@ Copiar ID - Copiar RFC + Copiar {isForeign(item) ? 'TAX-ID' : 'RFC'} diff --git a/frontend/src/lib/components/dashboard/clients_and_providers/delete-dialog.svelte b/frontend/src/lib/components/dashboard/clients_and_providers/delete-dialog.svelte index f0b8d48c..3cfe2b5f 100644 --- a/frontend/src/lib/components/dashboard/clients_and_providers/delete-dialog.svelte +++ b/frontend/src/lib/components/dashboard/clients_and_providers/delete-dialog.svelte @@ -51,6 +51,9 @@ } open = newOpen; } + + const isForeign = (cp: ClientProvider) => + (cp.type_nat_foreign || "N").toUpperCase() === "E"; @@ -66,7 +69,7 @@ {item.id}
- RFC: + {item ? (isForeign(item) ? 'TAX-ID:' : 'RFC:') : 'RFC:'} {item.rfc}
diff --git a/frontend/src/lib/components/dashboard/clients_and_providers/details-dialog.svelte b/frontend/src/lib/components/dashboard/clients_and_providers/details-dialog.svelte index fe478312..3b86bd06 100644 --- a/frontend/src/lib/components/dashboard/clients_and_providers/details-dialog.svelte +++ b/frontend/src/lib/components/dashboard/clients_and_providers/details-dialog.svelte @@ -15,6 +15,9 @@ function handleOpenChange(newOpen: boolean) { open = newOpen; } + + const isForeign = (cp: ClientProvider) => + (cp.type_nat_foreign || "N").toUpperCase() === "E"; @@ -39,7 +42,9 @@
- RFC + + {isForeign(item) ? "TAX-ID" : "RFC"} + {item.rfc}
@@ -63,7 +68,7 @@

Clasificación

-
+
Tipo {#if item.client_or_provider === 'client'} @@ -82,6 +87,13 @@ No especificado {/if}
+ +
+ Procedencia + + {isForeign(item) ? "Extranjero" : "Nacional"} + +
Estado @@ -100,44 +112,16 @@
- -
-

Información Fiscal

- - {#if item.residence_country} -
- País de Residencia - {item.residence_country} -
- {/if} - - {#if item.domicile_fiscal} -
- Domicilio Fiscal - {item.domicile_fiscal} -
- {/if} - - {#if item.foreign_tax_id} -
- ID Fiscal Extranjero - {item.foreign_tax_id} -
- {/if} - - -
- {#if item.address}

Dirección

- {#if item.address.street} + {#if item.address.streets}
- Calle - {item.address.street} + Calles + {item.address.streets}
{/if} @@ -149,15 +133,22 @@
{/if} - {#if item.address.zip_code} + {#if item.address.postal_code}
Código Postal - {item.address.zip_code} + {item.address.postal_code}
{/if}
+ {#if item.address.municipality} +
+ Municipio + {item.address.municipality} +
+ {/if} + {#if item.address.city}
Ciudad @@ -179,6 +170,29 @@ {item.address.country}
{/if} + + {#if item.address.email || item.address.phone || item.address.contact} +
+ {#if item.address.email} +
+ Email + {item.address.email} +
+ {/if} + {#if item.address.phone} +
+ Teléfono + {item.address.phone} +
+ {/if} + {#if item.address.contact} +
+ Contacto + {item.address.contact} +
+ {/if} +
+ {/if}
@@ -190,17 +204,27 @@

Programas

- {#if item.programs.program_code} + {#if item.programs.program}
- Código de Programa - {item.programs.program_code} + Programa + {item.programs.program}
{/if} - {#if item.programs.authorization_date} -
- Fecha de Autorización - {new Date(item.programs.authorization_date).toLocaleDateString()} + {#if item.programs.program_number || item.programs.manufacturer_id} +
+ {#if item.programs.program_number} +
+ Número + {item.programs.program_number} +
+ {/if} + {#if item.programs.manufacturer_id} +
+ Manufacturer ID + {item.programs.manufacturer_id} +
+ {/if}
{/if}
diff --git a/frontend/src/routes/dashboard/clients_and_providers/+page.svelte b/frontend/src/routes/dashboard/clients_and_providers/+page.svelte index f38de0c8..48bbd5c1 100644 --- a/frontend/src/routes/dashboard/clients_and_providers/+page.svelte +++ b/frontend/src/routes/dashboard/clients_and_providers/+page.svelte @@ -118,6 +118,12 @@ selectedItem = item; } + function taxIdOrRfcLabel(cp: ClientProvider | null): string { + if (!cp) return 'RFC'; + const proc = (cp.type_nat_foreign || 'N').toUpperCase(); + return proc === 'E' ? 'TAX-ID' : 'RFC'; + } + function handleEdit() { if (selectedItem) goto(`/dashboard/clients_and_providers/edit/${selectedItem.id}`); } @@ -182,7 +188,7 @@

Filtros

- Busque por nombre, RFC o tipo + Busque por nombre, RFC/TAX-ID o tipo
@@ -195,10 +201,10 @@ />
- + e.key === 'Enter' && handleSearch()} /> @@ -249,7 +255,7 @@ # - RFC + RFC / TAX-ID Nombre Tipo Estatus @@ -352,6 +358,7 @@ {selectedItem?.name || '---'}
+ {taxIdOrRfcLabel(selectedItem)}: {selectedItem?.rfc || ''}
@@ -434,10 +441,6 @@ Número {selectedItem.programs.program_number || '-'}
-
- TAX ID - {selectedItem.programs.tax_id || '-'} -
{/if} diff --git a/frontend/src/routes/dashboard/clients_and_providers/edit/[[id]]/+page.svelte b/frontend/src/routes/dashboard/clients_and_providers/edit/[[id]]/+page.svelte index 991a2507..0a10a0b0 100644 --- a/frontend/src/routes/dashboard/clients_and_providers/edit/[[id]]/+page.svelte +++ b/frontend/src/routes/dashboard/clients_and_providers/edit/[[id]]/+page.svelte @@ -73,7 +73,6 @@ responsible: '', position: '', is_active: true, - is_national_provider: false, streets: '', exterior_number: '', @@ -94,7 +93,6 @@ authorization_date_str: '', // String para input date prosec: '', manufacturer_id: '', - tax_id: '', ctpat_svi: '', is_certified_company: false }); @@ -152,7 +150,6 @@ responsible: item.responsible || '', position: item.position || '', is_active: !!item.is_active, - is_national_provider: !!item.is_national_provider, streets: addr.streets || '', exterior_number: addr.exterior_number || '', @@ -172,7 +169,6 @@ authorization_date_str: intDateToString(prog.secon_auth_date), prosec: prog.prosec ? String(prog.prosec) : '', manufacturer_id: prog.manufacturer_id || '', - tax_id: prog.tax_id || '', ctpat_svi: prog.ctpat_svi || '', is_certified_company: prog.is_certified_company === '1' }; @@ -185,6 +181,11 @@ } } + // Validación de formato: RFC (Nacional) o TAX-ID (Extranjero) + const RFC_REGEX = /^[A-Z&Ñ]{3,4}\d{6}[A-Z0-9]{3}$/i; + // TAX-ID: 2 dígitos, guión, resto alfanumérico. Ej: 12-3456789. Máx 30 caracteres. + const TAX_ID_REGEX = /^\d{2}-[A-Z0-9]{1,27}$/i; + // --- ENVÍO DE DATOS --- async function handleSubmit() { if (!companyStore.activeCompany) { @@ -193,11 +194,27 @@ return; } if (!formData.rfc.trim() || !formData.name.trim()) { - error = 'RFC y Nombre obligatorios'; + error = 'Identificador fiscal (RFC/TAX-ID) y Nombre son obligatorios'; toast.error(error); return; } + const rfcVal = formData.rfc.trim(); + const isForeign = (formData.type_nat_foreign || 'N').toUpperCase() === 'E'; + if (isForeign) { + if (!TAX_ID_REGEX.test(rfcVal)) { + error = 'El TAX-ID debe tener formato: 2 dígitos, guión y resto (ej. 12-3456789). Máx 30 caracteres.'; + toast.error(error); + return; + } + } else { + if (!RFC_REGEX.test(rfcVal)) { + error = 'El RFC no tiene el formato correcto. Ejemplo: XAXX010101000.'; + toast.error(error); + return; + } + } + loading = true; error = null; @@ -213,7 +230,6 @@ responsible: clean(formData.responsible), position: clean(formData.position), is_active: formData.is_active, - is_national_provider: formData.is_national_provider, address: { streets: clean(formData.streets), @@ -236,7 +252,6 @@ secon_auth_date: stringDateToInt(formData.authorization_date_str), prosec: clean(formData.prosec), manufacturer_id: clean(formData.manufacturer_id), - tax_id: clean(formData.tax_id), ctpat_svi: clean(formData.ctpat_svi), is_certified_company: formData.is_certified_company ? '1' : '0' } @@ -333,12 +348,12 @@
- +
@@ -659,19 +674,6 @@
-
- - -
-
- -
- -

Marcar si es un proveedor nacional

-
-