From cdbbd576e379a45344c2c648217fa075e9b3ecc6 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Tue, 2 Jul 2024 14:54:14 +0200
Subject: [PATCH 1/7] refactor: refs #6899 end invoiceOut migration with
 VnTable

---
 src/components/CreateManualInvoiceForm.vue    |  25 +-
 src/components/TransferInvoiceForm.vue        | 167 ++++----
 src/components/VnTable/VnTable.vue            |  16 +-
 src/components/ui/CardDescriptor.vue          |   5 +-
 .../InvoiceOut/Card/InvoiceOutDescriptor.vue  |   4 +-
 .../Card/InvoiceOutDescriptorMenu.vue         |  31 +-
 .../InvoiceOut/Card/InvoiceOutSummary.vue     |   8 +-
 src/pages/InvoiceOut/InvoiceOutFilter.vue     |   3 +-
 src/pages/InvoiceOut/InvoiceOutGlobal.vue     |   9 +-
 src/pages/InvoiceOut/InvoiceOutList.vue       | 379 ++++++++++--------
 .../InvoiceOut/InvoiceOutNegativeBases.vue    | 225 ++++++-----
 src/pages/InvoiceOut/locale/en.yml            |  25 ++
 src/pages/InvoiceOut/locale/es.yml            |  29 ++
 src/router/modules/invoiceOut.js              |   2 +-
 14 files changed, 527 insertions(+), 401 deletions(-)
 create mode 100644 src/pages/InvoiceOut/locale/en.yml

diff --git a/src/components/CreateManualInvoiceForm.vue b/src/components/CreateManualInvoiceForm.vue
index 92399c20c..1aa95011f 100644
--- a/src/components/CreateManualInvoiceForm.vue
+++ b/src/components/CreateManualInvoiceForm.vue
@@ -46,22 +46,6 @@ const onDataSaved = async (formData, requestResponse) => {
         @on-fetch="(data) => (taxAreasOptions = data)"
         auto-load
     />
-    <FetchData
-        url="Tickets"
-        :filter="{
-            fields: ['id', 'nickname'],
-            where: { refFk: null },
-            order: 'shipped DESC',
-        }"
-        @on-fetch="(data) => (ticketsOptions = data)"
-        auto-load
-    />
-    <FetchData
-        url="Clients"
-        :filter="{ fields: ['id', 'name'], order: 'name ASC', limit: 30 }"
-        @on-fetch="(data) => (clientsOptions = data)"
-        auto-load
-    />
     <FormModelPopup
         ref="formModelPopupRef"
         :title="t('Create manual invoice')"
@@ -84,6 +68,10 @@ const onDataSaved = async (formData, requestResponse) => {
                     option-value="id"
                     v-model="data.ticketFk"
                     @update:model-value="data.clientFk = null"
+                    url="Tickets"
+                    :where="{ refFk: null }"
+                    :fields="['id', 'nickname']"
+                    :filter-options="{ order: 'shipped DESC' }"
                 >
                     <template #option="scope">
                         <QItem v-bind="scope.itemProps">
@@ -105,6 +93,9 @@ const onDataSaved = async (formData, requestResponse) => {
                     option-value="id"
                     v-model="data.clientFk"
                     @update:model-value="data.ticketFk = null"
+                    url="Clients"
+                    :fields="['id', 'name']"
+                    :filter-options="{ order: 'name ASC' }"
                 />
                 <VnInputDate :label="t('Max date')" v-model="data.maxShipped" />
             </VnRow>
@@ -116,7 +107,6 @@ const onDataSaved = async (formData, requestResponse) => {
                     option-label="description"
                     option-value="code"
                     v-model="data.serial"
-                    :required="true"
                 />
                 <VnSelect
                     :label="t('Area')"
@@ -125,7 +115,6 @@ const onDataSaved = async (formData, requestResponse) => {
                     option-label="code"
                     option-value="code"
                     v-model="data.taxArea"
-                    :required="true"
                 />
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
diff --git a/src/components/TransferInvoiceForm.vue b/src/components/TransferInvoiceForm.vue
index 1af23583d..f307aa1f4 100644
--- a/src/components/TransferInvoiceForm.vue
+++ b/src/components/TransferInvoiceForm.vue
@@ -8,7 +8,7 @@ import VnRow from 'components/ui/VnRow.vue';
 import FetchData from 'components/FetchData.vue';
 import VnSelect from 'components/common/VnSelect.vue';
 import FormPopup from './FormPopup.vue';
-
+import { useDialogPluginComponent } from 'quasar';
 import axios from 'axios';
 import useNotify from 'src/composables/useNotify.js';
 
@@ -18,7 +18,7 @@ const $props = defineProps({
         default: () => {},
     },
 });
-
+const { dialogRef } = useDialogPluginComponent();
 const quasar = useQuasar();
 const { t } = useI18n();
 const router = useRouter();
@@ -70,14 +70,11 @@ const makeInvoice = async () => {
                     });
             });
             if (!response) {
-                console.log('entra cuando no checkbox');
                 return;
             }
         }
 
-        console.log('params: ', params);
         const { data } = await axios.post('InvoiceOuts/transferInvoice', params);
-        console.log('data: ', data);
         notify(t('Transferred invoice'), 'positive');
         const id = data?.[0];
         if (id) router.push({ name: 'InvoiceOutSummary', params: { id } });
@@ -119,90 +116,92 @@ const makeInvoice = async () => {
         @on-fetch="(data) => (invoiceCorrectionTypesOptions = data)"
         auto-load
     />
-    <FormPopup
+    <QDialog ref="dialogRef">
+        <FormPopup
         @on-submit="makeInvoice()"
         :title="t('Transfer invoice')"
         :custom-submit-button-label="t('Transfer client')"
         :default-cancel-button="false"
-    >
+        >
         <template #form-inputs>
-            <VnRow class="row q-gutter-md q-mb-md">
-                <VnSelect
-                    :label="t('Client')"
-                    :options="clientsOptions"
-                    hide-selected
-                    option-label="name"
-                    option-value="id"
-                    v-model="transferInvoiceParams.newClientFk"
-                    :required="true"
-                    url="Clients"
-                    :fields="['id', 'name', 'hasToInvoiceByAddress']"
-                    auto-load
-                >
-                    <template #option="scope">
-                        <QItem
-                            v-bind="scope.itemProps"
-                            @click="selectedClient(scope.opt)"
-                        >
-                            <QItemSection>
-                                <QItemLabel>
-                                    #{{ scope.opt?.id }} - {{ scope.opt?.name }}
-                                </QItemLabel>
-                            </QItemSection>
-                        </QItem>
-                    </template>
-                </VnSelect>
-                <VnSelect
-                    :label="t('Rectificative type')"
-                    :options="rectificativeTypeOptions"
-                    hide-selected
-                    option-label="description"
-                    option-value="id"
-                    v-model="transferInvoiceParams.cplusRectificationTypeFk"
-                    :required="true"
-                />
-            </VnRow>
-            <VnRow class="row q-gutter-md q-mb-md">
-                <VnSelect
-                    :label="t('Class')"
-                    :options="siiTypeInvoiceOutsOptions"
-                    hide-selected
-                    option-label="description"
-                    option-value="id"
-                    v-model="transferInvoiceParams.siiTypeInvoiceOutFk"
-                    :required="true"
-                >
-                    <template #option="scope">
-                        <QItem v-bind="scope.itemProps">
-                            <QItemSection>
-                                <QItemLabel>
-                                    {{ scope.opt?.code }} -
-                                    {{ scope.opt?.description }}
-                                </QItemLabel>
-                            </QItemSection>
-                        </QItem>
-                    </template>
-                </VnSelect>
-                <VnSelect
-                    :label="t('Type')"
-                    :options="invoiceCorrectionTypesOptions"
-                    hide-selected
-                    option-label="description"
-                    option-value="id"
-                    v-model="transferInvoiceParams.invoiceCorrectionTypeFk"
-                    :required="true"
-                />
-            </VnRow>
-            <VnRow class="row q-gutter-md q-mb-md">
-                <div>
-                    <QCheckbox :label="t('Bill destination client')" v-model="checked" />
-                    <QIcon name="info" class="cursor-info q-ml-sm" size="sm">
-                        <QTooltip>{{ t('transferInvoiceInfo') }}</QTooltip>
-                    </QIcon>
-                </div>
-            </VnRow>
-        </template>
-    </FormPopup>
+                <VnRow class="row q-gutter-md q-mb-md">
+                    <VnSelect
+                        :label="t('Client')"
+                        :options="clientsOptions"
+                        hide-selected
+                        option-label="name"
+                        option-value="id"
+                        v-model="transferInvoiceParams.newClientFk"
+                        :required="true"
+                        url="Clients"
+                        :fields="['id', 'name', 'hasToInvoiceByAddress']"
+                        auto-load
+                    >
+                        <template #option="scope">
+                            <QItem
+                                v-bind="scope.itemProps"
+                                @click="selectedClient(scope.opt)"
+                            >
+                                <QItemSection>
+                                    <QItemLabel>
+                                        #{{ scope.opt?.id }} - {{ scope.opt?.name }}
+                                    </QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelect>
+                    <VnSelect
+                        :label="t('Rectificative type')"
+                        :options="rectificativeTypeOptions"
+                        hide-selected
+                        option-label="description"
+                        option-value="id"
+                        v-model="transferInvoiceParams.cplusRectificationTypeFk"
+                        :required="true"
+                    />
+                </VnRow>
+                <VnRow class="row q-gutter-md q-mb-md">
+                    <VnSelect
+                        :label="t('Class')"
+                        :options="siiTypeInvoiceOutsOptions"
+                        hide-selected
+                        option-label="description"
+                        option-value="id"
+                        v-model="transferInvoiceParams.siiTypeInvoiceOutFk"
+                        :required="true"
+                    >
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection>
+                                    <QItemLabel>
+                                        {{ scope.opt?.code }} -
+                                        {{ scope.opt?.description }}
+                                    </QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelect>
+                    <VnSelect
+                        :label="t('Type')"
+                        :options="invoiceCorrectionTypesOptions"
+                        hide-selected
+                        option-label="description"
+                        option-value="id"
+                        v-model="transferInvoiceParams.invoiceCorrectionTypeFk"
+                        :required="true"
+                    />
+                </VnRow>
+                <VnRow class="row q-gutter-md q-mb-md">
+                    <div>
+                        <QCheckbox :label="t('Bill destination client')" v-model="checked" />
+                        <QIcon name="info" class="cursor-info q-ml-sm" size="sm">
+                            <QTooltip>{{ t('transferInvoiceInfo') }}</QTooltip>
+                        </QIcon>
+                    </div>
+                </VnRow>
+            </template>
+        </FormPopup>
+    </QDialog>
 </template>
 
 <i18n>
diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 493f1480e..8c00bb3f2 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -59,6 +59,10 @@ const $props = defineProps({
         type: Boolean,
         default: false,
     },
+    hasSubtoolbar: {
+        type: Boolean,
+        default: true,
+    },
 });
 const { t } = useI18n();
 const stateStore = useStateStore();
@@ -177,9 +181,12 @@ function columnName(col) {
 function getColAlign(col) {
     return 'text-' + (col.align ?? 'left')
 }
+
+const emit = defineEmits(['onFetch', 'update:selected', 'saveChanges']);
 defineExpose({
     reload,
     redirect: redirectFn,
+    selected
 });
 </script>
 <template>
@@ -225,11 +232,14 @@ defineExpose({
             :search-url="searchUrl"
             :disable-infinite-scroll="mode == TABLE_MODE"
             @save-changes="reload"
-            :has-subtoolbar="isEditable"
+            :has-subtoolbar="$attrs['hasSubtoolbar'] ?? isEditable"
         >
+            <template v-for="(_, slotName) in $slots" #[slotName]="slotData" :key="slotName">
+                <slot :name="slotName" v-bind="slotData ?? {}" :key="slotName" />
+            </template>
             <template #body="{ rows }">
                 <QTable
-                    v-bind="$attrs['QTable']"
+                    v-bind="$attrs['q-table']"
                     class="vnTable"
                     :columns="splittedColumns.columns"
                     :rows="rows"
@@ -246,6 +256,7 @@ defineExpose({
                             CrudModelRef.vnPaginateRef.paginate()
                     "
                     @row-click="(_, row) => rowClickFunction(row)"
+                    @update:selected="$emit('update:selected', $event)"
                 >
                     <template #top-left>
                         <slot name="top-left"></slot>
@@ -477,6 +488,7 @@ defineExpose({
                         default="input"
                         v-model="data[column.name]"
                         :show-label="true"
+                        component-prop="columnCreate"
                     />
                     <slot name="more-create-dialog" :data="data" />
                 </div>
diff --git a/src/components/ui/CardDescriptor.vue b/src/components/ui/CardDescriptor.vue
index 8bb2a603e..c233247bb 100644
--- a/src/components/ui/CardDescriptor.vue
+++ b/src/components/ui/CardDescriptor.vue
@@ -46,6 +46,7 @@ let arrayData;
 let store;
 let entity;
 const isLoading = ref(false);
+const menuRef = ref({});
 
 defineExpose({ getData });
 
@@ -127,9 +128,9 @@ const emit = defineEmits(['onFetch']);
                     <QTooltip>
                         {{ t('components.cardDescriptor.moreOptions') }}
                     </QTooltip>
-                    <QMenu>
+                    <QMenu ref="menuRef">
                         <QList>
-                            <slot name="menu" :entity="entity" />
+                            <slot name="menu" :entity="entity" :menu-ref="menuRef" />
                         </QList>
                     </QMenu>
                 </QBtn>
diff --git a/src/pages/InvoiceOut/Card/InvoiceOutDescriptor.vue b/src/pages/InvoiceOut/Card/InvoiceOutDescriptor.vue
index e01706e84..42b8d92d9 100644
--- a/src/pages/InvoiceOut/Card/InvoiceOutDescriptor.vue
+++ b/src/pages/InvoiceOut/Card/InvoiceOutDescriptor.vue
@@ -63,8 +63,8 @@ const setData = (entity) => (data.value = useCardDescription(entity.ref, entity.
         @on-fetch="setData"
         data-key="invoiceOutData"
     >
-        <template #menu="{ entity }">
-            <InvoiceOutDescriptorMenu :invoice-out-data="entity" />
+        <template #menu="{ entity, menuRef }">
+            <InvoiceOutDescriptorMenu :invoice-out-data="entity" :menu-ref="menuRef" />
         </template>
         <template #body="{ entity }">
             <VnLv :label="t('invoiceOut.card.issued')" :value="toDate(entity.issued)" />
diff --git a/src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue b/src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue
index 10af631bc..0d9e2aef6 100644
--- a/src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue
+++ b/src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref } from 'vue';
+import { ref, onBeforeMount } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
 import { useQuasar } from 'quasar';
@@ -11,13 +11,20 @@ import useNotify from 'src/composables/useNotify';
 import { useSession } from 'src/composables/useSession';
 import { usePrintService } from 'composables/usePrintService';
 import { useVnConfirm } from 'composables/useVnConfirm';
+import { getUrl } from 'src/composables/getUrl';
 import axios from 'axios';
 
+onBeforeMount(async () => (salixUrl.value = await getUrl('')));
+
 const $props = defineProps({
     invoiceOutData: {
         type: Object,
         default: () => {},
     },
+    menuRef: {
+        type: Object,
+        default: () => {},
+    },
 });
 
 const { notify } = useNotify();
@@ -28,8 +35,7 @@ const { t } = useI18n();
 const { openReport, sendEmail } = usePrintService();
 const { openConfirmationModal } = useVnConfirm();
 const quasar = useQuasar();
-
-const transferInvoiceDialogRef = ref();
+const salixUrl = ref();
 const invoiceFormType = ref('pdf');
 const defaultEmailAddress = ref($props.invoiceOutData.client?.email);
 
@@ -115,6 +121,7 @@ const refundInvoice = async (withWarehouse) => {
     try {
         const params = { ref: $props.invoiceOutData.ref, withWarehouse: withWarehouse };
         const { data } = await axios.post('InvoiceOuts/refund', params);
+        location.href = `${salixUrl.value}ticket/${data[0].id}/sale`;
         notify(
             t('refundInvoiceSuccessMessage', {
                 refundTicket: data[0].id,
@@ -125,11 +132,21 @@ const refundInvoice = async (withWarehouse) => {
         console.error('Error generating invoice out pdf', err);
     }
 };
+
+const showTransferInvoiceForm = async () => {
+    $props.menuRef.hide();
+    quasar.dialog({
+        component: TransferInvoiceForm,
+        componentProps: {
+            invoiceOutData: $props.invoiceOutData,
+        },
+    })
+}
 </script>
 
 <template>
-    <QItem v-ripple clickable @click="transferInvoiceDialogRef.show()">
-        <QItemSection>{{ t('Transfer invoice to...') }}</QItemSection>
+    <QItem v-ripple clickable>
+        <QItemSection @click="showTransferInvoiceForm()">{{ t('Transfer invoice to...') }}</QItemSection>
     </QItem>
     <QItem v-ripple clickable>
         <QItemSection>{{ t('Show invoice...') }}</QItemSection>
@@ -222,10 +239,6 @@ const refundInvoice = async (withWarehouse) => {
             {{ t('Create a single ticket with all the content of the current invoice') }}
         </QTooltip>
     </QItem>
-
-    <QDialog ref="transferInvoiceDialogRef">
-        <TransferInvoiceForm :invoice-out-data="invoiceOutData" />
-    </QDialog>
 </template>
 
 <i18n>
diff --git a/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue b/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue
index c773c43cf..8e344b1ca 100644
--- a/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue
+++ b/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue
@@ -3,7 +3,7 @@ import { onMounted, ref, computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import axios from 'axios';
-import { toCurrency, toDate } from 'src/filters';
+import { toCurrency, toDate, toPercentage } from 'src/filters';
 import CardSummary from 'components/ui/CardSummary.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import { getUrl } from 'src/composables/getUrl';
@@ -57,12 +57,14 @@ const taxColumns = ref([
         name: 'quantity',
         label: 'invoiceOut.summary.rate',
         field: (row) => row.rate,
+        format: (value) => toPercentage(value / 100),
         sortable: true,
     },
     {
         name: 'invoiceOuted',
         label: 'invoiceOut.summary.fee',
         field: (row) => row.vat,
+        format: (value) => toCurrency(value),
         sortable: true,
     },
 ]);
@@ -164,7 +166,7 @@ const ticketsColumns = ref([
                     </template>
                     <template #body-cell-item="{ value }">
                         <QTd>
-                            <QBtn flat color="primary">
+                            <QBtn flat class="link">
                                 {{ value }}
                                 <TicketDescriptorProxy :id="value" />
                             </QBtn>
@@ -172,7 +174,7 @@ const ticketsColumns = ref([
                     </template>
                     <template #body-cell-quantity="{ value, row }">
                         <QTd>
-                            <QBtn class="no-uppercase" flat color="primary" dense>
+                            <QBtn class="no-uppercase link" flat dense>
                                 {{ value }}
                                 <CustomerDescriptorProxy :id="row.id" />
                             </QBtn>
diff --git a/src/pages/InvoiceOut/InvoiceOutFilter.vue b/src/pages/InvoiceOut/InvoiceOutFilter.vue
index 985bfb085..103e175ec 100644
--- a/src/pages/InvoiceOut/InvoiceOutFilter.vue
+++ b/src/pages/InvoiceOut/InvoiceOutFilter.vue
@@ -41,7 +41,7 @@ function setWorkers(data) {
                 <span>{{ formatFn(tag.value) }}</span>
             </div>
         </template>
-        <template #body="{ params, searchFn }">
+        <template #body="{ params }">
             <QItem>
                 <QItemSection>
                     <VnInput
@@ -93,7 +93,6 @@ function setWorkers(data) {
                 <QItemSection>
                     <QCheckbox
                         :label="t('Has PDF')"
-                        @update:model-value="searchFn()"
                         toggle-indeterminate
                         v-model="params.hasPdf"
                     />
diff --git a/src/pages/InvoiceOut/InvoiceOutGlobal.vue b/src/pages/InvoiceOut/InvoiceOutGlobal.vue
index a01af6b4b..eecc61bc2 100644
--- a/src/pages/InvoiceOut/InvoiceOutGlobal.vue
+++ b/src/pages/InvoiceOut/InvoiceOutGlobal.vue
@@ -30,7 +30,7 @@ const selectedCustomerId = ref(null);
 const tableColumnComponents = {
     clientId: {
         component: QBtn,
-        props: { flat: true, color: 'blue' },
+        props: { flat: true, class: 'link' },
         event: (prop) => selectCustomerId(prop.value),
     },
     clientName: {
@@ -52,7 +52,12 @@ const tableColumnComponents = {
 };
 
 const columns = computed(() => [
-    { label: 'Id', field: 'clientId', name: 'clientId', align: 'left' },
+    {
+        align: 'left',
+        name: 'clientId',
+        label: 'Id',
+        field: 'clientId',
+    },
     {
         label: t('invoiceOut.globalInvoices.table.client'),
         field: 'clientName',
diff --git a/src/pages/InvoiceOut/InvoiceOutList.vue b/src/pages/InvoiceOut/InvoiceOutList.vue
index 536ee4971..40e0baf2f 100644
--- a/src/pages/InvoiceOut/InvoiceOutList.vue
+++ b/src/pages/InvoiceOut/InvoiceOutList.vue
@@ -1,74 +1,160 @@
 <script setup>
-import { onMounted, onUnmounted, ref } from 'vue';
+import { onMounted, onUnmounted, ref, computed, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { useRouter } from 'vue-router';
-
-import VnPaginate from 'src/components/ui/VnPaginate.vue';
-import InvoiceOutSummary from './Card/InvoiceOutSummary.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
+import VnInputDate from 'src/components/common/VnInputDate.vue';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
-import VnLv from 'src/components/ui/VnLv.vue';
-import CardList from 'src/components/ui/CardList.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
-import CustomerDescriptorProxy from '../Customer/Card/CustomerDescriptorProxy.vue';
-import CreateManualInvoiceForm from 'src/components/CreateManualInvoiceForm.vue';
-
-import InvoiceOutFilter from './InvoiceOutFilter.vue';
-import { toDate, toCurrency } from 'src/filters/index';
-import { useStateStore } from 'stores/useStateStore';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import { useSession } from 'src/composables/useSession';
-import RightMenu from 'src/components/common/RightMenu.vue';
+import VnTable from 'components/VnTable/VnTable.vue';
+import InvoiceOutSummary from './Card/InvoiceOutSummary.vue';
+import { toCurrency, toDate } from 'src/filters/index';
+import { useStateStore } from 'stores/useStateStore';
+import { QBtn } from 'quasar';
 
 const { t } = useI18n();
-const router = useRouter();
 const stateStore = useStateStore();
 const session = useSession();
 const tokenMultimedia = session.getTokenMultimedia();
 const { viewSummary } = useSummaryDialog();
+const tableRef = ref();
+const invoiceOutSerialsOptions = ref([]);
+const ticketsOptions = ref([]);
+const customerOptions = ref([]);
+const selectedRows = ref([]);
+const hasSelectedCards = computed(() => selectedRows.value.length > 0);
 
-const manualInvoiceDialogRef = ref(null);
-const selectedCards = ref(new Map());
-
+const columns = computed(() => [
+    {
+        align: 'left',
+        name: 'id',
+        label: t('invoiceOutList.tableVisibleColumns.id'),
+        chip: {
+            condition: () => true,
+        },
+        isId: true,
+    },
+    {
+        align: 'left',
+        name: 'ref',
+        label: t('invoiceOutList.tableVisibleColumns.ref'),
+        isTitle: true,
+        component: 'select',
+        attrs: {
+            url: 'InvoiceOuts',
+            optionLabel: 'ref',
+            optionValue: 'id',
+        },
+        columnField: {
+            component: null,
+        },
+    },
+    {
+        align: 'left',
+        name: 'Issued',
+        label: t('invoiceOutList.tableVisibleColumns.issued'),
+        component: 'date',
+        format: (row) => toDate(row.issued),
+        columnField: {
+            component: null,
+        },
+    },
+    {
+        align: 'left',
+        name: 'clientSocialName',
+        label: t('invoiceOutModule.customer'),
+        cardVisible: true,
+        component: 'select',
+        attrs: {
+            url: 'Clients',
+            fields: ['id', 'name'],
+        },
+        columnField: {
+            component: null,
+        },
+    },
+    {
+        align: 'left',
+        name: 'companyCode',
+        label: t('invoiceOutModule.company'),
+        cardVisible: true,
+        component: 'select',
+        attrs: {
+            url: 'Companies',
+            optionLabel: 'code',
+            optionValue: 'id',
+        },
+        columnField: {
+            component: null,
+        },
+    },
+    {
+        align: 'left',
+        name: 'amount',
+        label: t('invoiceOutModule.amount'),
+        cardVisible: true,
+        format: (row) => toCurrency(row.amount),
+    },
+    {
+        align: 'left',
+        name: 'created',
+        label: t('invoiceOutList.tableVisibleColumns.created'),
+        component: 'date',
+        columnField: {
+            component: null,
+        },
+        format: (row) => toDate(row.created),
+    },
+    {
+        align: 'left',
+        name: 'dued',
+        label: t('invoiceOutList.tableVisibleColumns.dueDate'),
+        component: 'date',
+        columnField: {
+            component: null,
+        },
+        format: (row) => toDate(row.dued),
+    },
+    {
+        align: 'right',
+        label: '',
+        name: 'tableActions',
+        actions: [
+            {
+                title: t('InvoiceOutSummary'),
+                icon: 'preview',
+                action: (row) => viewSummary(row.id, InvoiceOutSummary),
+            },
+            {
+                title: t('DownloadPdf'),
+                icon: 'vn:ticket',
+                isPrimary: true,
+                action: (row) => openPdf(row.id),
+            },
+        ],
+    },
+]);
 onMounted(() => (stateStore.rightDrawer = true));
 onUnmounted(() => (stateStore.rightDrawer = false));
 
-function navigate(id) {
-    router.push({ path: `/invoice-out/${id}` });
-}
-
-const toggleIndividualCard = (cardData) => {
-    if (selectedCards.value.has(cardData.id)) {
-        selectedCards.value.delete(cardData.id);
-        return;
-    }
-    selectedCards.value.set(cardData.id, cardData);
-};
-
-const toggleAllCards = (cardsData) => {
-    const allSelected = selectedCards.value.size === cardsData.length;
-
-    if (!allSelected) {
-        // Si no todas las tarjetas están seleccionadas, selecciónalas todas
-        cardsData.forEach((data) => {
-            if (!selectedCards.value.has(data.id)) {
-                selectedCards.value.set(data.id, data);
-            }
-        });
-    } else {
-        // Si todas las tarjetas están seleccionadas, deselecciónalas todas
-        selectedCards.value.clear();
-    }
-};
-
-const openPdf = () => {
+function openPdf(id) {
     try {
-        if (selectedCards.value.size === 0) return;
-        const selectedCardsArray = Array.from(selectedCards.value.values());
-
-        if (selectedCards.value.size === 1) {
-            const [invoiceOut] = selectedCardsArray;
-            const url = `api/InvoiceOuts/${invoiceOut.id}/download?access_token=${tokenMultimedia}`;
+            const url = `api/InvoiceOuts/${id}/download?access_token=${tokenMultimedia}`;
             window.open(url, '_blank');
+    } catch (err) {
+        console.error('Error opening PDF', err);
+    }
+};
+
+function downloadPdf() {
+    try {
+        if (selectedRows.value.size === 0) return;
+        const selectedCardsArray = Array.from(selectedRows.value.values());
+
+        if (selectedRows.value.size === 1) {
+            const [invoiceOut] = selectedCardsArray;
+            openPdf(invoiceOut.id);
         } else {
             const invoiceOutIdsArray = selectedCardsArray.map(
                 (invoiceOut) => invoiceOut.id
@@ -86,11 +172,9 @@ const openPdf = () => {
     } catch (err) {
         console.error('Error opening PDF');
     }
-};
+}
 
-const openCreateInvoiceModal = () => {
-    manualInvoiceDialogRef.value.show();
-};
+watch(selectedRows, { deep: true });
 </script>
 
 <template>
@@ -99,115 +183,80 @@ const openCreateInvoiceModal = () => {
         :label="t('searchInvoice')"
         data-key="InvoiceOutList"
     />
-    <RightMenu>
-        <template #right-panel>
-            <InvoiceOutFilter data-key="InvoiceOutList" />
+    <VnSubToolbar>
+        <template #st-actions>
+            <QBtn color="primary" icon-right="cloud_download" @click="downloadPdf()" :disable="!hasSelectedCards">
+                <QTooltip>{{ t('globals.downloadPdf') }}</QTooltip>
+            </QBtn>
         </template>
-    </RightMenu>
-    <QPage>
-        <VnPaginate
-            auto-load
-            data-key="InvoiceOutList"
-            :order="['issued DESC', 'id DESC']"
-            url="InvoiceOuts/filter"
-        >
-            <template #body="{ rows }">
-                <VnSubToolbar class="justify-end">
-                    <template #st-actions>
-                        <QBtn
-                            @click="openPdf()"
-                            class="q-mr-md"
-                            color="primary"
-                            icon="cloud_download"
-                            :disable="selectedCards.size === 0"
-                        >
-                            <QTooltip>{{ t('globals.downloadPdf') }}</QTooltip>
-                        </QBtn>
-                        <QCheckbox
-                            left-label
-                            :label="t('globals.markAll')"
-                            @click="toggleAllCards(rows)"
-                            :model-value="selectedCards.size === rows.length"
-                            class="q-mr-md"
-                        />
-                    </template>
-                </VnSubToolbar>
-                <div class="flex flex-center q-pa-md">
-                    <div class="vn-card-list">
-                        <CardList
-                            :element="row"
-                            :id="row.id"
-                            :show-checkbox="true"
-                            :is-selected="selectedCards.has(row.id)"
-                            :key="row.id"
-                            :title="row.ref"
-                            @click="navigate(row.id)"
-                            @toggle-card-check="toggleIndividualCard(row)"
-                            v-for="row of rows"
-                        >
-                            <template #list-items>
-                                <VnLv
-                                    :label="t('invoiceOut.list.issued')"
-                                    :value="toDate(row.issued)"
-                                />
-                                <VnLv
-                                    :label="t('invoiceOut.list.amount')"
-                                    :value="toCurrency(row.amount)"
-                                />
-                                <VnLv :label="t('invoiceOut.list.client')">
-                                    <template #value>
-                                        <span class="link" @click.stop>
-                                            {{ row?.clientSocialName }}
-                                            <CustomerDescriptorProxy
-                                                :id="row?.clientFk"
-                                            />
-                                        </span>
-                                    </template>
-                                </VnLv>
-                                <VnLv
-                                    :label="t('invoiceOut.list.shortCreated')"
-                                    :title-label="t('invoiceOut.list.created')"
-                                    :value="toDate(row.created)"
-                                />
-                                <VnLv
-                                    :label="t('invoiceOut.list.company')"
-                                    :value="row.companyCode"
-                                />
-                                <VnLv
-                                    :label="t('invoiceOut.list.shortDued')"
-                                    :title-label="t('invoiceOut.list.dued')"
-                                    :value="toDate(row.dued)"
-                                />
-                            </template>
-                            <template #actions>
-                                <QBtn
-                                    :label="t('components.smartCard.openSummary')"
-                                    @click.stop="viewSummary(row.id, InvoiceOutSummary)"
-                                    color="primary"
-                                    style="margin-top: 15px"
-                                    type="submit"
-                                />
-                            </template>
-                        </CardList>
-                    </div>
-                </div>
-            </template>
-        </VnPaginate>
-        <QPageSticky :offset="[20, 20]">
-            <QBtn fab icon="add" color="primary" @click="openCreateInvoiceModal()" />
-            <QTooltip>
-                {{ t('createInvoice') }}
-            </QTooltip>
-        </QPageSticky>
+    </VnSubToolbar>
+    <VnTable
+        ref="tableRef"
+        data-key="invoiceOut"
+        url="InvoiceOuts/filter"
+        :create="{
+            urlCreate: 'InvoiceOuts/createManualInvoice',
+            title: t('Create Manual Invoice'),
+            onDataSaved: ({ id }) => tableRef.redirect(id),
+            formInitialData: {
+                active: true,
+            },
+        }"
+        v-model:selected="selectedRows"
+        order="id DESC"
+        :columns="columns"
+        default-mode="table"
+        redirect="invoice-out"
+        auto-load
+        :q-table="{
+            'row-key':'id',
+            selection:'multiple'
+        }" 
 
-        <QDialog
-            ref="manualInvoiceDialogRef"
-            transition-show="scale"
-            transition-hide="scale"
-        >
-            <CreateManualInvoiceForm />
-        </QDialog>
-    </QPage>
+    >
+    <template #more-create-dialog="{ data }">
+            <VnSelect
+                url="Tickets"
+                v-model="data.ticketFk"
+                :label="t('invoiceOutList.tableVisibleColumns.ticket')"
+                :options="ticketsOptions"
+                option-label="nickname"
+                option-value="id"
+            />
+            <VnSelect
+                url="Clients"
+                v-model="data.clientFk"
+                :label="t('invoiceOutModule.customer')"
+                :options="customerOptions"
+                option-label="name"
+                option-value="id"
+            />
+            <VnInputDate
+                :label="t('invoiceOutList.tableVisibleColumns.dueDate')"
+                v-model="data.maxShipped"
+            />
+            <VnSelect
+                url="InvoiceOutSerials"
+                v-model="data.invoiceOutSerial"
+                :label="t('invoiceOutList.tableVisibleColumns.invoiceOutSerial')"
+                :options="invoiceOutSerialsOptions"
+                option-label="description"
+                option-value="code"
+            />
+            <VnSelect
+                url="TaxAreas"
+                v-model="data.area"
+                :label="t('invoiceOutList.tableVisibleColumns.taxArea')"
+                :options="taxAreasOptions"
+                option-label="code"
+                option-value="code"
+            />
+            <QInput
+                v-model="data.reference"
+                :label="t('invoiceOutList.tableVisibleColumns.ref')"
+            />
+        </template>
+    </VnTable>
 </template>
 
 <i18n>
@@ -223,4 +272,4 @@ es:
     fileAllowed: Descarga exitosa de archivo CSV
     youCanSearchByInvoiceReference: Puedes buscar por referencia de la factura
     createInvoice: Crear factura
-</i18n>
+</i18n>
\ No newline at end of file
diff --git a/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue b/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue
index 84a79661e..d94661849 100644
--- a/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue
+++ b/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue
@@ -1,21 +1,19 @@
 <script setup>
-import { computed, onBeforeMount } from 'vue';
+import { computed, ref, onBeforeMount } from 'vue';
 import { useI18n } from 'vue-i18n';
-import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
-import InvoiceOutNegativeFilter from './InvoiceOutNegativeBasesFilter.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
-import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
-import TicketDescriptorProxy from 'src/pages/Ticket/Card/TicketDescriptorProxy.vue';
 import { toCurrency } from 'src/filters';
+import VnTable from 'src/components/VnTable/VnTable.vue';
 import { useInvoiceOutGlobalStore } from 'src/stores/invoiceOutGlobal.js';
-import { useStateStore } from 'stores/useStateStore';
-import { useArrayData } from 'composables/useArrayData';
-import RightMenu from 'src/components/common/RightMenu.vue';
+import { useArrayData } from 'src/composables/useArrayData';
+// import useStateStore from 'src/stores/useStateStore';
 
-const invoiceOutGlobalStore = useInvoiceOutGlobalStore();
-const stateStore = useStateStore();
 const { t } = useI18n();
-
+const tableRef = ref();
+// const userFrom = Date.vnFirstDayOfMonth().toISOString();
+// const userTo = Date.vnLastDayOfMonth().toISOString();
+const invoiceOutGlobalStore = useInvoiceOutGlobalStore();
+// const stateStore = useStateStore();
 const arrayData = useArrayData('InvoiceOutNegative', {
     url: 'InvoiceOuts/negativeBases',
     limit: 0,
@@ -36,165 +34,170 @@ const arrayData = useArrayData('InvoiceOutNegative', {
 
 onBeforeMount(async () => {
     await arrayData.fetch({ append: false });
-    stateStore.rightDrawer = true;
+    // stateStore.rightDrawer = true;
 });
 
 const columns = computed(() => [
     {
-        label: t('invoiceOut.negativeBases.company'),
-        field: 'company',
+        align: 'left',
         name: 'company',
-        align: 'left',
+        label: t('invoiceOutModule.company'),
+        component: 'select',
+        cardVisible: true,
+        attrs: {
+            url: 'Companies',
+            optionLabel: 'code',
+            optionValue: 'id',
+        },
+        columnField: {
+            component: null,
+        }
     },
     {
-        label: t('invoiceOut.negativeBases.country'),
-        field: 'country',
+        align: 'left',
         name: 'country',
-        align: 'left',
+        label: t('negativeBases.country'),
+        component: 'select',
+        attrs: {
+            url: 'Countries',
+            optionLabel: 'name',
+            optionValue: 'id',
+        },
+        columnField: {
+            component: null,
+        }
     },
     {
-        label: t('invoiceOut.negativeBases.clientId'),
-        field: 'clientId',
+        align: 'left',
         name: 'clientId',
-        align: 'left',
+        label: t('negativeBases.clientId'),
+        cardVisible: true,
     },
     {
-        label: t('invoiceOut.negativeBases.client'),
-        field: 'clientSocialName',
-        name: 'client',
         align: 'left',
+        name: 'clientSocialName',
+        label: t('invoiceOutModule.customer'),
+        component: 'select',
+        isTitle: true,
+        cardVisible: true,
+        attrs: {
+            url: 'Clients',
+            fields: ['id', 'name'],
+        },
+        columnField: {
+            component: null,
+        }
     },
     {
-        label: t('invoiceOut.negativeBases.amount'),
-        field: 'amount',
+        align: 'left',
         name: 'amount',
-        align: 'left',
-        format: (value) => toCurrency(value),
+        label: t('invoiceOutModule.amount'),
+        format: (row) => toCurrency(row.amount),
+        cardVisible: true,
     },
     {
-        label: t('invoiceOut.negativeBases.base'),
-        field: 'taxableBase',
-        name: 'base',
         align: 'left',
+        name: 'taxableBase',
+        label: t('negativeBases.base'),
     },
     {
-        label: t('invoiceOut.negativeBases.ticketId'),
-        field: 'ticketFk',
-        name: 'ticketId',
         align: 'left',
+        name: 'ticketFk',
+        label: t('negativeBases.ticketId'),
+        cardVisible: true,
     },
     {
-        label: t('invoiceOut.negativeBases.active'),
-        field: 'isActive',
-        name: 'active',
         align: 'left',
+        name: 'isActive',
+        label: t('negativeBases.active'),
     },
     {
-        label: t('invoiceOut.negativeBases.hasToInvoice'),
-        field: 'hasToInvoice',
+        align: 'left',
         name: 'hasToInvoice',
-        align: 'left',
+        label: t('negativeBases.hasToInvoice'),
     },
     {
-        label: t('invoiceOut.negativeBases.verifiedData'),
-        field: 'isTaxDataChecked',
-        name: 'verifiedData',
         align: 'left',
+        name: 'hasVerifiedData',
+        label: t('negativeBases.verifiedData'),
     },
     {
-        label: t('invoiceOut.negativeBases.comercial'),
-        field: 'workerName',
-        name: 'worker',
         align: 'left',
+        label: t('customer.extendedList.tableVisibleColumns.salesPersonFk'),
+        name: 'workerName',
+        component: 'select',
+        attrs: {
+            url: 'Workers/activeWithInheritedRole',
+            fields: ['id', 'name'],
+            where: { role: 'salesPerson' },
+        },
+        columnField: {
+            component: null,
+        },
+        format: (row, dashIfEmpty) => dashIfEmpty(row.workerName),
     },
 ]);
 
 const downloadCSV = async () => {
-    const params = {}; // filter.value;
+    console.log('arrayData from: ', arrayData.store.userParams.from);
+    console.log('arrayData to: ', arrayData.store.userParams.to);
     const filterParams = {
         limit: 20,
         where: {
             and: [],
         },
     };
-    for (const param in params) {
-        if (params[param]) filterParams.where.and.push({ [param]: params[param] });
-    }
+
+    for (const [key, value] of Object.entries(arrayData.store.userParams)) {
+        if (value) {
+          filterParams.where.and.push({ [key]: value });
+        }
+    };
 
     await invoiceOutGlobalStore.getNegativeBasesCsv(
-        arrayData.value.store.userParams.from,
-        arrayData.value.store.userParams.to,
-        params
+        arrayData.store.userParams.from,
+        arrayData.store.userParams.to,
+        filterParams
     );
 };
 </script>
 <template>
     <VnSubToolbar>
         <template #st-actions>
-            <QBtn color="primary" icon-right="download" no-caps @click="downloadCSV()">
+            <QBtn color="primary" icon-right="download" @click="downloadCSV()">
                 <QTooltip>{{ t('Download as CSV') }}</QTooltip>
             </QBtn>
         </template>
     </VnSubToolbar>
-    <RightMenu>
-        <template #right-panel>
-            <InvoiceOutNegativeFilter data-key="InvoiceOutNegative" />
-        </template>
-    </RightMenu>
-    <QPage class="column items-center q-pa-md">
-        <QTable
-            :columns="columns"
-            :rows="arrayData.store.data"
-            row-key="clientId"
-            class="full-width q-mt-md"
-        >
-            <template #body-cell-clientId="{ row }">
-                <QTd>
-                    <QBtn flat dense class="link"> {{ row.clientId }}</QBtn>
-                    <CustomerDescriptorProxy :id="row.clientId" />
-                </QTd>
-            </template>
-            <template #body-cell-ticketId="{ row }">
-                <QTd>
-                    <QBtn flat dense class="link"> {{ row.ticketFk }}</QBtn>
-                    <TicketDescriptorProxy :id="row.ticketFk" />
-                </QTd>
-            </template>
-            <template #body-cell-worker="{ row }">
-                <QTd>
-                    <QBtn class="no-uppercase link" flat dense>{{ row.workerName }}</QBtn>
-                    <WorkerDescriptorProxy :id="row.comercialId" />
-                </QTd>
-            </template>
-            <template #body-cell-active="{ row }">
-                <QTd>
-                    <QCheckbox :model-value="!!row.isActive" disable />
-                </QTd>
-            </template>
-            <template #body-cell-hasToInvoice="{ row }">
-                <QTd>
-                    <QCheckbox :model-value="!!row.hasToInvoice" disable />
-                </QTd>
-            </template>
-            <template #body-cell-verifiedData="{ row }">
-                <QTd>
-                    <QCheckbox :model-value="!!row.isTaxDataChecked" disable />
-                </QTd>
-            </template>
-        </QTable>
-    </QPage>
+    <VnTable
+        ref="tableRef"
+        data-key="invoiceOut"
+        url="InvoiceOuts/negativeBases"
+        :user-params="arrayData.store.userParams"
+        :expr-builder="(param, value) => {
+            switch (param) {
+                case 'from':
+                case 'to':
+                    return;
+                default:
+                    return { [param]: value };
+            }
+        }"
+        :limit="0"
+        :columns="columns"
+        default-mode="table"
+        auto-load
+        :is-editable="false"
+        :use-model="true"
+    >
+        <!-- <template #moreBeforeActions>
+            <QBtn color="primary" icon-right="download" @click="downloadCSV()">
+                <QTooltip>{{ t('Download as CSV') }}</QTooltip>
+            </QBtn>
+        </template> -->
+    </VnTable>
 </template>
 
-<style lang="scss" scoped>
-.col-content {
-    border-radius: 4px;
-    padding: 6px;
-}
-.no-uppercase {
-    text-transform: none;
-}
-</style>
-
 <i18n>
 es:
     Download as CSV: Descargar como CSV
diff --git a/src/pages/InvoiceOut/locale/en.yml b/src/pages/InvoiceOut/locale/en.yml
new file mode 100644
index 000000000..5ad92ed09
--- /dev/null
+++ b/src/pages/InvoiceOut/locale/en.yml
@@ -0,0 +1,25 @@
+invoiceOutModule:
+    customer: Client
+    amount: Amount
+    company: Company
+invoiceOutList:
+    tableVisibleColumns:
+        id: ID
+        ref: Reference
+        issued: Issued
+        created: Created
+        dueDate: Max date
+        invoiceOutSerial: Serial
+        ticket: Ticket
+        taxArea: Tax area
+DownloadPdf: Download PDF
+InvoiceOutSummary: Summary
+negativeBases:
+        country: Country
+        clientId: Client ID
+        base: Base
+        ticketId: Ticket
+        active: Active
+        hasToInvoice: Has to invoice
+        verifiedData: Verified data
+        commercial: Commercial
\ No newline at end of file
diff --git a/src/pages/InvoiceOut/locale/es.yml b/src/pages/InvoiceOut/locale/es.yml
index b936c7b7e..a05125630 100644
--- a/src/pages/InvoiceOut/locale/es.yml
+++ b/src/pages/InvoiceOut/locale/es.yml
@@ -1,2 +1,31 @@
 Search invoice: Buscar factura emitida
 You can search by invoice reference: Puedes buscar por referencia de la factura
+invoiceOutModule:
+    customer: Cliente
+    amount: Importe
+    company: Empresa
+invoiceOutList:
+    tableVisibleColumns:
+        id: ID
+        ref: Referencia
+        issued: Fecha emisión
+        customer: Cliente
+        company: Empresa
+        amount: Importe
+        created: F. creación
+        dueDate: F. máxima
+        invoiceOutSerial: Serial
+        ticket: Ticket
+        taxArea: Area
+DownloadPdf: Descargar PDF
+InvoiceOutSummary: Resumen
+negativeBases:
+        country: País
+        clientId: ID del cliente
+        client: Cliente
+        base: Base
+        ticketId: Ticket
+        active: Activo
+        hasToInvoice: Debe facturar
+        verifiedData: Datos verificados
+        commercial: Comercial
\ No newline at end of file
diff --git a/src/router/modules/invoiceOut.js b/src/router/modules/invoiceOut.js
index 7c05b82e6..aac84573c 100644
--- a/src/router/modules/invoiceOut.js
+++ b/src/router/modules/invoiceOut.js
@@ -35,7 +35,7 @@ export default {
                     name: 'InvoiceOutGlobal',
                     meta: {
                         title: 'globalInvoicing',
-                        icon: 'contact_support',
+                        icon: 'Date_Range',
                     },
                     component: () => import('src/pages/InvoiceOut/InvoiceOutGlobal.vue'),
                 },

From 10f5323b9a82fdc41afaec03b181532021fe9b73 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Wed, 3 Jul 2024 09:45:59 +0200
Subject: [PATCH 2/7] refactor: refs #6899 fix negativeBases call

---
 .../InvoiceOut/InvoiceOutNegativeBases.vue    | 79 +++++++------------
 src/stores/invoiceOutGlobal.js                |  2 +-
 2 files changed, 28 insertions(+), 53 deletions(-)

diff --git a/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue b/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue
index d94661849..61e63a7a7 100644
--- a/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue
+++ b/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue
@@ -1,41 +1,20 @@
 <script setup>
-import { computed, ref, onBeforeMount } from 'vue';
+import { computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import { toCurrency } from 'src/filters';
 import VnTable from 'src/components/VnTable/VnTable.vue';
 import { useInvoiceOutGlobalStore } from 'src/stores/invoiceOutGlobal.js';
 import { useArrayData } from 'src/composables/useArrayData';
-// import useStateStore from 'src/stores/useStateStore';
 
 const { t } = useI18n();
 const tableRef = ref();
-// const userFrom = Date.vnFirstDayOfMonth().toISOString();
-// const userTo = Date.vnLastDayOfMonth().toISOString();
 const invoiceOutGlobalStore = useInvoiceOutGlobalStore();
-// const stateStore = useStateStore();
-const arrayData = useArrayData('InvoiceOutNegative', {
-    url: 'InvoiceOuts/negativeBases',
-    limit: 0,
-    userParams: {
-        from: Date.vnFirstDayOfMonth().toISOString(),
-        to: Date.vnLastDayOfMonth().toISOString(),
-    },
-    exprBuilder: (param, value) => {
-        switch (param) {
-            case 'from':
-            case 'to':
-                return;
-            default:
-                return { [param]: value };
-        }
-    },
-});
-
-onBeforeMount(async () => {
-    await arrayData.fetch({ append: false });
-    // stateStore.rightDrawer = true;
-});
+const userParams = {
+    from: Date.vnFirstDayOfMonth().toISOString(),
+    to: Date.vnLastDayOfMonth().toISOString(),
+};
+useArrayData('InvoiceOutNegative', { userParams });
 
 const columns = computed(() => [
     {
@@ -51,7 +30,7 @@ const columns = computed(() => [
         },
         columnField: {
             component: null,
-        }
+        },
     },
     {
         align: 'left',
@@ -65,7 +44,7 @@ const columns = computed(() => [
         },
         columnField: {
             component: null,
-        }
+        },
     },
     {
         align: 'left',
@@ -86,7 +65,7 @@ const columns = computed(() => [
         },
         columnField: {
             component: null,
-        }
+        },
     },
     {
         align: 'left',
@@ -139,8 +118,6 @@ const columns = computed(() => [
 ]);
 
 const downloadCSV = async () => {
-    console.log('arrayData from: ', arrayData.store.userParams.from);
-    console.log('arrayData to: ', arrayData.store.userParams.to);
     const filterParams = {
         limit: 20,
         where: {
@@ -148,15 +125,15 @@ const downloadCSV = async () => {
         },
     };
 
-    for (const [key, value] of Object.entries(arrayData.store.userParams)) {
+    for (const [key, value] of Object.entries(userParams)) {
         if (value) {
-          filterParams.where.and.push({ [key]: value });
+            filterParams.where.and.push({ [key]: value });
         }
-    };
+    }
 
     await invoiceOutGlobalStore.getNegativeBasesCsv(
-        arrayData.store.userParams.from,
-        arrayData.store.userParams.to,
+        userParams.from,
+        userParams.to,
         filterParams
     );
 };
@@ -171,30 +148,28 @@ const downloadCSV = async () => {
     </VnSubToolbar>
     <VnTable
         ref="tableRef"
-        data-key="invoiceOut"
+        data-key="negativeFilter"
         url="InvoiceOuts/negativeBases"
-        :user-params="arrayData.store.userParams"
-        :expr-builder="(param, value) => {
-            switch (param) {
-                case 'from':
-                case 'to':
-                    return;
-                default:
-                    return { [param]: value };
+        :user-params="userParams"
+        :expr-builder="
+            (param, value) => {
+                switch (param) {
+                    case 'from':
+                    case 'to':
+                        return;
+                    default:
+                        return { [param]: value };
+                }
             }
-        }"
+        "
         :limit="0"
         :columns="columns"
         default-mode="table"
         auto-load
         :is-editable="false"
         :use-model="true"
+        :order="''"
     >
-        <!-- <template #moreBeforeActions>
-            <QBtn color="primary" icon-right="download" @click="downloadCSV()">
-                <QTooltip>{{ t('Download as CSV') }}</QTooltip>
-            </QBtn>
-        </template> -->
     </VnTable>
 </template>
 
diff --git a/src/stores/invoiceOutGlobal.js b/src/stores/invoiceOutGlobal.js
index b1bcc0e7d..bb9a3d376 100644
--- a/src/stores/invoiceOutGlobal.js
+++ b/src/stores/invoiceOutGlobal.js
@@ -237,7 +237,7 @@ export const useInvoiceOutGlobalStore = defineStore({
         async getNegativeBasesCsv() {
             try {
                 const arrayData = useArrayData('InvoiceOutNegative');
-                const params = arrayData.store.currentFilter;
+                const params = arrayData.store.userParams;
 
                 const { data } = await axios.get('InvoiceOuts/negativeBasesCsv', {
                     params,

From 8dc1ec75b3e36f87638b7caa14d9983453473f8e Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Thu, 4 Jul 2024 08:27:20 +0200
Subject: [PATCH 3/7] refactor: refs #6899 requested changes

---
 src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue | 10 ++++++----
 src/pages/InvoiceOut/Card/InvoiceOutSummary.vue        |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue b/src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue
index 0d9e2aef6..eae41d789 100644
--- a/src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue
+++ b/src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue
@@ -121,7 +121,7 @@ const refundInvoice = async (withWarehouse) => {
     try {
         const params = { ref: $props.invoiceOutData.ref, withWarehouse: withWarehouse };
         const { data } = await axios.post('InvoiceOuts/refund', params);
-        location.href = `${salixUrl.value}ticket/${data[0].id}/sale`;
+        location.href = window.origin + `/#/ticket/${data[0].id}/sale`;
         notify(
             t('refundInvoiceSuccessMessage', {
                 refundTicket: data[0].id,
@@ -140,13 +140,15 @@ const showTransferInvoiceForm = async () => {
         componentProps: {
             invoiceOutData: $props.invoiceOutData,
         },
-    })
-}
+    });
+};
 </script>
 
 <template>
     <QItem v-ripple clickable>
-        <QItemSection @click="showTransferInvoiceForm()">{{ t('Transfer invoice to...') }}</QItemSection>
+        <QItemSection @click="showTransferInvoiceForm()">{{
+            t('Transfer invoice to...')
+        }}</QItemSection>
     </QItem>
     <QItem v-ripple clickable>
         <QItemSection>{{ t('Show invoice...') }}</QItemSection>
diff --git a/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue b/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue
index 8e344b1ca..e9d5a2f1f 100644
--- a/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue
+++ b/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue
@@ -115,7 +115,7 @@ const ticketsColumns = ref([
         </template>
         <template #body="{ entity: { invoiceOut } }">
             <QCard class="vn-one">
-                <VnTitle :text="t('invoiceOut.pageTitles.basicData')" />
+                <VnTitle :text="t('globals.pageTitles.basicData')" />
                 <VnLv
                     :label="t('invoiceOut.summary.issued')"
                     :value="toDate(invoiceOut.issued)"

From 90fbfd38e0b4bd6e559b3a981c39ecb1e571ffcc Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Thu, 4 Jul 2024 14:03:33 +0200
Subject: [PATCH 4/7] refcactor: refs #6899 deleted warnings

---
 src/components/VnTable/VnTable.vue            |  6 +++-
 src/pages/InvoiceOut/InvoiceOutGlobalForm.vue |  2 +-
 src/pages/InvoiceOut/InvoiceOutList.vue       | 31 +++++++++++--------
 3 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 56d1cbe8f..e4e8e0358 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -63,6 +63,10 @@ const $props = defineProps({
         type: Boolean,
         default: true,
     },
+    table: {
+        type: Object,
+        default: () => ({}),
+    },
 });
 const { t } = useI18n();
 const stateStore = useStateStore();
@@ -243,7 +247,7 @@ defineExpose({
             </template>
             <template #body="{ rows }">
                 <QTable
-                    v-bind="$attrs['q-table']"
+                    v-bind="table"
                     class="vnTable"
                     :columns="splittedColumns.columns"
                     :rows="rows"
diff --git a/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue b/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue
index 78ec03a16..23c63ee6a 100644
--- a/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue
+++ b/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue
@@ -48,7 +48,7 @@ const getStatus = computed({
 
 onMounted(async () => {
     await invoiceOutGlobalStore.init();
-    formData.value = { ...formInitialData.value };
+    formData.value = formInitialData.value.invoiceDate;
 });
 </script>
 
diff --git a/src/pages/InvoiceOut/InvoiceOutList.vue b/src/pages/InvoiceOut/InvoiceOutList.vue
index 40e0baf2f..037834d09 100644
--- a/src/pages/InvoiceOut/InvoiceOutList.vue
+++ b/src/pages/InvoiceOut/InvoiceOutList.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { onMounted, onUnmounted, ref, computed, watch } from 'vue';
+import { onMounted, onUnmounted, ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
@@ -12,6 +12,7 @@ import InvoiceOutSummary from './Card/InvoiceOutSummary.vue';
 import { toCurrency, toDate } from 'src/filters/index';
 import { useStateStore } from 'stores/useStateStore';
 import { QBtn } from 'quasar';
+import { watchEffect } from 'vue';
 
 const { t } = useI18n();
 const stateStore = useStateStore();
@@ -140,12 +141,12 @@ onUnmounted(() => (stateStore.rightDrawer = false));
 
 function openPdf(id) {
     try {
-            const url = `api/InvoiceOuts/${id}/download?access_token=${tokenMultimedia}`;
-            window.open(url, '_blank');
+        const url = `api/InvoiceOuts/${id}/download?access_token=${tokenMultimedia}`;
+        window.open(url, '_blank');
     } catch (err) {
         console.error('Error opening PDF', err);
     }
-};
+}
 
 function downloadPdf() {
     try {
@@ -174,7 +175,7 @@ function downloadPdf() {
     }
 }
 
-watch(selectedRows, { deep: true });
+watchEffect(selectedRows);
 </script>
 
 <template>
@@ -185,7 +186,12 @@ watch(selectedRows, { deep: true });
     />
     <VnSubToolbar>
         <template #st-actions>
-            <QBtn color="primary" icon-right="cloud_download" @click="downloadPdf()" :disable="!hasSelectedCards">
+            <QBtn
+                color="primary"
+                icon-right="cloud_download"
+                @click="downloadPdf()"
+                :disable="!hasSelectedCards"
+            >
                 <QTooltip>{{ t('globals.downloadPdf') }}</QTooltip>
             </QBtn>
         </template>
@@ -208,13 +214,12 @@ watch(selectedRows, { deep: true });
         default-mode="table"
         redirect="invoice-out"
         auto-load
-        :q-table="{
-            'row-key':'id',
-            selection:'multiple'
-        }" 
-
+        :table="{
+            'row-key': 'id',
+            selection: 'multiple',
+        }"
     >
-    <template #more-create-dialog="{ data }">
+        <template #more-create-dialog="{ data }">
             <VnSelect
                 url="Tickets"
                 v-model="data.ticketFk"
@@ -272,4 +277,4 @@ es:
     fileAllowed: Descarga exitosa de archivo CSV
     youCanSearchByInvoiceReference: Puedes buscar por referencia de la factura
     createInvoice: Crear factura
-</i18n>
\ No newline at end of file
+</i18n>

From 9aa283a6123c759941c1505f90f3f7a6eabb3668 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 5 Jul 2024 10:16:52 +0200
Subject: [PATCH 5/7] fix: refs #6899 fix openReport call

---
 .../Card/InvoiceOutDescriptorMenu.vue         |  1 -
 src/pages/InvoiceOut/InvoiceOutList.vue       | 19 +++++++++++--------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue b/src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue
index eae41d789..e524faa24 100644
--- a/src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue
+++ b/src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue
@@ -134,7 +134,6 @@ const refundInvoice = async (withWarehouse) => {
 };
 
 const showTransferInvoiceForm = async () => {
-    $props.menuRef.hide();
     quasar.dialog({
         component: TransferInvoiceForm,
         componentProps: {
diff --git a/src/pages/InvoiceOut/InvoiceOutList.vue b/src/pages/InvoiceOut/InvoiceOutList.vue
index 037834d09..fc40d95f2 100644
--- a/src/pages/InvoiceOut/InvoiceOutList.vue
+++ b/src/pages/InvoiceOut/InvoiceOutList.vue
@@ -6,6 +6,7 @@ import VnInputDate from 'src/components/common/VnInputDate.vue';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
+import { usePrintService } from 'composables/usePrintService';
 import { useSession } from 'src/composables/useSession';
 import VnTable from 'components/VnTable/VnTable.vue';
 import InvoiceOutSummary from './Card/InvoiceOutSummary.vue';
@@ -25,6 +26,8 @@ const ticketsOptions = ref([]);
 const customerOptions = ref([]);
 const selectedRows = ref([]);
 const hasSelectedCards = computed(() => selectedRows.value.length > 0);
+const MODEL = 'InvoiceOuts';
+const { openReport } = usePrintService();
 
 const columns = computed(() => [
     {
@@ -43,7 +46,7 @@ const columns = computed(() => [
         isTitle: true,
         component: 'select',
         attrs: {
-            url: 'InvoiceOuts',
+            url: MODEL,
             optionLabel: 'ref',
             optionValue: 'id',
         },
@@ -141,7 +144,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
 
 function openPdf(id) {
     try {
-        const url = `api/InvoiceOuts/${id}/download?access_token=${tokenMultimedia}`;
+        const url = `api/${MODEL}/${id}/download?access_token=${tokenMultimedia}`;
         window.open(url, '_blank');
     } catch (err) {
         console.error('Error opening PDF', err);
@@ -162,13 +165,13 @@ function downloadPdf() {
             );
             const invoiceOutIds = invoiceOutIdsArray.join(',');
 
-            const params = new URLSearchParams({
-                access_token: tokenMultimedia,
+            const params = {
                 ids: invoiceOutIds,
-            });
+            };
 
-            const url = `api/InvoiceOuts/downloadZip?${params}`;
-            window.open(url, '_blank');
+            openReport(`${MODEL}/downloadZip`, params);
+            // const url = `api/${MODEL}/downloadZip?${params}`;
+            // window.open(url, '_blank');
         }
     } catch (err) {
         console.error('Error opening PDF');
@@ -199,7 +202,7 @@ watchEffect(selectedRows);
     <VnTable
         ref="tableRef"
         data-key="invoiceOut"
-        url="InvoiceOuts/filter"
+        :url="`${MODEL}/filter`"
         :create="{
             urlCreate: 'InvoiceOuts/createManualInvoice',
             title: t('Create Manual Invoice'),

From a634d8d6e6ec739136aaaff0dd56e5a73014b1a5 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 5 Jul 2024 14:02:24 +0200
Subject: [PATCH 6/7] refactor: refs #6899 deleted comments

---
 src/pages/InvoiceOut/InvoiceOutList.vue          | 9 +--------
 src/pages/InvoiceOut/InvoiceOutNegativeBases.vue | 1 -
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/src/pages/InvoiceOut/InvoiceOutList.vue b/src/pages/InvoiceOut/InvoiceOutList.vue
index fc40d95f2..074df617f 100644
--- a/src/pages/InvoiceOut/InvoiceOutList.vue
+++ b/src/pages/InvoiceOut/InvoiceOutList.vue
@@ -7,7 +7,6 @@ import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import { usePrintService } from 'composables/usePrintService';
-import { useSession } from 'src/composables/useSession';
 import VnTable from 'components/VnTable/VnTable.vue';
 import InvoiceOutSummary from './Card/InvoiceOutSummary.vue';
 import { toCurrency, toDate } from 'src/filters/index';
@@ -17,8 +16,6 @@ import { watchEffect } from 'vue';
 
 const { t } = useI18n();
 const stateStore = useStateStore();
-const session = useSession();
-const tokenMultimedia = session.getTokenMultimedia();
 const { viewSummary } = useSummaryDialog();
 const tableRef = ref();
 const invoiceOutSerialsOptions = ref([]);
@@ -122,7 +119,6 @@ const columns = computed(() => [
     },
     {
         align: 'right',
-        label: '',
         name: 'tableActions',
         actions: [
             {
@@ -144,8 +140,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
 
 function openPdf(id) {
     try {
-        const url = `api/${MODEL}/${id}/download?access_token=${tokenMultimedia}`;
-        window.open(url, '_blank');
+        openReport(`${MODEL}//${id}/download`);
     } catch (err) {
         console.error('Error opening PDF', err);
     }
@@ -170,8 +165,6 @@ function downloadPdf() {
             };
 
             openReport(`${MODEL}/downloadZip`, params);
-            // const url = `api/${MODEL}/downloadZip?${params}`;
-            // window.open(url, '_blank');
         }
     } catch (err) {
         console.error('Error opening PDF');
diff --git a/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue b/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue
index 61e63a7a7..0b9dd7ad7 100644
--- a/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue
+++ b/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue
@@ -168,7 +168,6 @@ const downloadCSV = async () => {
         auto-load
         :is-editable="false"
         :use-model="true"
-        :order="''"
     >
     </VnTable>
 </template>

From 41052cce28b8c615a31291e39af16baaa311d612 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 5 Jul 2024 14:05:57 +0200
Subject: [PATCH 7/7] refactor: refs #6899 corrected api call

---
 src/pages/InvoiceOut/InvoiceOutList.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/InvoiceOut/InvoiceOutList.vue b/src/pages/InvoiceOut/InvoiceOutList.vue
index 074df617f..0f7bb5032 100644
--- a/src/pages/InvoiceOut/InvoiceOutList.vue
+++ b/src/pages/InvoiceOut/InvoiceOutList.vue
@@ -140,7 +140,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
 
 function openPdf(id) {
     try {
-        openReport(`${MODEL}//${id}/download`);
+        openReport(`${MODEL}/${id}/download`);
     } catch (err) {
         console.error('Error opening PDF', err);
     }