From a2c96d276e65bea5690cc478280aa4dfe48c13ff Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Tue, 2 Jan 2024 08:17:04 -0300
Subject: [PATCH 01/94] Supplier Basic data, Billing data and Fiscal data

---
 src/i18n/en/index.js                          |  30 ++
 src/i18n/es/index.js                          |  30 ++
 .../Customer/CustomerExtendedListFilter.vue   |   1 -
 src/pages/Supplier/Card/SupplierBasicData.vue |  98 +++++-
 .../Supplier/Card/SupplierBillingData.vue     |  69 ++++-
 .../Supplier/Card/SupplierFiscalData.vue      | 293 +++++++++++++++++-
 6 files changed, 517 insertions(+), 4 deletions(-)

diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index a7567866b..0e34798d7 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -860,6 +860,36 @@ export default {
         create: {
             supplierName: 'Supplier name',
         },
+        basicData: {
+            alias: 'Alias',
+            workerFk: 'Responsible',
+            isSerious: 'Verified',
+            isActive: 'Active',
+            isPayMethodChecked: 'PayMethod checked',
+            note: 'Notes',
+        },
+        fiscalData: {
+            name: 'Social name *',
+            nif: 'Tax number *',
+            account: 'Account',
+            sageTaxTypeFk: 'Sage tax type',
+            sageWithholdingFk: 'Sage withholding',
+            sageTransactionTypeFk: 'Sage transaction type',
+            supplierActivityFk: 'Supplier activity',
+            healthRegister: 'Health register',
+            street: 'Street',
+            postcode: 'Postcode',
+            city: 'City *',
+            provinceFk: 'Province',
+            country: 'Country',
+            isTrucker: 'Trucker',
+            isVies: 'Vies',
+        },
+        billingData: {
+            payMethodFk: 'Billing data',
+            payDemFk: 'Payment deadline',
+            payDay: 'Pay day',
+        },
     },
     travel: {
         pageTitles: {
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index c4820e70e..c83d25e3f 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -859,6 +859,36 @@ export default {
         create: {
             supplierName: 'Nombre del proveedor',
         },
+        basicData: {
+            alias: 'Alias',
+            workerFk: 'Responsable',
+            isSerious: 'Verificado',
+            isActive: 'Activo',
+            isPayMethodChecked: 'Método de pago validado',
+            note: 'Notas',
+        },
+        fiscalData: {
+            name: 'Razón social *',
+            nif: 'NIF/CIF *',
+            account: 'Cuenta',
+            sageTaxTypeFk: 'Tipo de impuesto sage',
+            sageWithholdingFk: 'Retención sage',
+            sageTransactionTypeFk: 'Tipo de transacción sage',
+            supplierActivityFk: 'Actividad proveedor',
+            healthRegister: 'Pasaporte sanitario',
+            street: 'Calle',
+            postcode: 'Código postal',
+            city: 'Población *',
+            provinceFk: 'Provincia',
+            country: 'País',
+            isTrucker: 'Transportista',
+            isVies: 'Vies',
+        },
+        billingData: {
+            payMethodFk: 'Forma de pago',
+            payDemFk: 'Plazo de pago',
+            payDay: 'Día de pago',
+        },
     },
     travel: {
         pageTitles: {
diff --git a/src/pages/Customer/CustomerExtendedListFilter.vue b/src/pages/Customer/CustomerExtendedListFilter.vue
index 0cf614fca..f7e83a757 100644
--- a/src/pages/Customer/CustomerExtendedListFilter.vue
+++ b/src/pages/Customer/CustomerExtendedListFilter.vue
@@ -565,7 +565,6 @@ const shouldRenderColumn = (colName) => {
 </style>
 
 <i18n>
-
 es:
     Social name: Razón social
 </i18n>
diff --git a/src/pages/Supplier/Card/SupplierBasicData.vue b/src/pages/Supplier/Card/SupplierBasicData.vue
index 582da48f3..b73ce9346 100644
--- a/src/pages/Supplier/Card/SupplierBasicData.vue
+++ b/src/pages/Supplier/Card/SupplierBasicData.vue
@@ -1 +1,97 @@
-<template>Supplier basic data</template>
+<script setup>
+import { ref } from 'vue';
+import { useRoute } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+
+import FetchData from 'components/FetchData.vue';
+import FormModel from 'components/FormModel.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+
+const route = useRoute();
+const { t } = useI18n();
+
+const workersOptions = ref([]);
+</script>
+<template>
+    <FetchData
+        url="Workers/search"
+        :filter="{ fields: ['id', 'nickname'], order: 'nickname ASC', limit: 30 }"
+        @on-fetch="(data) => (workersOptions = data)"
+        auto-load
+    />
+    <FormModel
+        :url="`Suppliers/${route.params.id}`"
+        :url-update="`Suppliers/${route.params.id}`"
+        model="supplier"
+        auto-load
+    >
+        <template #form="{ data, validate }">
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnInput
+                        v-model="data.nickname"
+                        :label="t('supplier.basicData.alias')"
+                        :rules="validate('supplier.nickname')"
+                        clearable
+                    />
+                </div>
+                <div class="col">
+                    <VnSelectFilter
+                        :label="t('supplier.basicData.workerFk')"
+                        v-model="data.workerFk"
+                        :options="workersOptions"
+                        option-value="id"
+                        option-label="name"
+                        hide-selected
+                        map-options
+                        :rules="validate('supplier.workerFk')"
+                    >
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection>
+                                    <QItemLabel>{{ scope.opt?.name }}</QItemLabel>
+                                    <QItemLabel caption>
+                                        {{ scope.opt?.nickname }}, {{ scope.opt?.id }}
+                                    </QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelectFilter>
+                </div>
+            </VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <QCheckbox
+                        v-model="data.isSerious"
+                        :label="t('supplier.basicData.isSerious')"
+                    />
+                </div>
+                <div class="col">
+                    <QCheckbox
+                        v-model="data.isActive"
+                        :label="t('supplier.basicData.isActive')"
+                    />
+                </div>
+                <div class="col">
+                    <QCheckbox
+                        v-model="data.isPayMethodChecked"
+                        :label="t('supplier.basicData.isPayMethodChecked')"
+                    />
+                </div>
+            </VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <QInput
+                        :label="t('supplier.basicData.note')"
+                        type="textarea"
+                        v-model="data.note"
+                        fill-input
+                        autogrow
+                    />
+                </div>
+            </VnRow>
+        </template>
+    </FormModel>
+</template>
diff --git a/src/pages/Supplier/Card/SupplierBillingData.vue b/src/pages/Supplier/Card/SupplierBillingData.vue
index 849737fa7..1237a0403 100644
--- a/src/pages/Supplier/Card/SupplierBillingData.vue
+++ b/src/pages/Supplier/Card/SupplierBillingData.vue
@@ -1 +1,68 @@
-<template>Supplier billing data</template>
+<script setup>
+import { ref } from 'vue';
+import { useRoute } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+
+import FetchData from 'components/FetchData.vue';
+import FormModel from 'components/FormModel.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+
+const route = useRoute();
+const { t } = useI18n();
+
+const paymethodsOptions = ref([]);
+const payDemsOptions = ref([]);
+</script>
+<template>
+    <FetchData
+        url="Paymethods"
+        @on-fetch="(data) => (paymethodsOptions = data)"
+        auto-load
+    />
+    <FetchData url="PayDems" @on-fetch="(data) => (payDemsOptions = data)" auto-load />
+    <FormModel
+        :url="`Suppliers/${route.params.id}`"
+        :url-update="`Suppliers/${route.params.id}`"
+        model="supplier"
+        auto-load
+    >
+        <template #form="{ data, validate }">
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnSelectFilter
+                        :label="t('supplier.billingData.payMethodFk')"
+                        v-model="data.payMethodFk"
+                        :options="paymethodsOptions"
+                        option-value="id"
+                        option-label="name"
+                        hide-selected
+                        map-options
+                        :rules="validate('supplier.payMethodFk')"
+                    />
+                </div>
+                <div class="col">
+                    <VnSelectFilter
+                        :label="t('supplier.billingData.payDemFk')"
+                        v-model="data.payDemFk"
+                        :options="payDemsOptions"
+                        option-value="id"
+                        option-label="payDem"
+                        hide-selected
+                        map-options
+                        :rules="validate('supplier.payDemFk')"
+                    />
+                </div>
+            </VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <QInput
+                        :label="t('supplier.billingData.payDay')"
+                        type="number"
+                        v-model="data.payDay"
+                    />
+                </div>
+            </VnRow>
+        </template>
+    </FormModel>
+</template>
diff --git a/src/pages/Supplier/Card/SupplierFiscalData.vue b/src/pages/Supplier/Card/SupplierFiscalData.vue
index dd018ac60..ebf1b96b6 100644
--- a/src/pages/Supplier/Card/SupplierFiscalData.vue
+++ b/src/pages/Supplier/Card/SupplierFiscalData.vue
@@ -1 +1,292 @@
-<template>Supplier fiscal data</template>
+<script setup>
+import { ref } from 'vue';
+import { useRoute } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+
+import FetchData from 'components/FetchData.vue';
+import FormModel from 'components/FormModel.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelectCreate from 'src/components/common/VnSelectCreate.vue';
+import CustomerCreateNewPostcode from 'src/components/CreateNewPostcodeForm.vue';
+
+const route = useRoute();
+const { t } = useI18n();
+
+const postcodeFetchDataRef = ref(null);
+const sageTaxTypesOptions = ref([]);
+const sageWithholdingsOptions = ref([]);
+const sageTransactionTypesOptions = ref([]);
+const supplierActivitiesOptions = ref([]);
+const postcodesOptions = ref([]);
+const provincesLocationOptions = ref([]);
+const townsLocationOptions = ref([]);
+const countriesOptions = ref([]);
+
+const onPostcodeCreated = async () => {
+    postcodeFetchDataRef.value.fetch();
+};
+</script>
+<template>
+    <FetchData
+        url="SageTaxTypes"
+        auto-load
+        @on-fetch="(data) => (sageTaxTypesOptions = data)"
+    />
+    <FetchData
+        url="SageWithholdings"
+        auto-load
+        @on-fetch="(data) => (sageWithholdingsOptions = data)"
+    />
+    <FetchData
+        url="sageTransactionTypes"
+        auto-load
+        @on-fetch="(data) => (sageTransactionTypesOptions = data)"
+    />
+    <FetchData
+        url="SupplierActivities"
+        auto-load
+        @on-fetch="(data) => (supplierActivitiesOptions = data)"
+    />
+    <FetchData
+        ref="postcodeFetchDataRef"
+        url="Postcodes/location"
+        @on-fetch="(data) => (postcodesOptions = data)"
+        auto-load
+    />
+    <FetchData
+        @on-fetch="(data) => (townsLocationOptions = data)"
+        auto-load
+        url="Towns/location"
+    />
+    <FetchData
+        @on-fetch="(data) => (provincesLocationOptions = data)"
+        auto-load
+        url="Provinces/location"
+    />
+    <FetchData
+        @on-fetch="(data) => (countriesOptions = data)"
+        auto-load
+        url="Countries"
+    />
+    <FormModel
+        :url="`Suppliers/${route.params.id}`"
+        :url-update="`Suppliers/${route.params.id}/updateFiscalData`"
+        model="supplier"
+        auto-load
+    >
+        <template #form="{ data, validate }">
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnInput
+                        v-model="data.name"
+                        :label="t('supplier.fiscalData.name')"
+                        clearable
+                    />
+                </div>
+                <div class="col">
+                    <VnInput
+                        v-model="data.nif"
+                        :label="t('supplier.fiscalData.nif')"
+                        clearable
+                    />
+                </div>
+            </VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnInput
+                        v-model="data.account"
+                        :label="t('supplier.fiscalData.account')"
+                        clearable
+                    />
+                </div>
+                <div class="col">
+                    <VnSelectFilter
+                        :label="t('supplier.fiscalData.sageTaxTypeFk')"
+                        v-model="data.sageTaxTypeFk"
+                        :options="sageTaxTypesOptions"
+                        option-value="id"
+                        option-label="vat"
+                        hide-selected
+                        map-options
+                    />
+                </div>
+            </VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnSelectFilter
+                        :label="t('supplier.fiscalData.sageWithholdingFk')"
+                        v-model="data.sageWithholdingFk"
+                        :options="sageWithholdingsOptions"
+                        option-value="id"
+                        option-label="withholding"
+                        hide-selected
+                        map-options
+                    />
+                </div>
+                <div class="col">
+                    <VnSelectFilter
+                        :label="t('supplier.fiscalData.sageTransactionTypeFk')"
+                        v-model="data.sageTransactionTypeFk"
+                        :options="sageTransactionTypesOptions"
+                        option-value="id"
+                        option-label="transaction"
+                        hide-selected
+                        map-options
+                    />
+                </div>
+            </VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnSelectFilter
+                        :label="t('supplier.fiscalData.supplierActivityFk')"
+                        v-model="data.supplierActivityFk"
+                        :options="supplierActivitiesOptions"
+                        option-value="code"
+                        option-label="name"
+                        hide-selected
+                        map-options
+                    />
+                </div>
+                <div class="col">
+                    <VnInput
+                        v-model="data.healthRegister"
+                        :label="t('supplier.fiscalData.healthRegister')"
+                        clearable
+                    />
+                </div>
+            </VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnInput
+                        v-model="data.street"
+                        :label="t('supplier.fiscalData.street')"
+                        clearable
+                    />
+                </div>
+                <div class="col">
+                    <VnSelectCreate
+                        v-model="data.postCode"
+                        :label="t('supplier.fiscalData.postcode')"
+                        :rules="validate('supplier.postCode')"
+                        :roles-allowed-to-create="['deliveryAssistant']"
+                        :options="postcodesOptions"
+                        option-label="code"
+                        option-value="code"
+                        map-options
+                        hide-selected
+                    >
+                        <template #form>
+                            <CustomerCreateNewPostcode
+                                @on-data-saved="onPostcodeCreated($event)"
+                            />
+                        </template>
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection v-if="scope.opt">
+                                    <QItemLabel>{{ scope.opt.code }}</QItemLabel>
+                                    <QItemLabel caption
+                                        >{{ scope.opt.code }} -
+                                        {{ scope.opt.town.name }} ({{
+                                            scope.opt.town.province.name
+                                        }},
+                                        {{
+                                            scope.opt.town.province.country.country
+                                        }})</QItemLabel
+                                    >
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelectCreate>
+                </div>
+            </VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnSelectFilter
+                        :label="t('supplier.fiscalData.city')"
+                        :options="townsLocationOptions"
+                        v-model="data.city"
+                        option-value="name"
+                        option-label="name"
+                        hide-selected
+                        :rules="validate('supplier.city')"
+                    >
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection>
+                                    <QItemLabel>{{ scope.opt.name }}</QItemLabel>
+                                    <QItemLabel caption
+                                        >{{ scope.opt.name }},
+                                        {{ scope.opt.province.name }} ({{
+                                            scope.opt.province.country.country
+                                        }})</QItemLabel
+                                    >
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelectFilter>
+                </div>
+                <div class="col">
+                    <VnSelectFilter
+                        :label="t('supplier.fiscalData.provinceFk')"
+                        :options="provincesLocationOptions"
+                        hide-selected
+                        option-label="name"
+                        option-value="id"
+                        v-model="data.provinceFk"
+                    >
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection>
+                                    <QItemLabel>{{
+                                        `${scope.opt.name} (${scope.opt.country.country})`
+                                    }}</QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelectFilter>
+                </div>
+            </VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnSelectFilter
+                        :label="t('supplier.fiscalData.country')"
+                        :options="countriesOptions"
+                        hide-selected
+                        option-label="country"
+                        option-value="id"
+                        v-model="data.countryFk"
+                        :rules="validate('postcode.countryFk')"
+                    />
+                </div>
+                <div class="col flex justify-around">
+                    <QCheckbox
+                        v-model="data.isTrucker"
+                        :label="t('supplier.fiscalData.isTrucker')"
+                    />
+                    <div class="row items-center">
+                        <QCheckbox
+                            v-model="data.isVies"
+                            :label="t('supplier.fiscalData.isVies')"
+                        />
+                        <QIcon name="info" size="xs" class="cursor-pointer q-ml-sm">
+                            <QTooltip>
+                                {{
+                                    t(
+                                        'When activating it, do not enter the country code in the ID field.'
+                                    )
+                                }}
+                            </QTooltip>
+                        </QIcon>
+                    </div>
+                </div>
+            </VnRow>
+        </template>
+    </FormModel>
+</template>
+
+<i18n>
+es:
+    When activating it, do not enter the country code in the ID field.: Al activarlo, no informar el código del país en el campo nif
+</i18n>

From 5e9006bf331f730fe66175b7823e1f2478c89b63 Mon Sep 17 00:00:00 2001
From: Kevin Martinez <kevin.martinez@mindshore.io>
Date: Thu, 4 Jan 2024 00:58:08 -0400
Subject: [PATCH 02/94] Fix travel summary cards

---
 src/pages/Travel/Card/TravelSummary.vue | 112 ++++++++++--------------
 1 file changed, 45 insertions(+), 67 deletions(-)

diff --git a/src/pages/Travel/Card/TravelSummary.vue b/src/pages/Travel/Card/TravelSummary.vue
index 3bc5f0584..946bb7426 100644
--- a/src/pages/Travel/Card/TravelSummary.vue
+++ b/src/pages/Travel/Card/TravelSummary.vue
@@ -218,75 +218,53 @@ const openEntryDescriptor = () => {};
         </template>
 
         <template #body>
-            <QCard class="vn-one row justify-around" style="min-width: 100%">
-                <VnRow>
-                    <div class="col">
-                        <VnLv
-                            :label="t('globals.shipped')"
-                            :value="toDate(travel.shipped)"
+            <QCard class="vn-one">
+                <VnLv
+                    :label="t('globals.shipped')"
+                    :value="toDate(travel.shipped)"
+                />
+                <VnLv
+                    :label="t('globals.wareHouseOut')"
+                    :value="travel.warehouseOut?.name"
+                />
+                <VnLv :label="t('travel.summary.delivered')" class="q-mb-xs">
+                    <template #value>
+                        <QCheckbox
+                            v-model="travel.isDelivered"
+                            disable
+                            dense
+                            class="full-width q-my-xs"
                         />
-                    </div>
-                    <div class="col">
-                        <VnLv
-                            :label="t('globals.wareHouseOut')"
-                            :value="travel.warehouseOut?.name"
-                        />
-                    </div>
-                    <div class="col">
-                        <VnLv :label="t('travel.summary.delivered')" class="q-mb-xs">
-                            <template #value>
-                                <QCheckbox
-                                    v-model="travel.isDelivered"
-                                    disable
-                                    dense
-                                    class="full-width q-my-xs"
-                                />
-                            </template>
-                        </VnLv>
-                    </div>
-                </VnRow>
-                <VnRow>
-                    <div class="col">
-                        <VnLv
-                            :label="t('globals.landed')"
-                            :value="toDate(travel.landed)"
-                        />
-                    </div>
-                    <div class="col">
-                        <VnLv
-                            :label="t('globals.wareHouseIn')"
-                            :value="travel.warehouseIn?.name"
-                        />
-                    </div>
-                    <div class="col">
-                        <VnLv :label="t('travel.summary.received')" class="q-mb-xs">
-                            <template #value>
-                                <QCheckbox
-                                    v-model="travel.isReceived"
-                                    disable
-                                    dense
-                                    class="full-width q-mb-xs"
-                                />
-                            </template>
-                        </VnLv>
-                    </div>
-                </VnRow>
-                <VnRow>
-                    <div class="col">
-                        <VnLv :label="t('globals.agency')" :value="travel.agency?.name" />
-                    </div>
-                    <div class="col">
-                        <VnLv :label="t('globals.reference')" :value="travel.ref" />
-                    </div>
-                    <div class="col">
-                        <VnLv label="m³" :value="travel.m3" />
-                    </div>
-                    <div class="col">
-                        <VnLv :label="t('globals.totalEntries')" :value="travel.m3" />
-                    </div>
-                </VnRow>
+                    </template>
+                </VnLv>
             </QCard>
-            <QCard class="vn-two" v-if="entriesTableRows.length > 0">
+            <QCard class="vn-one">
+                <VnLv
+                    :label="t('globals.landed')"
+                    :value="toDate(travel.landed)"
+                />
+                <VnLv
+                    :label="t('globals.wareHouseIn')"
+                    :value="travel.warehouseIn?.name"
+                />
+                <VnLv :label="t('travel.summary.received')" class="q-mb-xs">
+                    <template #value>
+                        <QCheckbox
+                            v-model="travel.isReceived"
+                            disable
+                            dense
+                            class="full-width q-mb-xs"
+                        />
+                    </template>
+                </VnLv>
+            </QCard>
+            <QCard class="vn-one">
+                <VnLv :label="t('globals.agency')" :value="travel.agency?.name" />
+                <VnLv :label="t('globals.reference')" :value="travel.ref" />
+                <VnLv label="m³" :value="travel.m3" />
+                <VnLv :label="t('globals.totalEntries')" :value="travel.m3" />
+            </QCard>
+            <QCard class="full-width" v-if="entriesTableRows.length > 0">
                 <a class="header" :href="travelUrl + 'entry'">
                     {{ t('travel.summary.entries') }}
                     <QIcon name="open_in_new" color="primary" />

From 4d0d051c8ae3a6ac97329d8d5d8efaf225236c6c Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Fri, 5 Jan 2024 08:51:03 -0300
Subject: [PATCH 03/94] supplier log submodule

---
 src/pages/Supplier/Card/SupplierLog.vue | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/pages/Supplier/Card/SupplierLog.vue b/src/pages/Supplier/Card/SupplierLog.vue
index 2733e958d..86ee15fce 100644
--- a/src/pages/Supplier/Card/SupplierLog.vue
+++ b/src/pages/Supplier/Card/SupplierLog.vue
@@ -1 +1,6 @@
-<template>Supplier log</template>
+<script setup>
+import VnLog from 'src/components/common/VnLog.vue';
+</script>
+<template>
+    <VnLog model="Supplier" url="/SupplierLogs"></VnLog>
+</template>

From 473e96ffb41525a16d7f6d92c66c5bc75b71463c Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Mon, 8 Jan 2024 11:32:42 -0300
Subject: [PATCH 04/94] wip

---
 src/components/CreateBankEntityForm.vue       |   9 +-
 src/i18n/en/index.js                          |  19 +-
 src/i18n/es/index.js                          |  19 +-
 src/pages/Supplier/Card/SupplierAccounts.vue  | 178 +++++++++++++++++-
 src/pages/Supplier/Card/SupplierAddresses.vue |  90 ++++++++-
 src/pages/Supplier/Card/SupplierCard.vue      |   4 +-
 src/pages/Supplier/Card/SupplierContacts.vue  | 118 +++++++++++-
 7 files changed, 430 insertions(+), 7 deletions(-)

diff --git a/src/components/CreateBankEntityForm.vue b/src/components/CreateBankEntityForm.vue
index f4f5fef7d..2a1385945 100644
--- a/src/components/CreateBankEntityForm.vue
+++ b/src/components/CreateBankEntityForm.vue
@@ -7,6 +7,13 @@ import FetchData from 'components/FetchData.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import FormModelPopup from './FormModelPopup.vue';
 
+const props = defineProps({
+    showEntityField: {
+        type: Boolean,
+        default: true,
+    },
+});
+
 const emit = defineEmits(['onDataSaved']);
 
 const { t } = useI18n();
@@ -73,7 +80,7 @@ const onDataSaved = (data) => {
                         :rules="validate('bankEntity.countryFk')"
                     />
                 </div>
-                <div class="col">
+                <div v-if="showEntityField" class="col">
                     <QInput :label="t('id')" v-model="data.id" />
                 </div>
             </VnRow>
diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index d6c569618..5682113b2 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -62,7 +62,7 @@ export default {
         selectRows: 'Select all { numberRows } row(s)',
         allRows: 'All { numberRows } row(s)',
         markAll: 'Mark all',
-        noResults: 'No results'
+        noResults: 'No results',
     },
     errors: {
         statusUnauthorized: 'Access denied',
@@ -905,6 +905,23 @@ export default {
             payDemFk: 'Payment deadline',
             payDay: 'Pay day',
         },
+        accounts: {
+            iban: 'Iban',
+            bankEntity: 'Bank entity',
+            beneficiary: 'Beneficiary',
+        },
+        contacts: {
+            name: 'Name',
+            phone: 'Phone',
+            mobile: 'Mobile',
+            email: 'Email',
+            observation: 'Notes',
+        },
+        addresses: {
+            street: 'Street',
+            postcode: 'Postcode',
+            phone: 'Phone',
+        },
     },
     travel: {
         pageTitles: {
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index 6fd60bfd9..e3a2ec5db 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -62,7 +62,7 @@ export default {
         selectRows: 'Seleccionar las { numberRows } filas(s)',
         allRows: 'Todo { numberRows } filas(s)',
         markAll: 'Marcar todo',
-        noResults: 'Sin resultados'
+        noResults: 'Sin resultados',
     },
     errors: {
         statusUnauthorized: 'Acceso denegado',
@@ -904,6 +904,23 @@ export default {
             payDemFk: 'Plazo de pago',
             payDay: 'Día de pago',
         },
+        accounts: {
+            iban: 'Iban',
+            bankEntity: 'Entidad bancaria',
+            beneficiary: 'Beneficiario',
+        },
+        contacts: {
+            name: 'Nombre',
+            phone: 'Teléfono',
+            mobile: 'Móvil',
+            email: 'Email',
+            observation: 'Notas',
+        },
+        addresses: {
+            street: 'Dirección',
+            postcode: 'Código postal',
+            phone: 'Teléfono',
+        },
     },
     travel: {
         pageTitles: {
diff --git a/src/pages/Supplier/Card/SupplierAccounts.vue b/src/pages/Supplier/Card/SupplierAccounts.vue
index 2b7059ea3..30edfb2fd 100644
--- a/src/pages/Supplier/Card/SupplierAccounts.vue
+++ b/src/pages/Supplier/Card/SupplierAccounts.vue
@@ -1 +1,177 @@
-<template>Supplier accounts</template>
+<script setup>
+import { ref, onMounted } from 'vue';
+import { useRoute } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+
+import FetchData from 'components/FetchData.vue';
+import CrudModel from 'components/CrudModel.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import CreateBankEntityForm from 'src/components/CreateBankEntityForm.vue';
+import VnSelectCreate from 'src/components/common/VnSelectCreate.vue';
+
+import axios from 'axios';
+import useNotify from 'src/composables/useNotify.js';
+import { useQuasar } from 'quasar';
+
+const quasar = useQuasar();
+const { notify } = useNotify();
+const route = useRoute();
+const { t } = useI18n();
+const supplier = ref(null);
+const supplierAccountRef = ref(null);
+const wireTransferFk = ref(null);
+const bankEntitiesOptions = ref([]);
+
+const onBankEntityCreated = (data) => {
+    bankEntitiesOptions.value.push(data);
+};
+
+const onChangesSaved = () => {
+    if (supplier.value.payMethodFk !== wireTransferFk.value)
+        quasar
+            .dialog({
+                message: t('Do you want to change the pay method to wire transfer?'),
+                ok: {
+                    push: true,
+                    color: 'primary',
+                },
+                cancel: true,
+            })
+            .onOk(async () => {
+                await setWireTransfer();
+            });
+};
+
+const setWireTransfer = async () => {
+    try {
+        const params = {
+            id: route.params.id,
+            payMethodFk: wireTransferFk.value,
+        };
+
+        await axios.patch(`Suppliers/${route.params.id}`, params);
+        notify('globals.dataSaved', 'positive');
+    } catch (err) {
+        console.error('Error setting wire transfer', err);
+    }
+};
+
+onMounted(() => {
+    if (supplierAccountRef.value) supplierAccountRef.value.reload();
+});
+</script>
+<template>
+    <FetchData
+        url="BankEntities"
+        @on-fetch="(data) => (bankEntitiesOptions = data)"
+        auto-load
+    />
+    <FetchData
+        url="payMethods/findOne"
+        @on-fetch="(data) => (wireTransferFk = data.id)"
+        :filter="{ where: { code: 'wireTransfer' } }"
+        auto-load
+    />
+    <FetchData
+        :url="`Suppliers/${route.params.id}`"
+        @on-fetch="(data) => (supplier = data)"
+        auto-load
+    />
+    <CrudModel
+        data-key="SupplierAccount"
+        url="SupplierAccounts"
+        model="SupplierAccounts"
+        :filter="{
+            fields: ['id', 'supplierFk', 'iban', 'bankEntityFk', 'beneficiary'],
+            where: { supplierFk: route.params.id },
+        }"
+        ref="supplierAccountRef"
+        :default-remove="false"
+        :data-required="{ supplierFk: route.params.id }"
+        @save-changes="onChangesSaved()"
+    >
+        <template #body="{ rows }">
+            <QCard class="q-pa-md">
+                <VnRow
+                    v-for="(row, index) in rows"
+                    :key="index"
+                    class="row q-gutter-md q-mb-md"
+                >
+                    <div class="col">
+                        <VnInput
+                            :label="t('supplier.accounts.iban')"
+                            v-model="row.iban"
+                        />
+                    </div>
+                    <div class="col">
+                        <VnSelectCreate
+                            :label="t('worker.create.bankEntity')"
+                            v-model="row.bankEntityFk"
+                            :options="bankEntitiesOptions"
+                            option-label="name"
+                            option-value="id"
+                            hide-selected
+                        >
+                            <template #form>
+                                <CreateBankEntityForm
+                                    @on-data-saved="onBankEntityCreated($event)"
+                                    :show-entity-field="false"
+                                />
+                            </template>
+                            <template #option="scope">
+                                <QItem v-bind="scope.itemProps">
+                                    <QItemSection v-if="scope.opt">
+                                        <QItemLabel
+                                            >{{ scope.opt.bic }}
+                                            {{ scope.opt.name }}</QItemLabel
+                                        >
+                                    </QItemSection>
+                                </QItem>
+                            </template>
+                        </VnSelectCreate>
+                    </div>
+                    <div class="col">
+                        <VnInput
+                            :label="t('supplier.accounts.beneficiary')"
+                            v-model="row.beneficiary"
+                        />
+                    </div>
+                    <div class="col-1 row justify-center items-center">
+                        <QIcon
+                            name="delete"
+                            size="sm"
+                            class="cursor-pointer"
+                            color="primary"
+                            @click="supplierAccountRef.remove([row])"
+                        >
+                            <QTooltip>
+                                {{ t('Remove account') }}
+                            </QTooltip>
+                        </QIcon>
+                    </div>
+                </VnRow>
+                <VnRow>
+                    <QIcon
+                        name="add"
+                        size="sm"
+                        class="cursor-pointer"
+                        color="primary"
+                        @click="supplierAccountRef.insert()"
+                    >
+                        <QTooltip>
+                            {{ t('Add account') }}
+                        </QTooltip>
+                    </QIcon>
+                </VnRow>
+            </QCard>
+        </template>
+    </CrudModel>
+</template>
+
+<i18n>
+    es:
+        Do you want to change the pay method to wire transfer?: ¿Quieres modificar la forma de pago a transferencia?
+        Add account: Añadir cuenta
+        Remove account: Remover cuenta
+</i18n>
diff --git a/src/pages/Supplier/Card/SupplierAddresses.vue b/src/pages/Supplier/Card/SupplierAddresses.vue
index dd82abe78..17c9e7c4c 100644
--- a/src/pages/Supplier/Card/SupplierAddresses.vue
+++ b/src/pages/Supplier/Card/SupplierAddresses.vue
@@ -1 +1,89 @@
-<template>Supplier addresses</template>
+<script setup>
+import { useI18n } from 'vue-i18n';
+import { useRouter, useRoute } from 'vue-router';
+
+import VnPaginate from 'src/components/ui/VnPaginate.vue';
+import CardList from 'src/components/ui/CardList.vue';
+import VnLv from 'src/components/ui/VnLv.vue';
+
+const router = useRouter();
+const route = useRoute();
+const { t } = useI18n();
+
+const addressesFilter = {
+    fields: [
+        'id',
+        'nickname',
+        'street',
+        'city',
+        'provinceFk',
+        'phone',
+        'mobile',
+        'postalCode',
+    ],
+    order: ['nickname ASC'],
+    include: [
+        {
+            relation: 'province',
+            scope: {
+                fields: ['id', 'name'],
+            },
+        },
+    ],
+};
+
+const redirectToCreateView = () => {
+    router.push({ name: 'SupplierCreate' });
+};
+</script>
+
+<template>
+    <QPage class="column items-center q-pa-md">
+        <div class="card-list">
+            <VnPaginate
+                data-key="SupplierAddress"
+                :url="`Suppliers/${route.params.id}/addresses`"
+                :filter="addressesFilter"
+                auto-load
+            >
+                <template #body="{ rows }">
+                    <CardList
+                        v-for="row of rows"
+                        :key="row.id"
+                        :title="row.nickname"
+                        :id="row.id"
+                        @click="redirectToCreateView(row.id)"
+                    >
+                        <template #list-items>
+                            <VnLv
+                                :label="t('supplier.addresses.street')"
+                                :value="row.street"
+                            />
+                            <VnLv
+                                :label="t('supplier.addresses.postcode')"
+                                :value="`${row.postalCode} - ${row.city}, ${row.province.name}`"
+                            />
+                            <VnLv
+                                :label="t('supplier.addresses.phone')"
+                                :value="`${row.phone}, ${row.mobile}`"
+                            />
+                        </template>
+                    </CardList>
+                </template>
+            </VnPaginate>
+        </div>
+        <QPageSticky :offset="[20, 20]">
+            <QBtn fab icon="add" color="primary" @click="redirectToCreateView()" />
+            <QTooltip>
+                {{ t('supplier.list.newSupplier') }}
+            </QTooltip>
+        </QPageSticky>
+    </QPage>
+</template>
+
+<style lang="scss" scoped>
+.card-list {
+    width: 100%;
+    max-width: 60em;
+}
+</style>
diff --git a/src/pages/Supplier/Card/SupplierCard.vue b/src/pages/Supplier/Card/SupplierCard.vue
index 04115cc3d..8eeb79e6c 100644
--- a/src/pages/Supplier/Card/SupplierCard.vue
+++ b/src/pages/Supplier/Card/SupplierCard.vue
@@ -32,7 +32,9 @@ const { t } = useI18n();
                 <QSpace />
                 <div id="st-actions"></div>
             </QToolbar>
-            <div class="q-pa-md"><RouterView></RouterView></div>
+            <div class="q-pa-md">
+                <RouterView />
+            </div>
         </QPage>
     </QPageContainer>
 </template>
diff --git a/src/pages/Supplier/Card/SupplierContacts.vue b/src/pages/Supplier/Card/SupplierContacts.vue
index ca58d4ab7..2331bd7e9 100644
--- a/src/pages/Supplier/Card/SupplierContacts.vue
+++ b/src/pages/Supplier/Card/SupplierContacts.vue
@@ -1 +1,117 @@
-<template>Supplier contacts</template>
+<script setup>
+import { ref, onMounted } from 'vue';
+import { useRoute } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+
+import CrudModel from 'components/CrudModel.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+
+const route = useRoute();
+const { t } = useI18n();
+const supplierContactRef = ref(null);
+
+onMounted(() => {
+    if (supplierContactRef.value) supplierContactRef.value.reload();
+});
+</script>
+<template>
+    <CrudModel
+        data-key="SupplierContact"
+        url="SupplierContacts"
+        model="SupplierContact"
+        :filter="{
+            where: { supplierFk: route.params.id },
+        }"
+        ref="supplierContactRef"
+        :default-remove="false"
+        :data-required="{ supplierFk: route.params.id }"
+    >
+        <template #body="{ rows }">
+            <QCard class="q-pa-md">
+                <QCardSection
+                    v-for="(row, index) in rows"
+                    :key="index"
+                    class="border q-pa-md q-mb-md"
+                >
+                    <VnRow class="row q-gutter-md">
+                        <div class="col">
+                            <VnInput
+                                :label="t('supplier.contacts.name')"
+                                v-model="row.name"
+                            />
+                        </div>
+                        <div class="col">
+                            <VnInput
+                                :label="t('supplier.contacts.phone')"
+                                v-model="row.phone"
+                            />
+                        </div>
+                        <div class="col">
+                            <VnInput
+                                :label="t('supplier.contacts.mobile')"
+                                v-model="row.mobile"
+                            />
+                        </div>
+                        <div class="col">
+                            <VnInput
+                                :label="t('supplier.contacts.email')"
+                                v-model="row.email"
+                            />
+                        </div>
+                    </VnRow>
+                    <VnRow class="row q-gutter-md">
+                        <div class="col">
+                            <QInput
+                                :label="t('supplier.contacts.observation')"
+                                type="textarea"
+                                v-model="row.observation"
+                                fill-input
+                                autogrow
+                            />
+                        </div>
+                        <div class="col-1 row justify-center items-center">
+                            <QIcon
+                                name="delete"
+                                size="sm"
+                                class="cursor-pointer"
+                                color="primary"
+                                @click="supplierContactRef.remove([row])"
+                            >
+                                <QTooltip>
+                                    {{ t('Remove contact') }}
+                                </QTooltip>
+                            </QIcon>
+                        </div>
+                    </VnRow>
+                </QCardSection>
+                <VnRow>
+                    <QIcon
+                        name="add"
+                        size="sm"
+                        class="cursor-pointer"
+                        color="primary"
+                        @click="supplierContactRef.insert()"
+                    >
+                        <QTooltip>
+                            {{ t('Add contact') }}
+                        </QTooltip>
+                    </QIcon>
+                </VnRow>
+            </QCard>
+        </template>
+    </CrudModel>
+</template>
+
+<style lang="scss" scoped>
+.border {
+    border-radius: 0px !important;
+    border: 1px solid var(--vn-text) !important;
+}
+</style>
+
+<i18n>
+    es:
+        Add contact: Añadir contacto
+        Remove contact: Remover contacto
+</i18n>

From 865a13aafa6215ed9c97cfefead3c928f2b898ad Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Mon, 8 Jan 2024 16:16:42 -0300
Subject: [PATCH 05/94] Submodulos de suppliers: Accounts, Contacts y Addresses

---
 src/components/CreateNewPostcodeForm.vue      |   2 +-
 src/i18n/en/index.js                          |   4 +
 src/i18n/es/index.js                          |   4 +
 src/pages/Supplier/Card/SupplierAddresses.vue |  12 +-
 .../Supplier/Card/SupplierAddressesCreate.vue | 182 ++++++++++++++++++
 src/pages/Supplier/Card/SupplierContacts.vue  |   1 +
 src/router/modules/Supplier.js                |   6 +
 7 files changed, 208 insertions(+), 3 deletions(-)
 create mode 100644 src/pages/Supplier/Card/SupplierAddressesCreate.vue

diff --git a/src/components/CreateNewPostcodeForm.vue b/src/components/CreateNewPostcodeForm.vue
index 3504445f8..a8e999ae1 100644
--- a/src/components/CreateNewPostcodeForm.vue
+++ b/src/components/CreateNewPostcodeForm.vue
@@ -131,7 +131,7 @@ const onProvinceCreated = async () => {
 es:
     New postcode: Nuevo código postal
     Please, ensure you put the correct data!: ¡Por favor, asegúrese de poner los datos correctos!
-    City: Ciudad
+    City: Población
     Province: Provincia
     Country: País
     Postcode: Código postal
diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index 5682113b2..85a82ebe5 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -921,6 +921,10 @@ export default {
             street: 'Street',
             postcode: 'Postcode',
             phone: 'Phone',
+            name: 'Name',
+            city: 'City',
+            province: 'Province',
+            mobile: 'Mobile',
         },
     },
     travel: {
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index e3a2ec5db..44ce18cc9 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -920,6 +920,10 @@ export default {
             street: 'Dirección',
             postcode: 'Código postal',
             phone: 'Teléfono',
+            name: 'Nombre',
+            city: 'Población',
+            province: 'Provincia',
+            mobile: 'Móvil',
         },
     },
     travel: {
diff --git a/src/pages/Supplier/Card/SupplierAddresses.vue b/src/pages/Supplier/Card/SupplierAddresses.vue
index 17c9e7c4c..df7cff932 100644
--- a/src/pages/Supplier/Card/SupplierAddresses.vue
+++ b/src/pages/Supplier/Card/SupplierAddresses.vue
@@ -33,7 +33,15 @@ const addressesFilter = {
 };
 
 const redirectToCreateView = () => {
-    router.push({ name: 'SupplierCreate' });
+    router.push({ name: 'SupplierAddressesCreate' });
+};
+
+const redirectToUpdateView = (addressData) => {
+    const stringifiedAddressData = JSON.stringify(addressData);
+    router.push({
+        name: 'SupplierAddressesCreate',
+        query: { addressData: stringifiedAddressData },
+    });
 };
 </script>
 
@@ -52,7 +60,7 @@ const redirectToCreateView = () => {
                         :key="row.id"
                         :title="row.nickname"
                         :id="row.id"
-                        @click="redirectToCreateView(row.id)"
+                        @click="redirectToUpdateView(row)"
                     >
                         <template #list-items>
                             <VnLv
diff --git a/src/pages/Supplier/Card/SupplierAddressesCreate.vue b/src/pages/Supplier/Card/SupplierAddressesCreate.vue
new file mode 100644
index 000000000..8ad0959f5
--- /dev/null
+++ b/src/pages/Supplier/Card/SupplierAddressesCreate.vue
@@ -0,0 +1,182 @@
+<script setup>
+import { useI18n } from 'vue-i18n';
+import { reactive, ref, onMounted, onBeforeMount } from 'vue';
+import { useRouter, useRoute } from 'vue-router';
+
+import FetchData from 'components/FetchData.vue';
+import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import FormModel from 'components/FormModel.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import VnSelectCreate from 'src/components/common/VnSelectCreate.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import CustomerCreateNewPostcode from 'src/components/CreateNewPostcodeForm.vue';
+
+const { t } = useI18n();
+const route = useRoute();
+const router = useRouter();
+
+const provincesOptions = ref([]);
+const postcodesOptions = ref([]);
+const townsLocationOptions = ref([]);
+const viewAction = ref();
+const updateAddressId = ref(null);
+const newAddressForm = reactive({
+    nickname: null,
+    street: null,
+    postalCode: null,
+    city: null,
+    provinceFk: null,
+    phone: null,
+    mobile: null,
+});
+
+const onDataSaved = () => {
+    router.push({ name: 'SupplierAddresses' });
+};
+
+const updateAddressForm = (addressData) => {
+    for (let key in newAddressForm) {
+        if (key in addressData) {
+            newAddressForm[key] = addressData[key];
+        }
+    }
+};
+
+onBeforeMount(() => {
+    viewAction.value = route.query.addressData ? 'update' : 'create';
+
+    if (viewAction.value === 'create') newAddressForm.supplierFk = route.params.id;
+});
+
+onMounted(() => {
+    if (viewAction.value === 'update' && route.query.addressData) {
+        const addressData = JSON.parse(route.query.addressData);
+        updateAddressId.value = addressData.id;
+        updateAddressForm(addressData);
+    }
+});
+</script>
+
+<template>
+    <FetchData
+        ref="postcodeFetchDataRef"
+        url="Postcodes/location"
+        @on-fetch="(data) => (postcodesOptions = data)"
+        auto-load
+    />
+    <FetchData
+        ref="provincesFetchDataRef"
+        @on-fetch="(data) => (provincesOptions = data)"
+        auto-load
+        url="Provinces"
+    />
+    <FetchData
+        ref="townsFetchDataRef"
+        @on-fetch="(data) => (townsLocationOptions = data)"
+        auto-load
+        url="Towns/location"
+    />
+    <QPage>
+        <FormModel
+            model="supplierAddresses"
+            :form-initial-data="newAddressForm"
+            :url-update="
+                viewAction !== 'create' ? `SupplierAddresses/${updateAddressId}` : null
+            "
+            :url-create="viewAction === 'create' ? 'SupplierAddresses' : null"
+            :observe-form-changes="viewAction === 'create'"
+            @on-data-saved="onDataSaved()"
+        >
+            <template #form="{ data, validate }">
+                <VnRow class="row q-gutter-md q-mb-md">
+                    <div class="col">
+                        <VnInput
+                            v-model="data.nickname"
+                            :label="t('supplier.addresses.name')"
+                        />
+                    </div>
+                    <div class="col">
+                        <VnInput
+                            v-model="data.street"
+                            :label="t('supplier.addresses.street')"
+                        />
+                    </div>
+                </VnRow>
+                <VnRow class="row q-gutter-md q-mb-md">
+                    <div class="col">
+                        <VnSelectCreate
+                            v-model="data.postalCode"
+                            :label="t('supplier.addresses.postcode')"
+                            :rules="validate('supplierAddress.postcode')"
+                            :roles-allowed-to-create="['deliveryAssistant']"
+                            :options="postcodesOptions"
+                            option-label="code"
+                            option-value="code"
+                            hide-selected
+                        >
+                            <template #form>
+                                <CustomerCreateNewPostcode
+                                    @on-data-saved="onPostcodeCreated($event)"
+                                />
+                            </template>
+                            <template #option="scope">
+                                <QItem v-bind="scope.itemProps">
+                                    <QItemSection v-if="scope.opt">
+                                        <QItemLabel>{{ scope.opt.code }}</QItemLabel>
+                                        <QItemLabel caption
+                                            >{{ scope.opt.code }} -
+                                            {{ scope.opt.town.name }} ({{
+                                                scope.opt.town.province.name
+                                            }},
+                                            {{
+                                                scope.opt.town.province.country.country
+                                            }})</QItemLabel
+                                        >
+                                    </QItemSection>
+                                </QItem>
+                            </template>
+                        </VnSelectCreate>
+                    </div>
+                    <div class="col">
+                        <VnSelectFilter
+                            :label="t('supplier.addresses.city')"
+                            :options="townsLocationOptions"
+                            v-model="data.city"
+                            hide-selected
+                            option-label="name"
+                            option-value="id"
+                        />
+                    </div>
+                </VnRow>
+                <VnRow class="row q-gutter-md q-mb-md">
+                    <div class="col">
+                        <VnSelectFilter
+                            :label="t('supplier.addresses.province')"
+                            :options="provincesOptions"
+                            hide-selected
+                            map-options
+                            option-label="name"
+                            option-value="id"
+                            v-model="data.provinceFk"
+                        />
+                    </div>
+                    <div class="col">
+                        <VnInput
+                            v-model="data.phone"
+                            :label="t('supplier.addresses.phone')"
+                        />
+                    </div>
+                </VnRow>
+                <VnRow class="row q-gutter-md q-mb-md">
+                    <div class="col">
+                        <VnInput
+                            v-model="data.mobile"
+                            :label="t('supplier.addresses.mobile')"
+                        />
+                    </div>
+                    <div class="col" />
+                </VnRow>
+            </template>
+        </FormModel>
+    </QPage>
+</template>
diff --git a/src/pages/Supplier/Card/SupplierContacts.vue b/src/pages/Supplier/Card/SupplierContacts.vue
index 2331bd7e9..d69b74a4c 100644
--- a/src/pages/Supplier/Card/SupplierContacts.vue
+++ b/src/pages/Supplier/Card/SupplierContacts.vue
@@ -15,6 +15,7 @@ onMounted(() => {
     if (supplierContactRef.value) supplierContactRef.value.reload();
 });
 </script>
+
 <template>
     <CrudModel
         data-key="SupplierContact"
diff --git a/src/router/modules/Supplier.js b/src/router/modules/Supplier.js
index 6ce1a7688..76b485d6b 100644
--- a/src/router/modules/Supplier.js
+++ b/src/router/modules/Supplier.js
@@ -134,6 +134,12 @@ export default {
                     component: () =>
                         import('src/pages/Supplier/Card/SupplierAddresses.vue'),
                 },
+                {
+                    path: 'address/create',
+                    name: 'SupplierAddressesCreate',
+                    component: () =>
+                        import('src/pages/Supplier/Card/SupplierAddressesCreate.vue'),
+                },
                 {
                     path: 'consumption',
                     name: 'SupplierConsumption',

From c21afccf7533955dfad64ea6ef85178481560291 Mon Sep 17 00:00:00 2001
From: carlosfonseca <carlos.fonseca@mindshore.io>
Date: Mon, 8 Jan 2024 14:25:21 -0500
Subject: [PATCH 06/94] Se crea el formulario para agregar nuevas observaciones
 en la tablade morosos

---
 .../Customer/Defaulter/CustomerDefaulter.vue  | 44 +++++++----
 .../CustomerDefaulterAddObservation.vue       | 79 +++++++++++++++++++
 2 files changed, 108 insertions(+), 15 deletions(-)
 create mode 100644 src/pages/Customer/Defaulter/CustomerDefaulterAddObservation.vue

diff --git a/src/pages/Customer/Defaulter/CustomerDefaulter.vue b/src/pages/Customer/Defaulter/CustomerDefaulter.vue
index d54d5df35..aff57318f 100644
--- a/src/pages/Customer/Defaulter/CustomerDefaulter.vue
+++ b/src/pages/Customer/Defaulter/CustomerDefaulter.vue
@@ -2,7 +2,7 @@
 import { ref, computed, onBeforeMount } from 'vue';
 import { useI18n } from 'vue-i18n';
 
-import { QBtn, QCheckbox } from 'quasar';
+import { QBtn, QCheckbox, useQuasar } from 'quasar';
 
 import { toCurrency, toDate } from 'filters/index';
 import { useArrayData } from 'composables/useArrayData';
@@ -12,12 +12,19 @@ import CustomerNotificationsFilter from './CustomerDefaulterFilter.vue';
 import CustomerBalanceDueTotal from './CustomerBalanceDueTotal.vue';
 import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
+import CustomerDefaulterAddObservation from './CustomerDefaulterAddObservation.vue';
 
 const { t } = useI18n();
 const stateStore = useStateStore();
+const quasar = useQuasar();
 
 const arrayData = ref(null);
 const balanceDueTotal = ref(0);
+const customerId = ref(0);
+const selected = ref([]);
+const workerId = ref(0);
+
+const rows = computed(() => arrayData.value.store.data);
 
 onBeforeMount(async () => {
     arrayData.value = useArrayData('CustomerDefaulter', {
@@ -31,16 +38,9 @@ onBeforeMount(async () => {
         },
         0
     );
-    console.log(balanceDueTotal.value);
     stateStore.rightDrawer = true;
 });
 
-const rows = computed(() => arrayData.value.store.data);
-
-const selected = ref([]);
-const workerId = ref(0);
-const customerId = ref(0);
-
 const tableColumnComponents = {
     client: {
         component: QBtn,
@@ -49,11 +49,10 @@ const tableColumnComponents = {
     },
     isWorker: {
         component: QCheckbox,
-        props: ({ value }) => ({
+        props: ({ row }) => ({
             disable: true,
-            'model-value': Boolean(value),
+            'model-value': Boolean(row.selected),
         }),
-        event: () => {},
     },
     salesperson: {
         component: QBtn,
@@ -180,6 +179,15 @@ const selectWorkerId = (id) => {
     customerId.value = 0;
     workerId.value = id;
 };
+
+const viewAddObservation = (rowsSelected) => {
+    quasar.dialog({
+        component: CustomerDefaulterAddObservation,
+        componentProps: {
+            clients: rowsSelected,
+        },
+    });
+};
 </script>
 
 <template>
@@ -190,11 +198,17 @@ const selectWorkerId = (id) => {
     </QDrawer>
 
     <QToolbar class="bg-vn-dark">
-        <div id="st-data">
+        <div id="st-data" class="row">
             <CustomerBalanceDueTotal :amount="balanceDueTotal" />
+            <div class="flex items-center q-ml-lg">
+                <QBtn
+                    color="primary"
+                    icon="vn:notes"
+                    :disabled="!selected.length"
+                    @click.stop="viewAddObservation(selected)"
+                />
+            </div>
         </div>
-        <QSpace />
-        <div id="st-actions"></div>
     </QToolbar>
 
     <QPage class="column items-center q-pa-md">
@@ -204,7 +218,7 @@ const selectWorkerId = (id) => {
             :rows="rows"
             class="full-width q-mt-md"
             hide-bottom
-            row-key="id"
+            row-key="clientFk"
             selection="multiple"
             v-model:selected="selected"
         >
diff --git a/src/pages/Customer/Defaulter/CustomerDefaulterAddObservation.vue b/src/pages/Customer/Defaulter/CustomerDefaulterAddObservation.vue
new file mode 100644
index 000000000..4a828b492
--- /dev/null
+++ b/src/pages/Customer/Defaulter/CustomerDefaulterAddObservation.vue
@@ -0,0 +1,79 @@
+<script setup>
+import { ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import axios from 'axios';
+
+import VnRow from 'components/ui/VnRow.vue';
+
+const $props = defineProps({
+    clients: {
+        type: Array,
+        required: true,
+    },
+});
+
+const { t } = useI18n();
+
+const newObservation = ref(null);
+
+const onSubmit = async () => {
+    const data = $props.clients.map((item) => {
+        return { clientFk: item.clientFk, text: newObservation.value };
+    });
+    await axios.post('ClientObservations', data);
+    const payload = {
+        defaulters: $props.clients,
+        observation: newObservation.value,
+    };
+    await axios.post('Defaulters/observationEmail', payload);
+};
+</script>
+
+<template>
+    <QDialog ref="dialogRef">
+        <QCard class="q-pa-md q-mb-md">
+            <QCardSection>
+                <QForm @submit="onSubmit()" class="q-pa-sm">
+                    <div>
+                        {{
+                            t('Add observation to all selected clients', {
+                                numberClients: t($props.clients.length),
+                            })
+                        }}
+                    </div>
+                    <VnRow class="row q-gutter-md q-mb-md">
+                        <div class="col">
+                            <QInput
+                                :label="t('Message')"
+                                type="textarea"
+                                v-model="newObservation"
+                            />
+                        </div>
+                    </VnRow>
+                    <div class="q-mt-lg row justify-end">
+                        <QBtn
+                            :label="t('globals.cancel')"
+                            color="primary"
+                            flat
+                            class="q-mr-md"
+                            v-close-popup
+                        />
+                        <QBtn
+                            :label="t('globals.save')"
+                            type="submit"
+                            color="primary"
+                            v-close-popup
+                        />
+                    </div>
+                </QForm>
+            </QCardSection>
+        </QCard>
+    </QDialog>
+</template>
+
+<i18n>
+    es:
+        Add observation to all selected clients: Añadir observación a { numberClients } cliente(s) seleccionado(s)
+        Message: Mensaje
+</i18n>

From dd8373ea2208990497205a21fa232e221b4cacfe Mon Sep 17 00:00:00 2001
From: carlosfonseca <carlos.fonseca@mindshore.io>
Date: Mon, 8 Jan 2024 17:28:56 -0500
Subject: [PATCH 07/94] Se hacen mejoras al momento de hacer las peticiones y
 se refresca la data actualizada

---
 .../Customer/Defaulter/CustomerDefaulter.vue  | 39 ++++++++++++-------
 .../CustomerDefaulterAddObservation.vue       | 39 ++++++++++++++-----
 2 files changed, 54 insertions(+), 24 deletions(-)

diff --git a/src/pages/Customer/Defaulter/CustomerDefaulter.vue b/src/pages/Customer/Defaulter/CustomerDefaulter.vue
index aff57318f..bf7480985 100644
--- a/src/pages/Customer/Defaulter/CustomerDefaulter.vue
+++ b/src/pages/Customer/Defaulter/CustomerDefaulter.vue
@@ -26,21 +26,6 @@ const workerId = ref(0);
 
 const rows = computed(() => arrayData.value.store.data);
 
-onBeforeMount(async () => {
-    arrayData.value = useArrayData('CustomerDefaulter', {
-        url: 'Defaulters/filter',
-        limit: 0,
-    });
-    await arrayData.value.fetch({ append: false });
-    balanceDueTotal.value = arrayData.value.store.data.reduce(
-        (accumulator, currentValue) => {
-            return accumulator + (currentValue['amount'] || 0);
-        },
-        0
-    );
-    stateStore.rightDrawer = true;
-});
-
 const tableColumnComponents = {
     client: {
         component: QBtn,
@@ -170,6 +155,25 @@ const columns = computed(() => [
     },
 ]);
 
+onBeforeMount(() => {
+    getArrayData();
+});
+
+const getArrayData = async () => {
+    arrayData.value = useArrayData('CustomerDefaulter', {
+        url: 'Defaulters/filter',
+        limit: 0,
+    });
+    await arrayData.value.fetch({ append: false });
+    balanceDueTotal.value = arrayData.value.store.data.reduce(
+        (accumulator, currentValue) => {
+            return accumulator + (currentValue['amount'] || 0);
+        },
+        0
+    );
+    stateStore.rightDrawer = true;
+};
+
 const selectCustomerId = (id) => {
     workerId.value = 0;
     customerId.value = id;
@@ -185,9 +189,14 @@ const viewAddObservation = (rowsSelected) => {
         component: CustomerDefaulterAddObservation,
         componentProps: {
             clients: rowsSelected,
+            promise: refreshData,
         },
     });
 };
+
+const refreshData = () => {
+    getArrayData();
+};
 </script>
 
 <template>
diff --git a/src/pages/Customer/Defaulter/CustomerDefaulterAddObservation.vue b/src/pages/Customer/Defaulter/CustomerDefaulterAddObservation.vue
index 4a828b492..b150f4d8b 100644
--- a/src/pages/Customer/Defaulter/CustomerDefaulterAddObservation.vue
+++ b/src/pages/Customer/Defaulter/CustomerDefaulterAddObservation.vue
@@ -3,6 +3,7 @@ import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 
 import axios from 'axios';
+import { useQuasar } from 'quasar';
 
 import VnRow from 'components/ui/VnRow.vue';
 
@@ -11,22 +12,42 @@ const $props = defineProps({
         type: Array,
         required: true,
     },
+    promise: {
+        type: Function,
+        required: true,
+    },
 });
 
 const { t } = useI18n();
+const quasar = useQuasar();
 
 const newObservation = ref(null);
 
 const onSubmit = async () => {
-    const data = $props.clients.map((item) => {
-        return { clientFk: item.clientFk, text: newObservation.value };
-    });
-    await axios.post('ClientObservations', data);
-    const payload = {
-        defaulters: $props.clients,
-        observation: newObservation.value,
-    };
-    await axios.post('Defaulters/observationEmail', payload);
+    try {
+        const data = $props.clients.map((item) => {
+            return { clientFk: item.clientFk, text: newObservation.value };
+        });
+        await axios.post('ClientObservations', data);
+
+        const payload = {
+            defaulters: $props.clients,
+            observation: newObservation.value,
+        };
+        await axios.post('Defaulters/observationEmail', payload);
+
+        await $props.promise();
+
+        quasar.notify({
+            message: t('globals.dataSaved'),
+            type: 'positive',
+        });
+    } catch (error) {
+        quasar.notify({
+            message: t(`${error.message}`),
+            type: 'negative',
+        });
+    }
 };
 </script>
 

From 091446178bb743bd07500c9f2c291cedb80b05ae Mon Sep 17 00:00:00 2001
From: carlosfonseca <carlos.fonseca@mindshore.io>
Date: Tue, 9 Jan 2024 08:23:19 -0500
Subject: [PATCH 08/94] Se crea tarjeta de data fiscal

---
 .../Customer/Card/CustomerFiscalData.vue      | 282 +++++++++++++++++-
 1 file changed, 281 insertions(+), 1 deletion(-)

diff --git a/src/pages/Customer/Card/CustomerFiscalData.vue b/src/pages/Customer/Card/CustomerFiscalData.vue
index ced6012b8..b4fe1fd30 100644
--- a/src/pages/Customer/Card/CustomerFiscalData.vue
+++ b/src/pages/Customer/Card/CustomerFiscalData.vue
@@ -1,3 +1,283 @@
+<script setup>
+import { ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useRoute } from 'vue-router';
+
+import FetchData from 'components/FetchData.vue';
+import FormModel from 'components/FormModel.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import CustomerCreateNewPostcode from 'src/components/CreateNewPostcodeForm.vue';
+import VnSelectCreate from 'src/components/common/VnSelectCreate.vue';
+
+const { t } = useI18n();
+const route = useRoute();
+
+const typesTaxes = ref([]);
+const typesTransactions = ref([]);
+const postcodeFetchDataRef = ref(null);
+const citiesLocationOptions = ref([]);
+const provincesLocationOptions = ref([]);
+const countriesOptions = ref([]);
+const postcodesOptions = ref([]);
+
+const onPostcodeCreated = async () => {
+    postcodeFetchDataRef.value.fetch();
+};
+</script>
+
 <template>
-    <div class="flex justify-center">Fiscal data</div>
+    <fetch-data auto-load @on-fetch="(data) => (typesTaxes = data)" url="SageTaxTypes" />
+    <fetch-data
+        auto-load
+        @on-fetch="(data) => (typesTransactions = data)"
+        url="SageTransactionTypes"
+    />
+    <FetchData
+        @on-fetch="(data) => (citiesLocationOptions = data)"
+        auto-load
+        url="Towns/location"
+    />
+    <FetchData
+        @on-fetch="(data) => (provincesLocationOptions = data)"
+        auto-load
+        url="Provinces/location"
+    />
+    <FetchData
+        @on-fetch="(data) => (countriesOptions = data)"
+        auto-load
+        url="Countries"
+    />
+
+    <FormModel
+        :url-update="`Clients/${route.params.id}/updateFiscalData`"
+        :url="`Clients/${route.params.id}/getCard`"
+        auto-load
+        model="customer"
+    >
+        <template #form="{ data, validate }">
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnInput
+                        :label="t('Social name')"
+                        :rules="validate('client.socialName')"
+                        v-model="data.socialName"
+                    />
+                </div>
+                <div class="col">
+                    <VnInput :label="t('Tax number')" v-model="data.fi" />
+                </div>
+            </VnRow>
+
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnInput :label="t('Street')" v-model="data.street" />
+                </div>
+            </VnRow>
+
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnSelectFilter
+                        :label="t('Sage tax type')"
+                        :options="typesTaxes"
+                        hide-selected
+                        option-label="vat"
+                        option-value="id"
+                        v-model="data.sageTaxTypeFk"
+                    />
+                </div>
+                <div class="col">
+                    <VnSelectFilter
+                        :label="t('Sage transaction type')"
+                        :options="typesTransactions"
+                        hide-selected
+                        option-label="vat"
+                        option-value="id"
+                        v-model="data.sageTransactionTypeFk"
+                    />
+                </div>
+            </VnRow>
+
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnSelectCreate
+                        :label="t('Postcode')"
+                        :options="postcodesOptions"
+                        :roles-allowed-to-create="['deliveryAssistant']"
+                        :rules="validate('Worker.postcode')"
+                        hide-selected
+                        option-label="code"
+                        option-value="code"
+                        v-model="data.postcode"
+                    >
+                        <template #form>
+                            <CustomerCreateNewPostcode
+                                @on-data-saved="onPostcodeCreated($event)"
+                            />
+                        </template>
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection v-if="scope.opt">
+                                    <QItemLabel>{{ scope.opt.code }}</QItemLabel>
+                                    <QItemLabel caption
+                                        >{{ scope.opt.code }} -
+                                        {{ scope.opt.town.name }} ({{
+                                            scope.opt.town.province.name
+                                        }},
+                                        {{
+                                            scope.opt.town.province.country.country
+                                        }})</QItemLabel
+                                    >
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelectCreate>
+                </div>
+                <div class="col">
+                    <!-- ciudades -->
+                    <VnSelectFilter
+                        :label="t('City')"
+                        :options="citiesLocationOptions"
+                        hide-selected
+                        option-label="name"
+                        option-value="name"
+                        v-model="data.city"
+                    >
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection>
+                                    <QItemLabel>{{ scope.opt.name }}</QItemLabel>
+                                    <QItemLabel caption>
+                                        {{
+                                            `${scope.opt.name}, ${scope.opt.province.name} (${scope.opt.province.country.country})`
+                                        }}
+                                    </QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelectFilter>
+                </div>
+            </VnRow>
+
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnSelectFilter
+                        :label="t('Province')"
+                        :options="provincesLocationOptions"
+                        hide-selected
+                        option-label="name"
+                        option-value="id"
+                        v-model="data.province"
+                    >
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection>
+                                    <QItemLabel>{{
+                                        `${scope.opt.name} (${scope.opt.country.country})`
+                                    }}</QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelectFilter>
+                </div>
+                <div class="col">
+                    <VnSelectFilter
+                        :label="t('Country')"
+                        :options="countriesOptions"
+                        hide-selected
+                        option-label="country"
+                        option-value="id"
+                        v-model="data.country"
+                    />
+                </div>
+            </VnRow>
+
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <QCheckbox :label="t('Active')" v-model="data.isActive" />
+                </div>
+                <div class="col">
+                    <QCheckbox :label="t('Frozen')" v-model="data.isFreezed" />
+                </div>
+            </VnRow>
+
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <QCheckbox :label="t('Has to invoice')" v-model="data.hasToInvoice" />
+                </div>
+                <div class="col">
+                    <QCheckbox :label="t('Vies')" v-model="data.isVies" />
+                </div>
+            </VnRow>
+
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <QCheckbox
+                        :label="t('Notify by email')"
+                        v-model="data.isToBeMailed"
+                    />
+                </div>
+                <div class="col">
+                    <QCheckbox
+                        :label="t('Invoice by address')"
+                        v-model="data.hasToInvoiceByAddress"
+                    />
+                </div>
+            </VnRow>
+
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <QCheckbox
+                        :label="t('Is equalizated')"
+                        v-model="data.isEqualizated"
+                    />
+                </div>
+                <div class="col">
+                    <QCheckbox
+                        :label="t('Verified data')"
+                        v-model="data.isTaxDataChecked"
+                    />
+                </div>
+            </VnRow>
+
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <QCheckbox
+                        :label="t('Incoterms authorization')"
+                        v-model="data.hasIncoterms"
+                    />
+                </div>
+                <div class="col">
+                    <QCheckbox
+                        :label="t('Electronic invoice')"
+                        v-model="data.hasElectronicInvoice"
+                    />
+                </div>
+            </VnRow>
+        </template>
+    </FormModel>
 </template>
+
+<i18n>
+es:
+    Social name: Razón social
+    Tax number: NIF / CIF
+    Street: Dirección fiscal
+    Sage tax type: Tipo de impuesto Sage
+    Sage transaction type: Tipo de transacción Sage
+    Postcode: Código postal
+    City: Población
+    Province: Provincia
+    Country: País
+    Active: Activo
+    Frozen: Congelado
+    Has to invoice: Factura
+    Vies: Vies
+    Notify by email: Notificar vía e-mail
+    Invoice by address: Facturar por consignatario
+    Is equalizated: Recargo de equivalencia
+    Verified data: Datos comprobados
+    Incoterms authorization: Autorización incoterms
+    Electronic invoice: Factura electrónica
+</i18n>

From 5511e365aa868a0e53881868d8bfe93670a47238 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Tue, 9 Jan 2024 10:46:27 -0300
Subject: [PATCH 09/94] WIP

---
 src/components/CrudModel.vue                  |   8 +-
 src/i18n/en/index.js                          |   9 ++
 src/i18n/es/index.js                          |   9 ++
 .../Supplier/Card/SupplierAgencyTerm.vue      | 140 +++++++++++++++++-
 .../Card/SupplierAgencyTermCreate.vue         | 113 ++++++++++++++
 .../Supplier/Card/SupplierConsumption.vue     |  37 ++++-
 src/router/modules/Supplier.js                |   6 +
 7 files changed, 318 insertions(+), 4 deletions(-)
 create mode 100644 src/pages/Supplier/Card/SupplierAgencyTermCreate.vue

diff --git a/src/components/CrudModel.vue b/src/components/CrudModel.vue
index 75353a35a..17fc8fc4a 100644
--- a/src/components/CrudModel.vue
+++ b/src/components/CrudModel.vue
@@ -225,15 +225,19 @@ function getDifferences(obj1, obj2) {
     delete obj2.$index;
 
     for (let key in obj1) {
-        if (obj2[key] && obj1[key] !== obj2[key]) {
+        if (obj2[key] && JSON.stringify(obj1[key]) !== JSON.stringify(obj2[key])) {
             diff[key] = obj2[key];
         }
     }
     for (let key in obj2) {
-        if (obj1[key] === undefined || obj1[key] !== obj2[key]) {
+        if (
+            obj1[key] === undefined ||
+            JSON.stringify(obj1[key]) !== JSON.stringify(obj2[key])
+        ) {
             diff[key] = obj2[key];
         }
     }
+
     return diff;
 }
 
diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index 85a82ebe5..8d0e0a9cc 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -926,6 +926,15 @@ export default {
             province: 'Province',
             mobile: 'Mobile',
         },
+        agencyTerms: {
+            agencyFk: 'Agency',
+            minimumM3: 'Minimum M3',
+            packagePrice: 'Package Price',
+            kmPrice: 'Km Price',
+            m3Price: 'M3 Price',
+            routePrice: 'Route price',
+            minimumKm: 'Minimum Km',
+        },
     },
     travel: {
         pageTitles: {
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index 44ce18cc9..96e0177a5 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -925,6 +925,15 @@ export default {
             province: 'Provincia',
             mobile: 'Móvil',
         },
+        agencyTerms: {
+            agencyFk: 'Agencia',
+            minimumM3: 'M3 mínimos',
+            packagePrice: 'Precio bulto',
+            kmPrice: 'Precio Km',
+            m3Price: 'Precio M3',
+            routePrice: 'Precio ruta',
+            minimumKm: 'Km mínimos',
+        },
     },
     travel: {
         pageTitles: {
diff --git a/src/pages/Supplier/Card/SupplierAgencyTerm.vue b/src/pages/Supplier/Card/SupplierAgencyTerm.vue
index 2a0c341cf..a300ae8e7 100644
--- a/src/pages/Supplier/Card/SupplierAgencyTerm.vue
+++ b/src/pages/Supplier/Card/SupplierAgencyTerm.vue
@@ -1 +1,139 @@
-<template>Supplier agency term</template>
+<script setup>
+import { ref, onMounted } from 'vue';
+import { useRouter, useRoute } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+
+import FetchData from 'components/FetchData.vue';
+import CrudModel from 'components/CrudModel.vue';
+import VnRow from 'components/ui/VnRow.vue';
+
+const route = useRoute();
+const router = useRouter();
+const { t } = useI18n();
+const supplierAgencyTermRef = ref(null);
+const agenciesOptions = ref(null);
+
+const supplierAgencyFilter = {
+    include: {
+        relation: 'agency',
+        scope: {
+            fields: ['id', 'name'],
+        },
+    },
+    where: { supplierFk: route.params.id },
+};
+
+const redirectToCreateView = () => {
+    router.push({ name: 'SupplierAgencyTermCreate' });
+};
+
+onMounted(() => {
+    if (supplierAgencyTermRef.value) supplierAgencyTermRef.value.reload();
+});
+</script>
+<template>
+    <FetchData
+        url="Suppliers/freeAgencies"
+        @on-fetch="(data) => (agenciesOptions = data)"
+        auto-load
+    />
+    <CrudModel
+        ref="supplierAgencyTermRef"
+        data-key="SupplierAgencyTerm"
+        save-url="SupplierAgencyTerms/crud"
+        url="SupplierAgencyTerms"
+        model="SupplierAgencyTerm"
+        primary-key="agencyFk"
+        :filter="supplierAgencyFilter"
+        :default-remove="false"
+        :data-required="{
+            supplierFk: route.params.id,
+        }"
+    >
+        <template #body="{ rows }">
+            <QCard class="q-pa-md">
+                <VnRow
+                    v-for="(row, index) in rows"
+                    :key="index"
+                    class="row q-gutter-md q-mb-md"
+                >
+                    <div class="col">
+                        <QField :label="t('supplier.agencyTerms.agencyFk')" stack-label>
+                            <template #control>
+                                <div tabindex="0">
+                                    {{ row.agency?.name }}
+                                </div>
+                            </template>
+                        </QField>
+                    </div>
+                    <div class="col">
+                        <QInput
+                            :label="t('supplier.agencyTerms.minimumM3')"
+                            v-model.number="row.minimumM3"
+                            type="number"
+                        />
+                    </div>
+                    <div class="col">
+                        <QInput
+                            :label="t('supplier.agencyTerms.packagePrice')"
+                            v-model.number="row.packagePrice"
+                            type="number"
+                        />
+                    </div>
+                    <div class="col">
+                        <QInput
+                            :label="t('supplier.agencyTerms.kmPrice')"
+                            v-model.number="row.kmPrice"
+                            type="number"
+                        />
+                    </div>
+                    <div class="col">
+                        <QInput
+                            :label="t('supplier.agencyTerms.m3Price')"
+                            v-model.number="row.m3Price"
+                            type="number"
+                        />
+                    </div>
+                    <div class="col">
+                        <QInput
+                            :label="t('supplier.agencyTerms.routePrice')"
+                            v-model.number="row.routePrice"
+                            type="number"
+                        />
+                    </div>
+                    <div class="col">
+                        <QInput
+                            :label="t('supplier.agencyTerms.minimumKm')"
+                            v-model.number="row.minimumKm"
+                            type="number"
+                        />
+                    </div>
+                    <div class="col-1 row justify-center items-center">
+                        <QIcon
+                            name="delete"
+                            size="sm"
+                            class="cursor-pointer"
+                            color="primary"
+                            @click="supplierAgencyTermRef.remove([row])"
+                        >
+                            <QTooltip>
+                                {{ t('Remove row') }}
+                            </QTooltip>
+                        </QIcon>
+                    </div>
+                </VnRow>
+            </QCard>
+        </template>
+    </CrudModel>
+    <QPageSticky :offset="[20, 20]">
+        <QBtn fab icon="add" color="primary" @click="redirectToCreateView()" />
+        <QTooltip>
+            {{ t('supplier.list.newSupplier') }}
+        </QTooltip>
+    </QPageSticky>
+</template>
+
+<i18n>
+    es:
+        Remove row: Eliminar fila
+</i18n>
diff --git a/src/pages/Supplier/Card/SupplierAgencyTermCreate.vue b/src/pages/Supplier/Card/SupplierAgencyTermCreate.vue
new file mode 100644
index 000000000..00f0b868f
--- /dev/null
+++ b/src/pages/Supplier/Card/SupplierAgencyTermCreate.vue
@@ -0,0 +1,113 @@
+<script setup>
+import { useI18n } from 'vue-i18n';
+import { reactive, ref } from 'vue';
+import { useRouter, useRoute } from 'vue-router';
+
+import FetchData from 'components/FetchData.vue';
+import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import FormModel from 'components/FormModel.vue';
+import VnRow from 'components/ui/VnRow.vue';
+
+const { t } = useI18n();
+const router = useRouter();
+const route = useRoute();
+
+const agenciesOptions = ref(null);
+const newAgencyTermForm = reactive({
+    agencyFk: null,
+    minimumM3: null,
+    packagePrice: null,
+    kmPrice: null,
+    m3Price: null,
+    routePrice: null,
+    minimumKm: null,
+    supplierFk: route.params.id,
+});
+
+const onDataSaved = () => {
+    router.push({ name: 'SupplierAgencyTerm' });
+};
+</script>
+
+<template>
+    <FetchData
+        url="Suppliers/freeAgencies"
+        @on-fetch="(data) => (agenciesOptions = data)"
+        auto-load
+    />
+
+    <QPage>
+        <FormModel
+            model="supplierAgencyTerm"
+            :form-initial-data="newAgencyTermForm"
+            url-create="SupplierAgencyTerms"
+            :observe-form-changes="true"
+            @on-data-saved="onDataSaved()"
+        >
+            <template #form="{ data }">
+                <VnRow class="row q-gutter-md q-mb-md">
+                    <div class="col">
+                        <VnSelectFilter
+                            :label="t('supplier.agencyTerms.agencyFk')"
+                            v-model="data.agencyFk"
+                            :options="agenciesOptions"
+                            option-label="name"
+                            option-value="id"
+                            hide-selected
+                            rounded
+                        />
+                    </div>
+                    <div class="col">
+                        <QInput
+                            :label="t('supplier.agencyTerms.minimumM3')"
+                            v-model.number="data.minimumM3"
+                            type="number"
+                        />
+                    </div>
+                </VnRow>
+                <VnRow class="row q-gutter-md q-mb-md">
+                    <div class="col">
+                        <QInput
+                            :label="t('supplier.agencyTerms.packagePrice')"
+                            v-model.number="data.packagePrice"
+                            type="number"
+                        />
+                    </div>
+                    <div class="col">
+                        <QInput
+                            :label="t('supplier.agencyTerms.kmPrice')"
+                            v-model.number="data.kmPrice"
+                            type="number"
+                        />
+                    </div>
+                </VnRow>
+                <VnRow class="row q-gutter-md q-mb-md">
+                    <div class="col">
+                        <QInput
+                            :label="t('supplier.agencyTerms.m3Price')"
+                            v-model.number="data.m3Price"
+                            type="number"
+                        />
+                    </div>
+                    <div class="col">
+                        <QInput
+                            :label="t('supplier.agencyTerms.routePrice')"
+                            v-model.number="data.routePrice"
+                            type="number"
+                        />
+                    </div>
+                </VnRow>
+                <VnRow class="row q-gutter-md q-mb-md">
+                    <div class="col">
+                        <QInput
+                            :label="t('supplier.agencyTerms.minimumKm')"
+                            v-model.number="data.minimumKm"
+                            type="number"
+                        />
+                    </div>
+                    <div class="col" />
+                </VnRow>
+            </template>
+        </FormModel>
+    </QPage>
+</template>
diff --git a/src/pages/Supplier/Card/SupplierConsumption.vue b/src/pages/Supplier/Card/SupplierConsumption.vue
index df1dead17..4504c8251 100644
--- a/src/pages/Supplier/Card/SupplierConsumption.vue
+++ b/src/pages/Supplier/Card/SupplierConsumption.vue
@@ -1 +1,36 @@
-<template>Supplier consumption</template>
+<script setup>
+import { useRoute } from 'vue-router';
+import { ref } from 'vue';
+
+import FetchData from 'components/FetchData.vue';
+
+const route = useRoute();
+
+const suppliersConsumption = ref();
+</script>
+
+<template>
+    <FetchData
+        url="Suppliers/consumption"
+        @on-fetch="(data) => (suppliersConsumption = data)"
+        :filter="{
+            where: { supplierFk: route.params.id },
+            order: ['itemTypeFk', 'itemName', 'itemSize'],
+        }"
+        auto-load
+    />
+    <QToolbar class="bg-vn-dark justify-end">
+        <div id="st-data"></div>
+        <QSpace />
+        <div id="st-actions">
+            <QBtn color="primary" icon-right="archive" no-caps />
+        </div>
+    </QToolbar>
+    <QPage class="column items-center q-pa-md"> </QPage>
+</template>
+
+<style lang="scss" scoped></style>
+
+<i18n>
+es:
+</i18n>
diff --git a/src/router/modules/Supplier.js b/src/router/modules/Supplier.js
index 76b485d6b..d341ddc25 100644
--- a/src/router/modules/Supplier.js
+++ b/src/router/modules/Supplier.js
@@ -160,6 +160,12 @@ export default {
                     component: () =>
                         import('src/pages/Supplier/Card/SupplierAgencyTerm.vue'),
                 },
+                {
+                    path: 'agency-term/create',
+                    name: 'SupplierAgencyTermCreate',
+                    component: () =>
+                        import('src/pages/Supplier/Card/SupplierAgencyTermCreate.vue'),
+                },
             ],
         },
     ],

From dfb716eb041f8a74e00c08df43d223f9978d737e Mon Sep 17 00:00:00 2001
From: carlosfonseca <carlos.fonseca@mindshore.io>
Date: Tue, 9 Jan 2024 09:22:29 -0500
Subject: [PATCH 10/94] Mejora solicitada

---
 src/pages/Customer/Card/CustomerFiscalData.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/Customer/Card/CustomerFiscalData.vue b/src/pages/Customer/Card/CustomerFiscalData.vue
index b4fe1fd30..ab778670a 100644
--- a/src/pages/Customer/Card/CustomerFiscalData.vue
+++ b/src/pages/Customer/Card/CustomerFiscalData.vue
@@ -61,6 +61,7 @@ const onPostcodeCreated = async () => {
                 <div class="col">
                     <VnInput
                         :label="t('Social name')"
+                        :required="true"
                         :rules="validate('client.socialName')"
                         v-model="data.socialName"
                     />

From 9bc60ff3c3322a05b3452868cd9815885a722470 Mon Sep 17 00:00:00 2001
From: carlosfonseca <carlos.fonseca@mindshore.io>
Date: Tue, 9 Jan 2024 11:59:36 -0500
Subject: [PATCH 11/94] Se crea tarjeta de formas de pago

---
 .../Customer/Card/CustomerBillingData.vue     | 120 +++++++++++++++++-
 1 file changed, 119 insertions(+), 1 deletion(-)

diff --git a/src/pages/Customer/Card/CustomerBillingData.vue b/src/pages/Customer/Card/CustomerBillingData.vue
index c14f3b499..cee583f39 100644
--- a/src/pages/Customer/Card/CustomerBillingData.vue
+++ b/src/pages/Customer/Card/CustomerBillingData.vue
@@ -1,3 +1,121 @@
+<script setup>
+import { ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useRoute } from 'vue-router';
+
+import FetchData from 'components/FetchData.vue';
+import FormModel from 'components/FormModel.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelectCreate from 'src/components/common/VnSelectCreate.vue';
+import CreateBankEntityForm from 'src/components/CreateBankEntityForm.vue';
+
+const { t } = useI18n();
+const route = useRoute();
+
+const payMethods = ref([]);
+const bankEntitiesOptions = ref([]);
+
+const onBankEntityCreated = (data) => {
+    bankEntitiesOptions.value.push(data);
+};
+</script>
+
 <template>
-    <div class="flex justify-center">Billing data</div>
+    <fetch-data @on-fetch="(data) => (payMethods = data)" auto-load url="PayMethods" />
+    <FetchData
+        @on-fetch="(data) => (bankEntitiesOptions = data)"
+        auto-load
+        url="BankEntities"
+    />
+
+    <FormModel
+        :url-update="`Clients/${route.params.id}`"
+        :url="`Clients/${route.params.id}/getCard`"
+        auto-load
+        model="customer"
+    >
+        <template #form="{ data, validate }">
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnSelectFilter
+                        :label="t('Billing data')"
+                        :options="payMethods"
+                        hide-selected
+                        option-label="name"
+                        option-value="id"
+                        v-model="data.payMethod"
+                    />
+                </div>
+                <div class="col">
+                    <VnInput
+                        :label="t('Due day')"
+                        :rules="validate('client.socialName')"
+                        v-model="data.dueDay"
+                    />
+                </div>
+            </VnRow>
+
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnInput :label="t('IBAN')" v-model="data.iban" />
+                </div>
+                <div class="col">
+                    <VnSelectCreate
+                        :label="t('Swift / BIC')"
+                        :options="bankEntitiesOptions"
+                        :roles-allowed-to-create="['salesAssistant', 'hr']"
+                        :rules="validate('Worker.bankEntity')"
+                        hide-selected
+                        option-label="name"
+                        option-value="id"
+                        v-model="data.bankEntityFk"
+                    >
+                        <template #form>
+                            <CreateBankEntityForm
+                                @on-data-saved="onBankEntityCreated($event)"
+                            />
+                        </template>
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection v-if="scope.opt">
+                                    <QItemLabel
+                                        >{{ scope.opt.bic }}
+                                        {{ scope.opt.name }}</QItemLabel
+                                    >
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelectCreate>
+                </div>
+            </VnRow>
+
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <QCheckbox :label="t('Received LCR')" v-model="data.hasLcr" />
+                </div>
+                <div class="col">
+                    <QCheckbox
+                        :label="t('VNL core received')"
+                        v-model="data.hasCoreVnl"
+                    />
+                </div>
+                <div class="col">
+                    <QCheckbox :label="t('VNL B2B received')" v-model="data.hasSepaVnl" />
+                </div>
+            </VnRow>
+        </template>
+    </FormModel>
 </template>
+
+<i18n>
+es:
+    Billing data: Forma de pago
+    Due day: Vencimiento
+    IBAN: IBAN
+    Swift / BIC: Swift / BIC
+    Received LCR: Recibido LCR
+    VNL core received: Recibido core VNL
+    VNL B2B received: Recibido B2B VNL
+</i18n>

From 53a832ae6a4a429e390e8bed229889610b56a633 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Wed, 10 Jan 2024 09:54:23 -0300
Subject: [PATCH 12/94] supplier consumption submodule

---
 src/i18n/en/index.js                          |   5 +
 src/i18n/es/index.js                          |   5 +
 .../Supplier/Card/SupplierConsumption.vue     | 170 +++++++++++++++++-
 src/pages/Travel/ExtraCommunity.vue           |  12 +-
 4 files changed, 184 insertions(+), 8 deletions(-)

diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index 8d0e0a9cc..205f919eb 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -935,6 +935,11 @@ export default {
             routePrice: 'Route price',
             minimumKm: 'Minimum Km',
         },
+        consumption: {
+            entry: 'Entry',
+            date: 'Date',
+            reference: 'Reference',
+        },
     },
     travel: {
         pageTitles: {
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index 96e0177a5..352e67046 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -934,6 +934,11 @@ export default {
             routePrice: 'Precio ruta',
             minimumKm: 'Km mínimos',
         },
+        consumption: {
+            entry: 'Entrada',
+            date: 'Fecha',
+            reference: 'Referencia',
+        },
     },
     travel: {
         pageTitles: {
diff --git a/src/pages/Supplier/Card/SupplierConsumption.vue b/src/pages/Supplier/Card/SupplierConsumption.vue
index 4504c8251..714499f63 100644
--- a/src/pages/Supplier/Card/SupplierConsumption.vue
+++ b/src/pages/Supplier/Card/SupplierConsumption.vue
@@ -1,12 +1,96 @@
 <script setup>
 import { useRoute } from 'vue-router';
-import { ref } from 'vue';
+import { ref, computed } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useQuasar } from 'quasar';
 
 import FetchData from 'components/FetchData.vue';
+import FetchedTags from 'components/ui/FetchedTags.vue';
+import SendEmailDialog from 'components/common/SendEmailDialog.vue';
 
+import { toDate, toDateString } from 'src/filters';
+import { dashIfEmpty } from 'src/filters';
+import { usePrintService } from 'composables/usePrintService';
+import useNotify from 'src/composables/useNotify.js';
+import axios from 'axios';
+
+const { t } = useI18n();
 const route = useRoute();
+const { openReport, sendEmail } = usePrintService();
+const quasar = useQuasar();
+const { notify } = useNotify();
 
 const suppliersConsumption = ref();
+
+const userParams = computed(() => {
+    const minDate = Date.vnNew();
+    minDate.setHours(0, 0, 0, 0);
+    minDate.setMonth(minDate.getMonth() - 2);
+
+    const maxDate = Date.vnNew();
+    maxDate.setHours(23, 59, 59, 59);
+
+    return {
+        from: toDateString(minDate),
+        to: toDateString(maxDate),
+    };
+});
+
+const reportParams = computed(() => ({
+    recipientId: Number(route.params.id),
+    ...userParams.value,
+}));
+
+const rows = computed(() => suppliersConsumption.value || []);
+
+const openReportPdf = () => {
+    openReport(`Suppliers/${route.params.id}/campaign-metrics-pdf`, reportParams.value);
+};
+
+const getSupplierContacts = async () => {
+    try {
+        const params = {
+            filter: {
+                where: {
+                    supplierFk: route.params.id,
+                    email: { neq: null },
+                },
+                limit: 1,
+            },
+        };
+
+        const { data } = await axios.get('SupplierContacts', params);
+
+        if (data && data.length) return data[0].email;
+    } catch (err) {
+        notify('This supplier does not have a contact with an email address', 'negative');
+        console.error('Error fetching supplierContacts: ', err);
+    }
+};
+
+const openSendEmailDialog = async () => {
+    const email = await getSupplierContacts();
+    quasar.dialog({
+        component: SendEmailDialog,
+        componentProps: {
+            data: {
+                address: email,
+            },
+            promise: sendCampaignMetricsEmail,
+        },
+    });
+};
+
+const sendCampaignMetricsEmail = ({ address }) => {
+    sendEmail(`Suppliers/${route.params.id}/campaign-metrics-email`, {
+        recipient: address,
+        ...reportParams.value,
+    });
+};
+
+const calculateTotal = (buysArray) => {
+    return buysArray.reduce((accumulator, { total }) => accumulator + total, 0);
+};
 </script>
 
 <template>
@@ -17,20 +101,92 @@ const suppliersConsumption = ref();
             where: { supplierFk: route.params.id },
             order: ['itemTypeFk', 'itemName', 'itemSize'],
         }"
+        :params="userParams"
         auto-load
     />
     <QToolbar class="bg-vn-dark justify-end">
-        <div id="st-data"></div>
-        <QSpace />
-        <div id="st-actions">
-            <QBtn color="primary" icon-right="archive" no-caps />
+        <div id="st-data">
+            <QBtn
+                v-if="userParams.from && userParams.to"
+                color="primary"
+                icon-right="picture_as_pdf"
+                no-caps
+                class="q-mr-md"
+                @click="openReportPdf()"
+            >
+                <QTooltip>
+                    {{ t('Open as PDF') }}
+                </QTooltip>
+            </QBtn>
+            <QBtn
+                v-if="userParams.from && userParams.to"
+                color="primary"
+                icon-right="email"
+                no-caps
+                @click="openSendEmailDialog()"
+            >
+                <QTooltip>
+                    {{ t('Send to email') }}
+                </QTooltip>
+            </QBtn>
         </div>
+        <QSpace />
+        <div id="st-actions"></div>
     </QToolbar>
-    <QPage class="column items-center q-pa-md"> </QPage>
+    <QPage class="column items-center q-pa-md">
+        <QTable
+            :rows="rows"
+            hide-bottom
+            row-key="id"
+            hide-header
+            :pagination="{ rowsPerPage: 0 }"
+            class="full-width q-mt-md"
+        >
+            <template #body="{ row }">
+                <QTr>
+                    <QTd no-hover class="label">{{
+                        t('supplier.consumption.entry')
+                    }}</QTd>
+                    <QTd no-hover>{{ row.id }}</QTd>
+                    <QTd no-hover class="label">{{ t('supplier.consumption.date') }}</QTd>
+                    <QTd no-hover>{{ toDate(row.shipped) }}</QTd>
+                    <QTd no-hover class="label">{{
+                        t('supplier.consumption.reference')
+                    }}</QTd>
+                    <QTd no-hover>{{ row.invoiceNumber }}</QTd>
+                </QTr>
+                <QTr v-for="(buy, index) in row.buys" :key="index">
+                    <QTd no-hover> {{ buy.itemName }}</QTd>
+
+                    <QTd no-hover>
+                        <span>{{ buy.subName }}</span>
+                        <fetched-tags :item="buy" :max-length="5" />
+                    </QTd>
+                    <QTd no-hover> {{ dashIfEmpty(buy.quantity) }}</QTd>
+                    <QTd no-hover> {{ dashIfEmpty(buy.price) }}</QTd>
+                    <QTd colspan="2" no-hover> {{ dashIfEmpty(buy.total) }}</QTd>
+                </QTr>
+                <QTr>
+                    <QTd colspan="6" no-hover>
+                        <span class="label">{{ t('Total entry') }}: </span>
+                        <span>{{ calculateTotal(row.buys) }}</span>
+                    </QTd>
+                </QTr>
+            </template>
+        </QTable>
+    </QPage>
 </template>
 
-<style lang="scss" scoped></style>
+<style scoped lang="scss">
+.label {
+    color: var(--vn-label);
+}
+</style>
 
 <i18n>
 es:
+    Total entry: Total entrada
+    Open as PDF: Abrir como PDF
+    Send to email: Enviar por email
+    This supplier does not have a contact with an email address: Este proveedor no tiene un email de contacto
 </i18n>
diff --git a/src/pages/Travel/ExtraCommunity.vue b/src/pages/Travel/ExtraCommunity.vue
index 62292f115..b9f4f002e 100644
--- a/src/pages/Travel/ExtraCommunity.vue
+++ b/src/pages/Travel/ExtraCommunity.vue
@@ -262,7 +262,16 @@ onMounted(async () => {
         <div id="st-data"></div>
         <QSpace />
         <div id="st-actions">
-            <QBtn color="primary" icon-right="archive" no-caps @click="openReportPdf()" />
+            <QBtn
+                color="primary"
+                icon-right="picture_as_pdf"
+                no-caps
+                @click="openReportPdf()"
+            >
+                <QTooltip>
+                    {{ t('Open as PDF') }}
+                </QTooltip>
+            </QBtn>
         </div>
     </QToolbar>
     <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
@@ -415,4 +424,5 @@ es:
     physicKg: KG físico
     shipped: F. envío
     landed: F. llegada
+    Open as PDF: Abrir como PDF
 </i18n>

From f2006663b732bf70908254362624e4e08078fce1 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 10 Jan 2024 14:29:01 +0100
Subject: [PATCH 13/94] refs #6664 popup

---
 src/components/ui/VnConfirm.vue      | 13 ++++++++++---
 src/pages/Claim/Card/ClaimAction.vue | 16 +++++++++++-----
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/src/components/ui/VnConfirm.vue b/src/components/ui/VnConfirm.vue
index f8715f685..c6650a28f 100644
--- a/src/components/ui/VnConfirm.vue
+++ b/src/components/ui/VnConfirm.vue
@@ -2,6 +2,7 @@
 import { ref } from 'vue';
 import { useDialogPluginComponent } from 'quasar';
 import { useI18n } from 'vue-i18n';
+import { onMounted } from 'vue';
 
 const { t } = useI18n();
 
@@ -28,6 +29,7 @@ const props = defineProps({
         required: false,
         default: null,
     },
+    callbackFn: Function,
 });
 
 defineEmits(['confirm', ...useDialogPluginComponent.emits]);
@@ -37,12 +39,17 @@ const { dialogRef, onDialogOK } = useDialogPluginComponent();
 const title = props.title || t('Confirm');
 const message = props.message || t('Are you sure you want to continue?');
 const isLoading = ref(false);
-
+onMounted(() => {
+    if (props.callbackFn) props.callbackFn();
+});
 async function confirm() {
+    let html = null;
+    html = document.getElementById(props.data.inputId);
     isLoading.value = true;
     if (props.promise) {
         try {
-            await props.promise(props.data);
+            if (html) await props.promise({ ...props.data, return: html.value });
+            else await props.promise(props.data);
         } finally {
             isLoading.value = false;
         }
@@ -66,7 +73,7 @@ async function confirm() {
                 <QBtn icon="close" :disable="isLoading" flat round dense v-close-popup />
             </QCardSection>
             <QCardSection class="row items-center">
-                <span v-html="message"></span>
+                <span id="spanHTML" v-html="message"></span>
             </QCardSection>
             <QCardActions align="right">
                 <QBtn
diff --git a/src/pages/Claim/Card/ClaimAction.vue b/src/pages/Claim/Card/ClaimAction.vue
index e92e65fc7..f3dd0b952 100644
--- a/src/pages/Claim/Card/ClaimAction.vue
+++ b/src/pages/Claim/Card/ClaimAction.vue
@@ -37,6 +37,7 @@ const marker_labels = [
     { value: DEFAULT_MIN_RESPONSABILITY, label: t('claim.summary.company') },
     { value: DEFAULT_MAX_RESPONSABILITY, label: t('claim.summary.person') },
 ];
+const portesMultiplicator = ref();
 
 const columns = computed(() => [
     {
@@ -140,22 +141,27 @@ async function regularizeClaim() {
                 component: VnConfirm,
                 componentProps: {
                     title: t('confirmGreuges'),
-                    message: t('confirmGreugesMessage'),
+                    message: `
+                    <input class="q-field__native q-m-md" type="number" placeholder="1" id="multiplicatorValue" name="multiplicatorValue" min="0" max="50"/>
+                     `,
+                    data: { inputId: 'multiplicatorValue' },
+                    promise: onUpdateGreugeAccept,
                 },
             })
             .onOk(async () => await onUpdateGreugeAccept());
     }
 }
 
-async function onUpdateGreugeAccept() {
+async function onUpdateGreugeAccept({ return: multiplicatorValue }) {
     const greugeTypeFreightId = (
         await axios.get(`GreugeTypes/findOne`, {
             filter: { where: { code: 'freightPickUp' } },
         })
     ).data.id;
-    const freightPickUpPrice = (await axios.get(`GreugeConfigs/findOne`)).data
-        .freightPickUpPrice;
-
+    const freightPickUpPrice =
+        (await axios.get(`GreugeConfigs/findOne`)).data.freightPickUpPrice *
+        +multiplicatorValue;
+    console.log(freightPickUpPrice);
     await axios.post(`Greuges`, {
         clientFk: claim.value.clientFk,
         description: `${t('ClaimGreugeDescription')} ${claimId}`.toUpperCase(),

From 9aeba371409b830e6b581cb4ab50be7367e8ce5e Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Wed, 10 Jan 2024 12:11:49 -0300
Subject: [PATCH 14/94] Autocomplete postcodes

---
 src/components/CreateNewPostcodeForm.vue      |  4 ++--
 src/components/FormModelPopup.vue             |  6 +++---
 .../Customer/Card/CustomerFiscalData.vue      | 20 +++++++++++++------
 src/pages/Customer/CustomerCreate.vue         |  9 ++++++---
 .../Supplier/Card/SupplierFiscalData.vue      |  8 ++++++--
 src/pages/Worker/WorkerCreate.vue             |  8 ++++++--
 6 files changed, 37 insertions(+), 18 deletions(-)

diff --git a/src/components/CreateNewPostcodeForm.vue b/src/components/CreateNewPostcodeForm.vue
index 3504445f8..a9efcf8f4 100644
--- a/src/components/CreateNewPostcodeForm.vue
+++ b/src/components/CreateNewPostcodeForm.vue
@@ -28,8 +28,8 @@ const countriesOptions = ref([]);
 const provincesOptions = ref([]);
 const townsLocationOptions = ref([]);
 
-const onDataSaved = () => {
-    emit('onDataSaved');
+const onDataSaved = (dataSaved) => {
+    emit('onDataSaved', dataSaved);
 };
 
 const onCityCreated = async () => {
diff --git a/src/components/FormModelPopup.vue b/src/components/FormModelPopup.vue
index c314f6897..04322a3c8 100644
--- a/src/components/FormModelPopup.vue
+++ b/src/components/FormModelPopup.vue
@@ -42,8 +42,8 @@ const { t } = useI18n();
 const closeButton = ref(null);
 const isLoading = ref(false);
 
-const onDataSaved = () => {
-    emit('onDataSaved');
+const onDataSaved = (dataSaved) => {
+    emit('onDataSaved', dataSaved);
     closeForm();
 };
 
@@ -59,7 +59,7 @@ const closeForm = () => {
         :default-actions="false"
         :url-create="urlCreate"
         :model="model"
-        @on-data-saved="onDataSaved()"
+        @on-data-saved="onDataSaved($event)"
     >
         <template #form="{ data, validate }">
             <span ref="closeButton" class="close-icon" v-close-popup>
diff --git a/src/pages/Customer/Card/CustomerFiscalData.vue b/src/pages/Customer/Card/CustomerFiscalData.vue
index ab778670a..e7e626a99 100644
--- a/src/pages/Customer/Card/CustomerFiscalData.vue
+++ b/src/pages/Customer/Card/CustomerFiscalData.vue
@@ -22,8 +22,12 @@ const provincesLocationOptions = ref([]);
 const countriesOptions = ref([]);
 const postcodesOptions = ref([]);
 
-const onPostcodeCreated = async () => {
+const onPostcodeCreated = async ({ code, provinceFk, townFk, countryFk }, formData) => {
     postcodeFetchDataRef.value.fetch();
+    formData.postcode = code;
+    formData.provinceFk = provinceFk;
+    formData.city = citiesLocationOptions.value.find((town) => town.id === townFk).name;
+    formData.countryFk = countryFk;
 };
 </script>
 
@@ -49,7 +53,12 @@ const onPostcodeCreated = async () => {
         auto-load
         url="Countries"
     />
-
+    <FetchData
+        ref="postcodeFetchDataRef"
+        url="Postcodes/location"
+        @on-fetch="(data) => (postcodesOptions = data)"
+        auto-load
+    />
     <FormModel
         :url-update="`Clients/${route.params.id}/updateFiscalData`"
         :url="`Clients/${route.params.id}/getCard`"
@@ -114,7 +123,7 @@ const onPostcodeCreated = async () => {
                     >
                         <template #form>
                             <CustomerCreateNewPostcode
-                                @on-data-saved="onPostcodeCreated($event)"
+                                @on-data-saved="onPostcodeCreated($event, data)"
                             />
                         </template>
                         <template #option="scope">
@@ -136,7 +145,6 @@ const onPostcodeCreated = async () => {
                     </VnSelectCreate>
                 </div>
                 <div class="col">
-                    <!-- ciudades -->
                     <VnSelectFilter
                         :label="t('City')"
                         :options="citiesLocationOptions"
@@ -169,7 +177,7 @@ const onPostcodeCreated = async () => {
                         hide-selected
                         option-label="name"
                         option-value="id"
-                        v-model="data.province"
+                        v-model="data.provinceFk"
                     >
                         <template #option="scope">
                             <QItem v-bind="scope.itemProps">
@@ -189,7 +197,7 @@ const onPostcodeCreated = async () => {
                         hide-selected
                         option-label="country"
                         option-value="id"
-                        v-model="data.country"
+                        v-model="data.countryFk"
                     />
                 </div>
             </VnRow>
diff --git a/src/pages/Customer/CustomerCreate.vue b/src/pages/Customer/CustomerCreate.vue
index 7b7aae11c..791135f1f 100644
--- a/src/pages/Customer/CustomerCreate.vue
+++ b/src/pages/Customer/CustomerCreate.vue
@@ -36,8 +36,12 @@ const provincesLocationOptions = ref([]);
 const countriesOptions = ref([]);
 const postcodesOptions = ref([]);
 
-const onPostcodeCreated = async () => {
+const onPostcodeCreated = async ({ code, provinceFk, townFk, countryFk }, formData) => {
     postcodeFetchDataRef.value.fetch();
+    formData.postcode = code;
+    formData.provinceFk = provinceFk;
+    formData.city = citiesLocationOptions.value.find((town) => town.id === townFk).name;
+    formData.countryFk = countryFk;
 };
 </script>
 
@@ -81,7 +85,6 @@ const onPostcodeCreated = async () => {
         </QToolbar>
         <FormModel
             :form-initial-data="newClientForm"
-            :observe-form-changes="false"
             model="client"
             url-create="Clients/createWithUser"
         >
@@ -148,7 +151,7 @@ const onPostcodeCreated = async () => {
                         >
                             <template #form>
                                 <CustomerCreateNewPostcode
-                                    @on-data-saved="onPostcodeCreated($event)"
+                                    @on-data-saved="onPostcodeCreated($event, data)"
                                 />
                             </template>
                             <template #option="scope">
diff --git a/src/pages/Supplier/Card/SupplierFiscalData.vue b/src/pages/Supplier/Card/SupplierFiscalData.vue
index ebf1b96b6..806c25c09 100644
--- a/src/pages/Supplier/Card/SupplierFiscalData.vue
+++ b/src/pages/Supplier/Card/SupplierFiscalData.vue
@@ -24,8 +24,12 @@ const provincesLocationOptions = ref([]);
 const townsLocationOptions = ref([]);
 const countriesOptions = ref([]);
 
-const onPostcodeCreated = async () => {
+const onPostcodeCreated = async ({ code, provinceFk, townFk, countryFk }, formData) => {
     postcodeFetchDataRef.value.fetch();
+    formData.postcode = code;
+    formData.provinceFk = provinceFk;
+    formData.city = townsLocationOptions.value.find((town) => town.id === townFk).name;
+    formData.countryFk = countryFk;
 };
 </script>
 <template>
@@ -179,7 +183,7 @@ const onPostcodeCreated = async () => {
                     >
                         <template #form>
                             <CustomerCreateNewPostcode
-                                @on-data-saved="onPostcodeCreated($event)"
+                                @on-data-saved="onPostcodeCreated($event, data)"
                             />
                         </template>
                         <template #option="scope">
diff --git a/src/pages/Worker/WorkerCreate.vue b/src/pages/Worker/WorkerCreate.vue
index 66b6e4cd8..ce623e6c1 100644
--- a/src/pages/Worker/WorkerCreate.vue
+++ b/src/pages/Worker/WorkerCreate.vue
@@ -65,8 +65,11 @@ const onBankEntityCreated = (data) => {
     bankEntitiesOptions.value.push(data);
 };
 
-const onPostcodeCreated = async () => {
+const onPostcodeCreated = async ({ code, provinceFk, townFk }, formData) => {
     postcodeFetchDataRef.value.fetch();
+    formData.postcode = code;
+    formData.provinceFk = provinceFk;
+    formData.city = townsOptions.value.find((town) => town.id === townFk).name;
 };
 
 onMounted(async () => {
@@ -193,7 +196,7 @@ onMounted(async () => {
                         >
                             <template #form>
                                 <CustomerCreateNewPostcode
-                                    @on-data-saved="onPostcodeCreated($event)"
+                                    @on-data-saved="onPostcodeCreated($event, data)"
                                 />
                             </template>
                             <template #option="scope">
@@ -360,6 +363,7 @@ onMounted(async () => {
                         </template>
                     </VnSelectCreate>
                 </VnRow>
+                <pre>{{ data }}</pre>
             </template>
         </FormModel>
     </QPage>

From b36cdbf7214376bfc6d3d99e1b96c1f89723ec65 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Thu, 11 Jan 2024 08:33:57 +0100
Subject: [PATCH 15/94] refs #6664 scss

---
 src/components/ui/VnConfirm.vue      | 2 +-
 src/pages/Claim/Card/ClaimAction.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/ui/VnConfirm.vue b/src/components/ui/VnConfirm.vue
index c6650a28f..0ce18cadb 100644
--- a/src/components/ui/VnConfirm.vue
+++ b/src/components/ui/VnConfirm.vue
@@ -72,7 +72,7 @@ async function confirm() {
                 <QSpace />
                 <QBtn icon="close" :disable="isLoading" flat round dense v-close-popup />
             </QCardSection>
-            <QCardSection class="row items-center">
+            <QCardSection class="row justify-center items-center">
                 <span id="spanHTML" v-html="message"></span>
             </QCardSection>
             <QCardActions align="right">
diff --git a/src/pages/Claim/Card/ClaimAction.vue b/src/pages/Claim/Card/ClaimAction.vue
index f3dd0b952..76f76903c 100644
--- a/src/pages/Claim/Card/ClaimAction.vue
+++ b/src/pages/Claim/Card/ClaimAction.vue
@@ -142,7 +142,7 @@ async function regularizeClaim() {
                 componentProps: {
                     title: t('confirmGreuges'),
                     message: `
-                    <input class="q-field__native q-m-md" type="number" placeholder="1" id="multiplicatorValue" name="multiplicatorValue" min="0" max="50"/>
+                    <input class="q-field__native text-grey-2" type="number" placeholder="1" id="multiplicatorValue" name="multiplicatorValue" min="0" max="50"/>
                      `,
                     data: { inputId: 'multiplicatorValue' },
                     promise: onUpdateGreugeAccept,

From d2ee8a98eb754f93cc4348f9cd2feb7566fdc6cb Mon Sep 17 00:00:00 2001
From: carlosfonseca <carlos.fonseca@mindshore.io>
Date: Thu, 11 Jan 2024 08:25:59 -0500
Subject: [PATCH 16/94] Se crea la tarjeta que muestra el listado de
 consignatarios existentes y la tarjeta de creacion

---
 .../Customer/Card/CustomerConsigneeCreate.vue | 241 ++++++++++++++++++
 .../Customer/Card/CustomerConsigneeEdit.vue   |   3 +
 .../Customer/Card/CustomerConsignees.vue      | 112 +++++++-
 src/router/modules/customer.js                |  43 +++-
 4 files changed, 391 insertions(+), 8 deletions(-)
 create mode 100644 src/pages/Customer/Card/CustomerConsigneeCreate.vue
 create mode 100644 src/pages/Customer/Card/CustomerConsigneeEdit.vue

diff --git a/src/pages/Customer/Card/CustomerConsigneeCreate.vue b/src/pages/Customer/Card/CustomerConsigneeCreate.vue
new file mode 100644
index 000000000..69d478b6f
--- /dev/null
+++ b/src/pages/Customer/Card/CustomerConsigneeCreate.vue
@@ -0,0 +1,241 @@
+<script setup>
+import { onBeforeMount, reactive, ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useRoute } from 'vue-router';
+
+import FetchData from 'components/FetchData.vue';
+import FormModel from 'components/FormModel.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import CustomerCreateNewPostcode from 'src/components/CreateNewPostcodeForm.vue';
+import VnSelectCreate from 'src/components/common/VnSelectCreate.vue';
+
+const { t } = useI18n();
+const route = useRoute();
+
+const formInitialData = reactive({
+    isDefaultAddress: false,
+    nickname: null,
+    street: null,
+    postalCode: null,
+    city: null,
+    provinceFk: null,
+    agencyModeFk: null,
+    phone: null,
+    mobile: null,
+    incotermsFk: null,
+    customsAgentFk: null,
+});
+
+const agencyModes = ref([]);
+const incoterms = ref([]);
+const customsAgents = ref([]);
+const postcodeFetchDataRef = ref(null);
+const citiesLocationOptions = ref([]);
+const provincesLocationOptions = ref([]);
+const postcodesOptions = ref([]);
+const urlCreate = ref('');
+
+onBeforeMount(() => {
+    urlCreate.value = `Clients/${route.params.id}/createAddress`;
+});
+
+const onPostcodeCreated = async () => {
+    postcodeFetchDataRef.value.fetch();
+};
+</script>
+
+<template>
+    <FetchData
+        @on-fetch="(data) => (postcodesOptions = data)"
+        auto-load
+        url="Postcodes/location"
+    />
+    <FetchData
+        @on-fetch="(data) => (citiesLocationOptions = data)"
+        auto-load
+        url="Towns/location"
+    />
+    <FetchData
+        @on-fetch="(data) => (provincesLocationOptions = data)"
+        auto-load
+        url="Provinces/location"
+    />
+    <fetch-data
+        @on-fetch="(data) => (agencyModes = data)"
+        auto-load
+        url="AgencyModes/isActive"
+    />
+    <fetch-data @on-fetch="(data) => (incoterms = data)" auto-load url="Incoterms" />
+    <fetch-data
+        @on-fetch="(data) => (customsAgents = data)"
+        auto-load
+        url="CustomsAgents"
+    />
+
+    <FormModel
+        :form-initial-data="formInitialData"
+        :observe-form-changes="false"
+        model="client"
+        :url-create="urlCreate"
+    >
+        <template #form="{ data, validate }">
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <QCheckbox :label="t('Default')" v-model="data.isDefaultAddress" />
+                </div>
+            </VnRow>
+
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnInput :label="t('Consignee')" v-model="data.nickname" />
+                </div>
+                <div class="col">
+                    <VnInput :label="t('Street address')" v-model="data.street" />
+                </div>
+            </VnRow>
+
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnSelectCreate
+                        :label="t('Postcode')"
+                        :options="postcodesOptions"
+                        :roles-allowed-to-create="['deliveryAssistant']"
+                        :rules="validate('Worker.postcode')"
+                        hide-selected
+                        option-label="code"
+                        option-value="code"
+                        v-model="data.postalCode"
+                    >
+                        <template #form>
+                            <CustomerCreateNewPostcode
+                                @on-data-saved="onPostcodeCreated($event)"
+                            />
+                        </template>
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection v-if="scope.opt">
+                                    <QItemLabel>{{ scope.opt.code }}</QItemLabel>
+                                    <QItemLabel caption
+                                        >{{ scope.opt.code }} -
+                                        {{ scope.opt.town.name }} ({{
+                                            scope.opt.town.province.name
+                                        }},
+                                        {{
+                                            scope.opt.town.province.country.country
+                                        }})</QItemLabel
+                                    >
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelectCreate>
+                </div>
+                <div class="col">
+                    <!-- ciudades -->
+                    <VnSelectFilter
+                        :label="t('City')"
+                        :options="citiesLocationOptions"
+                        hide-selected
+                        option-label="name"
+                        option-value="name"
+                        v-model="data.city"
+                    >
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection>
+                                    <QItemLabel>{{ scope.opt.name }}</QItemLabel>
+                                    <QItemLabel caption>
+                                        {{
+                                            `${scope.opt.name}, ${scope.opt.province.name} (${scope.opt.province.country.country})`
+                                        }}
+                                    </QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelectFilter>
+                </div>
+            </VnRow>
+
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnSelectFilter
+                        :label="t('Province')"
+                        :options="provincesLocationOptions"
+                        hide-selected
+                        option-label="name"
+                        option-value="id"
+                        v-model="data.provinceFk"
+                    >
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection>
+                                    <QItemLabel>{{
+                                        `${scope.opt.name} (${scope.opt.country.country})`
+                                    }}</QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelectFilter>
+                </div>
+                <div class="col">
+                    <VnSelectFilter
+                        :label="t('Agency')"
+                        :options="agencyModes"
+                        hide-selected
+                        option-label="name"
+                        option-value="id"
+                        v-model="data.agencyModeFk"
+                    />
+                </div>
+            </VnRow>
+
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnInput :label="t('Phone')" v-model="data.phone" />
+                </div>
+                <div class="col">
+                    <VnInput :label="t('Mobile')" v-model="data.mobile" />
+                </div>
+            </VnRow>
+
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnSelectFilter
+                        :label="t('Incoterms')"
+                        :options="incoterms"
+                        hide-selected
+                        option-label="name"
+                        option-value="code"
+                        v-model="data.incotermsFk"
+                    />
+                </div>
+                <div class="col">
+                    <VnSelectFilter
+                        :label="t('Customs agent')"
+                        :options="customsAgents"
+                        hide-selected
+                        option-label="fiscalName"
+                        option-value="id"
+                        v-model="data.customsAgentFk"
+                    />
+                </div>
+            </VnRow>
+        </template>
+    </FormModel>
+</template>
+
+<i18n>
+es:
+    Default: Predeterminado
+    Consignee: Consignatario
+    Street address: Dirección postal
+    Postcode: Código postal
+    City: Población
+    Province: Provincia
+    Agency: Agencia
+    Phone: Teléfono
+    Mobile: Movíl
+    Incoterms: Incoterms
+    Customs agent: Agente de aduanas
+</i18n>
diff --git a/src/pages/Customer/Card/CustomerConsigneeEdit.vue b/src/pages/Customer/Card/CustomerConsigneeEdit.vue
new file mode 100644
index 000000000..6546c527d
--- /dev/null
+++ b/src/pages/Customer/Card/CustomerConsigneeEdit.vue
@@ -0,0 +1,3 @@
+<template>
+    <div class="flex justify-center">Customer consignee edit</div>
+</template>
diff --git a/src/pages/Customer/Card/CustomerConsignees.vue b/src/pages/Customer/Card/CustomerConsignees.vue
index bab2bd1ff..5abe89589 100644
--- a/src/pages/Customer/Card/CustomerConsignees.vue
+++ b/src/pages/Customer/Card/CustomerConsignees.vue
@@ -1,3 +1,113 @@
+<script setup>
+import { ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useRoute, useRouter } from 'vue-router';
+
+import FetchData from 'components/FetchData.vue';
+import FormModel from 'components/FormModel.vue';
+
+const { t } = useI18n();
+const route = useRoute();
+const router = useRouter();
+
+const provincesLocation = ref([]);
+
+const setProvince = (provinceFk) => {
+    const result = provincesLocation.value.filter(
+        (province) => province.id === provinceFk
+    );
+    return result[0].name || '';
+};
+
+const toCustomerConsigneeCreate = () => {
+    router.push({ name: 'CustomerConsigneeCreate' });
+};
+
+const toCustomerConsigneeEdit = () => {
+    router.push({ name: 'CustomerConsigneeEdit' });
+};
+</script>
+
 <template>
-    <div class="flex justify-center">Consignees</div>
+    <FetchData
+        @on-fetch="(data) => (provincesLocation = data)"
+        auto-load
+        url="Provinces/location"
+    />
+
+    <FormModel
+        :observe-form-changes="false"
+        :url="`Clients/${route.params.id}/addresses`"
+        auto-load
+        model="customer"
+    >
+        <template #form="{ data }">
+            <div v-if="data?.length">
+                <div v-for="(item, index) in data" :key="index">
+                    <div
+                        :class="{
+                            'consignees-card': true,
+                            'q-mb-md': index + 1 === data.length ? false : true,
+                        }"
+                    >
+                        <div class="consignees-card-icon">
+                            <QIcon name="star" size="md" color="primary" />
+                        </div>
+                        <div>
+                            <div>
+                                <div class="text-weight-bold">
+                                    {{ item.nickname }} - #{{ item.id }}
+                                </div>
+                                <div>{{ item.street }}</div>
+                                <div>
+                                    {{ item.postalCode }} - {{ item.city }},
+                                    {{ setProvince(item.provinceFk) }}
+                                </div>
+                            </div>
+                            <div class="flex">
+                                <QCheckbox
+                                    :label="t('Is equalizated')"
+                                    v-model="item.isEqualizated"
+                                    class="q-mr-lg"
+                                    @click.stop="toCustomerConsigneeEdit()"
+                                />
+                                <QCheckbox
+                                    :label="t('Is logiflora allowed')"
+                                    v-model="item.isLogifloraAllowed"
+                                    @click.stop="toCustomerConsigneeEdit()"
+                                />
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </template>
+    </FormModel>
+    <QPageSticky :offset="[18, 18]">
+        <QBtn @click.stop="toCustomerConsigneeCreate()" color="primary" fab icon="add" />
+        <QTooltip>
+            {{ t('New consignee') }}
+        </QTooltip>
+    </QPageSticky>
 </template>
+
+<style lang="scss" scoped>
+.consignees-card {
+    border: 2px solid var(--vn-light-gray);
+    border-radius: 10px;
+    padding: 10px;
+    display: flex;
+}
+.consignees-card-icon {
+    margin: 0 15px 0 5px;
+    display: flex;
+    align-items: center;
+}
+</style>
+
+<i18n>
+es:
+    Is equalizated: Recargo de equivalencia
+    Is logiflora allowed: Compra directa en Holanda
+    New consignee: Nuevo consignatario
+</i18n>
diff --git a/src/router/modules/customer.js b/src/router/modules/customer.js
index 3c8445f42..752c486ee 100644
--- a/src/router/modules/customer.js
+++ b/src/router/modules/customer.js
@@ -152,13 +152,42 @@ export default {
                 },
                 {
                     path: 'consignees',
-                    name: 'CustomerConsignees',
-                    meta: {
-                        title: 'consignees',
-                        icon: 'vn:delivery',
-                    },
-                    component: () =>
-                        import('src/pages/Customer/Card/CustomerConsignees.vue'),
+                    name: 'ConsigneesCard',
+                    redirect: { name: 'CustomerConsignees' },
+                    children: [
+                        {
+                            path: '',
+                            name: 'CustomerConsignees',
+                            meta: {
+                                icon: 'vn:delivery',
+                                title: 'consignees',
+                            },
+                            component: () =>
+                                import('src/pages/Customer/Card/CustomerConsignees.vue'),
+                        },
+                        {
+                            path: 'create',
+                            name: 'CustomerConsigneeCreate',
+                            meta: {
+                                title: 'consignee-create',
+                            },
+                            component: () =>
+                                import(
+                                    'src/pages/Customer/Card/CustomerConsigneeCreate.vue'
+                                ),
+                        },
+                        {
+                            path: 'edit',
+                            name: 'CustomerConsigneeEdit',
+                            meta: {
+                                title: 'consignee-edit',
+                            },
+                            component: () =>
+                                import(
+                                    'src/pages/Customer/Card/CustomerConsigneeEdit.vue'
+                                ),
+                        },
+                    ],
                 },
                 {
                     path: 'notes',

From 627226d3cd125785abd40540a7f8e8ddacc1a80f Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Thu, 11 Jan 2024 14:58:22 -0300
Subject: [PATCH 17/94] Entry list

---
 src/components/ui/CardList.vue |   4 +
 src/i18n/en/index.js           |   6 ++
 src/i18n/es/index.js           |   6 ++
 src/pages/Entry/EntryList.vue  | 139 +++++++++++++++++++++++++++++++--
 4 files changed, 149 insertions(+), 6 deletions(-)

diff --git a/src/components/ui/CardList.vue b/src/components/ui/CardList.vue
index 7d7cee23e..eba69a952 100644
--- a/src/components/ui/CardList.vue
+++ b/src/components/ui/CardList.vue
@@ -9,6 +9,7 @@ const $props = defineProps({
     isSelected: { type: Boolean, default: false },
     title: { type: String, default: null },
     showCheckbox: { type: Boolean, default: false },
+    hasInfoIcons: { type: Boolean, default: false },
 });
 
 const emit = defineEmits(['toggleCardCheck']);
@@ -39,6 +40,9 @@ const toggleCardCheck = (item) => {
                 </div>
             </slot>
             <div class="card-list-body">
+                <div v-if="hasInfoIcons" class="column q-mr-md q-gutter-y-xs">
+                    <slot name="info-icons" />
+                </div>
                 <div class="list-items row flex-wrap-wrap">
                     <slot name="list-items" />
                 </div>
diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index 1b3c1298c..ffff99cc4 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -267,6 +267,12 @@ export default {
         },
         list: {
             newEntry: 'New entry',
+            landed: 'Landed',
+            invoiceNumber: 'Invoice number',
+            supplier: 'Supplier',
+            booked: 'Booked',
+            confirmed: 'Confirmed',
+            ordered: 'Ordered',
         },
     },
     ticket: {
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index 9758baefd..d8993a08c 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -265,6 +265,12 @@ export default {
         },
         list: {
             newEntry: 'Nueva entrada',
+            landed: 'F. entrega',
+            invoiceNumber: 'Núm. factura',
+            supplier: 'Proveedor',
+            booked: 'Asentado',
+            confirmed: 'Confirmado',
+            ordered: 'Pedida',
         },
     },
     ticket: {
diff --git a/src/pages/Entry/EntryList.vue b/src/pages/Entry/EntryList.vue
index 1baa9e019..84f0d8112 100644
--- a/src/pages/Entry/EntryList.vue
+++ b/src/pages/Entry/EntryList.vue
@@ -1,22 +1,149 @@
 <script setup>
+import { onMounted, onUnmounted } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
+import { useQuasar } from 'quasar';
 
+import VnPaginate from 'src/components/ui/VnPaginate.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 { useStateStore } from 'stores/useStateStore';
+import { toDate } from 'src/filters/index';
+
+const stateStore = useStateStore();
 const router = useRouter();
+const quasar = useQuasar();
 const { t } = useI18n();
 
+onMounted(async () => {
+    stateStore.rightDrawer = true;
+});
+onUnmounted(() => (stateStore.rightDrawer = false));
+
+function navigate(id) {
+    router.push({ path: `/invoice-in/${id}` });
+}
+
 const redirectToCreateView = () => {
     router.push({ name: 'EntryCreate' });
 };
+
+function viewSummary(id) {
+    // quasar.dialog({
+    //     component: EntrySummaryDialog,
+    //     componentProps: {
+    //         id,
+    //     },
+    // });
+}
 </script>
 
 <template>
+    <template v-if="stateStore.isHeaderMounted()">
+        <Teleport to="#searchbar">
+            <VnSearchbar
+                data-key="EntryList"
+                :label="t('Search entries')"
+                :info="t('You can search by entry reference')"
+            />
+        </Teleport>
+    </template>
+
     <QPage class="column items-center q-pa-md">
-        <QPageSticky :offset="[20, 20]">
-            <QBtn fab icon="add" color="primary" @click="redirectToCreateView()" />
-            <QTooltip>
-                {{ t('entry.list.newEntry') }}
-            </QTooltip>
-        </QPageSticky>
+        <div class="card-list">
+            <VnPaginate
+                data-key="EntryList"
+                url="Entries/filter"
+                order="landed DESC, id DESC"
+                auto-load
+            >
+                <template #body="{ rows }">
+                    <CardList
+                        v-for="row of rows"
+                        :key="row.id"
+                        :title="row.reference"
+                        @click="navigate(row.id)"
+                        :id="row.id"
+                        :has-info-icons="row.isExcludedFromAvailable || row.isRaid"
+                    >
+                        <template #info-icons>
+                            <QIcon
+                                v-if="row.isExcludedFromAvailable"
+                                name="vn:inventory"
+                                color="primary"
+                                size="xs"
+                            >
+                                <QTooltip>{{ t('Inventory entry') }}</QTooltip>
+                            </QIcon>
+                            <QIcon
+                                v-if="row.isRaid"
+                                name="vn:web"
+                                color="primary"
+                                size="xs"
+                            >
+                                <QTooltip>{{ t('Virtual entry') }}</QTooltip>
+                            </QIcon>
+                        </template>
+                        <template #list-items>
+                            <VnLv
+                                :label="t('entry.list.landed')"
+                                :value="toDate(row.landed)"
+                            />
+                            <VnLv
+                                :label="t('entry.list.booked')"
+                                :value="!!row.isBooked"
+                            />
+                            <VnLv
+                                :label="t('entry.list.invoiceNumber')"
+                                :value="row.invoiceNumber"
+                            />
+                            <VnLv
+                                :label="t('entry.list.confirmed')"
+                                :value="!!row.isConfirmed"
+                            />
+                            <VnLv
+                                :label="t('entry.list.supplier')"
+                                :value="row.supplierName"
+                            />
+                            <VnLv
+                                :label="t('entry.list.ordered')"
+                                :value="!!row.isOrdered"
+                            />
+                        </template>
+                        <template #actions>
+                            <QBtn
+                                :label="t('components.smartCard.openSummary')"
+                                @click.stop="viewSummary(row.id)"
+                                color="primary"
+                                type="submit"
+                            />
+                        </template>
+                    </CardList>
+                </template>
+            </VnPaginate>
+        </div>
     </QPage>
+    <QPageSticky :offset="[20, 20]">
+        <QBtn fab icon="add" color="primary" @click="redirectToCreateView()" />
+        <QTooltip>
+            {{ t('entry.list.newEntry') }}
+        </QTooltip>
+    </QPageSticky>
 </template>
+
+<style lang="scss" scoped>
+.card-list {
+    width: 100%;
+    max-width: 60em;
+}
+</style>
+
+<i18n>
+es:
+    Search entries: Buscar entradas
+    You can search by entry reference: Puedes buscar por referencia de la entrada
+    Inventory entry: Es inventario
+    Virtual entry: Es una redada
+</i18n>

From f9cbf03991c184d06b096e96882ae51817c049ba Mon Sep 17 00:00:00 2001
From: carlosfonseca <carlos.fonseca@mindshore.io>
Date: Thu, 11 Jan 2024 13:12:44 -0500
Subject: [PATCH 18/94] Se corrige el componente por comentario en pr

---
 .../Customer/Card/CustomerConsignees.vue      | 51 ++++++++++++-------
 1 file changed, 33 insertions(+), 18 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerConsignees.vue b/src/pages/Customer/Card/CustomerConsignees.vue
index 5abe89589..0d06c31fc 100644
--- a/src/pages/Customer/Card/CustomerConsignees.vue
+++ b/src/pages/Customer/Card/CustomerConsignees.vue
@@ -1,22 +1,36 @@
 <script setup>
-import { ref } from 'vue';
+import { computed, onBeforeMount, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute, useRouter } from 'vue-router';
 
+import { useArrayData } from 'composables/useArrayData';
+import { useStateStore } from 'stores/useStateStore';
 import FetchData from 'components/FetchData.vue';
-import FormModel from 'components/FormModel.vue';
 
 const { t } = useI18n();
 const route = useRoute();
 const router = useRouter();
+const stateStore = useStateStore();
 
+const arrayData = ref(null);
 const provincesLocation = ref([]);
 
+onBeforeMount(async () => {
+    arrayData.value = useArrayData('CustomerConsignees', {
+        url: `Clients/${route.params.id}/addresses`,
+        limit: 0,
+    });
+    await arrayData.value.fetch({ append: false });
+    stateStore.rightDrawer = true;
+});
+
+const data = computed(() => arrayData.value.store.data);
+
 const setProvince = (provinceFk) => {
     const result = provincesLocation.value.filter(
         (province) => province.id === provinceFk
     );
-    return result[0].name || '';
+    return result[0]?.name || '';
 };
 
 const toCustomerConsigneeCreate = () => {
@@ -35,13 +49,8 @@ const toCustomerConsigneeEdit = () => {
         url="Provinces/location"
     />
 
-    <FormModel
-        :observe-form-changes="false"
-        :url="`Clients/${route.params.id}/addresses`"
-        auto-load
-        model="customer"
-    >
-        <template #form="{ data }">
+    <QCard class="q-pa-sm">
+        <QCardSection>
             <div v-if="data?.length">
                 <div v-for="(item, index) in data" :key="index">
                     <div
@@ -81,14 +90,20 @@ const toCustomerConsigneeEdit = () => {
                     </div>
                 </div>
             </div>
-        </template>
-    </FormModel>
-    <QPageSticky :offset="[18, 18]">
-        <QBtn @click.stop="toCustomerConsigneeCreate()" color="primary" fab icon="add" />
-        <QTooltip>
-            {{ t('New consignee') }}
-        </QTooltip>
-    </QPageSticky>
+        </QCardSection>
+
+        <QPageSticky :offset="[18, 18]">
+            <QBtn
+                @click.stop="toCustomerConsigneeCreate()"
+                color="primary"
+                fab
+                icon="add"
+            />
+            <QTooltip>
+                {{ t('New consignee') }}
+            </QTooltip>
+        </QPageSticky>
+    </QCard>
 </template>
 
 <style lang="scss" scoped>

From 810dd81b34669426630453370dde37ec00beaa4f Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 12 Jan 2024 09:58:12 +0100
Subject: [PATCH 19/94] refs #6280 feat VnLocation approach

---
 src/components/common/VnLocation.vue | 179 +++++++++++++++++++++++++++
 1 file changed, 179 insertions(+)
 create mode 100644 src/components/common/VnLocation.vue

diff --git a/src/components/common/VnLocation.vue b/src/components/common/VnLocation.vue
new file mode 100644
index 000000000..70e818ade
--- /dev/null
+++ b/src/components/common/VnLocation.vue
@@ -0,0 +1,179 @@
+<script setup>
+import { ref, toRefs, computed, watch } from 'vue';
+import CreateNewPostcode from 'src/components/CreateNewPostcodeForm.vue';
+import VnSelectCreate from 'components/common/VnSelectCreate.vue';
+import VnSelectFilter from 'components/common/VnSelectFilter.vue';
+import FetchData from 'components/FetchData.vue';
+const emit = defineEmits(['update:modelValue', 'update:options']);
+import { useI18n } from 'vue-i18n';
+
+const { t } = useI18n();
+const citiesLocationOptions = ref([]);
+const provincesLocationOptions = ref([]);
+const countriesOptions = ref([]);
+const postcodesOptions = ref([]);
+const postcodeFetchDataRef = ref(null);
+
+const $props = defineProps({
+    modelValue: {
+        type: [String, Number, Object],
+        default: null,
+    },
+    options: {
+        type: Array,
+        default: () => [],
+    },
+    optionLabel: {
+        type: String,
+        default: '',
+    },
+    optionValue: {
+        type: String,
+        default: '',
+    },
+    filterOptions: {
+        type: Array,
+        default: () => [],
+    },
+    isClearable: {
+        type: Boolean,
+        default: true,
+    },
+    defaultFilter: {
+        type: Boolean,
+        default: true,
+    },
+});
+const locationsRef = ref();
+const locationsRefFilter = ref({ fields: ['code', 'nickname'], limit: 30 });
+
+const { optionLabel, optionValue, options } = toRefs($props);
+const myOptions = ref([]);
+const myOptionsOriginal = ref([]);
+const vnSelectRef = ref();
+const showForm = ref(false);
+
+const value = computed({
+    get() {
+        return $props.modelValue;
+    },
+    set(value) {
+        emit('update:modelValue', value);
+    },
+});
+
+function setOptions(data) {
+    myOptions.value = JSON.parse(JSON.stringify(data));
+    myOptionsOriginal.value = JSON.parse(JSON.stringify(data));
+}
+setOptions(options.value);
+const filter = (val, options) => {
+    const search = val.toString().toLowerCase();
+
+    if (!search) return options;
+    // if (!search.length < 2) return options;
+
+    return options
+};
+
+const filterHandler = (val, update) => {
+    update(
+        () => {
+            // if (val.length>2)
+                myOptions.value = filter(val, myOptionsOriginal.value);
+        },
+        (ref) => {
+            if (val !== '' && ref.options.length > 0) {
+                ref.setOptionIndex(-1);
+                ref.moveOptionSelection(1, true);
+            }
+        }
+    );
+};
+
+function locationFilter(val) {
+    let where = { limit: 30 };
+    let params = {};
+    let key = 'nickname';
+
+    if (new RegExp(/\d/g).test(val)) {
+        key = 'id';
+    }
+    params = { [key]: { like: `%${val}%` } };
+    where = Object.assign(where, params);
+    locationsRef.value.fetch({ where });
+}
+watch(options, (newValue) => {
+    setOptions(newValue);
+});
+
+function showLabel(data){
+    return `${data.code} - ${data.town.name}(${data.town.province.name}), ${data.town.province.country.country}`;
+}
+
+</script>
+
+<template>
+    <FetchData
+        ref="postcodeFetchDataRef"
+        url="Postcodes/location"
+        @on-fetch="(data) => (postcodesOptions = data)"
+        auto-load
+    />
+    <FetchData
+        @on-fetch="(data) => (citiesLocationOptions = data)"
+        auto-load
+        url="Towns/location"
+    />
+    <FetchData
+        @on-fetch="(data) => (provincesLocationOptions = data)"
+        auto-load
+        url="Provinces/location"
+    />
+    <FetchData
+        @on-fetch="(data) => (countriesOptions = data)"
+        auto-load
+        url="Countries"
+    />
+    <VnSelectCreate
+        v-model="value"
+        :options="postcodesOptions"
+        :label="t('Location')"
+        :option-label="showLabel"
+        v-bind="$attrs"
+        emit-value
+        map-options
+        use-input
+        @filter="filterHandler"
+        clearable
+        hide-selected
+        fill-input
+        :class="{ required: $attrs.required }"
+    >
+        <template #form>
+            <CreateNewPostcode @on-data-saved="onPostcodeCreated($event)" />
+        </template>
+        <template #option="scope">
+            <QItem v-bind="scope.itemProps">
+                <QItemSection v-if="scope.opt">
+                    <QItemLabel>{{ scope.opt.code }}</QItemLabel>
+                    <QItemLabel caption
+                        >{{ showLabel(scope.opt)}}</QItemLabel
+                    >
+                </QItemSection>
+            </QItem>
+        </template>
+    </VnSelectCreate>
+</template>
+<style lang="scss" scoped>
+.add-icon {
+    cursor: pointer;
+    background-color: $primary;
+    border-radius: 50px;
+}
+</style>
+
+<i18n>
+es:
+    Location: Ubicación
+</i18n>

From 68ba851e6e9f5c2b5a7e47b3b33df2b8ce1fddf3 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 12 Jan 2024 09:58:24 +0100
Subject: [PATCH 20/94] refs #6280 feat use VnLocation in CustomerCreate

---
 src/pages/Customer/CustomerCreate.vue | 96 ++-------------------------
 1 file changed, 7 insertions(+), 89 deletions(-)

diff --git a/src/pages/Customer/CustomerCreate.vue b/src/pages/Customer/CustomerCreate.vue
index cfaef0855..f6ac6a165 100644
--- a/src/pages/Customer/CustomerCreate.vue
+++ b/src/pages/Customer/CustomerCreate.vue
@@ -2,12 +2,11 @@
 import { reactive, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 
-import CustomerCreateNewPostcode from 'src/components/CreateNewPostcodeForm.vue';
 import FetchData from 'components/FetchData.vue';
 import FormModel from 'components/FormModel.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
-import VnSelectCreate from 'src/components/common/VnSelectCreate.vue';
+import VnLocation from 'src/components/common/VnLocation.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 
 const { t } = useI18n();
@@ -133,96 +132,15 @@ const onPostcodeCreated = async () => {
                 </VnRow>
                 <VnRow class="row q-gutter-md q-mb-md">
                     <div class="col">
-                        <VnSelectCreate
-                            v-model="data.postcode"
-                            :label="t('Postcode')"
-                            :rules="validate('Worker.postcode')"
-                            :roles-allowed-to-create="['deliveryAssistant']"
+                        <VnLocation
                             :options="postcodesOptions"
-                            option-label="code"
-                            option-value="code"
-                            hide-selected
-                        >
-                            <template #form>
-                                <CustomerCreateNewPostcode
-                                    @on-data-saved="onPostcodeCreated($event)"
-                                />
-                            </template>
-                            <template #option="scope">
-                                <QItem v-bind="scope.itemProps">
-                                    <QItemSection v-if="scope.opt">
-                                        <QItemLabel>{{ scope.opt.code }}</QItemLabel>
-                                        <QItemLabel caption
-                                            >{{ scope.opt.code }} -
-                                            {{ scope.opt.town.name }} ({{
-                                                scope.opt.town.province.name
-                                            }},
-                                            {{
-                                                scope.opt.town.province.country.country
-                                            }})</QItemLabel
-                                        >
-                                    </QItemSection>
-                                </QItem>
-                            </template>
-                        </VnSelectCreate>
-                    </div>
-                    <div class="col">
-                        <!-- ciudades -->
-                        <VnSelectFilter
-                            :label="t('City')"
-                            :options="citiesLocationOptions"
-                            hide-selected
-                            option-label="name"
-                            option-value="name"
-                            v-model="data.city"
-                        >
-                            <template #option="scope">
-                                <QItem v-bind="scope.itemProps">
-                                    <QItemSection>
-                                        <QItemLabel>{{ scope.opt.name }}</QItemLabel>
-                                        <QItemLabel caption>
-                                            {{
-                                                `${scope.opt.name}, ${scope.opt.province.name} (${scope.opt.province.country.country})`
-                                            }}
-                                        </QItemLabel>
-                                    </QItemSection>
-                                </QItem>
-                            </template>
-                        </VnSelectFilter>
-                    </div>
-                </VnRow>
-                <VnRow class="row q-gutter-md q-mb-md">
-                    <div class="col">
-                        <VnSelectFilter
-                            :label="t('Province')"
-                            :options="provincesLocationOptions"
-                            hide-selected
-                            option-label="name"
-                            option-value="id"
-                            v-model="data.provinceFk"
-                        >
-                            <template #option="scope">
-                                <QItem v-bind="scope.itemProps">
-                                    <QItemSection>
-                                        <QItemLabel>{{
-                                            `${scope.opt.name} (${scope.opt.country.country})`
-                                        }}</QItemLabel>
-                                    </QItemSection>
-                                </QItem>
-                            </template>
-                        </VnSelectFilter>
-                    </div>
-                    <div class="col">
-                        <VnSelectFilter
-                            :label="t('Country')"
-                            :options="countriesOptions"
-                            hide-selected
-                            option-label="country"
-                            option-value="id"
-                            v-model="data.countryFk"
-                        />
+                            v-model="data.location"
+                        @update:model-value="(data)=> console.log(data)"
+                            >
+                        </VnLocation>
                     </div>
                 </VnRow>
+
                 <VnRow class="row q-gutter-md q-mb-md">
                     <div class="col">
                         <QInput v-model="data.userName" :label="t('Web user')" />

From 67d4471f42eb2d125103ad42f8c65d3e44e4fe70 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 12 Jan 2024 10:57:50 +0100
Subject: [PATCH 21/94] refs #6280 feat: improve VnLocation

---
 src/components/common/VnLocation.vue     |  7 +++--
 src/components/common/VnSelectFilter.vue | 38 ++++++++++++++++++++++--
 2 files changed, 41 insertions(+), 4 deletions(-)

diff --git a/src/components/common/VnLocation.vue b/src/components/common/VnLocation.vue
index 70e818ade..3a296e168 100644
--- a/src/components/common/VnLocation.vue
+++ b/src/components/common/VnLocation.vue
@@ -135,16 +135,19 @@ function showLabel(data){
         auto-load
         url="Countries"
     />
+    <!-- @input-value="filter"
+    :default-filter="false" -->
     <VnSelectCreate
         v-model="value"
         :options="postcodesOptions"
         :label="t('Location')"
-        :option-label="showLabel"
+        option-label="code"
         v-bind="$attrs"
         emit-value
         map-options
         use-input
-        @filter="filterHandler"
+        :filter-options="['code','town.name']"
+        :filter-rules="['val.length>2',{code:'.length > 2'}]"
         clearable
         hide-selected
         fill-input
diff --git a/src/components/common/VnSelectFilter.vue b/src/components/common/VnSelectFilter.vue
index 244fb50bb..2c5c16e4f 100644
--- a/src/components/common/VnSelectFilter.vue
+++ b/src/components/common/VnSelectFilter.vue
@@ -16,7 +16,11 @@ const $props = defineProps({
         default: '',
     },
     filterOptions: {
-        type: Array,
+        type: [Array, Function],
+        default: () => [],
+    },
+    filterRules: {
+        type: [Array, Function],
         default: () => [],
     },
     isClearable: {
@@ -47,16 +51,46 @@ function setOptions(data) {
     myOptions.value = JSON.parse(JSON.stringify(data));
     myOptionsOriginal.value = JSON.parse(JSON.stringify(data));
 }
+function deepFind(obj, path) {
+  var paths = path.split('.')
+    , current = obj
+    , i;
+
+  for (i = 0; i < paths.length; ++i) {
+    if (current[paths[i]] == undefined) {
+      return undefined;
+    } else {
+      current = current[paths[i]];
+    }
+  }
+  return current;
+}
 setOptions(options.value);
 const filter = (val, options) => {
     const search = val.toString().toLowerCase();
 
     if (!search) return options;
+    if($props.filterRules.length) {
+        const passSomeRule = $props.filterRules.some((rule) => {
+            if(typeof rule === 'object') return true
+            const cond = eval(rule)
+            return cond;
+        });
+        if(!passSomeRule) return options
+    }
 
     return options.filter((row) => {
         if ($props.filterOptions.length) {
             return $props.filterOptions.some((prop) => {
-                const propValue = String(row[prop]).toLowerCase();
+                const passRules = $props.filterRules
+                .filter(rule=>typeof rule === 'object')
+                .every(rule=>{
+                    const propExists = Object.keys(rule).includes(prop);
+                    if(!propExists) return false;
+                    return eval(prop.concat(rule[prop]))
+                });
+                const propValue = String(deepFind(row,prop)).toLowerCase();
+                if(passRules)
                 return propValue.includes(search);
             });
         }

From 4b3ca3bbd97872f8c8935f0ec30ee3d442f14788 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 12 Jan 2024 11:27:54 +0100
Subject: [PATCH 22/94] refs #6280 feat: return geoFk VnLocation

---
 src/components/common/VnLocation.vue     | 51 +++---------------------
 src/components/common/VnSelectFilter.vue |  9 -----
 2 files changed, 5 insertions(+), 55 deletions(-)

diff --git a/src/components/common/VnLocation.vue b/src/components/common/VnLocation.vue
index 3a296e168..5c41144ac 100644
--- a/src/components/common/VnLocation.vue
+++ b/src/components/common/VnLocation.vue
@@ -2,7 +2,6 @@
 import { ref, toRefs, computed, watch } from 'vue';
 import CreateNewPostcode from 'src/components/CreateNewPostcodeForm.vue';
 import VnSelectCreate from 'components/common/VnSelectCreate.vue';
-import VnSelectFilter from 'components/common/VnSelectFilter.vue';
 import FetchData from 'components/FetchData.vue';
 const emit = defineEmits(['update:modelValue', 'update:options']);
 import { useI18n } from 'vue-i18n';
@@ -44,14 +43,10 @@ const $props = defineProps({
         default: true,
     },
 });
-const locationsRef = ref();
-const locationsRefFilter = ref({ fields: ['code', 'nickname'], limit: 30 });
 
-const { optionLabel, optionValue, options } = toRefs($props);
+const { options } = toRefs($props);
 const myOptions = ref([]);
 const myOptionsOriginal = ref([]);
-const vnSelectRef = ref();
-const showForm = ref(false);
 
 const value = computed({
     get() {
@@ -67,42 +62,6 @@ function setOptions(data) {
     myOptionsOriginal.value = JSON.parse(JSON.stringify(data));
 }
 setOptions(options.value);
-const filter = (val, options) => {
-    const search = val.toString().toLowerCase();
-
-    if (!search) return options;
-    // if (!search.length < 2) return options;
-
-    return options
-};
-
-const filterHandler = (val, update) => {
-    update(
-        () => {
-            // if (val.length>2)
-                myOptions.value = filter(val, myOptionsOriginal.value);
-        },
-        (ref) => {
-            if (val !== '' && ref.options.length > 0) {
-                ref.setOptionIndex(-1);
-                ref.moveOptionSelection(1, true);
-            }
-        }
-    );
-};
-
-function locationFilter(val) {
-    let where = { limit: 30 };
-    let params = {};
-    let key = 'nickname';
-
-    if (new RegExp(/\d/g).test(val)) {
-        key = 'id';
-    }
-    params = { [key]: { like: `%${val}%` } };
-    where = Object.assign(where, params);
-    locationsRef.value.fetch({ where });
-}
 watch(options, (newValue) => {
     setOptions(newValue);
 });
@@ -135,19 +94,19 @@ function showLabel(data){
         auto-load
         url="Countries"
     />
-    <!-- @input-value="filter"
-    :default-filter="false" -->
     <VnSelectCreate
         v-model="value"
         :options="postcodesOptions"
         :label="t('Location')"
-        option-label="code"
+        option-value="geoFk"
+        :option-label="showLabel"
+        :placeholder="t('Min. 3 char')"
         v-bind="$attrs"
         emit-value
         map-options
         use-input
         :filter-options="['code','town.name']"
-        :filter-rules="['val.length>2',{code:'.length > 2'}]"
+        :filter-rules="['val.length>2']"
         clearable
         hide-selected
         fill-input
diff --git a/src/components/common/VnSelectFilter.vue b/src/components/common/VnSelectFilter.vue
index 2c5c16e4f..ad0a0ec38 100644
--- a/src/components/common/VnSelectFilter.vue
+++ b/src/components/common/VnSelectFilter.vue
@@ -72,7 +72,6 @@ const filter = (val, options) => {
     if (!search) return options;
     if($props.filterRules.length) {
         const passSomeRule = $props.filterRules.some((rule) => {
-            if(typeof rule === 'object') return true
             const cond = eval(rule)
             return cond;
         });
@@ -82,15 +81,7 @@ const filter = (val, options) => {
     return options.filter((row) => {
         if ($props.filterOptions.length) {
             return $props.filterOptions.some((prop) => {
-                const passRules = $props.filterRules
-                .filter(rule=>typeof rule === 'object')
-                .every(rule=>{
-                    const propExists = Object.keys(rule).includes(prop);
-                    if(!propExists) return false;
-                    return eval(prop.concat(rule[prop]))
-                });
                 const propValue = String(deepFind(row,prop)).toLowerCase();
-                if(passRules)
                 return propValue.includes(search);
             });
         }

From bf19ce630dd8143dc3e0f4eb38a1247c03adb287 Mon Sep 17 00:00:00 2001
From: carlosfonseca <carlos.fonseca@mindshore.io>
Date: Fri, 12 Jan 2024 05:28:58 -0500
Subject: [PATCH 23/94] Nueva correccion por comentario

---
 .../Customer/Card/CustomerConsignees.vue      | 60 ++++++++-----------
 1 file changed, 25 insertions(+), 35 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerConsignees.vue b/src/pages/Customer/Card/CustomerConsignees.vue
index 0d06c31fc..f8f6160dd 100644
--- a/src/pages/Customer/Card/CustomerConsignees.vue
+++ b/src/pages/Customer/Card/CustomerConsignees.vue
@@ -1,31 +1,17 @@
 <script setup>
-import { computed, onBeforeMount, ref } from 'vue';
+import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute, useRouter } from 'vue-router';
 
-import { useArrayData } from 'composables/useArrayData';
-import { useStateStore } from 'stores/useStateStore';
 import FetchData from 'components/FetchData.vue';
+import VnPaginate from 'src/components/ui/VnPaginate.vue';
 
 const { t } = useI18n();
 const route = useRoute();
 const router = useRouter();
-const stateStore = useStateStore();
 
-const arrayData = ref(null);
 const provincesLocation = ref([]);
 
-onBeforeMount(async () => {
-    arrayData.value = useArrayData('CustomerConsignees', {
-        url: `Clients/${route.params.id}/addresses`,
-        limit: 0,
-    });
-    await arrayData.value.fetch({ append: false });
-    stateStore.rightDrawer = true;
-});
-
-const data = computed(() => arrayData.value.store.data);
-
 const setProvince = (provinceFk) => {
     const result = provincesLocation.value.filter(
         (province) => province.id === provinceFk
@@ -49,14 +35,19 @@ const toCustomerConsigneeEdit = () => {
         url="Provinces/location"
     />
 
-    <QCard class="q-pa-sm">
-        <QCardSection>
-            <div v-if="data?.length">
-                <div v-for="(item, index) in data" :key="index">
+    <QCard class="q-pa-lg">
+        <VnPaginate
+            data-key="CustomerConsignees"
+            :url="`Clients/${route.params.id}/addresses`"
+            order="id"
+            auto-load
+        >
+            <template #body="{ rows }">
+                <div v-for="(item, index) in rows" :key="index">
                     <div
                         :class="{
                             'consignees-card': true,
-                            'q-mb-md': index + 1 === data.length ? false : true,
+                            'q-mb-md': index + 1 === rows.length ? false : true,
                         }"
                     >
                         <div class="consignees-card-icon">
@@ -89,20 +80,19 @@ const toCustomerConsigneeEdit = () => {
                         </div>
                     </div>
                 </div>
-            </div>
-        </QCardSection>
-
-        <QPageSticky :offset="[18, 18]">
-            <QBtn
-                @click.stop="toCustomerConsigneeCreate()"
-                color="primary"
-                fab
-                icon="add"
-            />
-            <QTooltip>
-                {{ t('New consignee') }}
-            </QTooltip>
-        </QPageSticky>
+                <QPageSticky :offset="[18, 18]">
+                    <QBtn
+                        @click.stop="toCustomerConsigneeCreate()"
+                        color="primary"
+                        fab
+                        icon="add"
+                    />
+                    <QTooltip>
+                        {{ t('New consignee') }}
+                    </QTooltip>
+                </QPageSticky>
+            </template>
+        </VnPaginate>
     </QCard>
 </template>
 

From 4bf16da814579840108b688cd0c22b6ab904b15d Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Fri, 12 Jan 2024 09:49:34 -0300
Subject: [PATCH 24/94] Improve autocompletion

---
 src/components/CreateNewCityForm.vue           |  4 ++--
 src/components/CreateNewPostcodeForm.vue       | 18 ++++++++++++++----
 src/components/CreateNewProvinceForm.vue       |  4 ++--
 src/pages/Customer/Card/CustomerFiscalData.vue |  7 +++++--
 src/pages/Customer/CustomerCreate.vue          |  5 ++++-
 src/pages/Supplier/Card/SupplierFiscalData.vue | 13 ++++++++-----
 src/pages/Worker/WorkerCreate.vue              |  5 ++++-
 7 files changed, 39 insertions(+), 17 deletions(-)

diff --git a/src/components/CreateNewCityForm.vue b/src/components/CreateNewCityForm.vue
index ee842e86f..7326ea7a5 100644
--- a/src/components/CreateNewCityForm.vue
+++ b/src/components/CreateNewCityForm.vue
@@ -19,8 +19,8 @@ const cityFormData = reactive({
 
 const provincesOptions = ref([]);
 
-const onDataSaved = () => {
-    emit('onDataSaved');
+const onDataSaved = (dataSaved) => {
+    emit('onDataSaved', dataSaved);
 };
 </script>
 
diff --git a/src/components/CreateNewPostcodeForm.vue b/src/components/CreateNewPostcodeForm.vue
index 40efa0789..ccffb2ec2 100644
--- a/src/components/CreateNewPostcodeForm.vue
+++ b/src/components/CreateNewPostcodeForm.vue
@@ -32,12 +32,20 @@ const onDataSaved = (dataSaved) => {
     emit('onDataSaved', dataSaved);
 };
 
-const onCityCreated = async () => {
+const onCityCreated = async ({ name, provinceFk }, formData) => {
     await townsFetchDataRef.value.fetch();
+    formData.townFk = townsLocationOptions.value.find((town) => town.name === name).id;
+    formData.provinceFk = provinceFk;
+    formData.countryFk = provincesOptions.value.find(
+        (province) => province.id === provinceFk
+    ).countryFk;
 };
 
-const onProvinceCreated = async () => {
+const onProvinceCreated = async ({ name }, formData) => {
     await provincesFetchDataRef.value.fetch();
+    formData.provinceFk = provincesOptions.value.find(
+        (province) => province.name === name
+    ).id;
 };
 </script>
 
@@ -88,7 +96,9 @@ const onProvinceCreated = async () => {
                         :roles-allowed-to-create="['deliveryAssistant']"
                     >
                         <template #form>
-                            <CreateNewCityForm @on-data-saved="onCityCreated($event)" />
+                            <CreateNewCityForm
+                                @on-data-saved="onCityCreated($event, data)"
+                            />
                         </template>
                     </VnSelectCreate>
                 </div>
@@ -107,7 +117,7 @@ const onProvinceCreated = async () => {
                     >
                         <template #form>
                             <CreateNewProvinceForm
-                                @on-data-saved="onProvinceCreated($event)"
+                                @on-data-saved="onProvinceCreated($event, data)"
                             />
                         </template>
                     </VnSelectCreate>
diff --git a/src/components/CreateNewProvinceForm.vue b/src/components/CreateNewProvinceForm.vue
index 0f88952ea..b972db2c9 100644
--- a/src/components/CreateNewProvinceForm.vue
+++ b/src/components/CreateNewProvinceForm.vue
@@ -19,8 +19,8 @@ const provinceFormData = reactive({
 
 const autonomiesOptions = ref([]);
 
-const onDataSaved = () => {
-    emit('onDataSaved');
+const onDataSaved = (dataSaved) => {
+    emit('onDataSaved', dataSaved);
 };
 </script>
 
diff --git a/src/pages/Customer/Card/CustomerFiscalData.vue b/src/pages/Customer/Card/CustomerFiscalData.vue
index e7e626a99..0edcc3c07 100644
--- a/src/pages/Customer/Card/CustomerFiscalData.vue
+++ b/src/pages/Customer/Card/CustomerFiscalData.vue
@@ -14,16 +14,18 @@ import VnSelectCreate from 'src/components/common/VnSelectCreate.vue';
 const { t } = useI18n();
 const route = useRoute();
 
+const townsFetchDataRef = ref(null);
+const postcodeFetchDataRef = ref(null);
 const typesTaxes = ref([]);
 const typesTransactions = ref([]);
-const postcodeFetchDataRef = ref(null);
 const citiesLocationOptions = ref([]);
 const provincesLocationOptions = ref([]);
 const countriesOptions = ref([]);
 const postcodesOptions = ref([]);
 
 const onPostcodeCreated = async ({ code, provinceFk, townFk, countryFk }, formData) => {
-    postcodeFetchDataRef.value.fetch();
+    await postcodeFetchDataRef.value.fetch();
+    await townsFetchDataRef.value.fetch();
     formData.postcode = code;
     formData.provinceFk = provinceFk;
     formData.city = citiesLocationOptions.value.find((town) => town.id === townFk).name;
@@ -39,6 +41,7 @@ const onPostcodeCreated = async ({ code, provinceFk, townFk, countryFk }, formDa
         url="SageTransactionTypes"
     />
     <FetchData
+        ref="townsFetchDataRef"
         @on-fetch="(data) => (citiesLocationOptions = data)"
         auto-load
         url="Towns/location"
diff --git a/src/pages/Customer/CustomerCreate.vue b/src/pages/Customer/CustomerCreate.vue
index 767fdd0de..310deb71a 100644
--- a/src/pages/Customer/CustomerCreate.vue
+++ b/src/pages/Customer/CustomerCreate.vue
@@ -30,6 +30,7 @@ const newClientForm = reactive({
 });
 
 const postcodeFetchDataRef = ref(null);
+const townsFetchDataRef = ref(null);
 const workersOptions = ref([]);
 const businessTypesOptions = ref([]);
 const citiesLocationOptions = ref([]);
@@ -38,7 +39,8 @@ const countriesOptions = ref([]);
 const postcodesOptions = ref([]);
 
 const onPostcodeCreated = async ({ code, provinceFk, townFk, countryFk }, formData) => {
-    postcodeFetchDataRef.value.fetch();
+    await postcodeFetchDataRef.value.fetch();
+    await townsFetchDataRef.value.fetch();
     formData.postcode = code;
     formData.provinceFk = provinceFk;
     formData.city = citiesLocationOptions.value.find((town) => town.id === townFk).name;
@@ -64,6 +66,7 @@ const onPostcodeCreated = async ({ code, provinceFk, townFk, countryFk }, formDa
         url="BusinessTypes"
     />
     <FetchData
+        ref="townsFetchDataRef"
         @on-fetch="(data) => (citiesLocationOptions = data)"
         auto-load
         url="Towns/location"
diff --git a/src/pages/Supplier/Card/SupplierFiscalData.vue b/src/pages/Supplier/Card/SupplierFiscalData.vue
index 806c25c09..28ad26961 100644
--- a/src/pages/Supplier/Card/SupplierFiscalData.vue
+++ b/src/pages/Supplier/Card/SupplierFiscalData.vue
@@ -15,6 +15,7 @@ const route = useRoute();
 const { t } = useI18n();
 
 const postcodeFetchDataRef = ref(null);
+const townsFetchDataRef = ref(null);
 const sageTaxTypesOptions = ref([]);
 const sageWithholdingsOptions = ref([]);
 const sageTransactionTypesOptions = ref([]);
@@ -25,8 +26,9 @@ const townsLocationOptions = ref([]);
 const countriesOptions = ref([]);
 
 const onPostcodeCreated = async ({ code, provinceFk, townFk, countryFk }, formData) => {
-    postcodeFetchDataRef.value.fetch();
-    formData.postcode = code;
+    await postcodeFetchDataRef.value.fetch();
+    await townsFetchDataRef.value.fetch();
+    formData.postCode = code;
     formData.provinceFk = provinceFk;
     formData.city = townsLocationOptions.value.find((town) => town.id === townFk).name;
     formData.countryFk = countryFk;
@@ -60,6 +62,7 @@ const onPostcodeCreated = async ({ code, provinceFk, townFk, countryFk }, formDa
         auto-load
     />
     <FetchData
+        ref="townsFetchDataRef"
         @on-fetch="(data) => (townsLocationOptions = data)"
         auto-load
         url="Towns/location"
@@ -171,14 +174,13 @@ const onPostcodeCreated = async ({ code, provinceFk, townFk, countryFk }, formDa
                 </div>
                 <div class="col">
                     <VnSelectCreate
-                        v-model="data.postCode"
                         :label="t('supplier.fiscalData.postcode')"
+                        v-model="data.postCode"
+                        :options="postcodesOptions"
                         :rules="validate('supplier.postCode')"
                         :roles-allowed-to-create="['deliveryAssistant']"
-                        :options="postcodesOptions"
                         option-label="code"
                         option-value="code"
-                        map-options
                         hide-selected
                     >
                         <template #form>
@@ -286,6 +288,7 @@ const onPostcodeCreated = async ({ code, provinceFk, townFk, countryFk }, formDa
                     </div>
                 </div>
             </VnRow>
+            <pre> {{ data }}</pre>
         </template>
     </FormModel>
 </template>
diff --git a/src/pages/Worker/WorkerCreate.vue b/src/pages/Worker/WorkerCreate.vue
index eb9dc70f6..91d4d454b 100644
--- a/src/pages/Worker/WorkerCreate.vue
+++ b/src/pages/Worker/WorkerCreate.vue
@@ -50,6 +50,7 @@ const newWorkerForm = ref({
 });
 
 const postcodeFetchDataRef = ref(null);
+const townsFetchDataRef = ref(null);
 const provincesOptions = ref([]);
 const townsOptions = ref([]);
 const companiesOptions = ref([]);
@@ -67,7 +68,8 @@ const onBankEntityCreated = (data) => {
 };
 
 const onPostcodeCreated = async ({ code, provinceFk, townFk }, formData) => {
-    postcodeFetchDataRef.value.fetch();
+    await postcodeFetchDataRef.value.fetch();
+    await townsFetchDataRef.value.fetch();
     formData.postcode = code;
     formData.provinceFk = provinceFk;
     formData.city = townsOptions.value.find((town) => town.id === townFk).name;
@@ -99,6 +101,7 @@ onMounted(async () => {
         auto-load
     />
     <FetchData
+        ref="townsFetchDataRef"
         url="Towns/location"
         @on-fetch="(data) => (townsOptions = data)"
         :filter="townsFilter"

From 207a5a590867aa2976a357768cb4ffb67f54acb6 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Fri, 12 Jan 2024 10:36:42 -0300
Subject: [PATCH 25/94] changes

---
 src/components/CreateNewPostcodeForm.vue      |  4 +-
 src/components/FormModelPopup.vue             |  6 +-
 .../Customer/Card/CustomerConsigneeCreate.vue | 15 +++--
 .../Customer/Card/CustomerConsignees.vue      | 67 ++++++++++---------
 4 files changed, 50 insertions(+), 42 deletions(-)

diff --git a/src/components/CreateNewPostcodeForm.vue b/src/components/CreateNewPostcodeForm.vue
index 3504445f8..a9efcf8f4 100644
--- a/src/components/CreateNewPostcodeForm.vue
+++ b/src/components/CreateNewPostcodeForm.vue
@@ -28,8 +28,8 @@ const countriesOptions = ref([]);
 const provincesOptions = ref([]);
 const townsLocationOptions = ref([]);
 
-const onDataSaved = () => {
-    emit('onDataSaved');
+const onDataSaved = (dataSaved) => {
+    emit('onDataSaved', dataSaved);
 };
 
 const onCityCreated = async () => {
diff --git a/src/components/FormModelPopup.vue b/src/components/FormModelPopup.vue
index c314f6897..04322a3c8 100644
--- a/src/components/FormModelPopup.vue
+++ b/src/components/FormModelPopup.vue
@@ -42,8 +42,8 @@ const { t } = useI18n();
 const closeButton = ref(null);
 const isLoading = ref(false);
 
-const onDataSaved = () => {
-    emit('onDataSaved');
+const onDataSaved = (dataSaved) => {
+    emit('onDataSaved', dataSaved);
     closeForm();
 };
 
@@ -59,7 +59,7 @@ const closeForm = () => {
         :default-actions="false"
         :url-create="urlCreate"
         :model="model"
-        @on-data-saved="onDataSaved()"
+        @on-data-saved="onDataSaved($event)"
     >
         <template #form="{ data, validate }">
             <span ref="closeButton" class="close-icon" v-close-popup>
diff --git a/src/pages/Customer/Card/CustomerConsigneeCreate.vue b/src/pages/Customer/Card/CustomerConsigneeCreate.vue
index 69d478b6f..2f8ef1b97 100644
--- a/src/pages/Customer/Card/CustomerConsigneeCreate.vue
+++ b/src/pages/Customer/Card/CustomerConsigneeCreate.vue
@@ -28,10 +28,11 @@ const formInitialData = reactive({
     customsAgentFk: null,
 });
 
+const townsFetchDataRef = ref(null);
+const postcodeFetchDataRef = ref(null);
 const agencyModes = ref([]);
 const incoterms = ref([]);
 const customsAgents = ref([]);
-const postcodeFetchDataRef = ref(null);
 const citiesLocationOptions = ref([]);
 const provincesLocationOptions = ref([]);
 const postcodesOptions = ref([]);
@@ -41,18 +42,24 @@ onBeforeMount(() => {
     urlCreate.value = `Clients/${route.params.id}/createAddress`;
 });
 
-const onPostcodeCreated = async () => {
-    postcodeFetchDataRef.value.fetch();
+const onPostcodeCreated = async ({ code, provinceFk, townFk }, formData) => {
+    await postcodeFetchDataRef.value.fetch();
+    await townsFetchDataRef.value.fetch();
+    formData.postalCode = code;
+    formData.provinceFk = provinceFk;
+    formData.city = citiesLocationOptions.value.find((town) => town.id === townFk).name;
 };
 </script>
 
 <template>
     <FetchData
+        ref="postcodeFetchDataRef"
         @on-fetch="(data) => (postcodesOptions = data)"
         auto-load
         url="Postcodes/location"
     />
     <FetchData
+        ref="townsFetchDataRef"
         @on-fetch="(data) => (citiesLocationOptions = data)"
         auto-load
         url="Towns/location"
@@ -110,7 +117,7 @@ const onPostcodeCreated = async () => {
                     >
                         <template #form>
                             <CustomerCreateNewPostcode
-                                @on-data-saved="onPostcodeCreated($event)"
+                                @on-data-saved="onPostcodeCreated($event, data)"
                             />
                         </template>
                         <template #option="scope">
diff --git a/src/pages/Customer/Card/CustomerConsignees.vue b/src/pages/Customer/Card/CustomerConsignees.vue
index f8f6160dd..f412eda59 100644
--- a/src/pages/Customer/Card/CustomerConsignees.vue
+++ b/src/pages/Customer/Card/CustomerConsignees.vue
@@ -5,6 +5,7 @@ import { useRoute, useRouter } from 'vue-router';
 
 import FetchData from 'components/FetchData.vue';
 import VnPaginate from 'src/components/ui/VnPaginate.vue';
+import VnLv from 'src/components/ui/VnLv.vue';
 
 const { t } = useI18n();
 const route = useRoute();
@@ -43,43 +44,38 @@ const toCustomerConsigneeEdit = () => {
             auto-load
         >
             <template #body="{ rows }">
-                <div v-for="(item, index) in rows" :key="index">
-                    <div
-                        :class="{
-                            'consignees-card': true,
-                            'q-mb-md': index + 1 === rows.length ? false : true,
-                        }"
-                    >
-                        <div class="consignees-card-icon">
-                            <QIcon name="star" size="md" color="primary" />
+                <QCard
+                    v-for="(item, index) in rows"
+                    :key="index"
+                    :class="['consignees-card', { 'q-mb-md': rows.length - 1 !== index }]"
+                    @click="toCustomerConsigneeEdit()"
+                >
+                    <div class="consignees-card-icon">
+                        <QIcon name="star" size="md" color="primary" />
+                    </div>
+                    <div>
+                        <div class="text-weight-bold q-mb-sm">
+                            {{ item.nickname }} - #{{ item.id }}
                         </div>
+                        <div>{{ item.street }}</div>
                         <div>
-                            <div>
-                                <div class="text-weight-bold">
-                                    {{ item.nickname }} - #{{ item.id }}
-                                </div>
-                                <div>{{ item.street }}</div>
-                                <div>
-                                    {{ item.postalCode }} - {{ item.city }},
-                                    {{ setProvince(item.provinceFk) }}
-                                </div>
-                            </div>
-                            <div class="flex">
-                                <QCheckbox
-                                    :label="t('Is equalizated')"
-                                    v-model="item.isEqualizated"
-                                    class="q-mr-lg"
-                                    @click.stop="toCustomerConsigneeEdit()"
-                                />
-                                <QCheckbox
-                                    :label="t('Is logiflora allowed')"
-                                    v-model="item.isLogifloraAllowed"
-                                    @click.stop="toCustomerConsigneeEdit()"
-                                />
-                            </div>
+                            {{ item.postalCode }} - {{ item.city }},
+                            {{ setProvince(item.provinceFk) }}
+                        </div>
+                        <div class="flex">
+                            <VnLv
+                                :label="t('Is equalizated')"
+                                :value="item.isEqualizated"
+                                class="row q-mr-lg"
+                            />
+                            <VnLv
+                                :label="t('Is logiflora allowed')"
+                                :value="item.isLogifloraAllowed"
+                                class="row"
+                            />
                         </div>
                     </div>
-                </div>
+                </QCard>
                 <QPageSticky :offset="[18, 18]">
                     <QBtn
                         @click.stop="toCustomerConsigneeCreate()"
@@ -102,6 +98,11 @@ const toCustomerConsigneeEdit = () => {
     border-radius: 10px;
     padding: 10px;
     display: flex;
+    cursor: pointer;
+
+    &:hover {
+        background-color: var(--vn-light-gray);
+    }
 }
 .consignees-card-icon {
     margin: 0 15px 0 5px;

From 3d98bf578eb7e6a526a2bbff7aa8a80f41a470aa Mon Sep 17 00:00:00 2001
From: Kevin Martinez <kevin.martinez@mindshore.io>
Date: Fri, 12 Jan 2024 10:03:18 -0400
Subject: [PATCH 26/94] Create route list

---
 src/components/common/VnInputTime.vue | 108 +++++++
 src/filters/index.js                  |   2 +
 src/filters/isValidDate.js            |   3 +
 src/filters/toHour.js                 |  16 +
 src/i18n/en/index.js                  |   1 +
 src/i18n/es/index.js                  |   1 +
 src/pages/Route/RouteList.vue         | 407 ++++++++++++++++++++++++++
 src/router/modules/route.js           |  11 +-
 8 files changed, 548 insertions(+), 1 deletion(-)
 create mode 100644 src/components/common/VnInputTime.vue
 create mode 100644 src/filters/isValidDate.js
 create mode 100644 src/filters/toHour.js
 create mode 100644 src/pages/Route/RouteList.vue

diff --git a/src/components/common/VnInputTime.vue b/src/components/common/VnInputTime.vue
new file mode 100644
index 000000000..b705d91f6
--- /dev/null
+++ b/src/components/common/VnInputTime.vue
@@ -0,0 +1,108 @@
+<script setup>
+import {computed, ref} from 'vue';
+import { toHour} from 'src/filters';
+import {useI18n} from "vue-i18n";
+import isValidDate from "filters/isValidDate";
+
+const props = defineProps({
+    modelValue: {
+        type: String,
+        default: null,
+    },
+    readonly: {
+        type: Boolean,
+        default: false,
+    },
+    isOutlined: {
+        type: Boolean,
+        default: false,
+    },
+});
+const { t } = useI18n();
+const emit = defineEmits(['update:modelValue']);
+const value = computed({
+    get() {
+        return props.modelValue;
+    },
+    set(value) {
+        const [hours, minutes] = value.split(':')
+        const date = new Date()
+        date.setUTCHours(Number.parseInt(hours) || 0, Number.parseInt(minutes) || 0, 0, 0)
+        emit('update:modelValue', value ? date.toISOString() : null);
+    },
+});
+
+const onDateUpdate = (date) => {
+    internalValue.value = date;
+};
+
+const save = () => {
+    value.value = internalValue.value;
+};
+const formatTime = (dateString) => {
+    if (!isValidDate(dateString)){
+        return ''
+    }
+    const date = new Date(dateString || '');
+    return `${date.getUTCHours().toString().padStart(2, '0')}:${date.getUTCMinutes().toString().padStart(2, '0')}`;
+};
+
+const internalValue = ref(formatTime(value))
+
+const styleAttrs = computed(() => {
+    return props.isOutlined
+        ? {
+              dense: true,
+              outlined: true,
+              rounded: true,
+          }
+        : {};
+});
+</script>
+
+<template>
+    <QInput
+        class="vn-input-time"
+        rounded
+        readonly
+        :model-value="toHour(value)"
+        v-bind="{ ...$attrs, ...styleAttrs }"
+    >
+        <template #append>
+            <QIcon name="event" class="cursor-pointer">
+                <QPopupProxy
+                    cover
+                    transition-show="scale"
+                    transition-hide="scale"
+                    :no-parent-event="props.readonly"
+                >
+                    <QTime
+                        :format24h="false"
+                        :model-value="formatTime(value)"
+                        @update:model-value="onDateUpdate"
+                    >
+                        <div class="row items-center justify-end q-gutter-sm">
+                            <QBtn :label="t('Cancel')" color="primary" flat v-close-popup />
+                            <QBtn label="Ok" color="primary" flat @click="save" v-close-popup />
+                        </div>
+                    </QTime>
+                </QPopupProxy>
+            </QIcon>
+        </template>
+    </QInput>
+</template>
+
+<style lang="scss">
+.vn-input-time.q-field--standard.q-field--readonly .q-field__control:before {
+    border-bottom-style: solid;
+}
+
+.vn-input-time.q-field--outlined.q-field--readonly .q-field__control:before {
+    border-style: solid;
+}
+</style>
+
+<i18n>
+es:
+    Cancel: Cancelar
+</i18n>
diff --git a/src/filters/index.js b/src/filters/index.js
index f0120e663..478cb0ac8 100644
--- a/src/filters/index.js
+++ b/src/filters/index.js
@@ -8,11 +8,13 @@ import toPercentage from './toPercentage';
 import toLowerCamel from './toLowerCamel';
 import dashIfEmpty from './dashIfEmpty';
 import dateRange from './dateRange';
+import toHour from './toHour';
 
 export {
     toLowerCase,
     toLowerCamel,
     toDate,
+    toHour,
     toDateString,
     toDateHour,
     toRelativeDate,
diff --git a/src/filters/isValidDate.js b/src/filters/isValidDate.js
new file mode 100644
index 000000000..8365564b8
--- /dev/null
+++ b/src/filters/isValidDate.js
@@ -0,0 +1,3 @@
+export default function isValidDate(date) {
+    return !isNaN(new Date(date).getTime());
+}
diff --git a/src/filters/toHour.js b/src/filters/toHour.js
new file mode 100644
index 000000000..f24f81949
--- /dev/null
+++ b/src/filters/toHour.js
@@ -0,0 +1,16 @@
+import isValidDate from 'filters/isValidDate';
+
+export default function toHour(date) {
+    if (!isValidDate(date)) {
+        return '--:--';
+    }
+    const dateHour = new Date(date);
+    let hours = dateHour.getUTCHours();
+    hours = hours % 12;
+    hours = hours ? hours : 12;
+
+    let minutes = dateHour.getUTCMinutes();
+    minutes = minutes < 10 ? minutes.toString().padStart(2, '0') : minutes;
+
+    return `${hours}:${minutes} ${dateHour.getUTCHours() >= 12 ? 'PM' : 'AM'}`;
+}
diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index bd59edad1..72ed1cba8 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -807,6 +807,7 @@ export default {
         pageTitles: {
             routes: 'Routes',
             cmrsList: 'External CMRs list',
+            RouteList: 'List'
         },
         cmr: {
             list: {
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index 94f508429..f5a7483f4 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -806,6 +806,7 @@ export default {
         pageTitles: {
             routes: 'Rutas',
             cmrsList: 'Listado de CMRs externos',
+            RouteList: 'Listado'
         },
         cmr: {
             list: {
diff --git a/src/pages/Route/RouteList.vue b/src/pages/Route/RouteList.vue
new file mode 100644
index 000000000..408119751
--- /dev/null
+++ b/src/pages/Route/RouteList.vue
@@ -0,0 +1,407 @@
+<script setup>
+import VnPaginate from 'components/ui/VnPaginate.vue';
+import { useStateStore } from 'stores/useStateStore';
+import { useI18n } from 'vue-i18n';
+import { computed, onMounted, onUnmounted, ref } from 'vue';
+import {dashIfEmpty, toDate, toHour} from 'src/filters';
+import VnSelectFilter from 'components/common/VnSelectFilter.vue';
+import FetchData from 'components/FetchData.vue';
+import { useValidator } from 'composables/useValidator';
+import VnInputDate from "components/common/VnInputDate.vue";
+import VnInput from "components/common/VnInput.vue";
+import VnInputTime from "components/common/VnInputTime.vue";
+import axios from "axios";
+
+const stateStore = useStateStore();
+// const router = useRouter();
+// const quasar = useQuasar();
+const { t } = useI18n();
+const { validate } = useValidator();
+
+const to = Date.vnNew();
+to.setDate(to.getDate() + 1);
+to.setHours(0, 0, 0, 0);
+
+const from = Date.vnNew();
+from.setDate(from.getDate());
+from.setHours(0, 0, 0, 0);
+
+const params = ref({ from, to });
+
+onMounted(() => (stateStore.rightDrawer = true));
+onUnmounted(() => (stateStore.rightDrawer = false));
+
+const selectedRows = ref([]);
+const columns = computed(() => [
+    {
+        name: 'ID',
+        label: t('ID'),
+        field: (row) => row.id,
+        sortable: true,
+        align: 'left',
+    },
+    {
+        name: 'worker',
+        label: t('Worker'),
+        field: (row) => row.workerUserName,
+        sortable: true,
+        align: 'left',
+    },
+    {
+        name: 'agency',
+        label: t('Agency'),
+        field: (row) => row.agencyName,
+        sortable: true,
+        align: 'left',
+    },
+    {
+        name: 'vehicle',
+        label: t('Vehicle'),
+        field: (row) => row.vehiclePlateNumber,
+        sortable: true,
+        align: 'left',
+    },
+    {
+        name: 'date',
+        label: t('Date'),
+        field: (row) => row.created,
+        sortable: true,
+        align: 'left',
+    },
+    {
+        name: 'volume',
+        label: 'm³',
+        field: (row) => dashIfEmpty(row.m3),
+        sortable: true,
+        align: 'left',
+    },
+    {
+        name: 'description',
+        label: t('Description'),
+        field: (row) => row.description,
+        sortable: true,
+        align: 'left',
+    },
+    {
+        name: 'started',
+        label: t('Hour started'),
+        field: (row) => toHour(row.started),
+        sortable: true,
+        align: 'left',
+    },
+    {
+        name: 'finished',
+        label: t('Hour finished'),
+        field: (row) => toHour(row.finished),
+        sortable: true,
+        align: 'left',
+    },
+]);
+
+const refreshKey = ref(0)
+const workers = ref([]);
+const agencyList = ref([]);
+const vehicleList = ref([]);
+const updateRoute = async (route) => {
+    try {
+        return await axios.patch(`Routes/${route.id}`, route);
+    } catch (err) {
+        return err;
+    }
+}
+
+const updateVehicle = (row, vehicle) => {
+    row.vehicleFk = vehicle.id
+    row.vehiclePlateNumber = vehicle.numberPlate
+    updateRoute(row)
+}
+
+const updateAgency = (row, agency) => {
+    row.agencyModeFk = agency.id
+    row.agencyName = agency.name
+    updateRoute(row)
+}
+
+const updateWorker = (row, worker) => {
+    row.workerFk = worker.id
+    row.workerUserName = worker.name
+    updateRoute(row)
+}
+</script>
+
+<template>
+    <template v-if="stateStore.isHeaderMounted()">
+        <!--        <Teleport to="#searchbar">-->
+        <!--            <ShelvingSearchbar />-->
+        <!--        </Teleport>-->
+        <!--        <Teleport to="#actions-append">-->
+        <!--            <div class="row q-gutter-x-sm">-->
+        <!--                <QBtn-->
+        <!--                    flat-->
+        <!--                    @click="stateStore.toggleRightDrawer()"-->
+        <!--                    round-->
+        <!--                    dense-->
+        <!--                    icon="menu"-->
+        <!--                >-->
+        <!--                    <QTooltip bottom anchor="bottom right">-->
+        <!--                        {{ t('globals.collapseMenu') }}-->
+        <!--                    </QTooltip>-->
+        <!--                </QBtn>-->
+        <!--            </div>-->
+        <!--        </Teleport>-->
+    </template>
+    <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
+        <!--        <QScrollArea class="fit text-grey-8">-->
+        <!--            <ShelvingFilter data-key="ShelvingList" />-->
+        <!--        </QScrollArea>-->
+    </QDrawer>
+    <FetchData
+        url="Workers/activeWithInheritedRole"
+        @on-fetch="(data) => (workers = data)"
+        auto-load
+    />
+    <FetchData
+        url="AgencyModes"
+        @on-fetch="(data) => (agencyList = data)"
+        auto-load
+    />
+    <FetchData
+        url="Vehicles"
+        @on-fetch="(data) => (vehicleList = data)"
+        auto-load
+    />
+    <QPage class="column items-center q-pa-md">
+        <QToolbar class="q-pa-none q-mb-sm justify-end">
+            <QBtn
+                icon="refresh"
+                color="primary"
+                class="q-mr-sm"
+                @click="refreshKey++"
+            />
+        </QToolbar>
+        <VnPaginate
+            :key="refreshKey"
+            data-key="RouteList"
+            url="Routes/filter"
+            :order="['created DESC', 'id DESC']"
+            :limit="20"
+            :user-params="params"
+            auto-load
+        >
+            <template #body="{ rows }">
+                <QTable
+                    v-model:selected="selectedRows"
+                    :columns="columns"
+                    :rows="rows"
+                    flat
+                    row-key="id"
+                    hide-pagination
+                    selection="multiple"
+                >
+                    <template #body-cell-worker="props">
+                        <QTd :props="props">
+                            {{ props.row?.workerUserName }}
+                            <QPopupEdit
+                                :model-value="props.row.workerFk"
+                                v-slot="scope"
+                                buttons
+                                @update:model-value="(worker) => updateWorker(props.row, worker)"
+                            >
+                                <VnSelectFilter
+                                    :label="t('Worker')"
+                                    v-model="scope.value"
+                                    :options="workers"
+                                    option-value="id"
+                                    option-label="name"
+                                    hide-selected
+                                    autofocus
+                                    :emit-value="false"
+                                    :rules="validate('Route.workerFk')"
+                                    :is-clearable="false"
+                                    @keyup.enter="scope.set"
+                                    @focus="($event) => $event.target.select()"
+                                >
+                                    <template #option="{ opt, itemProps }">
+                                        <QItem
+                                            v-bind="itemProps"
+                                            class="q-pa-xs row items-center"
+                                        >
+                                            <QItemSection class="col-9 justify-center">
+                                                <span>{{ opt.name }}</span>
+                                                <span class="text-grey">{{
+                                                    opt.nickname
+                                                }}</span>
+                                            </QItemSection>
+                                        </QItem>
+                                    </template>
+                                </VnSelectFilter>
+                            </QPopupEdit>
+                        </QTd>
+                    </template>
+                    <template #body-cell-agency="props">
+                        <QTd :props="props">
+                            {{ props.row?.agencyName }}
+                            <QPopupEdit
+                                :model-value="props.row.agencyModeFk"
+                                v-slot="scope"
+                                buttons
+                                @update:model-value="(agency) => updateAgency(props.row, agency)"
+                            >
+                                <VnSelectFilter
+                                    :label="t('Agency')"
+                                    v-model="scope.value"
+                                    :options="agencyList"
+                                    option-value="id"
+                                    option-label="name"
+                                    hide-selected
+                                    autofocus
+                                    :emit-value="false"
+                                    :rules="validate('route.agencyFk')"
+                                    :is-clearable="false"
+                                    @keyup.enter="scope.set"
+                                    @focus="($event) => $event.target.select()"
+                                />
+                            </QPopupEdit>
+                        </QTd>
+                    </template>
+                    <template #body-cell-vehicle="props">
+                        <QTd :props="props">
+                            {{ props.row?.vehiclePlateNumber }}
+                            <QPopupEdit
+                                :model-value="props.row.vehicleFk"
+                                v-slot="scope"
+                                buttons
+                                @update:model-value="(vehicle) => updateVehicle(props.row, vehicle)"
+                            >
+                                <VnSelectFilter
+                                    :label="t('Vehicle')"
+                                    v-model="scope.value"
+                                    :options="vehicleList"
+                                    option-value="id"
+                                    option-label="numberPlate"
+                                    hide-selected
+                                    autofocus
+                                    :emit-value="false"
+                                    :rules="validate('route.vehicleFk')"
+                                    :is-clearable="false"
+                                    @keyup.enter="scope.set"
+                                    @focus="($event) => $event.target.select()"
+                                />
+                            </QPopupEdit>
+                        </QTd>
+                    </template>
+                    <template #body-cell-date="props">
+                        <QTd :props="props">
+                            {{ toDate(props.row?.created) }}
+                            <QPopupEdit
+                                v-model="props.row.created"
+                                v-slot="scope"
+                                @update:model-value="updateRoute(props.row)"
+                                buttons
+                            >
+                                <VnInputDate
+                                    v-model="scope.value"
+                                    autofocus
+                                    :label="t('Date')"
+                                    :rules="validate('route.created')"
+                                    :is-clearable="false"
+                                    @keyup.enter="scope.set"
+                                    @focus="($event) => $event.target.select()"
+                                />
+                            </QPopupEdit>
+                        </QTd>
+                    </template>
+                    <template #body-cell-description="props">
+                        <QTd :props="props">
+                            {{ props.row?.description }}
+                            <QPopupEdit
+                                v-model="props.row.description"
+                                v-slot="scope"
+                                @update:model-value="updateRoute(props.row)"
+                                buttons
+                            >
+                                <VnInput
+                                    v-model="scope.value"
+                                    autofocus
+                                    :label="t('Description')"
+                                    :rules="validate('route.description')"
+                                    :is-clearable="false"
+                                    @keyup.enter="scope.set"
+                                    @focus="($event) => $event.target.select()"
+                                />
+                            </QPopupEdit>
+                        </QTd>
+                    </template>
+                    <template #body-cell-started="props">
+                        <QTd :props="props">
+                            {{ toHour(props.row.started) }}
+                            <QPopupEdit
+                                v-model="props.row.started"
+                                v-slot="scope"
+                                buttons
+                                @update:model-value="updateRoute(props.row)"
+                            >
+                                <VnInputTime
+                                    v-model="scope.value"
+                                    autofocus
+                                    :label="t('Hour started')"
+                                    :rules="validate('route.started')"
+                                    :is-clearable="false"
+                                    @keyup.enter="scope.set"
+                                    @focus="($event) => $event.target.select()"
+                                />
+                            </QPopupEdit>
+                        </QTd>
+                    </template>
+                    <template #body-cell-finished="props">
+                        <QTd :props="props">
+                            {{ toHour(props.row.finished) }}
+                            <QPopupEdit
+                                v-model="props.row.finished"
+                                v-slot="scope"
+                                buttons
+                                @update:model-value="updateRoute(props.row)"
+                            >
+                                <VnInputTime
+                                    v-model="scope.value"
+                                    autofocus
+                                    :label="t('Hour finished')"
+                                    :rules="validate('route.finished')"
+                                    :is-clearable="false"
+                                    @keyup.enter="scope.set"
+                                    @focus="($event) => $event.target.select()"
+                                />
+                            </QPopupEdit>
+                        </QTd>
+                    </template>
+                </QTable>
+            </template>
+        </VnPaginate>
+        <!--        <QPageSticky :offset="[20, 20]">-->
+        <!--            <RouterLink :to="{ name: 'ShelvingCreate' }">-->
+        <!--                <QBtn fab icon="add" color="primary" />-->
+        <!--                <QTooltip>-->
+        <!--                    {{ t('shelving.list.newShelving') }}-->
+        <!--                </QTooltip>-->
+        <!--            </RouterLink>-->
+        <!--        </QPageSticky>-->
+    </QPage>
+</template>
+
+<style lang="scss" scoped>
+.card-list {
+    width: 100%;
+    max-width: 60em;
+}
+</style>
+<i18n>
+es:
+    ID: ID
+    Worker: Trabajador
+    Agency: Agencia
+    Vehicle: Vehículo
+    Date: Fecha
+    Description: Descripción
+    Hour started: Hora inicio
+    Hour finished: Hora fin
+</i18n>
diff --git a/src/router/modules/route.js b/src/router/modules/route.js
index acda898de..70c92f84b 100644
--- a/src/router/modules/route.js
+++ b/src/router/modules/route.js
@@ -10,7 +10,7 @@ export default {
     component: RouterView,
     redirect: { name: 'RouteMain' },
     menus: {
-        main: ['CmrList'],
+        main: ['RouteList', 'CmrList'],
         card: [],
     },
     children: [
@@ -29,6 +29,15 @@ export default {
                     },
                     component: () => import('src/pages/Route/Cmr/CmrList.vue'),
                 },
+                {
+                    path: 'list',
+                    name: 'RouteList',
+                    meta: {
+                        title: 'RouteList',
+                        icon: 'vn:delivery',
+                    },
+                    component: () => import('src/pages/Route/RouteList.vue'),
+                },
             ],
         },
     ],

From f64ac5c70d0974a0022c21547160aacc4f26d0f8 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Fri, 12 Jan 2024 17:02:52 -0300
Subject: [PATCH 27/94] Entry summary

---
 src/i18n/en/index.js                        |  30 ++
 src/i18n/es/index.js                        |  30 ++
 src/pages/Entry/Card/EntrySummary.vue       | 373 ++++++++++++++++++++
 src/pages/Entry/Card/EntrySummaryDialog.vue |  29 ++
 src/pages/Entry/EntryList.vue               |  17 +-
 src/pages/Supplier/Card/SupplierSummary.vue |   1 -
 src/router/modules/entry.js                 |  35 +-
 7 files changed, 488 insertions(+), 27 deletions(-)
 create mode 100644 src/pages/Entry/Card/EntrySummary.vue
 create mode 100644 src/pages/Entry/Card/EntrySummaryDialog.vue

diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index ffff99cc4..a8859798e 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -274,6 +274,36 @@ export default {
             confirmed: 'Confirmed',
             ordered: 'Ordered',
         },
+        summary: {
+            commission: 'Commission',
+            currency: 'Currency',
+            company: 'Company',
+            reference: 'Reference',
+            invoiceNumber: 'Invoice number',
+            ordered: 'Ordered',
+            confirmed: 'Confirmed',
+            booked: 'Booked',
+            raid: 'Raid',
+            excludedFromAvailable: 'Inventory',
+            travelReference: 'Reference',
+            travelAgency: 'Agency',
+            travelShipped: 'Shipped',
+            travelWarehouseOut: 'Warehouse Out',
+            travelDelivered: 'Delivered',
+            travelLanded: 'Landed',
+            travelWarehouseIn: 'Warehouse In',
+            travelReceived: 'Received',
+            buys: 'Buys',
+            quantity: 'Quantity',
+            stickers: 'Stickers',
+            package: 'Package',
+            weight: 'Weight',
+            packing: 'Packing',
+            grouping: 'Grouping',
+            buyingValue: 'Buying value',
+            import: 'Import',
+            pvp: 'PVP',
+        },
     },
     ticket: {
         pageTitles: {
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index d8993a08c..27687ef57 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -272,6 +272,36 @@ export default {
             confirmed: 'Confirmado',
             ordered: 'Pedida',
         },
+        summary: {
+            commission: 'Comisión',
+            currency: 'Moneda',
+            company: 'Empresa',
+            reference: 'Referencia',
+            invoiceNumber: 'Núm. factura',
+            ordered: 'Pedida',
+            confirmed: 'Confirmado',
+            booked: 'Asentado',
+            raid: 'Redada',
+            excludedFromAvailable: 'Inventario',
+            travelReference: 'Referencia',
+            travelAgency: 'Agencia',
+            travelShipped: 'F. envio',
+            travelWarehouseOut: 'Alm. salida',
+            travelDelivered: 'Enviada',
+            travelLanded: 'F. entrega',
+            travelWarehouseIn: 'Alm. entrada',
+            travelReceived: 'Recibida',
+            buys: 'Compras',
+            quantity: 'Cantidad',
+            stickers: 'Etiquetas',
+            package: 'Embalaje',
+            weight: 'Peso',
+            packing: 'Packing',
+            grouping: 'Grouping',
+            buyingValue: 'Coste',
+            import: 'Importe',
+            pvp: 'PVP',
+        },
     },
     ticket: {
         pageTitles: {
diff --git a/src/pages/Entry/Card/EntrySummary.vue b/src/pages/Entry/Card/EntrySummary.vue
new file mode 100644
index 000000000..19c59da27
--- /dev/null
+++ b/src/pages/Entry/Card/EntrySummary.vue
@@ -0,0 +1,373 @@
+<script setup>
+import { onMounted, ref, computed, onUpdated } from 'vue';
+import { useRoute } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+
+import CardSummary from 'components/ui/CardSummary.vue';
+import VnLv from 'src/components/ui/VnLv.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import TravelDescriptorProxy from 'src/pages/Travel/Card/TravelDescriptorProxy.vue';
+import FetchedTags from 'components/ui/FetchedTags.vue';
+
+import { toDate, toCurrency } from 'src/filters';
+import { getUrl } from 'src/composables/getUrl';
+import axios from 'axios';
+
+onUpdated(() => summaryRef.value.fetch());
+
+const route = useRoute();
+const { t } = useI18n();
+
+const $props = defineProps({
+    id: {
+        type: Number,
+        required: false,
+        default: null,
+    },
+});
+
+const entityId = computed(() => $props.id || route.params.id);
+const summaryRef = ref();
+const entry = ref();
+const entryBuys = ref([]);
+const entryUrl = ref();
+
+onMounted(async () => {
+    entryUrl.value = (await getUrl('entry/')) + entityId.value;
+});
+
+const tableColumnComponents = {
+    quantity: {
+        component: () => 'span',
+        props: () => {},
+    },
+    stickers: {
+        component: () => 'span',
+        props: () => {},
+        event: () => {},
+    },
+    packagingFk: {
+        component: () => 'span',
+        props: () => {},
+        event: () => {},
+    },
+    weight: {
+        component: () => 'span',
+        props: () => {},
+        event: () => {},
+    },
+    packing: {
+        component: () => 'span',
+        props: () => {},
+        event: () => {},
+    },
+    grouping: {
+        component: () => 'span',
+        props: () => {},
+        event: () => {},
+    },
+    buyingValue: {
+        component: () => 'span',
+        props: () => {},
+        event: () => {},
+    },
+    amount: {
+        component: () => 'span',
+        props: () => {},
+        event: () => {},
+    },
+    pvp: {
+        component: () => 'span',
+        props: () => {},
+        event: () => {},
+    },
+};
+
+const entriesTableColumns = computed(() => {
+    return [
+        {
+            label: t('entry.summary.quantity'),
+            field: 'quantity',
+            name: 'quantity',
+            align: 'left',
+        },
+        {
+            label: t('entry.summary.stickers'),
+            field: 'stickers',
+            name: 'stickers',
+            align: 'left',
+        },
+        {
+            label: t('entry.summary.package'),
+            field: 'packagingFk',
+            name: 'packagingFk',
+            align: 'left',
+        },
+        {
+            label: t('entry.summary.weight'),
+            field: 'weight',
+            name: 'weight',
+            align: 'left',
+        },
+        {
+            label: t('entry.summary.packing'),
+            field: 'packing',
+            name: 'packing',
+            align: 'left',
+        },
+        {
+            label: t('entry.summary.grouping'),
+            field: 'grouping',
+            name: 'grouping',
+            align: 'left',
+        },
+        {
+            label: t('entry.summary.buyingValue'),
+            field: 'buyingValue',
+            name: 'buyingValue',
+            align: 'left',
+            format: (value) => toCurrency(value),
+        },
+        {
+            label: t('entry.summary.import'),
+            name: 'amount',
+            align: 'left',
+            format: (_, row) => toCurrency(row.buyingValue * row.quantity),
+        },
+        {
+            label: t('entry.summary.pvp'),
+            name: 'pvp',
+            align: 'left',
+            format: (_, row) => toCurrency(row.price2) + ' / ' + toCurrency(row.price3),
+        },
+    ];
+});
+
+async function setEntryData(data) {
+    if (data) entry.value = data;
+    await fetchEntryBuys();
+}
+
+const fetchEntryBuys = async () => {
+    try {
+        const { data } = await axios.get(`Entries/${entry.value.id}/getBuys`);
+        if (data) entryBuys.value = data;
+    } catch (err) {
+        console.error('Error fetching entry buys');
+    }
+};
+</script>
+
+<template>
+    <CardSummary
+        ref="summaryRef"
+        :url="`Entries/${entityId}/getEntry`"
+        @on-fetch="(data) => setEntryData(data)"
+    >
+        <template #header-left>
+            <a class="header link" :href="entryUrl">
+                <QIcon name="open_in_new" color="white" size="sm" />
+            </a>
+        </template>
+        <template #header>
+            <span>{{ entry.id }} - {{ entry.supplier.nickname }}</span>
+        </template>
+
+        <template #body>
+            <QCard class="vn-one">
+                <a class="header link" :href="entryUrl">
+                    {{ t('globals.summary.basicData') }}
+                    <QIcon name="open_in_new" color="primary" />
+                </a>
+                <VnRow>
+                    <div class="col">
+                        <VnLv
+                            :label="t('entry.summary.commission')"
+                            :value="entry.commission"
+                        />
+                    </div>
+                    <div class="col">
+                        <VnLv
+                            :label="t('entry.summary.currency')"
+                            :value="entry.currency.name"
+                        />
+                    </div>
+                    <div class="col">
+                        <VnLv
+                            :label="t('entry.summary.company')"
+                            :value="entry.company.code"
+                        />
+                    </div>
+                    <div class="col">
+                        <VnLv
+                            :label="t('entry.summary.reference')"
+                            :value="entry.reference"
+                        />
+                    </div>
+                    <div class="col">
+                        <VnLv
+                            :label="t('entry.summary.invoiceNumber')"
+                            :value="entry.invoiceNumber"
+                        />
+                    </div>
+                    <div class="col">
+                        <VnLv
+                            :label="t('entry.summary.ordered')"
+                            :value="entry.isOrdered"
+                        />
+                    </div>
+                    <div class="col">
+                        <VnLv
+                            :label="t('entry.summary.confirmed')"
+                            :value="entry.isConfirmed"
+                        />
+                    </div>
+                    <div class="col">
+                        <VnLv
+                            :label="t('entry.summary.booked')"
+                            :value="entry.isBooked"
+                        />
+                    </div>
+                    <div class="col">
+                        <VnLv :label="t('entry.summary.raid')" :value="entry.isRaid" />
+                    </div>
+                    <div class="col">
+                        <VnLv
+                            :label="t('entry.summary.excludedFromAvailable')"
+                            :value="entry.isExcludedFromAvailable"
+                        />
+                    </div>
+                </VnRow>
+            </QCard>
+            <QCard class="vn-one">
+                <a class="header link" :href="entryUrl">
+                    {{ t('Travel data') }}
+                    <QIcon name="open_in_new" color="primary" />
+                </a>
+                <VnRow>
+                    <div class="col">
+                        <VnLv :label="t('entry.summary.travelReference')">
+                            <template #value>
+                                <span class="link">
+                                    {{ entry.travel.ref }}
+                                    <TravelDescriptorProxy :id="entry.travel.id" />
+                                </span>
+                            </template>
+                        </VnLv>
+                    </div>
+                    <div class="col">
+                        <VnLv
+                            :label="t('entry.summary.travelAgency')"
+                            :value="entry.travel.agency.name"
+                        />
+                    </div>
+                    <div class="col">
+                        <VnLv
+                            :label="t('entry.summary.travelShipped')"
+                            :value="toDate(entry.travel.shipped)"
+                        />
+                    </div>
+                    <div class="col">
+                        <VnLv
+                            :label="t('entry.summary.travelWarehouseOut')"
+                            :value="entry.travel.warehouseOut.name"
+                        />
+                    </div>
+                    <div class="col">
+                        <VnLv
+                            :label="t('entry.summary.travelDelivered')"
+                            :value="entry.travel.isDelivered"
+                        />
+                    </div>
+                    <div class="col">
+                        <VnLv
+                            :label="t('entry.summary.travelLanded')"
+                            :value="toDate(entry.travel.landed)"
+                        />
+                    </div>
+                    <div class="col">
+                        <VnLv
+                            :label="t('entry.summary.travelWarehouseIn')"
+                            :value="entry.travel.warehouseIn.name"
+                        />
+                    </div>
+                    <div class="col">
+                        <VnLv
+                            :label="t('entry.summary.travelReceived')"
+                            :value="entry.travel.isReceived"
+                        />
+                    </div>
+                </VnRow>
+            </QCard>
+            <QCard class="vn-two" style="min-width: 100%">
+                <a class="header">
+                    {{ t('entry.summary.buys') }}
+                </a>
+                <QTable
+                    :rows="entryBuys"
+                    :columns="entriesTableColumns"
+                    hide-bottom
+                    row-key="index"
+                    class="full-width q-mt-md"
+                >
+                    <template #body="{ cols, row, rowIndex }">
+                        <QTr no-hover>
+                            <QTd v-for="col in cols" :key="col.name">
+                                <component
+                                    :is="tableColumnComponents[col.name].component(props)"
+                                    v-bind="tableColumnComponents[col.name].props(props)"
+                                    @click="tableColumnComponents[col.name].event(props)"
+                                    class="col-content"
+                                >
+                                    <template
+                                        v-if="
+                                            col.name !== 'observation' &&
+                                            col.name !== 'isConfirmed'
+                                        "
+                                        >{{ col.value }}</template
+                                    >
+                                    <QTooltip v-if="col.toolTip">{{
+                                        col.toolTip
+                                    }}</QTooltip>
+                                </component>
+                            </QTd>
+                        </QTr>
+                        <QTr no-hover>
+                            <QTd>
+                                <span>{{ row.item.itemType.code }}</span>
+                            </QTd>
+                            <QTd>
+                                <span>{{ row.item.id }}</span>
+                            </QTd>
+                            <QTd>
+                                <span>{{ row.item.size }}</span>
+                            </QTd>
+                            <QTd>
+                                <span>{{ toCurrency(row.item.minPrice) }}</span>
+                            </QTd>
+                            <QTd colspan="6">
+                                <span>{{ row.item.concept }}</span>
+                                <span v-if="row.item.subName" class="subName">
+                                    {{ row.item.subName }}
+                                </span>
+                                <fetched-tags :item="row.item" :max-length="5" />
+                            </QTd>
+                        </QTr>
+                        <!-- Esta última row es utilizada para agregar un espaciado y así marcar una diferencia visual entre los diferentes buys -->
+                        <QTr
+                            v-if="rowIndex !== entryBuys.length - 1"
+                            style="height: 30px"
+                        >
+                            <QTd colspan="10" />
+                        </QTr>
+                    </template>
+                </QTable>
+            </QCard>
+        </template>
+    </CardSummary>
+</template>
+
+<i18n>
+es:
+    Travel data: 'Datos envío'
+</i18n>
diff --git a/src/pages/Entry/Card/EntrySummaryDialog.vue b/src/pages/Entry/Card/EntrySummaryDialog.vue
new file mode 100644
index 000000000..527421ce2
--- /dev/null
+++ b/src/pages/Entry/Card/EntrySummaryDialog.vue
@@ -0,0 +1,29 @@
+<script setup>
+import { useDialogPluginComponent } from 'quasar';
+import EntrySummary from './EntrySummary.vue';
+
+const $props = defineProps({
+    id: {
+        type: Number,
+        required: true,
+    },
+});
+
+defineEmits([...useDialogPluginComponent.emits]);
+
+const { dialogRef, onDialogHide } = useDialogPluginComponent();
+</script>
+
+<template>
+    <QDialog ref="dialogRef" @hide="onDialogHide">
+        <EntrySummary v-if="$props.id" :id="$props.id" />
+    </QDialog>
+</template>
+
+<style lang="scss">
+.q-dialog .summary .header {
+    position: sticky;
+    z-index: $z-max;
+    top: 0;
+}
+</style>
diff --git a/src/pages/Entry/EntryList.vue b/src/pages/Entry/EntryList.vue
index 84f0d8112..fc4f60ff0 100644
--- a/src/pages/Entry/EntryList.vue
+++ b/src/pages/Entry/EntryList.vue
@@ -8,6 +8,7 @@ import VnPaginate from 'src/components/ui/VnPaginate.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 EntrySummaryDialog from './Card/EntrySummaryDialog.vue';
 
 import { useStateStore } from 'stores/useStateStore';
 import { toDate } from 'src/filters/index';
@@ -23,7 +24,7 @@ onMounted(async () => {
 onUnmounted(() => (stateStore.rightDrawer = false));
 
 function navigate(id) {
-    router.push({ path: `/invoice-in/${id}` });
+    router.push({ path: `/entry/${id}` });
 }
 
 const redirectToCreateView = () => {
@@ -31,12 +32,12 @@ const redirectToCreateView = () => {
 };
 
 function viewSummary(id) {
-    // quasar.dialog({
-    //     component: EntrySummaryDialog,
-    //     componentProps: {
-    //         id,
-    //     },
-    // });
+    quasar.dialog({
+        component: EntrySummaryDialog,
+        componentProps: {
+            id,
+        },
+    });
 }
 </script>
 
@@ -66,7 +67,7 @@ function viewSummary(id) {
                         :title="row.reference"
                         @click="navigate(row.id)"
                         :id="row.id"
-                        :has-info-icons="row.isExcludedFromAvailable || row.isRaid"
+                        :has-info-icons="!!row.isExcludedFromAvailable || !!row.isRaid"
                     >
                         <template #info-icons>
                             <QIcon
diff --git a/src/pages/Supplier/Card/SupplierSummary.vue b/src/pages/Supplier/Card/SupplierSummary.vue
index 29b0c18c4..d734e21a5 100644
--- a/src/pages/Supplier/Card/SupplierSummary.vue
+++ b/src/pages/Supplier/Card/SupplierSummary.vue
@@ -182,4 +182,3 @@ const isAdministrative = computed(() => {
         </template>
     </CardSummary>
 </template>
-<style lang="scss" scoped></style>
diff --git a/src/router/modules/entry.js b/src/router/modules/entry.js
index 6a1cd6173..a806190a8 100644
--- a/src/router/modules/entry.js
+++ b/src/router/modules/entry.js
@@ -39,23 +39,22 @@ export default {
                 },
             ],
         },
-        // {
-        //     name: 'EntryCard',
-        //     path: ':id',
-        //     component: () => import('src/pages/Entry/Card/EntryCard.vue'),
-        //     redirect: { name: 'EntrySummary' },
-        //     children: [
-        //         {
-        //             name: 'EntrySummary',
-        //             path: 'summary',
-        //             meta: {
-        //                 title: 'summary',
-        //                 icon: 'launch',
-        //             },
-        //             component: () =>
-        //                 import('src/pages/Entry/Card/EntrySummary.vue'),
-        //         },
-        //     ],
-        // },
+        {
+            name: 'EntryCard',
+            path: ':id',
+            component: () => import('src/pages/Entry/Card/EntryCard.vue'),
+            redirect: { name: 'EntrySummary' },
+            children: [
+                {
+                    name: 'EntrySummary',
+                    path: 'summary',
+                    meta: {
+                        title: 'summary',
+                        icon: 'launch',
+                    },
+                    component: () => import('src/pages/Entry/Card/EntrySummary.vue'),
+                },
+            ],
+        },
     ],
 };

From 91f675ec99198dc51831d41f6502bcebfb72867e Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Sun, 14 Jan 2024 21:12:39 -0300
Subject: [PATCH 28/94] small table visual change in entry summary

---
 src/pages/Entry/Card/EntrySummary.vue | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/pages/Entry/Card/EntrySummary.vue b/src/pages/Entry/Card/EntrySummary.vue
index 19c59da27..d19b1f744 100644
--- a/src/pages/Entry/Card/EntrySummary.vue
+++ b/src/pages/Entry/Card/EntrySummary.vue
@@ -356,9 +356,9 @@ const fetchEntryBuys = async () => {
                         <!-- Esta última row es utilizada para agregar un espaciado y así marcar una diferencia visual entre los diferentes buys -->
                         <QTr
                             v-if="rowIndex !== entryBuys.length - 1"
-                            style="height: 30px"
+                            class="separation-row"
                         >
-                            <QTd colspan="10" />
+                            <QTd colspan="10" style="height: 24px" />
                         </QTr>
                     </template>
                 </QTable>
@@ -367,6 +367,12 @@ const fetchEntryBuys = async () => {
     </CardSummary>
 </template>
 
+<style lang="scss" scoped>
+.separation-row {
+    background-color: var(--vn-gray) !important;
+}
+</style>
+
 <i18n>
 es:
     Travel data: 'Datos envío'

From 20835471a3a1c392b080f51295e0bf49c92a71cf Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 15 Jan 2024 09:14:42 +0100
Subject: [PATCH 29/94] refs #6280 feat: handle option selected from 
 VnLocation

---
 src/components/common/VnLocation.vue  |  4 ++--
 src/pages/Customer/CustomerCreate.vue | 18 +++++++++++++-----
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/components/common/VnLocation.vue b/src/components/common/VnLocation.vue
index 5c41144ac..e91c78430 100644
--- a/src/components/common/VnLocation.vue
+++ b/src/components/common/VnLocation.vue
@@ -98,9 +98,8 @@ function showLabel(data){
         v-model="value"
         :options="postcodesOptions"
         :label="t('Location')"
-        option-value="geoFk"
         :option-label="showLabel"
-        :placeholder="t('Min. 3 char')"
+        :placeholder="t('Search by postalCode or town (at least 3 characters')"
         v-bind="$attrs"
         emit-value
         map-options
@@ -138,4 +137,5 @@ function showLabel(data){
 <i18n>
 es:
     Location: Ubicación
+    Search by postalCode or town (at least 3 characters): Buscar por código postal o nombre ( al menos 3 letras)
 </i18n>
diff --git a/src/pages/Customer/CustomerCreate.vue b/src/pages/Customer/CustomerCreate.vue
index f6ac6a165..3afda7fac 100644
--- a/src/pages/Customer/CustomerCreate.vue
+++ b/src/pages/Customer/CustomerCreate.vue
@@ -36,9 +36,13 @@ const provincesLocationOptions = ref([]);
 const countriesOptions = ref([]);
 const postcodesOptions = ref([]);
 
-const onPostcodeCreated = async () => {
-    postcodeFetchDataRef.value.fetch();
-};
+
+function handleLocation(data, { city, postcode, provinceFk, countryFk }) {
+    data.postcode = postcode;
+    data.city = city;
+    data.provinceFk = provinceFk;
+    data.countryFk = countryFk;
+}
 </script>
 
 <template>
@@ -133,10 +137,14 @@ const onPostcodeCreated = async () => {
                 <VnRow class="row q-gutter-md q-mb-md">
                     <div class="col">
                         <VnLocation
+                            :rules="validate('Worker.postcode')"
+                            :roles-allowed-to-create="['deliveryAssistant']"
                             :options="postcodesOptions"
                             v-model="data.location"
-                        @update:model-value="(data)=> console.log(data)"
-                            >
+                            @update:model-value="
+                                (location) => handleLocation(data, location)
+                            "
+                        >
                         </VnLocation>
                     </div>
                 </VnRow>

From 84b53131c7de09dc3ab204eba3c246f920321ee6 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 15 Jan 2024 09:22:01 +0100
Subject: [PATCH 30/94] refs #6280 feat: deepFind as composable

---
 src/components/common/VnSelectFilter.vue | 14 +-------------
 src/composables/deepFind.js              | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 13 deletions(-)
 create mode 100644 src/composables/deepFind.js

diff --git a/src/components/common/VnSelectFilter.vue b/src/components/common/VnSelectFilter.vue
index ad0a0ec38..c197f17ea 100644
--- a/src/components/common/VnSelectFilter.vue
+++ b/src/components/common/VnSelectFilter.vue
@@ -1,4 +1,5 @@
 <script setup>
+import { deepFind } from 'src/composables/deepFind';
 import { ref, toRefs, computed, watch } from 'vue';
 const emit = defineEmits(['update:modelValue', 'update:options']);
 
@@ -51,20 +52,7 @@ function setOptions(data) {
     myOptions.value = JSON.parse(JSON.stringify(data));
     myOptionsOriginal.value = JSON.parse(JSON.stringify(data));
 }
-function deepFind(obj, path) {
-  var paths = path.split('.')
-    , current = obj
-    , i;
 
-  for (i = 0; i < paths.length; ++i) {
-    if (current[paths[i]] == undefined) {
-      return undefined;
-    } else {
-      current = current[paths[i]];
-    }
-  }
-  return current;
-}
 setOptions(options.value);
 const filter = (val, options) => {
     const search = val.toString().toLowerCase();
diff --git a/src/composables/deepFind.js b/src/composables/deepFind.js
new file mode 100644
index 000000000..ec28fe387
--- /dev/null
+++ b/src/composables/deepFind.js
@@ -0,0 +1,14 @@
+export async function deepFind(obj, path) {
+    const keys = path.split('.');
+    let current = obj;
+
+    for (const key of keys) {
+        if (current[key] !== undefined) {
+            current = current[key];
+        } else {
+            return undefined;
+        }
+    }
+
+    return current;
+}

From c471a4febc4046f57dd0f0b9e0325b6c51fd8ab6 Mon Sep 17 00:00:00 2001
From: carlosfonseca <carlos.fonseca@mindshore.io>
Date: Mon, 15 Jan 2024 09:16:50 -0500
Subject: [PATCH 31/94] Se crea el formulario para la creacion de un agente de
 aduanas

---
 .../Customer/Card/CustomerConsignees.vue      | 16 +++--
 .../CustomerConsigneeCreate.vue               | 34 ++++++----
 .../CustomerConsigneeEdit.vue                 |  0
 .../components/CustomerNewCustomsAgent.vue    | 65 +++++++++++++++++++
 src/router/modules/customer.js                |  4 +-
 5 files changed, 98 insertions(+), 21 deletions(-)
 rename src/pages/Customer/{Card => components}/CustomerConsigneeCreate.vue (91%)
 rename src/pages/Customer/{Card => components}/CustomerConsigneeEdit.vue (100%)
 create mode 100644 src/pages/Customer/components/CustomerNewCustomsAgent.vue

diff --git a/src/pages/Customer/Card/CustomerConsignees.vue b/src/pages/Customer/Card/CustomerConsignees.vue
index f412eda59..553ab641b 100644
--- a/src/pages/Customer/Card/CustomerConsignees.vue
+++ b/src/pages/Customer/Card/CustomerConsignees.vue
@@ -47,7 +47,10 @@ const toCustomerConsigneeEdit = () => {
                 <QCard
                     v-for="(item, index) in rows"
                     :key="index"
-                    :class="['consignees-card', { 'q-mb-md': rows.length - 1 !== index }]"
+                    :class="{
+                        'consignees-card': true,
+                        'q-mb-md': index < rows.length - 1,
+                    }"
                     @click="toCustomerConsigneeEdit()"
                 >
                     <div class="consignees-card-icon">
@@ -63,15 +66,14 @@ const toCustomerConsigneeEdit = () => {
                             {{ setProvince(item.provinceFk) }}
                         </div>
                         <div class="flex">
-                            <VnLv
+                            <QCheckbox
                                 :label="t('Is equalizated')"
-                                :value="item.isEqualizated"
-                                class="row q-mr-lg"
+                                v-model="item.isEqualizated"
+                                class="q-mr-lg"
                             />
-                            <VnLv
+                            <QCheckbox
                                 :label="t('Is logiflora allowed')"
-                                :value="item.isLogifloraAllowed"
-                                class="row"
+                                v-model="item.isLogifloraAllowed"
                             />
                         </div>
                     </div>
diff --git a/src/pages/Customer/Card/CustomerConsigneeCreate.vue b/src/pages/Customer/components/CustomerConsigneeCreate.vue
similarity index 91%
rename from src/pages/Customer/Card/CustomerConsigneeCreate.vue
rename to src/pages/Customer/components/CustomerConsigneeCreate.vue
index 2f8ef1b97..3f3b2aedf 100644
--- a/src/pages/Customer/Card/CustomerConsigneeCreate.vue
+++ b/src/pages/Customer/components/CustomerConsigneeCreate.vue
@@ -8,8 +8,9 @@ import FormModel from 'components/FormModel.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
-import CustomerCreateNewPostcode from 'src/components/CreateNewPostcodeForm.vue';
 import VnSelectCreate from 'src/components/common/VnSelectCreate.vue';
+import CustomerCreateNewPostcode from 'src/components/CreateNewPostcodeForm.vue';
+import CustomsNewCustomsAgent from 'src/pages/Customer/components/CustomerNewCustomsAgent.vue';
 
 const { t } = useI18n();
 const route = useRoute();
@@ -124,15 +125,12 @@ const onPostcodeCreated = async ({ code, provinceFk, townFk }, formData) => {
                             <QItem v-bind="scope.itemProps">
                                 <QItemSection v-if="scope.opt">
                                     <QItemLabel>{{ scope.opt.code }}</QItemLabel>
-                                    <QItemLabel caption
-                                        >{{ scope.opt.code }} -
-                                        {{ scope.opt.town.name }} ({{
-                                            scope.opt.town.province.name
-                                        }},
-                                        {{
-                                            scope.opt.town.province.country.country
-                                        }})</QItemLabel
-                                    >
+                                    <QItemLabel caption>
+                                        {{ scope.opt.code }} -
+                                        {{ scope.opt.town.name }}
+                                        ({{ scope.opt.town.province.name }},
+                                        {{ scope.opt.town.province.country.country }})
+                                    </QItemLabel>
                                 </QItemSection>
                             </QItem>
                         </template>
@@ -218,20 +216,32 @@ const onPostcodeCreated = async ({ code, provinceFk, townFk }, formData) => {
                     />
                 </div>
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelectCreate
                         :label="t('Customs agent')"
                         :options="customsAgents"
                         hide-selected
                         option-label="fiscalName"
                         option-value="id"
                         v-model="data.customsAgentFk"
-                    />
+                    >
+                        <template #form>
+                            <CustomsNewCustomsAgent />
+                        </template>
+                    </VnSelectCreate>
                 </div>
             </VnRow>
         </template>
     </FormModel>
 </template>
 
+<style lang="scss" scoped>
+.add-icon {
+    cursor: pointer;
+    background-color: $primary;
+    border-radius: 50px;
+}
+</style>
+
 <i18n>
 es:
     Default: Predeterminado
diff --git a/src/pages/Customer/Card/CustomerConsigneeEdit.vue b/src/pages/Customer/components/CustomerConsigneeEdit.vue
similarity index 100%
rename from src/pages/Customer/Card/CustomerConsigneeEdit.vue
rename to src/pages/Customer/components/CustomerConsigneeEdit.vue
diff --git a/src/pages/Customer/components/CustomerNewCustomsAgent.vue b/src/pages/Customer/components/CustomerNewCustomsAgent.vue
new file mode 100644
index 000000000..b8b83e763
--- /dev/null
+++ b/src/pages/Customer/components/CustomerNewCustomsAgent.vue
@@ -0,0 +1,65 @@
+<script setup>
+import { reactive, ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import VnRow from 'components/ui/VnRow.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import FormModelPopup from 'src/components/FormModelPopup.vue';
+
+const emit = defineEmits(['onDataSaved']);
+
+const { t } = useI18n();
+
+const initialData = reactive({
+    nif: null,
+    fiscalName: null,
+    street: null,
+    phone: null,
+});
+
+const onDataSaved = (dataSaved) => {
+    emit('onDataSaved', dataSaved);
+};
+</script>
+
+<template>
+    <FormModelPopup
+        :title="t('New customs agent')"
+        url-create="CustomsAgents"
+        model="customer"
+        :form-initial-data="initialData"
+        @on-data-saved="onDataSaved($event)"
+    >
+        <template #form-inputs="{ data }">
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnInput :label="t('NIF')" :required="true" v-model="data.nif" />
+                </div>
+                <div class="col">
+                    <VnInput
+                        :label="t('Fiscal name')"
+                        :required="true"
+                        v-model="data.fiscalName"
+                    />
+                </div>
+            </VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnInput :label="t('Street')" v-model="data.street" />
+                </div>
+                <div class="col">
+                    <VnInput :label="t('Phone')" v-model="data.phone" />
+                </div>
+            </VnRow>
+        </template>
+    </FormModelPopup>
+</template>
+
+<i18n>
+es:
+    New customs agent: Nuevo agente de aduanas
+    NIF: NIF
+    Fiscal name: Nombre fiscal
+    Street: Dirección fiscal
+    Phone: Teléfono
+</i18n>
diff --git a/src/router/modules/customer.js b/src/router/modules/customer.js
index 752c486ee..a0dc2df23 100644
--- a/src/router/modules/customer.js
+++ b/src/router/modules/customer.js
@@ -173,7 +173,7 @@ export default {
                             },
                             component: () =>
                                 import(
-                                    'src/pages/Customer/Card/CustomerConsigneeCreate.vue'
+                                    'src/pages/Customer/components/CustomerConsigneeCreate.vue'
                                 ),
                         },
                         {
@@ -184,7 +184,7 @@ export default {
                             },
                             component: () =>
                                 import(
-                                    'src/pages/Customer/Card/CustomerConsigneeEdit.vue'
+                                    'src/pages/Customer/components/CustomerConsigneeEdit.vue'
                                 ),
                         },
                     ],

From 29418d22bb388ae514ce6cd3cb649ef1cf867c58 Mon Sep 17 00:00:00 2001
From: carlosfonseca <carlos.fonseca@mindshore.io>
Date: Tue, 16 Jan 2024 09:48:30 -0500
Subject: [PATCH 32/94] =?UTF-8?q?Se=20crea=20formulario=20de=20actualizaci?=
 =?UTF-8?q?=C3=B3n=20de=20un=20agente=20de=20aduanas=20y=20observaciones?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Customer/Card/CustomerConsignees.vue      |  68 +++-
 .../components/CustomerConsigneeCreate.vue    |  11 +-
 .../components/CustomerConsigneeEdit.vue      | 362 +++++++++++++++++-
 src/router/modules/customer.js                |  25 +-
 4 files changed, 447 insertions(+), 19 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerConsignees.vue b/src/pages/Customer/Card/CustomerConsignees.vue
index 553ab641b..bf61ea302 100644
--- a/src/pages/Customer/Card/CustomerConsignees.vue
+++ b/src/pages/Customer/Card/CustomerConsignees.vue
@@ -5,7 +5,6 @@ import { useRoute, useRouter } from 'vue-router';
 
 import FetchData from 'components/FetchData.vue';
 import VnPaginate from 'src/components/ui/VnPaginate.vue';
-import VnLv from 'src/components/ui/VnLv.vue';
 
 const { t } = useI18n();
 const route = useRoute();
@@ -13,6 +12,38 @@ const router = useRouter();
 
 const provincesLocation = ref([]);
 
+const consigneeFilter = {
+    fields: [
+        'id',
+        'isDefaultAddress',
+        'isActive',
+        'nickname',
+        'street',
+        'city',
+        'provinceFk',
+        'phone',
+        'mobile',
+        'isEqualizated',
+        'isLogifloraAllowed',
+        'postalCode',
+    ],
+    order: ['isDefaultAddress DESC', 'isActive DESC', 'nickname ASC'],
+    include: [
+        {
+            relation: 'observations',
+            scope: {
+                include: 'observationType',
+            },
+        },
+        {
+            relation: 'province',
+            scope: {
+                fields: ['id', 'name'],
+            },
+        },
+    ],
+};
+
 const setProvince = (provinceFk) => {
     const result = provincesLocation.value.filter(
         (province) => province.id === provinceFk
@@ -24,8 +55,14 @@ const toCustomerConsigneeCreate = () => {
     router.push({ name: 'CustomerConsigneeCreate' });
 };
 
-const toCustomerConsigneeEdit = () => {
-    router.push({ name: 'CustomerConsigneeEdit' });
+const toCustomerConsigneeEdit = (consigneeId) => {
+    router.push({
+        name: 'CustomerConsigneeEdit',
+        params: {
+            id: route.params.id,
+            consigneeId,
+        },
+    });
 };
 </script>
 
@@ -42,6 +79,7 @@ const toCustomerConsigneeEdit = () => {
             :url="`Clients/${route.params.id}/addresses`"
             order="id"
             auto-load
+            :filter="consigneeFilter"
         >
             <template #body="{ rows }">
                 <QCard
@@ -51,7 +89,7 @@ const toCustomerConsigneeEdit = () => {
                         'consignees-card': true,
                         'q-mb-md': index < rows.length - 1,
                     }"
-                    @click="toCustomerConsigneeEdit()"
+                    @click="toCustomerConsigneeEdit(item.id)"
                 >
                     <div class="consignees-card-icon">
                         <QIcon name="star" size="md" color="primary" />
@@ -70,14 +108,36 @@ const toCustomerConsigneeEdit = () => {
                                 :label="t('Is equalizated')"
                                 v-model="item.isEqualizated"
                                 class="q-mr-lg"
+                                disable
                             />
                             <QCheckbox
                                 :label="t('Is logiflora allowed')"
                                 v-model="item.isLogifloraAllowed"
+                                disable
                             />
                         </div>
                     </div>
+
+                    <QSeparator
+                        class="q-mx-lg"
+                        v-if="item.observations.length"
+                        vertical
+                    />
+
+                    <div v-if="item.observations.length">
+                        <div
+                            :key="index"
+                            class="flex q-mb-sm"
+                            v-for="(observation, index) in item.observations"
+                        >
+                            <div class="text-weight-bold q-mr-sm">
+                                {{ observation.observationType.description }}:
+                            </div>
+                            <div>{{ observation.description }}</div>
+                        </div>
+                    </div>
                 </QCard>
+
                 <QPageSticky :offset="[18, 18]">
                     <QBtn
                         @click.stop="toCustomerConsigneeCreate()"
diff --git a/src/pages/Customer/components/CustomerConsigneeCreate.vue b/src/pages/Customer/components/CustomerConsigneeCreate.vue
index 3f3b2aedf..f35ee8ea4 100644
--- a/src/pages/Customer/components/CustomerConsigneeCreate.vue
+++ b/src/pages/Customer/components/CustomerConsigneeCreate.vue
@@ -31,13 +31,14 @@ const formInitialData = reactive({
 
 const townsFetchDataRef = ref(null);
 const postcodeFetchDataRef = ref(null);
+const urlCreate = ref('');
+
+const postcodesOptions = ref([]);
+const citiesLocationOptions = ref([]);
+const provincesLocationOptions = ref([]);
 const agencyModes = ref([]);
 const incoterms = ref([]);
 const customsAgents = ref([]);
-const citiesLocationOptions = ref([]);
-const provincesLocationOptions = ref([]);
-const postcodesOptions = ref([]);
-const urlCreate = ref('');
 
 onBeforeMount(() => {
     urlCreate.value = `Clients/${route.params.id}/createAddress`;
@@ -85,8 +86,8 @@ const onPostcodeCreated = async ({ code, provinceFk, townFk }, formData) => {
     <FormModel
         :form-initial-data="formInitialData"
         :observe-form-changes="false"
-        model="client"
         :url-create="urlCreate"
+        model="client"
     >
         <template #form="{ data, validate }">
             <VnRow class="row q-gutter-md q-mb-md">
diff --git a/src/pages/Customer/components/CustomerConsigneeEdit.vue b/src/pages/Customer/components/CustomerConsigneeEdit.vue
index 6546c527d..be70b3a82 100644
--- a/src/pages/Customer/components/CustomerConsigneeEdit.vue
+++ b/src/pages/Customer/components/CustomerConsigneeEdit.vue
@@ -1,3 +1,363 @@
+<script setup>
+import { onBeforeMount, ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useRoute } from 'vue-router';
+
+import axios from 'axios';
+
+import FetchData from 'components/FetchData.vue';
+import FormModel from 'components/FormModel.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelectCreate from 'src/components/common/VnSelectCreate.vue';
+import CustomerCreateNewPostcode from 'src/components/CreateNewPostcodeForm.vue';
+import CustomsNewCustomsAgent from 'src/pages/Customer/components/CustomerNewCustomsAgent.vue';
+
+const { t } = useI18n();
+const route = useRoute();
+
+const townsFetchDataRef = ref(null);
+const postcodeFetchDataRef = ref(null);
+const urlUpdate = ref('');
+
+const postcodesOptions = ref([]);
+const citiesLocationOptions = ref([]);
+const provincesLocationOptions = ref([]);
+const agencyModes = ref([]);
+const incoterms = ref([]);
+const customsAgents = ref([]);
+const observationTypes = ref([]);
+const notes = ref([]);
+
+onBeforeMount(() => {
+    urlUpdate.value = `Clients/${route.params.id}/updateAddress/${route.params.consigneeId}`;
+});
+
+const onPostcodeCreated = async ({ code, provinceFk, townFk }, formData) => {
+    await postcodeFetchDataRef.value.fetch();
+    await townsFetchDataRef.value.fetch();
+    formData.postalCode = code;
+    formData.provinceFk = provinceFk;
+    formData.city = citiesLocationOptions.value.find((town) => town.id === townFk).name;
+};
+
+const getData = async (observations) => {
+    observationTypes.value = observations;
+
+    if (observationTypes.value.length) {
+        const filter = {
+            fields: ['id', 'addressFk', 'observationTypeFk', 'description'],
+            where: { addressFk: `${route.params.consigneeId}` },
+        };
+        const { data } = await axios.get('AddressObservations', {
+            params: { filter: JSON.stringify(filter) },
+        });
+
+        if (data.length) {
+            notes.value = data
+                .map((observation) => {
+                    const type = observationTypes.value.find(
+                        (type) => type.id === observation.observationTypeFk
+                    );
+                    return type
+                        ? {
+                              $isNew: false,
+                              $oldData: null,
+                              $orgIndex: null,
+                              addressFk: `${route.params.consigneeId}`,
+                              description: observation.description,
+                              observationTypeFk: type.id,
+                          }
+                        : null;
+                })
+                .filter((item) => item !== null);
+        }
+    }
+};
+
+const addNote = () => {
+    notes.value.push({
+        $isNew: true,
+        $oldData: null,
+        $orgIndex: null,
+        addressFk: `${route.params.consigneeId}`,
+        description: '',
+        observationTypeFk: '',
+    });
+};
+
+const deleteNote = (index) => {
+    notes.value.splice(index, 1);
+};
+</script>
+
 <template>
-    <div class="flex justify-center">Customer consignee edit</div>
+    <FetchData
+        ref="postcodeFetchDataRef"
+        @on-fetch="(data) => (postcodesOptions = data)"
+        auto-load
+        url="Postcodes/location"
+    />
+    <FetchData
+        ref="townsFetchDataRef"
+        @on-fetch="(data) => (citiesLocationOptions = data)"
+        auto-load
+        url="Towns/location"
+    />
+    <FetchData
+        @on-fetch="(data) => (provincesLocationOptions = data)"
+        auto-load
+        url="Provinces/location"
+    />
+    <fetch-data
+        @on-fetch="(data) => (agencyModes = data)"
+        auto-load
+        url="AgencyModes/isActive"
+    />
+    <fetch-data @on-fetch="(data) => (incoterms = data)" auto-load url="Incoterms" />
+    <fetch-data
+        @on-fetch="(data) => (customsAgents = data)"
+        auto-load
+        url="CustomsAgents"
+    />
+    <fetch-data @on-fetch="getData" auto-load url="ObservationTypes" />
+
+    <FormModel
+        :url-update="urlUpdate"
+        :url="`Addresses/${route.params.consigneeId}`"
+        @on-fetch="onFetch()"
+        auto-load
+        model="client"
+    >
+        <template #form="{ data, validate }">
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <QCheckbox :label="t('Enabled')" v-model="data.isActive" />
+                </div>
+                <div class="col">
+                    <QCheckbox
+                        :label="t('Is equalizated')"
+                        v-model="data.isEqualizated"
+                    />
+                </div>
+                <div class="col">
+                    <QCheckbox
+                        :label="t('Is Loginflora allowed')"
+                        v-model="data.isLogifloraAllowed"
+                    />
+                </div>
+            </VnRow>
+
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnInput :label="t('Consignee')" v-model="data.nickname" />
+                </div>
+                <div class="col">
+                    <VnInput :label="t('Street address')" v-model="data.street" />
+                </div>
+            </VnRow>
+
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnSelectCreate
+                        :label="t('Postcode')"
+                        :options="postcodesOptions"
+                        :roles-allowed-to-create="['deliveryAssistant']"
+                        :rules="validate('Worker.postcode')"
+                        hide-selected
+                        option-label="code"
+                        option-value="code"
+                        v-model="data.postalCode"
+                    >
+                        <template #form>
+                            <CustomerCreateNewPostcode
+                                @on-data-saved="onPostcodeCreated($event, data)"
+                            />
+                        </template>
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection v-if="scope.opt">
+                                    <QItemLabel>{{ scope.opt.code }}</QItemLabel>
+                                    <QItemLabel caption>
+                                        {{ scope.opt.code }} -
+                                        {{ scope.opt.town.name }}
+                                        ({{ scope.opt.town.province.name }},
+                                        {{ scope.opt.town.province.country.country }})
+                                    </QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelectCreate>
+                </div>
+                <div class="col">
+                    <!-- ciudades -->
+                    <VnSelectFilter
+                        :label="t('City')"
+                        :options="citiesLocationOptions"
+                        hide-selected
+                        option-label="name"
+                        option-value="name"
+                        v-model="data.city"
+                    >
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection>
+                                    <QItemLabel>{{ scope.opt.name }}</QItemLabel>
+                                    <QItemLabel caption>
+                                        {{
+                                            `${scope.opt.name}, ${scope.opt.province.name} (${scope.opt.province.country.country})`
+                                        }}
+                                    </QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelectFilter>
+                </div>
+            </VnRow>
+
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnSelectFilter
+                        :label="t('Province')"
+                        :options="provincesLocationOptions"
+                        hide-selected
+                        option-label="name"
+                        option-value="id"
+                        v-model="data.provinceFk"
+                    >
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection>
+                                    <QItemLabel>{{
+                                        `${scope.opt.name} (${scope.opt.country.country})`
+                                    }}</QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelectFilter>
+                </div>
+                <div class="col">
+                    <VnSelectFilter
+                        :label="t('Agency')"
+                        :options="agencyModes"
+                        hide-selected
+                        option-label="name"
+                        option-value="id"
+                        v-model="data.agencyModeFk"
+                    />
+                </div>
+            </VnRow>
+
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnInput :label="t('Phone')" v-model="data.phone" />
+                </div>
+                <div class="col">
+                    <VnInput :label="t('Mobile')" v-model="data.mobile" />
+                </div>
+            </VnRow>
+
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnSelectFilter
+                        :label="t('Incoterms')"
+                        :options="incoterms"
+                        hide-selected
+                        option-label="name"
+                        option-value="code"
+                        v-model="data.incotermsFk"
+                    />
+                </div>
+                <div class="col">
+                    <VnSelectCreate
+                        :label="t('Customs agent')"
+                        :options="customsAgents"
+                        hide-selected
+                        option-label="fiscalName"
+                        option-value="id"
+                        v-model="data.customsAgentFk"
+                    >
+                        <template #form>
+                            <CustomsNewCustomsAgent />
+                        </template>
+                    </VnSelectCreate>
+                </div>
+            </VnRow>
+
+            <h4 class="q-mb-xs">{{ t('Notes') }}</h4>
+            <VnRow
+                :key="index"
+                class="row q-gutter-md q-mb-md"
+                v-for="(note, index) in notes"
+            >
+                <div class="col">
+                    <VnSelectFilter
+                        :label="t('Observation type')"
+                        :options="observationTypes"
+                        hide-selected
+                        option-label="description"
+                        option-value="id"
+                        v-model="note.observationTypeFk"
+                    />
+                </div>
+                <div class="col">
+                    <VnInput :label="t('Description')" v-model="note.description" />
+                </div>
+                <div class="flex items-center">
+                    <QIcon
+                        @click.stop="deleteNote(index)"
+                        class="cursor-pointer"
+                        color="primary"
+                        name="delete"
+                        size="sm"
+                    >
+                        <QTooltip>
+                            {{ t('Remove') }}
+                        </QTooltip>
+                    </QIcon>
+                </div>
+            </VnRow>
+
+            <QIcon
+                @click.stop="addNote()"
+                class="cursor-pointer add-icon q-mt-md"
+                name="add"
+                size="sm"
+            >
+                <QTooltip>
+                    {{ t('Add note') }}
+                </QTooltip>
+            </QIcon>
+        </template>
+    </FormModel>
 </template>
+
+<style lang="scss" scoped>
+.add-icon {
+    background-color: $primary;
+    border-radius: 50px;
+}
+</style>
+
+<i18n>
+es:
+    Enabled: Activo
+    Is equalizated: Recargo de equivalencia
+    Is Loginflora allowed: Compra directa en Holanda
+    Consignee: Consignatario
+    Street address: Dirección postal
+    Postcode: Código postal
+    City: Población
+    Province: Provincia
+    Agency: Agencia
+    Phone: Teléfono
+    Mobile: Movíl
+    Incoterms: Incoterms
+    Customs agent: Agente de aduanas
+    Notes: Notas
+    Observation type: Tipo de observación
+    Description: Descripción
+    Add note: Añadir nota
+    Remove note: Eliminar nota
+</i18n>
diff --git a/src/router/modules/customer.js b/src/router/modules/customer.js
index a0dc2df23..5f8589355 100644
--- a/src/router/modules/customer.js
+++ b/src/router/modules/customer.js
@@ -177,15 +177,22 @@ export default {
                                 ),
                         },
                         {
-                            path: 'edit',
-                            name: 'CustomerConsigneeEdit',
-                            meta: {
-                                title: 'consignee-edit',
-                            },
-                            component: () =>
-                                import(
-                                    'src/pages/Customer/components/CustomerConsigneeEdit.vue'
-                                ),
+                            path: ':consigneeId',
+                            name: 'CustomerConsigneeEditCard',
+                            redirect: { name: 'CustomerConsigneeEdit' },
+                            children: [
+                                {
+                                    path: 'edit',
+                                    name: 'CustomerConsigneeEdit',
+                                    meta: {
+                                        title: 'consignee-edit',
+                                    },
+                                    component: () =>
+                                        import(
+                                            'src/pages/Customer/components/CustomerConsigneeEdit.vue'
+                                        ),
+                                },
+                            ],
                         },
                     ],
                 },

From 596904c4f8eaacd06454ba0d8bcb950c00460528 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Tue, 16 Jan 2024 13:26:12 -0300
Subject: [PATCH 33/94] Entry submodules: Log, Basic data, Buys (WIP)

---
 src/components/common/VnInput.vue       |   7 +-
 src/i18n/en/index.js                    |  26 +-
 src/i18n/es/index.js                    |  25 +-
 src/pages/Entry/Card/EntryBasicData.vue | 202 ++++++++++++
 src/pages/Entry/Card/EntryBuys.vue      | 406 ++++++++++++++++++++++++
 src/pages/Entry/Card/EntryLog.vue       |   6 +
 src/pages/Entry/Card/EntryNotes.vue     |   1 +
 src/pages/Entry/Card/EntrySummary.vue   |  22 +-
 src/router/modules/entry.js             |  38 ++-
 9 files changed, 707 insertions(+), 26 deletions(-)
 create mode 100644 src/pages/Entry/Card/EntryBasicData.vue
 create mode 100644 src/pages/Entry/Card/EntryBuys.vue
 create mode 100644 src/pages/Entry/Card/EntryLog.vue
 create mode 100644 src/pages/Entry/Card/EntryNotes.vue

diff --git a/src/components/common/VnInput.vue b/src/components/common/VnInput.vue
index cdc6dd865..76e91a5d8 100644
--- a/src/components/common/VnInput.vue
+++ b/src/components/common/VnInput.vue
@@ -1,7 +1,7 @@
 <script setup>
 import { computed } from 'vue';
 
-const emit = defineEmits(['update:modelValue', 'update:options']);
+const emit = defineEmits(['update:modelValue', 'update:options', 'keyup.enter']);
 
 const $props = defineProps({
     modelValue: {
@@ -32,6 +32,10 @@ const styleAttrs = computed(() => {
           }
         : {};
 });
+
+const onEnterPress = () => {
+    emit('keyup.enter');
+};
 </script>
 
 <template>
@@ -41,6 +45,7 @@ const styleAttrs = computed(() => {
         v-bind="{ ...$attrs, ...styleAttrs }"
         type="text"
         :class="{ required: $attrs.required }"
+        @keyup.enter="onEnterPress()"
     >
         <template v-if="$slots.prepend" #prepend>
             <slot name="prepend" />
diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index b7a2ff008..120cbd7e0 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -261,9 +261,11 @@ export default {
         pageTitles: {
             entries: 'Entries',
             list: 'List',
-            createEntry: 'New entry',
             summary: 'Summary',
-            create: 'Create',
+            basicData: 'Basic data',
+            buys: 'Buys',
+            notes: 'Notes',
+            log: 'Log',
         },
         list: {
             newEntry: 'New entry',
@@ -303,6 +305,26 @@ export default {
             buyingValue: 'Buying value',
             import: 'Import',
             pvp: 'PVP',
+            item: 'Item',
+        },
+        basicData: {
+            supplier: 'Supplier',
+            travel: 'Travel',
+            reference: 'Reference',
+            invoiceNumber: 'Invoice number',
+            company: 'Company',
+            currency: 'Currency',
+            commission: 'Commission',
+            observation: 'Observation',
+            ordered: 'Ordered',
+            confirmed: 'Confirmed',
+            booked: 'Booked',
+            raid: 'Raid',
+            excludedFromAvailable: 'Inventory',
+        },
+        buys: {
+            groupingPrice: 'Grouping price',
+            packingPrice: 'Packing price',
         },
     },
     ticket: {
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index 6107cce14..9c27c6fe1 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -261,7 +261,10 @@ export default {
             entries: 'Entradas',
             list: 'Listado',
             summary: 'Resumen',
-            create: 'Crear',
+            basicData: 'Datos básicos',
+            buys: 'Compras',
+            notes: 'Notas',
+            log: 'Historial',
         },
         list: {
             newEntry: 'Nueva entrada',
@@ -301,6 +304,26 @@ export default {
             buyingValue: 'Coste',
             import: 'Importe',
             pvp: 'PVP',
+            item: 'Artículo',
+        },
+        basicData: {
+            supplier: 'Proveedor',
+            travel: 'Envío',
+            reference: 'Referencia',
+            invoiceNumber: 'Núm. factura',
+            company: 'Empresa',
+            currency: 'Moneda',
+            observation: 'Observación',
+            commission: 'Comisión',
+            ordered: 'Pedida',
+            confirmed: 'Confirmado',
+            booked: 'Asentado',
+            raid: 'Redada',
+            excludedFromAvailable: 'Inventario',
+        },
+        buys: {
+            groupingPrice: 'Precio grouping',
+            packingPrice: 'Precio packing',
         },
     },
     ticket: {
diff --git a/src/pages/Entry/Card/EntryBasicData.vue b/src/pages/Entry/Card/EntryBasicData.vue
new file mode 100644
index 000000000..a5565fbf6
--- /dev/null
+++ b/src/pages/Entry/Card/EntryBasicData.vue
@@ -0,0 +1,202 @@
+<script setup>
+import { ref } from 'vue';
+import { useRoute } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+
+import FetchData from 'components/FetchData.vue';
+import FormModel from 'components/FormModel.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+
+import { toDate } from 'src/filters';
+
+const route = useRoute();
+const { t } = useI18n();
+
+const suppliersOptions = ref([]);
+const travelsOptions = ref([]);
+const companiesOptions = ref([]);
+const currenciesOptions = ref([]);
+</script>
+<template>
+    <FetchData
+        url="Suppliers"
+        :filter="{ fields: ['id', 'nickname'] }"
+        order="nickname"
+        @on-fetch="(data) => (suppliersOptions = data)"
+        auto-load
+    />
+    <FetchData
+        url="Travels/filter"
+        :filter="{ fields: ['id', 'warehouseInName'] }"
+        order="id"
+        @on-fetch="(data) => (travelsOptions = data)"
+        auto-load
+    />
+    <FetchData
+        ref="companiesRef"
+        url="Companies"
+        :filter="{ fields: ['id', 'code'] }"
+        order="code"
+        @on-fetch="(data) => (companiesOptions = data)"
+        auto-load
+    />
+    <FetchData
+        ref="currenciesRef"
+        url="Currencies"
+        :filter="{ fields: ['id', 'code'] }"
+        order="code"
+        @on-fetch="(data) => (currenciesOptions = data)"
+        auto-load
+    />
+    <FormModel
+        :url="`Entries/${route.params.id}`"
+        :url-update="`Entries/${route.params.id}`"
+        model="entry"
+        auto-load
+    >
+        <template #form="{ data }">
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnSelectFilter
+                        :label="t('entry.basicData.supplier')"
+                        v-model="data.supplierFk"
+                        :options="suppliersOptions"
+                        option-value="id"
+                        option-label="nickname"
+                        hide-selected
+                        :required="true"
+                        map-options
+                    >
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection>
+                                    <QItemLabel>{{ scope.opt?.name }}</QItemLabel>
+                                    <QItemLabel caption>
+                                        {{ scope.opt?.nickname }}, {{ scope.opt?.id }}
+                                    </QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelectFilter>
+                </div>
+                <div class="col">
+                    <VnSelectFilter
+                        :label="t('entry.basicData.travel')"
+                        v-model="data.travelFk"
+                        :options="travelsOptions"
+                        option-value="id"
+                        option-label="warehouseInName"
+                        map-options
+                        hide-selected
+                        :required="true"
+                    >
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection>
+                                    <QItemLabel
+                                        >{{ scope.opt?.agencyModeName }} -
+                                        {{ scope.opt?.warehouseInName }} ({{
+                                            toDate(scope.opt?.shipped)
+                                        }}) &#x2192; {{ scope.opt?.warehouseOutName }} ({{
+                                            toDate(scope.opt?.landed)
+                                        }})</QItemLabel
+                                    >
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelectFilter>
+                </div>
+            </VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnInput
+                        v-model="data.reference"
+                        :label="t('entry.basicData.reference')"
+                    />
+                </div>
+            </VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnInput
+                        v-model="data.invoiceNumber"
+                        :label="t('entry.basicData.invoiceNumber')"
+                    />
+                </div>
+                <div class="col">
+                    <VnSelectFilter
+                        :label="t('entry.basicData.company')"
+                        v-model="data.companyFk"
+                        :options="companiesOptions"
+                        option-value="id"
+                        option-label="code"
+                        map-options
+                        hide-selected
+                        :required="true"
+                    />
+                </div>
+            </VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnSelectFilter
+                        :label="t('entry.basicData.currency')"
+                        v-model="data.currencyFk"
+                        :options="currenciesOptions"
+                        option-value="id"
+                        option-label="code"
+                    />
+                </div>
+                <div class="col">
+                    <QInput
+                        :label="t('entry.basicData.commission')"
+                        v-model="data.commission"
+                        type="number"
+                        autofocus
+                        min="0"
+                    />
+                </div>
+            </VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <QInput
+                        :label="t('entry.basicData.observation')"
+                        type="textarea"
+                        v-model="data.observation"
+                        fill-input
+                        autogrow
+                    />
+                </div>
+            </VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <QCheckbox
+                        v-model="data.isOrdered"
+                        :label="t('entry.basicData.ordered')"
+                    />
+                </div>
+                <div class="col">
+                    <QCheckbox
+                        v-model="data.isConfirmed"
+                        :label="t('entry.basicData.confirmed')"
+                    />
+                </div>
+                <div class="col">
+                    <QCheckbox
+                        v-model="data.isExcludedFromAvailable"
+                        :label="t('entry.basicData.excludedFromAvailable')"
+                    />
+                </div>
+                <div class="col">
+                    <QCheckbox v-model="data.isRaid" :label="t('entry.basicData.raid')" />
+                </div>
+                <div class="col">
+                    <QCheckbox
+                        v-model="data.isBooked"
+                        :label="t('entry.basicData.booked')"
+                    />
+                </div>
+            </VnRow>
+        </template>
+    </FormModel>
+</template>
diff --git a/src/pages/Entry/Card/EntryBuys.vue b/src/pages/Entry/Card/EntryBuys.vue
new file mode 100644
index 000000000..4c399ed0f
--- /dev/null
+++ b/src/pages/Entry/Card/EntryBuys.vue
@@ -0,0 +1,406 @@
+<script setup>
+import { ref, computed } from 'vue';
+import { useRoute } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+
+import VnPaginate from 'src/components/ui/VnPaginate.vue';
+import FetchData from 'src/components/FetchData.vue';
+import VnSelectFilter from 'components/common/VnSelectFilter.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import FetchedTags from 'components/ui/FetchedTags.vue';
+import VnConfirm from 'components/ui/VnConfirm.vue';
+
+import { useQuasar } from 'quasar';
+import { useStateStore } from 'stores/useStateStore';
+import { toCurrency } from 'src/filters';
+import axios from 'axios';
+import useNotify from 'src/composables/useNotify.js';
+
+const quasar = useQuasar();
+const route = useRoute();
+const { t } = useI18n();
+const stateStore = useStateStore();
+const { notify } = useNotify();
+
+const rowsSelected = ref([]);
+const entryBuysPaginateRef = ref(null);
+const packagingsOptions = ref(null);
+
+const tableColumnComponents = computed(() => ({
+    item: {
+        component: () => 'span',
+        props: () => {},
+        event: () => ({}),
+    },
+    quantity: {
+        component: () => VnInput,
+        props: (col) => ({
+            type: 'number',
+            min: 0,
+            label: col.label,
+            class: 'input-number',
+        }),
+        event: (props) => ({
+            'keyup.enter': () => saveChange(props.row),
+        }),
+    },
+    packagingFk: {
+        component: () => VnSelectFilter,
+        props: () => ({
+            'option-value': 'id',
+            'option-label': 'id',
+            'emit-value': true,
+            'map-options': true,
+            'use-input': true,
+            'hide-selected': true,
+            options: packagingsOptions.value,
+        }),
+        event: (props) => ({
+            'update:modelValue': () => saveChange(props.row),
+        }),
+    },
+    stickers: {
+        component: () => VnInput,
+        props: (col) => ({
+            type: 'number',
+            min: 0,
+            label: col.label,
+            class: 'input-number',
+        }),
+        event: (props) => ({
+            'keyup.enter': () => saveChange(props.row),
+        }),
+    },
+    weight: {
+        component: () => VnInput,
+        props: (col) => ({
+            type: 'number',
+            min: 0,
+            label: col.label,
+        }),
+        event: (props) => ({
+            'keyup.enter': () => saveChange(props.row),
+        }),
+    },
+    packing: {
+        component: () => VnInput,
+        props: (col) => ({
+            type: 'number',
+            min: 0,
+            label: col.label,
+        }),
+        event: (props) => ({
+            'keyup.enter': () => saveChange(props.row),
+        }),
+    },
+    grouping: {
+        component: () => VnInput,
+        props: (col) => ({
+            type: 'number',
+            min: 0,
+            label: col.label,
+        }),
+        event: (props) => ({
+            'keyup.enter': () => saveChange(props.row),
+        }),
+    },
+    buyingValue: {
+        component: () => VnInput,
+        props: (col) => ({
+            type: 'number',
+            min: 0,
+            label: col.label,
+        }),
+        event: (props) => ({
+            'keyup.enter': () => saveChange(props.row),
+        }),
+    },
+    price2: {
+        component: () => VnInput,
+        props: (col) => ({
+            type: 'number',
+            min: 0,
+            label: col.label,
+        }),
+        event: (props) => ({
+            'keyup.enter': () => saveChange(props.row),
+        }),
+    },
+    price3: {
+        component: () => VnInput,
+        props: (col) => ({
+            type: 'number',
+            min: 0,
+            label: col.label,
+        }),
+        event: (props) => ({
+            'keyup.enter': () => saveChange(props.row),
+        }),
+    },
+    import: {
+        component: () => 'span',
+        props: () => {},
+        event: () => ({}),
+    },
+}));
+
+const entriesTableColumns = computed(() => {
+    return [
+        {
+            label: t('entry.summary.item'),
+            field: 'id',
+            name: 'item',
+            align: 'left',
+        },
+        {
+            label: t('entry.summary.quantity'),
+            field: 'quantity',
+            name: 'quantity',
+            align: 'left',
+        },
+        {
+            label: t('entry.summary.package'),
+            field: 'packagingFk',
+            name: 'packagingFk',
+            align: 'left',
+        },
+        {
+            label: t('entry.summary.stickers'),
+            field: 'stickers',
+            name: 'stickers',
+            align: 'left',
+        },
+        {
+            label: t('entry.summary.weight'),
+            field: 'weight',
+            name: 'weight',
+            align: 'left',
+        },
+        {
+            label: t('entry.summary.packing'),
+            field: 'packing',
+            name: 'packing',
+            align: 'left',
+        },
+        {
+            label: t('entry.summary.grouping'),
+            field: 'grouping',
+            name: 'grouping',
+            align: 'left',
+        },
+        {
+            label: t('entry.summary.buyingValue'),
+            field: 'buyingValue',
+            name: 'buyingValue',
+            align: 'left',
+            format: (value) => toCurrency(value),
+        },
+        {
+            label: t('entry.buys.groupingPrice'),
+            field: 'price2',
+            name: 'price2',
+            align: 'left',
+        },
+        {
+            label: t('entry.buys.packingPrice'),
+            field: 'price3',
+            name: 'price3',
+            align: 'left',
+        },
+        {
+            label: t('entry.summary.import'),
+            name: 'import',
+            align: 'left',
+            format: (_, row) => toCurrency(row.buyingValue * row.quantity),
+        },
+    ];
+});
+
+const saveChange = async (rowData) => {
+    await axios.patch(`Buys/${rowData.id}`, rowData);
+};
+
+const openRemoveDialog = async () => {
+    quasar
+        .dialog({
+            component: VnConfirm,
+            componentProps: {
+                title: t('Confirm deletion'),
+                message:
+                    rowsSelected.value.length > 1
+                        ? t('Are you sure you want to delete this buys?')
+                        : t('Are you sure you want to delete this buy?'),
+                data: rowsSelected.value,
+            },
+        })
+        .onOk(async () => {
+            try {
+                await deleteBuys();
+                const notifyMessage =
+                    rowsSelected.value.length > 1 ? t('Buys deleted') : t('Buy deleted');
+                notify(notifyMessage, 'positive');
+            } catch (err) {
+                console.error('Error deleting buys');
+            }
+        });
+};
+
+const deleteBuys = async () => {
+    await axios.post('Buys/deleteBuys', { buys: rowsSelected.value });
+    entryBuysPaginateRef.value.fetch();
+};
+
+const importBuys = () => {
+    // redirect to buys import view
+};
+</script>
+
+<template>
+    <FetchData
+        ref="expensesRef"
+        url="Packagings"
+        :filter="{ fields: ['id'], where: { freightItemFk: true }, order: 'id ASC' }"
+        auto-load
+        @on-fetch="(data) => (packagingsOptions = data)"
+    />
+    <Teleport to="#st-actions" v-if="stateStore?.isSubToolbarShown()">
+        <QBtnGroup push style="column-gap: 10px">
+            <slot name="moreBeforeActions" />
+            <QBtn
+                :label="t('globals.remove')"
+                color="primary"
+                icon="delete"
+                flat
+                @click="openRemoveDialog()"
+                :disable="!rowsSelected?.length"
+                :title="t('globals.remove')"
+            />
+        </QBtnGroup>
+    </Teleport>
+    <VnPaginate
+        ref="entryBuysPaginateRef"
+        data-key="EntryBuys"
+        :url="`Entries/${route.params.id}/getBuys`"
+        auto-load
+    >
+        <template #body="{ rows }">
+            <QTable
+                :rows="rows"
+                :columns="entriesTableColumns"
+                selection="multiple"
+                row-key="id"
+                hide-bottom
+                class="full-width q-mt-md"
+                :grid="$q.screen.lt.md"
+                v-model:selected="rowsSelected"
+            >
+                <template #body="props">
+                    <QTr>
+                        <QTd>
+                            <QCheckbox v-model="props.selected" />
+                        </QTd>
+                        <QTd v-for="col in props.cols" :key="col.name">
+                            <component
+                                :is="tableColumnComponents[col.name].component()"
+                                v-bind="tableColumnComponents[col.name].props(col)"
+                                v-model="props.row[col.field]"
+                                v-on="tableColumnComponents[col.name].event(props)"
+                            >
+                                <template
+                                    v-if="col.name === 'item' || col.name === 'import'"
+                                >
+                                    {{ col.value }}
+                                </template>
+                            </component>
+                        </QTd>
+                    </QTr>
+                    <QTr no-hover>
+                        <QTd />
+                        <QTd>
+                            <span>{{ props.row.item.itemType.code }}</span>
+                        </QTd>
+                        <QTd>
+                            <span>{{ props.row.item.id }}</span>
+                        </QTd>
+                        <QTd>
+                            <span>{{ props.row.item.size }}</span>
+                        </QTd>
+                        <QTd>
+                            <span>{{ toCurrency(props.row.item.minPrice) }}</span>
+                        </QTd>
+                        <QTd colspan="7">
+                            <span>{{ props.row.item.concept }}</span>
+                            <span v-if="props.row.item.subName" class="subName">
+                                {{ props.row.item.subName }}
+                            </span>
+                            <fetched-tags :item="props.row.item" :max-length="5" />
+                        </QTd>
+                    </QTr>
+                    <!-- Esta última row es utilizada para agregar un espaciado y así marcar una diferencia visual entre los diferentes buys -->
+                    <QTr v-if="props.rowIndex !== rows.length - 1" class="separation-row">
+                        <QTd colspan="12" style="height: 24px" />
+                    </QTr>
+                </template>
+                <template #item="props">
+                    <div class="q-pa-xs col-xs-12 col-sm-6 grid-style-transition">
+                        <QCard bordered flat>
+                            <QCardSection>
+                                <QCheckbox v-model="props.selected" dense />
+                            </QCardSection>
+                            <QSeparator />
+                            <QList dense>
+                                <QItem v-for="col in props.cols" :key="col.name">
+                                    <component
+                                        :is="tableColumnComponents[col.name].component()"
+                                        v-bind="
+                                            tableColumnComponents[col.name].props(col)
+                                        "
+                                        v-model="props.row[col.field]"
+                                        v-on="
+                                            tableColumnComponents[col.name].event(props)
+                                        "
+                                        class="full-width"
+                                    >
+                                        <template
+                                            v-if="
+                                                col.name === 'item' ||
+                                                col.name === 'import'
+                                            "
+                                        >
+                                            {{ col.label + ': ' + col.value }}
+                                        </template>
+                                    </component>
+                                </QItem>
+                            </QList>
+                        </QCard>
+                    </div>
+                </template>
+            </QTable>
+        </template>
+    </VnPaginate>
+    <QPageSticky :offset="[20, 20]">
+        <QBtn fab icon="upload" color="primary" @click="importBuys()" />
+        <QTooltip>
+            {{ t('Import buys') }}
+        </QTooltip>
+    </QPageSticky>
+</template>
+
+<style lang="scss" scoped>
+.separation-row {
+    background-color: var(--vn-gray) !important;
+}
+.grid-style-transition {
+    transition: transform 0.28s, background-color 0.28s;
+}
+</style>
+
+<i18n>
+es:
+    Import buys: Importar compras
+    Buy deleted: Compra eliminada
+    Buys deleted: Compras eliminadas
+    Confirm deletion: Confirmar eliminación
+    Are you sure you want to delete this buy?: Seguro que quieres eliminar esta compra?
+    Are you sure you want to delete this buys?: Seguro que quieres eliminar estas compras?
+</i18n>
diff --git a/src/pages/Entry/Card/EntryLog.vue b/src/pages/Entry/Card/EntryLog.vue
new file mode 100644
index 000000000..930f7dd40
--- /dev/null
+++ b/src/pages/Entry/Card/EntryLog.vue
@@ -0,0 +1,6 @@
+<script setup>
+import VnLog from 'src/components/common/VnLog.vue';
+</script>
+<template>
+    <VnLog model="Entry" url="/EntryLogs"></VnLog>
+</template>
diff --git a/src/pages/Entry/Card/EntryNotes.vue b/src/pages/Entry/Card/EntryNotes.vue
new file mode 100644
index 000000000..4728feea5
--- /dev/null
+++ b/src/pages/Entry/Card/EntryNotes.vue
@@ -0,0 +1 @@
+<template>Entry Notes</template>
diff --git a/src/pages/Entry/Card/EntrySummary.vue b/src/pages/Entry/Card/EntrySummary.vue
index d19b1f744..3861e0321 100644
--- a/src/pages/Entry/Card/EntrySummary.vue
+++ b/src/pages/Entry/Card/EntrySummary.vue
@@ -39,47 +39,30 @@ onMounted(async () => {
 const tableColumnComponents = {
     quantity: {
         component: () => 'span',
-        props: () => {},
     },
     stickers: {
         component: () => 'span',
-        props: () => {},
-        event: () => {},
     },
     packagingFk: {
         component: () => 'span',
-        props: () => {},
-        event: () => {},
     },
     weight: {
         component: () => 'span',
-        props: () => {},
-        event: () => {},
     },
     packing: {
         component: () => 'span',
-        props: () => {},
-        event: () => {},
     },
     grouping: {
         component: () => 'span',
-        props: () => {},
-        event: () => {},
     },
     buyingValue: {
         component: () => 'span',
-        props: () => {},
-        event: () => {},
     },
     amount: {
         component: () => 'span',
-        props: () => {},
-        event: () => {},
     },
     pvp: {
         component: () => 'span',
-        props: () => {},
-        event: () => {},
     },
 };
 
@@ -314,10 +297,7 @@ const fetchEntryBuys = async () => {
                         <QTr no-hover>
                             <QTd v-for="col in cols" :key="col.name">
                                 <component
-                                    :is="tableColumnComponents[col.name].component(props)"
-                                    v-bind="tableColumnComponents[col.name].props(props)"
-                                    @click="tableColumnComponents[col.name].event(props)"
-                                    class="col-content"
+                                    :is="tableColumnComponents[col.name].component()"
                                 >
                                     <template
                                         v-if="
diff --git a/src/router/modules/entry.js b/src/router/modules/entry.js
index a806190a8..4137cb59e 100644
--- a/src/router/modules/entry.js
+++ b/src/router/modules/entry.js
@@ -11,7 +11,7 @@ export default {
     redirect: { name: 'EntryMain' },
     menus: {
         main: ['EntryList'],
-        card: [],
+        card: ['EntryBasicData', 'EntryBuys', 'EntryNotes', 'EntryLog'],
     },
     children: [
         {
@@ -54,6 +54,42 @@ export default {
                     },
                     component: () => import('src/pages/Entry/Card/EntrySummary.vue'),
                 },
+                {
+                    path: 'basic-data',
+                    name: 'EntryBasicData',
+                    meta: {
+                        title: 'basicData',
+                        icon: 'vn:settings',
+                    },
+                    component: () => import('src/pages/Entry/Card/EntryBasicData.vue'),
+                },
+                {
+                    path: 'buys',
+                    name: 'EntryBuys',
+                    meta: {
+                        title: 'buys',
+                        icon: 'vn:lines',
+                    },
+                    component: () => import('src/pages/Entry/Card/EntryBuys.vue'),
+                },
+                {
+                    path: 'notes',
+                    name: 'EntryNotes',
+                    meta: {
+                        title: 'notes',
+                        icon: 'vn:notes',
+                    },
+                    component: () => import('src/pages/Entry/Card/EntryNotes.vue'),
+                },
+                {
+                    path: 'log',
+                    name: 'EntryLog',
+                    meta: {
+                        title: 'log',
+                        icon: 'vn:History',
+                    },
+                    component: () => import('src/pages/Entry/Card/EntryLog.vue'),
+                },
             ],
         },
     ],

From 64a4a800f752dad7016b9dbe5e457e3313ae61fc Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Tue, 16 Jan 2024 16:11:23 -0300
Subject: [PATCH 34/94] Entry buys import

---
 src/i18n/en/index.js                     |   9 +
 src/i18n/es/index.js                     |   9 +
 src/pages/Entry/Card/EntryBuys.vue       |   5 +-
 src/pages/Entry/Card/EntryBuysImport.vue | 281 +++++++++++++++++++++++
 src/router/modules/entry.js              |   5 +
 5 files changed, 307 insertions(+), 2 deletions(-)
 create mode 100644 src/pages/Entry/Card/EntryBuysImport.vue

diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index 120cbd7e0..a1d237480 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -325,6 +325,15 @@ export default {
         buys: {
             groupingPrice: 'Grouping price',
             packingPrice: 'Packing price',
+            reference: 'Reference',
+            observations: 'Observations',
+            item: 'Item',
+            description: 'Description',
+            size: 'Size',
+            packing: 'Packing',
+            grouping: 'Grouping',
+            buyingValue: 'Buying value',
+            packagingFk: 'Box',
         },
     },
     ticket: {
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index 9c27c6fe1..3aa9d350e 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -324,6 +324,15 @@ export default {
         buys: {
             groupingPrice: 'Precio grouping',
             packingPrice: 'Precio packing',
+            reference: 'Referencia',
+            observations: 'Observaciónes',
+            item: 'Artículo',
+            description: 'Descripción',
+            size: 'Medida',
+            packing: 'Packing',
+            grouping: 'Grouping',
+            buyingValue: 'Coste',
+            packagingFk: 'Embalaje',
         },
     },
     ticket: {
diff --git a/src/pages/Entry/Card/EntryBuys.vue b/src/pages/Entry/Card/EntryBuys.vue
index 4c399ed0f..87d4b3826 100644
--- a/src/pages/Entry/Card/EntryBuys.vue
+++ b/src/pages/Entry/Card/EntryBuys.vue
@@ -1,6 +1,6 @@
 <script setup>
 import { ref, computed } from 'vue';
-import { useRoute } from 'vue-router';
+import { useRoute, useRouter } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 
 import VnPaginate from 'src/components/ui/VnPaginate.vue';
@@ -18,6 +18,7 @@ import useNotify from 'src/composables/useNotify.js';
 
 const quasar = useQuasar();
 const route = useRoute();
+const router = useRouter();
 const { t } = useI18n();
 const stateStore = useStateStore();
 const { notify } = useNotify();
@@ -251,7 +252,7 @@ const deleteBuys = async () => {
 };
 
 const importBuys = () => {
-    // redirect to buys import view
+    router.push({ name: 'EntryBuysImport' });
 };
 </script>
 
diff --git a/src/pages/Entry/Card/EntryBuysImport.vue b/src/pages/Entry/Card/EntryBuysImport.vue
new file mode 100644
index 000000000..1495e968d
--- /dev/null
+++ b/src/pages/Entry/Card/EntryBuysImport.vue
@@ -0,0 +1,281 @@
+<script setup>
+import { ref, computed } from 'vue';
+import { useRoute, useRouter } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+
+import VnInput from 'src/components/common/VnInput.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import FetchData from 'components/FetchData.vue';
+import VnSelectFilter from 'components/common/VnSelectFilter.vue';
+
+import { useStateStore } from 'stores/useStateStore';
+import axios from 'axios';
+import useNotify from 'src/composables/useNotify.js';
+import { toCurrency } from 'filters/index';
+
+const stateStore = useStateStore();
+const route = useRoute();
+const router = useRouter();
+const { t } = useI18n();
+const { notify } = useNotify();
+
+const importData = ref({
+    file: null,
+    invoice: null,
+    buys: [],
+    observation: null,
+    ref: null,
+});
+
+const lastItemBuysOptions = ref([]);
+const packagingsOptions = ref([]);
+
+const columns = computed(() => [
+    {
+        label: t('entry.buys.item'),
+        name: 'item',
+        field: 'itemFk',
+        options: lastItemBuysOptions.value,
+        optionValue: 'id',
+        optionLabel: 'name',
+        align: 'left',
+    },
+    {
+        label: t('entry.buys.description'),
+        name: 'description',
+        field: 'description',
+        align: 'left',
+    },
+    {
+        label: t('entry.buys.size'),
+        name: 'size',
+        field: 'size',
+        align: 'left',
+    },
+    {
+        label: t('entry.buys.packing'),
+        name: 'packing',
+        field: 'packing',
+        align: 'left',
+    },
+    {
+        label: t('entry.buys.grouping'),
+        name: 'grouping',
+        field: 'grouping',
+        align: 'left',
+    },
+    {
+        label: t('entry.buys.buyingValue'),
+        name: 'buyingValue',
+        field: 'buyingValue',
+        align: 'left',
+        format: (val) => toCurrency(val),
+    },
+    {
+        label: t('entry.buys.packagingFk'),
+        name: 'packagingFk',
+        field: 'packagingFk',
+        options: packagingsOptions.value,
+        optionValue: 'id',
+        optionLabel: 'id',
+        align: 'left',
+    },
+]);
+
+const onFileChange = (e) => {
+    importData.value.file = e;
+    const reader = new FileReader();
+    reader.onload = (e) => fillData(e.target.result);
+    reader.readAsText(importData.value.file);
+};
+
+const fillData = async (rawData) => {
+    const data = JSON.parse(rawData);
+    const [invoice] = data.invoices;
+
+    importData.value.observation = invoice.tx_awb;
+    const companyName = invoice.tx_company;
+    const boxes = invoice.boxes;
+    const buys = [];
+
+    for (let box of boxes) {
+        const boxVolume = box.nu_length * box.nu_width * box.nu_height;
+        for (let product of box.products) {
+            const packing = product.nu_stems_bunch * product.nu_bunches;
+            buys.push({
+                description: product.nm_product,
+                companyName: companyName,
+                size: product.nu_length,
+                packing: packing,
+                grouping: product.nu_stems_bunch,
+                buyingValue: parseFloat(product.mny_rate_stem),
+                volume: boxVolume,
+            });
+        }
+    }
+
+    const boxesId = boxes.map((box) => box.id_box);
+    importData.value.ref = boxesId.join(', ');
+    await fetchBuys(buys);
+};
+
+const fetchBuys = async (buys) => {
+    try {
+        const params = { buys };
+        const { data } = await axios.post(
+            `Entries/${route.params.id}/importBuysPreview`,
+            params
+        );
+        importData.value.buys = data;
+    } catch (err) {
+        console.error('Error fetching buys');
+    }
+};
+
+const onSubmit = async () => {
+    try {
+        const params = importData.value;
+        const hasAnyEmptyRow = params.buys.some((buy) => {
+            return buy.itemFk === null;
+        });
+
+        if (hasAnyEmptyRow) {
+            notify(t('Some of the imported buys does not have an item'), 'negative');
+            return;
+        }
+
+        await axios.post(`Entries/${route.params.id}/importBuys`, params);
+        notify('globals.dataSaved', 'positive');
+        redirectToBuysView();
+    } catch (err) {
+        console.error('Error importing buys', err);
+    }
+};
+
+const redirectToBuysView = () => {
+    router.push({ name: 'EntryBuys' });
+};
+</script>
+<template>
+    <FetchData
+        :url="`Entries/${route.params.id}/lastItemBuys`"
+        :filter="{ fields: ['id', 'name'] }"
+        order="id DESC"
+        @on-fetch="(data) => (lastItemBuysOptions = data)"
+        auto-load
+    />
+    <FetchData
+        url="Packagings"
+        :filter="{ fields: ['id'], where: { isBox: true } }"
+        order="id ASC"
+        @on-fetch="(data) => (packagingsOptions = data)"
+        auto-load
+    />
+    <QForm>
+        <Teleport to="#st-actions" v-if="stateStore?.isSubToolbarShown()">
+            <div>
+                <QBtnGroup push class="q-gutter-x-sm">
+                    <QBtn
+                        :label="t('globals.cancel')"
+                        color="primary"
+                        icon="restart_alt"
+                        flat
+                        @click="redirectToBuysView()"
+                    />
+                    <QBtn
+                        :label="t('globals.save')"
+                        color="primary"
+                        icon="save"
+                        type="submit"
+                        :disable="!importData.file"
+                        @click="onSubmit()"
+                    />
+                </QBtnGroup>
+            </div>
+        </Teleport>
+        <QCard class="q-pa-lg">
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <QFile
+                        label="Standard"
+                        :multiple="false"
+                        v-model="importData.file"
+                        @update:model-value="onFileChange($event)"
+                    >
+                        <template #append>
+                            <QIcon name="vn:attach" class="cursor-pointer">
+                                <QTooltip>{{ t('Select a file') }}</QTooltip>
+                            </QIcon>
+                        </template>
+                    </QFile>
+                </div>
+            </VnRow>
+            <div v-if="importData.file">
+                <VnRow class="row q-gutter-md q-mb-md">
+                    <div class="col">
+                        <VnInput
+                            :label="t('entry.buys.reference')"
+                            v-model="importData.ref"
+                        />
+                    </div>
+                </VnRow>
+                <VnRow class="row q-gutter-md q-mb-md">
+                    <div class="col">
+                        <VnInput
+                            :label="t('entry.buys.observations')"
+                            v-model="importData.observation"
+                        />
+                    </div>
+                </VnRow>
+                <VnRow>
+                    <QTable
+                        :columns="columns"
+                        :rows="importData.buys"
+                        :pagination="{ rowsPerPage: 0 }"
+                        hide-pagination
+                    >
+                        <template #body-cell-item="{ row, col }">
+                            <QTd auto-width>
+                                <VnSelectFilter
+                                    v-model="row[col.field]"
+                                    :options="col.options"
+                                    :option-value="col.optionValue"
+                                    :option-label="col.optionLabel"
+                                    hide-selected
+                                >
+                                    <template #option="scope">
+                                        <QItem v-bind="scope.itemProps">
+                                            <QItemSection>
+                                                <QItemLabel>
+                                                    {{ scope.opt?.id }} -
+                                                    {{ scope.opt?.name }}
+                                                </QItemLabel>
+                                            </QItemSection>
+                                        </QItem>
+                                    </template>
+                                </VnSelectFilter>
+                            </QTd>
+                        </template>
+                        <template #body-cell-packagingFk="{ row, col }">
+                            <QTd auto-width>
+                                <VnSelectFilter
+                                    v-model="row[col.field]"
+                                    :options="col.options"
+                                    :option-value="col.optionValue"
+                                    :option-label="col.optionLabel"
+                                    hide-selected
+                                />
+                            </QTd>
+                        </template>
+                    </QTable>
+                </VnRow>
+            </div>
+        </QCard>
+    </QForm>
+</template>
+
+<i18n>
+es:
+    Select a file: Selecciona un fichero
+    Some of the imported buys does not have an item: Algunas de las compras importadas no tienen un artículo
+</i18n>
diff --git a/src/router/modules/entry.js b/src/router/modules/entry.js
index 4137cb59e..8d25a8e0c 100644
--- a/src/router/modules/entry.js
+++ b/src/router/modules/entry.js
@@ -72,6 +72,11 @@ export default {
                     },
                     component: () => import('src/pages/Entry/Card/EntryBuys.vue'),
                 },
+                {
+                    path: 'buys/import',
+                    name: 'EntryBuysImport',
+                    component: () => import('src/pages/Entry/Card/EntryBuysImport.vue'),
+                },
                 {
                     path: 'notes',
                     name: 'EntryNotes',

From 27f9d5a7b28b89633e69f1b7b160bafa18cb6def Mon Sep 17 00:00:00 2001
From: carlosfonseca <carlos.fonseca@mindshore.io>
Date: Tue, 16 Jan 2024 22:25:17 -0500
Subject: [PATCH 35/94] Se crea tarjeta de notas, lectura y creacion

---
 src/pages/Customer/Card/CustomerNotes.vue     | 93 ++++++++++++++++++-
 .../components/CustomerNoteCreate.vue         | 40 ++++++++
 src/router/modules/customer.js                | 31 +++++--
 3 files changed, 157 insertions(+), 7 deletions(-)
 create mode 100644 src/pages/Customer/components/CustomerNoteCreate.vue

diff --git a/src/pages/Customer/Card/CustomerNotes.vue b/src/pages/Customer/Card/CustomerNotes.vue
index 65ade2903..303ea0980 100644
--- a/src/pages/Customer/Card/CustomerNotes.vue
+++ b/src/pages/Customer/Card/CustomerNotes.vue
@@ -1,3 +1,94 @@
+<script setup>
+import { useI18n } from 'vue-i18n';
+import { useRoute, useRouter } from 'vue-router';
+
+import { date } from 'quasar';
+
+import VnPaginate from 'src/components/ui/VnPaginate.vue';
+
+const { t } = useI18n();
+const route = useRoute();
+const router = useRouter();
+
+const noteFilter = {
+    order: 'created DESC',
+    where: {
+        clientFk: `${route.params.id}`,
+    },
+};
+
+const toCustomerNoteCreate = () => {
+    router.push({ name: 'CustomerNoteCreate' });
+};
+</script>
+
 <template>
-    <div class="flex justify-center">Notes</div>
+    <QCard class="q-pa-lg">
+        <VnPaginate
+            data-key="CustomerNotes"
+            :url="'clientObservations'"
+            auto-load
+            :filter="noteFilter"
+        >
+            <template #body="{ rows }">
+                <div v-if="rows.length">
+                    <QCard
+                        v-for="(item, index) in rows"
+                        :key="index"
+                        :class="{
+                            'consignees-card': true,
+                            'q-mb-md': index < rows.length - 1,
+                        }"
+                    >
+                        <div class="flex justify-between">
+                            <p class="label-color">{{ item.worker.user.nickname }}</p>
+                            <p class="label-color">
+                                {{
+                                    date.formatDate(item?.created, 'DD-MM-YYYY HH:mm:ss')
+                                }}
+                            </p>
+                        </div>
+                        <h6 class="q-mt-xs q-mb-none">{{ item.text }}</h6>
+                    </QCard>
+                </div>
+
+                <div v-else>
+                    <h5 class="flex justify-center label-color">
+                        {{ t('globals.noResults') }}
+                    </h5>
+                </div>
+
+                <QPageSticky :offset="[18, 18]">
+                    <QBtn
+                        @click.stop="toCustomerConsigneeCreate()"
+                        color="primary"
+                        fab
+                        icon="add"
+                    />
+                    <QTooltip>
+                        {{ t('New consignee') }}
+                    </QTooltip>
+                </QPageSticky>
+            </template>
+        </VnPaginate>
+    </QCard>
+
+    <QPageSticky :offset="[18, 18]">
+        <QBtn @click.stop="toCustomerNoteCreate()" color="primary" fab icon="add" />
+        <QTooltip>
+            {{ t('New consignee') }}
+        </QTooltip>
+    </QPageSticky>
 </template>
+
+<style lang="scss">
+.consignees-card {
+    border: 2px solid var(--vn-light-gray);
+    border-radius: 10px;
+    padding: 10px;
+}
+
+.label-color {
+    color: var(--vn-label);
+}
+</style>
diff --git a/src/pages/Customer/components/CustomerNoteCreate.vue b/src/pages/Customer/components/CustomerNoteCreate.vue
new file mode 100644
index 000000000..7dde8f11e
--- /dev/null
+++ b/src/pages/Customer/components/CustomerNoteCreate.vue
@@ -0,0 +1,40 @@
+<script setup>
+import { onMounted, reactive } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useRoute } from 'vue-router';
+
+import FormModel from 'components/FormModel.vue';
+import VnRow from 'components/ui/VnRow.vue';
+
+const { t } = useI18n();
+const route = useRoute();
+
+const initialData = reactive({
+    text: null,
+});
+
+onMounted(() => {
+    initialData.clientFk = `${route.params.id}`;
+});
+</script>
+
+<template>
+    <FormModel
+        :form-initial-data="initialData"
+        :observe-form-changes="false"
+        url-create="ClientObservations"
+    >
+        <template #form="{ data }">
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <QInput :label="t('Note')" type="textarea" v-model="data.text" />
+                </div>
+            </VnRow>
+        </template>
+    </FormModel>
+</template>
+
+<i18n>
+es:
+    Note: Nota
+</i18n>
diff --git a/src/router/modules/customer.js b/src/router/modules/customer.js
index 5f8589355..bd404f7ee 100644
--- a/src/router/modules/customer.js
+++ b/src/router/modules/customer.js
@@ -198,12 +198,31 @@ export default {
                 },
                 {
                     path: 'notes',
-                    name: 'CustomerNotes',
-                    meta: {
-                        title: 'notes',
-                        icon: 'vn:notes',
-                    },
-                    component: () => import('src/pages/Customer/Card/CustomerNotes.vue'),
+                    name: 'NotesCard',
+                    redirect: { name: 'CustomerNotes' },
+                    children: [
+                        {
+                            path: '',
+                            name: 'CustomerNotes',
+                            meta: {
+                                title: 'notes',
+                                icon: 'vn:notes',
+                            },
+                            component: () =>
+                                import('src/pages/Customer/Card/CustomerNotes.vue'),
+                        },
+                        {
+                            path: 'create',
+                            name: 'CustomerNoteCreate',
+                            meta: {
+                                title: 'note-create',
+                            },
+                            component: () =>
+                                import(
+                                    'src/pages/Customer/components/CustomerNoteCreate.vue'
+                                ),
+                        },
+                    ],
                 },
                 {
                     path: 'credits',

From 7a7622023cd5abcb98717068944b63703e46ce2d Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 17 Jan 2024 08:29:51 +0100
Subject: [PATCH 36/94] refs #6694 perf: remove unnecessary api calls

---
 src/pages/Customer/CustomerCreate.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/pages/Customer/CustomerCreate.vue b/src/pages/Customer/CustomerCreate.vue
index 3afda7fac..b20554ee9 100644
--- a/src/pages/Customer/CustomerCreate.vue
+++ b/src/pages/Customer/CustomerCreate.vue
@@ -51,18 +51,18 @@ function handleLocation(data, { city, postcode, provinceFk, countryFk }) {
         auto-load
         url="Workers/search?departmentCodes"
     />
-    <FetchData
+    <!-- <FetchData
         ref="postcodeFetchDataRef"
         url="Postcodes/location"
         @on-fetch="(data) => (postcodesOptions = data)"
         auto-load
-    />
+    /> -->
     <FetchData
         @on-fetch="(data) => (businessTypesOptions = data)"
         auto-load
         url="BusinessTypes"
     />
-    <FetchData
+    <!-- <FetchData
         @on-fetch="(data) => (citiesLocationOptions = data)"
         auto-load
         url="Towns/location"
@@ -76,7 +76,7 @@ function handleLocation(data, { city, postcode, provinceFk, countryFk }) {
         @on-fetch="(data) => (countriesOptions = data)"
         auto-load
         url="Countries"
-    />
+    />-->
     <QPage>
         <VnSubToolbar />
         <FormModel

From c0005c0544deb57c6004f1b3a62d154b73356efa Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 17 Jan 2024 08:30:05 +0100
Subject: [PATCH 37/94] refs #6694 perf: add function for optionLabel

---
 src/components/common/VnSelectFilter.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/common/VnSelectFilter.vue b/src/components/common/VnSelectFilter.vue
index c197f17ea..5b91caa1a 100644
--- a/src/components/common/VnSelectFilter.vue
+++ b/src/components/common/VnSelectFilter.vue
@@ -13,7 +13,7 @@ const $props = defineProps({
         default: () => [],
     },
     optionLabel: {
-        type: String,
+        type: [String, Function],
         default: '',
     },
     filterOptions: {

From 817a4e9e3f8ccb58a07e6f00d6e432e49c3a1592 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 17 Jan 2024 08:30:23 +0100
Subject: [PATCH 38/94] refs #6694 feat call new method for filter

---
 src/components/common/VnLocation.vue | 88 ++++++++++++++++++++--------
 1 file changed, 63 insertions(+), 25 deletions(-)

diff --git a/src/components/common/VnLocation.vue b/src/components/common/VnLocation.vue
index e91c78430..db6f49469 100644
--- a/src/components/common/VnLocation.vue
+++ b/src/components/common/VnLocation.vue
@@ -7,11 +7,12 @@ const emit = defineEmits(['update:modelValue', 'update:options']);
 import { useI18n } from 'vue-i18n';
 
 const { t } = useI18n();
-const citiesLocationOptions = ref([]);
-const provincesLocationOptions = ref([]);
-const countriesOptions = ref([]);
+// const citiesLocationOptions = ref([]);
+// const provincesLocationOptions = ref([]);
+// const countriesOptions = ref([]);
+// const townsRef = ref([]);
 const postcodesOptions = ref([]);
-const postcodeFetchDataRef = ref(null);
+const postcodesRef = ref(null);
 
 const $props = defineProps({
     modelValue: {
@@ -66,25 +67,61 @@ watch(options, (newValue) => {
     setOptions(newValue);
 });
 
-function showLabel(data){
-    return `${data.code} - ${data.town.name}(${data.town.province.name}), ${data.town.province.country.country}`;
+function showLabel(data) {
+       return `${data.code} - ${data.town}(${data.province}), ${data.country}`;
 }
 
-</script>
+function locationFilter(value) {
+    // if(value==='') return [];
+    let where = { limit: 30 };
+    const params = { value };
+    postcodesRef.value.fetch({ where: Object.assign(where, params) });
+//     postcodesRef.value.fetch({
+//   where: {
+//     or: [
+//       { code: { like: '%4660%' } },
+//       { 'town.name': { like: '%Alz%' } }
+//     ]
+//   }});
+    // const townParams = { name: { like: `%${val}%` } };
 
-<template>
-    <FetchData
-        ref="postcodeFetchDataRef"
-        url="Postcodes/location"
-        @on-fetch="(data) => (postcodesOptions = data)"
-        auto-load
-    />
-    <FetchData
-        @on-fetch="(data) => (citiesLocationOptions = data)"
+    // townsRef.value.fetch({ where: Object.assign(where, townParams) });
+}
+function handleFetch( data) {
+//     if (from === 'towns') {
+//         data = data.reduce((acc, town) => {
+//             for (const postcode of town.postcodes) {
+//                 console.log(postcode);
+//                 acc.push({ ...postcode, town:{name: town.name, province: town.province} });
+//             }
+
+//             return acc;
+//         }, []);
+//     }
+//     console.log(from, data);
+     postcodesOptions.value = data;
+}
+</script>
+<!-- let where = { limit: 30 };
+
+const params = { 'town': false, 'townsFk': {like: ``}  };
+where = Object.assign(where, params);
+postcodesRef.value.fetch({ where});
+} -->
+<!-- <FetchData
+        ref="townsRef"
+        @on-fetch="(data) => handleFetch('towns', data)"
         auto-load
         url="Towns/location"
-    />
+    /> -->
+<template>
     <FetchData
+        ref="postcodesRef"
+        url="Postcodes/filter"
+        @on-fetch="(data) =>handleFetch(data)"
+        auto-load
+    />
+    <!--  <FetchData
         @on-fetch="(data) => (provincesLocationOptions = data)"
         auto-load
         url="Provinces/location"
@@ -93,23 +130,26 @@ function showLabel(data){
         @on-fetch="(data) => (countriesOptions = data)"
         auto-load
         url="Countries"
-    />
+    /> -->
+    <!-- :filter-options="['code','town.name']"
+    :filter-rules="['val.length>2']" -->
     <VnSelectCreate
+        v-if="postcodesRef"
         v-model="value"
         :options="postcodesOptions"
         :label="t('Location')"
         :option-label="showLabel"
-        :placeholder="t('Search by postalCode or town (at least 3 characters')"
+        :placeholder="t('Search by postalCode, town, province or country')"
         v-bind="$attrs"
         emit-value
         map-options
         use-input
-        :filter-options="['code','town.name']"
-        :filter-rules="['val.length>2']"
         clearable
         hide-selected
         fill-input
         :class="{ required: $attrs.required }"
+        @input-value="locationFilter"
+        :default-filter="false"
     >
         <template #form>
             <CreateNewPostcode @on-data-saved="onPostcodeCreated($event)" />
@@ -118,9 +158,7 @@ function showLabel(data){
             <QItem v-bind="scope.itemProps">
                 <QItemSection v-if="scope.opt">
                     <QItemLabel>{{ scope.opt.code }}</QItemLabel>
-                    <QItemLabel caption
-                        >{{ showLabel(scope.opt)}}</QItemLabel
-                    >
+                    <QItemLabel caption>{{ showLabel(scope.opt) }}</QItemLabel>
                 </QItemSection>
             </QItem>
         </template>
@@ -137,5 +175,5 @@ function showLabel(data){
 <i18n>
 es:
     Location: Ubicación
-    Search by postalCode or town (at least 3 characters): Buscar por código postal o nombre ( al menos 3 letras)
+    Search by postalCode, town, province or country: Buscar por código postal, ciudad o país
 </i18n>

From d8e7f3acaa3b4b2ea6fcb190225f96c4e6d5a236 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 17 Jan 2024 08:31:28 +0100
Subject: [PATCH 39/94] refs #6694 perf: remove comments

---
 src/components/common/VnLocation.vue | 50 ----------------------------
 1 file changed, 50 deletions(-)

diff --git a/src/components/common/VnLocation.vue b/src/components/common/VnLocation.vue
index db6f49469..b321b731a 100644
--- a/src/components/common/VnLocation.vue
+++ b/src/components/common/VnLocation.vue
@@ -7,10 +7,6 @@ const emit = defineEmits(['update:modelValue', 'update:options']);
 import { useI18n } from 'vue-i18n';
 
 const { t } = useI18n();
-// const citiesLocationOptions = ref([]);
-// const provincesLocationOptions = ref([]);
-// const countriesOptions = ref([]);
-// const townsRef = ref([]);
 const postcodesOptions = ref([]);
 const postcodesRef = ref(null);
 
@@ -72,48 +68,14 @@ function showLabel(data) {
 }
 
 function locationFilter(value) {
-    // if(value==='') return [];
     let where = { limit: 30 };
     const params = { value };
     postcodesRef.value.fetch({ where: Object.assign(where, params) });
-//     postcodesRef.value.fetch({
-//   where: {
-//     or: [
-//       { code: { like: '%4660%' } },
-//       { 'town.name': { like: '%Alz%' } }
-//     ]
-//   }});
-    // const townParams = { name: { like: `%${val}%` } };
-
-    // townsRef.value.fetch({ where: Object.assign(where, townParams) });
 }
 function handleFetch( data) {
-//     if (from === 'towns') {
-//         data = data.reduce((acc, town) => {
-//             for (const postcode of town.postcodes) {
-//                 console.log(postcode);
-//                 acc.push({ ...postcode, town:{name: town.name, province: town.province} });
-//             }
-
-//             return acc;
-//         }, []);
-//     }
-//     console.log(from, data);
      postcodesOptions.value = data;
 }
 </script>
-<!-- let where = { limit: 30 };
-
-const params = { 'town': false, 'townsFk': {like: ``}  };
-where = Object.assign(where, params);
-postcodesRef.value.fetch({ where});
-} -->
-<!-- <FetchData
-        ref="townsRef"
-        @on-fetch="(data) => handleFetch('towns', data)"
-        auto-load
-        url="Towns/location"
-    /> -->
 <template>
     <FetchData
         ref="postcodesRef"
@@ -121,18 +83,6 @@ postcodesRef.value.fetch({ where});
         @on-fetch="(data) =>handleFetch(data)"
         auto-load
     />
-    <!--  <FetchData
-        @on-fetch="(data) => (provincesLocationOptions = data)"
-        auto-load
-        url="Provinces/location"
-    />
-    <FetchData
-        @on-fetch="(data) => (countriesOptions = data)"
-        auto-load
-        url="Countries"
-    /> -->
-    <!-- :filter-options="['code','town.name']"
-    :filter-rules="['val.length>2']" -->
     <VnSelectCreate
         v-if="postcodesRef"
         v-model="value"

From e6c59866d1884cc0afe743d2502f2a5e1ed98cf8 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Wed, 17 Jan 2024 08:15:55 -0300
Subject: [PATCH 40/94] Entry notes submodule

---
 src/i18n/en/index.js                |   4 ++
 src/i18n/es/index.js                |   4 ++
 src/pages/Entry/Card/EntryNotes.vue | 100 +++++++++++++++++++++++++++-
 3 files changed, 107 insertions(+), 1 deletion(-)

diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index a1d237480..7ee389ea7 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -335,6 +335,10 @@ export default {
             buyingValue: 'Buying value',
             packagingFk: 'Box',
         },
+        notes: {
+            observationType: 'Observation type',
+            description: 'Description',
+        },
     },
     ticket: {
         pageTitles: {
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index 3aa9d350e..0efe2598e 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -334,6 +334,10 @@ export default {
             buyingValue: 'Coste',
             packagingFk: 'Embalaje',
         },
+        notes: {
+            observationType: 'Tipo de observación',
+            description: 'Descripción',
+        },
     },
     ticket: {
         pageTitles: {
diff --git a/src/pages/Entry/Card/EntryNotes.vue b/src/pages/Entry/Card/EntryNotes.vue
index 4728feea5..c78d6c842 100644
--- a/src/pages/Entry/Card/EntryNotes.vue
+++ b/src/pages/Entry/Card/EntryNotes.vue
@@ -1 +1,99 @@
-<template>Entry Notes</template>
+<script setup>
+import { ref, onMounted } from 'vue';
+import { useRoute } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+
+import FetchData from 'components/FetchData.vue';
+import CrudModel from 'components/CrudModel.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+
+const route = useRoute();
+const { t } = useI18n();
+
+const entryObservationsRef = ref(null);
+const entryObservationsOptions = ref([]);
+
+onMounted(() => {
+    if (entryObservationsRef.value) entryObservationsRef.value.reload();
+});
+</script>
+<template>
+    <FetchData
+        url="ObservationTypes"
+        @on-fetch="(data) => (entryObservationsOptions = data)"
+        auto-load
+    />
+    <CrudModel
+        data-key="EntryAccount"
+        url="EntryObservations"
+        model="EntryAccount"
+        :filter="{
+            fields: ['id', 'entryFk', 'observationTypeFk', 'description'],
+            where: { entryFk: route.params.id },
+        }"
+        ref="entryObservationsRef"
+        :default-remove="false"
+        :data-required="{ entryFk: route.params.id }"
+    >
+        <template #body="{ rows }">
+            <QCard class="q-pa-md">
+                <VnRow
+                    v-for="(row, index) in rows"
+                    :key="index"
+                    class="row q-gutter-md q-mb-md"
+                >
+                    <div class="col-3">
+                        <VnSelectFilter
+                            :label="t('entry.notes.observationType')"
+                            v-model="row.observationTypeFk"
+                            :options="entryObservationsOptions"
+                            option-label="description"
+                            option-value="id"
+                            hide-selected
+                        />
+                    </div>
+                    <div class="col">
+                        <VnInput
+                            :label="t('entry.notes.description')"
+                            v-model="row.description"
+                        />
+                    </div>
+                    <div class="col-1 row justify-center items-center">
+                        <QIcon
+                            name="delete"
+                            size="sm"
+                            class="cursor-pointer"
+                            color="primary"
+                            @click="entryObservationsRef.remove([row])"
+                        >
+                            <QTooltip>
+                                {{ t('Remove note') }}
+                            </QTooltip>
+                        </QIcon>
+                    </div>
+                </VnRow>
+                <VnRow>
+                    <QIcon
+                        name="add"
+                        size="sm"
+                        class="cursor-pointer"
+                        color="primary"
+                        @click="entryObservationsRef.insert()"
+                    >
+                        <QTooltip>
+                            {{ t('Add note') }}
+                        </QTooltip>
+                    </QIcon>
+                </VnRow>
+            </QCard>
+        </template>
+    </CrudModel>
+</template>
+
+<i18n>
+    es:
+        Add note: Añadir nota
+        Remove note: Quitar nota
+</i18n>

From e1ac98cf3e54d698da695d9d6d9dc33546510115 Mon Sep 17 00:00:00 2001
From: Kevin Martinez <kevin.martinez@mindshore.io>
Date: Wed, 17 Jan 2024 07:34:43 -0400
Subject: [PATCH 41/94] Add route list filter

---
 src/pages/Route/Card/RouteFilter.vue    | 234 ++++++++++++++++++++++++
 src/pages/Route/Card/RouteSearchbar.vue |  20 ++
 src/pages/Route/RouteList.vue           | 114 ++++++------
 3 files changed, 308 insertions(+), 60 deletions(-)
 create mode 100644 src/pages/Route/Card/RouteFilter.vue
 create mode 100644 src/pages/Route/Card/RouteSearchbar.vue

diff --git a/src/pages/Route/Card/RouteFilter.vue b/src/pages/Route/Card/RouteFilter.vue
new file mode 100644
index 000000000..45580d913
--- /dev/null
+++ b/src/pages/Route/Card/RouteFilter.vue
@@ -0,0 +1,234 @@
+<script setup>
+import { ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import FetchData from 'components/FetchData.vue';
+import VnFilterPanel from 'components/ui/VnFilterPanel.vue';
+import VnSelectFilter from 'components/common/VnSelectFilter.vue';
+import VnInputDate from 'components/common/VnInputDate.vue';
+import VnInput from 'components/common/VnInput.vue';
+
+const { t } = useI18n();
+const props = defineProps({
+    dataKey: {
+        type: String,
+        required: true,
+    },
+});
+
+const emit = defineEmits(['search']);
+
+const workerList = ref([]);
+const agencyList = ref([]);
+const vehicleList = ref([]);
+const warehouseList = ref([]);
+</script>
+
+<template>
+    <FetchData
+        url="Workers/search"
+        :filter="{ fields: ['id', 'nickname'] }"
+        sort-by="nickname ASC"
+        limit="30"
+        @on-fetch="(data) => (workerList = data)"
+        auto-load
+    />
+    <FetchData
+        url="AgencyModes/isActive"
+        :filter="{ fields: ['id', 'name'] }"
+        sort-by="name ASC"
+        limit="30"
+        @on-fetch="(data) => (agencyList = data)"
+        auto-load
+    />
+    <FetchData
+        url="Vehicles"
+        :filter="{ fields: ['id', 'numberPlate'] }"
+        sort-by="numberPlate ASC"
+        limit="30"
+        @on-fetch="(data) => (vehicleList = data)"
+        auto-load
+    />
+    <FetchData url="Warehouses" @on-fetch="(data) => (warehouseList = data)" auto-load />
+    <VnFilterPanel
+        :data-key="props.dataKey"
+        :search-button="true"
+        @search="emit('search')"
+    >
+        <template #tags="{ tag, formatFn }">
+            <div class="q-gutter-x-xs">
+                <strong>{{ t(`params.${tag.label}`) }}: </strong>
+                <span>{{ formatFn(tag.value) }}</span>
+            </div>
+        </template>
+        <template #body="{ params }">
+            <QList dense>
+                <QItem class="q-my-sm">
+                    <QItemSection v-if="workerList">
+                        <VnSelectFilter
+                            :label="t('Worker')"
+                            v-model="params.workerFk"
+                            :options="workerList"
+                            option-value="id"
+                            option-label="nickname"
+                            dense
+                            outlined
+                            rounded
+                            emit-value
+                            map-options
+                            use-input
+                            :input-debounce="0"
+                        >
+                            <template #option="{ itemProps, opt }">
+                                <QItem v-bind="itemProps">
+                                    <QItemSection>
+                                        <QItemLabel>{{ opt.name }}</QItemLabel>
+                                        <QItemLabel caption>
+                                            {{ opt.nickname }},{{ opt.code }}
+                                        </QItemLabel>
+                                    </QItemSection>
+                                </QItem>
+                            </template>
+                        </VnSelectFilter>
+                    </QItemSection>
+                </QItem>
+                <QItem class="q-my-sm">
+                    <QItemSection v-if="agencyList">
+                        <VnSelectFilter
+                            :label="t('Agency')"
+                            v-model="params.agencyModeFk"
+                            :options="agencyList"
+                            option-value="id"
+                            option-label="name"
+                            dense
+                            outlined
+                            rounded
+                            emit-value
+                            map-options
+                            use-input
+                            :input-debounce="0"
+                        />
+                    </QItemSection>
+                </QItem>
+                <QItem class="q-my-sm">
+                    <QItemSection>
+                        <VnInputDate
+                            v-model="params.from"
+                            :label="t('From')"
+                            is-outlined
+                            :disable="Boolean(params.scopeDays)"
+                            @update:model-value="params.scopeDays = null"
+                        />
+                    </QItemSection>
+                </QItem>
+                <QItem class="q-my-sm">
+                    <QItemSection>
+                        <VnInputDate
+                            v-model="params.to"
+                            :label="t('To')"
+                            is-outlined
+                            :disable="Boolean(params.scopeDays)"
+                            @update:model-value="params.scopeDays = null"
+                        />
+                    </QItemSection>
+                </QItem>
+                <QItem class="q-my-sm">
+                    <QItemSection>
+                        <VnInput
+                            v-model="params.scopeDays"
+                            type="number"
+                            :label="t('Days Onward')"
+                            is-outlined
+                            clearable
+                            :disable="Boolean(params.from || params.to)"
+                            @update:model-value="
+                                params.to = null;
+                                params.from = null;
+                            "
+                        />
+                    </QItemSection>
+                </QItem>
+                <QItem class="q-my-sm">
+                    <QItemSection v-if="vehicleList">
+                        <VnSelectFilter
+                            :label="t('Vehicle')"
+                            v-model="params.vehicleFk"
+                            :options="vehicleList"
+                            option-value="id"
+                            option-label="numberPlate"
+                            dense
+                            outlined
+                            rounded
+                            emit-value
+                            map-options
+                            use-input
+                            :input-debounce="0"
+                        />
+                    </QItemSection>
+                </QItem>
+                <QItem class="q-my-sm">
+                    <QItemSection>
+                        <VnInput v-model="params.m3" label="m³" is-outlined clearable />
+                    </QItemSection>
+                </QItem>
+                <QItem class="q-my-sm">
+                    <QItemSection v-if="vehicleList">
+                        <VnSelectFilter
+                            :label="t('Warehouse')"
+                            v-model="params.warehouseFk"
+                            :options="warehouseList"
+                            option-value="id"
+                            option-label="name"
+                            dense
+                            outlined
+                            rounded
+                            emit-value
+                            map-options
+                            use-input
+                            :input-debounce="0"
+                        />
+                    </QItemSection>
+                </QItem>
+                <QItem class="q-my-sm">
+                    <QItemSection>
+                        <VnInput
+                            v-model="params.description"
+                            :label="t('Description')"
+                            is-outlined
+                            clearable
+                        />
+                    </QItemSection>
+                </QItem>
+            </QList>
+        </template>
+    </VnFilterPanel>
+</template>
+
+<i18n>
+en:
+    params:
+        warehouseFk: Warehouse
+        description: Description
+        m3: m³
+        vehicleFk: Vehicle
+        agencyModeFk: Agency
+        workerFk: Worker
+        from: From
+        to: To
+es:
+    params:
+        warehouseFk: Almacén
+        description: Descripción
+        m3: m³
+        vehicleFk: Vehículo
+        agencyModeFk: Agencia
+        workerFk: Trabajador
+        from: Desde
+        to: Hasta
+    Warehouse: Almacén
+    Description: Descripción
+    Vehicle: Vehículo
+    Agency: Agencia
+    Worker: Trabajador
+    From: Desde
+    To: Hasta
+</i18n>
diff --git a/src/pages/Route/Card/RouteSearchbar.vue b/src/pages/Route/Card/RouteSearchbar.vue
new file mode 100644
index 000000000..9ee4a602f
--- /dev/null
+++ b/src/pages/Route/Card/RouteSearchbar.vue
@@ -0,0 +1,20 @@
+<script setup>
+import VnSearchbar from 'components/ui/VnSearchbar.vue';
+import {useI18n} from "vue-i18n";
+const { t } = useI18n();
+</script>
+
+<template>
+    <VnSearchbar
+        data-key="RouteList"
+        :label="t('Search route')"
+        :info="t('You can search by route reference')"
+    />
+</template>
+
+<style scoped lang="scss"></style>
+<i18n>
+es:
+    Search route: Buscar rutas
+    You can search by route reference: Puedes buscar por referencia de la ruta
+</i18n>
diff --git a/src/pages/Route/RouteList.vue b/src/pages/Route/RouteList.vue
index 408119751..ddf3e1a12 100644
--- a/src/pages/Route/RouteList.vue
+++ b/src/pages/Route/RouteList.vue
@@ -3,14 +3,16 @@ import VnPaginate from 'components/ui/VnPaginate.vue';
 import { useStateStore } from 'stores/useStateStore';
 import { useI18n } from 'vue-i18n';
 import { computed, onMounted, onUnmounted, ref } from 'vue';
-import {dashIfEmpty, toDate, toHour} from 'src/filters';
+import { dashIfEmpty, toDate, toHour } from 'src/filters';
 import VnSelectFilter from 'components/common/VnSelectFilter.vue';
 import FetchData from 'components/FetchData.vue';
 import { useValidator } from 'composables/useValidator';
-import VnInputDate from "components/common/VnInputDate.vue";
-import VnInput from "components/common/VnInput.vue";
-import VnInputTime from "components/common/VnInputTime.vue";
-import axios from "axios";
+import VnInputDate from 'components/common/VnInputDate.vue';
+import VnInput from 'components/common/VnInput.vue';
+import VnInputTime from 'components/common/VnInputTime.vue';
+import axios from 'axios';
+import RouteSearchbar from 'pages/Route/Card/RouteSearchbar.vue';
+import RouteFilter from 'pages/Route/Card/RouteFilter.vue';
 
 const stateStore = useStateStore();
 // const router = useRouter();
@@ -98,7 +100,7 @@ const columns = computed(() => [
     },
 ]);
 
-const refreshKey = ref(0)
+const refreshKey = ref(0);
 const workers = ref([]);
 const agencyList = ref([]);
 const vehicleList = ref([]);
@@ -108,76 +110,63 @@ const updateRoute = async (route) => {
     } catch (err) {
         return err;
     }
-}
+};
 
 const updateVehicle = (row, vehicle) => {
-    row.vehicleFk = vehicle.id
-    row.vehiclePlateNumber = vehicle.numberPlate
-    updateRoute(row)
-}
+    row.vehicleFk = vehicle.id;
+    row.vehiclePlateNumber = vehicle.numberPlate;
+    updateRoute(row);
+};
 
 const updateAgency = (row, agency) => {
-    row.agencyModeFk = agency.id
-    row.agencyName = agency.name
-    updateRoute(row)
-}
+    row.agencyModeFk = agency.id;
+    row.agencyName = agency.name;
+    updateRoute(row);
+};
 
 const updateWorker = (row, worker) => {
-    row.workerFk = worker.id
-    row.workerUserName = worker.name
-    updateRoute(row)
-}
+    row.workerFk = worker.id;
+    row.workerUserName = worker.name;
+    updateRoute(row);
+};
 </script>
 
 <template>
     <template v-if="stateStore.isHeaderMounted()">
-        <!--        <Teleport to="#searchbar">-->
-        <!--            <ShelvingSearchbar />-->
-        <!--        </Teleport>-->
-        <!--        <Teleport to="#actions-append">-->
-        <!--            <div class="row q-gutter-x-sm">-->
-        <!--                <QBtn-->
-        <!--                    flat-->
-        <!--                    @click="stateStore.toggleRightDrawer()"-->
-        <!--                    round-->
-        <!--                    dense-->
-        <!--                    icon="menu"-->
-        <!--                >-->
-        <!--                    <QTooltip bottom anchor="bottom right">-->
-        <!--                        {{ t('globals.collapseMenu') }}-->
-        <!--                    </QTooltip>-->
-        <!--                </QBtn>-->
-        <!--            </div>-->
-        <!--        </Teleport>-->
+        <Teleport to="#searchbar">
+            <RouteSearchbar />
+        </Teleport>
+        <Teleport to="#actions-append">
+            <div class="row q-gutter-x-sm">
+                <QBtn
+                    flat
+                    @click="stateStore.toggleRightDrawer()"
+                    round
+                    dense
+                    icon="menu"
+                >
+                    <QTooltip bottom anchor="bottom right">
+                        {{ t('globals.collapseMenu') }}
+                    </QTooltip>
+                </QBtn>
+            </div>
+        </Teleport>
     </template>
     <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
-        <!--        <QScrollArea class="fit text-grey-8">-->
-        <!--            <ShelvingFilter data-key="ShelvingList" />-->
-        <!--        </QScrollArea>-->
+        <QScrollArea class="fit text-grey-8">
+            <RouteFilter data-key="RouteList" />
+        </QScrollArea>
     </QDrawer>
     <FetchData
         url="Workers/activeWithInheritedRole"
         @on-fetch="(data) => (workers = data)"
         auto-load
     />
-    <FetchData
-        url="AgencyModes"
-        @on-fetch="(data) => (agencyList = data)"
-        auto-load
-    />
-    <FetchData
-        url="Vehicles"
-        @on-fetch="(data) => (vehicleList = data)"
-        auto-load
-    />
+    <FetchData url="AgencyModes" @on-fetch="(data) => (agencyList = data)" auto-load />
+    <FetchData url="Vehicles" @on-fetch="(data) => (vehicleList = data)" auto-load />
     <QPage class="column items-center q-pa-md">
         <QToolbar class="q-pa-none q-mb-sm justify-end">
-            <QBtn
-                icon="refresh"
-                color="primary"
-                class="q-mr-sm"
-                @click="refreshKey++"
-            />
+            <QBtn icon="refresh" color="primary" class="q-mr-sm" @click="refreshKey++" />
         </QToolbar>
         <VnPaginate
             :key="refreshKey"
@@ -185,7 +174,6 @@ const updateWorker = (row, worker) => {
             url="Routes/filter"
             :order="['created DESC', 'id DESC']"
             :limit="20"
-            :user-params="params"
             auto-load
         >
             <template #body="{ rows }">
@@ -205,7 +193,9 @@ const updateWorker = (row, worker) => {
                                 :model-value="props.row.workerFk"
                                 v-slot="scope"
                                 buttons
-                                @update:model-value="(worker) => updateWorker(props.row, worker)"
+                                @update:model-value="
+                                    (worker) => updateWorker(props.row, worker)
+                                "
                             >
                                 <VnSelectFilter
                                     :label="t('Worker')"
@@ -245,7 +235,9 @@ const updateWorker = (row, worker) => {
                                 :model-value="props.row.agencyModeFk"
                                 v-slot="scope"
                                 buttons
-                                @update:model-value="(agency) => updateAgency(props.row, agency)"
+                                @update:model-value="
+                                    (agency) => updateAgency(props.row, agency)
+                                "
                             >
                                 <VnSelectFilter
                                     :label="t('Agency')"
@@ -271,7 +263,9 @@ const updateWorker = (row, worker) => {
                                 :model-value="props.row.vehicleFk"
                                 v-slot="scope"
                                 buttons
-                                @update:model-value="(vehicle) => updateVehicle(props.row, vehicle)"
+                                @update:model-value="
+                                    (vehicle) => updateVehicle(props.row, vehicle)
+                                "
                             >
                                 <VnSelectFilter
                                     :label="t('Vehicle')"

From a68f53d9f7f867e50dee5b946d3d9370f9e4ace7 Mon Sep 17 00:00:00 2001
From: Kevin Martinez <kevin.martinez@mindshore.io>
Date: Wed, 17 Jan 2024 09:04:10 -0400
Subject: [PATCH 42/94] Add route form

---
 src/components/FormModel.vue       |   7 +-
 src/i18n/en/index.js               |   4 +-
 src/i18n/es/index.js               |   4 +-
 src/pages/Route/Card/RouteCard.vue |  21 +++
 src/pages/Route/Card/RouteForm.vue | 215 +++++++++++++++++++++++++++++
 src/pages/Route/RouteList.vue      |  19 +--
 src/router/modules/route.js        |  26 ++++
 7 files changed, 283 insertions(+), 13 deletions(-)
 create mode 100644 src/pages/Route/Card/RouteCard.vue
 create mode 100644 src/pages/Route/Card/RouteForm.vue

diff --git a/src/components/FormModel.vue b/src/components/FormModel.vue
index a5560dfc0..4ad566bf8 100644
--- a/src/components/FormModel.vue
+++ b/src/components/FormModel.vue
@@ -128,13 +128,14 @@ async function save() {
 
     try {
         const body = $props.mapper ? $props.mapper(formData.value) : formData.value;
+        let response
         if ($props.urlCreate) {
-            await axios.post($props.urlCreate, body);
+            response = await axios.post($props.urlCreate, body);
             notify('globals.dataCreated', 'positive');
         } else {
-            await axios.patch($props.urlUpdate || $props.url, body);
+            response = await axios.patch($props.urlUpdate || $props.url, body);
         }
-        emit('onDataSaved', formData.value);
+        emit('onDataSaved', formData.value, response);
         originalData.value = JSON.parse(JSON.stringify(formData.value));
         hasChanges.value = false;
     } catch (err) {
diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index 72ed1cba8..2056f1907 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -807,7 +807,9 @@ export default {
         pageTitles: {
             routes: 'Routes',
             cmrsList: 'External CMRs list',
-            RouteList: 'List'
+            RouteList: 'List',
+            create: 'Create',
+            basicData: 'Basic Data'
         },
         cmr: {
             list: {
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index f5a7483f4..970f23231 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -806,7 +806,9 @@ export default {
         pageTitles: {
             routes: 'Rutas',
             cmrsList: 'Listado de CMRs externos',
-            RouteList: 'Listado'
+            RouteList: 'Listado',
+            create: 'Crear',
+            basicData: 'Datos básicos',
         },
         cmr: {
             list: {
diff --git a/src/pages/Route/Card/RouteCard.vue b/src/pages/Route/Card/RouteCard.vue
new file mode 100644
index 000000000..2082b67df
--- /dev/null
+++ b/src/pages/Route/Card/RouteCard.vue
@@ -0,0 +1,21 @@
+<script setup>
+import { useStateStore } from 'stores/useStateStore';
+import LeftMenu from 'components/LeftMenu.vue';
+// import ShelvingDescriptor from 'pages/Shelving/Card/ShelvingDescriptor.vue';
+
+const stateStore = useStateStore();
+</script>
+<template>
+    <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
+        <QScrollArea class="fit">
+            <!--            <ShelvingDescriptor />-->
+            <QSeparator />
+            <LeftMenu source="card" />
+        </QScrollArea>
+    </QDrawer>
+    <QPageContainer>
+        <QPage>
+            <RouterView></RouterView>
+        </QPage>
+    </QPageContainer>
+</template>
diff --git a/src/pages/Route/Card/RouteForm.vue b/src/pages/Route/Card/RouteForm.vue
new file mode 100644
index 000000000..00ea18f4f
--- /dev/null
+++ b/src/pages/Route/Card/RouteForm.vue
@@ -0,0 +1,215 @@
+<script setup>
+import { useI18n } from 'vue-i18n';
+import { ref } from 'vue';
+import { useRoute, useRouter } from 'vue-router';
+import VnRow from 'components/ui/VnRow.vue';
+import FetchData from 'components/FetchData.vue';
+import FormModel from 'components/FormModel.vue';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
+import VnSelectFilter from 'components/common/VnSelectFilter.vue';
+import VnInputDate from 'components/common/VnInputDate.vue';
+import VnInput from 'components/common/VnInput.vue';
+import axios from 'axios';
+import VnInputTime from 'components/common/VnInputTime.vue';
+
+const { t } = useI18n();
+const route = useRoute();
+const router = useRouter();
+const shelvingId = route.params?.id || null;
+const isNew = Boolean(!shelvingId);
+const defaultInitialData = {
+    agencyModeFk: null,
+    created: null,
+    description: '',
+    vehicleFk: null,
+    workerFk: null,
+};
+
+const workerList = ref([]);
+const agencyList = ref([]);
+const vehicleList = ref([]);
+
+const routeFilter = {
+    fields: [
+        'id',
+        'workerFk',
+        'agencyModeFk',
+        'created',
+        'm3',
+        'warehouseFk',
+        'description',
+        'vehicleFk',
+        'kmStart',
+        'kmEnd',
+        'started',
+        'finished',
+        'cost',
+        'zoneFk',
+        'isOk',
+    ],
+    include: [
+        { relation: 'agencyMode', scope: { fields: ['id', 'name'] } },
+        {
+            relation: 'vehicle',
+            scope: { fields: ['id', 'm3'] },
+        },
+        { relation: 'zone', scope: { fields: ['id', 'name'] } },
+        {
+            relation: 'worker',
+            scope: {
+                fields: ['id'],
+                include: {
+                    relation: 'user',
+                    scope: {
+                        fields: ['id'],
+                        include: { relation: 'emailUser', scope: { fields: ['email'] } },
+                    },
+                },
+            },
+        },
+    ],
+};
+const onSave = (data, response) => {
+    if (isNew) {
+        axios.post(`Routes/${response.data?.id}/updateWorkCenter`);
+        // TODO: Add summary
+        // router.push({ name: 'RouteSummary', params: { id: response.data?.id } });
+    }
+};
+</script>
+<template>
+    <VnSubToolbar />
+    <FetchData
+        url="Workers/search"
+        :filter="{ fields: ['id', 'nickname'] }"
+        sort-by="nickname ASC"
+        limit="30"
+        @on-fetch="(data) => (workerList = data)"
+        auto-load
+    />
+    <FetchData
+        url="AgencyModes/isActive"
+        :filter="{ fields: ['id', 'name'] }"
+        sort-by="name ASC"
+        limit="30"
+        @on-fetch="(data) => (agencyList = data)"
+        auto-load
+    />
+    <FetchData
+        url="Vehicles"
+        :filter="{ fields: ['id', 'numberPlate'] }"
+        sort-by="numberPlate ASC"
+        limit="30"
+        @on-fetch="(data) => (vehicleList = data)"
+        auto-load
+    />
+    <FormModel
+        :url="isNew ? null : `Routes/${shelvingId}`"
+        :url-create="isNew ? 'Routes' : null"
+        :observe-form-changes="!isNew"
+        :filter="routeFilter"
+        model="route"
+        :auto-load="!isNew"
+        :form-initial-data="defaultInitialData"
+        @on-data-saved="onSave"
+    >
+        <template #form="{ data }">
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnSelectFilter
+                        :label="t('Worker')"
+                        v-model="data.workerFk"
+                        :options="workerList"
+                        option-value="id"
+                        option-label="nickname"
+                        emit-value
+                        map-options
+                        use-input
+                        :input-debounce="0"
+                    >
+                        <template #option="{ itemProps, opt }">
+                            <QItem v-bind="itemProps">
+                                <QItemSection>
+                                    <QItemLabel>{{ opt.name }}</QItemLabel>
+                                    <QItemLabel caption>
+                                        {{ opt.nickname }},{{ opt.code }}
+                                    </QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelectFilter>
+                </div>
+                <div class="col">
+                    <VnSelectFilter
+                        :label="t('Vehicle')"
+                        v-model="data.vehicleFk"
+                        :options="vehicleList"
+                        option-value="id"
+                        option-label="numberPlate"
+                        emit-value
+                        map-options
+                        use-input
+                        :input-debounce="0"
+                    />
+                </div>
+            </VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnSelectFilter
+                        :label="t('Agency')"
+                        v-model="data.agencyModeFk"
+                        :options="agencyList"
+                        option-value="id"
+                        option-label="name"
+                        emit-value
+                        map-options
+                        use-input
+                        :input-debounce="0"
+                    />
+                </div>
+                <div class="col">
+                    <VnInputDate v-model="data.created" :label="t('Created')" />
+                </div>
+            </VnRow>
+            <template v-if="!isNew">
+                <VnRow class="row q-gutter-md q-mb-md">
+                    <div class="col">
+                        <VnInput
+                            v-model="data.kmStart"
+                            :label="t('Km Start')"
+                            clearable
+                        />
+                    </div>
+                    <div class="col">
+                        <VnInput v-model="data.kmEnd" :label="t('Km End')" clearable />
+                    </div>
+                </VnRow>
+                <VnRow class="row q-gutter-md q-mb-md">
+                    <div class="col">
+                        <VnInputTime
+                            v-model="data.started"
+                            :label="t('Hour started')"
+                            clearable
+                        />
+                    </div>
+                    <div class="col">
+                        <VnInputTime
+                            v-model="data.finished"
+                            :label="t('Hour finished')"
+                            clearable
+                        />
+                    </div>
+                </VnRow>
+            </template>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnInput
+                        v-model="data.description"
+                        :label="t('Description')"
+                        clearable
+                    />
+                </div>
+            </VnRow>
+        </template>
+    </FormModel>
+</template>
diff --git a/src/pages/Route/RouteList.vue b/src/pages/Route/RouteList.vue
index ddf3e1a12..3dcc0af37 100644
--- a/src/pages/Route/RouteList.vue
+++ b/src/pages/Route/RouteList.vue
@@ -371,14 +371,14 @@ const updateWorker = (row, worker) => {
                 </QTable>
             </template>
         </VnPaginate>
-        <!--        <QPageSticky :offset="[20, 20]">-->
-        <!--            <RouterLink :to="{ name: 'ShelvingCreate' }">-->
-        <!--                <QBtn fab icon="add" color="primary" />-->
-        <!--                <QTooltip>-->
-        <!--                    {{ t('shelving.list.newShelving') }}-->
-        <!--                </QTooltip>-->
-        <!--            </RouterLink>-->
-        <!--        </QPageSticky>-->
+        <QPageSticky :offset="[20, 20]">
+            <RouterLink :to="{ name: 'RouteCreate' }">
+                <QBtn fab icon="add" color="primary" />
+                <QTooltip>
+                    {{ t('newRoute') }}
+                </QTooltip>
+            </RouterLink>
+        </QPageSticky>
     </QPage>
 </template>
 
@@ -389,6 +389,8 @@ const updateWorker = (row, worker) => {
 }
 </style>
 <i18n>
+en:
+    newRoute: New Route
 es:
     ID: ID
     Worker: Trabajador
@@ -398,4 +400,5 @@ es:
     Description: Descripción
     Hour started: Hora inicio
     Hour finished: Hora fin
+    newRoute: Nueva Ruta
 </i18n>
diff --git a/src/router/modules/route.js b/src/router/modules/route.js
index 70c92f84b..f6553a4f1 100644
--- a/src/router/modules/route.js
+++ b/src/router/modules/route.js
@@ -38,6 +38,32 @@ export default {
                     },
                     component: () => import('src/pages/Route/RouteList.vue'),
                 },
+                {
+                    path: 'create',
+                    name: 'RouteCreate',
+                    meta: {
+                        title: 'create',
+                    },
+                    component: () => import('src/pages/Route/Card/RouteForm.vue'),
+                },
+            ],
+        },
+        {
+            name: 'RouteCard',
+            path: ':id',
+            component: () => import('src/pages/Route/Card/RouteCard.vue'),
+            // TODO: Add summary
+            redirect: { name: 'RouteBasicData' },
+            children: [
+                {
+                    name: 'RouteBasicData',
+                    path: 'basic-data',
+                    meta: {
+                        title: 'basicData',
+                        icon: 'vn:settings',
+                    },
+                    component: () => import('pages/Route/Card/RouteForm.vue'),
+                },
             ],
         },
     ],

From 3671a7b449137eabaa1a986a5a8aeaa97cb1d62e Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Wed, 17 Jan 2024 10:45:58 -0300
Subject: [PATCH 43/94] Entry descriptor

---
 src/components/ui/CardDescriptor.vue          |   3 +-
 src/i18n/en/index.js                          |   5 +
 src/i18n/es/index.js                          |   5 +
 src/pages/Entry/Card/EntryCard.vue            |  26 ++-
 src/pages/Entry/Card/EntryDescriptor.vue      | 165 ++++++++++++++++++
 src/pages/Entry/Card/EntryDescriptorProxy.vue |  16 ++
 src/pages/Entry/EntryList.vue                 |  19 --
 src/pages/Entry/EntryMain.vue                 |  21 ++-
 8 files changed, 235 insertions(+), 25 deletions(-)
 create mode 100644 src/pages/Entry/Card/EntryDescriptor.vue
 create mode 100644 src/pages/Entry/Card/EntryDescriptorProxy.vue

diff --git a/src/components/ui/CardDescriptor.vue b/src/components/ui/CardDescriptor.vue
index 5c911a08e..9571c742e 100644
--- a/src/components/ui/CardDescriptor.vue
+++ b/src/components/ui/CardDescriptor.vue
@@ -1,8 +1,7 @@
 <script setup>
-import { onMounted, useSlots, ref, watch, computed } from 'vue';
+import { onMounted, useSlots, watch, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
-import axios from 'axios';
 import SkeletonDescriptor from 'components/ui/SkeletonDescriptor.vue';
 import { useArrayData } from 'composables/useArrayData';
 
diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index a1d237480..d5979121b 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -335,6 +335,11 @@ export default {
             buyingValue: 'Buying value',
             packagingFk: 'Box',
         },
+        descriptor: {
+            agency: 'Agency',
+            landed: 'Landed',
+            warehouseOut: 'Warehouse Out',
+        },
     },
     ticket: {
         pageTitles: {
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index 3aa9d350e..bd66bfbed 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -334,6 +334,11 @@ export default {
             buyingValue: 'Coste',
             packagingFk: 'Embalaje',
         },
+        descriptor: {
+            agency: 'Agency',
+            landed: 'F. entrega',
+            warehouseOut: 'Alm. salida',
+        },
     },
     ticket: {
         pageTitles: {
diff --git a/src/pages/Entry/Card/EntryCard.vue b/src/pages/Entry/Card/EntryCard.vue
index d4937e983..f6399cc0b 100644
--- a/src/pages/Entry/Card/EntryCard.vue
+++ b/src/pages/Entry/Card/EntryCard.vue
@@ -1,15 +1,29 @@
 <script setup>
-import { useStateStore } from 'stores/useStateStore';
+import { useI18n } from 'vue-i18n';
+
+import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 import LeftMenu from 'components/LeftMenu.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
+import EntryDescriptor from './EntryDescriptor.vue';
 
+import { useStateStore } from 'stores/useStateStore';
+
+const { t } = useI18n();
 const stateStore = useStateStore();
 </script>
 <template>
-    <!-- Entry searchbar -->
+    <template v-if="stateStore.isHeaderMounted()">
+        <Teleport to="#searchbar">
+            <VnSearchbar
+                data-key="EntryList"
+                :label="t('Search entries')"
+                :info="t('You can search by entry reference')"
+            />
+        </Teleport>
+    </template>
     <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
         <QScrollArea class="fit">
-            <!-- EntryDescriptor -->
+            <EntryDescriptor />
             <QSeparator />
             <LeftMenu source="card" />
         </QScrollArea>
@@ -22,3 +36,9 @@ const stateStore = useStateStore();
         </QPage>
     </QPageContainer>
 </template>
+
+<i18n>
+es:
+    Search entries: Buscar entradas
+    You can search by entry reference: Puedes buscar por referencia de la entrada
+</i18n>
diff --git a/src/pages/Entry/Card/EntryDescriptor.vue b/src/pages/Entry/Card/EntryDescriptor.vue
new file mode 100644
index 000000000..e4aaaf291
--- /dev/null
+++ b/src/pages/Entry/Card/EntryDescriptor.vue
@@ -0,0 +1,165 @@
+<script setup>
+import { ref, computed, onMounted } from 'vue';
+import { useRoute } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+
+import CardDescriptor from 'components/ui/CardDescriptor.vue';
+import VnLv from 'src/components/ui/VnLv.vue';
+import useCardDescription from 'src/composables/useCardDescription';
+
+import { toDate } from 'src/filters';
+
+const $props = defineProps({
+    id: {
+        type: Number,
+        required: false,
+        default: null,
+    },
+    summary: {
+        type: Object,
+        default: null,
+    },
+});
+
+const route = useRoute();
+const { t } = useI18n();
+
+const entryFilter = {
+    include: [
+        {
+            relation: 'travel',
+            scope: {
+                fields: ['id', 'landed', 'agencyModeFk', 'warehouseOutFk'],
+                include: [
+                    {
+                        relation: 'agency',
+                        scope: {
+                            fields: ['name'],
+                        },
+                    },
+                    {
+                        relation: 'warehouseOut',
+                        scope: {
+                            fields: ['name'],
+                        },
+                    },
+                    {
+                        relation: 'warehouseIn',
+                        scope: {
+                            fields: ['name'],
+                        },
+                    },
+                ],
+            },
+        },
+        {
+            relation: 'supplier',
+            scope: {
+                fields: ['id', 'nickname'],
+            },
+        },
+    ],
+};
+
+const getEntryRedirectionFilter = (entry) => {
+    let entryTravel = entry && entry.travel;
+
+    if (!entryTravel || !entryTravel.landed) return null;
+
+    const date = new Date(entryTravel.landed);
+    date.setHours(0, 0, 0, 0);
+
+    const from = new Date(date.getTime());
+    from.setDate(from.getDate() - 10);
+
+    const to = new Date(date.getTime());
+    to.setDate(to.getDate() + 10);
+
+    return JSON.stringify({
+        supplierFk: entry.supplierFk,
+        from,
+        to,
+    });
+};
+
+const entityId = computed(() => {
+    return $props.id || route.params.id;
+});
+
+const data = ref(useCardDescription());
+const setData = (entity) =>
+    (data.value = useCardDescription(entity.supplier.nickname, entity.id));
+</script>
+
+<template>
+    <CardDescriptor
+        module="Entry"
+        :url="`Entries/${entityId}`"
+        :filter="entryFilter"
+        :title="data.title"
+        :subtitle="data.subtitle"
+        @on-fetch="setData"
+        data-key="entryData"
+    >
+        <template #body="{ entity }">
+            <VnLv
+                :label="t('entry.descriptor.agency')"
+                :value="entity.travel.agency.name"
+            />
+            <VnLv
+                :label="t('entry.descriptor.landed')"
+                :value="toDate(entity.travel.landed)"
+            />
+            <VnLv
+                :label="t('entry.descriptor.warehouseOut')"
+                :value="entity.travel.warehouseOut.name"
+            />
+        </template>
+        <template #actions="{ entity }">
+            <QCardActions>
+                <QBtn
+                    :to="`/supplier/${entity.supplier.id}`"
+                    size="md"
+                    icon="vn:supplier"
+                    color="primary"
+                >
+                    <QTooltip>{{ t('Supplier card') }}</QTooltip>
+                </QBtn>
+                <QBtn
+                    :to="{
+                        name: 'TravelMain',
+                        query: {
+                            params: JSON.stringify({
+                                agencyModeFk: entity.travel?.agencyModeFk,
+                            }),
+                        },
+                    }"
+                    size="md"
+                    icon="local_airport"
+                    color="primary"
+                >
+                    <QTooltip>{{ t('All travels with current agency') }}</QTooltip>
+                </QBtn>
+                <QBtn
+                    :to="{
+                        name: 'EntryMain',
+                        query: {
+                            params: getEntryRedirectionFilter(entity),
+                        },
+                    }"
+                    size="md"
+                    icon="vn:entry"
+                    color="primary"
+                >
+                    <QTooltip>{{ t('All entries with current supplier') }}</QTooltip>
+                </QBtn>
+            </QCardActions>
+        </template>
+    </CardDescriptor>
+</template>
+<i18n>
+es:
+    Supplier card: Ficha del proveedor
+    All travels with current agency: Todos los envíos con la agencia actual
+    All entries with current supplier: Todas las entradas con el proveedor actual
+</i18n>
diff --git a/src/pages/Entry/Card/EntryDescriptorProxy.vue b/src/pages/Entry/Card/EntryDescriptorProxy.vue
new file mode 100644
index 000000000..e1c05f1ac
--- /dev/null
+++ b/src/pages/Entry/Card/EntryDescriptorProxy.vue
@@ -0,0 +1,16 @@
+<script setup>
+import EntryDescriptor from './EntryDescriptor.vue';
+
+const $props = defineProps({
+    id: {
+        type: Number,
+        required: true,
+    },
+});
+</script>
+
+<template>
+    <QPopupProxy>
+        <EntryDescriptor v-if="$props.id" :id="$props.id" />
+    </QPopupProxy>
+</template>
diff --git a/src/pages/Entry/EntryList.vue b/src/pages/Entry/EntryList.vue
index fc4f60ff0..49912e9da 100644
--- a/src/pages/Entry/EntryList.vue
+++ b/src/pages/Entry/EntryList.vue
@@ -1,28 +1,19 @@
 <script setup>
-import { onMounted, onUnmounted } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
 import { useQuasar } from 'quasar';
 
 import VnPaginate from 'src/components/ui/VnPaginate.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 EntrySummaryDialog from './Card/EntrySummaryDialog.vue';
 
-import { useStateStore } from 'stores/useStateStore';
 import { toDate } from 'src/filters/index';
 
-const stateStore = useStateStore();
 const router = useRouter();
 const quasar = useQuasar();
 const { t } = useI18n();
 
-onMounted(async () => {
-    stateStore.rightDrawer = true;
-});
-onUnmounted(() => (stateStore.rightDrawer = false));
-
 function navigate(id) {
     router.push({ path: `/entry/${id}` });
 }
@@ -42,16 +33,6 @@ function viewSummary(id) {
 </script>
 
 <template>
-    <template v-if="stateStore.isHeaderMounted()">
-        <Teleport to="#searchbar">
-            <VnSearchbar
-                data-key="EntryList"
-                :label="t('Search entries')"
-                :info="t('You can search by entry reference')"
-            />
-        </Teleport>
-    </template>
-
     <QPage class="column items-center q-pa-md">
         <div class="card-list">
             <VnPaginate
diff --git a/src/pages/Entry/EntryMain.vue b/src/pages/Entry/EntryMain.vue
index 66ce78f23..8fa17a899 100644
--- a/src/pages/Entry/EntryMain.vue
+++ b/src/pages/Entry/EntryMain.vue
@@ -1,11 +1,24 @@
 <script setup>
-import { useStateStore } from 'stores/useStateStore';
+import { useI18n } from 'vue-i18n';
 import LeftMenu from 'src/components/LeftMenu.vue';
+import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 
+import { useStateStore } from 'stores/useStateStore';
+
+const { t } = useI18n();
 const stateStore = useStateStore();
 </script>
 
 <template>
+    <template v-if="stateStore.isHeaderMounted()">
+        <Teleport to="#searchbar">
+            <VnSearchbar
+                data-key="EntryList"
+                :label="t('Search entries')"
+                :info="t('You can search by entry reference')"
+            />
+        </Teleport>
+    </template>
     <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
         <QScrollArea class="fit text-grey-8">
             <LeftMenu />
@@ -15,3 +28,9 @@ const stateStore = useStateStore();
         <RouterView></RouterView>
     </QPageContainer>
 </template>
+
+<i18n>
+es:
+    Search entries: Buscar entradas
+    You can search by entry reference: Puedes buscar por referencia de la entrada
+</i18n>

From 7753c365e4829c5696f647d5c6aa166c8dcaeab3 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Wed, 17 Jan 2024 10:53:52 -0300
Subject: [PATCH 44/94] Apply Entry descriptor to extra community table

---
 src/pages/Travel/ExtraCommunity.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/pages/Travel/ExtraCommunity.vue b/src/pages/Travel/ExtraCommunity.vue
index b9f4f002e..18824503f 100644
--- a/src/pages/Travel/ExtraCommunity.vue
+++ b/src/pages/Travel/ExtraCommunity.vue
@@ -9,6 +9,7 @@ import TravelDescriptorProxy from 'src/pages/Travel/Card/TravelDescriptorProxy.v
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 import ExtraCommunityFilter from './ExtraCommunityFilter.vue';
 import VnInput from 'src/components/common/VnInput.vue';
+import EntryDescriptorProxy from '../Entry/Card/EntryDescriptorProxy.vue';
 
 import { useStateStore } from 'stores/useStateStore';
 import { toCurrency } from 'src/filters';
@@ -231,7 +232,7 @@ const navigateToTravelId = (id) => {
 };
 
 const stopEventPropagation = (event, col) => {
-    if (!['ref', 'id', 'supplier'].includes(col.name)) return;
+    if (!['ref', 'id', 'cargoSupplierNickname'].includes(col.name)) return;
     event.preventDefault();
     event.stopPropagation();
 };
@@ -359,10 +360,9 @@ onMounted(async () => {
                     :props="props"
                     class="secondary-row"
                 >
-                    <QTd
-                        ><QBtn flat color="blue" class="col-content">{{ entry.id }}</QBtn>
-                        <!-- Cuando se cree el modulo relacionado a entries, crear su descriptor y colocarlo acá -->
-                        <!-- <EntryDescriptorProxy :id="entry.id"/> -->
+                    <QTd>
+                        <QBtn flat color="blue" class="col-content">{{ entry.id }} </QBtn>
+                        <EntryDescriptorProxy :id="entry.id" />
                     </QTd>
                     <QTd
                         ><QBtn flat color="blue" class="col-content">{{

From c584eaf72363ac27bc919a60727287f6650bd91b Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 17 Jan 2024 14:59:16 +0100
Subject: [PATCH 45/94] refs #6694 feat change request params filters

---
 src/components/common/VnLocation.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/common/VnLocation.vue b/src/components/common/VnLocation.vue
index b321b731a..add5ff19b 100644
--- a/src/components/common/VnLocation.vue
+++ b/src/components/common/VnLocation.vue
@@ -67,10 +67,10 @@ function showLabel(data) {
        return `${data.code} - ${data.town}(${data.province}), ${data.country}`;
 }
 
-function locationFilter(value) {
+function locationFilter(search) {
     let where = { limit: 30 };
-    const params = { value };
-    postcodesRef.value.fetch({ where: Object.assign(where, params) });
+    const params = { search };
+    postcodesRef.value.fetch({ where, args: params });
 }
 function handleFetch( data) {
      postcodesOptions.value = data;

From 655c8210751f819ad4aff1480f94e57f73e22931 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 17 Jan 2024 15:01:31 +0100
Subject: [PATCH 46/94] refs #6694 feat input-debounce

---
 src/components/common/VnLocation.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/common/VnLocation.vue b/src/components/common/VnLocation.vue
index add5ff19b..072b08094 100644
--- a/src/components/common/VnLocation.vue
+++ b/src/components/common/VnLocation.vue
@@ -100,6 +100,7 @@ function handleFetch( data) {
         :class="{ required: $attrs.required }"
         @input-value="locationFilter"
         :default-filter="false"
+        :input-debounce="100"
     >
         <template #form>
             <CreateNewPostcode @on-data-saved="onPostcodeCreated($event)" />

From ecea050b7779acd040b66a36e087e5dee3409cdf Mon Sep 17 00:00:00 2001
From: Kevin Martinez <kevin.martinez@mindshore.io>
Date: Wed, 17 Jan 2024 10:24:09 -0400
Subject: [PATCH 47/94] Add route list actions

---
 src/pages/Route/RouteList.vue | 73 ++++++++++++++++++++++++++++++++++-
 1 file changed, 71 insertions(+), 2 deletions(-)

diff --git a/src/pages/Route/RouteList.vue b/src/pages/Route/RouteList.vue
index 3dcc0af37..5dd82cc51 100644
--- a/src/pages/Route/RouteList.vue
+++ b/src/pages/Route/RouteList.vue
@@ -129,6 +129,28 @@ const updateWorker = (row, worker) => {
     row.workerUserName = worker.name;
     updateRoute(row);
 };
+
+const confirmationDialog = ref(false);
+const startingDate = ref(null);
+
+const cloneRoutes = () => {
+    axios.post('Routes/clone', {
+        created: startingDate.value,
+        ids: selectedRows.value.map((row) => row?.id),
+    });
+    refreshKey.value++;
+    startingDate.value = null;
+};
+
+const markAsServed = () => {
+    selectedRows.value.forEach((row) => {
+        if (row?.id) {
+            axios.patch(`Routes/${row?.id}`, { isOk: true });
+        }
+    });
+    refreshKey.value++;
+    startingDate.value = null;
+};
 </script>
 
 <template>
@@ -152,6 +174,28 @@ const updateWorker = (row, worker) => {
             </div>
         </Teleport>
     </template>
+    <QDialog v-model="confirmationDialog">
+        <QCard style="min-width: 350px">
+            <QCardSection>
+                <p class="text-h6 q-ma-none">{{ t('Select the starting date') }}</p>
+            </QCardSection>
+
+            <QCardSection class="q-pt-none">
+                <VnInputDate
+                    :label="t('Stating date')"
+                    v-model="startingDate"
+                    autofocus
+                />
+            </QCardSection>
+
+            <QCardActions align="right">
+                <QBtn flat :label="t('Cancel')" v-close-popup class="text-primary" />
+                <QBtn color="primary" v-close-popup @click="cloneRoutes">
+                    {{ t('Clone') }}
+                </QBtn>
+            </QCardActions>
+        </QCard>
+    </QDialog>
     <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
         <QScrollArea class="fit text-grey-8">
             <RouteFilter data-key="RouteList" />
@@ -165,7 +209,26 @@ const updateWorker = (row, worker) => {
     <FetchData url="AgencyModes" @on-fetch="(data) => (agencyList = data)" auto-load />
     <FetchData url="Vehicles" @on-fetch="(data) => (vehicleList = data)" auto-load />
     <QPage class="column items-center q-pa-md">
-        <QToolbar class="q-pa-none q-mb-sm justify-end">
+        <QToolbar
+            :class="[
+                'q-pa-none q-mb-sm',
+                selectedRows?.length ? 'justify-between' : 'justify-end',
+            ]"
+        >
+            <div v-if="selectedRows?.length">
+                <QBtn
+                    icon="vn:clone"
+                    color="primary"
+                    class="q-mr-sm"
+                    @click="confirmationDialog = true"
+                >
+                    <QTooltip>{{ t('Clone Selected Routes') }}</QTooltip>
+                </QBtn>
+
+                <QBtn icon="check" color="primary" class="q-mr-sm" @click="markAsServed">
+                    <QTooltip>{{ t('Mark as served') }}</QTooltip>
+                </QBtn>
+            </div>
             <QBtn icon="refresh" color="primary" class="q-mr-sm" @click="refreshKey++" />
         </QToolbar>
         <VnPaginate
@@ -183,8 +246,8 @@ const updateWorker = (row, worker) => {
                     :rows="rows"
                     flat
                     row-key="id"
-                    hide-pagination
                     selection="multiple"
+                    :rows-per-page-options="[0]"
                 >
                     <template #body-cell-worker="props">
                         <QTd :props="props">
@@ -401,4 +464,10 @@ es:
     Hour started: Hora inicio
     Hour finished: Hora fin
     newRoute: Nueva Ruta
+    Clone Selected Routes: Clonar rutas seleccionadas
+    Select the starting date: Seleccione la fecha de inicio
+    Stating date: Fecha de inicio
+    Cancel: Cancelar
+    Clone: Clonar
+    Mark as served: Marcar como servidas
 </i18n>

From 9cd1f542aaa7a673cc47822ebb2f55029967e59d Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Wed, 17 Jan 2024 13:02:44 -0300
Subject: [PATCH 48/94] WIP

---
 src/pages/Entry/EntryFilter.vue | 215 ++++++++++++++++++++++++++++++++
 src/pages/Entry/EntryList.vue   |  13 ++
 2 files changed, 228 insertions(+)
 create mode 100644 src/pages/Entry/EntryFilter.vue

diff --git a/src/pages/Entry/EntryFilter.vue b/src/pages/Entry/EntryFilter.vue
new file mode 100644
index 000000000..cce512299
--- /dev/null
+++ b/src/pages/Entry/EntryFilter.vue
@@ -0,0 +1,215 @@
+<script setup>
+import { ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
+import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import FetchData from 'components/FetchData.vue';
+import VnInputDate from 'src/components/common/VnInputDate.vue';
+
+const { t } = useI18n();
+const props = defineProps({
+    dataKey: {
+        type: String,
+        required: true,
+    },
+});
+
+const currenciesOptions = ref([]);
+const companiesOptions = ref([]);
+const suppliersOptions = ref([]);
+</script>
+
+<template>
+    <FetchData
+        ref="companiesRef"
+        url="Companies"
+        :filter="{ fields: ['id', 'code'] }"
+        order="code"
+        @on-fetch="(data) => (companiesOptions = data)"
+        auto-load
+    />
+    <FetchData
+        ref="currenciesRef"
+        url="Currencies"
+        :filter="{ fields: ['id', 'name'] }"
+        order="code"
+        @on-fetch="(data) => (currenciesOptions = data)"
+        auto-load
+    />
+    <FetchData
+        url="Suppliers"
+        :filter="{ fields: ['id', 'nickname', 'name'] }"
+        order="nickname"
+        @on-fetch="(data) => (suppliersOptions = data)"
+        auto-load
+    />
+
+    <VnFilterPanel :data-key="props.dataKey" :search-button="true">
+        <template #tags="{ tag, formatFn }">
+            <div class="q-gutter-x-xs">
+                <strong>{{ t(`params.${tag.label}`) }}: </strong>
+                <span>{{ formatFn(tag.value) }}</span>
+            </div>
+        </template>
+        <template #body="{ params }">
+            <QList dense class="list q-gutter-y-sm q-mt-sm">
+                <QItem>
+                    <QItemSection>
+                        <VnInput
+                            v-model="params.search"
+                            :label="t('params.search')"
+                            is-outlined
+                        />
+                    </QItemSection>
+                </QItem>
+                <QItem>
+                    <QItemSection>
+                        <VnInput
+                            v-model="params.reference"
+                            :label="t('params.reference')"
+                            is-outlined
+                        />
+                    </QItemSection>
+                </QItem>
+                <QItem>
+                    <QItemSection>
+                        <VnInput
+                            v-model="params.invoiceNumber"
+                            :label="t('params.invoiceNumber')"
+                            is-outlined
+                        />
+                    </QItemSection>
+                </QItem>
+                <QItem>
+                    <QItemSection>
+                        <VnInput
+                            v-model="params.travelFk"
+                            :label="t('params.travelFk')"
+                            is-outlined
+                        />
+                    </QItemSection>
+                </QItem>
+                <QItem>
+                    <QItemSection>
+                        <VnSelectFilter
+                            :label="t('params.companyFk')"
+                            v-model="params.companyFk"
+                            :options="companiesOptions"
+                            option-value="id"
+                            option-label="code"
+                            hide-selected
+                            dense
+                            outlined
+                            rounded
+                        />
+                    </QItemSection>
+                </QItem>
+                <QItem>
+                    <QItemSection>
+                        <VnSelectFilter
+                            :label="t('params.currencyFk')"
+                            v-model="params.currencyFk"
+                            :options="currenciesOptions"
+                            option-value="id"
+                            option-label="name"
+                            hide-selected
+                            dense
+                            outlined
+                            rounded
+                        />
+                    </QItemSection>
+                </QItem>
+                <QItem>
+                    <QItemSection>
+                        <VnSelectFilter
+                            :label="t('params.supplierFk')"
+                            v-model="params.supplierFk"
+                            :options="suppliersOptions"
+                            option-value="id"
+                            option-label="name"
+                            hide-selected
+                            dense
+                            outlined
+                            rounded
+                        >
+                            <template #option="scope">
+                                <QItem v-bind="scope.itemProps">
+                                    <QItemSection>
+                                        <QItemLabel>{{
+                                            scope.opt?.name + ': ' + scope.opt?.nickname
+                                        }}</QItemLabel>
+                                    </QItemSection>
+                                </QItem>
+                            </template>
+                        </VnSelectFilter>
+                    </QItemSection>
+                </QItem>
+                <QItem>
+                    <QItemSection>
+                        <VnInputDate
+                            :label="t('params.created')"
+                            is-outlined
+                            v-model="params.created"
+                        />
+                    </QItemSection>
+                </QItem>
+                <QItem>
+                    <QItemSection>
+                        <VnInputDate
+                            :label="t('params.from')"
+                            is-outlined
+                            v-model="params.from"
+                        />
+                    </QItemSection>
+                </QItem>
+                <QItem>
+                    <QItemSection>
+                        <VnInputDate
+                            :label="t('params.to')"
+                            is-outlined
+                            v-model="params.to"
+                        />
+                    </QItemSection>
+                </QItem>
+            </QList>
+        </template>
+    </VnFilterPanel>
+</template>
+
+<style scoped>
+.list {
+    width: 256px;
+}
+.list * {
+    max-width: 100%;
+}
+</style>
+
+<i18n>
+en:
+    params:
+        search: General search
+        reference: Reference
+        invoiceNumber: Invoice number
+        travelFk: Travel
+        companyFk: Company
+        currencyFk: Currency
+        supplierFk: Supplier
+        from: From
+        to: To
+        created: Created
+es:
+    params:
+        search: Búsqueda general
+        reference: Referencia
+        invoiceNumber: Núm. factura
+        travelFk: Envío
+        companyFk: Empresa
+        currencyFk: Moneda
+        supplierFk: Proveedor
+        from: Desde
+        to: Hasta
+        created: Fecha creación
+</i18n>
diff --git a/src/pages/Entry/EntryList.vue b/src/pages/Entry/EntryList.vue
index 49912e9da..40747178c 100644
--- a/src/pages/Entry/EntryList.vue
+++ b/src/pages/Entry/EntryList.vue
@@ -1,4 +1,5 @@
 <script setup>
+import { onMounted } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
 import { useQuasar } from 'quasar';
@@ -7,9 +8,12 @@ import VnPaginate from 'src/components/ui/VnPaginate.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import CardList from 'src/components/ui/CardList.vue';
 import EntrySummaryDialog from './Card/EntrySummaryDialog.vue';
+import EntryFilter from './EntryFilter.vue';
 
+import { useStateStore } from 'stores/useStateStore';
 import { toDate } from 'src/filters/index';
 
+const stateStore = useStateStore();
 const router = useRouter();
 const quasar = useQuasar();
 const { t } = useI18n();
@@ -30,9 +34,18 @@ function viewSummary(id) {
         },
     });
 }
+
+onMounted(async () => {
+    stateStore.rightDrawer = true;
+});
 </script>
 
 <template>
+    <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
+        <QScrollArea class="fit text-grey-8">
+            <EntryFilter data-key="EntryList" />
+        </QScrollArea>
+    </QDrawer>
     <QPage class="column items-center q-pa-md">
         <div class="card-list">
             <VnPaginate

From a06f9a279ef7906487526985e45cc55057d30d0e Mon Sep 17 00:00:00 2001
From: carlosfonseca <carlos.fonseca@mindshore.io>
Date: Wed, 17 Jan 2024 11:52:11 -0500
Subject: [PATCH 49/94] Se hacen correcciones solicitadas

---
 .../components/CustomerConsigneeCreate.vue    | 19 +++++++++++++------
 .../components/CustomerConsigneeEdit.vue      | 11 ++++++++++-
 .../components/CustomerNewCustomsAgent.vue    |  2 ++
 .../components/CustomerNoteCreate.vue         | 14 +++++++++++++-
 4 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/src/pages/Customer/components/CustomerConsigneeCreate.vue b/src/pages/Customer/components/CustomerConsigneeCreate.vue
index f35ee8ea4..aadf554b3 100644
--- a/src/pages/Customer/components/CustomerConsigneeCreate.vue
+++ b/src/pages/Customer/components/CustomerConsigneeCreate.vue
@@ -3,6 +3,8 @@ import { onBeforeMount, reactive, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 
+import axios from 'axios';
+
 import FetchData from 'components/FetchData.vue';
 import FormModel from 'components/FormModel.vue';
 import VnRow from 'components/ui/VnRow.vue';
@@ -42,6 +44,7 @@ const customsAgents = ref([]);
 
 onBeforeMount(() => {
     urlCreate.value = `Clients/${route.params.id}/createAddress`;
+    getCustomsAgents();
 });
 
 const onPostcodeCreated = async ({ code, provinceFk, townFk }, formData) => {
@@ -51,6 +54,15 @@ const onPostcodeCreated = async ({ code, provinceFk, townFk }, formData) => {
     formData.provinceFk = provinceFk;
     formData.city = citiesLocationOptions.value.find((town) => town.id === townFk).name;
 };
+
+const getCustomsAgents = async () => {
+    const { data } = await axios.get('CustomsAgents');
+    customsAgents.value = data;
+};
+
+const refreshData = () => {
+    getCustomsAgents();
+};
 </script>
 
 <template>
@@ -77,11 +89,6 @@ const onPostcodeCreated = async ({ code, provinceFk, townFk }, formData) => {
         url="AgencyModes/isActive"
     />
     <fetch-data @on-fetch="(data) => (incoterms = data)" auto-load url="Incoterms" />
-    <fetch-data
-        @on-fetch="(data) => (customsAgents = data)"
-        auto-load
-        url="CustomsAgents"
-    />
 
     <FormModel
         :form-initial-data="formInitialData"
@@ -226,7 +233,7 @@ const onPostcodeCreated = async ({ code, provinceFk, townFk }, formData) => {
                         v-model="data.customsAgentFk"
                     >
                         <template #form>
-                            <CustomsNewCustomsAgent />
+                            <CustomsNewCustomsAgent @on-data-saved="refreshData()" />
                         </template>
                     </VnSelectCreate>
                 </div>
diff --git a/src/pages/Customer/components/CustomerConsigneeEdit.vue b/src/pages/Customer/components/CustomerConsigneeEdit.vue
index be70b3a82..ca7dbfde9 100644
--- a/src/pages/Customer/components/CustomerConsigneeEdit.vue
+++ b/src/pages/Customer/components/CustomerConsigneeEdit.vue
@@ -90,6 +90,14 @@ const addNote = () => {
 const deleteNote = (index) => {
     notes.value.splice(index, 1);
 };
+
+const onDataSaved = () => {
+    const payload = {
+        creates: notes.value,
+    };
+    console.log(payload);
+    axios.post('AddressObservations/crud', payload);
+};
 </script>
 
 <template>
@@ -124,9 +132,10 @@ const deleteNote = (index) => {
     <fetch-data @on-fetch="getData" auto-load url="ObservationTypes" />
 
     <FormModel
+        :observe-form-changes="false"
         :url-update="urlUpdate"
         :url="`Addresses/${route.params.consigneeId}`"
-        @on-fetch="onFetch()"
+        @on-data-saved="onDataSaved()"
         auto-load
         model="client"
     >
diff --git a/src/pages/Customer/components/CustomerNewCustomsAgent.vue b/src/pages/Customer/components/CustomerNewCustomsAgent.vue
index b8b83e763..341b25351 100644
--- a/src/pages/Customer/components/CustomerNewCustomsAgent.vue
+++ b/src/pages/Customer/components/CustomerNewCustomsAgent.vue
@@ -18,6 +18,8 @@ const initialData = reactive({
 });
 
 const onDataSaved = (dataSaved) => {
+    console.log('onDataSaved()');
+    console.log(dataSaved);
     emit('onDataSaved', dataSaved);
 };
 </script>
diff --git a/src/pages/Customer/components/CustomerNoteCreate.vue b/src/pages/Customer/components/CustomerNoteCreate.vue
index 7dde8f11e..79f6e9576 100644
--- a/src/pages/Customer/components/CustomerNoteCreate.vue
+++ b/src/pages/Customer/components/CustomerNoteCreate.vue
@@ -1,13 +1,14 @@
 <script setup>
 import { onMounted, reactive } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { useRoute } from 'vue-router';
+import { useRoute, useRouter } from 'vue-router';
 
 import FormModel from 'components/FormModel.vue';
 import VnRow from 'components/ui/VnRow.vue';
 
 const { t } = useI18n();
 const route = useRoute();
+const router = useRouter();
 
 const initialData = reactive({
     text: null,
@@ -16,6 +17,16 @@ const initialData = reactive({
 onMounted(() => {
     initialData.clientFk = `${route.params.id}`;
 });
+
+const toCustomerNotes = () => {
+    console.log('toCustomerNotes()');
+    router.push({
+        name: 'CustomerNotes',
+        params: {
+            id: route.params.id,
+        },
+    });
+};
 </script>
 
 <template>
@@ -23,6 +34,7 @@ onMounted(() => {
         :form-initial-data="initialData"
         :observe-form-changes="false"
         url-create="ClientObservations"
+        @on-data-saved="toCustomerNotes()"
     >
         <template #form="{ data }">
             <VnRow class="row q-gutter-md q-mb-md">

From 91e36e640402b2b416236cf1047fabb9b655e538 Mon Sep 17 00:00:00 2001
From: carlosfonseca <carlos.fonseca@mindshore.io>
Date: Wed, 17 Jan 2024 13:45:01 -0500
Subject: [PATCH 50/94] Se crea la tarjeta de creditos, listado y creacion

---
 src/pages/Customer/Card/CustomerCredits.vue   | 153 +++++++++++++++++-
 .../ExtendedList/CustomerExtendedList.vue     |   1 -
 .../components/CustomerConsigneeEdit.vue      |   1 -
 .../components/CustomerCreditCreate.vue       |  51 ++++++
 .../components/CustomerNewCustomsAgent.vue    |   2 -
 .../components/CustomerNoteCreate.vue         |   1 -
 src/router/modules/customer.js                |  32 +++-
 7 files changed, 228 insertions(+), 13 deletions(-)
 create mode 100644 src/pages/Customer/components/CustomerCreditCreate.vue

diff --git a/src/pages/Customer/Card/CustomerCredits.vue b/src/pages/Customer/Card/CustomerCredits.vue
index e8a4c3b48..baa33a548 100644
--- a/src/pages/Customer/Card/CustomerCredits.vue
+++ b/src/pages/Customer/Card/CustomerCredits.vue
@@ -1,3 +1,154 @@
+<script setup>
+import { ref, computed, onBeforeMount, onMounted } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useRouter } from 'vue-router';
+
+import { QBtn } from 'quasar';
+
+import { toCurrency, toDate } from 'src/filters';
+import { useArrayData } from 'composables/useArrayData';
+import { useStateStore } from 'stores/useStateStore';
+
+import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
+
+const { t } = useI18n();
+const router = useRouter();
+const stateStore = useStateStore();
+
+const arrayData = ref(null);
+const workerId = ref(0);
+
+onBeforeMount(async () => {
+    const filter = {
+        include: [
+            {
+                relation: 'worker',
+                scope: {
+                    fields: ['id'],
+                    include: { relation: 'user', scope: { fields: ['name'] } },
+                },
+            },
+        ],
+        where: { clientFk: '1' },
+        order: ['created DESC'],
+        limit: 20,
+    };
+    arrayData.value = useArrayData('CustomerCreditsCard', {
+        url: 'ClientCredits',
+        filter,
+    });
+    await arrayData.value.fetch({ append: false });
+    stateStore.rightDrawer = true;
+});
+
+onMounted(() => {
+    const filteredColumns = columns.value.filter(
+        (col) => col.name !== 'actions' && col.name !== 'customerStatus'
+    );
+    allColumnNames.value = filteredColumns.map((col) => col.name);
+});
+
+const rows = computed(() => arrayData.value.store.data);
+const allColumnNames = ref([]);
+
+const tableColumnComponents = {
+    created: {
+        component: 'span',
+        props: () => {},
+        event: () => {},
+    },
+    employee: {
+        component: QBtn,
+        props: () => ({ flat: true, color: 'blue' }),
+        event: (prop) => {
+            selectWorkerId(prop.row.clientFk);
+        },
+    },
+    amount: {
+        component: 'span',
+        props: () => {},
+        event: () => {},
+    },
+};
+
+const columns = computed(() => [
+    {
+        align: 'left',
+        field: 'created',
+        label: t('Since'),
+        name: 'created',
+        format: (value) => toDate(value),
+    },
+    {
+        align: 'left',
+        field: (value) => value.worker.user.name,
+        label: t('Employee'),
+        name: 'employee',
+    },
+    {
+        align: 'left',
+        field: 'amount',
+        label: t('Credit'),
+        name: 'amount',
+        format: (value) => toCurrency(value),
+    },
+]);
+
+const selectWorkerId = (id) => {
+    workerId.value = id;
+};
+
+const toCustomerCreditCreate = () => {
+    router.push({ name: 'CustomerCreditCreate' });
+};
+</script>
+
 <template>
-    <div class="flex justify-center">Credits</div>
+    <QPage class="column items-center q-pa-md">
+        <QTable
+            :columns="columns"
+            :pagination="{ rowsPerPage: 12 }"
+            :rows="rows"
+            class="full-width q-mt-md"
+            row-key="id"
+        >
+            <template #body-cell="props">
+                <QTd :props="props">
+                    <QTr :props="props" class="cursor-pointer">
+                        <component
+                            :is="tableColumnComponents[props.col.name].component"
+                            class="col-content"
+                            v-bind="tableColumnComponents[props.col.name].props(props)"
+                            @click="tableColumnComponents[props.col.name].event(props)"
+                        >
+                            {{ props.value }}
+                            <WorkerDescriptorProxy :id="workerId" />
+                        </component>
+                    </QTr>
+                </QTd>
+            </template>
+        </QTable>
+    </QPage>
+
+    <QPageSticky :offset="[18, 18]">
+        <QBtn @click.stop="toCustomerCreditCreate()" color="primary" fab icon="add" />
+        <QTooltip>
+            {{ t('New credit') }}
+        </QTooltip>
+    </QPageSticky>
 </template>
+
+<style lang="scss" scoped>
+.col-content {
+    border-radius: 4px;
+    padding: 6px;
+}
+</style>
+
+<i18n>
+es:
+    Since: Desde
+    Employee: Empleado
+    Credit: Credito
+    New credit: Nuevo credito
+</i18n>
diff --git a/src/pages/Customer/ExtendedList/CustomerExtendedList.vue b/src/pages/Customer/ExtendedList/CustomerExtendedList.vue
index caee06d60..65acf78a2 100644
--- a/src/pages/Customer/ExtendedList/CustomerExtendedList.vue
+++ b/src/pages/Customer/ExtendedList/CustomerExtendedList.vue
@@ -485,7 +485,6 @@ const selectCustomerId = (id) => {
 };
 
 const selectSalesPersonId = (id) => {
-    console.log('selectedSalesPersonId:: ', selectedSalesPersonId.value);
     selectedSalesPersonId.value = id;
 };
 </script>
diff --git a/src/pages/Customer/components/CustomerConsigneeEdit.vue b/src/pages/Customer/components/CustomerConsigneeEdit.vue
index ca7dbfde9..43649c58e 100644
--- a/src/pages/Customer/components/CustomerConsigneeEdit.vue
+++ b/src/pages/Customer/components/CustomerConsigneeEdit.vue
@@ -95,7 +95,6 @@ const onDataSaved = () => {
     const payload = {
         creates: notes.value,
     };
-    console.log(payload);
     axios.post('AddressObservations/crud', payload);
 };
 </script>
diff --git a/src/pages/Customer/components/CustomerCreditCreate.vue b/src/pages/Customer/components/CustomerCreditCreate.vue
new file mode 100644
index 000000000..053f0d18a
--- /dev/null
+++ b/src/pages/Customer/components/CustomerCreditCreate.vue
@@ -0,0 +1,51 @@
+<script setup>
+import { reactive } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useRoute, useRouter } from 'vue-router';
+
+import FormModel from 'components/FormModel.vue';
+import VnRow from 'components/ui/VnRow.vue';
+
+const { t } = useI18n();
+const route = useRoute();
+const router = useRouter();
+
+const initialData = reactive({
+    credit: null,
+});
+
+const toCustomerCredits = () => {
+    router.push({
+        name: 'CustomerCredits',
+        params: {
+            id: route.params.id,
+        },
+    });
+};
+</script>
+
+<template>
+    <FormModel
+        :form-initial-data="initialData"
+        :observe-form-changes="false"
+        :url-update="`/Clients/${route.params.id}`"
+        @on-data-saved="toCustomerCredits()"
+    >
+        <template #form="{ data }">
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <QInput
+                        :label="t('Credit')"
+                        type="number"
+                        v-model.number="data.credit"
+                    />
+                </div>
+            </VnRow>
+        </template>
+    </FormModel>
+</template>
+
+<i18n>
+es:
+    Credit: Crédito
+</i18n>
diff --git a/src/pages/Customer/components/CustomerNewCustomsAgent.vue b/src/pages/Customer/components/CustomerNewCustomsAgent.vue
index 341b25351..b8b83e763 100644
--- a/src/pages/Customer/components/CustomerNewCustomsAgent.vue
+++ b/src/pages/Customer/components/CustomerNewCustomsAgent.vue
@@ -18,8 +18,6 @@ const initialData = reactive({
 });
 
 const onDataSaved = (dataSaved) => {
-    console.log('onDataSaved()');
-    console.log(dataSaved);
     emit('onDataSaved', dataSaved);
 };
 </script>
diff --git a/src/pages/Customer/components/CustomerNoteCreate.vue b/src/pages/Customer/components/CustomerNoteCreate.vue
index 79f6e9576..cea90f975 100644
--- a/src/pages/Customer/components/CustomerNoteCreate.vue
+++ b/src/pages/Customer/components/CustomerNoteCreate.vue
@@ -19,7 +19,6 @@ onMounted(() => {
 });
 
 const toCustomerNotes = () => {
-    console.log('toCustomerNotes()');
     router.push({
         name: 'CustomerNotes',
         params: {
diff --git a/src/router/modules/customer.js b/src/router/modules/customer.js
index bd404f7ee..fa57682af 100644
--- a/src/router/modules/customer.js
+++ b/src/router/modules/customer.js
@@ -226,13 +226,31 @@ export default {
                 },
                 {
                     path: 'credits',
-                    name: 'CustomerCredits',
-                    meta: {
-                        title: 'credits',
-                        icon: 'vn:credit',
-                    },
-                    component: () =>
-                        import('src/pages/Customer/Card/CustomerCredits.vue'),
+                    name: 'CreditsCard',
+                    redirect: { name: 'CustomerCredits' },
+                    children: [
+                        {
+                            path: '',
+                            name: 'CustomerCredits',
+                            meta: {
+                                title: 'credits',
+                                icon: 'vn:credit',
+                            },
+                            component: () =>
+                                import('src/pages/Customer/Card/CustomerCredits.vue'),
+                        },
+                        {
+                            path: 'create',
+                            name: 'CustomerCreditCreate',
+                            meta: {
+                                title: 'credit-create',
+                            },
+                            component: () =>
+                                import(
+                                    'src/pages/Customer/components/CustomerCreditCreate.vue'
+                                ),
+                        },
+                    ],
                 },
                 {
                     path: 'greuges',

From 903b02a66ffbe9babe0bf7f5f37637fad8f9a099 Mon Sep 17 00:00:00 2001
From: carlosfonseca <carlos.fonseca@mindshore.io>
Date: Wed, 17 Jan 2024 15:26:48 -0500
Subject: [PATCH 51/94] Correccion solicitada

---
 src/pages/Customer/Card/CustomerCredits.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerCredits.vue b/src/pages/Customer/Card/CustomerCredits.vue
index baa33a548..13bc684b3 100644
--- a/src/pages/Customer/Card/CustomerCredits.vue
+++ b/src/pages/Customer/Card/CustomerCredits.vue
@@ -3,7 +3,7 @@ import { ref, computed, onBeforeMount, onMounted } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
 
-import { QBtn } from 'quasar';
+import { date, QBtn } from 'quasar';
 
 import { toCurrency, toDate } from 'src/filters';
 import { useArrayData } from 'composables/useArrayData';
@@ -77,7 +77,7 @@ const columns = computed(() => [
         field: 'created',
         label: t('Since'),
         name: 'created',
-        format: (value) => toDate(value),
+        format: (value) => date.formatDate(value, 'DD/MM/YYYY hh:mm:ss'),
     },
     {
         align: 'left',

From 8f47a0bc2bf01e07332c1d94ded5a7fce256a6dc Mon Sep 17 00:00:00 2001
From: Kevin Martinez <kevin.martinez@mindshore.io>
Date: Wed, 17 Jan 2024 18:02:39 -0400
Subject: [PATCH 52/94] Update router list

---
 src/pages/Route/RouteList.vue | 407 +++++++++++++++++-----------------
 1 file changed, 206 insertions(+), 201 deletions(-)

diff --git a/src/pages/Route/RouteList.vue b/src/pages/Route/RouteList.vue
index 5dd82cc51..5972a6959 100644
--- a/src/pages/Route/RouteList.vue
+++ b/src/pages/Route/RouteList.vue
@@ -208,28 +208,29 @@ const markAsServed = () => {
     />
     <FetchData url="AgencyModes" @on-fetch="(data) => (agencyList = data)" auto-load />
     <FetchData url="Vehicles" @on-fetch="(data) => (vehicleList = data)" auto-load />
-    <QPage class="column items-center q-pa-md">
-        <QToolbar
-            :class="[
-                'q-pa-none q-mb-sm',
-                selectedRows?.length ? 'justify-between' : 'justify-end',
-            ]"
-        >
-            <div v-if="selectedRows?.length">
+    <QPage class="column items-center">
+        <QToolbar class="bg-vn-dark justify-end">
+            <div id="st-actions" class="q-pa-sm">
                 <QBtn
                     icon="vn:clone"
                     color="primary"
                     class="q-mr-sm"
+                    :disable="!selectedRows?.length"
                     @click="confirmationDialog = true"
                 >
                     <QTooltip>{{ t('Clone Selected Routes') }}</QTooltip>
                 </QBtn>
 
-                <QBtn icon="check" color="primary" class="q-mr-sm" @click="markAsServed">
+                <QBtn
+                    icon="check"
+                    color="primary"
+                    class="q-mr-sm"
+                    :disable="!selectedRows?.length"
+                    @click="markAsServed"
+                >
                     <QTooltip>{{ t('Mark as served') }}</QTooltip>
                 </QBtn>
             </div>
-            <QBtn icon="refresh" color="primary" class="q-mr-sm" @click="refreshKey++" />
         </QToolbar>
         <VnPaginate
             :key="refreshKey"
@@ -240,198 +241,202 @@ const markAsServed = () => {
             auto-load
         >
             <template #body="{ rows }">
-                <QTable
-                    v-model:selected="selectedRows"
-                    :columns="columns"
-                    :rows="rows"
-                    flat
-                    row-key="id"
-                    selection="multiple"
-                    :rows-per-page-options="[0]"
-                >
-                    <template #body-cell-worker="props">
-                        <QTd :props="props">
-                            {{ props.row?.workerUserName }}
-                            <QPopupEdit
-                                :model-value="props.row.workerFk"
-                                v-slot="scope"
-                                buttons
-                                @update:model-value="
-                                    (worker) => updateWorker(props.row, worker)
-                                "
-                            >
-                                <VnSelectFilter
-                                    :label="t('Worker')"
-                                    v-model="scope.value"
-                                    :options="workers"
-                                    option-value="id"
-                                    option-label="name"
-                                    hide-selected
-                                    autofocus
-                                    :emit-value="false"
-                                    :rules="validate('Route.workerFk')"
-                                    :is-clearable="false"
-                                    @keyup.enter="scope.set"
-                                    @focus="($event) => $event.target.select()"
+                <div class="q-pa-md">
+                    <QTable
+                        v-model:selected="selectedRows"
+                        :columns="columns"
+                        :rows="rows"
+                        flat
+                        row-key="id"
+                        selection="multiple"
+                        :rows-per-page-options="[0]"
+                    >
+                        <template #body-cell-worker="props">
+                            <QTd :props="props">
+                                {{ props.row?.workerUserName }}
+                                <QPopupEdit
+                                    :model-value="props.row.workerFk"
+                                    v-slot="scope"
+                                    buttons
+                                    @update:model-value="
+                                        (worker) => updateWorker(props.row, worker)
+                                    "
                                 >
-                                    <template #option="{ opt, itemProps }">
-                                        <QItem
-                                            v-bind="itemProps"
-                                            class="q-pa-xs row items-center"
-                                        >
-                                            <QItemSection class="col-9 justify-center">
-                                                <span>{{ opt.name }}</span>
-                                                <span class="text-grey">{{
-                                                    opt.nickname
-                                                }}</span>
-                                            </QItemSection>
-                                        </QItem>
-                                    </template>
-                                </VnSelectFilter>
-                            </QPopupEdit>
-                        </QTd>
-                    </template>
-                    <template #body-cell-agency="props">
-                        <QTd :props="props">
-                            {{ props.row?.agencyName }}
-                            <QPopupEdit
-                                :model-value="props.row.agencyModeFk"
-                                v-slot="scope"
-                                buttons
-                                @update:model-value="
-                                    (agency) => updateAgency(props.row, agency)
-                                "
-                            >
-                                <VnSelectFilter
-                                    :label="t('Agency')"
-                                    v-model="scope.value"
-                                    :options="agencyList"
-                                    option-value="id"
-                                    option-label="name"
-                                    hide-selected
-                                    autofocus
-                                    :emit-value="false"
-                                    :rules="validate('route.agencyFk')"
-                                    :is-clearable="false"
-                                    @keyup.enter="scope.set"
-                                    @focus="($event) => $event.target.select()"
-                                />
-                            </QPopupEdit>
-                        </QTd>
-                    </template>
-                    <template #body-cell-vehicle="props">
-                        <QTd :props="props">
-                            {{ props.row?.vehiclePlateNumber }}
-                            <QPopupEdit
-                                :model-value="props.row.vehicleFk"
-                                v-slot="scope"
-                                buttons
-                                @update:model-value="
-                                    (vehicle) => updateVehicle(props.row, vehicle)
-                                "
-                            >
-                                <VnSelectFilter
-                                    :label="t('Vehicle')"
-                                    v-model="scope.value"
-                                    :options="vehicleList"
-                                    option-value="id"
-                                    option-label="numberPlate"
-                                    hide-selected
-                                    autofocus
-                                    :emit-value="false"
-                                    :rules="validate('route.vehicleFk')"
-                                    :is-clearable="false"
-                                    @keyup.enter="scope.set"
-                                    @focus="($event) => $event.target.select()"
-                                />
-                            </QPopupEdit>
-                        </QTd>
-                    </template>
-                    <template #body-cell-date="props">
-                        <QTd :props="props">
-                            {{ toDate(props.row?.created) }}
-                            <QPopupEdit
-                                v-model="props.row.created"
-                                v-slot="scope"
-                                @update:model-value="updateRoute(props.row)"
-                                buttons
-                            >
-                                <VnInputDate
-                                    v-model="scope.value"
-                                    autofocus
-                                    :label="t('Date')"
-                                    :rules="validate('route.created')"
-                                    :is-clearable="false"
-                                    @keyup.enter="scope.set"
-                                    @focus="($event) => $event.target.select()"
-                                />
-                            </QPopupEdit>
-                        </QTd>
-                    </template>
-                    <template #body-cell-description="props">
-                        <QTd :props="props">
-                            {{ props.row?.description }}
-                            <QPopupEdit
-                                v-model="props.row.description"
-                                v-slot="scope"
-                                @update:model-value="updateRoute(props.row)"
-                                buttons
-                            >
-                                <VnInput
-                                    v-model="scope.value"
-                                    autofocus
-                                    :label="t('Description')"
-                                    :rules="validate('route.description')"
-                                    :is-clearable="false"
-                                    @keyup.enter="scope.set"
-                                    @focus="($event) => $event.target.select()"
-                                />
-                            </QPopupEdit>
-                        </QTd>
-                    </template>
-                    <template #body-cell-started="props">
-                        <QTd :props="props">
-                            {{ toHour(props.row.started) }}
-                            <QPopupEdit
-                                v-model="props.row.started"
-                                v-slot="scope"
-                                buttons
-                                @update:model-value="updateRoute(props.row)"
-                            >
-                                <VnInputTime
-                                    v-model="scope.value"
-                                    autofocus
-                                    :label="t('Hour started')"
-                                    :rules="validate('route.started')"
-                                    :is-clearable="false"
-                                    @keyup.enter="scope.set"
-                                    @focus="($event) => $event.target.select()"
-                                />
-                            </QPopupEdit>
-                        </QTd>
-                    </template>
-                    <template #body-cell-finished="props">
-                        <QTd :props="props">
-                            {{ toHour(props.row.finished) }}
-                            <QPopupEdit
-                                v-model="props.row.finished"
-                                v-slot="scope"
-                                buttons
-                                @update:model-value="updateRoute(props.row)"
-                            >
-                                <VnInputTime
-                                    v-model="scope.value"
-                                    autofocus
-                                    :label="t('Hour finished')"
-                                    :rules="validate('route.finished')"
-                                    :is-clearable="false"
-                                    @keyup.enter="scope.set"
-                                    @focus="($event) => $event.target.select()"
-                                />
-                            </QPopupEdit>
-                        </QTd>
-                    </template>
-                </QTable>
+                                    <VnSelectFilter
+                                        :label="t('Worker')"
+                                        v-model="scope.value"
+                                        :options="workers"
+                                        option-value="id"
+                                        option-label="name"
+                                        hide-selected
+                                        autofocus
+                                        :emit-value="false"
+                                        :rules="validate('Route.workerFk')"
+                                        :is-clearable="false"
+                                        @keyup.enter="scope.set"
+                                        @focus="($event) => $event.target.select()"
+                                    >
+                                        <template #option="{ opt, itemProps }">
+                                            <QItem
+                                                v-bind="itemProps"
+                                                class="q-pa-xs row items-center"
+                                            >
+                                                <QItemSection
+                                                    class="col-9 justify-center"
+                                                >
+                                                    <span>{{ opt.name }}</span>
+                                                    <span class="text-grey">{{
+                                                        opt.nickname
+                                                    }}</span>
+                                                </QItemSection>
+                                            </QItem>
+                                        </template>
+                                    </VnSelectFilter>
+                                </QPopupEdit>
+                            </QTd>
+                        </template>
+                        <template #body-cell-agency="props">
+                            <QTd :props="props">
+                                {{ props.row?.agencyName }}
+                                <QPopupEdit
+                                    :model-value="props.row.agencyModeFk"
+                                    v-slot="scope"
+                                    buttons
+                                    @update:model-value="
+                                        (agency) => updateAgency(props.row, agency)
+                                    "
+                                >
+                                    <VnSelectFilter
+                                        :label="t('Agency')"
+                                        v-model="scope.value"
+                                        :options="agencyList"
+                                        option-value="id"
+                                        option-label="name"
+                                        hide-selected
+                                        autofocus
+                                        :emit-value="false"
+                                        :rules="validate('route.agencyFk')"
+                                        :is-clearable="false"
+                                        @keyup.enter="scope.set"
+                                        @focus="($event) => $event.target.select()"
+                                    />
+                                </QPopupEdit>
+                            </QTd>
+                        </template>
+                        <template #body-cell-vehicle="props">
+                            <QTd :props="props">
+                                {{ props.row?.vehiclePlateNumber }}
+                                <QPopupEdit
+                                    :model-value="props.row.vehicleFk"
+                                    v-slot="scope"
+                                    buttons
+                                    @update:model-value="
+                                        (vehicle) => updateVehicle(props.row, vehicle)
+                                    "
+                                >
+                                    <VnSelectFilter
+                                        :label="t('Vehicle')"
+                                        v-model="scope.value"
+                                        :options="vehicleList"
+                                        option-value="id"
+                                        option-label="numberPlate"
+                                        hide-selected
+                                        autofocus
+                                        :emit-value="false"
+                                        :rules="validate('route.vehicleFk')"
+                                        :is-clearable="false"
+                                        @keyup.enter="scope.set"
+                                        @focus="($event) => $event.target.select()"
+                                    />
+                                </QPopupEdit>
+                            </QTd>
+                        </template>
+                        <template #body-cell-date="props">
+                            <QTd :props="props">
+                                {{ toDate(props.row?.created) }}
+                                <QPopupEdit
+                                    v-model="props.row.created"
+                                    v-slot="scope"
+                                    @update:model-value="updateRoute(props.row)"
+                                    buttons
+                                >
+                                    <VnInputDate
+                                        v-model="scope.value"
+                                        autofocus
+                                        :label="t('Date')"
+                                        :rules="validate('route.created')"
+                                        :is-clearable="false"
+                                        @keyup.enter="scope.set"
+                                        @focus="($event) => $event.target.select()"
+                                    />
+                                </QPopupEdit>
+                            </QTd>
+                        </template>
+                        <template #body-cell-description="props">
+                            <QTd :props="props">
+                                {{ props.row?.description }}
+                                <QPopupEdit
+                                    v-model="props.row.description"
+                                    v-slot="scope"
+                                    @update:model-value="updateRoute(props.row)"
+                                    buttons
+                                >
+                                    <VnInput
+                                        v-model="scope.value"
+                                        autofocus
+                                        :label="t('Description')"
+                                        :rules="validate('route.description')"
+                                        :is-clearable="false"
+                                        @keyup.enter="scope.set"
+                                        @focus="($event) => $event.target.select()"
+                                    />
+                                </QPopupEdit>
+                            </QTd>
+                        </template>
+                        <template #body-cell-started="props">
+                            <QTd :props="props">
+                                {{ toHour(props.row.started) }}
+                                <QPopupEdit
+                                    v-model="props.row.started"
+                                    v-slot="scope"
+                                    buttons
+                                    @update:model-value="updateRoute(props.row)"
+                                >
+                                    <VnInputTime
+                                        v-model="scope.value"
+                                        autofocus
+                                        :label="t('Hour started')"
+                                        :rules="validate('route.started')"
+                                        :is-clearable="false"
+                                        @keyup.enter="scope.set"
+                                        @focus="($event) => $event.target.select()"
+                                    />
+                                </QPopupEdit>
+                            </QTd>
+                        </template>
+                        <template #body-cell-finished="props">
+                            <QTd :props="props">
+                                {{ toHour(props.row.finished) }}
+                                <QPopupEdit
+                                    v-model="props.row.finished"
+                                    v-slot="scope"
+                                    buttons
+                                    @update:model-value="updateRoute(props.row)"
+                                >
+                                    <VnInputTime
+                                        v-model="scope.value"
+                                        autofocus
+                                        :label="t('Hour finished')"
+                                        :rules="validate('route.finished')"
+                                        :is-clearable="false"
+                                        @keyup.enter="scope.set"
+                                        @focus="($event) => $event.target.select()"
+                                    />
+                                </QPopupEdit>
+                            </QTd>
+                        </template>
+                    </QTable>
+                </div>
             </template>
         </VnPaginate>
         <QPageSticky :offset="[20, 20]">

From 0e506910327d341f9bd7bb762afd8c3f739a32b3 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 18 Jan 2024 07:32:04 +0100
Subject: [PATCH 53/94] refs #6694 perf: order VnLocation attrs

---
 src/components/common/VnLocation.vue | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/components/common/VnLocation.vue b/src/components/common/VnLocation.vue
index 072b08094..82dfd6d53 100644
--- a/src/components/common/VnLocation.vue
+++ b/src/components/common/VnLocation.vue
@@ -90,6 +90,10 @@ function handleFetch( data) {
         :label="t('Location')"
         :option-label="showLabel"
         :placeholder="t('Search by postalCode, town, province or country')"
+        @input-value="locationFilter"
+        :default-filter="false"
+        :input-debounce="100"
+        :class="{ required: $attrs.required }"
         v-bind="$attrs"
         emit-value
         map-options
@@ -97,19 +101,15 @@ function handleFetch( data) {
         clearable
         hide-selected
         fill-input
-        :class="{ required: $attrs.required }"
-        @input-value="locationFilter"
-        :default-filter="false"
-        :input-debounce="100"
     >
         <template #form>
             <CreateNewPostcode @on-data-saved="onPostcodeCreated($event)" />
         </template>
-        <template #option="scope">
-            <QItem v-bind="scope.itemProps">
-                <QItemSection v-if="scope.opt">
-                    <QItemLabel>{{ scope.opt.code }}</QItemLabel>
-                    <QItemLabel caption>{{ showLabel(scope.opt) }}</QItemLabel>
+        <template #option="{itemProps, opt}">
+            <QItem v-bind="itemProps">
+                <QItemSection v-if="opt">
+                    <QItemLabel>{{ opt.code }}</QItemLabel>
+                    <QItemLabel caption>{{ showLabel(opt) }}</QItemLabel>
                 </QItemSection>
             </QItem>
         </template>

From 4e1f4a184608b8cbb68e043744dd01af7a477b93 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 18 Jan 2024 07:32:24 +0100
Subject: [PATCH 54/94] add new rule for eslintrc.js

---
 .eslintrc.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index c8bdecb1a..1d09a896f 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -58,7 +58,7 @@ module.exports = {
     rules: {
         'prefer-promise-reject-errors': 'off',
         'no-unused-vars': 'warn',
-
+        "vue/no-multiple-template-root": "off" ,
         // allow debugger during development only
         'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
     },

From 94fb073d3f280cd2a1f0a16974d789ad03c7a3e9 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 18 Jan 2024 07:43:00 +0100
Subject: [PATCH 55/94] refs #6694 perf: remove comments

---
 src/pages/Customer/CustomerCreate.vue | 25 -------------------------
 1 file changed, 25 deletions(-)

diff --git a/src/pages/Customer/CustomerCreate.vue b/src/pages/Customer/CustomerCreate.vue
index b20554ee9..4ce4b4520 100644
--- a/src/pages/Customer/CustomerCreate.vue
+++ b/src/pages/Customer/CustomerCreate.vue
@@ -28,12 +28,8 @@ const newClientForm = reactive({
     isEqualizated: false,
 });
 
-const postcodeFetchDataRef = ref(null);
 const workersOptions = ref([]);
 const businessTypesOptions = ref([]);
-const citiesLocationOptions = ref([]);
-const provincesLocationOptions = ref([]);
-const countriesOptions = ref([]);
 const postcodesOptions = ref([]);
 
 
@@ -51,32 +47,11 @@ function handleLocation(data, { city, postcode, provinceFk, countryFk }) {
         auto-load
         url="Workers/search?departmentCodes"
     />
-    <!-- <FetchData
-        ref="postcodeFetchDataRef"
-        url="Postcodes/location"
-        @on-fetch="(data) => (postcodesOptions = data)"
-        auto-load
-    /> -->
     <FetchData
         @on-fetch="(data) => (businessTypesOptions = data)"
         auto-load
         url="BusinessTypes"
     />
-    <!-- <FetchData
-        @on-fetch="(data) => (citiesLocationOptions = data)"
-        auto-load
-        url="Towns/location"
-    />
-    <FetchData
-        @on-fetch="(data) => (provincesLocationOptions = data)"
-        auto-load
-        url="Provinces/location"
-    />
-    <FetchData
-        @on-fetch="(data) => (countriesOptions = data)"
-        auto-load
-        url="Countries"
-    />-->
     <QPage>
         <VnSubToolbar />
         <FormModel

From 4e66f3c65d85b3a058620d4a695d32494203bc79 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 18 Jan 2024 07:43:30 +0100
Subject: [PATCH 56/94] refs #6694 feat: handle when postcodecreated

---
 src/components/common/VnLocation.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/components/common/VnLocation.vue b/src/components/common/VnLocation.vue
index 82dfd6d53..d650211ad 100644
--- a/src/components/common/VnLocation.vue
+++ b/src/components/common/VnLocation.vue
@@ -73,8 +73,11 @@ function locationFilter(search) {
     postcodesRef.value.fetch({ where, args: params });
 }
 function handleFetch( data) {
-     postcodesOptions.value = data;
+    postcodesOptions.value = data;
 }
+async function onPostcodeCreated(){
+    postcodesRef.value.fetch();
+};
 </script>
 <template>
     <FetchData

From c38e76de88eea9f49ccad3dcad6a1d05b57a5abc Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 18 Jan 2024 07:45:17 +0100
Subject: [PATCH 57/94] refs #6694 feat: use VnLocation for WorkerCreate

---
 src/components/common/VnLocation.vue |   2 +-
 src/pages/Worker/WorkerCreate.vue    | 114 ++++-----------------------
 2 files changed, 17 insertions(+), 99 deletions(-)

diff --git a/src/components/common/VnLocation.vue b/src/components/common/VnLocation.vue
index d650211ad..6720e3920 100644
--- a/src/components/common/VnLocation.vue
+++ b/src/components/common/VnLocation.vue
@@ -129,5 +129,5 @@ async function onPostcodeCreated(){
 <i18n>
 es:
     Location: Ubicación
-    Search by postalCode, town, province or country: Buscar por código postal, ciudad o país
+    Search by postalcode, town, province or country: Buscar por código postal, ciudad o país
 </i18n>
diff --git a/src/pages/Worker/WorkerCreate.vue b/src/pages/Worker/WorkerCreate.vue
index accac7cf2..667111c6a 100644
--- a/src/pages/Worker/WorkerCreate.vue
+++ b/src/pages/Worker/WorkerCreate.vue
@@ -9,7 +9,7 @@ import VnInputDate from 'components/common/VnInputDate.vue';
 import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
 import VnSelectCreate from 'src/components/common/VnSelectCreate.vue';
 import CreateBankEntityForm from 'src/components/CreateBankEntityForm.vue';
-import CustomerCreateNewPostcode from 'src/components/CreateNewPostcodeForm.vue';
+import VnLocation from 'src/components/common/VnLocation.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 
@@ -21,14 +21,6 @@ const workerConfigFilter = {
     field: ['payMethodFk'],
 };
 
-const provincesFilter = {
-    fields: ['id', 'name', 'countryFk'],
-};
-
-const townsFilter = {
-    fields: ['id', 'name', 'provinceFk'],
-};
-
 const newWorkerForm = ref({
     companyFk: null,
     payMethodFk: null,
@@ -49,9 +41,6 @@ const newWorkerForm = ref({
     bankEntityFk: null,
 });
 
-const postcodeFetchDataRef = ref(null);
-const provincesOptions = ref([]);
-const townsOptions = ref([]);
 const companiesOptions = ref([]);
 const workersOptions = ref([]);
 const payMethodsOptions = ref([]);
@@ -66,9 +55,13 @@ const onBankEntityCreated = (data) => {
     bankEntitiesOptions.value.push(data);
 };
 
-const onPostcodeCreated = async () => {
-    postcodeFetchDataRef.value.fetch();
-};
+
+function handleLocation(data, { city, postcode, provinceFk, countryFk }) {
+    data.postcode = postcode;
+    data.city = city;
+    data.provinceFk = provinceFk;
+    data.countryFk = countryFk;
+}
 
 onMounted(async () => {
     const userInfo = await useUserConfig().fetch();
@@ -83,24 +76,7 @@ onMounted(async () => {
         :filter="workerConfigFilter"
         auto-load
     />
-    <FetchData
-        ref="postcodeFetchDataRef"
-        url="Postcodes/location"
-        @on-fetch="(data) => (postcodesOptions = data)"
-        auto-load
-    />
-    <FetchData
-        url="Provinces/location"
-        @on-fetch="(data) => (provincesOptions = data)"
-        :filter="provincesFilter"
-        auto-load
-    />
-    <FetchData
-        url="Towns/location"
-        @on-fetch="(data) => (townsOptions = data)"
-        :filter="townsFilter"
-        auto-load
-    />
+
     <FetchData
         url="Companies"
         @on-fetch="(data) => (companiesOptions = data)"
@@ -178,77 +154,19 @@ onMounted(async () => {
                 </VnRow>
                 <VnRow class="row q-gutter-md q-mb-md">
                     <div class="col">
-                        <VnSelectCreate
-                            v-model="data.postcode"
-                            :label="t('worker.create.postcode')"
+                        <VnLocation
                             :rules="validate('Worker.postcode')"
                             :roles-allowed-to-create="['deliveryAssistant']"
                             :options="postcodesOptions"
-                            option-label="code"
-                            option-value="code"
-                            hide-selected
-                        >
-                            <template #form>
-                                <CustomerCreateNewPostcode
-                                    @on-data-saved="onPostcodeCreated($event)"
-                                />
-                            </template>
-                            <template #option="scope">
-                                <QItem v-bind="scope.itemProps">
-                                    <QItemSection v-if="scope.opt">
-                                        <QItemLabel>{{ scope.opt.code }}</QItemLabel>
-                                        <QItemLabel caption
-                                            >{{ scope.opt.code }} -
-                                            {{ scope.opt.town.name }} ({{
-                                                scope.opt.town.province.name
-                                            }},
-                                            {{
-                                                scope.opt.town.province.country.country
-                                            }})</QItemLabel
-                                        >
-                                    </QItemSection>
-                                </QItem>
-                            </template>
-                        </VnSelectCreate>
-                    </div>
-                    <div class="col">
-                        <VnSelectFilter
-                            :label="t('worker.create.province')"
-                            v-model="data.provinceFk"
-                            :options="provincesOptions"
-                            option-value="id"
-                            option-label="name"
-                            hide-selected
-                            :rules="validate('Worker.provinceFk')"
-                        />
+                            v-model="data.location"
+                            @update:model-value="
+                                    (location) => handleLocation(data, location)
+                                    "
+                            >
+                        </VnLocation>
                     </div>
                 </VnRow>
                 <VnRow class="row q-gutter-md q-mb-md">
-                    <div class="col">
-                        <VnSelectFilter
-                            :label="t('worker.create.city')"
-                            v-model="data.city"
-                            :options="townsOptions"
-                            option-value="name"
-                            option-label="name"
-                            hide-selected
-                            :rules="validate('Worker.city')"
-                        >
-                            <template #option="scope">
-                                <QItem v-bind="scope.itemProps">
-                                    <QItemSection>
-                                        <QItemLabel>{{ scope.opt.name }}</QItemLabel>
-                                        <QItemLabel caption
-                                            >{{ scope.opt.name }},
-                                            {{ scope.opt.province.name }} ({{
-                                                scope.opt.province.country.country
-                                            }})</QItemLabel
-                                        >
-                                    </QItemSection>
-                                </QItem>
-                            </template>
-                        </VnSelectFilter>
-                    </div>
                     <div class="col">
                         <VnInput
                             :label="t('worker.create.street')"

From 161bfab443986425881dbc1b1b4abeceb23ff7af Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Thu, 18 Jan 2024 08:58:04 -0300
Subject: [PATCH 58/94] Add subfilter to entry list view and entry descriptor
 improvements

---
 src/css/app.scss                         |  8 +++-
 src/i18n/es/index.js                     |  2 +-
 src/pages/Entry/Card/EntryDescriptor.vue | 51 ++++++++++++++++++++----
 src/pages/Entry/EntryFilter.vue          | 31 ++++++++++++++
 src/pages/Travel/Card/TravelSummary.vue  | 11 +----
 5 files changed, 84 insertions(+), 19 deletions(-)

diff --git a/src/css/app.scss b/src/css/app.scss
index bcc75ab38..f11ab865c 100644
--- a/src/css/app.scss
+++ b/src/css/app.scss
@@ -17,9 +17,9 @@ a {
 // Removes chrome autofill background
 input:-webkit-autofill,
 select:-webkit-autofill {
-    color:  var(--vn-text) ;
+    color: var(--vn-text);
     font-family: $typography-font-family;
-    -webkit-text-fill-color: var(--vn-text) ;
+    -webkit-text-fill-color: var(--vn-text);
     -webkit-background-clip: text !important;
     background-clip: text !important;
 }
@@ -48,6 +48,10 @@ body.body--dark {
     background-color: var(--vn-dark);
 }
 
+.color-vn-text {
+    color: var(--vn-text);
+}
+
 .vn-card {
     background-color: var(--vn-gray);
     color: var(--vn-text);
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index bd66bfbed..6d1516df1 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -335,7 +335,7 @@ export default {
             packagingFk: 'Embalaje',
         },
         descriptor: {
-            agency: 'Agency',
+            agency: 'Agencia',
             landed: 'F. entrega',
             warehouseOut: 'Alm. salida',
         },
diff --git a/src/pages/Entry/Card/EntryDescriptor.vue b/src/pages/Entry/Card/EntryDescriptor.vue
index e4aaaf291..b1658ccd3 100644
--- a/src/pages/Entry/Card/EntryDescriptor.vue
+++ b/src/pages/Entry/Card/EntryDescriptor.vue
@@ -8,6 +8,7 @@ import VnLv from 'src/components/ui/VnLv.vue';
 import useCardDescription from 'src/composables/useCardDescription';
 
 import { toDate } from 'src/filters';
+import { usePrintService } from 'composables/usePrintService';
 
 const $props = defineProps({
     id: {
@@ -23,6 +24,7 @@ const $props = defineProps({
 
 const route = useRoute();
 const { t } = useI18n();
+const { openReport } = usePrintService();
 
 const entryFilter = {
     include: [
@@ -61,6 +63,14 @@ const entryFilter = {
     ],
 };
 
+const entityId = computed(() => {
+    return $props.id || route.params.id;
+});
+
+const data = ref(useCardDescription());
+const setData = (entity) =>
+    (data.value = useCardDescription(entity.supplier.nickname, entity.id));
+
 const getEntryRedirectionFilter = (entry) => {
     let entryTravel = entry && entry.travel;
 
@@ -82,13 +92,9 @@ const getEntryRedirectionFilter = (entry) => {
     });
 };
 
-const entityId = computed(() => {
-    return $props.id || route.params.id;
-});
-
-const data = ref(useCardDescription());
-const setData = (entity) =>
-    (data.value = useCardDescription(entity.supplier.nickname, entity.id));
+const showEntryReport = () => {
+    openReport(`Entries/${route.params.id}/entry-order-pdf`);
+};
 </script>
 
 <template>
@@ -101,6 +107,18 @@ const setData = (entity) =>
         @on-fetch="setData"
         data-key="entryData"
     >
+        <template #menu="{ entity }">
+            <QItem v-ripple clickable @click="showEntryReport(entity)">
+                <QItemSection>{{ t('Show entry report') }}</QItemSection>
+            </QItem>
+            <QItem v-ripple clickable>
+                <QItemSection>
+                    <RouterLink :to="{ name: 'EntryList' }" class="color-vn-text">
+                        {{ t('Go to module index') }}
+                    </RouterLink>
+                </QItemSection>
+            </QItem>
+        </template>
         <template #body="{ entity }">
             <VnLv
                 :label="t('entry.descriptor.agency')"
@@ -115,6 +133,21 @@ const setData = (entity) =>
                 :value="entity.travel.warehouseOut.name"
             />
         </template>
+        <template #icons="{ entity }">
+            <QCardActions class="q-gutter-x-md">
+                <QIcon
+                    v-if="entity.isExcludedFromAvailable"
+                    name="vn:inventory"
+                    color="primary"
+                    size="xs"
+                >
+                    <QTooltip>{{ t('Inventory entry') }}</QTooltip>
+                </QIcon>
+                <QIcon v-if="entity.isRaid" name="vn:web" color="primary" size="xs">
+                    <QTooltip>{{ t('Virtual entry') }}</QTooltip>
+                </QIcon>
+            </QCardActions>
+        </template>
         <template #actions="{ entity }">
             <QCardActions>
                 <QBtn
@@ -162,4 +195,8 @@ es:
     Supplier card: Ficha del proveedor
     All travels with current agency: Todos los envíos con la agencia actual
     All entries with current supplier: Todas las entradas con el proveedor actual
+    Show entry report: Ver informe del pedido
+    Go to module index: Ir al índice del modulo
+    Inventory entry: Es inventario
+    Virtual entry: Es una redada
 </i18n>
diff --git a/src/pages/Entry/EntryFilter.vue b/src/pages/Entry/EntryFilter.vue
index cce512299..7eeffcee7 100644
--- a/src/pages/Entry/EntryFilter.vue
+++ b/src/pages/Entry/EntryFilter.vue
@@ -173,6 +173,31 @@ const suppliersOptions = ref([]);
                         />
                     </QItemSection>
                 </QItem>
+                <QItem>
+                    <QItemSection>
+                        <QCheckbox
+                            :label="t('params.isBooked')"
+                            v-model="params.isBooked"
+                            toggle-indeterminate
+                        />
+                    </QItemSection>
+                    <QItemSection>
+                        <QCheckbox
+                            :label="t('params.isConfirmed')"
+                            v-model="params.isConfirmed"
+                            toggle-indeterminate
+                        />
+                    </QItemSection>
+                </QItem>
+                <QItem>
+                    <QItemSection>
+                        <QCheckbox
+                            :label="t('params.isOrdered')"
+                            v-model="params.isOrdered"
+                            toggle-indeterminate
+                        />
+                    </QItemSection>
+                </QItem>
             </QList>
         </template>
     </VnFilterPanel>
@@ -200,6 +225,9 @@ en:
         from: From
         to: To
         created: Created
+        isBooked: Booked
+        isConfirmed: Confirmed
+        isOrdered: Ordered
 es:
     params:
         search: Búsqueda general
@@ -212,4 +240,7 @@ es:
         from: Desde
         to: Hasta
         created: Fecha creación
+        isBooked: Asentado
+        isConfirmed: Confirmado
+        isOrdered: Pedida
 </i18n>
diff --git a/src/pages/Travel/Card/TravelSummary.vue b/src/pages/Travel/Card/TravelSummary.vue
index 946bb7426..4f0e8860a 100644
--- a/src/pages/Travel/Card/TravelSummary.vue
+++ b/src/pages/Travel/Card/TravelSummary.vue
@@ -6,7 +6,6 @@ import { useI18n } from 'vue-i18n';
 import { QCheckbox, QIcon } from 'quasar';
 import CardSummary from 'components/ui/CardSummary.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
-import VnRow from 'components/ui/VnRow.vue';
 
 import travelService from 'src/services/travel.service';
 import { toDate, toCurrency } from 'src/filters';
@@ -219,10 +218,7 @@ const openEntryDescriptor = () => {};
 
         <template #body>
             <QCard class="vn-one">
-                <VnLv
-                    :label="t('globals.shipped')"
-                    :value="toDate(travel.shipped)"
-                />
+                <VnLv :label="t('globals.shipped')" :value="toDate(travel.shipped)" />
                 <VnLv
                     :label="t('globals.wareHouseOut')"
                     :value="travel.warehouseOut?.name"
@@ -239,10 +235,7 @@ const openEntryDescriptor = () => {};
                 </VnLv>
             </QCard>
             <QCard class="vn-one">
-                <VnLv
-                    :label="t('globals.landed')"
-                    :value="toDate(travel.landed)"
-                />
+                <VnLv :label="t('globals.landed')" :value="toDate(travel.landed)" />
                 <VnLv
                     :label="t('globals.wareHouseIn')"
                     :value="travel.warehouseIn?.name"

From 661e9d4368d8ee0e78ac13c5786b608b4ad1e709 Mon Sep 17 00:00:00 2001
From: Kevin Martinez <kevin.martinez@mindshore.io>
Date: Thu, 18 Jan 2024 08:45:41 -0400
Subject: [PATCH 59/94] Create route summary

---
 src/i18n/en/index.js                          |   3 +-
 src/i18n/es/index.js                          |   1 +
 src/pages/Route/Card/RouteCard.vue            |   3 +-
 src/pages/Route/Card/RouteDescriptor.vue      | 104 ++++
 src/pages/Route/Card/RouteDescriptorMenu.vue  |  63 +++
 src/pages/Route/Card/RouteDescriptorProxy.vue |  15 +
 src/pages/Route/Card/RouteForm.vue            |   3 +-
 src/pages/Route/Card/RouteSummary.vue         | 314 ++++++++++++
 src/pages/Route/Card/RouteSummaryDialog.vue   |  29 ++
 src/pages/Route/RouteList.vue                 | 472 ++++++++++--------
 src/router/modules/route.js                   |  18 +-
 11 files changed, 806 insertions(+), 219 deletions(-)
 create mode 100644 src/pages/Route/Card/RouteDescriptor.vue
 create mode 100644 src/pages/Route/Card/RouteDescriptorMenu.vue
 create mode 100644 src/pages/Route/Card/RouteDescriptorProxy.vue
 create mode 100644 src/pages/Route/Card/RouteSummary.vue
 create mode 100644 src/pages/Route/Card/RouteSummaryDialog.vue

diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index 2056f1907..3b4482b07 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -809,7 +809,8 @@ export default {
             cmrsList: 'External CMRs list',
             RouteList: 'List',
             create: 'Create',
-            basicData: 'Basic Data'
+            basicData: 'Basic Data',
+            summary: 'Summary'
         },
         cmr: {
             list: {
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index 970f23231..322f08df4 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -809,6 +809,7 @@ export default {
             RouteList: 'Listado',
             create: 'Crear',
             basicData: 'Datos básicos',
+            summary: 'Summary',
         },
         cmr: {
             list: {
diff --git a/src/pages/Route/Card/RouteCard.vue b/src/pages/Route/Card/RouteCard.vue
index 2082b67df..46b997b65 100644
--- a/src/pages/Route/Card/RouteCard.vue
+++ b/src/pages/Route/Card/RouteCard.vue
@@ -1,6 +1,7 @@
 <script setup>
 import { useStateStore } from 'stores/useStateStore';
 import LeftMenu from 'components/LeftMenu.vue';
+import RouteDescriptor from 'pages/Route/Card/RouteDescriptor.vue';
 // import ShelvingDescriptor from 'pages/Shelving/Card/ShelvingDescriptor.vue';
 
 const stateStore = useStateStore();
@@ -8,7 +9,7 @@ const stateStore = useStateStore();
 <template>
     <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
         <QScrollArea class="fit">
-            <!--            <ShelvingDescriptor />-->
+            <RouteDescriptor />
             <QSeparator />
             <LeftMenu source="card" />
         </QScrollArea>
diff --git a/src/pages/Route/Card/RouteDescriptor.vue b/src/pages/Route/Card/RouteDescriptor.vue
new file mode 100644
index 000000000..218764277
--- /dev/null
+++ b/src/pages/Route/Card/RouteDescriptor.vue
@@ -0,0 +1,104 @@
+<script setup>
+import { ref, computed } from 'vue';
+import { useRoute } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+import CardDescriptor from 'components/ui/CardDescriptor.vue';
+import VnLv from 'components/ui/VnLv.vue';
+import useCardDescription from 'composables/useCardDescription';
+import { dashIfEmpty, toDate } from 'src/filters';
+import RouteDescriptorMenu from 'pages/Route/Card/RouteDescriptorMenu.vue';
+
+const $props = defineProps({
+    id: {
+        type: Number,
+        required: false,
+        default: null,
+    },
+});
+
+const route = useRoute();
+const { t } = useI18n();
+
+const entityId = computed(() => {
+    return $props.id || route.params.id;
+});
+
+const filter = {
+    fields: [
+        'id',
+        'workerFk',
+        'agencyModeFk',
+        'created',
+        'm3',
+        'warehouseFk',
+        'description',
+        'vehicleFk',
+        'kmStart',
+        'kmEnd',
+        'started',
+        'finished',
+        'cost',
+        'zoneFk',
+        'isOk',
+    ],
+    include: [
+        { relation: 'agencyMode', scope: { fields: ['id', 'name'] } },
+        {
+            relation: 'vehicle',
+            scope: { fields: ['id', 'm3'] },
+        },
+        { relation: 'zone', scope: { fields: ['id', 'name'] } },
+        {
+            relation: 'worker',
+            scope: {
+                fields: ['id'],
+                include: {
+                    relation: 'user',
+                    scope: {
+                        fields: ['id'],
+                        include: { relation: 'emailUser', scope: { fields: ['email'] } },
+                    },
+                },
+            },
+        },
+    ],
+};
+const data = ref(useCardDescription());
+const setData = (entity) => (data.value = useCardDescription(entity.code, entity.id));
+</script>
+
+<template>
+    <CardDescriptor
+        module="Route"
+        :url="`Routes/${entityId}`"
+        :filter="filter"
+        :title="data.title"
+        :subtitle="data.subtitle"
+        data-key="Routes"
+        @on-fetch="setData"
+    >
+        <template #body="{ entity }">
+            <VnLv :label="t('Date')" :value="toDate(entity?.created)" />
+            <VnLv :label="t('Agency')" :value="entity?.agencyMode?.name" />
+            <VnLv :label="t('Zone')" :value="entity?.zone?.name" />
+            <VnLv
+                :label="t('Volume')"
+                :value="`${dashIfEmpty(entity?.m3)} / ${dashIfEmpty(
+                    entity?.vehicle?.m3
+                )} m³`"
+            />
+            <VnLv :label="t('Description')" :value="entity?.description" />
+        </template>
+        <template #menu="{ entity }">
+            <RouteDescriptorMenu :route="entity" />
+        </template>
+    </CardDescriptor>
+</template>
+<i18n>
+es:
+    Date: Fecha
+    Agency: Agencia
+    Zone: Zona
+    Volume: Volumen
+    Description: Descripción
+</i18n>
diff --git a/src/pages/Route/Card/RouteDescriptorMenu.vue b/src/pages/Route/Card/RouteDescriptorMenu.vue
new file mode 100644
index 000000000..b661d1cd7
--- /dev/null
+++ b/src/pages/Route/Card/RouteDescriptorMenu.vue
@@ -0,0 +1,63 @@
+<script setup>
+import axios from 'axios';
+import { useQuasar } from 'quasar';
+import { useI18n } from 'vue-i18n';
+import { useRouter } from 'vue-router';
+import VnConfirm from 'components/ui/VnConfirm.vue';
+
+const props = defineProps({
+    route: {
+        type: Object,
+        required: true,
+    },
+});
+
+const router = useRouter();
+const quasar = useQuasar();
+const { t } = useI18n();
+
+function confirmRemove() {
+    quasar
+        .dialog({
+            component: VnConfirm,
+            componentProps: {
+                title: t('confirmDeletion'),
+                message: t('confirmDeletionMessage'),
+                promise: remove,
+            },
+        })
+        .onOk(async () => await router.push({ name: 'RouteList' }));
+}
+
+async function remove() {
+    if (!props.route.id) {
+        return;
+    }
+    await axios.delete(`Routes/${props.route.id}`);
+    quasar.notify({
+        message: t('globals.dataDeleted'),
+        type: 'positive',
+    });
+}
+
+//  TODO: Add reports
+</script>
+<template>
+    <QItem @click="confirmRemove" v-ripple clickable>
+        <QItemSection avatar>
+            <QIcon name="delete" />
+        </QItemSection>
+        <QItemSection>{{ t('deleteRoute') }}</QItemSection>
+    </QItem>
+</template>
+
+<i18n>
+en:
+    confirmDeletion: Confirm deletion
+    confirmDeletionMessage: Are you sure you want to delete this route?
+    deleteRoute: Delete route
+es:
+    confirmDeletion: Confirmar eliminación,
+    confirmDeletionMessage: Seguro que quieres eliminar esta ruta?
+    deleteRoute: Eliminar ruta
+</i18n>
diff --git a/src/pages/Route/Card/RouteDescriptorProxy.vue b/src/pages/Route/Card/RouteDescriptorProxy.vue
new file mode 100644
index 000000000..541f9716a
--- /dev/null
+++ b/src/pages/Route/Card/RouteDescriptorProxy.vue
@@ -0,0 +1,15 @@
+<script setup>
+import RouteDescriptor from 'pages/Route/Card/RouteDescriptor.vue';
+
+const $props = defineProps({
+    id: {
+        type: Number,
+        required: true,
+    },
+});
+</script>
+<template>
+    <QPopupProxy>
+        <RouteDescriptor v-if="$props.id" :id="$props.id" />
+    </QPopupProxy>
+</template>
diff --git a/src/pages/Route/Card/RouteForm.vue b/src/pages/Route/Card/RouteForm.vue
index 00ea18f4f..49a067c00 100644
--- a/src/pages/Route/Card/RouteForm.vue
+++ b/src/pages/Route/Card/RouteForm.vue
@@ -72,8 +72,7 @@ const routeFilter = {
 const onSave = (data, response) => {
     if (isNew) {
         axios.post(`Routes/${response.data?.id}/updateWorkCenter`);
-        // TODO: Add summary
-        // router.push({ name: 'RouteSummary', params: { id: response.data?.id } });
+        router.push({ name: 'RouteSummary', params: { id: response.data?.id } });
     }
 };
 </script>
diff --git a/src/pages/Route/Card/RouteSummary.vue b/src/pages/Route/Card/RouteSummary.vue
new file mode 100644
index 000000000..a10ca088e
--- /dev/null
+++ b/src/pages/Route/Card/RouteSummary.vue
@@ -0,0 +1,314 @@
+<script setup>
+import { computed, onMounted, onUnmounted, ref } from 'vue';
+import { useRoute } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+import { useStateStore } from 'stores/useStateStore';
+import CardSummary from 'components/ui/CardSummary.vue';
+import VnLv from 'components/ui/VnLv.vue';
+import { QIcon } from 'quasar';
+import { dashIfEmpty, toCurrency, toDate, toHour } from 'src/filters';
+import WorkerDescriptorProxy from 'pages/Worker/Card/WorkerDescriptorProxy.vue';
+import axios from 'axios';
+import CustomerDescriptorProxy from 'pages/Customer/Card/CustomerDescriptorProxy.vue';
+import TicketDescriptorProxy from 'pages/Ticket/Card/TicketDescriptorProxy.vue';
+
+const $props = defineProps({
+    id: {
+        type: Number,
+        default: 0,
+    },
+});
+const route = useRoute();
+const stateStore = useStateStore();
+const { t } = useI18n();
+
+const entityId = computed(() => $props.id || route.params.id);
+const isDialog = Boolean($props.id);
+const hideRightDrawer = () => {
+    if (!isDialog) {
+        stateStore.rightDrawer = false;
+    }
+};
+onMounted(hideRightDrawer);
+onUnmounted(hideRightDrawer);
+const getTotalPackages = (tickets) => {
+    return (tickets || []).reduce((sum, ticket) => sum + ticket.packages, 0);
+};
+
+const ticketColumns = ref([
+    {
+        name: 'order',
+        label: t('route.summary.order'),
+        field: (row) => dashIfEmpty(row?.priority),
+        sortable: false,
+        align: 'center',
+    },
+    {
+        name: 'street',
+        label: t('route.summary.street'),
+        field: (row) => row?.street,
+        sortable: false,
+        align: 'left',
+    },
+    {
+        name: 'city',
+        label: t('route.summary.city'),
+        field: (row) => row?.city,
+        sortable: false,
+        align: 'left',
+    },
+    {
+        name: 'pc',
+        label: t('route.summary.pc'),
+        field: (row) => row?.postalCode,
+        sortable: false,
+        align: 'center',
+    },
+    {
+        name: 'client',
+        label: t('route.summary.client'),
+        field: (row) => row?.nickname,
+        sortable: false,
+        align: 'left',
+    },
+    {
+        name: 'warehouse',
+        label: t('route.summary.warehouse'),
+        field: (row) => row?.warehouseName,
+        sortable: false,
+        align: 'left',
+    },
+    {
+        name: 'packages',
+        label: t('route.summary.packages'),
+        field: (row) => row?.packages,
+        sortable: false,
+        align: 'center',
+    },
+    {
+        name: 'volume',
+        label: t('route.summary.m3'),
+        field: (row) => row?.volume,
+        sortable: false,
+        align: 'center',
+    },
+    {
+        name: 'packaging',
+        label: t('route.summary.packaging'),
+        field: (row) => row?.ipt,
+        sortable: false,
+        align: 'center',
+    },
+    {
+        name: 'ticket',
+        label: t('route.summary.ticket'),
+        field: (row) => row?.id,
+        sortable: false,
+        align: 'right',
+    },
+    {
+        name: 'observations',
+        label: '',
+        field: (row) => row?.ticketObservation,
+        sortable: false,
+        align: 'left',
+    },
+]);
+
+const openBuscaman = async (route, ticket) => {
+    if (!route.vehicleFk) throw new Error(`The route doesn't have a vehicle`);
+    const response = await axios.get(`Routes/${route.vehicleFk}/getDeliveryPoint`);
+    if (!response.data)
+        throw new Error(`The route's vehicle doesn't have a delivery point`);
+
+    const address = `${response.data}+to:${ticket.postalCode} ${ticket.city} ${ticket.street}`;
+    window.open(
+        'https://gps.buscalia.com/usuario/localizar.aspx?bmi=true&addr=' +
+            encodeURI(address),
+        '_blank'
+    );
+};
+</script>
+
+<template>
+    <div class="q-pa-md">
+        <CardSummary ref="summary" :url="`Routes/${entityId}/summary`">
+            <template #header-left>
+                <RouterLink :to="{ name: `RouteSummary`, params: { id: entityId } }">
+                    <QIcon name="open_in_new" color="white" size="sm" />
+                </RouterLink>
+            </template>
+            <template #header="{ entity }">
+                <span>{{ `${entity?.route.id} - ${entity?.route?.description}` }}</span>
+            </template>
+            <template #body="{ entity }">
+                <QCard class="vn-one">
+                    <VnLv :label="t('ID')" :value="entity?.route.id" />
+                    <VnLv
+                        :label="t('route.summary.date')"
+                        :value="toDate(entity?.route.created)"
+                    />
+                    <VnLv
+                        :label="t('route.summary.agency')"
+                        :value="entity?.route?.agencyMode?.name"
+                    />
+                    <VnLv
+                        :label="t('route.summary.vehicle')"
+                        :value="entity.route?.vehicle?.numberPlate"
+                    />
+                    <VnLv :label="t('route.summary.driver')">
+                        <template #value>
+                            <span class="link">
+                                {{ dashIfEmpty(entity?.route?.worker?.user?.name) }}
+                                <WorkerDescriptorProxy :id="entity.route?.workerFk" />
+                            </span>
+                        </template>
+                    </VnLv>
+                    <VnLv
+                        :label="t('route.summary.cost')"
+                        :value="toCurrency(entity.route?.cost)"
+                    />
+                </QCard>
+                <QCard class="vn-one">
+                    <VnLv
+                        :label="t('route.summary.started')"
+                        :value="toHour(entity?.route.started)"
+                    />
+                    <VnLv
+                        :label="t('route.summary.finished')"
+                        :value="toHour(entity?.route.finished)"
+                    />
+                    <VnLv
+                        :label="t('route.summary.kmStart')"
+                        :value="dashIfEmpty(entity?.route?.kmStart)"
+                    />
+                    <VnLv
+                        :label="t('route.summary.kmEnd')"
+                        :value="dashIfEmpty(entity?.route?.kmEnd)"
+                    />
+                    <VnLv
+                        :label="t('route.summary.volume')"
+                        :value="`${dashIfEmpty(entity?.route?.m3)} / ${dashIfEmpty(
+                            entity?.route?.vehicle?.m3
+                        )} m³`"
+                    />
+                    <VnLv
+                        :label="t('route.summary.packages')"
+                        :value="getTotalPackages(entity.tickets)"
+                    />
+                </QCard>
+                <QCard class="vn-one">
+                    <div class="header">
+                        {{ t('route.summary.description') }}
+                    </div>
+                    <p>
+                        {{ dashIfEmpty(entity?.route?.description) }}
+                    </p>
+                </QCard>
+
+                <QCard class="vn-max">
+                    <div class="header">
+                        {{ t('route.summary.tickets') }}
+                    </div>
+                    <QTable
+                        :columns="ticketColumns"
+                        :rows="entity?.tickets"
+                        :rows-per-page-options="[0]"
+                        row-key="id"
+                        flat
+                        hide-pagination
+                    >
+                        <template #body-cell-city="{ value, row }">
+                            <QTd auto-width>
+                                <span
+                                    class="text-primary cursor-pointer"
+                                    @click="openBuscaman(entity?.route, row)"
+                                >
+                                    {{ value }}
+                                </span>
+                            </QTd>
+                        </template>
+                        <template #body-cell-client="{ value, row }">
+                            <QTd auto-width>
+                                <span class="text-primary cursor-pointer">
+                                    {{ value }}
+                                    <CustomerDescriptorProxy :id="row?.clientFk" />
+                                </span>
+                            </QTd>
+                        </template>
+                        <template #body-cell-ticket="{ value, row }">
+                            <QTd auto-width>
+                                <span class="text-primary cursor-pointer">
+                                    {{ value }}
+                                    <TicketDescriptorProxy :id="row?.id" />
+                                </span>
+                            </QTd>
+                        </template>
+                        <template #body-cell-observations="{ value }">
+                            <QTd auto-width>
+                                <QIcon
+                                    v-if="value"
+                                    name="vn:notes"
+                                    color="primary"
+                                    class="cursor-pointer"
+                                >
+                                    <QTooltip>{{ value }}</QTooltip>
+                                </QIcon>
+                            </QTd>
+                        </template>
+                    </QTable>
+                </QCard>
+            </template>
+        </CardSummary>
+    </div>
+</template>
+<i18n>
+en:
+    route:
+        summary:
+            date: Date
+            agency: Agency
+            vehicle: Vehicle
+            driver: Driver
+            cost: Cost
+            started: Started time
+            finished: Finished time
+            kmStart: Km start
+            kmEnd: Km end
+            volume: Volume
+            packages: Packages
+            description: Description
+            tickets: Tickets
+            order: Order
+            street: Street
+            city: City
+            pc: PC
+            client: Client
+            warehouse: Warehouse
+            m3: m³
+            packaging: Packaging
+            ticket: Ticket
+es:
+    route:
+        summary:
+            date: Fecha
+            agency: Agencia
+            vehicle: Vehículo
+            driver: Conductor
+            cost: Costo
+            started: Hora inicio
+            finished: Hora fin
+            kmStart: Km inicio
+            kmEnd: Km fin
+            volume: Volumen
+            packages: Bultos
+            description: Descripción
+            tickets: Tickets
+            order: Orden
+            street: Dirección fiscal
+            city: Población
+            pc: CP
+            client: Cliente
+            warehouse: Almacén
+            packaging: Encajado
+</i18n>
diff --git a/src/pages/Route/Card/RouteSummaryDialog.vue b/src/pages/Route/Card/RouteSummaryDialog.vue
new file mode 100644
index 000000000..4a943a93a
--- /dev/null
+++ b/src/pages/Route/Card/RouteSummaryDialog.vue
@@ -0,0 +1,29 @@
+<script setup>
+import { useDialogPluginComponent } from 'quasar';
+import RouteSummary from 'pages/Route/Card/RouteSummary.vue';
+
+const $props = defineProps({
+    id: {
+        type: Number,
+        required: true,
+    },
+});
+
+defineEmits([...useDialogPluginComponent.emits]);
+
+const { dialogRef, onDialogHide } = useDialogPluginComponent();
+</script>
+
+<template>
+    <QDialog ref="dialogRef" @hide="onDialogHide">
+        <RouteSummary v-if="$props.id" :id="$props.id" />
+    </QDialog>
+</template>
+
+<style lang="scss">
+.q-dialog .route .header {
+    position: sticky;
+    z-index: $z-max;
+    top: 0;
+}
+</style>
diff --git a/src/pages/Route/RouteList.vue b/src/pages/Route/RouteList.vue
index 5972a6959..591f723e9 100644
--- a/src/pages/Route/RouteList.vue
+++ b/src/pages/Route/RouteList.vue
@@ -13,12 +13,13 @@ import VnInputTime from 'components/common/VnInputTime.vue';
 import axios from 'axios';
 import RouteSearchbar from 'pages/Route/Card/RouteSearchbar.vue';
 import RouteFilter from 'pages/Route/Card/RouteFilter.vue';
+import { useQuasar } from 'quasar';
+import RouteSummaryDialog from 'pages/Route/Card/RouteSummaryDialog.vue';
 
 const stateStore = useStateStore();
-// const router = useRouter();
-// const quasar = useQuasar();
 const { t } = useI18n();
 const { validate } = useValidator();
+const quasar = useQuasar();
 
 const to = Date.vnNew();
 to.setDate(to.getDate() + 1);
@@ -98,6 +99,12 @@ const columns = computed(() => [
         sortable: true,
         align: 'left',
     },
+    {
+        name: 'actions',
+        label: '',
+        sortable: false,
+        align: 'right',
+    },
 ]);
 
 const refreshKey = ref(0);
@@ -151,6 +158,18 @@ const markAsServed = () => {
     refreshKey.value++;
     startingDate.value = null;
 };
+
+function previewRoute(id) {
+    if (!id) {
+        return;
+    }
+    quasar.dialog({
+        component: RouteSummaryDialog,
+        componentProps: {
+            id,
+        },
+    });
+}
 </script>
 
 <template>
@@ -187,7 +206,7 @@ const markAsServed = () => {
                     autofocus
                 />
             </QCardSection>
-
+            <!-- TODO: Add report -->
             <QCardActions align="right">
                 <QBtn flat :label="t('Cancel')" v-close-popup class="text-primary" />
                 <QBtn color="primary" v-close-popup @click="cloneRoutes">
@@ -232,213 +251,237 @@ const markAsServed = () => {
                 </QBtn>
             </div>
         </QToolbar>
-        <VnPaginate
-            :key="refreshKey"
-            data-key="RouteList"
-            url="Routes/filter"
-            :order="['created DESC', 'id DESC']"
-            :limit="20"
-            auto-load
-        >
-            <template #body="{ rows }">
-                <div class="q-pa-md">
-                    <QTable
-                        v-model:selected="selectedRows"
-                        :columns="columns"
-                        :rows="rows"
-                        flat
-                        row-key="id"
-                        selection="multiple"
-                        :rows-per-page-options="[0]"
-                    >
-                        <template #body-cell-worker="props">
-                            <QTd :props="props">
-                                {{ props.row?.workerUserName }}
-                                <QPopupEdit
-                                    :model-value="props.row.workerFk"
-                                    v-slot="scope"
-                                    buttons
-                                    @update:model-value="
-                                        (worker) => updateWorker(props.row, worker)
-                                    "
-                                >
-                                    <VnSelectFilter
-                                        :label="t('Worker')"
-                                        v-model="scope.value"
-                                        :options="workers"
-                                        option-value="id"
-                                        option-label="name"
-                                        hide-selected
-                                        autofocus
-                                        :emit-value="false"
-                                        :rules="validate('Route.workerFk')"
-                                        :is-clearable="false"
-                                        @keyup.enter="scope.set"
-                                        @focus="($event) => $event.target.select()"
+        <div class="route-list">
+            <VnPaginate
+                :key="refreshKey"
+                data-key="RouteList"
+                url="Routes/filter"
+                :order="['created DESC', 'id DESC']"
+                :limit="20"
+                auto-load
+            >
+                <template #body="{ rows }">
+                    <div class="q-pa-md">
+                        <QTable
+                            v-model:selected="selectedRows"
+                            :columns="columns"
+                            :rows="rows"
+                            flat
+                            row-key="id"
+                            selection="multiple"
+                            :rows-per-page-options="[0]"
+                            hide-pagination
+                        >
+                            <template #body-cell-worker="props">
+                                <QTd :props="props">
+                                    {{ props.row?.workerUserName }}
+                                    <QPopupEdit
+                                        :model-value="props.row.workerFk"
+                                        v-slot="scope"
+                                        buttons
+                                        @update:model-value="
+                                            (worker) => updateWorker(props.row, worker)
+                                        "
                                     >
-                                        <template #option="{ opt, itemProps }">
-                                            <QItem
-                                                v-bind="itemProps"
-                                                class="q-pa-xs row items-center"
-                                            >
-                                                <QItemSection
-                                                    class="col-9 justify-center"
+                                        <VnSelectFilter
+                                            :label="t('Worker')"
+                                            v-model="scope.value"
+                                            :options="workers"
+                                            option-value="id"
+                                            option-label="name"
+                                            hide-selected
+                                            autofocus
+                                            :emit-value="false"
+                                            :rules="validate('Route.workerFk')"
+                                            :is-clearable="false"
+                                            @keyup.enter="scope.set"
+                                            @focus="($event) => $event.target.select()"
+                                        >
+                                            <template #option="{ opt, itemProps }">
+                                                <QItem
+                                                    v-bind="itemProps"
+                                                    class="q-pa-xs row items-center"
                                                 >
-                                                    <span>{{ opt.name }}</span>
-                                                    <span class="text-grey">{{
-                                                        opt.nickname
-                                                    }}</span>
-                                                </QItemSection>
-                                            </QItem>
-                                        </template>
-                                    </VnSelectFilter>
-                                </QPopupEdit>
-                            </QTd>
-                        </template>
-                        <template #body-cell-agency="props">
-                            <QTd :props="props">
-                                {{ props.row?.agencyName }}
-                                <QPopupEdit
-                                    :model-value="props.row.agencyModeFk"
-                                    v-slot="scope"
-                                    buttons
-                                    @update:model-value="
-                                        (agency) => updateAgency(props.row, agency)
-                                    "
-                                >
-                                    <VnSelectFilter
-                                        :label="t('Agency')"
-                                        v-model="scope.value"
-                                        :options="agencyList"
-                                        option-value="id"
-                                        option-label="name"
-                                        hide-selected
-                                        autofocus
-                                        :emit-value="false"
-                                        :rules="validate('route.agencyFk')"
-                                        :is-clearable="false"
-                                        @keyup.enter="scope.set"
-                                        @focus="($event) => $event.target.select()"
-                                    />
-                                </QPopupEdit>
-                            </QTd>
-                        </template>
-                        <template #body-cell-vehicle="props">
-                            <QTd :props="props">
-                                {{ props.row?.vehiclePlateNumber }}
-                                <QPopupEdit
-                                    :model-value="props.row.vehicleFk"
-                                    v-slot="scope"
-                                    buttons
-                                    @update:model-value="
-                                        (vehicle) => updateVehicle(props.row, vehicle)
-                                    "
-                                >
-                                    <VnSelectFilter
-                                        :label="t('Vehicle')"
-                                        v-model="scope.value"
-                                        :options="vehicleList"
-                                        option-value="id"
-                                        option-label="numberPlate"
-                                        hide-selected
-                                        autofocus
-                                        :emit-value="false"
-                                        :rules="validate('route.vehicleFk')"
-                                        :is-clearable="false"
-                                        @keyup.enter="scope.set"
-                                        @focus="($event) => $event.target.select()"
-                                    />
-                                </QPopupEdit>
-                            </QTd>
-                        </template>
-                        <template #body-cell-date="props">
-                            <QTd :props="props">
-                                {{ toDate(props.row?.created) }}
-                                <QPopupEdit
-                                    v-model="props.row.created"
-                                    v-slot="scope"
-                                    @update:model-value="updateRoute(props.row)"
-                                    buttons
-                                >
-                                    <VnInputDate
-                                        v-model="scope.value"
-                                        autofocus
-                                        :label="t('Date')"
-                                        :rules="validate('route.created')"
-                                        :is-clearable="false"
-                                        @keyup.enter="scope.set"
-                                        @focus="($event) => $event.target.select()"
-                                    />
-                                </QPopupEdit>
-                            </QTd>
-                        </template>
-                        <template #body-cell-description="props">
-                            <QTd :props="props">
-                                {{ props.row?.description }}
-                                <QPopupEdit
-                                    v-model="props.row.description"
-                                    v-slot="scope"
-                                    @update:model-value="updateRoute(props.row)"
-                                    buttons
-                                >
-                                    <VnInput
-                                        v-model="scope.value"
-                                        autofocus
-                                        :label="t('Description')"
-                                        :rules="validate('route.description')"
-                                        :is-clearable="false"
-                                        @keyup.enter="scope.set"
-                                        @focus="($event) => $event.target.select()"
-                                    />
-                                </QPopupEdit>
-                            </QTd>
-                        </template>
-                        <template #body-cell-started="props">
-                            <QTd :props="props">
-                                {{ toHour(props.row.started) }}
-                                <QPopupEdit
-                                    v-model="props.row.started"
-                                    v-slot="scope"
-                                    buttons
-                                    @update:model-value="updateRoute(props.row)"
-                                >
-                                    <VnInputTime
-                                        v-model="scope.value"
-                                        autofocus
-                                        :label="t('Hour started')"
-                                        :rules="validate('route.started')"
-                                        :is-clearable="false"
-                                        @keyup.enter="scope.set"
-                                        @focus="($event) => $event.target.select()"
-                                    />
-                                </QPopupEdit>
-                            </QTd>
-                        </template>
-                        <template #body-cell-finished="props">
-                            <QTd :props="props">
-                                {{ toHour(props.row.finished) }}
-                                <QPopupEdit
-                                    v-model="props.row.finished"
-                                    v-slot="scope"
-                                    buttons
-                                    @update:model-value="updateRoute(props.row)"
-                                >
-                                    <VnInputTime
-                                        v-model="scope.value"
-                                        autofocus
-                                        :label="t('Hour finished')"
-                                        :rules="validate('route.finished')"
-                                        :is-clearable="false"
-                                        @keyup.enter="scope.set"
-                                        @focus="($event) => $event.target.select()"
-                                    />
-                                </QPopupEdit>
-                            </QTd>
-                        </template>
-                    </QTable>
-                </div>
-            </template>
-        </VnPaginate>
+                                                    <QItemSection
+                                                        class="col-9 justify-center"
+                                                    >
+                                                        <span>{{ opt.name }}</span>
+                                                        <span class="text-grey">{{
+                                                            opt.nickname
+                                                        }}</span>
+                                                    </QItemSection>
+                                                </QItem>
+                                            </template>
+                                        </VnSelectFilter>
+                                    </QPopupEdit>
+                                </QTd>
+                            </template>
+                            <template #body-cell-agency="props">
+                                <QTd :props="props">
+                                    {{ props.row?.agencyName }}
+                                    <QPopupEdit
+                                        :model-value="props.row.agencyModeFk"
+                                        v-slot="scope"
+                                        buttons
+                                        @update:model-value="
+                                            (agency) => updateAgency(props.row, agency)
+                                        "
+                                    >
+                                        <VnSelectFilter
+                                            :label="t('Agency')"
+                                            v-model="scope.value"
+                                            :options="agencyList"
+                                            option-value="id"
+                                            option-label="name"
+                                            hide-selected
+                                            autofocus
+                                            :emit-value="false"
+                                            :rules="validate('route.agencyFk')"
+                                            :is-clearable="false"
+                                            @keyup.enter="scope.set"
+                                            @focus="($event) => $event.target.select()"
+                                        />
+                                    </QPopupEdit>
+                                </QTd>
+                            </template>
+                            <template #body-cell-vehicle="props">
+                                <QTd :props="props">
+                                    {{ props.row?.vehiclePlateNumber }}
+                                    <QPopupEdit
+                                        :model-value="props.row.vehicleFk"
+                                        v-slot="scope"
+                                        buttons
+                                        @update:model-value="
+                                            (vehicle) => updateVehicle(props.row, vehicle)
+                                        "
+                                    >
+                                        <VnSelectFilter
+                                            :label="t('Vehicle')"
+                                            v-model="scope.value"
+                                            :options="vehicleList"
+                                            option-value="id"
+                                            option-label="numberPlate"
+                                            hide-selected
+                                            autofocus
+                                            :emit-value="false"
+                                            :rules="validate('route.vehicleFk')"
+                                            :is-clearable="false"
+                                            @keyup.enter="scope.set"
+                                            @focus="($event) => $event.target.select()"
+                                        />
+                                    </QPopupEdit>
+                                </QTd>
+                            </template>
+                            <template #body-cell-date="props">
+                                <QTd :props="props">
+                                    {{ toDate(props.row?.created) }}
+                                    <QPopupEdit
+                                        v-model="props.row.created"
+                                        v-slot="scope"
+                                        @update:model-value="updateRoute(props.row)"
+                                        buttons
+                                    >
+                                        <VnInputDate
+                                            v-model="scope.value"
+                                            autofocus
+                                            :label="t('Date')"
+                                            :rules="validate('route.created')"
+                                            :is-clearable="false"
+                                            @keyup.enter="scope.set"
+                                            @focus="($event) => $event.target.select()"
+                                        />
+                                    </QPopupEdit>
+                                </QTd>
+                            </template>
+                            <template #body-cell-description="props">
+                                <QTd :props="props">
+                                    {{ props.row?.description }}
+                                    <QPopupEdit
+                                        v-model="props.row.description"
+                                        v-slot="scope"
+                                        @update:model-value="updateRoute(props.row)"
+                                        buttons
+                                    >
+                                        <VnInput
+                                            v-model="scope.value"
+                                            autofocus
+                                            :label="t('Description')"
+                                            :rules="validate('route.description')"
+                                            :is-clearable="false"
+                                            @keyup.enter="scope.set"
+                                            @focus="($event) => $event.target.select()"
+                                        />
+                                    </QPopupEdit>
+                                </QTd>
+                            </template>
+                            <template #body-cell-started="props">
+                                <QTd :props="props">
+                                    {{ toHour(props.row.started) }}
+                                    <QPopupEdit
+                                        v-model="props.row.started"
+                                        v-slot="scope"
+                                        buttons
+                                        @update:model-value="updateRoute(props.row)"
+                                    >
+                                        <VnInputTime
+                                            v-model="scope.value"
+                                            autofocus
+                                            :label="t('Hour started')"
+                                            :rules="validate('route.started')"
+                                            :is-clearable="false"
+                                            @keyup.enter="scope.set"
+                                            @focus="($event) => $event.target.select()"
+                                        />
+                                    </QPopupEdit>
+                                </QTd>
+                            </template>
+                            <template #body-cell-finished="props">
+                                <QTd :props="props">
+                                    {{ toHour(props.row.finished) }}
+                                    <QPopupEdit
+                                        v-model="props.row.finished"
+                                        v-slot="scope"
+                                        buttons
+                                        @update:model-value="updateRoute(props.row)"
+                                    >
+                                        <VnInputTime
+                                            v-model="scope.value"
+                                            autofocus
+                                            :label="t('Hour finished')"
+                                            :rules="validate('route.finished')"
+                                            :is-clearable="false"
+                                            @keyup.enter="scope.set"
+                                            @focus="($event) => $event.target.select()"
+                                        />
+                                    </QPopupEdit>
+                                </QTd>
+                            </template>
+                            <template #body-cell-actions="props">
+                                <QTd :props="props">
+                                    <div class="table-actions">
+                                        <QIcon
+                                            name="vn:ticketAdd"
+                                            size="xs"
+                                            color="primary"
+                                        >
+                                            <QTooltip>{{ t('Add ticket') }}</QTooltip>
+                                        </QIcon>
+                                        <QIcon
+                                            name="preview"
+                                            size="xs"
+                                            color="primary"
+                                            @click="previewRoute(props?.row?.id)"
+                                        >
+                                            <QTooltip>{{ t('Preview') }}</QTooltip>
+                                        </QIcon>
+                                    </div>
+                                </QTd>
+                            </template>
+                        </QTable>
+                    </div>
+                </template>
+            </VnPaginate>
+        </div>
         <QPageSticky :offset="[20, 20]">
             <RouterLink :to="{ name: 'RouteCreate' }">
                 <QBtn fab icon="add" color="primary" />
@@ -451,9 +494,18 @@ const markAsServed = () => {
 </template>
 
 <style lang="scss" scoped>
-.card-list {
+.route-list {
     width: 100%;
-    max-width: 60em;
+}
+
+.table-actions {
+    display: flex;
+    align-items: center;
+    gap: 12px;
+
+    i {
+        cursor: pointer;
+    }
 }
 </style>
 <i18n>
diff --git a/src/router/modules/route.js b/src/router/modules/route.js
index f6553a4f1..614345913 100644
--- a/src/router/modules/route.js
+++ b/src/router/modules/route.js
@@ -11,14 +11,14 @@ export default {
     redirect: { name: 'RouteMain' },
     menus: {
         main: ['RouteList', 'CmrList'],
-        card: [],
+        card: ['RouteBasicData'],
     },
     children: [
         {
             path: '/route',
             name: 'RouteMain',
             component: () => import('src/pages/Route/RouteMain.vue'),
-            redirect: { name: 'CmrList' },
+            redirect: { name: 'RouteList' },
             children: [
                 {
                     path: 'cmr',
@@ -34,7 +34,7 @@ export default {
                     name: 'RouteList',
                     meta: {
                         title: 'RouteList',
-                        icon: 'vn:delivery',
+                        icon: 'view_list',
                     },
                     component: () => import('src/pages/Route/RouteList.vue'),
                 },
@@ -52,8 +52,7 @@ export default {
             name: 'RouteCard',
             path: ':id',
             component: () => import('src/pages/Route/Card/RouteCard.vue'),
-            // TODO: Add summary
-            redirect: { name: 'RouteBasicData' },
+            redirect: { name: 'RouteSummary' },
             children: [
                 {
                     name: 'RouteBasicData',
@@ -64,6 +63,15 @@ export default {
                     },
                     component: () => import('pages/Route/Card/RouteForm.vue'),
                 },
+                {
+                    name: 'RouteSummary',
+                    path: 'summary',
+                    meta: {
+                        title: 'summary',
+                        icon: 'open_in_new',
+                    },
+                    component: () => import('pages/Route/Card/RouteSummary.vue'),
+                },
             ],
         },
     ],

From 9588ffb54bfb326390f8aaaa0fcf2f48893b6c3f Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Thu, 18 Jan 2024 11:20:21 -0300
Subject: [PATCH 60/94] remove log

---
 src/pages/Supplier/Card/SupplierFiscalData.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/Supplier/Card/SupplierFiscalData.vue b/src/pages/Supplier/Card/SupplierFiscalData.vue
index 28ad26961..d481d6205 100644
--- a/src/pages/Supplier/Card/SupplierFiscalData.vue
+++ b/src/pages/Supplier/Card/SupplierFiscalData.vue
@@ -288,7 +288,6 @@ const onPostcodeCreated = async ({ code, provinceFk, townFk, countryFk }, formDa
                     </div>
                 </div>
             </VnRow>
-            <pre> {{ data }}</pre>
         </template>
     </FormModel>
 </template>

From 862dc20bcd38ec8d3595a120ce23a32107af2649 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Fri, 19 Jan 2024 10:48:23 -0300
Subject: [PATCH 61/94] Add translation to SupplierCard search-bar

---
 src/pages/Supplier/Card/SupplierCard.vue | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/pages/Supplier/Card/SupplierCard.vue b/src/pages/Supplier/Card/SupplierCard.vue
index 6b6e8c7f7..1b9b858d3 100644
--- a/src/pages/Supplier/Card/SupplierCard.vue
+++ b/src/pages/Supplier/Card/SupplierCard.vue
@@ -62,3 +62,8 @@ const { t } = useI18n();
     }
 }
 </style>
+
+<i18n>
+    es:
+        Search suppliers: Buscar proveedores
+</i18n>

From c7b9f4ce5b230989582244e09376506b74f449df Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Fri, 19 Jan 2024 11:16:35 -0300
Subject: [PATCH 62/94] Change entry buys plural translation logic

---
 src/pages/Entry/Card/EntryBuys.vue | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/pages/Entry/Card/EntryBuys.vue b/src/pages/Entry/Card/EntryBuys.vue
index 87d4b3826..990feb656 100644
--- a/src/pages/Entry/Card/EntryBuys.vue
+++ b/src/pages/Entry/Card/EntryBuys.vue
@@ -227,18 +227,20 @@ const openRemoveDialog = async () => {
             component: VnConfirm,
             componentProps: {
                 title: t('Confirm deletion'),
-                message:
-                    rowsSelected.value.length > 1
-                        ? t('Are you sure you want to delete this buys?')
-                        : t('Are you sure you want to delete this buy?'),
+                message: t(
+                    `Are you sure you want to delete this buy${
+                        rowsSelected.value.length > 1 ? 's' : ''
+                    }?`
+                ),
                 data: rowsSelected.value,
             },
         })
         .onOk(async () => {
             try {
                 await deleteBuys();
-                const notifyMessage =
-                    rowsSelected.value.length > 1 ? t('Buys deleted') : t('Buy deleted');
+                const notifyMessage = t(
+                    `Buy${rowsSelected.value.length > 1 ? 's' : ''} deleted`
+                );
                 notify(notifyMessage, 'positive');
             } catch (err) {
                 console.error('Error deleting buys');

From cae42486c86b2de340e0e74b556773993bd1da39 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Fri, 19 Jan 2024 11:25:19 -0300
Subject: [PATCH 63/94] apply nowrap to QTooltip

---
 src/pages/Entry/Card/EntryBuys.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/Entry/Card/EntryBuys.vue b/src/pages/Entry/Card/EntryBuys.vue
index 990feb656..5eee14d29 100644
--- a/src/pages/Entry/Card/EntryBuys.vue
+++ b/src/pages/Entry/Card/EntryBuys.vue
@@ -383,7 +383,7 @@ const importBuys = () => {
     </VnPaginate>
     <QPageSticky :offset="[20, 20]">
         <QBtn fab icon="upload" color="primary" @click="importBuys()" />
-        <QTooltip>
+        <QTooltip class="text-no-wrap">
             {{ t('Import buys') }}
         </QTooltip>
     </QPageSticky>

From 5d0290f58546ffad4ef8cd4004a37dc30d316f2f Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Fri, 19 Jan 2024 11:29:43 -0300
Subject: [PATCH 64/94] Fix QFile label translation in entry buys

---
 src/i18n/en/index.js                     | 3 ++-
 src/i18n/es/index.js                     | 1 +
 src/pages/Entry/Card/EntryBuysImport.vue | 3 ++-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index 742134ecd..e67f86f89 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -334,6 +334,7 @@ export default {
             grouping: 'Grouping',
             buyingValue: 'Buying value',
             packagingFk: 'Box',
+            file: 'File',
         },
         notes: {
             observationType: 'Observation type',
@@ -886,7 +887,7 @@ export default {
             RouteList: 'List',
             create: 'Create',
             basicData: 'Basic Data',
-            summary: 'Summary'
+            summary: 'Summary',
         },
         cmr: {
             list: {
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index ed6633bd9..cd0a0a2ad 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -333,6 +333,7 @@ export default {
             grouping: 'Grouping',
             buyingValue: 'Coste',
             packagingFk: 'Embalaje',
+            file: 'Fichero',
         },
         notes: {
             observationType: 'Tipo de observación',
diff --git a/src/pages/Entry/Card/EntryBuysImport.vue b/src/pages/Entry/Card/EntryBuysImport.vue
index 1495e968d..50f5aeae8 100644
--- a/src/pages/Entry/Card/EntryBuysImport.vue
+++ b/src/pages/Entry/Card/EntryBuysImport.vue
@@ -197,10 +197,11 @@ const redirectToBuysView = () => {
             <VnRow class="row q-gutter-md q-mb-md">
                 <div class="col">
                     <QFile
-                        label="Standard"
+                        :label="t('entry.buys.file')"
                         :multiple="false"
                         v-model="importData.file"
                         @update:model-value="onFileChange($event)"
+                        class="required"
                     >
                         <template #append>
                             <QIcon name="vn:attach" class="cursor-pointer">

From a888472ad226820412c3b37e6f0d52bf2a467df4 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Fri, 19 Jan 2024 11:34:07 -0300
Subject: [PATCH 65/94] Fix tooltip label in supplier agency term

---
 src/i18n/en/index.js                           | 1 +
 src/i18n/es/index.js                           | 1 +
 src/pages/Supplier/Card/SupplierAgencyTerm.vue | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index e67f86f89..1a7a4c27e 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -1017,6 +1017,7 @@ export default {
             m3Price: 'M3 Price',
             routePrice: 'Route price',
             minimumKm: 'Minimum Km',
+            addRow: 'Add row',
         },
         consumption: {
             entry: 'Entry',
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index cd0a0a2ad..83de42ee0 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -1017,6 +1017,7 @@ export default {
             m3Price: 'Precio M3',
             routePrice: 'Precio ruta',
             minimumKm: 'Km mínimos',
+            addRow: 'Añadir fila',
         },
         consumption: {
             entry: 'Entrada',
diff --git a/src/pages/Supplier/Card/SupplierAgencyTerm.vue b/src/pages/Supplier/Card/SupplierAgencyTerm.vue
index a300ae8e7..769ff4dad 100644
--- a/src/pages/Supplier/Card/SupplierAgencyTerm.vue
+++ b/src/pages/Supplier/Card/SupplierAgencyTerm.vue
@@ -128,7 +128,7 @@ onMounted(() => {
     <QPageSticky :offset="[20, 20]">
         <QBtn fab icon="add" color="primary" @click="redirectToCreateView()" />
         <QTooltip>
-            {{ t('supplier.list.newSupplier') }}
+            {{ t('supplier.agencyTerms.addRow') }}
         </QTooltip>
     </QPageSticky>
 </template>

From 533435c7ba1d4587e927c39ea964055b43f27cd6 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Fri, 19 Jan 2024 15:16:36 -0300
Subject: [PATCH 66/94] Remove pre tag in WorkerCreate component

---
 src/pages/Worker/WorkerCreate.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/Worker/WorkerCreate.vue b/src/pages/Worker/WorkerCreate.vue
index 91d4d454b..5cc3993ea 100644
--- a/src/pages/Worker/WorkerCreate.vue
+++ b/src/pages/Worker/WorkerCreate.vue
@@ -363,7 +363,6 @@ onMounted(async () => {
                         </template>
                     </VnSelectCreate>
                 </VnRow>
-                <pre>{{ data }}</pre>
             </template>
         </FormModel>
     </QPage>

From 0df15b2d8898e02c7830e4af1d528cfce68c48c3 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Mon, 22 Jan 2024 12:45:07 +0100
Subject: [PATCH 67/94] refs #6733 remove alert

---
 src/components/FormModel.vue | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/components/FormModel.vue b/src/components/FormModel.vue
index a5560dfc0..405b895e7 100644
--- a/src/components/FormModel.vue
+++ b/src/components/FormModel.vue
@@ -176,13 +176,6 @@ watch(formUrl, async () => {
 });
 </script>
 <template>
-    <QBanner
-        v-if="$props.observeFormChanges && hasChanges"
-        class="text-white bg-warning full-width"
-    >
-        <QIcon name="warning" size="md" class="q-mr-md" />
-        <span>{{ t('globals.changesToSave') }}</span>
-    </QBanner>
     <div class="column items-center full-width">
         <QForm
             v-if="formData"

From 2400eca1e320cf7142cb10c06060a8ec8feb9f41 Mon Sep 17 00:00:00 2001
From: carlosfonseca <carlos.fonseca@mindshore.io>
Date: Mon, 22 Jan 2024 06:53:47 -0500
Subject: [PATCH 68/94] Se hace correccion solicitada en issuecomment-39495

---
 .../components/CustomerConsigneeCreate.vue    | 31 +++++++++----------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/src/pages/Customer/components/CustomerConsigneeCreate.vue b/src/pages/Customer/components/CustomerConsigneeCreate.vue
index aadf554b3..92ce47bf2 100644
--- a/src/pages/Customer/components/CustomerConsigneeCreate.vue
+++ b/src/pages/Customer/components/CustomerConsigneeCreate.vue
@@ -1,7 +1,7 @@
 <script setup>
 import { onBeforeMount, reactive, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { useRoute } from 'vue-router';
+import { useRoute, useRouter } from 'vue-router';
 
 import axios from 'axios';
 
@@ -16,20 +16,9 @@ import CustomsNewCustomsAgent from 'src/pages/Customer/components/CustomerNewCus
 
 const { t } = useI18n();
 const route = useRoute();
+const router = useRouter();
 
-const formInitialData = reactive({
-    isDefaultAddress: false,
-    nickname: null,
-    street: null,
-    postalCode: null,
-    city: null,
-    provinceFk: null,
-    agencyModeFk: null,
-    phone: null,
-    mobile: null,
-    incotermsFk: null,
-    customsAgentFk: null,
-});
+const formInitialData = reactive({ isDefaultAddress: false });
 
 const townsFetchDataRef = ref(null);
 const postcodeFetchDataRef = ref(null);
@@ -63,19 +52,28 @@ const getCustomsAgents = async () => {
 const refreshData = () => {
     getCustomsAgents();
 };
+
+const toCustomerConsignees = () => {
+    router.push({
+        name: 'CustomerConsignees',
+        params: {
+            id: route.params.id,
+        },
+    });
+};
 </script>
 
 <template>
     <FetchData
-        ref="postcodeFetchDataRef"
         @on-fetch="(data) => (postcodesOptions = data)"
         auto-load
+        ref="postcodeFetchDataRef"
         url="Postcodes/location"
     />
     <FetchData
-        ref="townsFetchDataRef"
         @on-fetch="(data) => (citiesLocationOptions = data)"
         auto-load
+        ref="townsFetchDataRef"
         url="Towns/location"
     />
     <FetchData
@@ -94,6 +92,7 @@ const refreshData = () => {
         :form-initial-data="formInitialData"
         :observe-form-changes="false"
         :url-create="urlCreate"
+        @on-data-saved="toCustomerConsignees()"
         model="client"
     >
         <template #form="{ data, validate }">

From 9c2267e116a9679dbb73251739daf95b7784ecd7 Mon Sep 17 00:00:00 2001
From: carlosfonseca <carlos.fonseca@mindshore.io>
Date: Mon, 22 Jan 2024 07:01:41 -0500
Subject: [PATCH 69/94] Se hace correccion solicitada en issuecomment-39487

---
 src/pages/Customer/Card/CustomerConsignees.vue | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerConsignees.vue b/src/pages/Customer/Card/CustomerConsignees.vue
index bf61ea302..4ddf1dea1 100644
--- a/src/pages/Customer/Card/CustomerConsignees.vue
+++ b/src/pages/Customer/Card/CustomerConsignees.vue
@@ -91,7 +91,7 @@ const toCustomerConsigneeEdit = (consigneeId) => {
                     }"
                     @click="toCustomerConsigneeEdit(item.id)"
                 >
-                    <div class="consignees-card-icon">
+                    <div class="q-ml-xs q-mr-md flex items-center">
                         <QIcon name="star" size="md" color="primary" />
                     </div>
                     <div>
@@ -166,11 +166,6 @@ const toCustomerConsigneeEdit = (consigneeId) => {
         background-color: var(--vn-light-gray);
     }
 }
-.consignees-card-icon {
-    margin: 0 15px 0 5px;
-    display: flex;
-    align-items: center;
-}
 </style>
 
 <i18n>

From 9d4d3bf84dcf1bcf13a2369af89d52545a3d96cf Mon Sep 17 00:00:00 2001
From: carlosfonseca <carlos.fonseca@mindshore.io>
Date: Mon, 22 Jan 2024 07:55:30 -0500
Subject: [PATCH 70/94] Se hace correccion solicitada en issuecomment-39488

---
 src/pages/Customer/Card/CustomerCredits.vue | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerCredits.vue b/src/pages/Customer/Card/CustomerCredits.vue
index 13bc684b3..931cbf0cf 100644
--- a/src/pages/Customer/Card/CustomerCredits.vue
+++ b/src/pages/Customer/Card/CustomerCredits.vue
@@ -117,9 +117,10 @@ const toCustomerCreditCreate = () => {
                     <QTr :props="props" class="cursor-pointer">
                         <component
                             :is="tableColumnComponents[props.col.name].component"
-                            class="col-content"
-                            v-bind="tableColumnComponents[props.col.name].props(props)"
                             @click="tableColumnComponents[props.col.name].event(props)"
+                            class="rounded-borders q-pa-sm"
+                            style="border: 1px solid red"
+                            v-bind="tableColumnComponents[props.col.name].props(props)"
                         >
                             {{ props.value }}
                             <WorkerDescriptorProxy :id="workerId" />
@@ -138,13 +139,6 @@ const toCustomerCreditCreate = () => {
     </QPageSticky>
 </template>
 
-<style lang="scss" scoped>
-.col-content {
-    border-radius: 4px;
-    padding: 6px;
-}
-</style>
-
 <i18n>
 es:
     Since: Desde

From 676b178892cc1e7d000b6f276060b3b48350f703 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Mon, 22 Jan 2024 14:24:01 +0100
Subject: [PATCH 71/94] refs #6655 remove clickStop

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

diff --git a/src/pages/Claim/ClaimList.vue b/src/pages/Claim/ClaimList.vue
index df9af4743..a11e1e886 100644
--- a/src/pages/Claim/ClaimList.vue
+++ b/src/pages/Claim/ClaimList.vue
@@ -87,7 +87,7 @@ function viewSummary(id) {
                         v-for="row of rows"
                     >
                         <template #list-items>
-                            <VnLv :label="t('claim.list.customer')" @click.stop>
+                            <VnLv :label="t('claim.list.customer')">
                                 <template #value>
                                     <span class="link" @click.stop>
                                         {{ row.clientName }}

From 30c90e534ce4140c0c961bd09f4ac00793dbcdf6 Mon Sep 17 00:00:00 2001
From: carlosfonseca <carlos.fonseca@mindshore.io>
Date: Mon, 22 Jan 2024 08:44:15 -0500
Subject: [PATCH 72/94] Se hace correccion solicitada en issuecomment-39493

---
 src/pages/Customer/Card/CustomerCredits.vue | 1 -
 src/pages/Customer/Card/CustomerNotes.vue   | 6 ++++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerCredits.vue b/src/pages/Customer/Card/CustomerCredits.vue
index 931cbf0cf..3124a18fc 100644
--- a/src/pages/Customer/Card/CustomerCredits.vue
+++ b/src/pages/Customer/Card/CustomerCredits.vue
@@ -119,7 +119,6 @@ const toCustomerCreditCreate = () => {
                             :is="tableColumnComponents[props.col.name].component"
                             @click="tableColumnComponents[props.col.name].event(props)"
                             class="rounded-borders q-pa-sm"
-                            style="border: 1px solid red"
                             v-bind="tableColumnComponents[props.col.name].props(props)"
                         >
                             {{ props.value }}
diff --git a/src/pages/Customer/Card/CustomerNotes.vue b/src/pages/Customer/Card/CustomerNotes.vue
index 303ea0980..09f5c0ce6 100644
--- a/src/pages/Customer/Card/CustomerNotes.vue
+++ b/src/pages/Customer/Card/CustomerNotes.vue
@@ -36,7 +36,9 @@ const toCustomerNoteCreate = () => {
                         v-for="(item, index) in rows"
                         :key="index"
                         :class="{
-                            'consignees-card': true,
+                            'q-pa-md': true,
+                            'q-rounded': true,
+                            'custom-border': true,
                             'q-mb-md': index < rows.length - 1,
                         }"
                     >
@@ -82,7 +84,7 @@ const toCustomerNoteCreate = () => {
 </template>
 
 <style lang="scss">
-.consignees-card {
+.custom-border {
     border: 2px solid var(--vn-light-gray);
     border-radius: 10px;
     padding: 10px;

From def175bee25ea1d7d4112c74e9b0bb76efbd0ee0 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Mon, 22 Jan 2024 12:11:51 -0300
Subject: [PATCH 73/94] move QList element and classes inside VnFilterPanel

---
 src/components/common/VnLogFilter.vue         |  42 +-
 src/components/common/VnSelectFilter.vue      |   6 +
 src/components/ui/VnFilterPanel.vue           |  10 +-
 src/pages/Claim/ClaimFilter.vue               | 263 +++---
 src/pages/Customer/CustomerFilter.vue         | 237 +++--
 .../Defaulter/CustomerDefaulterFilter.vue     | 275 +++---
 .../CustomerExtendedListFilter.vue            | 830 +++++++++---------
 .../CustomerNotificationsFilter.vue           | 143 ++-
 .../Payments/CustomerPaymentsFilter.vue       | 117 ++-
 src/pages/Entry/EntryFilter.vue               | 288 +++---
 src/pages/InvoiceIn/InvoiceInFilter.vue       | 281 +++---
 src/pages/InvoiceOut/InvoiceOutFilter.vue     | 138 ++-
 .../InvoiceOutNegativeBasesFilter.vue         | 148 ++--
 src/pages/Order/Card/OrderCatalogFilter.vue   | 330 ++++---
 src/pages/Order/Card/OrderFilter.vue          | 294 +++----
 src/pages/Route/Card/RouteFilter.vue          | 274 +++---
 src/pages/Route/Cmr/CmrFilter.vue             | 192 ++--
 src/pages/Shelving/Card/ShelvingFilter.vue    | 110 +--
 src/pages/Ticket/TicketFilter.vue             | 322 ++++---
 src/pages/Travel/ExtraCommunityFilter.vue     | 285 +++---
 src/pages/Travel/TravelFilter.vue             | 401 +++++----
 src/pages/Worker/WorkerFilter.vue             | 134 ++-
 22 files changed, 2476 insertions(+), 2644 deletions(-)

diff --git a/src/components/common/VnLogFilter.vue b/src/components/common/VnLogFilter.vue
index 5f4dbf717..b5941239c 100644
--- a/src/components/common/VnLogFilter.vue
+++ b/src/components/common/VnLogFilter.vue
@@ -38,28 +38,26 @@ const workers = ref();
                 minimal
             >
             </QDate>
-            <QList dense>
-                <QSeparator />
-                <QItem>
-                    <QItemSection v-if="!workers">
-                        <QSkeleton type="QInput" class="full-width" />
-                    </QItemSection>
-                    <QItemSection v-if="workers">
-                        <QSelect
-                            :label="t('User')"
-                            v-model="params.userFk"
-                            @update:model-value="searchFn()"
-                            :options="workers"
-                            option-value="id"
-                            option-label="name"
-                            emit-value
-                            map-options
-                            use-input
-                            :input-debounce="0"
-                        />
-                    </QItemSection>
-                </QItem>
-            </QList>
+            <QSeparator />
+            <QItem>
+                <QItemSection v-if="!workers">
+                    <QSkeleton type="QInput" class="full-width" />
+                </QItemSection>
+                <QItemSection v-if="workers">
+                    <QSelect
+                        :label="t('User')"
+                        v-model="params.userFk"
+                        @update:model-value="searchFn()"
+                        :options="workers"
+                        option-value="id"
+                        option-label="name"
+                        emit-value
+                        map-options
+                        use-input
+                        :input-debounce="0"
+                    />
+                </QItemSection>
+            </QItem>
         </template>
     </VnFilterPanel>
 </template>
diff --git a/src/components/common/VnSelectFilter.vue b/src/components/common/VnSelectFilter.vue
index 244fb50bb..377a39a0e 100644
--- a/src/components/common/VnSelectFilter.vue
+++ b/src/components/common/VnSelectFilter.vue
@@ -116,3 +116,9 @@ watch(options, (newValue) => {
         </template>
     </QSelect>
 </template>
+
+<style scoped lang="scss">
+.q-field--outlined {
+    max-width: 100%;
+}
+</style>
diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue
index 0a306dc5f..708a170a2 100644
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@@ -216,7 +216,9 @@ function formatValue(value) {
             </QItem>
             <QSeparator />
         </QList>
-        <slot name="body" :params="userParams" :search-fn="search"></slot>
+        <QList dense class="list q-gutter-y-sm q-mt-sm">
+            <slot name="body" :params="userParams" :search-fn="search"></slot>
+        </QList>
         <template v-if="props.searchButton">
             <QItem>
                 <QItemSection class="q-py-sm">
@@ -242,6 +244,12 @@ function formatValue(value) {
     />
 </template>
 
+<style scoped lang="scss">
+.list {
+    width: 256px;
+}
+</style>
+
 <i18n>
 es:
     No filters applied: No se han aplicado filtros
diff --git a/src/pages/Claim/ClaimFilter.vue b/src/pages/Claim/ClaimFilter.vue
index b06f47653..ee702ffdd 100644
--- a/src/pages/Claim/ClaimFilter.vue
+++ b/src/pages/Claim/ClaimFilter.vue
@@ -36,123 +36,122 @@ const states = ref();
             </div>
         </template>
         <template #body="{ params, searchFn }">
-            <QList dense class="list">
-                <QItem class="q-my-sm">
-                    <QItemSection>
-                        <VnInput
-                            :label="t('Customer ID')"
-                            v-model="params.clientFk"
-                            lazy-rules
-                            is-outlined
-                        >
-                            <template #prepend>
-                                <QIcon name="badge" size="xs"></QIcon> </template
-                        ></VnInput>
-                    </QItemSection>
-                </QItem>
-                <QItem class="q-mb-sm">
-                    <QItemSection>
-                        <VnInput
-                            :label="t('Client Name')"
-                            v-model="params.clientName"
-                            lazy-rules
-                            is-outlined
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem class="q-mb-sm">
-                    <QItemSection v-if="!workers">
-                        <QSkeleton type="QInput" class="full-width" />
-                    </QItemSection>
-                    <QItemSection v-if="workers">
-                        <VnSelectFilter
-                            :label="t('Salesperson')"
-                            v-model="params.salesPersonFk"
-                            @update:model-value="searchFn()"
-                            :options="workers"
-                            option-value="id"
-                            option-label="name"
-                            emit-value
-                            map-options
-                            use-input
-                            hide-selected
-                            dense
-                            outlined
-                            rounded
-                            :input-debounce="0"
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem class="q-mb-sm">
-                    <QItemSection v-if="!workers">
-                        <QSkeleton type="QInput" class="full-width" />
-                    </QItemSection>
-                    <QItemSection v-if="workers">
-                        <VnSelectFilter
-                            :label="t('Attender')"
-                            v-model="params.attenderFk"
-                            @update:model-value="searchFn()"
-                            :options="workers"
-                            option-value="id"
-                            option-label="name"
-                            emit-value
-                            map-options
-                            use-input
-                            hide-selected
-                            dense
-                            outlined
-                            rounded
-                            :input-debounce="0"
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem class="q-mb-sm">
-                    <QItemSection v-if="!workers">
-                        <QSkeleton type="QInput" class="full-width" />
-                    </QItemSection>
-                    <QItemSection v-if="workers">
-                        <VnSelectFilter
-                            :label="t('Responsible')"
-                            v-model="params.claimResponsibleFk"
-                            @update:model-value="searchFn()"
-                            :options="workers"
-                            option-value="id"
-                            option-label="name"
-                            emit-value
-                            map-options
-                            use-input
-                            hide-selected
-                            dense
-                            outlined
-                            rounded
-                            :input-debounce="0"
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem class="q-mb-sm">
-                    <QItemSection v-if="!states">
-                        <QSkeleton type="QInput" class="full-width" />
-                    </QItemSection>
-                    <QItemSection v-if="states">
-                        <VnSelectFilter
-                            :label="t('State')"
-                            v-model="params.claimStateFk"
-                            @update:model-value="searchFn()"
-                            :options="states"
-                            option-value="id"
-                            option-label="description"
-                            emit-value
-                            map-options
-                            hide-selected
-                            dense
-                            outlined
-                            rounded
-                        />
-                    </QItemSection>
-                </QItem>
-                <QSeparator />
-                <QExpansionItem :label="t('More options')" expand-separator>
-                    <!-- <QItem>
+            <QItem class="q-my-sm">
+                <QItemSection>
+                    <VnInput
+                        :label="t('Customer ID')"
+                        v-model="params.clientFk"
+                        lazy-rules
+                        is-outlined
+                    >
+                        <template #prepend>
+                            <QIcon name="badge" size="xs"></QIcon> </template
+                    ></VnInput>
+                </QItemSection>
+            </QItem>
+            <QItem class="q-mb-sm">
+                <QItemSection>
+                    <VnInput
+                        :label="t('Client Name')"
+                        v-model="params.clientName"
+                        lazy-rules
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem class="q-mb-sm">
+                <QItemSection v-if="!workers">
+                    <QSkeleton type="QInput" class="full-width" />
+                </QItemSection>
+                <QItemSection v-if="workers">
+                    <VnSelectFilter
+                        :label="t('Salesperson')"
+                        v-model="params.salesPersonFk"
+                        @update:model-value="searchFn()"
+                        :options="workers"
+                        option-value="id"
+                        option-label="name"
+                        emit-value
+                        map-options
+                        use-input
+                        hide-selected
+                        dense
+                        outlined
+                        rounded
+                        :input-debounce="0"
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem class="q-mb-sm">
+                <QItemSection v-if="!workers">
+                    <QSkeleton type="QInput" class="full-width" />
+                </QItemSection>
+                <QItemSection v-if="workers">
+                    <VnSelectFilter
+                        :label="t('Attender')"
+                        v-model="params.attenderFk"
+                        @update:model-value="searchFn()"
+                        :options="workers"
+                        option-value="id"
+                        option-label="name"
+                        emit-value
+                        map-options
+                        use-input
+                        hide-selected
+                        dense
+                        outlined
+                        rounded
+                        :input-debounce="0"
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem class="q-mb-sm">
+                <QItemSection v-if="!workers">
+                    <QSkeleton type="QInput" class="full-width" />
+                </QItemSection>
+                <QItemSection v-if="workers">
+                    <VnSelectFilter
+                        :label="t('Responsible')"
+                        v-model="params.claimResponsibleFk"
+                        @update:model-value="searchFn()"
+                        :options="workers"
+                        option-value="id"
+                        option-label="name"
+                        emit-value
+                        map-options
+                        use-input
+                        hide-selected
+                        dense
+                        outlined
+                        rounded
+                        :input-debounce="0"
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem class="q-mb-sm">
+                <QItemSection v-if="!states">
+                    <QSkeleton type="QInput" class="full-width" />
+                </QItemSection>
+                <QItemSection v-if="states">
+                    <VnSelectFilter
+                        :label="t('State')"
+                        v-model="params.claimStateFk"
+                        @update:model-value="searchFn()"
+                        :options="states"
+                        option-value="id"
+                        option-label="description"
+                        emit-value
+                        map-options
+                        hide-selected
+                        dense
+                        outlined
+                        rounded
+                    />
+                </QItemSection>
+            </QItem>
+            <QSeparator />
+            <QExpansionItem :label="t('More options')" expand-separator>
+                <!-- <QItem>
                         <QItemSection>
                             <qSelect
                                 :label="t('Item')"
@@ -168,30 +167,20 @@ const states = ref();
                             />
                         </QItemSection>
                     </QItem> -->
-                    <QItem>
-                        <QItemSection>
-                            <VnInputDate
-                                v-model="params.created"
-                                :label="t('Created')"
-                                is-outlined
-                            />
-                        </QItemSection>
-                    </QItem>
-                </QExpansionItem>
-            </QList>
+                <QItem>
+                    <QItemSection>
+                        <VnInputDate
+                            v-model="params.created"
+                            :label="t('Created')"
+                            is-outlined
+                        />
+                    </QItemSection>
+                </QItem>
+            </QExpansionItem>
         </template>
     </VnFilterPanel>
 </template>
 
-<style scoped>
-.list {
-    width: 256px;
-}
-.list * {
-    max-width: 100%;
-}
-</style>
-
 <i18n>
 en:
     params:
diff --git a/src/pages/Customer/CustomerFilter.vue b/src/pages/Customer/CustomerFilter.vue
index 36a9add89..593b45509 100644
--- a/src/pages/Customer/CustomerFilter.vue
+++ b/src/pages/Customer/CustomerFilter.vue
@@ -37,153 +37,134 @@ const zones = ref();
             </div>
         </template>
         <template #body="{ params, searchFn }">
-            <QList dense class="list">
-                <QItem class="q-my-sm">
+            <QItem class="q-my-sm">
+                <QItemSection>
+                    <VnInput :label="t('FI')" v-model="params.fi" is-outlined>
+                        <template #prepend>
+                            <QIcon name="badge" size="xs" />
+                        </template>
+                    </VnInput>
+                </QItemSection>
+            </QItem>
+            <QItem class="q-mb-sm">
+                <QItemSection>
+                    <VnInput :label="t('Name')" v-model="params.name" is-outlined />
+                </QItemSection>
+            </QItem>
+            <QItem class="q-mb-sm">
+                <QItemSection>
+                    <VnInput
+                        :label="t('Social Name')"
+                        v-model="params.socialName"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem class="q-mb-sm">
+                <QItemSection v-if="!workers">
+                    <QSkeleton type="QInput" class="full-width" />
+                </QItemSection>
+                <QItemSection v-if="workers">
+                    <VnSelectFilter
+                        :label="t('Salesperson')"
+                        v-model="params.salesPersonFk"
+                        @update:model-value="searchFn()"
+                        :options="workers"
+                        option-value="id"
+                        option-label="name"
+                        emit-value
+                        map-options
+                        use-input
+                        hide-selected
+                        dense
+                        outlined
+                        rounded
+                        :input-debounce="0"
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem class="q-mb-sm">
+                <QItemSection v-if="!provinces">
+                    <QSkeleton type="QInput" class="full-width" />
+                </QItemSection>
+                <QItemSection v-if="provinces">
+                    <VnSelectFilter
+                        :label="t('Province')"
+                        v-model="params.provinceFk"
+                        @update:model-value="searchFn()"
+                        :options="provinces"
+                        option-value="id"
+                        option-label="name"
+                        emit-value
+                        map-options
+                        hide-selected
+                        dense
+                        outlined
+                        rounded
+                        :input-debounce="0"
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem class="q-mb-md">
+                <QItemSection>
+                    <VnInput :label="t('City')" v-model="params.city" is-outlined />
+                </QItemSection>
+            </QItem>
+            <QSeparator />
+            <QExpansionItem :label="t('More options')" expand-separator>
+                <QItem>
                     <QItemSection>
-                        <VnInput :label="t('FI')" v-model="params.fi" is-outlined>
+                        <VnInput :label="t('Phone')" v-model="params.phone" is-outlined>
                             <template #prepend>
-                                <QIcon name="badge" size="xs" />
+                                <QIcon name="phone" size="xs" />
                             </template>
                         </VnInput>
                     </QItemSection>
                 </QItem>
-                <QItem class="q-mb-sm">
+                <QItem>
                     <QItemSection>
-                        <VnInput :label="t('Name')" v-model="params.name" is-outlined />
+                        <VnInput :label="t('Email')" v-model="params.email" is-outlined>
+                            <template #prepend>
+                                <QIcon name="email" size="sm" />
+                            </template>
+                        </VnInput>
                     </QItemSection>
                 </QItem>
-                <QItem class="q-mb-sm">
+                <QItem>
+                    <QItemSection v-if="!zones">
+                        <QSkeleton type="QInput" class="full-width" />
+                    </QItemSection>
+                    <QItemSection v-if="zones">
+                        <VnSelectFilter
+                            :label="t('Zone')"
+                            v-model="params.zoneFk"
+                            @update:model-value="searchFn()"
+                            :options="zones"
+                            option-value="id"
+                            option-label="name"
+                            emit-value
+                            map-options
+                            hide-selected
+                            dense
+                            outlined
+                            rounded
+                        />
+                    </QItemSection>
+                </QItem>
+                <QItem>
                     <QItemSection>
                         <VnInput
-                            :label="t('Social Name')"
-                            v-model="params.socialName"
+                            :label="t('Postcode')"
+                            v-model="params.postcode"
                             is-outlined
                         />
                     </QItemSection>
                 </QItem>
-                <QItem class="q-mb-sm">
-                    <QItemSection v-if="!workers">
-                        <QSkeleton type="QInput" class="full-width" />
-                    </QItemSection>
-                    <QItemSection v-if="workers">
-                        <VnSelectFilter
-                            :label="t('Salesperson')"
-                            v-model="params.salesPersonFk"
-                            @update:model-value="searchFn()"
-                            :options="workers"
-                            option-value="id"
-                            option-label="name"
-                            emit-value
-                            map-options
-                            use-input
-                            hide-selected
-                            dense
-                            outlined
-                            rounded
-                            :input-debounce="0"
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem class="q-mb-sm">
-                    <QItemSection v-if="!provinces">
-                        <QSkeleton type="QInput" class="full-width" />
-                    </QItemSection>
-                    <QItemSection v-if="provinces">
-                        <VnSelectFilter
-                            :label="t('Province')"
-                            v-model="params.provinceFk"
-                            @update:model-value="searchFn()"
-                            :options="provinces"
-                            option-value="id"
-                            option-label="name"
-                            emit-value
-                            map-options
-                            hide-selected
-                            dense
-                            outlined
-                            rounded
-                            :input-debounce="0"
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem class="q-mb-md">
-                    <QItemSection>
-                        <VnInput :label="t('City')" v-model="params.city" is-outlined />
-                    </QItemSection>
-                </QItem>
-                <QSeparator />
-                <QExpansionItem :label="t('More options')" expand-separator>
-                    <QItem>
-                        <QItemSection>
-                            <VnInput
-                                :label="t('Phone')"
-                                v-model="params.phone"
-                                is-outlined
-                            >
-                                <template #prepend>
-                                    <QIcon name="phone" size="xs" />
-                                </template>
-                            </VnInput>
-                        </QItemSection>
-                    </QItem>
-                    <QItem>
-                        <QItemSection>
-                            <VnInput
-                                :label="t('Email')"
-                                v-model="params.email"
-                                is-outlined
-                            >
-                                <template #prepend>
-                                    <QIcon name="email" size="sm" />
-                                </template>
-                            </VnInput>
-                        </QItemSection>
-                    </QItem>
-                    <QItem>
-                        <QItemSection v-if="!zones">
-                            <QSkeleton type="QInput" class="full-width" />
-                        </QItemSection>
-                        <QItemSection v-if="zones">
-                            <VnSelectFilter
-                                :label="t('Zone')"
-                                v-model="params.zoneFk"
-                                @update:model-value="searchFn()"
-                                :options="zones"
-                                option-value="id"
-                                option-label="name"
-                                emit-value
-                                map-options
-                                hide-selected
-                                dense
-                                outlined
-                                rounded
-                            />
-                        </QItemSection>
-                    </QItem>
-                    <QItem>
-                        <QItemSection>
-                            <VnInput
-                                :label="t('Postcode')"
-                                v-model="params.postcode"
-                                is-outlined
-                            />
-                        </QItemSection>
-                    </QItem>
-                </QExpansionItem>
-            </QList>
+            </QExpansionItem>
         </template>
     </VnFilterPanel>
 </template>
 
-<style scoped>
-.list {
-    width: 256px;
-}
-.list * {
-    max-width: 100%;
-}
-</style>
-
 <i18n>
 en:
     params:
diff --git a/src/pages/Customer/Defaulter/CustomerDefaulterFilter.vue b/src/pages/Customer/Defaulter/CustomerDefaulterFilter.vue
index 43ceb1bac..f26af5975 100644
--- a/src/pages/Customer/Defaulter/CustomerDefaulterFilter.vue
+++ b/src/pages/Customer/Defaulter/CustomerDefaulterFilter.vue
@@ -46,163 +46,148 @@ const authors = ref();
         </template>
 
         <template #body="{ params }">
-            <QList dense class="list">
-                <QItem class="q-mb-sm q-mt-sm">
-                    <QItemSection v-if="clients">
-                        <VnSelectFilter
-                            :input-debounce="0"
-                            :label="t('Client')"
-                            :options="clients"
-                            dense
-                            emit-value
-                            hide-selected
-                            map-options
-                            option-label="name"
-                            option-value="clientTypeFk"
-                            outlined
-                            rounded
-                            use-input
-                            v-model="params.clientFk"
-                        />
-                    </QItemSection>
-                    <QItemSection v-else>
-                        <QSkeleton class="full-width" type="QInput" />
-                    </QItemSection>
-                </QItem>
+            <QItem class="q-mb-sm q-mt-sm">
+                <QItemSection v-if="clients">
+                    <VnSelectFilter
+                        :input-debounce="0"
+                        :label="t('Client')"
+                        :options="clients"
+                        dense
+                        emit-value
+                        hide-selected
+                        map-options
+                        option-label="name"
+                        option-value="clientTypeFk"
+                        outlined
+                        rounded
+                        use-input
+                        v-model="params.clientFk"
+                    />
+                </QItemSection>
+                <QItemSection v-else>
+                    <QSkeleton class="full-width" type="QInput" />
+                </QItemSection>
+            </QItem>
 
-                <QItem class="q-mb-sm">
-                    <QItemSection v-if="salespersons">
-                        <VnSelectFilter
-                            :input-debounce="0"
-                            :label="t('Salesperson')"
-                            :options="salespersons"
-                            dense
-                            emit-value
-                            hide-selected
-                            map-options
-                            option-label="name"
-                            option-value="id"
-                            outlined
-                            rounded
-                            use-input
-                            v-model="params.salesPersonFk"
-                        />
-                    </QItemSection>
-                    <QItemSection v-else>
-                        <QSkeleton class="full-width" type="QInput" />
-                    </QItemSection>
-                </QItem>
+            <QItem class="q-mb-sm">
+                <QItemSection v-if="salespersons">
+                    <VnSelectFilter
+                        :input-debounce="0"
+                        :label="t('Salesperson')"
+                        :options="salespersons"
+                        dense
+                        emit-value
+                        hide-selected
+                        map-options
+                        option-label="name"
+                        option-value="id"
+                        outlined
+                        rounded
+                        use-input
+                        v-model="params.salesPersonFk"
+                    />
+                </QItemSection>
+                <QItemSection v-else>
+                    <QSkeleton class="full-width" type="QInput" />
+                </QItemSection>
+            </QItem>
 
-                <QItem class="q-mb-sm">
-                    <QItemSection v-if="countries">
-                        <VnSelectFilter
-                            :input-debounce="0"
-                            :label="t('Country')"
-                            :options="countries"
-                            dense
-                            emit-value
-                            hide-selected
-                            map-options
-                            option-label="country"
-                            option-value="id"
-                            outlined
-                            rounded
-                            use-input
-                            v-model="params.countryFk"
-                        />
-                    </QItemSection>
-                    <QItemSection v-else>
-                        <QSkeleton class="full-width" type="QInput" />
-                    </QItemSection>
-                </QItem>
+            <QItem class="q-mb-sm">
+                <QItemSection v-if="countries">
+                    <VnSelectFilter
+                        :input-debounce="0"
+                        :label="t('Country')"
+                        :options="countries"
+                        dense
+                        emit-value
+                        hide-selected
+                        map-options
+                        option-label="country"
+                        option-value="id"
+                        outlined
+                        rounded
+                        use-input
+                        v-model="params.countryFk"
+                    />
+                </QItemSection>
+                <QItemSection v-else>
+                    <QSkeleton class="full-width" type="QInput" />
+                </QItemSection>
+            </QItem>
 
-                <QItem class="q-mb-sm">
-                    <QItemSection>
-                        <VnInput
-                            :label="t('P. Method')"
-                            is-outlined
-                            v-model="params.paymentMethod"
-                        />
-                    </QItemSection>
-                </QItem>
+            <QItem class="q-mb-sm">
+                <QItemSection>
+                    <VnInput
+                        :label="t('P. Method')"
+                        is-outlined
+                        v-model="params.paymentMethod"
+                    />
+                </QItemSection>
+            </QItem>
 
-                <QItem class="q-mb-sm">
-                    <QItemSection>
-                        <VnInput
-                            :label="t('Balance D.')"
-                            is-outlined
-                            v-model="params.balance"
-                        />
-                    </QItemSection>
-                </QItem>
+            <QItem class="q-mb-sm">
+                <QItemSection>
+                    <VnInput
+                        :label="t('Balance D.')"
+                        is-outlined
+                        v-model="params.balance"
+                    />
+                </QItemSection>
+            </QItem>
 
-                <QItem class="q-mb-sm">
-                    <QItemSection v-if="authors">
-                        <VnSelectFilter
-                            :input-debounce="0"
-                            :label="t('Author')"
-                            :options="authors"
-                            dense
-                            emit-value
-                            hide-selected
-                            map-options
-                            option-label="name"
-                            option-value="id"
-                            outlined
-                            rounded
-                            use-input
-                            v-model="params.workerFk"
-                        />
-                    </QItemSection>
-                    <QItemSection v-else>
-                        <QSkeleton class="full-width" type="QInput" />
-                    </QItemSection>
-                </QItem>
+            <QItem class="q-mb-sm">
+                <QItemSection v-if="authors">
+                    <VnSelectFilter
+                        :input-debounce="0"
+                        :label="t('Author')"
+                        :options="authors"
+                        dense
+                        emit-value
+                        hide-selected
+                        map-options
+                        option-label="name"
+                        option-value="id"
+                        outlined
+                        rounded
+                        use-input
+                        v-model="params.workerFk"
+                    />
+                </QItemSection>
+                <QItemSection v-else>
+                    <QSkeleton class="full-width" type="QInput" />
+                </QItemSection>
+            </QItem>
 
-                <QItem class="q-mb-sm">
-                    <QItemSection>
-                        <VnInput
-                            :label="t('L. O. Date')"
-                            is-outlined
-                            v-model="params.date"
-                        />
-                    </QItemSection>
-                </QItem>
+            <QItem class="q-mb-sm">
+                <QItemSection>
+                    <VnInput :label="t('L. O. Date')" is-outlined v-model="params.date" />
+                </QItemSection>
+            </QItem>
 
-                <QItem class="q-mb-sm">
-                    <QItemSection>
-                        <VnInput
-                            :label="t('Credit I.')"
-                            is-outlined
-                            v-model="params.credit"
-                        />
-                    </QItemSection>
-                </QItem>
+            <QItem class="q-mb-sm">
+                <QItemSection>
+                    <VnInput
+                        :label="t('Credit I.')"
+                        is-outlined
+                        v-model="params.credit"
+                    />
+                </QItemSection>
+            </QItem>
 
-                <QItem class="q-mb-sm">
-                    <QItemSection>
-                        <VnInputDate
-                            :label="t('From')"
-                            is-outlined
-                            v-model="params.defaulterSinced"
-                        />
-                    </QItemSection>
-                </QItem>
-                <QSeparator />
-            </QList>
+            <QItem class="q-mb-sm">
+                <QItemSection>
+                    <VnInputDate
+                        :label="t('From')"
+                        is-outlined
+                        v-model="params.defaulterSinced"
+                    />
+                </QItemSection>
+            </QItem>
+            <QSeparator />
         </template>
     </VnFilterPanel>
 </template>
 
-<style scoped>
-.list {
-    width: 256px;
-}
-.list * {
-    max-width: 100%;
-}
-</style>
-
 <i18n>
 en:
     params:
diff --git a/src/pages/Customer/ExtendedList/CustomerExtendedListFilter.vue b/src/pages/Customer/ExtendedList/CustomerExtendedListFilter.vue
index 46b4e1e7b..df898e7c1 100644
--- a/src/pages/Customer/ExtendedList/CustomerExtendedListFilter.vue
+++ b/src/pages/Customer/ExtendedList/CustomerExtendedListFilter.vue
@@ -145,27 +145,26 @@ const shouldRenderColumn = (colName) => {
             </div>
         </template>
         <template #body="{ params, searchFn }">
-            <QList dense class="list q-gutter-y-sm q-mt-sm">
-                <QItem v-if="shouldRenderColumn('id')">
-                    <QItemSection>
-                        <VnInput
-                            :label="t('customer.extendedList.tableVisibleColumns.id')"
-                            v-model="params.id"
-                            is-outlined
-                            clearable
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem v-if="shouldRenderColumn('name')">
-                    <QItemSection>
-                        <VnInput
-                            :label="t('customer.extendedList.tableVisibleColumns.name')"
-                            v-model="params.name"
-                            is-outlined
-                        />
-                    </QItemSection>
-                </QItem>
-                <!-- <QItem class="q-mb-sm">
+            <QItem v-if="shouldRenderColumn('id')">
+                <QItemSection>
+                    <VnInput
+                        :label="t('customer.extendedList.tableVisibleColumns.id')"
+                        v-model="params.id"
+                        is-outlined
+                        clearable
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem v-if="shouldRenderColumn('name')">
+                <QItemSection>
+                    <VnInput
+                        :label="t('customer.extendedList.tableVisibleColumns.name')"
+                        v-model="params.name"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
+            <!-- <QItem class="q-mb-sm">
                     <QItemSection v-if="!clients">
                         <QSkeleton type="QInput" class="full-width" />
                     </QItemSection>
@@ -188,429 +187,384 @@ const shouldRenderColumn = (colName) => {
                         />
                     </QItemSection>
                 </QItem> -->
-                <QItem v-if="shouldRenderColumn('fi')">
-                    <QItemSection>
-                        <VnInput
-                            :label="t('customer.extendedList.tableVisibleColumns.fi')"
-                            v-model="params.fi"
-                            is-outlined
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem v-if="shouldRenderColumn('salesPersonFk')">
-                    <QItemSection v-if="!workers">
-                        <QSkeleton type="QInput" class="full-width" />
-                    </QItemSection>
-                    <QItemSection v-if="workers">
-                        <VnSelectFilter
-                            :label="
-                                t(
-                                    'customer.extendedList.tableVisibleColumns.salesPersonFk'
-                                )
-                            "
-                            v-model="params.salesPersonFk"
-                            @update:model-value="searchFn()"
-                            :options="workers"
-                            option-value="id"
-                            option-label="name"
-                            emit-value
-                            map-options
-                            use-input
-                            hide-selected
-                            dense
-                            outlined
-                            rounded
-                            :input-debounce="0"
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem v-if="shouldRenderColumn('credit')">
-                    <QItemSection>
-                        <VnInput
-                            :label="t('customer.extendedList.tableVisibleColumns.credit')"
-                            v-model="params.credit"
-                            is-outlined
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem v-if="shouldRenderColumn('creditInsurance')">
-                    <QItemSection>
-                        <VnInput
-                            :label="
-                                t(
-                                    'customer.extendedList.tableVisibleColumns.creditInsurance'
-                                )
-                            "
-                            v-model="params.creditInsurance"
-                            is-outlined
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem v-if="shouldRenderColumn('phone')">
-                    <QItemSection>
-                        <VnInput
-                            :label="t('customer.extendedList.tableVisibleColumns.phone')"
-                            v-model="params.phone"
-                            is-outlined
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem v-if="shouldRenderColumn('mobile')">
-                    <QItemSection>
-                        <VnInput
-                            :label="t('customer.extendedList.tableVisibleColumns.mobile')"
-                            v-model="params.mobile"
-                            is-outlined
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem v-if="shouldRenderColumn('street')">
-                    <QItemSection>
-                        <VnInput
-                            :label="t('customer.extendedList.tableVisibleColumns.street')"
-                            v-model="params.street"
-                            is-outlined
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem v-if="shouldRenderColumn('countryFk')">
-                    <QItemSection>
-                        <VnSelectFilter
-                            :label="
-                                t('customer.extendedList.tableVisibleColumns.countryFk')
-                            "
-                            v-model="params.countryFk"
-                            @update:model-value="searchFn()"
-                            :options="countriesOptions"
-                            option-value="id"
-                            option-label="country"
-                            map-options
-                            hide-selected
-                            dense
-                            outlined
-                            rounded
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem v-if="shouldRenderColumn('provinceFk')">
-                    <QItemSection>
-                        <VnSelectFilter
-                            :label="
-                                t('customer.extendedList.tableVisibleColumns.provinceFk')
-                            "
-                            v-model="params.provinceFk"
-                            @update:model-value="searchFn()"
-                            :options="provincesOptions"
-                            option-value="id"
-                            option-label="name"
-                            map-options
-                            hide-selected
-                            dense
-                            outlined
-                            rounded
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem v-if="shouldRenderColumn('city')">
-                    <QItemSection>
-                        <VnInput
-                            :label="t('customer.extendedList.tableVisibleColumns.city')"
-                            v-model="params.city"
-                            is-outlined
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem v-if="shouldRenderColumn('postcode')">
-                    <QItemSection>
-                        <VnInput
-                            :label="
-                                t('customer.extendedList.tableVisibleColumns.postcode')
-                            "
-                            v-model="params.postcode"
-                            is-outlined
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem v-if="shouldRenderColumn('email')">
-                    <QItemSection>
-                        <VnInput
-                            :label="t('customer.extendedList.tableVisibleColumns.email')"
-                            v-model="params.email"
-                            is-outlined
-                        />
-                    </QItemSection>
-                </QItem>
+            <QItem v-if="shouldRenderColumn('fi')">
+                <QItemSection>
+                    <VnInput
+                        :label="t('customer.extendedList.tableVisibleColumns.fi')"
+                        v-model="params.fi"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem v-if="shouldRenderColumn('salesPersonFk')">
+                <QItemSection v-if="!workers">
+                    <QSkeleton type="QInput" class="full-width" />
+                </QItemSection>
+                <QItemSection v-if="workers">
+                    <VnSelectFilter
+                        :label="
+                            t('customer.extendedList.tableVisibleColumns.salesPersonFk')
+                        "
+                        v-model="params.salesPersonFk"
+                        @update:model-value="searchFn()"
+                        :options="workers"
+                        option-value="id"
+                        option-label="name"
+                        emit-value
+                        map-options
+                        use-input
+                        hide-selected
+                        dense
+                        outlined
+                        rounded
+                        :input-debounce="0"
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem v-if="shouldRenderColumn('credit')">
+                <QItemSection>
+                    <VnInput
+                        :label="t('customer.extendedList.tableVisibleColumns.credit')"
+                        v-model="params.credit"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem v-if="shouldRenderColumn('creditInsurance')">
+                <QItemSection>
+                    <VnInput
+                        :label="
+                            t('customer.extendedList.tableVisibleColumns.creditInsurance')
+                        "
+                        v-model="params.creditInsurance"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem v-if="shouldRenderColumn('phone')">
+                <QItemSection>
+                    <VnInput
+                        :label="t('customer.extendedList.tableVisibleColumns.phone')"
+                        v-model="params.phone"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem v-if="shouldRenderColumn('mobile')">
+                <QItemSection>
+                    <VnInput
+                        :label="t('customer.extendedList.tableVisibleColumns.mobile')"
+                        v-model="params.mobile"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem v-if="shouldRenderColumn('street')">
+                <QItemSection>
+                    <VnInput
+                        :label="t('customer.extendedList.tableVisibleColumns.street')"
+                        v-model="params.street"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem v-if="shouldRenderColumn('countryFk')">
+                <QItemSection>
+                    <VnSelectFilter
+                        :label="t('customer.extendedList.tableVisibleColumns.countryFk')"
+                        v-model="params.countryFk"
+                        @update:model-value="searchFn()"
+                        :options="countriesOptions"
+                        option-value="id"
+                        option-label="country"
+                        map-options
+                        hide-selected
+                        dense
+                        outlined
+                        rounded
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem v-if="shouldRenderColumn('provinceFk')">
+                <QItemSection>
+                    <VnSelectFilter
+                        :label="t('customer.extendedList.tableVisibleColumns.provinceFk')"
+                        v-model="params.provinceFk"
+                        @update:model-value="searchFn()"
+                        :options="provincesOptions"
+                        option-value="id"
+                        option-label="name"
+                        map-options
+                        hide-selected
+                        dense
+                        outlined
+                        rounded
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem v-if="shouldRenderColumn('city')">
+                <QItemSection>
+                    <VnInput
+                        :label="t('customer.extendedList.tableVisibleColumns.city')"
+                        v-model="params.city"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem v-if="shouldRenderColumn('postcode')">
+                <QItemSection>
+                    <VnInput
+                        :label="t('customer.extendedList.tableVisibleColumns.postcode')"
+                        v-model="params.postcode"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem v-if="shouldRenderColumn('email')">
+                <QItemSection>
+                    <VnInput
+                        :label="t('customer.extendedList.tableVisibleColumns.email')"
+                        v-model="params.email"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
 
-                <QItem v-if="shouldRenderColumn('created')">
-                    <QItemSection>
-                        <VnInputDate
-                            v-model="params.created"
-                            :label="
-                                t('customer.extendedList.tableVisibleColumns.created')
-                            "
-                            @update:model-value="searchFn()"
-                            is-outlined
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem v-if="shouldRenderColumn('businessTypeFk')">
-                    <QItemSection>
-                        <VnSelectFilter
-                            :label="
-                                t(
-                                    'customer.extendedList.tableVisibleColumns.businessTypeFk'
-                                )
-                            "
-                            v-model="params.businessTypeFk"
-                            :options="businessTypesOptions"
-                            @update:model-value="searchFn()"
-                            option-value="code"
-                            option-label="description"
-                            map-options
-                            hide-selected
-                            dense
-                            outlined
-                            rounded
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem v-if="shouldRenderColumn('payMethodFk')">
-                    <QItemSection>
-                        <VnSelectFilter
-                            :label="
-                                t('customer.extendedList.tableVisibleColumns.payMethodFk')
-                            "
-                            v-model="params.payMethodFk"
-                            :options="paymethodsOptions"
-                            @update:model-value="searchFn()"
-                            option-value="id"
-                            option-label="name"
-                            map-options
-                            hide-selected
-                            dense
-                            outlined
-                            rounded
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem v-if="shouldRenderColumn('sageTaxTypeFk')">
-                    <QItemSection>
-                        <VnSelectFilter
-                            :label="
-                                t(
-                                    'customer.extendedList.tableVisibleColumns.sageTaxTypeFk'
-                                )
-                            "
-                            v-model="params.sageTaxTypeFk"
-                            @update:model-value="searchFn()"
-                            :options="sageTaxTypesOptions"
-                            option-value="id"
-                            option-label="vat"
-                            map-options
-                            hide-selected
-                            dense
-                            outlined
-                            rounded
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem v-if="shouldRenderColumn('sageTransactionTypeFk')">
-                    <QItemSection>
-                        <VnSelectFilter
-                            :label="
-                                t(
-                                    'customer.extendedList.tableVisibleColumns.sageTransactionTypeFk'
-                                )
-                            "
-                            v-model="params.sageTransactionTypeFk"
-                            @update:model-value="searchFn()"
-                            :options="sageTransactionTypesOptions"
-                            option-value="id"
-                            option-label="transaction"
-                            map-options
-                            hide-selected
-                            dense
-                            outlined
-                            rounded
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem
-                    v-if="shouldRenderColumn('isActive') || shouldRenderColumn('isVies')"
-                >
-                    <QItemSection v-if="shouldRenderColumn('isActive')">
-                        <QCheckbox
-                            v-model="params.isActive"
-                            @update:model-value="searchFn()"
-                            :label="
-                                t('customer.extendedList.tableVisibleColumns.isActive')
-                            "
-                            toggle-indeterminate
-                            :false-value="undefined"
-                        />
-                    </QItemSection>
-                    <QItemSection v-if="shouldRenderColumn('isVies')">
-                        <QCheckbox
-                            v-model="params.isVies"
-                            @update:model-value="searchFn()"
-                            :label="t('customer.extendedList.tableVisibleColumns.isVies')"
-                            toggle-indeterminate
-                            :false-value="undefined"
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem
-                    v-if="
-                        shouldRenderColumn('isEqualizated') ||
-                        shouldRenderColumn('isTaxDataChecked')
-                    "
-                >
-                    <QItemSection v-if="shouldRenderColumn('isTaxDataChecked')">
-                        <QCheckbox
-                            v-model="params.isTaxDataChecked"
-                            @update:model-value="searchFn()"
-                            :label="
-                                t(
-                                    'customer.extendedList.tableVisibleColumns.isTaxDataChecked'
-                                )
-                            "
-                            toggle-indeterminate
-                            :false-value="undefined"
-                        />
-                    </QItemSection>
-                    <QItemSection v-if="shouldRenderColumn('isEqualizated')">
-                        <QCheckbox
-                            v-model="params.isEqualizated"
-                            @update:model-value="searchFn()"
-                            :label="
-                                t(
-                                    'customer.extendedList.tableVisibleColumns.isEqualizated'
-                                )
-                            "
-                            toggle-indeterminate
-                            :false-value="undefined"
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem
-                    v-if="
-                        shouldRenderColumn('hasToInvoice') ||
-                        shouldRenderColumn('isFreezed')
-                    "
-                >
-                    <QItemSection v-if="shouldRenderColumn('isFreezed')">
-                        <QCheckbox
-                            v-model="params.isFreezed"
-                            @update:model-value="searchFn()"
-                            :label="
-                                t('customer.extendedList.tableVisibleColumns.isFreezed')
-                            "
-                            toggle-indeterminate
-                            :false-value="undefined"
-                        />
-                    </QItemSection>
-                    <QItemSection v-if="shouldRenderColumn('hasToInvoice')">
-                        <QCheckbox
-                            v-model="params.hasToInvoice"
-                            @update:model-value="searchFn()"
-                            :label="
-                                t(
-                                    'customer.extendedList.tableVisibleColumns.hasToInvoice'
-                                )
-                            "
-                            toggle-indeterminate
-                            :false-value="undefined"
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem
-                    v-if="
-                        shouldRenderColumn('isToBeMailed') ||
-                        shouldRenderColumn('hasToInvoiceByAddress')
-                    "
-                >
-                    <QItemSection v-if="shouldRenderColumn('hasToInvoiceByAddress')">
-                        <QCheckbox
-                            v-model="params.hasToInvoiceByAddress"
-                            @update:model-value="searchFn()"
-                            :label="
-                                t(
-                                    'customer.extendedList.tableVisibleColumns.hasToInvoiceByAddress'
-                                )
-                            "
-                            toggle-indeterminate
-                            :false-value="undefined"
-                        />
-                    </QItemSection>
-                    <QItemSection v-if="shouldRenderColumn('isToBeMailed')">
-                        <QCheckbox
-                            v-model="params.isToBeMailed"
-                            @update:model-value="searchFn()"
-                            :label="
-                                t(
-                                    'customer.extendedList.tableVisibleColumns.isToBeMailed'
-                                )
-                            "
-                            toggle-indeterminate
-                            :false-value="undefined"
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem
-                    v-if="
-                        shouldRenderColumn('hasLcr') || shouldRenderColumn('hasCoreVnl')
-                    "
-                >
-                    <QItemSection v-if="shouldRenderColumn('hasLcr')">
-                        <QCheckbox
-                            v-model="params.hasLcr"
-                            @update:model-value="searchFn()"
-                            :label="t('customer.extendedList.tableVisibleColumns.hasLcr')"
-                            toggle-indeterminate
-                            :false-value="undefined"
-                        />
-                    </QItemSection>
-                    <QItemSection v-if="shouldRenderColumn('hasCoreVnl')">
-                        <QCheckbox
-                            v-model="params.hasCoreVnl"
-                            @update:model-value="searchFn()"
-                            :label="
-                                t('customer.extendedList.tableVisibleColumns.hasCoreVnl')
-                            "
-                            toggle-indeterminate
-                            :false-value="undefined"
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem v-if="shouldRenderColumn('hasSepaVnl')">
-                    <QItemSection>
-                        <QCheckbox
-                            v-model="params.hasSepaVnl"
-                            @update:model-value="searchFn()"
-                            :label="
-                                t('customer.extendedList.tableVisibleColumns.hasSepaVnl')
-                            "
-                            toggle-indeterminate
-                            :false-value="undefined"
-                        />
-                    </QItemSection>
-                </QItem>
+            <QItem v-if="shouldRenderColumn('created')">
+                <QItemSection>
+                    <VnInputDate
+                        v-model="params.created"
+                        :label="t('customer.extendedList.tableVisibleColumns.created')"
+                        @update:model-value="searchFn()"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem v-if="shouldRenderColumn('businessTypeFk')">
+                <QItemSection>
+                    <VnSelectFilter
+                        :label="
+                            t('customer.extendedList.tableVisibleColumns.businessTypeFk')
+                        "
+                        v-model="params.businessTypeFk"
+                        :options="businessTypesOptions"
+                        @update:model-value="searchFn()"
+                        option-value="code"
+                        option-label="description"
+                        map-options
+                        hide-selected
+                        dense
+                        outlined
+                        rounded
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem v-if="shouldRenderColumn('payMethodFk')">
+                <QItemSection>
+                    <VnSelectFilter
+                        :label="
+                            t('customer.extendedList.tableVisibleColumns.payMethodFk')
+                        "
+                        v-model="params.payMethodFk"
+                        :options="paymethodsOptions"
+                        @update:model-value="searchFn()"
+                        option-value="id"
+                        option-label="name"
+                        map-options
+                        hide-selected
+                        dense
+                        outlined
+                        rounded
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem v-if="shouldRenderColumn('sageTaxTypeFk')">
+                <QItemSection>
+                    <VnSelectFilter
+                        :label="
+                            t('customer.extendedList.tableVisibleColumns.sageTaxTypeFk')
+                        "
+                        v-model="params.sageTaxTypeFk"
+                        @update:model-value="searchFn()"
+                        :options="sageTaxTypesOptions"
+                        option-value="id"
+                        option-label="vat"
+                        map-options
+                        hide-selected
+                        dense
+                        outlined
+                        rounded
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem v-if="shouldRenderColumn('sageTransactionTypeFk')">
+                <QItemSection>
+                    <VnSelectFilter
+                        :label="
+                            t(
+                                'customer.extendedList.tableVisibleColumns.sageTransactionTypeFk'
+                            )
+                        "
+                        v-model="params.sageTransactionTypeFk"
+                        @update:model-value="searchFn()"
+                        :options="sageTransactionTypesOptions"
+                        option-value="id"
+                        option-label="transaction"
+                        map-options
+                        hide-selected
+                        dense
+                        outlined
+                        rounded
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem v-if="shouldRenderColumn('isActive') || shouldRenderColumn('isVies')">
+                <QItemSection v-if="shouldRenderColumn('isActive')">
+                    <QCheckbox
+                        v-model="params.isActive"
+                        @update:model-value="searchFn()"
+                        :label="t('customer.extendedList.tableVisibleColumns.isActive')"
+                        toggle-indeterminate
+                        :false-value="undefined"
+                    />
+                </QItemSection>
+                <QItemSection v-if="shouldRenderColumn('isVies')">
+                    <QCheckbox
+                        v-model="params.isVies"
+                        @update:model-value="searchFn()"
+                        :label="t('customer.extendedList.tableVisibleColumns.isVies')"
+                        toggle-indeterminate
+                        :false-value="undefined"
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem
+                v-if="
+                    shouldRenderColumn('isEqualizated') ||
+                    shouldRenderColumn('isTaxDataChecked')
+                "
+            >
+                <QItemSection v-if="shouldRenderColumn('isTaxDataChecked')">
+                    <QCheckbox
+                        v-model="params.isTaxDataChecked"
+                        @update:model-value="searchFn()"
+                        :label="
+                            t(
+                                'customer.extendedList.tableVisibleColumns.isTaxDataChecked'
+                            )
+                        "
+                        toggle-indeterminate
+                        :false-value="undefined"
+                    />
+                </QItemSection>
+                <QItemSection v-if="shouldRenderColumn('isEqualizated')">
+                    <QCheckbox
+                        v-model="params.isEqualizated"
+                        @update:model-value="searchFn()"
+                        :label="
+                            t('customer.extendedList.tableVisibleColumns.isEqualizated')
+                        "
+                        toggle-indeterminate
+                        :false-value="undefined"
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem
+                v-if="
+                    shouldRenderColumn('hasToInvoice') || shouldRenderColumn('isFreezed')
+                "
+            >
+                <QItemSection v-if="shouldRenderColumn('isFreezed')">
+                    <QCheckbox
+                        v-model="params.isFreezed"
+                        @update:model-value="searchFn()"
+                        :label="t('customer.extendedList.tableVisibleColumns.isFreezed')"
+                        toggle-indeterminate
+                        :false-value="undefined"
+                    />
+                </QItemSection>
+                <QItemSection v-if="shouldRenderColumn('hasToInvoice')">
+                    <QCheckbox
+                        v-model="params.hasToInvoice"
+                        @update:model-value="searchFn()"
+                        :label="
+                            t('customer.extendedList.tableVisibleColumns.hasToInvoice')
+                        "
+                        toggle-indeterminate
+                        :false-value="undefined"
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem
+                v-if="
+                    shouldRenderColumn('isToBeMailed') ||
+                    shouldRenderColumn('hasToInvoiceByAddress')
+                "
+            >
+                <QItemSection v-if="shouldRenderColumn('hasToInvoiceByAddress')">
+                    <QCheckbox
+                        v-model="params.hasToInvoiceByAddress"
+                        @update:model-value="searchFn()"
+                        :label="
+                            t(
+                                'customer.extendedList.tableVisibleColumns.hasToInvoiceByAddress'
+                            )
+                        "
+                        toggle-indeterminate
+                        :false-value="undefined"
+                    />
+                </QItemSection>
+                <QItemSection v-if="shouldRenderColumn('isToBeMailed')">
+                    <QCheckbox
+                        v-model="params.isToBeMailed"
+                        @update:model-value="searchFn()"
+                        :label="
+                            t('customer.extendedList.tableVisibleColumns.isToBeMailed')
+                        "
+                        toggle-indeterminate
+                        :false-value="undefined"
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem
+                v-if="shouldRenderColumn('hasLcr') || shouldRenderColumn('hasCoreVnl')"
+            >
+                <QItemSection v-if="shouldRenderColumn('hasLcr')">
+                    <QCheckbox
+                        v-model="params.hasLcr"
+                        @update:model-value="searchFn()"
+                        :label="t('customer.extendedList.tableVisibleColumns.hasLcr')"
+                        toggle-indeterminate
+                        :false-value="undefined"
+                    />
+                </QItemSection>
+                <QItemSection v-if="shouldRenderColumn('hasCoreVnl')">
+                    <QCheckbox
+                        v-model="params.hasCoreVnl"
+                        @update:model-value="searchFn()"
+                        :label="t('customer.extendedList.tableVisibleColumns.hasCoreVnl')"
+                        toggle-indeterminate
+                        :false-value="undefined"
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem v-if="shouldRenderColumn('hasSepaVnl')">
+                <QItemSection>
+                    <QCheckbox
+                        v-model="params.hasSepaVnl"
+                        @update:model-value="searchFn()"
+                        :label="t('customer.extendedList.tableVisibleColumns.hasSepaVnl')"
+                        toggle-indeterminate
+                        :false-value="undefined"
+                    />
+                </QItemSection>
+            </QItem>
 
-                <QSeparator />
-            </QList>
+            <QSeparator />
         </template>
     </VnFilterPanel>
 </template>
 
-<style scoped>
-.list {
-    width: 256px;
-}
-.list * {
-    max-width: 100%;
-}
-</style>
-
 <i18n>
 es:
     Social name: Razón social
diff --git a/src/pages/Customer/Notifications/CustomerNotificationsFilter.vue b/src/pages/Customer/Notifications/CustomerNotificationsFilter.vue
index 650158278..957abb7a3 100644
--- a/src/pages/Customer/Notifications/CustomerNotificationsFilter.vue
+++ b/src/pages/Customer/Notifications/CustomerNotificationsFilter.vue
@@ -36,91 +36,80 @@ const clients = ref();
         </template>
 
         <template #body="{ params, searchFn }">
-            <QList dense class="list">
-                <QItem class="q-mb-sm q-mt-sm">
-                    <QItemSection>
-                        <VnInput
-                            :label="t('Identifier')"
-                            is-outlined
-                            v-model="params.identifier"
-                        />
-                    </QItemSection>
-                </QItem>
+            <QItem class="q-mb-sm q-mt-sm">
+                <QItemSection>
+                    <VnInput
+                        :label="t('Identifier')"
+                        is-outlined
+                        v-model="params.identifier"
+                    />
+                </QItemSection>
+            </QItem>
 
-                <QItem class="q-mb-sm">
-                    <QItemSection v-if="!clients">
-                        <QSkeleton type="QInput" class="full-width" />
-                    </QItemSection>
-                    <QItemSection v-if="clients">
-                        <VnSelectFilter
-                            :input-debounce="0"
-                            :label="t('Social name')"
-                            :options="clients"
-                            @update:model-value="searchFn()"
-                            dense
-                            emit-value
-                            hide-selected
-                            map-options
-                            option-label="socialName"
-                            option-value="socialName"
-                            outlined
-                            rounded
-                            use-input
-                            v-model="params.socialName"
-                        />
-                    </QItemSection>
-                </QItem>
+            <QItem class="q-mb-sm">
+                <QItemSection v-if="!clients">
+                    <QSkeleton type="QInput" class="full-width" />
+                </QItemSection>
+                <QItemSection v-if="clients">
+                    <VnSelectFilter
+                        :input-debounce="0"
+                        :label="t('Social name')"
+                        :options="clients"
+                        @update:model-value="searchFn()"
+                        dense
+                        emit-value
+                        hide-selected
+                        map-options
+                        option-label="socialName"
+                        option-value="socialName"
+                        outlined
+                        rounded
+                        use-input
+                        v-model="params.socialName"
+                    />
+                </QItemSection>
+            </QItem>
 
-                <QItem class="q-mb-sm">
-                    <QItemSection v-if="!cities">
-                        <QSkeleton type="QInput" class="full-width" />
-                    </QItemSection>
-                    <QItemSection v-if="cities">
-                        <VnSelectFilter
-                            :input-debounce="0"
-                            :label="t('City')"
-                            :options="cities"
-                            @update:model-value="searchFn()"
-                            dense
-                            emit-value
-                            hide-selected
-                            map-options
-                            option-label="name"
-                            option-value="name"
-                            outlined
-                            rounded
-                            use-input
-                            v-model="params.city"
-                        />
-                    </QItemSection>
-                </QItem>
+            <QItem class="q-mb-sm">
+                <QItemSection v-if="!cities">
+                    <QSkeleton type="QInput" class="full-width" />
+                </QItemSection>
+                <QItemSection v-if="cities">
+                    <VnSelectFilter
+                        :input-debounce="0"
+                        :label="t('City')"
+                        :options="cities"
+                        @update:model-value="searchFn()"
+                        dense
+                        emit-value
+                        hide-selected
+                        map-options
+                        option-label="name"
+                        option-value="name"
+                        outlined
+                        rounded
+                        use-input
+                        v-model="params.city"
+                    />
+                </QItemSection>
+            </QItem>
 
-                <QItem class="q-mb-sm">
-                    <QItemSection>
-                        <VnInput :label="t('Phone')" is-outlined v-model="params.phone" />
-                    </QItemSection>
-                </QItem>
+            <QItem class="q-mb-sm">
+                <QItemSection>
+                    <VnInput :label="t('Phone')" is-outlined v-model="params.phone" />
+                </QItemSection>
+            </QItem>
 
-                <QItem class="q-mb-sm">
-                    <QItemSection>
-                        <VnInput :label="t('Email')" is-outlined v-model="params.email" />
-                    </QItemSection>
-                </QItem>
-                <QSeparator />
-            </QList>
+            <QItem class="q-mb-sm">
+                <QItemSection>
+                    <VnInput :label="t('Email')" is-outlined v-model="params.email" />
+                </QItemSection>
+            </QItem>
+            <QSeparator />
         </template>
     </VnFilterPanel>
 </template>
 
-<style scoped>
-.list {
-    width: 256px;
-}
-.list * {
-    max-width: 100%;
-}
-</style>
-
 <i18n>
 en:
     params:
diff --git a/src/pages/Customer/Payments/CustomerPaymentsFilter.vue b/src/pages/Customer/Payments/CustomerPaymentsFilter.vue
index a19b35a20..74ea2c203 100644
--- a/src/pages/Customer/Payments/CustomerPaymentsFilter.vue
+++ b/src/pages/Customer/Payments/CustomerPaymentsFilter.vue
@@ -27,71 +27,60 @@ function isValidNumber(value) {
             </div>
         </template>
         <template #body="{ params }">
-            <QList dense class="q-gutter-y-sm q-mt-sm">
-                <QItem>
-                    <QItemSection>
-                        <VnInput
-                            :label="t('Order ID')"
-                            v-model="params.orderFk"
-                            is-outlined
-                        >
-                            <template #prepend>
-                                <QIcon name="vn:basket" size="xs" />
-                            </template>
-                        </VnInput>
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <VnInput
-                            :label="t('Customer ID')"
-                            v-model="params.clientFk"
-                            is-outlined
-                        >
-                            <template #prepend>
-                                <QIcon name="vn:client" size="xs" />
-                            </template>
-                        </VnInput>
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <VnInput
-                            :label="t('Amount')"
-                            v-model="params.amount"
-                            is-outlined
-                            @update:model-value="
-                                (value) => {
-                                    if (value.includes(','))
-                                        params.amount = params.amount.replace(',', '.');
-                                }
-                            "
-                            :rules="[
-                                (val) =>
-                                    isValidNumber(val) || !val || 'Please type a number',
-                            ]"
-                            lazy-rules
-                        >
-                            <template #prepend>
-                                <QIcon name="euro" size="sm" />
-                            </template>
-                        </VnInput>
-                    </QItemSection>
-                </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInput :label="t('Order ID')" v-model="params.orderFk" is-outlined>
+                        <template #prepend>
+                            <QIcon name="vn:basket" size="xs" />
+                        </template>
+                    </VnInput>
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInput
+                        :label="t('Customer ID')"
+                        v-model="params.clientFk"
+                        is-outlined
+                    >
+                        <template #prepend>
+                            <QIcon name="vn:client" size="xs" />
+                        </template>
+                    </VnInput>
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInput
+                        :label="t('Amount')"
+                        v-model="params.amount"
+                        is-outlined
+                        @update:model-value="
+                            (value) => {
+                                if (value.includes(','))
+                                    params.amount = params.amount.replace(',', '.');
+                            }
+                        "
+                        :rules="[
+                            (val) => isValidNumber(val) || !val || 'Please type a number',
+                        ]"
+                        lazy-rules
+                    >
+                        <template #prepend>
+                            <QIcon name="euro" size="sm" />
+                        </template>
+                    </VnInput>
+                </QItemSection>
+            </QItem>
 
-                <QItem>
-                    <QItemSection>
-                        <VnInputDate
-                            v-model="params.from"
-                            :label="t('From')"
-                            is-outlined
-                        />
-                    </QItemSection>
-                    <QItemSection>
-                        <VnInputDate v-model="params.to" :label="t('To')" is-outlined />
-                    </QItemSection>
-                </QItem>
-            </QList>
+            <QItem>
+                <QItemSection>
+                    <VnInputDate v-model="params.from" :label="t('From')" is-outlined />
+                </QItemSection>
+                <QItemSection>
+                    <VnInputDate v-model="params.to" :label="t('To')" is-outlined />
+                </QItemSection>
+            </QItem>
         </template>
     </VnFilterPanel>
 </template>
diff --git a/src/pages/Entry/EntryFilter.vue b/src/pages/Entry/EntryFilter.vue
index 7eeffcee7..4b326c572 100644
--- a/src/pages/Entry/EntryFilter.vue
+++ b/src/pages/Entry/EntryFilter.vue
@@ -54,151 +54,149 @@ const suppliersOptions = ref([]);
             </div>
         </template>
         <template #body="{ params }">
-            <QList dense class="list q-gutter-y-sm q-mt-sm">
-                <QItem>
-                    <QItemSection>
-                        <VnInput
-                            v-model="params.search"
-                            :label="t('params.search')"
-                            is-outlined
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <VnInput
-                            v-model="params.reference"
-                            :label="t('params.reference')"
-                            is-outlined
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <VnInput
-                            v-model="params.invoiceNumber"
-                            :label="t('params.invoiceNumber')"
-                            is-outlined
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <VnInput
-                            v-model="params.travelFk"
-                            :label="t('params.travelFk')"
-                            is-outlined
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <VnSelectFilter
-                            :label="t('params.companyFk')"
-                            v-model="params.companyFk"
-                            :options="companiesOptions"
-                            option-value="id"
-                            option-label="code"
-                            hide-selected
-                            dense
-                            outlined
-                            rounded
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <VnSelectFilter
-                            :label="t('params.currencyFk')"
-                            v-model="params.currencyFk"
-                            :options="currenciesOptions"
-                            option-value="id"
-                            option-label="name"
-                            hide-selected
-                            dense
-                            outlined
-                            rounded
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <VnSelectFilter
-                            :label="t('params.supplierFk')"
-                            v-model="params.supplierFk"
-                            :options="suppliersOptions"
-                            option-value="id"
-                            option-label="name"
-                            hide-selected
-                            dense
-                            outlined
-                            rounded
-                        >
-                            <template #option="scope">
-                                <QItem v-bind="scope.itemProps">
-                                    <QItemSection>
-                                        <QItemLabel>{{
-                                            scope.opt?.name + ': ' + scope.opt?.nickname
-                                        }}</QItemLabel>
-                                    </QItemSection>
-                                </QItem>
-                            </template>
-                        </VnSelectFilter>
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <VnInputDate
-                            :label="t('params.created')"
-                            is-outlined
-                            v-model="params.created"
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <VnInputDate
-                            :label="t('params.from')"
-                            is-outlined
-                            v-model="params.from"
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <VnInputDate
-                            :label="t('params.to')"
-                            is-outlined
-                            v-model="params.to"
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <QCheckbox
-                            :label="t('params.isBooked')"
-                            v-model="params.isBooked"
-                            toggle-indeterminate
-                        />
-                    </QItemSection>
-                    <QItemSection>
-                        <QCheckbox
-                            :label="t('params.isConfirmed')"
-                            v-model="params.isConfirmed"
-                            toggle-indeterminate
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <QCheckbox
-                            :label="t('params.isOrdered')"
-                            v-model="params.isOrdered"
-                            toggle-indeterminate
-                        />
-                    </QItemSection>
-                </QItem>
-            </QList>
+            <QItem>
+                <QItemSection>
+                    <VnInput
+                        v-model="params.search"
+                        :label="t('params.search')"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInput
+                        v-model="params.reference"
+                        :label="t('params.reference')"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInput
+                        v-model="params.invoiceNumber"
+                        :label="t('params.invoiceNumber')"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInput
+                        v-model="params.travelFk"
+                        :label="t('params.travelFk')"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnSelectFilter
+                        :label="t('params.companyFk')"
+                        v-model="params.companyFk"
+                        :options="companiesOptions"
+                        option-value="id"
+                        option-label="code"
+                        hide-selected
+                        dense
+                        outlined
+                        rounded
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnSelectFilter
+                        :label="t('params.currencyFk')"
+                        v-model="params.currencyFk"
+                        :options="currenciesOptions"
+                        option-value="id"
+                        option-label="name"
+                        hide-selected
+                        dense
+                        outlined
+                        rounded
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnSelectFilter
+                        :label="t('params.supplierFk')"
+                        v-model="params.supplierFk"
+                        :options="suppliersOptions"
+                        option-value="id"
+                        option-label="name"
+                        hide-selected
+                        dense
+                        outlined
+                        rounded
+                    >
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection>
+                                    <QItemLabel>{{
+                                        scope.opt?.name + ': ' + scope.opt?.nickname
+                                    }}</QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelectFilter>
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInputDate
+                        :label="t('params.created')"
+                        is-outlined
+                        v-model="params.created"
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInputDate
+                        :label="t('params.from')"
+                        is-outlined
+                        v-model="params.from"
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInputDate
+                        :label="t('params.to')"
+                        is-outlined
+                        v-model="params.to"
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <QCheckbox
+                        :label="t('params.isBooked')"
+                        v-model="params.isBooked"
+                        toggle-indeterminate
+                    />
+                </QItemSection>
+                <QItemSection>
+                    <QCheckbox
+                        :label="t('params.isConfirmed')"
+                        v-model="params.isConfirmed"
+                        toggle-indeterminate
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <QCheckbox
+                        :label="t('params.isOrdered')"
+                        v-model="params.isOrdered"
+                        toggle-indeterminate
+                    />
+                </QItemSection>
+            </QItem>
         </template>
     </VnFilterPanel>
 </template>
diff --git a/src/pages/InvoiceIn/InvoiceInFilter.vue b/src/pages/InvoiceIn/InvoiceInFilter.vue
index f8198d237..dec798906 100644
--- a/src/pages/InvoiceIn/InvoiceInFilter.vue
+++ b/src/pages/InvoiceIn/InvoiceInFilter.vue
@@ -36,55 +36,121 @@ const suppliersRef = ref();
             </div>
         </template>
         <template #body="{ params, searchFn }">
-            <QList dense class="list q-gutter-y-sm q-mt-sm">
+            <QItem>
+                <QItemSection>
+                    <VnInput
+                        :label="t('Id or Supplier')"
+                        v-model="params.search"
+                        is-outlined
+                    >
+                        <template #prepend>
+                            <QIcon name="badge" size="sm"></QIcon>
+                        </template>
+                    </VnInput>
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInput
+                        :label="t('params.supplierRef')"
+                        v-model="params.supplierRef"
+                        is-outlined
+                        lazy-rules
+                    >
+                        <template #prepend>
+                            <QIcon name="vn:client" size="sm"></QIcon>
+                        </template>
+                    </VnInput>
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnSelectFilter
+                        :label="t('params.supplierFk')"
+                        v-model="params.supplierFk"
+                        :options="suppliers"
+                        option-value="id"
+                        option-label="nickname"
+                        @input-value="suppliersRef.fetch()"
+                        dense
+                        outlined
+                        rounded
+                    >
+                    </VnSelectFilter>
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInput
+                        :label="t('params.fi')"
+                        v-model="params.fi"
+                        is-outlined
+                        lazy-rules
+                    >
+                        <template #prepend>
+                            <QIcon name="badge" size="sm"></QIcon>
+                        </template>
+                    </VnInput>
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInput
+                        :label="t('params.serialNumber')"
+                        v-model="params.serialNumber"
+                        is-outlined
+                        lazy-rules
+                    >
+                        <template #prepend>
+                            <QIcon name="badge" size="sm"></QIcon>
+                        </template>
+                    </VnInput>
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInput
+                        :label="t('params.serial')"
+                        v-model="params.serial"
+                        is-outlined
+                        lazy-rules
+                    >
+                        <template #prepend>
+                            <QIcon name="badge" size="sm"></QIcon>
+                        </template>
+                    </VnInput>
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInput
+                        :label="t('Amount')"
+                        v-model="params.amount"
+                        is-outlined
+                        lazy-rules
+                    >
+                        <template #prepend>
+                            <QIcon name="euro" size="sm"></QIcon>
+                        </template>
+                    </VnInput>
+                </QItemSection>
+            </QItem>
+            <QItem class="q-mb-md">
+                <QItemSection>
+                    <QCheckbox
+                        :label="t('params.isBooked')"
+                        v-model="params.isBooked"
+                        @update:model-value="searchFn()"
+                        toggle-indeterminate
+                    />
+                </QItemSection>
+            </QItem>
+            <QExpansionItem :label="t('More options')" expand-separator>
                 <QItem>
                     <QItemSection>
                         <VnInput
-                            :label="t('Id or Supplier')"
-                            v-model="params.search"
-                            is-outlined
-                        >
-                            <template #prepend>
-                                <QIcon name="badge" size="sm"></QIcon>
-                            </template>
-                        </VnInput>
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <VnInput
-                            :label="t('params.supplierRef')"
-                            v-model="params.supplierRef"
-                            is-outlined
-                            lazy-rules
-                        >
-                            <template #prepend>
-                                <QIcon name="vn:client" size="sm"></QIcon>
-                            </template>
-                        </VnInput>
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <VnSelectFilter
-                            :label="t('params.supplierFk')"
-                            v-model="params.supplierFk"
-                            :options="suppliers"
-                            option-value="id"
-                            option-label="nickname"
-                            @input-value="suppliersRef.fetch()"
-                            dense
-                            outlined
-                            rounded
-                        >
-                        </VnSelectFilter>
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <VnInput
-                            :label="t('params.fi')"
-                            v-model="params.fi"
+                            :label="t('params.awb')"
+                            v-model="params.awbCode"
                             is-outlined
                             lazy-rules
                         >
@@ -97,126 +163,45 @@ const suppliersRef = ref();
                 <QItem>
                     <QItemSection>
                         <VnInput
-                            :label="t('params.serialNumber')"
-                            v-model="params.serialNumber"
+                            :label="t('params.account')"
+                            v-model="params.account"
                             is-outlined
                             lazy-rules
                         >
                             <template #prepend>
-                                <QIcon name="badge" size="sm"></QIcon>
+                                <QIcon name="person" size="sm" />
                             </template>
                         </VnInput>
                     </QItemSection>
                 </QItem>
                 <QItem>
                     <QItemSection>
-                        <VnInput
-                            :label="t('params.serial')"
-                            v-model="params.serial"
+                        <VnInputDate
+                            :label="t('From')"
+                            v-model="params.from"
                             is-outlined
-                            lazy-rules
-                        >
-                            <template #prepend>
-                                <QIcon name="badge" size="sm"></QIcon>
-                            </template>
-                        </VnInput>
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <VnInput
-                            :label="t('Amount')"
-                            v-model="params.amount"
-                            is-outlined
-                            lazy-rules
-                        >
-                            <template #prepend>
-                                <QIcon name="euro" size="sm"></QIcon>
-                            </template>
-                        </VnInput>
-                    </QItemSection>
-                </QItem>
-                <QItem class="q-mb-md">
-                    <QItemSection>
-                        <QCheckbox
-                            :label="t('params.isBooked')"
-                            v-model="params.isBooked"
-                            @update:model-value="searchFn()"
-                            toggle-indeterminate
                         />
                     </QItemSection>
                 </QItem>
-                <QExpansionItem :label="t('More options')" expand-separator>
-                    <QItem>
-                        <QItemSection>
-                            <VnInput
-                                :label="t('params.awb')"
-                                v-model="params.awbCode"
-                                is-outlined
-                                lazy-rules
-                            >
-                                <template #prepend>
-                                    <QIcon name="badge" size="sm"></QIcon>
-                                </template>
-                            </VnInput>
-                        </QItemSection>
-                    </QItem>
-                    <QItem>
-                        <QItemSection>
-                            <VnInput
-                                :label="t('params.account')"
-                                v-model="params.account"
-                                is-outlined
-                                lazy-rules
-                            >
-                                <template #prepend>
-                                    <QIcon name="person" size="sm" />
-                                </template>
-                            </VnInput>
-                        </QItemSection>
-                    </QItem>
-                    <QItem>
-                        <QItemSection>
-                            <VnInputDate
-                                :label="t('From')"
-                                v-model="params.from"
-                                is-outlined
-                            />
-                        </QItemSection>
-                    </QItem>
-                    <QItem>
-                        <QItemSection>
-                            <VnInputDate
-                                :label="t('To')"
-                                v-model="params.to"
-                                is-outlined
-                            />
-                        </QItemSection>
-                    </QItem>
-                    <QItem>
-                        <QItemSection>
-                            <VnInputDate
-                                :label="t('Issued')"
-                                v-model="params.issued"
-                                is-outlined
-                            />
-                        </QItemSection>
-                    </QItem>
-                </QExpansionItem>
-            </QList>
+                <QItem>
+                    <QItemSection>
+                        <VnInputDate :label="t('To')" v-model="params.to" is-outlined />
+                    </QItemSection>
+                </QItem>
+                <QItem>
+                    <QItemSection>
+                        <VnInputDate
+                            :label="t('Issued')"
+                            v-model="params.issued"
+                            is-outlined
+                        />
+                    </QItemSection>
+                </QItem>
+            </QExpansionItem>
         </template>
     </VnFilterPanel>
 </template>
 
-<style scoped>
-.list {
-    width: 256px;
-}
-.list * {
-    max-width: 100%;
-}
-</style>
-
 <i18n>
 en:
     params:
diff --git a/src/pages/InvoiceOut/InvoiceOutFilter.vue b/src/pages/InvoiceOut/InvoiceOutFilter.vue
index 124ea00d1..f8a430b51 100644
--- a/src/pages/InvoiceOut/InvoiceOutFilter.vue
+++ b/src/pages/InvoiceOut/InvoiceOutFilter.vue
@@ -41,95 +41,89 @@ function setWorkers(data) {
             </div>
         </template>
         <template #body="{ params, searchFn }">
-            <QList dense class="q-gutter-y-sm q-mt-sm">
+            <QItem>
+                <QItemSection>
+                    <VnInput
+                        :label="t('Customer ID')"
+                        v-model="params.clientFk"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInput v-model="params.fi" :label="t('FI')" is-outlined />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInput :label="t('Amount')" v-model="params.amount" is-outlined />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <QInput
+                        :label="t('Min')"
+                        dense
+                        lazy-rules
+                        outlined
+                        rounded
+                        type="number"
+                        v-model.number="params.min"
+                    />
+                </QItemSection>
+                <QItemSection>
+                    <QInput
+                        :label="t('Max')"
+                        dense
+                        lazy-rules
+                        outlined
+                        rounded
+                        type="number"
+                        v-model.number="params.max"
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <QCheckbox
+                        :label="t('Has PDF')"
+                        @update:model-value="searchFn()"
+                        toggle-indeterminate
+                        v-model="params.hasPdf"
+                    />
+                </QItemSection>
+            </QItem>
+            <QSeparator />
+            <QExpansionItem :label="t('More options')" expand-separator>
                 <QItem>
                     <QItemSection>
-                        <VnInput
-                            :label="t('Customer ID')"
-                            v-model="params.clientFk"
+                        <VnInputDate
+                            v-model="params.issued"
+                            :label="t('Issued')"
                             is-outlined
                         />
                     </QItemSection>
                 </QItem>
                 <QItem>
                     <QItemSection>
-                        <VnInput v-model="params.fi" :label="t('FI')" is-outlined />
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <VnInput
-                            :label="t('Amount')"
-                            v-model="params.amount"
+                        <VnInputDate
+                            v-model="params.created"
+                            :label="t('Created')"
                             is-outlined
                         />
                     </QItemSection>
                 </QItem>
                 <QItem>
                     <QItemSection>
-                        <QInput
-                            :label="t('Min')"
-                            dense
-                            lazy-rules
-                            outlined
-                            rounded
-                            type="number"
-                            v-model.number="params.min"
-                        />
-                    </QItemSection>
-                    <QItemSection>
-                        <QInput
-                            :label="t('Max')"
-                            dense
-                            lazy-rules
-                            outlined
-                            rounded
-                            type="number"
-                            v-model.number="params.max"
+                        <VnInputDate
+                            v-model="params.dued"
+                            :label="t('Dued')"
+                            is-outlined
                         />
                     </QItemSection>
                 </QItem>
-                <QItem>
-                    <QItemSection>
-                        <QCheckbox
-                            :label="t('Has PDF')"
-                            @update:model-value="searchFn()"
-                            toggle-indeterminate
-                            v-model="params.hasPdf"
-                        />
-                    </QItemSection>
-                </QItem>
-                <QSeparator />
-                <QExpansionItem :label="t('More options')" expand-separator>
-                    <QItem>
-                        <QItemSection>
-                            <VnInputDate
-                                v-model="params.issued"
-                                :label="t('Issued')"
-                                is-outlined
-                            />
-                        </QItemSection>
-                    </QItem>
-                    <QItem>
-                        <QItemSection>
-                            <VnInputDate
-                                v-model="params.created"
-                                :label="t('Created')"
-                                is-outlined
-                            />
-                        </QItemSection>
-                    </QItem>
-                    <QItem>
-                        <QItemSection>
-                            <VnInputDate
-                                v-model="params.dued"
-                                :label="t('Dued')"
-                                is-outlined
-                            />
-                        </QItemSection>
-                    </QItem>
-                </QExpansionItem>
-            </QList>
+            </QExpansionItem>
         </template>
     </VnFilterPanel>
 </template>
diff --git a/src/pages/InvoiceOut/InvoiceOutNegativeBasesFilter.vue b/src/pages/InvoiceOut/InvoiceOutNegativeBasesFilter.vue
index 028246aeb..3adfa1d13 100644
--- a/src/pages/InvoiceOut/InvoiceOutNegativeBasesFilter.vue
+++ b/src/pages/InvoiceOut/InvoiceOutNegativeBasesFilter.vue
@@ -27,87 +27,83 @@ const props = defineProps({
             </div>
         </template>
         <template #body="{ params }">
-            <QList dense class="q-gutter-y-sm q-mt-sm">
-                <QItem>
-                    <QItemSection>
-                        <VnInputDate
-                            v-model="params.from"
-                            :label="t('invoiceOut.negativeBases.from')"
-                            is-outlined
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <VnInputDate
-                            v-model="params.to"
-                            :label="t('invoiceOut.negativeBases.to')"
-                            is-outlined
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <VnInput
-                            v-model="params.company"
-                            :label="t('invoiceOut.negativeBases.company')"
-                            is-outlined
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <VnInput
-                            v-model="params.country"
-                            :label="t('invoiceOut.negativeBases.country')"
-                            is-outlined
-                        />
-                    </QItemSection>
-                </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInputDate
+                        v-model="params.from"
+                        :label="t('invoiceOut.negativeBases.from')"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInputDate
+                        v-model="params.to"
+                        :label="t('invoiceOut.negativeBases.to')"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInput
+                        v-model="params.company"
+                        :label="t('invoiceOut.negativeBases.company')"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInput
+                        v-model="params.country"
+                        :label="t('invoiceOut.negativeBases.country')"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
 
-                <QItem>
-                    <QItemSection>
-                        <VnInput
-                            v-model="params.clientId"
-                            :label="t('invoiceOut.negativeBases.clientId')"
-                            is-outlined
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <VnInput
-                            v-model="params.clientSocialName"
-                            :label="t('invoiceOut.negativeBases.client')"
-                            is-outlined
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <VnInput
-                            v-model="params.amount"
-                            :label="t('invoiceOut.negativeBases.amount')"
-                            is-outlined
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <VnInput
-                            v-model="params.comercialName"
-                            :label="t('invoiceOut.negativeBases.comercial')"
-                            is-outlined
-                        />
-                    </QItemSection>
-                </QItem>
-            </QList>
+            <QItem>
+                <QItemSection>
+                    <VnInput
+                        v-model="params.clientId"
+                        :label="t('invoiceOut.negativeBases.clientId')"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInput
+                        v-model="params.clientSocialName"
+                        :label="t('invoiceOut.negativeBases.client')"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInput
+                        v-model="params.amount"
+                        :label="t('invoiceOut.negativeBases.amount')"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInput
+                        v-model="params.comercialName"
+                        :label="t('invoiceOut.negativeBases.comercial')"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
         </template>
     </VnFilterPanel>
 </template>
 
-<style scoped></style>
-
 <i18n>
 en:
     params:
diff --git a/src/pages/Order/Card/OrderCatalogFilter.vue b/src/pages/Order/Card/OrderCatalogFilter.vue
index c325a9b05..760c48726 100644
--- a/src/pages/Order/Card/OrderCatalogFilter.vue
+++ b/src/pages/Order/Card/OrderCatalogFilter.vue
@@ -219,183 +219,181 @@ const getCategoryClass = (category, params) => {
             </template>
         </template>
         <template #body="{ params, searchFn }">
-            <QList dense style="max-width: 256px">
-                <QItem class="category-filter q-mt-md">
-                    <div
-                        v-for="category in categoryList"
-                        :key="category.name"
-                        :class="['category', getCategoryClass(category, params)]"
-                    >
-                        <QIcon
-                            :name="category.icon"
-                            class="category-icon"
-                            @click="selectCategory(params, category, searchFn)"
-                        >
-                            <QTooltip>
-                                {{ t(category.name) }}
-                            </QTooltip>
-                        </QIcon>
-                    </div>
-                </QItem>
-                <QItem class="q-my-md">
-                    <QItemSection>
-                        <VnSelectFilter
-                            :label="t('params.type')"
-                            v-model="params.typeFk"
-                            :options="typeList"
-                            option-value="id"
-                            option-label="name"
-                            dense
-                            outlined
-                            rounded
-                            emit-value
-                            use-input
-                            :disable="!selectedCategoryFk"
-                            @update:model-value="
-                                (value) => {
-                                    selectedTypeFk = value;
-                                    searchFn();
-                                }
-                            "
-                        >
-                            <template #option="{ itemProps, opt }">
-                                <QItem v-bind="itemProps">
-                                    <QItemSection>
-                                        <QItemLabel>{{ opt.name }}</QItemLabel>
-                                        <QItemLabel caption>
-                                            {{ opt.categoryName }}
-                                        </QItemLabel>
-                                    </QItemSection>
-                                </QItem>
-                            </template>
-                        </VnSelectFilter>
-                    </QItemSection>
-                </QItem>
-                <QSeparator />
-                <QItem class="q-my-md">
-                    <QItemSection>
-                        <VnSelectFilter
-                            :label="t('params.order')"
-                            v-model="selectedOrder"
-                            :options="orderList || []"
-                            option-value="way"
-                            option-label="name"
-                            dense
-                            outlined
-                            rounded
-                            :emit-value="false"
-                            use-input
-                            :is-clearable="false"
-                            @update:model-value="
-                                (value) => onOrderChange(value, params, searchFn)
-                            "
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem class="q-mb-md">
-                    <QItemSection>
-                        <VnSelectFilter
-                            :label="t('params.order')"
-                            v-model="selectedOrderField"
-                            :options="OrderFields || []"
-                            option-value="field"
-                            option-label="name"
-                            dense
-                            outlined
-                            rounded
-                            :emit-value="false"
-                            use-input
-                            :is-clearable="false"
-                            @update:model-value="
-                                (value) => onOrderFieldChange(value, params, searchFn)
-                            "
-                        />
-                    </QItemSection>
-                </QItem>
-                <QSeparator />
-                <QItem class="q-mt-md">
-                    <QItemSection>
-                        <VnSelectFilter
-                            :label="t('params.tag')"
-                            v-model="selectedTag"
-                            :options="props.tags || []"
-                            option-value="id"
-                            option-label="name"
-                            dense
-                            outlined
-                            rounded
-                            :emit-value="false"
-                            use-input
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem
-                    v-for="(value, index) in tagValues"
-                    :key="value"
-                    class="q-mt-md filter-value"
+            <QItem class="category-filter q-mt-md">
+                <div
+                    v-for="category in categoryList"
+                    :key="category.name"
+                    :class="['category', getCategoryClass(category, params)]"
                 >
-                    <VnInput
-                        v-if="selectedTag?.isFree"
-                        v-model="value.value"
-                        :label="t('params.value')"
-                        is-outlined
-                        class="filter-input"
-                    />
+                    <QIcon
+                        :name="category.icon"
+                        class="category-icon"
+                        @click="selectCategory(params, category, searchFn)"
+                    >
+                        <QTooltip>
+                            {{ t(category.name) }}
+                        </QTooltip>
+                    </QIcon>
+                </div>
+            </QItem>
+            <QItem class="q-my-md">
+                <QItemSection>
                     <VnSelectFilter
-                        v-else
-                        :label="t('params.value')"
-                        v-model="value.value"
-                        :options="tagOptions || []"
-                        option-value="value"
-                        option-label="value"
+                        :label="t('params.type')"
+                        v-model="params.typeFk"
+                        :options="typeList"
+                        option-value="id"
+                        option-label="name"
                         dense
                         outlined
                         rounded
                         emit-value
                         use-input
-                        :disable="!selectedTag"
-                        class="filter-input"
+                        :disable="!selectedCategoryFk"
+                        @update:model-value="
+                            (value) => {
+                                selectedTypeFk = value;
+                                searchFn();
+                            }
+                        "
+                    >
+                        <template #option="{ itemProps, opt }">
+                            <QItem v-bind="itemProps">
+                                <QItemSection>
+                                    <QItemLabel>{{ opt.name }}</QItemLabel>
+                                    <QItemLabel caption>
+                                        {{ opt.categoryName }}
+                                    </QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelectFilter>
+                </QItemSection>
+            </QItem>
+            <QSeparator />
+            <QItem class="q-my-md">
+                <QItemSection>
+                    <VnSelectFilter
+                        :label="t('params.order')"
+                        v-model="selectedOrder"
+                        :options="orderList || []"
+                        option-value="way"
+                        option-label="name"
+                        dense
+                        outlined
+                        rounded
+                        :emit-value="false"
+                        use-input
+                        :is-clearable="false"
+                        @update:model-value="
+                            (value) => onOrderChange(value, params, searchFn)
+                        "
                     />
+                </QItemSection>
+            </QItem>
+            <QItem class="q-mb-md">
+                <QItemSection>
+                    <VnSelectFilter
+                        :label="t('params.order')"
+                        v-model="selectedOrderField"
+                        :options="OrderFields || []"
+                        option-value="field"
+                        option-label="name"
+                        dense
+                        outlined
+                        rounded
+                        :emit-value="false"
+                        use-input
+                        :is-clearable="false"
+                        @update:model-value="
+                            (value) => onOrderFieldChange(value, params, searchFn)
+                        "
+                    />
+                </QItemSection>
+            </QItem>
+            <QSeparator />
+            <QItem class="q-mt-md">
+                <QItemSection>
+                    <VnSelectFilter
+                        :label="t('params.tag')"
+                        v-model="selectedTag"
+                        :options="props.tags || []"
+                        option-value="id"
+                        option-label="name"
+                        dense
+                        outlined
+                        rounded
+                        :emit-value="false"
+                        use-input
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem
+                v-for="(value, index) in tagValues"
+                :key="value"
+                class="q-mt-md filter-value"
+            >
+                <VnInput
+                    v-if="selectedTag?.isFree"
+                    v-model="value.value"
+                    :label="t('params.value')"
+                    is-outlined
+                    class="filter-input"
+                />
+                <VnSelectFilter
+                    v-else
+                    :label="t('params.value')"
+                    v-model="value.value"
+                    :options="tagOptions || []"
+                    option-value="value"
+                    option-label="value"
+                    dense
+                    outlined
+                    rounded
+                    emit-value
+                    use-input
+                    :disable="!selectedTag"
+                    class="filter-input"
+                />
 
-                    <FetchData
-                        v-if="selectedTag && !selectedTag.isFree"
-                        :url="`Tags/${selectedTag?.id}/filterValue`"
-                        limit="30"
-                        auto-load
-                        @on-fetch="(data) => (tagOptions = data)"
-                    />
+                <FetchData
+                    v-if="selectedTag && !selectedTag.isFree"
+                    :url="`Tags/${selectedTag?.id}/filterValue`"
+                    limit="30"
+                    auto-load
+                    @on-fetch="(data) => (tagOptions = data)"
+                />
 
-                    <QIcon
-                        name="delete"
-                        class="filter-icon"
-                        @click="(tagValues || []).splice(index, 1)"
+                <QIcon
+                    name="delete"
+                    class="filter-icon"
+                    @click="(tagValues || []).splice(index, 1)"
+                />
+            </QItem>
+            <QItem class="q-mt-lg">
+                <QIcon
+                    name="add_circle"
+                    class="filter-icon"
+                    @click="tagValues.push({})"
+                />
+            </QItem>
+            <QItem>
+                <QItemSection class="q-py-sm">
+                    <QBtn
+                        :label="t('Search')"
+                        class="full-width"
+                        color="primary"
+                        dense
+                        icon="search"
+                        rounded
+                        type="button"
+                        unelevated
+                        :disable="isButtonDisabled"
+                        @click.stop="applyTagFilter(params, searchFn)"
                     />
-                </QItem>
-                <QItem class="q-mt-lg">
-                    <QIcon
-                        name="add_circle"
-                        class="filter-icon"
-                        @click="tagValues.push({})"
-                    />
-                </QItem>
-                <QItem>
-                    <QItemSection class="q-py-sm">
-                        <QBtn
-                            :label="t('Search')"
-                            class="full-width"
-                            color="primary"
-                            dense
-                            icon="search"
-                            rounded
-                            type="button"
-                            unelevated
-                            :disable="isButtonDisabled"
-                            @click.stop="applyTagFilter(params, searchFn)"
-                        />
-                    </QItemSection>
-                </QItem>
-                <QSeparator />
-            </QList>
+                </QItemSection>
+            </QItem>
+            <QSeparator />
         </template>
     </VnFilterPanel>
 </template>
diff --git a/src/pages/Order/Card/OrderFilter.vue b/src/pages/Order/Card/OrderFilter.vue
index b49f0b115..62bfe0e02 100644
--- a/src/pages/Order/Card/OrderFilter.vue
+++ b/src/pages/Order/Card/OrderFilter.vue
@@ -59,162 +59,152 @@ const sourceList = ref(null);
             </div>
         </template>
         <template #body="{ params }">
-            <QList id="orderFilter" dense>
-                <QItem>
-                    <QItemSection>
-                        <VnInput
-                            is-outlined
-                            :label="t('customerId')"
-                            v-model="params.clientFk"
-                            lazy-rules
-                        >
-                            <template #prepend>
-                                <QIcon name="badge" size="sm"></QIcon>
-                            </template>
-                        </VnInput>
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection v-if="agencyList">
-                        <VnSelectFilter
-                            :label="t('agency')"
-                            v-model="params.agencyModeFk"
-                            :options="agencyList"
-                            option-value="id"
-                            option-label="name"
-                            dense
-                            outlined
-                            rounded
-                            emit-value
-                            map-options
-                            use-input
-                            :input-debounce="0"
-                        />
-                    </QItemSection>
-                    <QItemSection v-else>
-                        <QSkeleton type="QInput" class="full-width" />
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection v-if="salesPersonList">
-                        <VnSelectFilter
-                            :label="t('salesPerson')"
-                            v-model="params.workerFk"
-                            :options="salesPersonList"
-                            option-value="id"
-                            option-label="name"
-                            dense
-                            outlined
-                            rounded
-                            emit-value
-                            map-options
-                            use-input
-                            :input-debounce="0"
-                        >
-                            <template #option="{ itemProps, opt }">
-                                <QItem v-bind="itemProps">
-                                    <QItemSection>
-                                        <QItemLabel>{{ opt.name }}</QItemLabel>
-                                        <QItemLabel caption>
-                                            {{ opt.nickname }},{{ opt.code }}
-                                        </QItemLabel>
-                                    </QItemSection>
-                                </QItem>
-                            </template>
-                        </VnSelectFilter>
-                    </QItemSection>
-                    <QItemSection v-else>
-                        <QSkeleton type="QInput" class="full-width" />
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <VnInputDate
-                            v-model="params.from"
-                            :label="t('fromLanded')"
-                            dense
-                            outlined
-                            rounded
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <VnInputDate
-                            v-model="params.to"
-                            :label="t('toLanded')"
-                            dense
-                            outlined
-                            rounded
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <VnInput
-                            :label="t('orderId')"
-                            v-model="params.orderFk"
-                            lazy-rules
-                            is-outlined
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection v-if="sourceList">
-                        <VnSelectFilter
-                            :label="t('application')"
-                            v-model="params.sourceApp"
-                            :options="sourceList"
-                            option-label="value"
-                            emit-value
-                            map-options
-                            use-input
-                            dense
-                            outlined
-                            rounded
-                            :input-debounce="0"
-                        />
-                    </QItemSection>
-                    <QItemSection v-else>
-                        <QSkeleton type="QInput" class="full-width" />
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <QCheckbox
-                            v-model="params.myTeam"
-                            :label="t('myTeam')"
-                            toggle-indeterminate
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <QCheckbox
-                            v-model="params.isConfirmed"
-                            :label="t('isConfirmed')"
-                            toggle-indeterminate
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <QCheckbox v-model="params.showEmpty" :label="t('showEmpty')" />
-                    </QItemSection>
-                </QItem>
-            </QList>
+            <QItem>
+                <QItemSection>
+                    <VnInput
+                        is-outlined
+                        :label="t('customerId')"
+                        v-model="params.clientFk"
+                        lazy-rules
+                    >
+                        <template #prepend>
+                            <QIcon name="badge" size="sm"></QIcon>
+                        </template>
+                    </VnInput>
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection v-if="agencyList">
+                    <VnSelectFilter
+                        :label="t('agency')"
+                        v-model="params.agencyModeFk"
+                        :options="agencyList"
+                        option-value="id"
+                        option-label="name"
+                        dense
+                        outlined
+                        rounded
+                        emit-value
+                        map-options
+                        use-input
+                        :input-debounce="0"
+                    />
+                </QItemSection>
+                <QItemSection v-else>
+                    <QSkeleton type="QInput" class="full-width" />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection v-if="salesPersonList">
+                    <VnSelectFilter
+                        :label="t('salesPerson')"
+                        v-model="params.workerFk"
+                        :options="salesPersonList"
+                        option-value="id"
+                        option-label="name"
+                        dense
+                        outlined
+                        rounded
+                        emit-value
+                        map-options
+                        use-input
+                        :input-debounce="0"
+                    >
+                        <template #option="{ itemProps, opt }">
+                            <QItem v-bind="itemProps">
+                                <QItemSection>
+                                    <QItemLabel>{{ opt.name }}</QItemLabel>
+                                    <QItemLabel caption>
+                                        {{ opt.nickname }},{{ opt.code }}
+                                    </QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelectFilter>
+                </QItemSection>
+                <QItemSection v-else>
+                    <QSkeleton type="QInput" class="full-width" />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInputDate
+                        v-model="params.from"
+                        :label="t('fromLanded')"
+                        dense
+                        outlined
+                        rounded
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInputDate
+                        v-model="params.to"
+                        :label="t('toLanded')"
+                        dense
+                        outlined
+                        rounded
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInput
+                        :label="t('orderId')"
+                        v-model="params.orderFk"
+                        lazy-rules
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection v-if="sourceList">
+                    <VnSelectFilter
+                        :label="t('application')"
+                        v-model="params.sourceApp"
+                        :options="sourceList"
+                        option-label="value"
+                        emit-value
+                        map-options
+                        use-input
+                        dense
+                        outlined
+                        rounded
+                        :input-debounce="0"
+                    />
+                </QItemSection>
+                <QItemSection v-else>
+                    <QSkeleton type="QInput" class="full-width" />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <QCheckbox
+                        v-model="params.myTeam"
+                        :label="t('myTeam')"
+                        toggle-indeterminate
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <QCheckbox
+                        v-model="params.isConfirmed"
+                        :label="t('isConfirmed')"
+                        toggle-indeterminate
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <QCheckbox v-model="params.showEmpty" :label="t('showEmpty')" />
+                </QItemSection>
+            </QItem>
         </template>
     </VnFilterPanel>
 </template>
 
-<style lang="scss">
-#orderFilter {
-    .q-item {
-        padding-top: 8px;
-    }
-}
-</style>
-
 <i18n>
 en:
     params:
diff --git a/src/pages/Route/Card/RouteFilter.vue b/src/pages/Route/Card/RouteFilter.vue
index 45580d913..4be1981ab 100644
--- a/src/pages/Route/Card/RouteFilter.vue
+++ b/src/pages/Route/Card/RouteFilter.vue
@@ -61,144 +61,142 @@ const warehouseList = ref([]);
             </div>
         </template>
         <template #body="{ params }">
-            <QList dense>
-                <QItem class="q-my-sm">
-                    <QItemSection v-if="workerList">
-                        <VnSelectFilter
-                            :label="t('Worker')"
-                            v-model="params.workerFk"
-                            :options="workerList"
-                            option-value="id"
-                            option-label="nickname"
-                            dense
-                            outlined
-                            rounded
-                            emit-value
-                            map-options
-                            use-input
-                            :input-debounce="0"
-                        >
-                            <template #option="{ itemProps, opt }">
-                                <QItem v-bind="itemProps">
-                                    <QItemSection>
-                                        <QItemLabel>{{ opt.name }}</QItemLabel>
-                                        <QItemLabel caption>
-                                            {{ opt.nickname }},{{ opt.code }}
-                                        </QItemLabel>
-                                    </QItemSection>
-                                </QItem>
-                            </template>
-                        </VnSelectFilter>
-                    </QItemSection>
-                </QItem>
-                <QItem class="q-my-sm">
-                    <QItemSection v-if="agencyList">
-                        <VnSelectFilter
-                            :label="t('Agency')"
-                            v-model="params.agencyModeFk"
-                            :options="agencyList"
-                            option-value="id"
-                            option-label="name"
-                            dense
-                            outlined
-                            rounded
-                            emit-value
-                            map-options
-                            use-input
-                            :input-debounce="0"
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem class="q-my-sm">
-                    <QItemSection>
-                        <VnInputDate
-                            v-model="params.from"
-                            :label="t('From')"
-                            is-outlined
-                            :disable="Boolean(params.scopeDays)"
-                            @update:model-value="params.scopeDays = null"
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem class="q-my-sm">
-                    <QItemSection>
-                        <VnInputDate
-                            v-model="params.to"
-                            :label="t('To')"
-                            is-outlined
-                            :disable="Boolean(params.scopeDays)"
-                            @update:model-value="params.scopeDays = null"
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem class="q-my-sm">
-                    <QItemSection>
-                        <VnInput
-                            v-model="params.scopeDays"
-                            type="number"
-                            :label="t('Days Onward')"
-                            is-outlined
-                            clearable
-                            :disable="Boolean(params.from || params.to)"
-                            @update:model-value="
-                                params.to = null;
-                                params.from = null;
-                            "
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem class="q-my-sm">
-                    <QItemSection v-if="vehicleList">
-                        <VnSelectFilter
-                            :label="t('Vehicle')"
-                            v-model="params.vehicleFk"
-                            :options="vehicleList"
-                            option-value="id"
-                            option-label="numberPlate"
-                            dense
-                            outlined
-                            rounded
-                            emit-value
-                            map-options
-                            use-input
-                            :input-debounce="0"
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem class="q-my-sm">
-                    <QItemSection>
-                        <VnInput v-model="params.m3" label="m³" is-outlined clearable />
-                    </QItemSection>
-                </QItem>
-                <QItem class="q-my-sm">
-                    <QItemSection v-if="vehicleList">
-                        <VnSelectFilter
-                            :label="t('Warehouse')"
-                            v-model="params.warehouseFk"
-                            :options="warehouseList"
-                            option-value="id"
-                            option-label="name"
-                            dense
-                            outlined
-                            rounded
-                            emit-value
-                            map-options
-                            use-input
-                            :input-debounce="0"
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem class="q-my-sm">
-                    <QItemSection>
-                        <VnInput
-                            v-model="params.description"
-                            :label="t('Description')"
-                            is-outlined
-                            clearable
-                        />
-                    </QItemSection>
-                </QItem>
-            </QList>
+            <QItem class="q-my-sm">
+                <QItemSection v-if="workerList">
+                    <VnSelectFilter
+                        :label="t('Worker')"
+                        v-model="params.workerFk"
+                        :options="workerList"
+                        option-value="id"
+                        option-label="nickname"
+                        dense
+                        outlined
+                        rounded
+                        emit-value
+                        map-options
+                        use-input
+                        :input-debounce="0"
+                    >
+                        <template #option="{ itemProps, opt }">
+                            <QItem v-bind="itemProps">
+                                <QItemSection>
+                                    <QItemLabel>{{ opt.name }}</QItemLabel>
+                                    <QItemLabel caption>
+                                        {{ opt.nickname }},{{ opt.code }}
+                                    </QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelectFilter>
+                </QItemSection>
+            </QItem>
+            <QItem class="q-my-sm">
+                <QItemSection v-if="agencyList">
+                    <VnSelectFilter
+                        :label="t('Agency')"
+                        v-model="params.agencyModeFk"
+                        :options="agencyList"
+                        option-value="id"
+                        option-label="name"
+                        dense
+                        outlined
+                        rounded
+                        emit-value
+                        map-options
+                        use-input
+                        :input-debounce="0"
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem class="q-my-sm">
+                <QItemSection>
+                    <VnInputDate
+                        v-model="params.from"
+                        :label="t('From')"
+                        is-outlined
+                        :disable="Boolean(params.scopeDays)"
+                        @update:model-value="params.scopeDays = null"
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem class="q-my-sm">
+                <QItemSection>
+                    <VnInputDate
+                        v-model="params.to"
+                        :label="t('To')"
+                        is-outlined
+                        :disable="Boolean(params.scopeDays)"
+                        @update:model-value="params.scopeDays = null"
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem class="q-my-sm">
+                <QItemSection>
+                    <VnInput
+                        v-model="params.scopeDays"
+                        type="number"
+                        :label="t('Days Onward')"
+                        is-outlined
+                        clearable
+                        :disable="Boolean(params.from || params.to)"
+                        @update:model-value="
+                            params.to = null;
+                            params.from = null;
+                        "
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem class="q-my-sm">
+                <QItemSection v-if="vehicleList">
+                    <VnSelectFilter
+                        :label="t('Vehicle')"
+                        v-model="params.vehicleFk"
+                        :options="vehicleList"
+                        option-value="id"
+                        option-label="numberPlate"
+                        dense
+                        outlined
+                        rounded
+                        emit-value
+                        map-options
+                        use-input
+                        :input-debounce="0"
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem class="q-my-sm">
+                <QItemSection>
+                    <VnInput v-model="params.m3" label="m³" is-outlined clearable />
+                </QItemSection>
+            </QItem>
+            <QItem class="q-my-sm">
+                <QItemSection v-if="vehicleList">
+                    <VnSelectFilter
+                        :label="t('Warehouse')"
+                        v-model="params.warehouseFk"
+                        :options="warehouseList"
+                        option-value="id"
+                        option-label="name"
+                        dense
+                        outlined
+                        rounded
+                        emit-value
+                        map-options
+                        use-input
+                        :input-debounce="0"
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem class="q-my-sm">
+                <QItemSection>
+                    <VnInput
+                        v-model="params.description"
+                        :label="t('Description')"
+                        is-outlined
+                        clearable
+                    />
+                </QItemSection>
+            </QItem>
         </template>
     </VnFilterPanel>
 </template>
diff --git a/src/pages/Route/Cmr/CmrFilter.vue b/src/pages/Route/Cmr/CmrFilter.vue
index a5bf5513b..553f19431 100644
--- a/src/pages/Route/Cmr/CmrFilter.vue
+++ b/src/pages/Route/Cmr/CmrFilter.vue
@@ -28,103 +28,101 @@ const countries = ref();
             </div>
         </template>
         <template #body="{ params }">
-            <QList dense class="q-gutter-y-sm q-mt-sm">
-                <QItem>
-                    <QItemSection>
-                        <VnInput
-                            :label="t('route.cmr.list.cmrFk')"
-                            v-model="params.cmrFk"
-                            is-outlined
-                        >
-                            <template #prepend>
-                                <QIcon name="article" size="sm"></QIcon>
-                            </template>
-                        </VnInput>
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <QCheckbox
-                            :label="t('route.cmr.list.hasCmrDms')"
-                            v-model="params.hasCmrDms"
-                            lazy-rules
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <VnInput
-                            :label="t('route.cmr.list.ticketFk')"
-                            v-model="params.ticketFk"
-                            is-outlined
-                        >
-                            <template #prepend>
-                                <QIcon name="vn:ticket" size="sm"></QIcon>
-                            </template>
-                        </VnInput>
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <VnInput
-                            :label="t('route.cmr.list.routeFk')"
-                            v-model="params.routeFk"
-                            is-outlined
-                        >
-                            <template #prepend>
-                                <QIcon name="vn:delivery" size="sm"></QIcon>
-                            </template>
-                        </VnInput>
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <VnInput
-                            :label="t('route.cmr.list.clientFk')"
-                            v-model="params.clientFk"
-                            is-outlined
-                        >
-                            <template #prepend>
-                                <QIcon name="vn:client" size="sm"></QIcon>
-                            </template>
-                        </VnInput>
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection v-if="!countries">
-                        <QSkeleton type="QInput" class="full-width" />
-                    </QItemSection>
-                    <QItemSection v-if="countries" class="q-mb-sm">
-                        <QSelect
-                            :label="t('route.cmr.list.country')"
-                            v-model="params.country"
-                            :options="countries"
-                            option-value="country"
-                            option-label="country"
-                            transition-show="jump-down"
-                            transition-hide="jump-up"
-                            emit-value
-                            map-options
-                            dense
-                            outlined
-                            rounded
-                        >
-                            <template #prepend>
-                                <QIcon name="flag" size="sm"></QIcon>
-                            </template>
-                        </QSelect>
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <VnInputDate
-                            v-model="params.shipped"
-                            :label="t('route.cmr.list.shipped')"
-                            is-outlined
-                        />
-                    </QItemSection>
-                </QItem>
-            </QList>
+            <QItem>
+                <QItemSection>
+                    <VnInput
+                        :label="t('route.cmr.list.cmrFk')"
+                        v-model="params.cmrFk"
+                        is-outlined
+                    >
+                        <template #prepend>
+                            <QIcon name="article" size="sm"></QIcon>
+                        </template>
+                    </VnInput>
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <QCheckbox
+                        :label="t('route.cmr.list.hasCmrDms')"
+                        v-model="params.hasCmrDms"
+                        lazy-rules
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInput
+                        :label="t('route.cmr.list.ticketFk')"
+                        v-model="params.ticketFk"
+                        is-outlined
+                    >
+                        <template #prepend>
+                            <QIcon name="vn:ticket" size="sm"></QIcon>
+                        </template>
+                    </VnInput>
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInput
+                        :label="t('route.cmr.list.routeFk')"
+                        v-model="params.routeFk"
+                        is-outlined
+                    >
+                        <template #prepend>
+                            <QIcon name="vn:delivery" size="sm"></QIcon>
+                        </template>
+                    </VnInput>
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInput
+                        :label="t('route.cmr.list.clientFk')"
+                        v-model="params.clientFk"
+                        is-outlined
+                    >
+                        <template #prepend>
+                            <QIcon name="vn:client" size="sm"></QIcon>
+                        </template>
+                    </VnInput>
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection v-if="!countries">
+                    <QSkeleton type="QInput" class="full-width" />
+                </QItemSection>
+                <QItemSection v-if="countries" class="q-mb-sm">
+                    <QSelect
+                        :label="t('route.cmr.list.country')"
+                        v-model="params.country"
+                        :options="countries"
+                        option-value="country"
+                        option-label="country"
+                        transition-show="jump-down"
+                        transition-hide="jump-up"
+                        emit-value
+                        map-options
+                        dense
+                        outlined
+                        rounded
+                    >
+                        <template #prepend>
+                            <QIcon name="flag" size="sm"></QIcon>
+                        </template>
+                    </QSelect>
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInputDate
+                        v-model="params.shipped"
+                        :label="t('route.cmr.list.shipped')"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
         </template>
     </VnFilterPanel>
 </template>
diff --git a/src/pages/Shelving/Card/ShelvingFilter.vue b/src/pages/Shelving/Card/ShelvingFilter.vue
index 423402f89..6767f6d97 100644
--- a/src/pages/Shelving/Card/ShelvingFilter.vue
+++ b/src/pages/Shelving/Card/ShelvingFilter.vue
@@ -41,7 +41,11 @@ function setParkings(data) {
         @on-fetch="setWorkers"
         auto-load
     />
-    <VnFilterPanel :data-key="props.dataKey" :search-button="true" @search="emit('search')">
+    <VnFilterPanel
+        :data-key="props.dataKey"
+        :search-button="true"
+        @search="emit('search')"
+    >
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">
                 <strong>{{ t(`params.${tag.label}`) }}: </strong>
@@ -49,59 +53,57 @@ function setParkings(data) {
             </div>
         </template>
         <template #body="{ params }">
-            <QList dense>
-                <QItem class="q-my-sm">
-                    <QItemSection v-if="!parkings">
-                        <QSkeleton type="QInput" class="full-width" />
-                    </QItemSection>
-                    <QItemSection v-if="parkings">
-                        <QSelect
-                            dense
-                            outlined
-                            rounded
-                            :label="t('params.parkingFk')"
-                            v-model="params.parkingFk"
-                            :options="parkings"
-                            option-value="id"
-                            option-label="code"
-                            emit-value
-                            map-options
-                            use-input
-                            :input-debounce="0"
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem class="q-mb-sm">
-                    <QItemSection v-if="!workers">
-                        <QSkeleton type="QInput" class="full-width" />
-                    </QItemSection>
-                    <QItemSection v-if="workers">
-                        <QSelect
-                            dense
-                            outlined
-                            rounded
-                            :label="t('params.userFk')"
-                            v-model="params.userFk"
-                            :options="workers"
-                            option-value="id"
-                            option-label="name"
-                            emit-value
-                            map-options
-                            use-input
-                            :input-debounce="0"
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem class="q-mb-md">
-                    <QItemSection>
-                        <QCheckbox
-                            v-model="params.isRecyclable"
-                            :label="t('params.isRecyclable')"
-                            toggle-indeterminate
-                        />
-                    </QItemSection>
-                </QItem>
-            </QList>
+            <QItem class="q-my-sm">
+                <QItemSection v-if="!parkings">
+                    <QSkeleton type="QInput" class="full-width" />
+                </QItemSection>
+                <QItemSection v-if="parkings">
+                    <QSelect
+                        dense
+                        outlined
+                        rounded
+                        :label="t('params.parkingFk')"
+                        v-model="params.parkingFk"
+                        :options="parkings"
+                        option-value="id"
+                        option-label="code"
+                        emit-value
+                        map-options
+                        use-input
+                        :input-debounce="0"
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem class="q-mb-sm">
+                <QItemSection v-if="!workers">
+                    <QSkeleton type="QInput" class="full-width" />
+                </QItemSection>
+                <QItemSection v-if="workers">
+                    <QSelect
+                        dense
+                        outlined
+                        rounded
+                        :label="t('params.userFk')"
+                        v-model="params.userFk"
+                        :options="workers"
+                        option-value="id"
+                        option-label="name"
+                        emit-value
+                        map-options
+                        use-input
+                        :input-debounce="0"
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem class="q-mb-md">
+                <QItemSection>
+                    <QCheckbox
+                        v-model="params.isRecyclable"
+                        :label="t('params.isRecyclable')"
+                        toggle-indeterminate
+                    />
+                </QItemSection>
+            </QItem>
         </template>
     </VnFilterPanel>
 </template>
diff --git a/src/pages/Ticket/TicketFilter.vue b/src/pages/Ticket/TicketFilter.vue
index b0b584257..7b74117bb 100644
--- a/src/pages/Ticket/TicketFilter.vue
+++ b/src/pages/Ticket/TicketFilter.vue
@@ -56,66 +56,138 @@ const warehouses = ref();
             </div>
         </template>
         <template #body="{ params, searchFn }">
-            <QList dense class="q-gutter-y-sm q-mt-sm">
+            <QItem>
+                <QItemSection>
+                    <VnInput
+                        v-model="params.clientFk"
+                        :label="t('Customer ID')"
+                        is-outlined
+                    />
+                </QItemSection>
+                <QItemSection>
+                    <VnInput
+                        v-model="params.orderFk"
+                        :label="t('Order ID')"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInputDate v-model="params.from" :label="t('From')" is-outlined />
+                </QItemSection>
+                <QItemSection>
+                    <VnInputDate v-model="params.to" :label="t('To')" is-outlined />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection v-if="!workers">
+                    <QSkeleton type="QInput" class="full-width" />
+                </QItemSection>
+                <QItemSection v-if="workers">
+                    <QSelect
+                        :label="t('Salesperson')"
+                        v-model="params.salesPersonFk"
+                        :options="workers"
+                        option-value="id"
+                        option-label="name"
+                        emit-value
+                        map-options
+                        use-input
+                        dense
+                        outlined
+                        rounded
+                        :input-debounce="0"
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection v-if="!states">
+                    <QSkeleton type="QInput" class="full-width" />
+                </QItemSection>
+                <QItemSection v-if="states">
+                    <QSelect
+                        :label="t('State')"
+                        v-model="params.stateFk"
+                        @update:model-value="searchFn()"
+                        :options="states"
+                        option-value="id"
+                        option-label="name"
+                        emit-value
+                        map-options
+                        dense
+                        outlined
+                        rounded
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInput
+                        v-model="params.refFk"
+                        :label="t('Invoice Ref.')"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <QCheckbox
+                        v-model="params.myTeam"
+                        @update:model-value="searchFn()"
+                        :label="t('My team')"
+                        toggle-indeterminate
+                    />
+                </QItemSection>
+                <QItemSection>
+                    <QCheckbox
+                        v-model="params.pending"
+                        @update:model-value="searchFn()"
+                        :label="t('Pending')"
+                        toggle-indeterminate
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <QCheckbox
+                        v-model="params.hasInvoice"
+                        @update:model-value="searchFn()"
+                        :label="t('Invoiced')"
+                        toggle-indeterminate
+                    />
+                </QItemSection>
+                <QItemSection>
+                    <QCheckbox
+                        v-model="params.hasRoute"
+                        @update:model-value="searchFn()"
+                        :label="t('Routed')"
+                        toggle-indeterminate
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <QCheckbox
+                        v-model="params.problems"
+                        @update:model-value="searchFn()"
+                        :label="t('With problems')"
+                        toggle-indeterminate
+                    />
+                </QItemSection>
+            </QItem>
+            <QSeparator />
+            <QExpansionItem :label="t('More options')" expand-separator>
                 <QItem>
-                    <QItemSection>
-                        <VnInput
-                            v-model="params.clientFk"
-                            :label="t('Customer ID')"
-                            is-outlined
-                        />
-                    </QItemSection>
-                    <QItemSection>
-                        <VnInput
-                            v-model="params.orderFk"
-                            :label="t('Order ID')"
-                            is-outlined
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <VnInputDate
-                            v-model="params.from"
-                            :label="t('From')"
-                            is-outlined
-                        />
-                    </QItemSection>
-                    <QItemSection>
-                        <VnInputDate v-model="params.to" :label="t('To')" is-outlined />
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection v-if="!workers">
+                    <QItemSection v-if="!provinces">
                         <QSkeleton type="QInput" class="full-width" />
                     </QItemSection>
-                    <QItemSection v-if="workers">
+                    <QItemSection v-if="provinces">
                         <QSelect
-                            :label="t('Salesperson')"
-                            v-model="params.salesPersonFk"
-                            :options="workers"
-                            option-value="id"
-                            option-label="name"
-                            emit-value
-                            map-options
-                            use-input
-                            dense
-                            outlined
-                            rounded
-                            :input-debounce="0"
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection v-if="!states">
-                        <QSkeleton type="QInput" class="full-width" />
-                    </QItemSection>
-                    <QItemSection v-if="states">
-                        <QSelect
-                            :label="t('State')"
-                            v-model="params.stateFk"
+                            :label="t('Province')"
+                            v-model="params.provinceFk"
                             @update:model-value="searchFn()"
-                            :options="states"
+                            :options="provinces"
                             option-value="id"
                             option-label="name"
                             emit-value
@@ -127,124 +199,46 @@ const warehouses = ref();
                     </QItemSection>
                 </QItem>
                 <QItem>
-                    <QItemSection>
-                        <VnInput
-                            v-model="params.refFk"
-                            :label="t('Invoice Ref.')"
-                            is-outlined
+                    <QItemSection v-if="!agencies">
+                        <QSkeleton type="QInput" class="full-width" />
+                    </QItemSection>
+                    <QItemSection v-if="agencies">
+                        <QSelect
+                            :label="t('Agency')"
+                            v-model="params.agencyModeFk"
+                            @update:model-value="searchFn()"
+                            :options="agencies"
+                            option-value="id"
+                            option-label="name"
+                            emit-value
+                            map-options
+                            dense
+                            outlined
+                            rounded
                         />
                     </QItemSection>
                 </QItem>
                 <QItem>
-                    <QItemSection>
-                        <QCheckbox
-                            v-model="params.myTeam"
-                            @update:model-value="searchFn()"
-                            :label="t('My team')"
-                            toggle-indeterminate
-                        />
+                    <QItemSection v-if="!warehouses">
+                        <QSkeleton type="QInput" class="full-width" />
                     </QItemSection>
-                    <QItemSection>
-                        <QCheckbox
-                            v-model="params.pending"
+                    <QItemSection v-if="warehouses">
+                        <QSelect
+                            :label="t('Warehouse')"
+                            v-model="params.warehouseFk"
                             @update:model-value="searchFn()"
-                            :label="t('Pending')"
-                            toggle-indeterminate
+                            :options="warehouses"
+                            option-value="id"
+                            option-label="name"
+                            emit-value
+                            map-options
+                            dense
+                            outlined
+                            rounded
                         />
                     </QItemSection>
                 </QItem>
-                <QItem>
-                    <QItemSection>
-                        <QCheckbox
-                            v-model="params.hasInvoice"
-                            @update:model-value="searchFn()"
-                            :label="t('Invoiced')"
-                            toggle-indeterminate
-                        />
-                    </QItemSection>
-                    <QItemSection>
-                        <QCheckbox
-                            v-model="params.hasRoute"
-                            @update:model-value="searchFn()"
-                            :label="t('Routed')"
-                            toggle-indeterminate
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <QCheckbox
-                            v-model="params.problems"
-                            @update:model-value="searchFn()"
-                            :label="t('With problems')"
-                            toggle-indeterminate
-                        />
-                    </QItemSection>
-                </QItem>
-                <QSeparator />
-                <QExpansionItem :label="t('More options')" expand-separator>
-                    <QItem>
-                        <QItemSection v-if="!provinces">
-                            <QSkeleton type="QInput" class="full-width" />
-                        </QItemSection>
-                        <QItemSection v-if="provinces">
-                            <QSelect
-                                :label="t('Province')"
-                                v-model="params.provinceFk"
-                                @update:model-value="searchFn()"
-                                :options="provinces"
-                                option-value="id"
-                                option-label="name"
-                                emit-value
-                                map-options
-                                dense
-                                outlined
-                                rounded
-                            />
-                        </QItemSection>
-                    </QItem>
-                    <QItem>
-                        <QItemSection v-if="!agencies">
-                            <QSkeleton type="QInput" class="full-width" />
-                        </QItemSection>
-                        <QItemSection v-if="agencies">
-                            <QSelect
-                                :label="t('Agency')"
-                                v-model="params.agencyModeFk"
-                                @update:model-value="searchFn()"
-                                :options="agencies"
-                                option-value="id"
-                                option-label="name"
-                                emit-value
-                                map-options
-                                dense
-                                outlined
-                                rounded
-                            />
-                        </QItemSection>
-                    </QItem>
-                    <QItem>
-                        <QItemSection v-if="!warehouses">
-                            <QSkeleton type="QInput" class="full-width" />
-                        </QItemSection>
-                        <QItemSection v-if="warehouses">
-                            <QSelect
-                                :label="t('Warehouse')"
-                                v-model="params.warehouseFk"
-                                @update:model-value="searchFn()"
-                                :options="warehouses"
-                                option-value="id"
-                                option-label="name"
-                                emit-value
-                                map-options
-                                dense
-                                outlined
-                                rounded
-                            />
-                        </QItemSection>
-                    </QItem>
-                </QExpansionItem>
-            </QList>
+            </QExpansionItem>
         </template>
     </VnFilterPanel>
 </template>
diff --git a/src/pages/Travel/ExtraCommunityFilter.vue b/src/pages/Travel/ExtraCommunityFilter.vue
index 260b0fb42..cac8e093d 100644
--- a/src/pages/Travel/ExtraCommunityFilter.vue
+++ b/src/pages/Travel/ExtraCommunityFilter.vue
@@ -66,158 +66,149 @@ const decrement = (paramsObj, key) => {
             </div>
         </template>
         <template #body="{ params }">
-            <QList dense class="list q-gutter-y-sm q-mt-sm">
-                <QItem>
-                    <QItemSection>
-                        <VnInput label="id" v-model="params.id" is-outlined />
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <VnInput
-                            :label="t('params.reference')"
-                            v-model="params.reference"
-                            is-outlined
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <QInput
-                            v-model="params.totalEntries"
-                            type="number"
-                            :label="t('params.totalEntries')"
-                            dense
-                            outlined
-                            rounded
-                            min="0"
-                            class="input-number"
-                        >
-                            <template #append>
-                                <QBtn
-                                    icon="add"
-                                    flat
-                                    dense
-                                    size="12px"
-                                    @click="add(params, 'totalEntries')"
-                                />
-                                <QBtn
-                                    icon="remove"
-                                    flat
-                                    dense
-                                    size="12px"
-                                    @click="decrement(params, 'totalEntries')"
-                                />
-                            </template>
-                        </QInput>
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <VnSelectFilter
-                            :label="t('params.agencyModeFk')"
-                            v-model="params.agencyModeFk"
-                            :options="agenciesOptions"
-                            option-value="agencyFk"
-                            option-label="name"
-                            hide-selected
-                            dense
-                            outlined
-                            rounded
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <VnInputDate
-                            v-model="params.shippedFrom"
-                            :label="t('params.shippedFrom')"
-                            is-outlined
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <VnInputDate
-                            v-model="params.landedTo"
-                            :label="t('params.landedTo')"
-                            is-outlined
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <VnSelectFilter
-                            :label="t('params.warehouseOutFk')"
-                            v-model="params.warehouseOutFk"
-                            :options="warehousesOptions"
-                            option-value="id"
-                            option-label="name"
-                            hide-selected
-                            dense
-                            outlined
-                            rounded
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <VnSelectFilter
-                            :label="t('params.warehouseInFk')"
-                            v-model="params.warehouseInFk"
-                            :options="warehousesOptions"
-                            option-value="id"
-                            option-label="name"
-                            hide-selected
-                            dense
-                            outlined
-                            rounded
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <VnSelectFilter
-                            :label="t('supplier.pageTitles.supplier')"
-                            v-model="params.cargoSupplierFk"
-                            :options="suppliersOptions"
-                            option-value="id"
-                            option-label="name"
-                            hide-selected
-                            dense
-                            outlined
-                            rounded
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <VnSelectFilter
-                            :label="t('params.continent')"
-                            v-model="params.continent"
-                            :options="continentsOptions"
-                            option-value="code"
-                            option-label="name"
-                            hide-selected
-                            dense
-                            outlined
-                            rounded
-                        />
-                    </QItemSection>
-                </QItem>
-            </QList>
+            <QItem>
+                <QItemSection>
+                    <VnInput label="id" v-model="params.id" is-outlined />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInput
+                        :label="t('params.reference')"
+                        v-model="params.reference"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <QInput
+                        v-model="params.totalEntries"
+                        type="number"
+                        :label="t('params.totalEntries')"
+                        dense
+                        outlined
+                        rounded
+                        min="0"
+                        class="input-number"
+                    >
+                        <template #append>
+                            <QBtn
+                                icon="add"
+                                flat
+                                dense
+                                size="12px"
+                                @click="add(params, 'totalEntries')"
+                            />
+                            <QBtn
+                                icon="remove"
+                                flat
+                                dense
+                                size="12px"
+                                @click="decrement(params, 'totalEntries')"
+                            />
+                        </template>
+                    </QInput>
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnSelectFilter
+                        :label="t('params.agencyModeFk')"
+                        v-model="params.agencyModeFk"
+                        :options="agenciesOptions"
+                        option-value="agencyFk"
+                        option-label="name"
+                        hide-selected
+                        dense
+                        outlined
+                        rounded
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInputDate
+                        v-model="params.shippedFrom"
+                        :label="t('params.shippedFrom')"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInputDate
+                        v-model="params.landedTo"
+                        :label="t('params.landedTo')"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnSelectFilter
+                        :label="t('params.warehouseOutFk')"
+                        v-model="params.warehouseOutFk"
+                        :options="warehousesOptions"
+                        option-value="id"
+                        option-label="name"
+                        hide-selected
+                        dense
+                        outlined
+                        rounded
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnSelectFilter
+                        :label="t('params.warehouseInFk')"
+                        v-model="params.warehouseInFk"
+                        :options="warehousesOptions"
+                        option-value="id"
+                        option-label="name"
+                        hide-selected
+                        dense
+                        outlined
+                        rounded
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnSelectFilter
+                        :label="t('supplier.pageTitles.supplier')"
+                        v-model="params.cargoSupplierFk"
+                        :options="suppliersOptions"
+                        option-value="id"
+                        option-label="name"
+                        hide-selected
+                        dense
+                        outlined
+                        rounded
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnSelectFilter
+                        :label="t('params.continent')"
+                        v-model="params.continent"
+                        :options="continentsOptions"
+                        option-value="code"
+                        option-label="name"
+                        hide-selected
+                        dense
+                        outlined
+                        rounded
+                    />
+                </QItemSection>
+            </QItem>
         </template>
     </VnFilterPanel>
 </template>
 
 <style scoped>
-.list {
-    width: 256px;
-}
-.list * {
-    max-width: 100%;
-}
-
 .input-number >>> input[type='number'] {
     -moz-appearance: textfield;
 }
diff --git a/src/pages/Travel/TravelFilter.vue b/src/pages/Travel/TravelFilter.vue
index 52a755c34..62439a2e4 100644
--- a/src/pages/Travel/TravelFilter.vue
+++ b/src/pages/Travel/TravelFilter.vue
@@ -61,216 +61,207 @@ const decrement = (paramsObj, key) => {
             </div>
         </template>
         <template #body="{ params }">
-            <QList dense class="list q-gutter-y-sm q-mt-sm">
-                <QItem>
-                    <QItemSection>
-                        <VnInput
-                            v-model="params.search"
-                            :label="t('params.search')"
-                            is-outlined
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <VnSelectFilter
-                            :label="t('params.agencyModeFk')"
-                            v-model="params.agencyModeFk"
-                            :options="agenciesOptions"
-                            option-value="agencyFk"
-                            option-label="name"
-                            hide-selected
-                            dense
-                            outlined
-                            rounded
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <VnSelectFilter
-                            :label="t('params.warehouseOutFk')"
-                            v-model="params.warehouseOutFk"
-                            :options="warehousesOptions"
-                            option-value="id"
-                            option-label="name"
-                            hide-selected
-                            dense
-                            outlined
-                            rounded
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <VnSelectFilter
-                            :label="t('params.warehouseInFk')"
-                            v-model="params.warehouseInFk"
-                            :options="warehousesOptions"
-                            option-value="id"
-                            option-label="name"
-                            hide-selected
-                            dense
-                            outlined
-                            rounded
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <QInput
-                            v-model="params.scopeDays"
-                            type="number"
-                            :label="t('params.scopeDays')"
-                            dense
-                            outlined
-                            rounded
-                            class="input-number"
-                        >
-                            <template #append>
-                                <QBtn
-                                    icon="add"
-                                    flat
-                                    dense
-                                    size="12px"
-                                    @click="add(params, 'scopeDays')"
-                                />
-                                <QBtn
-                                    icon="remove"
-                                    flat
-                                    dense
-                                    size="12px"
-                                    @click="decrement(params, 'scopeDays')"
-                                />
-                            </template>
-                        </QInput>
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <QInput
-                            dense
-                            outlined
-                            rounded
-                            placeholder="dd-mm-aaa"
-                            :label="t('params.landedFrom')"
-                            :model-value="toDate(params.landedFrom)"
-                        >
-                            <template #append>
-                                <QIcon name="event" class="cursor-pointer">
-                                    <QPopupProxy
-                                        cover
-                                        transition-show="scale"
-                                        transition-hide="scale"
-                                    >
-                                        <QDate v-model="params.landedFrom">
-                                            <div class="row items-center justify-end">
-                                                <QBtn
-                                                    v-close-popup
-                                                    :label="t('globals.close')"
-                                                    color="primary"
-                                                    flat
-                                                />
-                                            </div>
-                                        </QDate>
-                                    </QPopupProxy>
-                                </QIcon>
-                            </template>
-                        </QInput>
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <QInput
-                            dense
-                            outlined
-                            rounded
-                            placeholder="dd-mm-aaa"
-                            :model-value="toDate(params.landedTo)"
-                            :label="t('params.landedTo')"
-                        >
-                            <template #append>
-                                <QIcon name="event" class="cursor-pointer">
-                                    <QPopupProxy
-                                        cover
-                                        transition-show="scale"
-                                        transition-hide="scale"
-                                    >
-                                        <QDate v-model="params.landedTo">
-                                            <div class="row items-center justify-end">
-                                                <QBtn
-                                                    v-close-popup
-                                                    :label="t('globals.close')"
-                                                    color="primary"
-                                                    flat
-                                                />
-                                            </div>
-                                        </QDate>
-                                    </QPopupProxy>
-                                </QIcon>
-                            </template>
-                        </QInput>
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <VnSelectFilter
-                            :label="t('params.continent')"
-                            v-model="params.continent"
-                            :options="continentsOptions"
-                            option-value="code"
-                            option-label="name"
-                            hide-selected
-                            dense
-                            outlined
-                            rounded
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <QInput
-                            v-model="params.totalEntries"
-                            type="number"
-                            :label="t('params.totalEntries')"
-                            dense
-                            outlined
-                            rounded
-                            min="0"
-                            class="input-number"
-                        >
-                            <template #append>
-                                <QBtn
-                                    icon="add"
-                                    flat
-                                    dense
-                                    size="12px"
-                                    @click="add(params, 'totalEntries')"
-                                />
-                                <QBtn
-                                    icon="remove"
-                                    flat
-                                    dense
-                                    size="12px"
-                                    @click="decrement(params, 'totalEntries')"
-                                />
-                            </template>
-                        </QInput>
-                    </QItemSection>
-                </QItem>
-            </QList>
+            <QItem>
+                <QItemSection>
+                    <VnInput
+                        v-model="params.search"
+                        :label="t('params.search')"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnSelectFilter
+                        :label="t('params.agencyModeFk')"
+                        v-model="params.agencyModeFk"
+                        :options="agenciesOptions"
+                        option-value="agencyFk"
+                        option-label="name"
+                        hide-selected
+                        dense
+                        outlined
+                        rounded
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnSelectFilter
+                        :label="t('params.warehouseOutFk')"
+                        v-model="params.warehouseOutFk"
+                        :options="warehousesOptions"
+                        option-value="id"
+                        option-label="name"
+                        hide-selected
+                        dense
+                        outlined
+                        rounded
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnSelectFilter
+                        :label="t('params.warehouseInFk')"
+                        v-model="params.warehouseInFk"
+                        :options="warehousesOptions"
+                        option-value="id"
+                        option-label="name"
+                        hide-selected
+                        dense
+                        outlined
+                        rounded
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <QInput
+                        v-model="params.scopeDays"
+                        type="number"
+                        :label="t('params.scopeDays')"
+                        dense
+                        outlined
+                        rounded
+                        class="input-number"
+                    >
+                        <template #append>
+                            <QBtn
+                                icon="add"
+                                flat
+                                dense
+                                size="12px"
+                                @click="add(params, 'scopeDays')"
+                            />
+                            <QBtn
+                                icon="remove"
+                                flat
+                                dense
+                                size="12px"
+                                @click="decrement(params, 'scopeDays')"
+                            />
+                        </template>
+                    </QInput>
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <QInput
+                        dense
+                        outlined
+                        rounded
+                        placeholder="dd-mm-aaa"
+                        :label="t('params.landedFrom')"
+                        :model-value="toDate(params.landedFrom)"
+                    >
+                        <template #append>
+                            <QIcon name="event" class="cursor-pointer">
+                                <QPopupProxy
+                                    cover
+                                    transition-show="scale"
+                                    transition-hide="scale"
+                                >
+                                    <QDate v-model="params.landedFrom">
+                                        <div class="row items-center justify-end">
+                                            <QBtn
+                                                v-close-popup
+                                                :label="t('globals.close')"
+                                                color="primary"
+                                                flat
+                                            />
+                                        </div>
+                                    </QDate>
+                                </QPopupProxy>
+                            </QIcon>
+                        </template>
+                    </QInput>
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <QInput
+                        dense
+                        outlined
+                        rounded
+                        placeholder="dd-mm-aaa"
+                        :model-value="toDate(params.landedTo)"
+                        :label="t('params.landedTo')"
+                    >
+                        <template #append>
+                            <QIcon name="event" class="cursor-pointer">
+                                <QPopupProxy
+                                    cover
+                                    transition-show="scale"
+                                    transition-hide="scale"
+                                >
+                                    <QDate v-model="params.landedTo">
+                                        <div class="row items-center justify-end">
+                                            <QBtn
+                                                v-close-popup
+                                                :label="t('globals.close')"
+                                                color="primary"
+                                                flat
+                                            />
+                                        </div>
+                                    </QDate>
+                                </QPopupProxy>
+                            </QIcon>
+                        </template>
+                    </QInput>
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnSelectFilter
+                        :label="t('params.continent')"
+                        v-model="params.continent"
+                        :options="continentsOptions"
+                        option-value="code"
+                        option-label="name"
+                        hide-selected
+                        dense
+                        outlined
+                        rounded
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <QInput
+                        v-model="params.totalEntries"
+                        type="number"
+                        :label="t('params.totalEntries')"
+                        dense
+                        outlined
+                        rounded
+                        min="0"
+                        class="input-number"
+                    >
+                        <template #append>
+                            <QBtn
+                                icon="add"
+                                flat
+                                dense
+                                size="12px"
+                                @click="add(params, 'totalEntries')"
+                            />
+                            <QBtn
+                                icon="remove"
+                                flat
+                                dense
+                                size="12px"
+                                @click="decrement(params, 'totalEntries')"
+                            />
+                        </template>
+                    </QInput>
+                </QItemSection>
+            </QItem>
         </template>
     </VnFilterPanel>
 </template>
 
 <style scoped>
-.list {
-    width: 256px;
-}
-.list * {
-    max-width: 100%;
-}
-
 .input-number >>> input[type='number'] {
     -moz-appearance: textfield;
 }
diff --git a/src/pages/Worker/WorkerFilter.vue b/src/pages/Worker/WorkerFilter.vue
index 680a17937..0853791ef 100644
--- a/src/pages/Worker/WorkerFilter.vue
+++ b/src/pages/Worker/WorkerFilter.vue
@@ -27,74 +27,72 @@ const departments = ref();
             </div>
         </template>
         <template #body="{ params, searchFn }">
-            <QList dense class="q-gutter-y-sm q-mt-sm">
-                <QItem>
-                    <QItemSection>
-                        <VnInput :label="t('FI')" v-model="params.fi" is-outlined
-                            ><template #prepend>
-                                <QIcon name="badge" size="xs"></QIcon> </template
-                        ></VnInput>
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <VnInput
-                            :label="t('First Name')"
-                            v-model="params.firstName"
-                            is-outlined
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <VnInput
-                            :label="t('Last Name')"
-                            v-model="params.lastName"
-                            is-outlined
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <VnInput
-                            :label="t('User Name')"
-                            v-model="params.userName"
-                            is-outlined
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection v-if="!departments">
-                        <QSkeleton type="QInput" class="full-width" />
-                    </QItemSection>
-                    <QItemSection v-if="departments">
-                        <QSelect
-                            :label="t('Department')"
-                            v-model="params.departmentFk"
-                            @update:model-value="searchFn()"
-                            :options="departments"
-                            option-value="id"
-                            option-label="name"
-                            emit-value
-                            map-options
-                            use-input
-                            dense
-                            outlined
-                            rounded
-                            :input-debounce="0"
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <VnInput
-                            :label="t('Extension')"
-                            v-model="params.extension"
-                            is-outlined
-                        />
-                    </QItemSection>
-                </QItem>
-            </QList>
+            <QItem>
+                <QItemSection>
+                    <VnInput :label="t('FI')" v-model="params.fi" is-outlined
+                        ><template #prepend>
+                            <QIcon name="badge" size="xs"></QIcon> </template
+                    ></VnInput>
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInput
+                        :label="t('First Name')"
+                        v-model="params.firstName"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInput
+                        :label="t('Last Name')"
+                        v-model="params.lastName"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInput
+                        :label="t('User Name')"
+                        v-model="params.userName"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection v-if="!departments">
+                    <QSkeleton type="QInput" class="full-width" />
+                </QItemSection>
+                <QItemSection v-if="departments">
+                    <QSelect
+                        :label="t('Department')"
+                        v-model="params.departmentFk"
+                        @update:model-value="searchFn()"
+                        :options="departments"
+                        option-value="id"
+                        option-label="name"
+                        emit-value
+                        map-options
+                        use-input
+                        dense
+                        outlined
+                        rounded
+                        :input-debounce="0"
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInput
+                        :label="t('Extension')"
+                        v-model="params.extension"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
         </template>
     </VnFilterPanel>
 </template>

From 4731bdbabded9dc1647f178a91b47f2303f11008 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Mon, 22 Jan 2024 12:25:59 -0300
Subject: [PATCH 74/94] Make card-list a global class

---
 src/css/app.scss                              |  5 +++++
 src/pages/Claim/ClaimList.vue                 |  9 +-------
 src/pages/Claim/ClaimRmaList.vue              |  3 +--
 src/pages/Customer/CustomerList.vue           |  9 +-------
 .../Customer/Payments/CustomerPayments.vue    | 21 +++++++------------
 src/pages/Entry/EntryList.vue                 |  9 +-------
 src/pages/InvoiceIn/InvoiceInList.vue         |  9 +-------
 src/pages/InvoiceOut/InvoiceOutList.vue       |  9 +-------
 src/pages/Order/OrderCatalog.vue              | 12 ++++-------
 src/pages/Order/OrderLines.vue                |  7 +------
 src/pages/Order/OrderList.vue                 | 13 +++---------
 src/pages/Order/OrderVolume.vue               |  7 +------
 src/pages/Shelving/ShelvingList.vue           |  9 +-------
 src/pages/Supplier/Card/SupplierAddresses.vue |  9 +-------
 src/pages/Supplier/SupplierList.vue           |  9 +-------
 src/pages/Ticket/TicketList.vue               |  9 +-------
 src/pages/Travel/TravelList.vue               |  9 +-------
 src/pages/Wagon/Type/WagonTypeList.vue        |  9 +-------
 src/pages/Wagon/WagonList.vue                 |  9 +-------
 src/pages/Worker/WorkerList.vue               |  9 +-------
 20 files changed, 36 insertions(+), 149 deletions(-)

diff --git a/src/css/app.scss b/src/css/app.scss
index f11ab865c..b742dae2f 100644
--- a/src/css/app.scss
+++ b/src/css/app.scss
@@ -58,6 +58,11 @@ body.body--dark {
     border-radius: 8px;
 }
 
+.vn-card-list {
+    width: 100%;
+    max-width: 60em;
+}
+
 /* Estilo para el asterisco en campos requeridos */
 .q-field.required .q-field__label:after {
     content: ' *';
diff --git a/src/pages/Claim/ClaimList.vue b/src/pages/Claim/ClaimList.vue
index b33854959..a0e38079d 100644
--- a/src/pages/Claim/ClaimList.vue
+++ b/src/pages/Claim/ClaimList.vue
@@ -71,7 +71,7 @@ function viewSummary(id) {
         </QScrollArea>
     </QDrawer>
     <QPage class="column items-center q-pa-md">
-        <div class="card-list">
+        <div class="vn-card-list">
             <VnPaginate
                 data-key="ClaimList"
                 url="Claims/filter"
@@ -145,13 +145,6 @@ function viewSummary(id) {
     </QPage>
 </template>
 
-<style lang="scss" scoped>
-.card-list {
-    width: 100%;
-    max-width: 60em;
-}
-</style>
-
 <i18n>
 es:
     Search claim: Buscar reclamación
diff --git a/src/pages/Claim/ClaimRmaList.vue b/src/pages/Claim/ClaimRmaList.vue
index 3774932e3..b906e32fa 100644
--- a/src/pages/Claim/ClaimRmaList.vue
+++ b/src/pages/Claim/ClaimRmaList.vue
@@ -84,7 +84,7 @@ async function remove({ id }) {
                 </QForm>
             </QCard>
         </QPageSticky>
-        <div class="card-list">
+        <div class="vn-card-list">
             <VnPaginate
                 data-key="ClaimRmaList"
                 url="ClaimRmas"
@@ -160,7 +160,6 @@ async function remove({ id }) {
     padding-top: 156px;
 }
 
-.card-list,
 .card {
     width: 100%;
     max-width: 60em;
diff --git a/src/pages/Customer/CustomerList.vue b/src/pages/Customer/CustomerList.vue
index 540afcc4c..a78720d03 100644
--- a/src/pages/Customer/CustomerList.vue
+++ b/src/pages/Customer/CustomerList.vue
@@ -65,7 +65,7 @@ const redirectToCreateView = () => {
         </QScrollArea>
     </QDrawer>
     <QPage class="column items-center q-pa-md">
-        <div class="card-list">
+        <div class="vn-card-list">
             <VnPaginate
                 auto-load
                 data-key="CustomerList"
@@ -116,13 +116,6 @@ const redirectToCreateView = () => {
     </QPage>
 </template>
 
-<style lang="scss" scoped>
-.card-list {
-    width: 100%;
-    max-width: 60em;
-}
-</style>
-
 <i18n>
 es:
     Search customer: Buscar cliente
diff --git a/src/pages/Customer/Payments/CustomerPayments.vue b/src/pages/Customer/Payments/CustomerPayments.vue
index de774e63e..eedaaf137 100644
--- a/src/pages/Customer/Payments/CustomerPayments.vue
+++ b/src/pages/Customer/Payments/CustomerPayments.vue
@@ -122,7 +122,7 @@ function stateColor(row) {
         </QScrollArea>
     </QDrawer>
     <QPage class="column items-center q-pa-md customer-payments">
-        <div class="card-list">
+        <div class="vn-card-list">
             <QToolbar class="q-pa-none justify-end">
                 <QBtn
                     @click="arrayData.refresh()"
@@ -278,18 +278,13 @@ function stateColor(row) {
 
 <style lang="scss">
 .customer-payments {
-    .card-list {
-        width: 100%;
-        max-width: 60em;
-
-        .q-table--dense .q-table th:first-child {
-            padding-left: 0;
-        }
-        td {
-            max-width: 130px;
-            overflow: hidden;
-            text-overflow: ellipsis;
-        }
+    .q-table--dense .q-table th:first-child {
+        padding-left: 0;
+    }
+    td {
+        max-width: 130px;
+        overflow: hidden;
+        text-overflow: ellipsis;
     }
 }
 </style>
diff --git a/src/pages/Entry/EntryList.vue b/src/pages/Entry/EntryList.vue
index 40747178c..0cf707efa 100644
--- a/src/pages/Entry/EntryList.vue
+++ b/src/pages/Entry/EntryList.vue
@@ -47,7 +47,7 @@ onMounted(async () => {
         </QScrollArea>
     </QDrawer>
     <QPage class="column items-center q-pa-md">
-        <div class="card-list">
+        <div class="vn-card-list">
             <VnPaginate
                 data-key="EntryList"
                 url="Entries/filter"
@@ -128,13 +128,6 @@ onMounted(async () => {
     </QPageSticky>
 </template>
 
-<style lang="scss" scoped>
-.card-list {
-    width: 100%;
-    max-width: 60em;
-}
-</style>
-
 <i18n>
 es:
     Search entries: Buscar entradas
diff --git a/src/pages/InvoiceIn/InvoiceInList.vue b/src/pages/InvoiceIn/InvoiceInList.vue
index bf791c10e..2f508ec34 100644
--- a/src/pages/InvoiceIn/InvoiceInList.vue
+++ b/src/pages/InvoiceIn/InvoiceInList.vue
@@ -71,7 +71,7 @@ function viewSummary(id) {
         </QScrollArea>
     </QDrawer>
     <QPage class="column items-center q-pa-md">
-        <div class="card-list">
+        <div class="vn-card-list">
             <VnPaginate
                 data-key="InvoiceInList"
                 url="InvoiceIns/filter"
@@ -157,13 +157,6 @@ function viewSummary(id) {
     </QPageSticky>
 </template>
 
-<style lang="scss" scoped>
-.card-list {
-    width: 100%;
-    max-width: 60em;
-}
-</style>
-
 <i18n>
 es:
     Search invoice: Buscar factura emitida
diff --git a/src/pages/InvoiceOut/InvoiceOutList.vue b/src/pages/InvoiceOut/InvoiceOutList.vue
index 292fa2e0a..36d1d3aad 100644
--- a/src/pages/InvoiceOut/InvoiceOutList.vue
+++ b/src/pages/InvoiceOut/InvoiceOutList.vue
@@ -181,7 +181,7 @@ const downloadCsv = () => {
                     </div>
                 </QToolbar>
                 <div class="flex flex-center q-pa-md">
-                    <div class="card-list">
+                    <div class="vn-card-list">
                         <CardList
                             :element="row"
                             :id="row.id"
@@ -246,13 +246,6 @@ const downloadCsv = () => {
     </QPage>
 </template>
 
-<style lang="scss" scoped>
-.card-list {
-    width: 100%;
-    max-width: 60em;
-}
-</style>
-
 <i18n>
 en:
     searchInvoice: Search issued invoice
diff --git a/src/pages/Order/OrderCatalog.vue b/src/pages/Order/OrderCatalog.vue
index 55f5e7da1..21442d10d 100644
--- a/src/pages/Order/OrderCatalog.vue
+++ b/src/pages/Order/OrderCatalog.vue
@@ -1,7 +1,7 @@
 <script setup>
 import { useStateStore } from 'stores/useStateStore';
 import { useRoute } from 'vue-router';
-import {onMounted, onUnmounted, ref} from 'vue';
+import { onMounted, onUnmounted, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import VnPaginate from 'components/ui/VnPaginate.vue';
 import VnSearchbar from 'components/ui/VnSearchbar.vue';
@@ -20,7 +20,7 @@ const catalogParams = {
     orderBy: JSON.stringify({ field: 'relevancy DESC, name', way: 'ASC', isTag: false }),
 };
 
-const tags = ref([])
+const tags = ref([]);
 
 function extractTags(items) {
     const resultTags = [];
@@ -34,7 +34,7 @@ function extractTags(items) {
             }
         });
     });
-    tags.value = resultTags
+    tags.value = resultTags;
 }
 </script>
 
@@ -70,7 +70,7 @@ function extractTags(items) {
         </QScrollArea>
     </QDrawer>
     <QPage class="column items-center q-pa-md">
-        <div class="card-list">
+        <div class="full-width">
             <VnPaginate
                 data-key="OrderCatalogList"
                 url="Orders/CatalogFilter"
@@ -93,10 +93,6 @@ function extractTags(items) {
 </template>
 
 <style lang="scss" scoped>
-.card-list {
-    width: 100%;
-}
-
 .catalog-list {
     display: flex;
     align-items: flex-start;
diff --git a/src/pages/Order/OrderLines.vue b/src/pages/Order/OrderLines.vue
index 0dce70831..a2ee42481 100644
--- a/src/pages/Order/OrderLines.vue
+++ b/src/pages/Order/OrderLines.vue
@@ -83,7 +83,7 @@ async function confirmOrder() {
         auto-load
     />
     <QPage :key="componentKey" class="column items-center q-pa-md">
-        <div class="card-list">
+        <div class="vn-card-list">
             <div v-if="!orderSummary.total" class="no-result">
                 {{ t('globals.noResults') }}
             </div>
@@ -228,11 +228,6 @@ async function confirmOrder() {
 }
 </style>
 <style lang="scss" scoped>
-.card-list {
-    width: 100%;
-    max-width: 60em;
-}
-
 .header {
     color: $primary;
     font-weight: bold;
diff --git a/src/pages/Order/OrderList.vue b/src/pages/Order/OrderList.vue
index 362a68b4d..8b6b53fbe 100644
--- a/src/pages/Order/OrderList.vue
+++ b/src/pages/Order/OrderList.vue
@@ -4,7 +4,7 @@ import { onMounted, onUnmounted } from 'vue';
 import { useRouter } from 'vue-router';
 import { useStateStore } from 'stores/useStateStore';
 import { toCurrency, toDate } from 'src/filters';
-import {useQuasar} from "quasar";
+import { useQuasar } from 'quasar';
 import CardList from 'components/ui/CardList.vue';
 import WorkerDescriptorProxy from 'pages/Worker/Card/WorkerDescriptorProxy.vue';
 import CustomerDescriptorProxy from 'pages/Customer/Card/CustomerDescriptorProxy.vue';
@@ -12,7 +12,7 @@ import VnPaginate from 'components/ui/VnPaginate.vue';
 import VnLv from 'components/ui/VnLv.vue';
 import OrderSearchbar from 'pages/Order/Card/OrderSearchbar.vue';
 import OrderFilter from 'pages/Order/Card/OrderFilter.vue';
-import OrderSummaryDialog from "pages/Order/Card/OrderSummaryDialog.vue";
+import OrderSummaryDialog from 'pages/Order/Card/OrderSummaryDialog.vue';
 
 const stateStore = useStateStore();
 const quasar = useQuasar();
@@ -63,7 +63,7 @@ function viewSummary(id) {
         </QScrollArea>
     </QDrawer>
     <QPage class="column items-center q-pa-md">
-        <div class="card-list">
+        <div class="vn-card-list">
             <VnPaginate
                 data-key="OrderList"
                 url="Orders/filter"
@@ -153,10 +153,3 @@ function viewSummary(id) {
         </QPageSticky>
     </QPage>
 </template>
-
-<style lang="scss" scoped>
-.card-list {
-    width: 100%;
-    max-width: 60em;
-}
-</style>
diff --git a/src/pages/Order/OrderVolume.vue b/src/pages/Order/OrderVolume.vue
index 4f4c269f6..5bb106edc 100644
--- a/src/pages/Order/OrderVolume.vue
+++ b/src/pages/Order/OrderVolume.vue
@@ -35,7 +35,7 @@ const loadVolumes = async (rows) => {
         auto-load
     />
     <QPage class="column items-center q-pa-md">
-        <div class="card-list">
+        <div class="vn-card-list">
             <div
                 v-if="!volumeSummary?.totalVolume && !volumeSummary?.totalBoxes"
                 class="no-result"
@@ -121,11 +121,6 @@ const loadVolumes = async (rows) => {
 }
 </style>
 <style lang="scss" scoped>
-.card-list {
-    width: 100%;
-    max-width: 60em;
-}
-
 .header {
     color: $primary;
     font-weight: bold;
diff --git a/src/pages/Shelving/ShelvingList.vue b/src/pages/Shelving/ShelvingList.vue
index 71b3a6ccf..c884dc5f4 100644
--- a/src/pages/Shelving/ShelvingList.vue
+++ b/src/pages/Shelving/ShelvingList.vue
@@ -74,7 +74,7 @@ function exprBuilder(param, value) {
         </QScrollArea>
     </QDrawer>
     <QPage class="column items-center q-pa-md">
-        <div class="card-list">
+        <div class="vn-card-list">
             <VnPaginate
                 data-key="ShelvingList"
                 url="Shelvings"
@@ -129,10 +129,3 @@ function exprBuilder(param, value) {
         </QPageSticky>
     </QPage>
 </template>
-
-<style lang="scss" scoped>
-.card-list {
-    width: 100%;
-    max-width: 60em;
-}
-</style>
diff --git a/src/pages/Supplier/Card/SupplierAddresses.vue b/src/pages/Supplier/Card/SupplierAddresses.vue
index df7cff932..c6b08075f 100644
--- a/src/pages/Supplier/Card/SupplierAddresses.vue
+++ b/src/pages/Supplier/Card/SupplierAddresses.vue
@@ -47,7 +47,7 @@ const redirectToUpdateView = (addressData) => {
 
 <template>
     <QPage class="column items-center q-pa-md">
-        <div class="card-list">
+        <div class="vn-card-list">
             <VnPaginate
                 data-key="SupplierAddress"
                 :url="`Suppliers/${route.params.id}/addresses`"
@@ -88,10 +88,3 @@ const redirectToUpdateView = (addressData) => {
         </QPageSticky>
     </QPage>
 </template>
-
-<style lang="scss" scoped>
-.card-list {
-    width: 100%;
-    max-width: 60em;
-}
-</style>
diff --git a/src/pages/Supplier/SupplierList.vue b/src/pages/Supplier/SupplierList.vue
index ea7bc3cb0..d504e127a 100644
--- a/src/pages/Supplier/SupplierList.vue
+++ b/src/pages/Supplier/SupplierList.vue
@@ -44,7 +44,7 @@ const viewSummary = (id) => {
     </template>
 
     <QPage class="column items-center q-pa-md">
-        <div class="card-list">
+        <div class="vn-card-list">
             <VnPaginate data-key="SuppliersList" url="Suppliers/filter" auto-load>
                 <template #body="{ rows }">
                     <CardList
@@ -95,13 +95,6 @@ const viewSummary = (id) => {
     </QPage>
 </template>
 
-<style lang="scss" scoped>
-.card-list {
-    width: 100%;
-    max-width: 60em;
-}
-</style>
-
 <i18n>
 en:
     Search suppliers: Search suppliers
diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index 9186eb6ad..6f57ad0b9 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -74,7 +74,7 @@ function viewSummary(id) {
         </QScrollArea>
     </QDrawer>
     <QPage class="column items-center q-pa-md">
-        <div class="card-list">
+        <div class="vn-card-list">
             <VnPaginate
                 data-key="TicketList"
                 url="Tickets/filter"
@@ -134,13 +134,6 @@ function viewSummary(id) {
     </QPage>
 </template>
 
-<style lang="scss" scoped>
-.card-list {
-    width: 100%;
-    max-width: 60em;
-}
-</style>
-
 <i18n>
 es:
     Search ticket: Buscar ticket
diff --git a/src/pages/Travel/TravelList.vue b/src/pages/Travel/TravelList.vue
index 889f096aa..dbbdaca93 100644
--- a/src/pages/Travel/TravelList.vue
+++ b/src/pages/Travel/TravelList.vue
@@ -56,7 +56,7 @@ onMounted(async () => {
         </QScrollArea>
     </QDrawer>
     <QPage class="column items-center q-pa-md">
-        <div class="card-list">
+        <div class="vn-card-list">
             <VnPaginate
                 data-key="TravelList"
                 url="Travels/filter"
@@ -132,13 +132,6 @@ onMounted(async () => {
     </QPage>
 </template>
 
-<style lang="scss" scoped>
-.card-list {
-    width: 100%;
-    max-width: 60em;
-}
-</style>
-
 <i18n>
 en:
     addEntry: Add entry
diff --git a/src/pages/Wagon/Type/WagonTypeList.vue b/src/pages/Wagon/Type/WagonTypeList.vue
index 8e4ace744..a7c713039 100644
--- a/src/pages/Wagon/Type/WagonTypeList.vue
+++ b/src/pages/Wagon/Type/WagonTypeList.vue
@@ -42,7 +42,7 @@ async function remove(row) {
 
 <template>
     <QPage class="column items-center q-pa-md">
-        <div class="card-list">
+        <div class="vn-card-list">
             <VnPaginate
                 data-key="WagonTypeList"
                 url="/WagonTypes"
@@ -80,10 +80,3 @@ async function remove(row) {
         </QPageSticky>
     </QPage>
 </template>
-
-<style lang="scss" scoped>
-.card-list {
-    width: 100%;
-    max-width: 60em;
-}
-</style>
diff --git a/src/pages/Wagon/WagonList.vue b/src/pages/Wagon/WagonList.vue
index 77d9da0bf..18417f433 100644
--- a/src/pages/Wagon/WagonList.vue
+++ b/src/pages/Wagon/WagonList.vue
@@ -48,7 +48,7 @@ async function remove(row) {
 
 <template>
     <QPage class="column items-center q-pa-md">
-        <div class="card-list">
+        <div class="vn-card-list">
             <VnPaginate
                 data-key="WagonList"
                 url="/Wagons"
@@ -99,10 +99,3 @@ async function remove(row) {
         </QPageSticky>
     </QPage>
 </template>
-
-<style lang="scss" scoped>
-.card-list {
-    width: 100%;
-    max-width: 60em;
-}
-</style>
diff --git a/src/pages/Worker/WorkerList.vue b/src/pages/Worker/WorkerList.vue
index e7e86d16e..0e9868a04 100644
--- a/src/pages/Worker/WorkerList.vue
+++ b/src/pages/Worker/WorkerList.vue
@@ -64,7 +64,7 @@ const redirectToCreateView = () => {
         </QScrollArea>
     </QDrawer>
     <QPage class="column items-center q-pa-md">
-        <div class="card-list">
+        <div class="vn-card-list">
             <VnPaginate
                 data-key="WorkerList"
                 url="Workers/filter"
@@ -114,13 +114,6 @@ const redirectToCreateView = () => {
     </QPage>
 </template>
 
-<style lang="scss" scoped>
-.card-list {
-    width: 100%;
-    max-width: 60em;
-}
-</style>
-
 <i18n>
 es:
     Search worker: Buscar trabajador

From 23210600ac78e89925c22a2905dde02d5bd0c6f0 Mon Sep 17 00:00:00 2001
From: carlosfonseca <carlos.fonseca@mindshore.io>
Date: Mon, 22 Jan 2024 11:00:03 -0500
Subject: [PATCH 75/94] Se hace correccion solicitada en issuecomment-39539

---
 .../Customer/Card/CustomerBillingData.vue     | 21 +++++++++----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerBillingData.vue b/src/pages/Customer/Card/CustomerBillingData.vue
index cee583f39..a455e6db2 100644
--- a/src/pages/Customer/Card/CustomerBillingData.vue
+++ b/src/pages/Customer/Card/CustomerBillingData.vue
@@ -1,8 +1,10 @@
 <script setup>
-import { ref } from 'vue';
+import { onMounted, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 
+import axios from 'axios';
+
 import FetchData from 'components/FetchData.vue';
 import FormModel from 'components/FormModel.vue';
 import VnRow from 'components/ui/VnRow.vue';
@@ -17,18 +19,17 @@ const route = useRoute();
 const payMethods = ref([]);
 const bankEntitiesOptions = ref([]);
 
-const onBankEntityCreated = (data) => {
-    bankEntitiesOptions.value.push(data);
+onMounted(() => getBankEntities());
+
+const getBankEntities = async () => {
+    const filter = { fields: ['id', 'bic', 'name'], order: 'bic ASC', limit: 30 };
+    const { data } = await axios.get('BankEntities', { filter });
+    bankEntitiesOptions.value = data;
 };
 </script>
 
 <template>
     <fetch-data @on-fetch="(data) => (payMethods = data)" auto-load url="PayMethods" />
-    <FetchData
-        @on-fetch="(data) => (bankEntitiesOptions = data)"
-        auto-load
-        url="BankEntities"
-    />
 
     <FormModel
         :url-update="`Clients/${route.params.id}`"
@@ -73,9 +74,7 @@ const onBankEntityCreated = (data) => {
                         v-model="data.bankEntityFk"
                     >
                         <template #form>
-                            <CreateBankEntityForm
-                                @on-data-saved="onBankEntityCreated($event)"
-                            />
+                            <CreateBankEntityForm @on-data-saved="getBankEntities()" />
                         </template>
                         <template #option="scope">
                             <QItem v-bind="scope.itemProps">

From 6809e9bddb37ba812c3e56a8f62f3beb255a051d Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 23 Jan 2024 11:27:13 +0100
Subject: [PATCH 76/94] refs #6280 perf: same value as searchDelay in salix

---
 src/components/common/VnLocation.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/common/VnLocation.vue b/src/components/common/VnLocation.vue
index 6720e3920..827afe9ca 100644
--- a/src/components/common/VnLocation.vue
+++ b/src/components/common/VnLocation.vue
@@ -95,7 +95,7 @@ async function onPostcodeCreated(){
         :placeholder="t('Search by postalCode, town, province or country')"
         @input-value="locationFilter"
         :default-filter="false"
-        :input-debounce="100"
+        :input-debounce="300"
         :class="{ required: $attrs.required }"
         v-bind="$attrs"
         emit-value

From 5d888a29778f04d264352cfae6d97f98f5442c4d Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 23 Jan 2024 11:33:34 +0100
Subject: [PATCH 77/94] refs #6280 perf: remove deepFind unused code

---
 src/components/common/VnSelectFilter.vue |  3 +--
 src/composables/deepFind.js              | 14 --------------
 2 files changed, 1 insertion(+), 16 deletions(-)
 delete mode 100644 src/composables/deepFind.js

diff --git a/src/components/common/VnSelectFilter.vue b/src/components/common/VnSelectFilter.vue
index 5b91caa1a..a7ac4a7cd 100644
--- a/src/components/common/VnSelectFilter.vue
+++ b/src/components/common/VnSelectFilter.vue
@@ -1,5 +1,4 @@
 <script setup>
-import { deepFind } from 'src/composables/deepFind';
 import { ref, toRefs, computed, watch } from 'vue';
 const emit = defineEmits(['update:modelValue', 'update:options']);
 
@@ -69,7 +68,7 @@ const filter = (val, options) => {
     return options.filter((row) => {
         if ($props.filterOptions.length) {
             return $props.filterOptions.some((prop) => {
-                const propValue = String(deepFind(row,prop)).toLowerCase();
+                const propValue = String(row[prop]).toLowerCase();
                 return propValue.includes(search);
             });
         }
diff --git a/src/composables/deepFind.js b/src/composables/deepFind.js
deleted file mode 100644
index ec28fe387..000000000
--- a/src/composables/deepFind.js
+++ /dev/null
@@ -1,14 +0,0 @@
-export async function deepFind(obj, path) {
-    const keys = path.split('.');
-    let current = obj;
-
-    for (const key of keys) {
-        if (current[key] !== undefined) {
-            current = current[key];
-        } else {
-            return undefined;
-        }
-    }
-
-    return current;
-}

From 37859892faad87197d25aa7488d588f4e18bbdf3 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 23 Jan 2024 12:53:21 +0100
Subject: [PATCH 78/94] refs #6280 perf: call locationFilter

---
 src/components/common/VnLocation.vue | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/components/common/VnLocation.vue b/src/components/common/VnLocation.vue
index 827afe9ca..ee879a62c 100644
--- a/src/components/common/VnLocation.vue
+++ b/src/components/common/VnLocation.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, toRefs, computed, watch } from 'vue';
+import { ref, toRefs, computed, watch, onMounted } from 'vue';
 import CreateNewPostcode from 'src/components/CreateNewPostcodeForm.vue';
 import VnSelectCreate from 'components/common/VnSelectCreate.vue';
 import FetchData from 'components/FetchData.vue';
@@ -67,16 +67,19 @@ function showLabel(data) {
        return `${data.code} - ${data.town}(${data.province}), ${data.country}`;
 }
 
+
+onMounted(() => {
+    locationFilter()
+})
 function locationFilter(search) {
-    let where = { limit: 30 };
-    const params = { search };
-    postcodesRef.value.fetch({ where, args: params });
+    let where = { search };
+    postcodesRef.value.fetch({ where, limit: 30});
 }
 function handleFetch( data) {
     postcodesOptions.value = data;
 }
 async function onPostcodeCreated(){
-    postcodesRef.value.fetch();
+    locationFilter()
 };
 </script>
 <template>
@@ -84,7 +87,6 @@ async function onPostcodeCreated(){
         ref="postcodesRef"
         url="Postcodes/filter"
         @on-fetch="(data) =>handleFetch(data)"
-        auto-load
     />
     <VnSelectCreate
         v-if="postcodesRef"

From 5ebeb7fe472c9bca7b29e9460732341716d40c84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Segarra=20Mart=C3=ADnez?= <jsegarra@verdnatura.es>
Date: Tue, 23 Jan 2024 23:23:51 +0100
Subject: [PATCH 79/94] refs #6280 perf locationFilter

---
 src/components/common/VnLocation.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/common/VnLocation.vue b/src/components/common/VnLocation.vue
index ee879a62c..674784849 100644
--- a/src/components/common/VnLocation.vue
+++ b/src/components/common/VnLocation.vue
@@ -72,8 +72,8 @@ onMounted(() => {
     locationFilter()
 })
 function locationFilter(search) {
-    let where = { search };
-    postcodesRef.value.fetch({ where, limit: 30});
+    let args = { filter:{limit: 30}, search};
+    postcodesRef.value.fetch({args});
 }
 function handleFetch( data) {
     postcodesOptions.value = data;

From 45dc9c355f4ab6342a82bb8e597a81cea2b96318 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 24 Jan 2024 08:30:09 +0100
Subject: [PATCH 80/94] refs #6280 perf: improve component

---
 src/components/common/VnLocation.vue        | 15 ++++++----
 src/pages/Customer/CustomerCreate.vue       |  7 +++--
 src/pages/Worker/WorkerCreate.vue           |  7 +++--
 test/cypress/integration/VnLocation.spec.js | 32 +++++++++++++++++++++
 4 files changed, 49 insertions(+), 12 deletions(-)
 create mode 100644 test/cypress/integration/VnLocation.spec.js

diff --git a/src/components/common/VnLocation.vue b/src/components/common/VnLocation.vue
index 674784849..a7a58e2b8 100644
--- a/src/components/common/VnLocation.vue
+++ b/src/components/common/VnLocation.vue
@@ -54,11 +54,16 @@ const value = computed({
     },
 });
 
+onMounted(() => {
+    locationFilter()
+});
+
 function setOptions(data) {
     myOptions.value = JSON.parse(JSON.stringify(data));
     myOptionsOriginal.value = JSON.parse(JSON.stringify(data));
 }
 setOptions(options.value);
+
 watch(options, (newValue) => {
     setOptions(newValue);
 });
@@ -67,17 +72,15 @@ function showLabel(data) {
        return `${data.code} - ${data.town}(${data.province}), ${data.country}`;
 }
 
-
-onMounted(() => {
-    locationFilter()
-})
 function locationFilter(search) {
-    let args = { filter:{limit: 30}, search};
-    postcodesRef.value.fetch({args});
+    let where = { search };
+    postcodesRef.value.fetch({filter:{ where}, limit: 30});
 }
+
 function handleFetch( data) {
     postcodesOptions.value = data;
 }
+
 async function onPostcodeCreated(){
     locationFilter()
 };
diff --git a/src/pages/Customer/CustomerCreate.vue b/src/pages/Customer/CustomerCreate.vue
index 4ce4b4520..800279326 100644
--- a/src/pages/Customer/CustomerCreate.vue
+++ b/src/pages/Customer/CustomerCreate.vue
@@ -33,9 +33,10 @@ const businessTypesOptions = ref([]);
 const postcodesOptions = ref([]);
 
 
-function handleLocation(data, { city, postcode, provinceFk, countryFk }) {
-    data.postcode = postcode;
-    data.city = city;
+function handleLocation(data, location ) {
+    const { town, code, provinceFk, countryFk } = location ?? {}
+    data.postcode = code;
+    data.city = town;
     data.provinceFk = provinceFk;
     data.countryFk = countryFk;
 }
diff --git a/src/pages/Worker/WorkerCreate.vue b/src/pages/Worker/WorkerCreate.vue
index 490fd2086..3ded85584 100644
--- a/src/pages/Worker/WorkerCreate.vue
+++ b/src/pages/Worker/WorkerCreate.vue
@@ -57,9 +57,10 @@ const onBankEntityCreated = (data) => {
 };
 
 
-function handleLocation(data, { city, postcode, provinceFk, countryFk }) {
-    data.postcode = postcode;
-    data.city = city;
+function handleLocation(data, location ) {
+    const { town, postcode: code, provinceFk, countryFk } = location ?? {}
+    data.postcode = code;
+    data.city = town;
     data.provinceFk = provinceFk;
     data.countryFk = countryFk;
 }
diff --git a/test/cypress/integration/VnLocation.spec.js b/test/cypress/integration/VnLocation.spec.js
new file mode 100644
index 000000000..20b18700f
--- /dev/null
+++ b/test/cypress/integration/VnLocation.spec.js
@@ -0,0 +1,32 @@
+const inputLocation = ':nth-child(3) > :nth-child(1) > .q-field > .q-field__inner > .q-field__control';
+const locationOptions ='[role="listbox"] > div.q-virtual-scroll__content > .q-item'
+describe('VnLocation', () => {
+    beforeEach(() => {
+        cy.viewport(1280, 720);
+        cy.login('developer');
+        cy.visit('/#/worker/create');
+        cy.waitForElement('.q-card');
+    });
+
+    // it('Show all options', function() {
+    //   cy.get(inputLocation).click();
+    //   cy.get(locationOptions).should('have.length',5)
+    //   // cy.get(':nth-child(3) > :nth-child(1) > .q-field > .q-field__inner > .q-field__control > :nth-child(2) > .q-icon').click()
+    // });
+
+    // it('input filter location as "al"', function() {
+    //     cy.get(inputLocation).click();
+    //     cy.get(inputLocation).clear();
+    //     cy.get(inputLocation).type('al');
+    //     cy.get(locationOptions).should('have.length',3);
+    // });
+    it('input filter location as "ecuador"', function() {
+        cy.get(inputLocation).click();
+        cy.get(inputLocation).clear();
+        cy.get(inputLocation).type('ecuador');
+        cy.get(locationOptions).should('have.length',1);
+        cy.get(`${locationOptions}:nth-child(1)`).click();
+        cy.get(':nth-child(3) > :nth-child(1) > .q-field > .q-field__inner > .q-field__control > :nth-child(2) > .q-icon').click();
+
+    });
+})

From e47561df868d9da935d9b69975948e7017212399 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 24 Jan 2024 13:50:04 +0100
Subject: [PATCH 81/94] refs #6664 disable

---
 src/pages/Claim/Card/ClaimAction.vue | 37 ++++++++++++++++++++++------
 1 file changed, 29 insertions(+), 8 deletions(-)

diff --git a/src/pages/Claim/Card/ClaimAction.vue b/src/pages/Claim/Card/ClaimAction.vue
index 76f76903c..b2c99bcb6 100644
--- a/src/pages/Claim/Card/ClaimAction.vue
+++ b/src/pages/Claim/Card/ClaimAction.vue
@@ -232,10 +232,10 @@ async function importToNewRefundTicket() {
         show-if-above
         v-if="claim"
     >
-        <QCard class="totalClaim vn-card q-my-md q-pa-sm">
+        <QCard class="totalClaim q-my-md q-pa-sm no-box-shadow">
             {{ `${t('Total claimed')}: ${toCurrency(totalClaimed)}` }}
         </QCard>
-        <QCard class="vn-card q-mb-md q-pa-sm">
+        <QCard class="q-mb-md q-pa-sm no-box-shadow">
             <QItem class="justify-between">
                 <QItemLabel class="slider-container">
                     <p class="text-primary">
@@ -256,13 +256,31 @@ async function importToNewRefundTicket() {
                 </QItemLabel>
             </QItem>
         </QCard>
-        <QItemLabel class="mana q-mb-md">
-            <QCheckbox
-                v-model="claim.isChargedToMana"
-                @update:model-value="(value) => save({ isChargedToMana: value })"
+        <QCard class="q-mb-md q-pa-sm no-box-shadow" style="margin-bottom: 1em">
+            <QItemLabel class="mana q-mb-md">
+                <QCheckbox
+                    v-model="claim.isChargedToMana"
+                    @update:model-value="(value) => save({ isChargedToMana: value })"
+                />
+                <span>{{ t('mana') }}</span>
+            </QItemLabel>
+        </QCard>
+        <QCard class="q-mb-md q-pa-sm no-box-shadow" style="position: static">
+            <QInput
+                :label="t('confirmGreuges')"
+                class="q-field__native text-grey-2"
+                type="number"
+                placeholder="0"
+                id="multiplicatorValue"
+                name="multiplicatorValue"
+                min="0"
+                max="50"
+                disable="
+                    claim.value.responsibility >=
+                    Math.ceil(DEFAULT_MAX_RESPONSABILITY) / 2
+                "
             />
-            <span>{{ t('mana') }}</span>
-        </QItemLabel>
+        </QCard>
     </QDrawer>
     <Teleport to="#st-data" v-if="stateStore.isSubToolbarShown()"> </Teleport>
     <CrudModel
@@ -470,6 +488,9 @@ async function importToNewRefundTicket() {
 .mana {
     float: inline-start;
 }
+.vn-card {
+    background-color: blue($color: #000000);
+}
 </style>
 <i18n>
 en:

From 8ae7756e9abf61a5b96a8d0f131dd86d2f300526 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 24 Jan 2024 14:58:33 +0100
Subject: [PATCH 82/94] refs #6664 btn

---
 src/pages/Claim/Card/ClaimAction.vue | 40 +++++++++++++++-------------
 1 file changed, 21 insertions(+), 19 deletions(-)

diff --git a/src/pages/Claim/Card/ClaimAction.vue b/src/pages/Claim/Card/ClaimAction.vue
index b2c99bcb6..85a30600c 100644
--- a/src/pages/Claim/Card/ClaimAction.vue
+++ b/src/pages/Claim/Card/ClaimAction.vue
@@ -135,21 +135,21 @@ async function regularizeClaim() {
         message: t('globals.dataSaved'),
         type: 'positive',
     });
-    if (claim.value.responsibility >= Math.ceil(DEFAULT_MAX_RESPONSABILITY) / 2) {
-        quasar
-            .dialog({
-                component: VnConfirm,
-                componentProps: {
-                    title: t('confirmGreuges'),
-                    message: `
-                    <input class="q-field__native text-grey-2" type="number" placeholder="1" id="multiplicatorValue" name="multiplicatorValue" min="0" max="50"/>
-                     `,
-                    data: { inputId: 'multiplicatorValue' },
-                    promise: onUpdateGreugeAccept,
-                },
-            })
-            .onOk(async () => await onUpdateGreugeAccept());
-    }
+    // if (claim.value.responsibility >= Math.ceil(DEFAULT_MAX_RESPONSABILITY) / 2) {
+    //     quasar
+    //         .dialog({
+    //             component: VnConfirm,
+    //             componentProps: {
+    //                 title: t('confirmGreuges'),
+    //                 message: `
+    //                 <input class="q-field__native text-grey-2" type="number" placeholder="1" id="multiplicatorValue" name="multiplicatorValue" min="0" max="50"/>
+    //                  `,
+    //                 data: { inputId: 'multiplicatorValue' },
+    //                 promise: onUpdateGreugeAccept,
+    //             },
+    //         })
+    //         .onOk(async () => await onUpdateGreugeAccept());
+    // }
 }
 
 async function onUpdateGreugeAccept({ return: multiplicatorValue }) {
@@ -275,11 +275,12 @@ async function importToNewRefundTicket() {
                 name="multiplicatorValue"
                 min="0"
                 max="50"
-                disable="
-                    claim.value.responsibility >=
-                    Math.ceil(DEFAULT_MAX_RESPONSABILITY) / 2
-                "
+                v-model="multiplicatorValue"
             />
+            <QBtn
+                @click="onUpdateGreugeAccept(multiplicatorValue)"
+                :label="t('Apply Greuges')"
+            ></QBtn>
         </QCard>
     </QDrawer>
     <Teleport to="#st-data" v-if="stateStore.isSubToolbarShown()"> </Teleport>
@@ -521,4 +522,5 @@ es:
     Id item: Id artículo
     confirmGreuges: ¿Desea insertar greuges?
     confirmGreugesMessage: Insertar greuges en la ficha del cliente
+    Apply Greuges: Aplicar Greuges
 </i18n>

From 47fd0b2dfde8874374d2956da8b436cbe0d4d744 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Thu, 25 Jan 2024 08:46:51 +0100
Subject: [PATCH 83/94] refs #6745 fix(claimDescriptor= claimRatio label.
 fix(TicketSummary): state can be null

---
 src/pages/Claim/Card/ClaimDescriptor.vue | 8 +++++++-
 src/pages/Ticket/Card/TicketSummary.vue  | 6 +++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/pages/Claim/Card/ClaimDescriptor.vue b/src/pages/Claim/Card/ClaimDescriptor.vue
index afd22c340..deaed94f8 100644
--- a/src/pages/Claim/Card/ClaimDescriptor.vue
+++ b/src/pages/Claim/Card/ClaimDescriptor.vue
@@ -145,7 +145,7 @@ const setData = (entity) => {
             />
             <VnLv :label="t('claim.card.zone')" :value="entity.ticket?.zone?.name" />
             <VnLv
-                :label="t('claim.card.zone')"
+                :label="t('claimRate')"
                 :value="toPercentage(entity.client?.claimsRatio?.claimingRate)"
             />
         </template>
@@ -176,3 +176,9 @@ const setData = (entity) => {
     margin-top: 0;
 }
 </style>
+<i18n>
+    en:
+        claimRate: Claming rate
+    es:
+        claimRate: Ratio de reclamación
+</i18n>
diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index 65523bb82..fe7dcee9a 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -58,7 +58,7 @@ function formattedAddress() {
 
 function isEditable() {
     try {
-        return !ticket.value.ticketState.state.alertLevel;
+        return !ticket.value.ticketState?.state?.alertLevel;
     } catch (e) {
         console.error(e);
     }
@@ -153,8 +153,8 @@ async function changeState(value) {
                 </a>
                 <VnLv :label="t('ticket.summary.state')">
                     <template #value>
-                        <QChip :color="ticket.ticketState.state.classColor ?? 'dark'">
-                            {{ ticket.ticketState.state.name }}
+                        <QChip :color="ticket.ticketState?.state?.classColor ?? 'dark'">
+                            {{ ticket.ticketState?.state?.name }}
                         </QChip>
                     </template>
                 </VnLv>

From 35aa0ba20a769006396747d6a58ef10f41d480ec Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Thu, 25 Jan 2024 13:48:42 +0100
Subject: [PATCH 84/94] refs #6664 claimPortes

---
 src/pages/Claim/Card/ClaimAction.vue          | 29 +++++--------------
 .../integration/claim/claimAction.spec.js     |  1 -
 2 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/src/pages/Claim/Card/ClaimAction.vue b/src/pages/Claim/Card/ClaimAction.vue
index 85a30600c..371cb015f 100644
--- a/src/pages/Claim/Card/ClaimAction.vue
+++ b/src/pages/Claim/Card/ClaimAction.vue
@@ -37,7 +37,7 @@ const marker_labels = [
     { value: DEFAULT_MIN_RESPONSABILITY, label: t('claim.summary.company') },
     { value: DEFAULT_MAX_RESPONSABILITY, label: t('claim.summary.person') },
 ];
-const portesMultiplicator = ref();
+const multiplicatorValue = ref();
 
 const columns = computed(() => [
     {
@@ -135,24 +135,10 @@ async function regularizeClaim() {
         message: t('globals.dataSaved'),
         type: 'positive',
     });
-    // if (claim.value.responsibility >= Math.ceil(DEFAULT_MAX_RESPONSABILITY) / 2) {
-    //     quasar
-    //         .dialog({
-    //             component: VnConfirm,
-    //             componentProps: {
-    //                 title: t('confirmGreuges'),
-    //                 message: `
-    //                 <input class="q-field__native text-grey-2" type="number" placeholder="1" id="multiplicatorValue" name="multiplicatorValue" min="0" max="50"/>
-    //                  `,
-    //                 data: { inputId: 'multiplicatorValue' },
-    //                 promise: onUpdateGreugeAccept,
-    //             },
-    //         })
-    //         .onOk(async () => await onUpdateGreugeAccept());
-    // }
+    await onUpdateGreugeAccept();
 }
 
-async function onUpdateGreugeAccept({ return: multiplicatorValue }) {
+async function onUpdateGreugeAccept() {
     const greugeTypeFreightId = (
         await axios.get(`GreugeTypes/findOne`, {
             filter: { where: { code: 'freightPickUp' } },
@@ -160,7 +146,7 @@ async function onUpdateGreugeAccept({ return: multiplicatorValue }) {
     ).data.id;
     const freightPickUpPrice =
         (await axios.get(`GreugeConfigs/findOne`)).data.freightPickUpPrice *
-        +multiplicatorValue;
+        +multiplicatorValue.value;
     console.log(freightPickUpPrice);
     await axios.post(`Greuges`, {
         clientFk: claim.value.clientFk,
@@ -267,6 +253,9 @@ async function importToNewRefundTicket() {
         </QCard>
         <QCard class="q-mb-md q-pa-sm no-box-shadow" style="position: static">
             <QInput
+                :disable="
+                    !(claim.responsibility >= Math.ceil(DEFAULT_MAX_RESPONSABILITY) / 2)
+                "
                 :label="t('confirmGreuges')"
                 class="q-field__native text-grey-2"
                 type="number"
@@ -277,10 +266,6 @@ async function importToNewRefundTicket() {
                 max="50"
                 v-model="multiplicatorValue"
             />
-            <QBtn
-                @click="onUpdateGreugeAccept(multiplicatorValue)"
-                :label="t('Apply Greuges')"
-            ></QBtn>
         </QCard>
     </QDrawer>
     <Teleport to="#st-data" v-if="stateStore.isSubToolbarShown()"> </Teleport>
diff --git a/test/cypress/integration/claim/claimAction.spec.js b/test/cypress/integration/claim/claimAction.spec.js
index f181722fa..685e120ce 100644
--- a/test/cypress/integration/claim/claimAction.spec.js
+++ b/test/cypress/integration/claim/claimAction.spec.js
@@ -31,7 +31,6 @@ describe('ClaimAction', () => {
 
     it('should regularize', () => {
         cy.get('[title="Regularize"]').click();
-        cy.clickConfirm();
     });
 
     it('should remove the line', () => {

From 67d95f9ad0d296b9704ccaa63a0ef7989da0af22 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Thu, 25 Jan 2024 14:44:41 +0100
Subject: [PATCH 85/94] refs #6664 vnConfirm og

---
 src/components/ui/VnConfirm.vue | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/src/components/ui/VnConfirm.vue b/src/components/ui/VnConfirm.vue
index 0ce18cadb..f8715f685 100644
--- a/src/components/ui/VnConfirm.vue
+++ b/src/components/ui/VnConfirm.vue
@@ -2,7 +2,6 @@
 import { ref } from 'vue';
 import { useDialogPluginComponent } from 'quasar';
 import { useI18n } from 'vue-i18n';
-import { onMounted } from 'vue';
 
 const { t } = useI18n();
 
@@ -29,7 +28,6 @@ const props = defineProps({
         required: false,
         default: null,
     },
-    callbackFn: Function,
 });
 
 defineEmits(['confirm', ...useDialogPluginComponent.emits]);
@@ -39,17 +37,12 @@ const { dialogRef, onDialogOK } = useDialogPluginComponent();
 const title = props.title || t('Confirm');
 const message = props.message || t('Are you sure you want to continue?');
 const isLoading = ref(false);
-onMounted(() => {
-    if (props.callbackFn) props.callbackFn();
-});
+
 async function confirm() {
-    let html = null;
-    html = document.getElementById(props.data.inputId);
     isLoading.value = true;
     if (props.promise) {
         try {
-            if (html) await props.promise({ ...props.data, return: html.value });
-            else await props.promise(props.data);
+            await props.promise(props.data);
         } finally {
             isLoading.value = false;
         }
@@ -72,8 +65,8 @@ async function confirm() {
                 <QSpace />
                 <QBtn icon="close" :disable="isLoading" flat round dense v-close-popup />
             </QCardSection>
-            <QCardSection class="row justify-center items-center">
-                <span id="spanHTML" v-html="message"></span>
+            <QCardSection class="row items-center">
+                <span v-html="message"></span>
             </QCardSection>
             <QCardActions align="right">
                 <QBtn

From 9f9835b7ab8d1a1d21945c82ff94ae2eb7e33352 Mon Sep 17 00:00:00 2001
From: JAVIER SEGARRA MARTINEZ <jsegarra@verdnatura.es>
Date: Fri, 26 Jan 2024 07:56:41 +0000
Subject: [PATCH 86/94] refs #6280: remove related code to filter-rules

---
 src/components/common/VnSelectFilter.vue | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/src/components/common/VnSelectFilter.vue b/src/components/common/VnSelectFilter.vue
index a7ac4a7cd..7f10f5efe 100644
--- a/src/components/common/VnSelectFilter.vue
+++ b/src/components/common/VnSelectFilter.vue
@@ -12,15 +12,11 @@ const $props = defineProps({
         default: () => [],
     },
     optionLabel: {
-        type: [String, Function],
+        type: [String],
         default: '',
     },
     filterOptions: {
-        type: [Array, Function],
-        default: () => [],
-    },
-    filterRules: {
-        type: [Array, Function],
+        type: [Array],
         default: () => [],
     },
     isClearable: {
@@ -57,13 +53,6 @@ const filter = (val, options) => {
     const search = val.toString().toLowerCase();
 
     if (!search) return options;
-    if($props.filterRules.length) {
-        const passSomeRule = $props.filterRules.some((rule) => {
-            const cond = eval(rule)
-            return cond;
-        });
-        if(!passSomeRule) return options
-    }
 
     return options.filter((row) => {
         if ($props.filterOptions.length) {

From c731b5b9893bc5443cb8b48c106c19a049f3fcc4 Mon Sep 17 00:00:00 2001
From: JAVIER SEGARRA MARTINEZ <jsegarra@verdnatura.es>
Date: Fri, 26 Jan 2024 08:04:08 +0000
Subject: [PATCH 87/94] refs #6280: replace function event

---
 src/components/common/VnLocation.vue | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/components/common/VnLocation.vue b/src/components/common/VnLocation.vue
index a7a58e2b8..0b30faaa7 100644
--- a/src/components/common/VnLocation.vue
+++ b/src/components/common/VnLocation.vue
@@ -81,9 +81,6 @@ function handleFetch( data) {
     postcodesOptions.value = data;
 }
 
-async function onPostcodeCreated(){
-    locationFilter()
-};
 </script>
 <template>
     <FetchData
@@ -111,7 +108,7 @@ async function onPostcodeCreated(){
         fill-input
     >
         <template #form>
-            <CreateNewPostcode @on-data-saved="onPostcodeCreated($event)" />
+            <CreateNewPostcode @on-data-saved="locationFilter()" />
         </template>
         <template #option="{itemProps, opt}">
             <QItem v-bind="itemProps">

From 9a23bb2ed24b984e4fd000964a3878fbc96b6e20 Mon Sep 17 00:00:00 2001
From: carlosfonseca <carlos.fonseca@mindshore.io>
Date: Fri, 26 Jan 2024 11:08:45 -0500
Subject: [PATCH 88/94] Se corrige comentario 39968

---
 .../Customer/Card/CustomerBillingData.vue     | 20 ++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerBillingData.vue b/src/pages/Customer/Card/CustomerBillingData.vue
index a455e6db2..1543eac7a 100644
--- a/src/pages/Customer/Card/CustomerBillingData.vue
+++ b/src/pages/Customer/Card/CustomerBillingData.vue
@@ -18,18 +18,28 @@ const route = useRoute();
 
 const payMethods = ref([]);
 const bankEntitiesOptions = ref([]);
+const bankEntitiesRef = ref(null);
 
-onMounted(() => getBankEntities());
+const filter = {
+    fields: ['id', 'bic', 'name'],
+    order: 'bic ASC',
+    limit: 30,
+};
 
-const getBankEntities = async () => {
-    const filter = { fields: ['id', 'bic', 'name'], order: 'bic ASC', limit: 30 };
-    const { data } = await axios.get('BankEntities', { filter });
-    bankEntitiesOptions.value = data;
+const getBankEntities = () => {
+    bankEntitiesRef.value.fetch();
 };
 </script>
 
 <template>
     <fetch-data @on-fetch="(data) => (payMethods = data)" auto-load url="PayMethods" />
+    <fetch-data
+        ref="bankEntitiesRef"
+        @on-fetch="(data) => (bankEntitiesOptions = data)"
+        :filter="filter"
+        auto-load
+        url="BankEntities"
+    />
 
     <FormModel
         :url-update="`Clients/${route.params.id}`"

From 8c9db8b3ae320127aa2eac99bb7571c6481d79fc Mon Sep 17 00:00:00 2001
From: JAVIER SEGARRA MARTINEZ <jsegarra@verdnatura.es>
Date: Mon, 29 Jan 2024 07:16:39 +0000
Subject: [PATCH 89/94] refs #6280 test: remove comments

---
 test/cypress/integration/VnLocation.spec.js | 22 ++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/test/cypress/integration/VnLocation.spec.js b/test/cypress/integration/VnLocation.spec.js
index 20b18700f..15226b166 100644
--- a/test/cypress/integration/VnLocation.spec.js
+++ b/test/cypress/integration/VnLocation.spec.js
@@ -8,18 +8,18 @@ describe('VnLocation', () => {
         cy.waitForElement('.q-card');
     });
 
-    // it('Show all options', function() {
-    //   cy.get(inputLocation).click();
-    //   cy.get(locationOptions).should('have.length',5)
-    //   // cy.get(':nth-child(3) > :nth-child(1) > .q-field > .q-field__inner > .q-field__control > :nth-child(2) > .q-icon').click()
-    // });
+    it('Show all options', function() {
+      cy.get(inputLocation).click();
+      cy.get(locationOptions).should('have.length',5)
+      // cy.get(':nth-child(3) > :nth-child(1) > .q-field > .q-field__inner > .q-field__control > :nth-child(2) > .q-icon').click()
+    });
 
-    // it('input filter location as "al"', function() {
-    //     cy.get(inputLocation).click();
-    //     cy.get(inputLocation).clear();
-    //     cy.get(inputLocation).type('al');
-    //     cy.get(locationOptions).should('have.length',3);
-    // });
+    it('input filter location as "al"', function() {
+        cy.get(inputLocation).click();
+        cy.get(inputLocation).clear();
+        cy.get(inputLocation).type('al');
+        cy.get(locationOptions).should('have.length',3);
+    });
     it('input filter location as "ecuador"', function() {
         cy.get(inputLocation).click();
         cy.get(inputLocation).clear();

From a02b534cfa6ff64ba69aa711aa6eb35ab5859736 Mon Sep 17 00:00:00 2001
From: JAVIER SEGARRA MARTINEZ <jsegarra@verdnatura.es>
Date: Mon, 29 Jan 2024 07:20:40 +0000
Subject: [PATCH 90/94] refs #6280 test: remove comments

---
 test/cypress/integration/VnLocation.spec.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/test/cypress/integration/VnLocation.spec.js b/test/cypress/integration/VnLocation.spec.js
index 15226b166..fe0ecee68 100644
--- a/test/cypress/integration/VnLocation.spec.js
+++ b/test/cypress/integration/VnLocation.spec.js
@@ -10,8 +10,7 @@ describe('VnLocation', () => {
 
     it('Show all options', function() {
       cy.get(inputLocation).click();
-      cy.get(locationOptions).should('have.length',5)
-      // cy.get(':nth-child(3) > :nth-child(1) > .q-field > .q-field__inner > .q-field__control > :nth-child(2) > .q-icon').click()
+      cy.get(locationOptions).should('have.length',5);
     });
 
     it('input filter location as "al"', function() {

From 70e912fc924e2a8260807b74968f509ea3dbea26 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Mon, 29 Jan 2024 08:38:55 +0100
Subject: [PATCH 92/94] refs #6681 try fix jenkins

---
 Jenkinsfile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 437332c4e..f6382d62b 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -31,7 +31,7 @@ pipeline {
                 NODE_ENV = ""
             }
             steps {
-                nodejs('node-v18') {
+                nodejs('node-v20') {
                     sh 'npm install --no-audit --prefer-offline'
                 }
             }
@@ -47,7 +47,7 @@ pipeline {
             parallel {
                 stage('Frontend') {
                     steps {
-                        nodejs('node-v18') {
+                        nodejs('node-v20') {
                             sh 'npm run test:unit:ci'
                         }
                     }
@@ -63,7 +63,7 @@ pipeline {
                 CREDENTIALS = credentials('docker-registry')
             }
             steps {
-                nodejs('node-v18') {
+                nodejs('node-v20') {
                     sh 'quasar build'
                 }
                 dockerBuild()
@@ -96,4 +96,4 @@ pipeline {
             }
         }
     }
-}
\ No newline at end of file
+}

From 935211a71f4f7c3a41c0799e9b4ce8ae9880762d Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Mon, 29 Jan 2024 08:41:38 +0100
Subject: [PATCH 93/94] refs #6681 try fix jenkins

---
 Jenkinsfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index f6382d62b..9dd72ccc3 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -31,7 +31,7 @@ pipeline {
                 NODE_ENV = ""
             }
             steps {
-                nodejs('node-v20') {
+                nodejs('node-v18') {
                     sh 'npm install --no-audit --prefer-offline'
                 }
             }
@@ -47,7 +47,7 @@ pipeline {
             parallel {
                 stage('Frontend') {
                     steps {
-                        nodejs('node-v20') {
+                        nodejs('node-v18') {
                             sh 'npm run test:unit:ci'
                         }
                     }
@@ -63,7 +63,7 @@ pipeline {
                 CREDENTIALS = credentials('docker-registry')
             }
             steps {
-                nodejs('node-v20') {
+                nodejs('node-v18') {
                     sh 'quasar build'
                 }
                 dockerBuild()

From 324d6da3a3320d5167593b8e4608699daa0a6fc2 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Mon, 29 Jan 2024 11:48:18 +0100
Subject: [PATCH 94/94] refs #6664 claimfix

---
 src/pages/Claim/Card/ClaimAction.vue | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/pages/Claim/Card/ClaimAction.vue b/src/pages/Claim/Card/ClaimAction.vue
index 371cb015f..59409e432 100644
--- a/src/pages/Claim/Card/ClaimAction.vue
+++ b/src/pages/Claim/Card/ClaimAction.vue
@@ -146,8 +146,7 @@ async function onUpdateGreugeAccept() {
     ).data.id;
     const freightPickUpPrice =
         (await axios.get(`GreugeConfigs/findOne`)).data.freightPickUpPrice *
-        +multiplicatorValue.value;
-    console.log(freightPickUpPrice);
+        multiplicatorValue.value;
     await axios.post(`Greuges`, {
         clientFk: claim.value.clientFk,
         description: `${t('ClaimGreugeDescription')} ${claimId}`.toUpperCase(),
@@ -474,9 +473,6 @@ async function importToNewRefundTicket() {
 .mana {
     float: inline-start;
 }
-.vn-card {
-    background-color: blue($color: #000000);
-}
 </style>
 <i18n>
 en: