Merge branch 'dev' into 8004-liliumStyleRemake

src/pages/InvoiceOut/InvoiceOutGlobalForm.vue

@@ -115,6 +115,9 @@ onMounted(async () => {
             <VnSelect
                 :label="t('invoiceOutSerialType')"
                 v-model="formData.serialType"
+                @update:model-value="
+                    invoiceOutGlobalStore.fetchInvoiceOutConfig(formData)
+                "
                 :options="serialTypesOptions"
                 option-value="type"
                 option-label="type"

src/pages/Ticket/TicketAdvance.vue

@@ -37,6 +37,7 @@ const userParams = reactive({
     ipt: 'H',
     futureIpt: 'H',
     isFullMovable: true,
+    onlyWithDestination: true,
 });
 
 const ticketColumns = computed(() => [
@@ -464,6 +465,7 @@ watch(
                     color="primary"
                     name="vn:agency-term"
                     size="xs"
+                    class="q-mr-xs"
                 >
                     <QTooltip class="column">
                         <span>
@@ -482,6 +484,14 @@ watch(
                         </span>
                     </QTooltip>
                 </QIcon>
+                <QIcon
+                    v-if="row.saleClonedFk"
+                    color="primary"
+                    name="content_copy"
+                    size="xs"
+                >
+                    <QTooltip>{{ t('advanceTickets.clonedSales') }}</QTooltip>
+                </QIcon>
             </template>
             <template #column-id="{ row }">
                 <QBtn flat class="link">

src/pages/Ticket/TicketAdvanceFilter.vue

@@ -168,6 +168,16 @@ onMounted(async () => await getItemPackingTypes());
                     </VnSelect>
                 </QItemSection>
             </QItem>
+            <QItem>
+                <QItemSection>
+                    <QCheckbox
+                        toggle-indeterminate
+                        label="only with destination"
+                        v-model="params.onlyWithDestination"
+                        @update:model-value="searchFn()"
+                    />
+                </QItemSection>
+            </QItem>
         </template>
     </VnFilterPanel>
 </template>
@@ -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
 </i18n>

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

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

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 userInfo = await useUserConfig().fetch();
-                const params = { companyFk: companyFk };
+                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 = data?.issued
-                this.minInvoicingDate = stringDate;
+                    ? new Date(data.issued)
-                this.formInitialData.invoiceDate = stringDate;
+                    : Date.vnNew();
-
-                this.minInvoicingDate = new Date(data.issued);
                 this.formInitialData.invoiceDate = this.minInvoicingDate;
+                formData.invoiceDate = this.minInvoicingDate;
             } catch (err) {
                 console.error('Error fetching invoice out global initial data');
                 throw new Error();