diff --git a/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue b/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue index 3fd3104bf..e6c689523 100644 --- a/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue +++ b/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue @@ -115,6 +115,9 @@ onMounted(async () => { [ @@ -464,6 +465,7 @@ watch( color="primary" name="vn:agency-term" size="xs" + class="q-mr-xs" > @@ -482,6 +484,14 @@ watch( + + {{ t('advanceTickets.clonedSales') }} + @@ -182,6 +192,7 @@ en: ipt: Destination IPT isFullMovable: 100% movable warehouseFk: Warehouse + onlyWithDestination: Only with destination es: Horizontal: Horizontal Vertical: Vertical @@ -193,4 +204,5 @@ es: ipt: IPT destino isFullMovable: 100% movible warehouseFk: Almacén + onlyWithDestination: Solo con destino diff --git a/src/pages/Ticket/locale/en.yml b/src/pages/Ticket/locale/en.yml index 56cc798ba..f11b32c3a 100644 --- a/src/pages/Ticket/locale/en.yml +++ b/src/pages/Ticket/locale/en.yml @@ -53,6 +53,7 @@ advanceTickets: errorsList: Errors list search: Search advance tickets searchInfo: Search advance tickets by ID or client ID + clonedSales: Has turn lines futureTickets: problems: Problems shipped: Date diff --git a/src/pages/Ticket/locale/es.yml b/src/pages/Ticket/locale/es.yml index bb068ac5b..945da8367 100644 --- a/src/pages/Ticket/locale/es.yml +++ b/src/pages/Ticket/locale/es.yml @@ -91,6 +91,7 @@ advanceTickets: errorsList: Lista de errores search: Buscar por tickets adelantados searchInfo: Buscar tickets adelantados por el identificador o el identificador del cliente + clonedSales: Tiene líneas de turno futureTickets: problems: Problemas shipped: Fecha diff --git a/src/stores/invoiceOutGlobal.js b/src/stores/invoiceOutGlobal.js index 332494aa8..cc8d86ea8 100644 --- a/src/stores/invoiceOutGlobal.js +++ b/src/stores/invoiceOutGlobal.js @@ -19,7 +19,7 @@ export const useInvoiceOutGlobalStore = defineStore({ maxShipped: null, clientId: null, printer: null, - serialType: null, + serialType: 'global', }, addresses: [], minInvoicingDate: null, @@ -41,7 +41,6 @@ export const useInvoiceOutGlobalStore = defineStore({ async fetchAllData() { try { - const userInfo = await useUserConfig().fetch(); const date = Date.vnNew(); this.formInitialData.maxShipped = new Date( date.getFullYear(), @@ -53,7 +52,7 @@ export const useInvoiceOutGlobalStore = defineStore({ await Promise.all([ this.fetchParallelism(), - this.fetchInvoiceOutConfig(userInfo.companyFk), + this.fetchInvoiceOutConfig(), ]); this.initialDataLoading = false; @@ -62,21 +61,23 @@ export const useInvoiceOutGlobalStore = defineStore({ } }, - async fetchInvoiceOutConfig(companyFk) { + async fetchInvoiceOutConfig(formData = this.formInitialData) { try { - this.formInitialData.companyFk = companyFk; - const params = { companyFk: companyFk }; + const userInfo = await useUserConfig().fetch(); + const params = { + companyFk: userInfo.companyFk, + serialType: formData.serialType, + }; const { data } = await axios.get('InvoiceOuts/getInvoiceDate', { params, }); - const stringDate = data.issued.substring(0, 10); - this.minInvoicingDate = stringDate; - this.formInitialData.invoiceDate = stringDate; - - this.minInvoicingDate = new Date(data.issued); + this.minInvoicingDate = data?.issued + ? new Date(data.issued) + : Date.vnNew(); this.formInitialData.invoiceDate = this.minInvoicingDate; + formData.invoiceDate = this.minInvoicingDate; } catch (err) { console.error('Error fetching invoice out global initial data'); throw new Error();