diff --git a/frontend/src/lib/components/dashboard/invoices/edit/others-tab-form.svelte b/frontend/src/lib/components/dashboard/invoices/edit/others-tab-form.svelte
index 4a153cd8..4752a40b 100644
--- a/frontend/src/lib/components/dashboard/invoices/edit/others-tab-form.svelte
+++ b/frontend/src/lib/components/dashboard/invoices/edit/others-tab-form.svelte
@@ -4,7 +4,7 @@
import { Label } from '$lib/components/ui/label';
import { Button } from '$lib/components/ui/button';
import { Checkbox } from '$lib/components/ui/checkbox';
- import { RadioGroup, RadioGroupItem } from '$lib/components/ui/radio-group';
+ import * as RadioGroup from '$lib/components/ui/radio-group';
import * as Select from '$lib/components/ui/select';
import { Textarea } from '$lib/components/ui/textarea';
import { Plus, Upload } from 'lucide-svelte';
@@ -15,13 +15,15 @@
formData = $bindable(),
exists = $bindable(),
transportModes = [],
- operationType = undefined
+ operationType = undefined,
+ invoiceType = undefined
}: {
invoice: Invoice | null;
formData?: any;
exists?: boolean;
transportModes?: any[];
operationType?: number;
+ invoiceType?: string;
} = $props();
if (!formData && invoice) {
@@ -30,9 +32,11 @@
comments_status: invoice.comments_status || '',
// Campos que van en diferentes recursos pero se editan aquí
transport_mode: invoice.logistics?.transport_mode || null,
- is_mixed: invoice.compliance_mx?.is_mixed || null,
+ is_mixed: invoice.compliance_mx?.is_mixed ? 'si' : 'no',
print_stamp: invoice.financials?.seal_value_2500 || false,
- rule_3121_parties_ii: false,
+ rule_3121_parties_ii: invoice.compliance_mx?.rule_3121_parties_ii || false,
+ // Errores (Copied from Continuation Tab)
+ errores_facturacion: [],
related_doc_id: invoice.related_doc_id || null,
code_signature: invoice.compliance_mx?.signature_key || '',
electronic_signature: invoice.compliance_mx?.electronic_signature || '',
@@ -64,6 +68,8 @@
is_mixed: null,
print_stamp: false,
rule_3121_parties_ii: false,
+ // Errores
+ errores_facturacion: [],
related_doc_id: null,
code_signature: '',
electronic_signature: '',
@@ -94,231 +100,280 @@
// Función para cargar información
console.log('Cargar información');
}
+
+ $effect(() => {
+ console.log('OthersTabForm props:', {
+ invoiceType,
+ operationType,
+ isMixed: formData.is_mixed,
+ rule: formData.rule_3121_parties_ii
+ });
+ });
-
-
-
-
-
- (formData.transport_mode = value || 'TRUCK')}
- >
-
- {transportModes.find((m) => m.key === formData.transport_mode)?.name ||
- 'Seleccionar modo'}
-
-
- {#each transportModes as mode}
-
- {mode.name}
-
- {/each}
-
-
-
-
- {#if operationType !== 1}
-
+{#if invoiceType !== 'MEX'}
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
(formData.is_mixed = v === 'yes')}
- class="flex gap-4"
- >
-
-
-
-
-
-
-
-
-
-
-
- {:else}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
(formData.option_iv18 = v || '')}
+ value={formData.transport_mode}
+ onValueChange={(value: string | undefined) =>
+ (formData.transport_mode = value || 'TRUCK')}
>
-
- {formData.option_iv18 || 'Seleccionar opción'}
+
+ {transportModes.find((m) => m.key === formData.transport_mode)?.name ||
+ 'Seleccionar modo'}
- Opción 1
-
+ {#each transportModes as mode}
+
+ {mode.name}
+
+ {/each}
-
-
-
- Datos Entrega
-
-
-
-
-
+ {#if operationType !== 1 && invoiceType !== 'MEX'}
+
-
-
-
-
-
-
-
-
- {/if}
-
- {#if operationType !== 1}
-
-
-
-
- {/if}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
+ {#if invoiceType !== 'CR' && invoiceType !== 'REP' && invoiceType !== 'REPAR'}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {/if}
+ {/if}
+
+ {#if (operationType === 1 || invoiceType === 'CR') && invoiceType !== 'REP' && invoiceType !== 'REPAR'}
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+ (formData.option_iv18 = v || '')}
+ >
+
+ {formData.option_iv18 || 'Seleccionar opción'}
+
+
+ Opción 1
+
+
-
+
+
+
+ Datos Entrega
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {/if}
+
+ {#if operationType !== 1 && invoiceType !== 'CR' && invoiceType !== 'REP' && invoiceType !== 'REPAR'}
+
+
+
+
+ {/if}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+{:else}
+
+
Errores de Facturación
+
+
+
+
+
+ | Línea |
+ Clave |
+ Descripción |
+
+
+
+ {#if formData.errores_facturacion?.length}
+ {#each formData.errores_facturacion as error}
+
+ | {error.linea} |
+ {error.clave} |
+ {error.descripcion} |
+
+ {/each}
+ {:else}
+
+ |
+ Sin errores registrados
+ |
+
+ {/if}
+
+
+
+
+
+
+
+
+
+
+{/if}
diff --git a/frontend/src/lib/components/dashboard/invoices/edit/save-invoice.ts b/frontend/src/lib/components/dashboard/invoices/edit/save-invoice.ts
index 59586a2c..aa8070a8 100644
--- a/frontend/src/lib/components/dashboard/invoices/edit/save-invoice.ts
+++ b/frontend/src/lib/components/dashboard/invoices/edit/save-invoice.ts
@@ -57,7 +57,7 @@ export async function saveInvoice(options: SaveInvoiceOptions): Promise
{
@@ -611,32 +619,36 @@
currentStatusFunction = null;
}
- // --- AQUÍ PASAMOS LA FUNCIÓN DE DESCARGA A LAS COLUMNAS ---
- const columns = createColumns(handleSuccess);
- async function handleModalConfirm(type: string, format: string, currency: string, uomSource: string, weightUnit: string) {
- if (!selectedInvoice || !companyStore.activeCompany) return;
+ // --- AQUÍ PASAMOS LA FUNCIÓN DE DESCARGA A LAS COLUMNAS ---
+ const columns = createColumns(handleSuccess);
+ async function handleModalConfirm(
+ type: string,
+ format: string,
+ currency: string,
+ uomSource: string,
+ weightUnit: string
+ ) {
+ if (!selectedInvoice || !companyStore.activeCompany) return;
- try {
- // 1. Trigger: Start celery task with selected options
- // Note: uomSource and weightUnit are UI-only for now
- const { task_id } = await invoicesReportsApi.triggerPdfGeneration(
- selectedInvoice.id,
- companyStore.activeCompany.id,
- type,
- currency
- );
-
- // 2. Open Progress Dialog
- currentTaskId = task_id;
- currentStatusFunction = invoicesReportsApi.getTaskStatus;
- showProgressDialog = true;
-
- } catch (error) {
- console.error(error);
- toast.error("No se pudo iniciar la descarga");
- }
- }
+ try {
+ // 1. Trigger: Start celery task with selected options
+ // Note: uomSource and weightUnit are UI-only for now
+ const { task_id } = await invoicesReportsApi.triggerPdfGeneration(
+ selectedInvoice.id,
+ companyStore.activeCompany.id,
+ type,
+ currency
+ );
+ // 2. Open Progress Dialog
+ currentTaskId = task_id;
+ currentStatusFunction = invoicesReportsApi.getTaskStatus;
+ showProgressDialog = true;
+ } catch (error) {
+ console.error(error);
+ toast.error('No se pudo iniciar la descarga');
+ }
+ }
@@ -659,13 +671,13 @@
>
-
+
@@ -521,7 +539,11 @@
-
+
General
@@ -538,10 +560,12 @@
Otros
-
-
- Cont.
-
+ {#if invoiceType !== 'MEX'}
+
+
+ Cont.
+
+ {/if}