From 3f1c0b95faf7d8ff00b10fa93acdbed4047d6b9a Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 10 Jul 2024 15:03:25 +0200
Subject: [PATCH 001/281] fix: proposal to avoid notify error

---
 src/pages/Customer/Card/CustomerUnpaid.vue               | 2 +-
 src/pages/Customer/Card/CustomerWebAccess.vue            | 2 +-
 src/pages/Customer/components/CustomerChangePassword.vue | 2 +-
 src/pages/Customer/components/CustomerSamplesCreate.vue  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerUnpaid.vue b/src/pages/Customer/Card/CustomerUnpaid.vue
index a9d4a3d66..6c61b92a1 100644
--- a/src/pages/Customer/Card/CustomerUnpaid.vue
+++ b/src/pages/Customer/Card/CustomerUnpaid.vue
@@ -92,7 +92,7 @@ const onSubmit = async () => {
         notify('globals.dataSaved', 'positive');
         unpaidClient.value = true;
     } catch (error) {
-        notify('errors.create', 'negative');
+        notify('errors.writeRequest', 'negative');
     } finally {
         isLoading.value = false;
     }
diff --git a/src/pages/Customer/Card/CustomerWebAccess.vue b/src/pages/Customer/Card/CustomerWebAccess.vue
index 33659dd77..4468c52f0 100644
--- a/src/pages/Customer/Card/CustomerWebAccess.vue
+++ b/src/pages/Customer/Card/CustomerWebAccess.vue
@@ -70,7 +70,7 @@ const onSubmit = async () => {
         notify('globals.dataSaved', 'positive');
         if (usersPreviewRef.value) usersPreviewRef.value.fetch();
     } catch (error) {
-        notify('errors.create', 'negative');
+        notify('errors.writeRequest', 'negative');
     } finally {
         isLoading.value = false;
     }
diff --git a/src/pages/Customer/components/CustomerChangePassword.vue b/src/pages/Customer/components/CustomerChangePassword.vue
index 1bfc5e103..632b11dc9 100644
--- a/src/pages/Customer/components/CustomerChangePassword.vue
+++ b/src/pages/Customer/components/CustomerChangePassword.vue
@@ -48,7 +48,7 @@ const onSubmit = async () => {
         await axios.patch(`Clients/${$props.id}/setPassword`, payload);
         await $props.promise();
     } catch (error) {
-        notify('errors.create', 'negative');
+        notify('errors.writeRequest', 'negative');
     } finally {
         isLoading.value = false;
         if (closeButton.value) closeButton.value.click();
diff --git a/src/pages/Customer/components/CustomerSamplesCreate.vue b/src/pages/Customer/components/CustomerSamplesCreate.vue
index be614aa0b..283b8fa97 100644
--- a/src/pages/Customer/components/CustomerSamplesCreate.vue
+++ b/src/pages/Customer/components/CustomerSamplesCreate.vue
@@ -150,7 +150,7 @@ const onSubmit = async () => {
         notify('globals.dataSaved', 'positive');
         onDataSaved(data);
     } catch (error) {
-        notify('errors.create', 'negative');
+        notify('errors.writeRequest', 'negative');
     } finally {
         isLoading.value = false;
     }

From 3a0204d27bde863207db6d8a621611cd7085dc18 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 24 Jul 2024 14:58:51 +0200
Subject: [PATCH 002/281] feat: vnLocation changes

---
 src/components/common/VnLocation.vue          | 149 +++++++++++-------
 .../Customer/Card/CustomerFiscalData.vue      |   6 +-
 .../Supplier/Card/SupplierFiscalData.vue      |  10 +-
 .../vnComponent/vnLocation.spec.js            |   2 +-
 4 files changed, 98 insertions(+), 69 deletions(-)

diff --git a/src/components/common/VnLocation.vue b/src/components/common/VnLocation.vue
index 9ed48ca15..fc19e509f 100644
--- a/src/components/common/VnLocation.vue
+++ b/src/components/common/VnLocation.vue
@@ -1,18 +1,23 @@
 <script setup>
-import { ref, toRefs, computed, watch, onMounted } from 'vue';
+import { ref, toRefs, onMounted, nextTick } from 'vue';
 import CreateNewPostcode from 'src/components/CreateNewPostcodeForm.vue';
 import VnSelectDialog from 'components/common/VnSelectDialog.vue';
-import FetchData from 'components/FetchData.vue';
-const emit = defineEmits(['update:modelValue', 'update:options']);
+const emit = defineEmits(['update:selected', 'update:options']);
 import { useI18n } from 'vue-i18n';
+import { useArrayData } from 'src/composables/useArrayData';
 
 const { t } = useI18n();
 const postcodesOptions = ref([]);
-const postcodesRef = ref(null);
+const postcodesOptionsOriginal = ref([]);
+// const postcodesRef = ref(null);
 
 const $props = defineProps({
-    modelValue: {
-        type: [String, Number, Object],
+    postalCodeKey: {
+        type: String,
+        default: 'postalCode',
+    },
+    location: {
+        type: Object,
         default: null,
     },
     options: {
@@ -41,89 +46,115 @@ const $props = defineProps({
     },
 });
 
-const { options } = toRefs($props);
-const myOptions = ref([]);
-const myOptionsOriginal = ref([]);
-
-const value = computed({
-    get() {
-        return $props.modelValue;
-    },
-    set(value) {
-        emit(
-            'update:modelValue',
-            postcodesOptions.value.find((p) => p.code === value)
-        );
-    },
+const selectedId = ref(null);
+const mySelect = ref();
+const modelValue = ref($props.location[$props.postalCodeKey]);
+const arrayData = useArrayData('postcodes', {
+    url: 'Postcodes/filter',
+    limit: 1,
 });
 
-onMounted(() => {
-    locationFilter($props.modelValue);
-});
+function sanitizePostcode(data) {
+    return data.map((postcode) => ({
+        ...postcode,
+        original: postcode,
+        id: sanitizeId(postcode),
+        label: sanitizeLabel(postcode),
+    }));
+}
 
+function sanitizeId(postcode) {
+    return `${postcode.code ?? postcode[$props.postalCodeKey]}_${postcode.provinceFk}_${
+        postcode.countryFk
+    }`;
+}
+onMounted(async () => {
+    await retriveOptions();
+    nextTick(() => mySelect.value.showPopup());
+});
+async function retriveOptions() {
+    let options = [];
+    if (modelValue.value) {
+        await locationFilter(modelValue.value, () => {});
+        options = arrayData.store.data;
+    } else {
+        const { data } = await arrayData.fetch({ updateRouter: false, append: true });
+        options = data;
+    }
+    setOptions(options);
+}
+function findOptionById(postcode) {
+    return postcodesOptions.value.find((p) => p.id === postcode);
+}
 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);
-});
-
-function showLabel(data) {
-    return `${data.code} - ${data.town}(${data.province}), ${data.country}`;
+    postcodesOptions.value = sanitizePostcode(data);
+    if (modelValue.value) {
+        const { [$props.postalCodeKey]: code } = $props.location;
+        selectedId.value =
+            findOptionById(sanitizeId({ ...$props.location, code })) ??
+            sanitizePostcode([$props.location])[0];
+    }
+    postcodesOptionsOriginal.value = JSON.parse(JSON.stringify(postcodesOptions.value));
 }
 
-function locationFilter(search = '') {
-    if (
-        search &&
-        (search.includes('undefined') || search.startsWith(`${$props.modelValue} - `))
-    )
+async function handleInput(value) {
+    if (value) emit('update:selected', findOptionById(value));
+    if (modelValue.value) {
+        modelValue.value = value;
+        arrayData.store.userFilter = {};
+        await retriveOptions();
+        mySelect.value.showPopup();
+    } else postcodesOptions.value = postcodesOptionsOriginal.value;
+}
+function sanitizeLabel(postcode) {
+    return `${postcode.code ?? postcode[$props.postalCodeKey]} - ${postcode.town}(${
+        postcode.province
+    }), ${postcode.country}`;
+}
+
+async function locationFilter(search, update) {
+    if (search.length === 0) {
         return;
+    }
     let where = { search };
-    postcodesRef.value.fetch({ filter: { where }, limit: 30 });
+    arrayData.store.userFilter = { filter: { where } };
+    await arrayData.fetch({ append: false, updateRouter: false });
+
+    update(() => {
+        postcodesOptions.value = sanitizePostcode(arrayData.store.data);
+    });
 }
 
-function handleFetch(data) {
-    postcodesOptions.value = data;
-}
 function onDataSaved(newPostcode) {
     postcodesOptions.value.push(newPostcode);
-    value.value = newPostcode.code;
+    selectedId.value = newPostcode.code ?? newPostcode[$props.postalCodeKey];
 }
 </script>
 <template>
-    <FetchData
-        ref="postcodesRef"
-        url="Postcodes/filter"
-        @on-fetch="(data) => handleFetch(data)"
-    />
     <VnSelectDialog
-        v-if="postcodesRef"
-        :option-label="(opt) => showLabel(opt) ?? 'code'"
-        :option-value="(opt) => opt.code"
-        v-model="value"
+        ref="mySelect"
+        option-label="label"
+        option-value="id"
+        v-model="selectedId"
         :options="postcodesOptions"
         :label="t('Location')"
+        @update:model-value="handleInput"
         :placeholder="t('search_by_postalcode')"
-        @input-value="locationFilter"
-        :default-filter="false"
+        @filter="locationFilter"
         :input-debounce="300"
         :class="{ required: $attrs.required }"
         v-bind="$attrs"
         clearable
+        emit-value
     >
         <template #form>
-            <CreateNewPostcode
-                @on-data-saved="onDataSaved"
-            />
+            <CreateNewPostcode @on-data-saved="onDataSaved" />
         </template>
         <template #option="{ itemProps, opt }">
             <QItem v-bind="itemProps">
                 <QItemSection v-if="opt.code">
                     <QItemLabel>{{ opt.code }}</QItemLabel>
-                    <QItemLabel caption>{{ showLabel(opt) }}</QItemLabel>
+                    <QItemLabel caption>{{ opt.label }}</QItemLabel>
                 </QItemSection>
             </QItem>
         </template>
diff --git a/src/pages/Customer/Card/CustomerFiscalData.vue b/src/pages/Customer/Card/CustomerFiscalData.vue
index a7cdfafc5..d05e4fa01 100644
--- a/src/pages/Customer/Card/CustomerFiscalData.vue
+++ b/src/pages/Customer/Card/CustomerFiscalData.vue
@@ -95,9 +95,9 @@ function handleLocation(data, location) {
                 <VnLocation
                     :rules="validate('Worker.postcode')"
                     :roles-allowed-to-create="['deliveryAssistant']"
-                    :options="postcodesOptions"
-                    v-model="data.postcode"
-                    @update:model-value="(location) => handleLocation(data, location)"
+                    :location="data"
+                    postal-code-key="postcode"
+                    @update:selected="(location) => handleLocation(data, location)"
                 >
                 </VnLocation>
             </VnRow>
diff --git a/src/pages/Supplier/Card/SupplierFiscalData.vue b/src/pages/Supplier/Card/SupplierFiscalData.vue
index 179c6f5e6..61077d48e 100644
--- a/src/pages/Supplier/Card/SupplierFiscalData.vue
+++ b/src/pages/Supplier/Card/SupplierFiscalData.vue
@@ -17,11 +17,10 @@ const sageTaxTypesOptions = ref([]);
 const sageWithholdingsOptions = ref([]);
 const sageTransactionTypesOptions = ref([]);
 const supplierActivitiesOptions = ref([]);
-const postcodesOptions = ref([]);
 
 function handleLocation(data, location) {
-    const { town, code, provinceFk, countryFk } = location ?? {};
-    data.postCode = code;
+    const { town, label, provinceFk, countryFk } = location ?? {};
+    data.postCode = label;
     data.city = town;
     data.provinceFk = provinceFk;
     data.countryFk = countryFk;
@@ -131,9 +130,8 @@ function handleLocation(data, location) {
                 <VnLocation
                     :rules="validate('Worker.postcode')"
                     :roles-allowed-to-create="['deliveryAssistant']"
-                    :options="postcodesOptions"
-                    v-model="data.postCode"
-                    @update:model-value="(location) => handleLocation(data, location)"
+                    :location="data"
+                    @update:selected="(location) => handleLocation(data, location)"
                 >
                 </VnLocation>
             </VnRow>
diff --git a/test/cypress/integration/vnComponent/vnLocation.spec.js b/test/cypress/integration/vnComponent/vnLocation.spec.js
index 6719d8391..c465b152c 100644
--- a/test/cypress/integration/vnComponent/vnLocation.spec.js
+++ b/test/cypress/integration/vnComponent/vnLocation.spec.js
@@ -17,7 +17,7 @@ describe('VnLocation', () => {
             cy.get(inputLocation).click();
             cy.get(inputLocation).clear();
             cy.get(inputLocation).type('al');
-            cy.get(locationOptions).should('have.length.at.least', 3);
+            cy.get(locationOptions).should('have.length.at.least', 4);
         });
         it('input filter location as "ecuador"', function () {
             cy.get(inputLocation).click();

From 2ab7d48b0c8b6eb7bf0909e3e45cbc621dbbdb1d Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 26 Jul 2024 09:55:24 +0200
Subject: [PATCH 003/281] feat: refs #7553 added VnTable in Expedition, new
 field & minor changes in rest of section

---
 salix-front-mindshore                         |   1 +
 src/pages/Ticket/Card/TicketExpedition.vue    | 304 ++++++------------
 .../Ticket/Card/TicketPurchaseRequest.vue     |  30 +-
 src/pages/Ticket/Card/TicketSale.vue          |  11 +-
 src/pages/Ticket/Card/TicketSaleTracking.vue  |  10 +-
 src/pages/Ticket/Card/TicketTracking.vue      |  10 +-
 src/pages/Ticket/Card/TicketVolume.vue        |  10 +-
 src/pages/Ticket/locale/en.yml                |   3 +
 src/pages/Ticket/locale/es.yml                |   3 +
 9 files changed, 149 insertions(+), 233 deletions(-)
 create mode 160000 salix-front-mindshore

diff --git a/salix-front-mindshore b/salix-front-mindshore
new file mode 160000
index 000000000..7432396ce
--- /dev/null
+++ b/salix-front-mindshore
@@ -0,0 +1 @@
+Subproject commit 7432396ceafb7fe46b8ed8ac28fa7753df57efd2
diff --git a/src/pages/Ticket/Card/TicketExpedition.vue b/src/pages/Ticket/Card/TicketExpedition.vue
index a7eb9e27e..e8dd5b31c 100644
--- a/src/pages/Ticket/Card/TicketExpedition.vue
+++ b/src/pages/Ticket/Card/TicketExpedition.vue
@@ -1,41 +1,37 @@
 <script setup>
-import { onMounted, ref, computed, onUnmounted, reactive, watch } from 'vue';
+import { onMounted, ref, computed, onUnmounted, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 
-import FetchData from 'components/FetchData.vue';
-import VnInput from 'src/components/common/VnInput.vue';
 import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
-import TicketEditManaProxy from './TicketEditMana.vue';
 import TableVisibleColumns from 'src/components/common/TableVisibleColumns.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import ExpeditionNewTicket from './ExpeditionNewTicket.vue';
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
 
 import { useStateStore } from 'stores/useStateStore';
-import { toCurrency, toPercentage } from 'src/filters';
 import { useArrayData } from 'composables/useArrayData';
 import { useVnConfirm } from 'composables/useVnConfirm';
 import useNotify from 'src/composables/useNotify.js';
 import { toDateTimeFormat } from 'src/filters/date';
 import axios from 'axios';
+import VnTable from 'src/components/VnTable/VnTable.vue';
 
 const route = useRoute();
 const stateStore = useStateStore();
 const { t } = useI18n();
 const { notify } = useNotify();
 const { openConfirmationModal } = useVnConfirm();
-const editPriceProxyRef = ref(null);
 const newTicketDialogRef = ref(null);
 const logsTableDialogRef = ref(null);
-
+const tableRef = ref();
 const expeditionsLogsData = ref([]);
 const selectedExpeditions = ref([]);
 const allColumnNames = ref([]);
 const visibleColumns = ref([]);
 const newTicketWithRoute = ref(false);
-const itemsOptions = ref([]);
+const selectedRows = ref([]);
+const hasSelectedRows = computed(() => selectedRows.value.length > 0);
 
 const exprBuilder = (param, value) => {
     switch (param) {
@@ -56,8 +52,6 @@ const expeditionsArrayData = useArrayData('ticketExpeditions', {
     filter: expeditionsFilter.value,
     exprBuilder: exprBuilder,
 });
-const expeditionsStore = expeditionsArrayData.store;
-const ticketExpeditions = computed(() => expeditionsStore.data);
 
 const ticketArrayData = useArrayData('ticketData');
 const ticketStore = ticketArrayData.store;
@@ -75,127 +69,95 @@ watch(
     { immediate: true }
 );
 
-const params = reactive({});
-
-const applyColumnFilter = async (col) => {
-    try {
-        const paramKey = col.columnFilter?.filterParamKey || col.field;
-        params[paramKey] = col.columnFilter.filterValue;
-        await expeditionsArrayData.addFilter({ filter: expeditionsFilter.value, params });
-    } catch (err) {
-        console.error('Error applying column filter', err);
-    }
-};
-
-const getInputEvents = (col) => {
-    return col.columnFilter.type === 'select'
-        ? { 'update:modelValue': () => applyColumnFilter(col) }
-        : {
-              'keyup.enter': () => applyColumnFilter(col),
-          };
-};
-
 const columns = computed(() => [
     {
+        align: 'left',
         label: t('expedition.id'),
         name: 'id',
-        field: 'id',
-        align: 'left',
-        sortable: true,
+        chip: {
+            condition: () => true,
+        },
+        isId: true,
         columnFilter: {
-            component: VnInput,
-            type: 'text',
-            filterParamKey: 'expeditionFk',
-            filterValue: null,
-            event: getInputEvents,
-            attrs: {
-                dense: true,
-            },
+            inWhere: true,
         },
     },
     {
         label: t('expedition.item'),
-        name: 'item',
+        name: 'packagingItemFk',
         align: 'left',
+        cardVisible: true,
         columnFilter: {
-            component: VnInput,
-            type: 'text',
-            filterParamKey: 'packageItemName',
-            filterValue: null,
-            event: getInputEvents,
-            attrs: {
-                dense: true,
-            },
+            inWhere: true,
         },
     },
     {
         label: t('expedition.name'),
-        name: 'name',
-        field: 'packageItemName',
+        name: 'packageItemName',
         align: 'left',
+        isTitle: true,
         columnFilter: {
-            component: VnSelect,
-            type: 'select',
-            filterValue: null,
-            event: getInputEvents,
-            attrs: {
-                options: itemsOptions.value,
-                'option-value': 'id',
-                'option-label': 'name',
-                dense: true,
-            },
+            inWhere: true,
+            // component: 'select',
+            // attrs: {
+            //     url: 'Items',
+            //     useLike: false,
+            //     fields: ['id', 'name'],
+            //     optionLabel: 'name',
+            //     optionValue: 'id',
+            // },
         },
     },
     {
         label: t('expedition.packageType'),
-        name: 'packageType',
-        field: 'freightItemName',
+        name: 'freightItemName',
         align: 'left',
         columnFilter: {
-            component: VnInput,
-            type: 'text',
-            // filterParamKey: 'expeditionFk',
-            filterValue: null,
-            event: getInputEvents,
-            attrs: {
-                dense: true,
-            },
+            inWhere: true,
         },
     },
     {
         label: t('expedition.counter'),
         name: 'counter',
-        field: 'counter',
         align: 'left',
-        columnFilter: null,
+        columnFilter: {
+            inWhere: true,
+        },
     },
     {
         label: t('expedition.externalId'),
         name: 'externalId',
-        field: 'externalId',
         align: 'left',
-        columnFilter: null,
+        cardVisible: true,
+        columnFilter: {
+            inWhere: true,
+        },
     },
     {
         label: t('expedition.created'),
         name: 'created',
-        field: 'created',
         align: 'left',
-        columnFilter: null,
-        format: (value) => toDateTimeFormat(value),
+        cardVisible: true,
+        format: (row) => toDateTimeFormat(row.created),
     },
     {
         label: t('expedition.state'),
         name: 'state',
-        field: 'state',
         align: 'left',
-        columnFilter: null,
+        cardVisible: true,
+        columnFilter: { inWhere: true },
     },
     {
-        label: '',
-        name: 'history',
-        align: 'left',
-        columnFilter: null,
+        align: 'right',
+        name: 'tableActions',
+        actions: [
+            {
+                title: t('expedition.historyAction'),
+                icon: 'history',
+                isPrimary: true,
+                action: (row) => showLog(row),
+            },
+        ],
     },
 ]);
 
@@ -204,23 +166,35 @@ const logTableColumns = computed(() => [
         label: t('expedition.state'),
         name: 'state',
         field: 'state',
-        align: 'left',
+        align: 'center',
         sortable: true,
     },
     {
         label: t('expedition.name'),
         name: 'name',
-        align: 'name',
+        field: 'name',
+        align: 'center',
         columnFilter: null,
     },
     {
         label: t('expedition.created'),
         name: 'created',
         field: 'created',
-        align: 'left',
+        align: 'center',
         columnFilter: null,
         format: (value) => toDateTimeFormat(value),
     },
+    {
+        label: t('expedition.isScanned'),
+        name: 'isScanned',
+        field: 'isScanned',
+        align: 'center',
+        columnFilter: null,
+        format: (value) => {
+            if (value === true) return t('expedition.yes');
+            else return t('expedition.no');
+        },
+    },
 ]);
 
 const showNewTicketDialog = (withRoute = false) => {
@@ -255,10 +229,20 @@ const getExpeditionState = async (expedition) => {
             order: ['created DESC'],
         };
 
-        const { data } = await axios.get(`ExpeditionStates/filter`, {
+        const { data: expeditionStates } = await axios.get(`ExpeditionStates/filter`, {
             params: { filter: JSON.stringify(filter) },
         });
-        expeditionsLogsData.value = data;
+        const { data: scannedStates } = await axios.get(`ExpeditionStates`, {
+            params: { filter: JSON.stringify(filter), fields: ['id', 'isScanned'] },
+        });
+
+        expeditionsLogsData.value = expeditionStates.map((state) => {
+            const scannedState = scannedStates.find((s) => s.id === state.id);
+            return {
+                ...state,
+                isScanned: scannedState ? scannedState.isScanned : false,
+            };
+        });
     } catch (error) {
         console.error(error);
     }
@@ -268,19 +252,12 @@ onMounted(async () => {
     stateStore.rightDrawer = true;
     const filteredColumns = columns.value.filter((col) => col.name !== 'history');
     allColumnNames.value = filteredColumns.map((col) => col.name);
-    // await expeditionsArrayData.fetch({ append: false });
 });
 
 onUnmounted(() => (stateStore.rightDrawer = false));
 </script>
 
 <template>
-    <FetchData
-        url="Items"
-        auto-load
-        :filter="{ fields: ['id', 'name'], order: 'name ASC' }"
-        @on-fetch="(data) => (itemsOptions = data)"
-    />
     <VnSubToolbar>
         <template #st-data>
             <TableVisibleColumns
@@ -296,7 +273,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                     ref="btnDropdownRef"
                     color="primary"
                     :label="t('expedition.move')"
-                    :disable="!selectedExpeditions.length"
+                    :disable="!hasSelectedRows"
                 >
                     <template #label>
                         <QTooltip>{{ t('Select lines to see the options') }}</QTooltip>
@@ -329,7 +306,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                     </QList>
                 </QBtnDropdown>
                 <QBtn
-                    :disable="!selectedExpeditions.length"
+                    :disable="!hasSelectedRows"
                     icon="delete"
                     color="primary"
                     @click="
@@ -344,110 +321,27 @@ onUnmounted(() => (stateStore.rightDrawer = false));
         </template>
     </VnSubToolbar>
 
-    <QTable
-        :rows="ticketExpeditions"
+    <VnTable
+        ref="tableRef"
+        data-key="TicketExpedition"
+        url="Expeditions/filter"
         :columns="columns"
-        row-key="id"
-        :pagination="{ rowsPerPage: 0 }"
-        class="full-width q-mt-md"
-        selection="multiple"
-        v-model:selected="selectedExpeditions"
-        :visible-columns="visibleColumns"
-        :no-data-label="t('globals.noResults')"
+        :filter="expeditionsFilter"
+        v-model:selected="selectedRows"
+        :table="{
+            'row-key': 'id',
+            selection: 'multiple',
+        }"
+        default-mode="table"
+        auto-load
     >
-        <template #top-row="{ cols }">
-            <QTr>
-                <QTd />
-                <QTd v-for="(col, index) in cols" :key="index" style="max-width: 100px">
-                    <component
-                        :is="col.columnFilter.component"
-                        v-if="col.columnFilter"
-                        v-model="col.columnFilter.filterValue"
-                        v-bind="col.columnFilter.attrs"
-                        v-on="col.columnFilter.event(col)"
-                        dense
-                    />
-                </QTd>
-            </QTr>
-        </template>
-        <template #body-cell-item="{ row }">
-            <QTd auto-width @click.stop>
-                <QBtn flat color="primary">{{ row.packagingItemFk }}</QBtn>
+        <template #column-packagingItemFk="{ row }">
+            <span class="link" @click.stop>
+                {{ row.packagingItemFk }}
                 <ItemDescriptorProxy :id="row.packagingItemFk" />
-            </QTd>
+            </span>
         </template>
-        <template #body-cell-available="{ row }">
-            <QTd @click.stop>
-                <QBadge :color="row.available < 0 ? 'alert' : 'transparent'" dense>
-                    {{ row.available }}
-                </QBadge>
-            </QTd>
-        </template>
-
-        <template #body-cell-price="{ row }">
-            <QTd>
-                <template v-if="isTicketEditable && row.id">
-                    <QBtn flat color="primary" dense @click="onOpenEditPricePopover(row)">
-                        {{ toCurrency(row.price) }}
-                    </QBtn>
-                    <TicketEditManaProxy
-                        ref="editPriceProxyRef"
-                        :mana="mana"
-                        :new-price="getNewPrice"
-                        @save="updatePrice(row)"
-                    >
-                        <VnInput
-                            v-model.number="edit.price"
-                            :label="t('ticketSale.price')"
-                            type="number"
-                        />
-                    </TicketEditManaProxy>
-                </template>
-                <span v-else>{{ toCurrency(row.price) }}</span>
-            </QTd>
-        </template>
-        <template #body-cell-discount="{ row }">
-            <QTd>
-                <template v-if="!isLocked && row.id">
-                    <QBtn
-                        flat
-                        color="primary"
-                        dense
-                        @click="onOpenEditDiscountPopover(row)"
-                    >
-                        {{ toPercentage(row.discount / 100) }}
-                    </QBtn>
-                    <TicketEditManaProxy
-                        :mana="mana"
-                        :new-price="getNewPrice"
-                        @save="changeDiscount(row)"
-                    >
-                        <VnInput
-                            v-model.number="edit.discount"
-                            :label="t('ticketSale.discount')"
-                            type="number"
-                        />
-                    </TicketEditManaProxy>
-                </template>
-                <span v-else>{{ toPercentage(row.discount / 100) }}</span>
-            </QTd>
-        </template>
-        <template #body-cell-history="{ row }">
-            <QTd>
-                <QBtn
-                    @click.stop="showLog(row)"
-                    color="primary"
-                    icon="history"
-                    size="md"
-                    flat
-                >
-                    <QTooltip class="text-no-wrap">
-                        {{ t('expedition.historyAction') }}
-                    </QTooltip>
-                </QBtn>
-            </QTd>
-        </template>
-    </QTable>
+    </VnTable>
     <QDialog ref="newTicketDialogRef" transition-show="scale" transition-hide="scale">
         <ExpeditionNewTicket
             :ticket="ticketData"
@@ -461,12 +355,14 @@ onUnmounted(() => (stateStore.rightDrawer = false));
             data-key="TicketExpeditionLog"
             :rows="expeditionsLogsData"
             :columns="logTableColumns"
-            class="q-pa-sm"
+            class="q-pa-md full-width"
         >
             <template #body-cell-name="{ row }">
-                <QTd auto-width>
-                    <QBtn flat dense color="primary">{{ row.name }}</QBtn>
-                    <WorkerDescriptorProxy :id="row.workerFk" />
+                <QTd style="text-align: center">
+                    <span class="link" @click.stop>
+                        <QBtn flat dense>{{ row.name }}</QBtn>
+                        <WorkerDescriptorProxy :id="row.workerFk" />
+                    </span>
                 </QTd>
             </template>
         </QTable>
diff --git a/src/pages/Ticket/Card/TicketPurchaseRequest.vue b/src/pages/Ticket/Card/TicketPurchaseRequest.vue
index 281dc46a1..35573cf2d 100644
--- a/src/pages/Ticket/Card/TicketPurchaseRequest.vue
+++ b/src/pages/Ticket/Card/TicketPurchaseRequest.vue
@@ -186,18 +186,22 @@ const openCreateModal = () => createTicketRequestDialogRef.value.show();
                     </template>
                     <template #body-cell-requester="{ row }">
                         <QTd @click.stop>
-                            <QBtn flat color="primary">
-                                {{ row.requester?.user?.nickname }}
-                                <WorkerDescriptorProxy :id="row.requesterFk" />
-                            </QBtn>
+                            <span class="link">
+                                <QBtn flat>
+                                    {{ row.requester?.user?.nickname }}
+                                    <WorkerDescriptorProxy :id="row.requesterFk" />
+                                </QBtn>
+                            </span>
                         </QTd>
                     </template>
                     <template #body-cell-atender="{ row }">
                         <QTd @click.stop>
-                            <QBtn flat color="primary">
-                                {{ row.atender?.user?.nickname }}
-                                <WorkerDescriptorProxy :id="row.attenderFk" />
-                            </QBtn>
+                            <span class="link">
+                                <QBtn flat>
+                                    {{ row.atender?.user?.nickname }}
+                                    <WorkerDescriptorProxy :id="row.attenderFk" />
+                                </QBtn>
+                            </span>
                         </QTd>
                     </template>
                     <template #body-cell-quantity="{ row }">
@@ -220,10 +224,12 @@ const openCreateModal = () => createTicketRequestDialogRef.value.show();
                     </template>
                     <template #body-cell-saleFk="{ row }">
                         <QTd @click.stop>
-                            <QBtn v-if="row.saleFk" flat color="primary">
-                                {{ row.sale.itemFk }}
-                                <ItemDescriptorProxy :id="row.sale.itemFk" />
-                            </QBtn>
+                            <span class="link">
+                                <QBtn v-if="row.saleFk" flat>
+                                    {{ row.sale.itemFk }}
+                                    <ItemDescriptorProxy :id="row.sale.itemFk" />
+                                </QBtn>
+                            </span>
                         </QTd>
                     </template>
                     <template #body-cell-actions="{ row }">
diff --git a/src/pages/Ticket/Card/TicketSale.vue b/src/pages/Ticket/Card/TicketSale.vue
index cbc94b388..13fea42b4 100644
--- a/src/pages/Ticket/Card/TicketSale.vue
+++ b/src/pages/Ticket/Card/TicketSale.vue
@@ -11,7 +11,6 @@ import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
 import TicketEditManaProxy from './TicketEditMana.vue';
 import VnImg from 'src/components/ui/VnImg.vue';
 
-import RightMenu from 'src/components/common/RightMenu.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import TicketSaleMoreActions from './TicketSaleMoreActions.vue';
 import TicketTransfer from './TicketTransfer.vue';
@@ -620,10 +619,12 @@ onUnmounted(() => (stateStore.rightDrawer = false));
         <template #body-cell-itemFk="{ row }">
             <QTd @click.stop>
                 <div v-if="row.id">
-                    <QBtn flat color="primary" dense>
-                        {{ row.itemFk }}
-                    </QBtn>
-                    <ItemDescriptorProxy :id="row.itemFk" />
+                    <span class="link">
+                        <QBtn flat dense>
+                            {{ row.itemFk }}
+                        </QBtn>
+                        <ItemDescriptorProxy :id="row.itemFk" />
+                    </span>
                 </div>
                 <VnSelect
                     v-else
diff --git a/src/pages/Ticket/Card/TicketSaleTracking.vue b/src/pages/Ticket/Card/TicketSaleTracking.vue
index d519bc2c6..93aa627e6 100644
--- a/src/pages/Ticket/Card/TicketSaleTracking.vue
+++ b/src/pages/Ticket/Card/TicketSaleTracking.vue
@@ -406,10 +406,12 @@ const qCheckBoxController = (sale, action) => {
         <template #body-cell-item="{ row }">
             <QTd @click.stop>
                 <div>
-                    <QBtn flat color="primary">
-                        {{ row.itemFk }}
-                    </QBtn>
-                    <ItemDescriptorProxy :id="row.itemFk" />
+                    <span class="link">
+                        <QBtn flat>
+                            {{ row.itemFk }}
+                        </QBtn>
+                        <ItemDescriptorProxy :id="row.itemFk" />
+                    </span>
                 </div>
             </QTd>
         </template>
diff --git a/src/pages/Ticket/Card/TicketTracking.vue b/src/pages/Ticket/Card/TicketTracking.vue
index 2ddb278fa..62d755c4d 100644
--- a/src/pages/Ticket/Card/TicketTracking.vue
+++ b/src/pages/Ticket/Card/TicketTracking.vue
@@ -95,10 +95,12 @@ const openCreateModal = () => createTrackingDialogRef.value.show();
                 >
                     <template #body-cell-worker="{ row }">
                         <QTd @click.stop>
-                            <QBtn flat color="primary">
-                                {{ row.user?.name }}
-                                <WorkerDescriptorProxy :id="row.user?.worker?.id" />
-                            </QBtn>
+                            <span class="link">
+                                <QBtn flat>
+                                    {{ row.user?.name }}
+                                    <WorkerDescriptorProxy :id="row.user?.worker?.id" />
+                                </QBtn>
+                            </span>
                         </QTd>
                     </template>
                 </QTable>
diff --git a/src/pages/Ticket/Card/TicketVolume.vue b/src/pages/Ticket/Card/TicketVolume.vue
index 93da31e53..a021cfbf1 100644
--- a/src/pages/Ticket/Card/TicketVolume.vue
+++ b/src/pages/Ticket/Card/TicketVolume.vue
@@ -134,10 +134,12 @@ onUnmounted(() => (stateStore.rightDrawer = false));
     >
         <template #body-cell-item="{ row }">
             <QTd>
-                <QBtn flat color="primary">
-                    {{ row.itemFk }}
-                    <ItemDescriptorProxy :id="row.itemFk" />
-                </QBtn>
+                <span class="link">
+                    <QBtn flat>
+                        {{ row.itemFk }}
+                        <ItemDescriptorProxy :id="row.itemFk" />
+                    </QBtn>
+                </span>
             </QTd>
         </template>
         <template #body-cell-description="{ row }">
diff --git a/src/pages/Ticket/locale/en.yml b/src/pages/Ticket/locale/en.yml
index 10a8e1fa4..66a3787dd 100644
--- a/src/pages/Ticket/locale/en.yml
+++ b/src/pages/Ticket/locale/en.yml
@@ -112,6 +112,9 @@ expedition:
     removeExpeditionSubtitle: Are you sure you want to delete this expedition?
     worker: Worker
     move: Move
+    isScanned: Is scanned
+    yes: Yes
+    no: No
 basicData:
     next: Next
     back: Back
diff --git a/src/pages/Ticket/locale/es.yml b/src/pages/Ticket/locale/es.yml
index a80692bfe..59f5a7f91 100644
--- a/src/pages/Ticket/locale/es.yml
+++ b/src/pages/Ticket/locale/es.yml
@@ -201,6 +201,9 @@ expedition:
     removeExpeditionSubtitle: ¿Está seguro de eliminar esta expedición?
     worker: Trabajador
     move: Mover
+    isScanned: Escaneado
+    yes: Sí
+    no: No
 package:
     package: Embalaje
     quantity: Cantidad

From 1dace39882a136d1304b3f8905494555e67cfd0e Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 26 Jul 2024 11:24:40 +0200
Subject: [PATCH 004/281] refactor: refs #7553 changed isScanned field & fixed
 cardDescriptor warning

---
 src/components/ui/CardDescriptor.vue       |  3 ++-
 src/pages/Ticket/Card/TicketExpedition.vue | 23 +++++++++-------------
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/src/components/ui/CardDescriptor.vue b/src/components/ui/CardDescriptor.vue
index 90ac856e5..7f35f0a28 100644
--- a/src/components/ui/CardDescriptor.vue
+++ b/src/components/ui/CardDescriptor.vue
@@ -47,6 +47,7 @@ let store;
 let entity;
 const isLoading = ref(false);
 const isSameDataKey = computed(() => $props.dataKey === route.meta.moduleName);
+const menuRef = ref();
 defineExpose({ getData });
 
 onBeforeMount(async () => {
@@ -170,7 +171,7 @@ const toModule = computed(() =>
                     <QTooltip>
                         {{ t('components.cardDescriptor.moreOptions') }}
                     </QTooltip>
-                    <QMenu ref="menuRef">
+                    <QMenu :ref="menuRef">
                         <QList>
                             <slot name="menu" :entity="entity" :menu-ref="menuRef" />
                         </QList>
diff --git a/src/pages/Ticket/Card/TicketExpedition.vue b/src/pages/Ticket/Card/TicketExpedition.vue
index e8dd5b31c..5ca57ae8e 100644
--- a/src/pages/Ticket/Card/TicketExpedition.vue
+++ b/src/pages/Ticket/Card/TicketExpedition.vue
@@ -98,14 +98,6 @@ const columns = computed(() => [
         isTitle: true,
         columnFilter: {
             inWhere: true,
-            // component: 'select',
-            // attrs: {
-            //     url: 'Items',
-            //     useLike: false,
-            //     fields: ['id', 'name'],
-            //     optionLabel: 'name',
-            //     optionValue: 'id',
-            // },
         },
     },
     {
@@ -181,7 +173,6 @@ const logTableColumns = computed(() => [
         name: 'created',
         field: 'created',
         align: 'center',
-        columnFilter: null,
         format: (value) => toDateTimeFormat(value),
     },
     {
@@ -189,11 +180,6 @@ const logTableColumns = computed(() => [
         name: 'isScanned',
         field: 'isScanned',
         align: 'center',
-        columnFilter: null,
-        format: (value) => {
-            if (value === true) return t('expedition.yes');
-            else return t('expedition.no');
-        },
     },
 ]);
 
@@ -365,6 +351,15 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                     </span>
                 </QTd>
             </template>
+            <template #body-cell-isScanned="{ row }">
+                <QTd style="text-align: center">
+                    <QCheckbox disable v-model="row.isScanned">
+                        {{
+                            row.isScanned === 1 ? t('expedition.yes') : t('expedition.no')
+                        }}
+                    </QCheckbox>
+                </QTd>
+            </template>
         </QTable>
     </QDialog>
 </template>

From 61f1eae282d94617dd1ce2d40cc9f2843f5af236 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 26 Jul 2024 12:01:46 +0200
Subject: [PATCH 005/281] fix: deleted branch cloned wrongly

---
 salix-front-mindshore | 1 -
 1 file changed, 1 deletion(-)
 delete mode 160000 salix-front-mindshore

diff --git a/salix-front-mindshore b/salix-front-mindshore
deleted file mode 160000
index 7432396ce..000000000
--- a/salix-front-mindshore
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 7432396ceafb7fe46b8ed8ac28fa7753df57efd2

From 954a6ff6c0c197821051e030a6a671586a1c7d09 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 2 Aug 2024 13:55:51 +0200
Subject: [PATCH 006/281] refacotr: refs #7553 refactor sales, purchaseRequest
 and saleTracking

---
 src/pages/Monitor/SalesTicketsTable.vue       |   4 +-
 .../Ticket/Card/TicketPurchaseRequest.vue     | 310 +++++++++---------
 src/pages/Ticket/Card/TicketSale.vue          | 259 +++++++--------
 src/pages/Ticket/Card/TicketSaleTracking.vue  |  16 +-
 4 files changed, 303 insertions(+), 286 deletions(-)

diff --git a/src/pages/Monitor/SalesTicketsTable.vue b/src/pages/Monitor/SalesTicketsTable.vue
index 1ca68240b..1dd0557ab 100644
--- a/src/pages/Monitor/SalesTicketsTable.vue
+++ b/src/pages/Monitor/SalesTicketsTable.vue
@@ -303,7 +303,7 @@ const columns = computed(() => [
             {
                 title: t('salesTicketsTable.goToLines'),
                 icon: 'vn:lines',
-                color: 'priamry',
+                color: 'primary',
                 action: (row) => redirectToSales(row.id),
                 isPrimary: true,
                 attrs: {
@@ -314,7 +314,7 @@ const columns = computed(() => [
             {
                 title: t('salesTicketsTable.preview'),
                 icon: 'preview',
-                color: 'priamry',
+                color: 'primary',
                 action: (row) => viewSummary(row.id, TicketSummary),
                 isPrimary: true,
                 attrs: {
diff --git a/src/pages/Ticket/Card/TicketPurchaseRequest.vue b/src/pages/Ticket/Card/TicketPurchaseRequest.vue
index 35573cf2d..3efdcbef8 100644
--- a/src/pages/Ticket/Card/TicketPurchaseRequest.vue
+++ b/src/pages/Ticket/Card/TicketPurchaseRequest.vue
@@ -1,27 +1,32 @@
 <script setup>
 import { ref, computed, watch, reactive } from 'vue';
+import axios from 'axios';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 
-import VnInput from 'src/components/common/VnInput.vue';
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
 import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
-import CrudModel from 'src/components/CrudModel.vue';
-import TicketCreateRequest from './TicketCreateRequest.vue';
-
 import { dashIfEmpty } from 'src/filters';
 import { toDateFormat } from 'src/filters/date.js';
+import VnTable from 'src/components/VnTable/VnTable.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
+import FetchData from 'src/components/FetchData.vue';
+import { useVnConfirm } from 'composables/useVnConfirm';
+import useNotify from 'src/composables/useNotify.js';
 
 const route = useRoute();
 const { t } = useI18n();
-const createTicketRequestDialogRef = ref(null);
-const crudModelRef = ref(null);
+const tableRef = ref();
+const attendersOptions = ref([]);
+const { openConfirmationModal } = useVnConfirm();
+const { notify } = useNotify();
 
 watch(
     () => route.params.id,
     async (val) => {
         crudModelFilter.where.ticketFk = val;
-        crudModelRef.value.reload();
+        tableRef.value.reload();
     }
 );
 
@@ -72,64 +77,90 @@ const crudModelFilter = reactive({
 
 const columns = computed(() => [
     {
+        align: 'left',
         label: t('purchaseRequest.id'),
         name: 'id',
-        field: 'id',
-        align: 'left',
-        columnFilter: null,
+        chip: {
+            condition: () => true,
+        },
+        isId: true,
+        hidden: true,
     },
     {
+        align: 'left',
         label: t('purchaseRequest.description'),
         name: 'description',
-        field: 'description',
-        align: 'left',
-        format: (val) => dashIfEmpty(val),
+        columnClass: 'expand',
+        hidden: true,
     },
     {
+        align: 'left',
         label: t('purchaseRequest.created'),
         name: 'created',
-        field: 'created',
-        align: 'left',
-        format: (val) => toDateFormat(val),
+        format: (row) => toDateFormat(row.created),
+        cardVisible: true,
+        hidden: true,
     },
     {
+        align: 'left',
         label: t('purchaseRequest.requester'),
-        name: 'requester',
-        align: 'left',
-        sortable: true,
+        name: 'requesterFk',
+        cardVisible: true,
+        format: (row) => dashIfEmpty(row.requester?.user?.nickname),
+        hidden: true,
     },
     {
+        align: 'left',
         label: t('purchaseRequest.atender'),
-        name: 'atender',
-        align: 'left',
+        name: 'attenderFk',
+        cardVisible: true,
+        format: (row) => dashIfEmpty(row.atender?.user?.nickname),
+        hidden: true,
     },
     {
+        align: 'left',
         label: t('purchaseRequest.quantity'),
         name: 'quantity',
-        align: 'left',
+        hidden: true,
     },
     {
+        align: 'left',
         label: t('purchaseRequest.price'),
         name: 'price',
-        align: 'left',
+        hidden: true,
     },
     {
+        align: 'left',
         label: t('purchaseRequest.saleFk'),
         name: 'saleFk',
-        align: 'left',
+        cardVisible: true,
+        hidden: true,
     },
     {
+        align: 'left',
         label: t('purchaseRequest.state'),
-        name: 'state',
-        field: 'isOk',
-        align: 'left',
-        format: (val) => t(getRequestState(val)),
+        name: 'isOk',
+        cardVisible: true,
+        isHidden: true,
     },
     {
-        label: '',
-        name: 'actions',
-        align: 'left',
-        columnFilter: null,
+        align: 'right',
+        name: 'tableActions',
+        actions: [
+            {
+                title: t('globals.delete'),
+                icon: 'delete',
+                isPrimary: true,
+                action: (row) =>
+                    openConfirmationModal(
+                        t('You are going to delete this ticket purchase request'),
+                        t(
+                            'This ticket will be removed from ticket purchase requests! Continue anyway?'
+                        ),
+                        () => removeLine(row.id)
+                    ),
+            },
+        ],
     },
 ]);
 
@@ -140,131 +171,114 @@ const getRequestState = (state) => {
         case false:
             return 'Denied';
         case true:
-            return 'Acepted';
+            return 'Accepted';
     }
 };
 
 const isEditable = (isOk) => isOk !== null;
 
-const removeLine = async (row) => crudModelRef.value.remove([row]);
-
-const openCreateModal = () => createTicketRequestDialogRef.value.show();
+async function removeLine(id) {
+    try {
+        await axios.delete(`TicketRequests/${id}`);
+        notify(t('globals.dataSaved'), 'positive');
+        location.reload();
+    } catch (err) {
+        console.error('Error ', err);
+    }
+}
 </script>
 
 <template>
-    <QPage class="column items-center q-pa-md">
-        <CrudModel
-            data-key="PurchaseRequests"
-            url="TicketRequests"
-            ref="crudModelRef"
-            :filter="crudModelFilter"
-            :order="['created ASC']"
-            :default-remove="false"
-            :default-save="false"
-            :default-reset="false"
-            :limit="0"
-            auto-load
-        >
-            <template #body="{ rows }">
-                <QTable
-                    :rows="rows"
-                    :columns="columns"
-                    row-key="id"
-                    :pagination="{ rowsPerPage: 0 }"
-                    class="full-width q-mt-md"
-                    :no-data-label="t('globals.noResults')"
-                    @row-click="(_, row) => redirectToTicketSummary(row.ticketFk)"
-                >
-                    <template #body-cell-description="{ row }">
-                        <QTd @click.stop>
-                            <VnInput
-                                v-model="row.description"
-                                @blur="crudModelRef.saveChanges()"
-                                :disable="isEditable(row.isOk)"
-                            />
-                        </QTd>
-                    </template>
-                    <template #body-cell-requester="{ row }">
-                        <QTd @click.stop>
-                            <span class="link">
-                                <QBtn flat>
-                                    {{ row.requester?.user?.nickname }}
-                                    <WorkerDescriptorProxy :id="row.requesterFk" />
-                                </QBtn>
-                            </span>
-                        </QTd>
-                    </template>
-                    <template #body-cell-atender="{ row }">
-                        <QTd @click.stop>
-                            <span class="link">
-                                <QBtn flat>
-                                    {{ row.atender?.user?.nickname }}
-                                    <WorkerDescriptorProxy :id="row.attenderFk" />
-                                </QBtn>
-                            </span>
-                        </QTd>
-                    </template>
-                    <template #body-cell-quantity="{ row }">
-                        <QTd @click.stop>
-                            <VnInput
-                                v-model="row.quantity"
-                                @blur="crudModelRef.saveChanges()"
-                                :disable="isEditable(row.isOk)"
-                            />
-                        </QTd>
-                    </template>
-                    <template #body-cell-price="{ row }">
-                        <QTd @click.stop>
-                            <VnInput
-                                v-model="row.price"
-                                @blur="crudModelRef.saveChanges()"
-                                :disable="isEditable(row.isOk)"
-                            />
-                        </QTd>
-                    </template>
-                    <template #body-cell-saleFk="{ row }">
-                        <QTd @click.stop>
-                            <span class="link">
-                                <QBtn v-if="row.saleFk" flat>
-                                    {{ row.sale.itemFk }}
-                                    <ItemDescriptorProxy :id="row.sale.itemFk" />
-                                </QBtn>
-                            </span>
-                        </QTd>
-                    </template>
-                    <template #body-cell-actions="{ row }">
-                        <QTd>
-                            <QIcon
-                                @click.stop="removeLine(row)"
-                                class="q-ml-sm cursor-pointer"
-                                color="primary"
-                                name="delete"
-                                size="sm"
-                            >
-                                <QTooltip>
-                                    {{ t('globals.delete') }}
-                                </QTooltip>
-                            </QIcon>
-                        </QTd>
-                    </template>
-                </QTable>
-            </template>
-        </CrudModel>
-        <QDialog
-            ref="createTicketRequestDialogRef"
-            transition-show="scale"
-            transition-hide="scale"
-        >
-            <TicketCreateRequest @on-request-created="crudModelRef.reload()" />
-        </QDialog>
-        <QPageSticky :offset="[20, 20]">
-            <QBtn @click="openCreateModal()" color="primary" fab icon="add" />
-            <QTooltip class="text-no-wrap">
-                {{ t('purchaseRequest.newRequest') }}
-            </QTooltip>
-        </QPageSticky>
-    </QPage>
+    <FetchData
+        url="TicketRequests/getItemTypeWorker"
+        :filter="{ fields: ['id', 'nickname'], order: 'nickname ASC' }"
+        auto-load
+        @on-fetch="(data) => (attendersOptions = data)"
+    />
+    <VnTable
+        ref="tableRef"
+        data-key="PurchaseRequests"
+        url="TicketRequests"
+        :create="{
+            urlCreate: 'TicketRequests',
+            title: t('Create request'),
+            onDataSaved: ({ id }) => tableRef.reload(id),
+            formInitialData: {
+                ticketFk: route.params.id,
+            },
+        }"
+        save-url="TicketRequests/crud"
+        :filter="crudModelFilter"
+        :columns="columns"
+        :is-editable="true"
+        :right-search="false"
+        auto-load
+    >
+        <template #column-description="{ row }">
+            <VnInput v-model="row.description" :disable="isEditable(row.isOk)" />
+        </template>
+        <template #column-requesterFk="{ row }">
+            <span class="link" @click.stop>
+                {{ row.requester?.user?.nickname }}
+                <WorkerDescriptorProxy :id="row.requesterFk" />
+            </span>
+        </template>
+        <template #column-attenderFk="{ row }">
+            <span class="link" @click.stop>
+                {{ row.atender?.user?.nickname }}
+                <WorkerDescriptorProxy :id="row.attenderFk" />
+            </span>
+        </template>
+        <template #column-quantity="{ row }">
+            <VnInput v-model="row.quantity" :disable="isEditable(row.isOk)" />
+        </template>
+        <template #column-price="{ row }">
+            <span @click.stop>
+                <VnInput v-model="row.price" :disable="isEditable(row.isOk)">
+                    {{ row.price }}
+                </VnInput>
+            </span>
+        </template>
+        <template #column-saleFk="{ row }">
+            <QTd style="width: 3%">
+                <span class="link" @click.stop>
+                    {{ dashIfEmpty(row.sale?.itemFk) }}
+                    <ItemDescriptorProxy :id="row.sale?.itemFk" /> </span
+            ></QTd>
+        </template>
+        <template #column-isOk="{ row }">
+            {{ t(getRequestState(row.isOk)) }}
+        </template>
+
+        <template #more-create-dialog="{ data }">
+            <VnInput
+                v-model="data.description"
+                :label="t('purchaseRequest.description')"
+            />
+            <VnSelect
+                :label="t('purchaseRequest.atender')"
+                v-model="data.attenderFk"
+                :options="attendersOptions"
+                hide-selected
+                option-label="nickname"
+                option-value="id"
+            />
+            <VnInput
+                v-model="data.quantity"
+                :label="t('purchaseRequest.quantity')"
+                type="number"
+                min="1"
+            />
+            <VnInput
+                v-model="data.price"
+                :label="t('purchaseRequest.price')"
+                type="number"
+                min="0"
+            />
+        </template>
+    </VnTable>
 </template>
+
 <i18n>
     es:
         New: Nueva
diff --git a/src/pages/Ticket/Card/TicketSale.vue b/src/pages/Ticket/Card/TicketSale.vue
index 13fea42b4..853913285 100644
--- a/src/pages/Ticket/Card/TicketSale.vue
+++ b/src/pages/Ticket/Card/TicketSale.vue
@@ -16,11 +16,12 @@ import TicketSaleMoreActions from './TicketSaleMoreActions.vue';
 import TicketTransfer from './TicketTransfer.vue';
 
 import { useStateStore } from 'stores/useStateStore';
-import { toCurrency, toPercentage, dashIfEmpty } from 'src/filters';
+import { toCurrency, toPercentage } from 'src/filters';
 import { useArrayData } from 'composables/useArrayData';
 import { useVnConfirm } from 'composables/useVnConfirm';
 import useNotify from 'src/composables/useNotify.js';
 import axios from 'axios';
+import VnTable from 'src/components/VnTable/VnTable.vue';
 
 const route = useRoute();
 const router = useRouter();
@@ -33,7 +34,8 @@ const stateBtnDropdownRef = ref(null);
 
 const arrayData = useArrayData('ticketData');
 const { store } = arrayData;
-
+const selectedRows = ref([]);
+const hasSelectedRows = computed(() => selectedRows.value.length > 0);
 const ticketConfig = ref(null);
 const isLocked = ref(false);
 const isTicketEditable = ref(false);
@@ -56,86 +58,104 @@ watch(
 
 const columns = computed(() => [
     {
-        label: '',
+        align: 'left',
         name: 'statusIcons',
-        align: 'left',
+        hidden: true,
     },
     {
-        label: '',
-        name: 'picture',
-        align: 'left',
+        align: 'center',
+        label: t('lines.image'),
+        name: 'image',
+        columnField: {
+            component: VnImg,
+            attrs: (id) => {
+                return {
+                    id,
+                    width: '50px',
+                };
+            },
+        },
+        columnFilter: false,
     },
     {
+        align: 'left',
         label: t('ticketSale.visible'),
         name: 'visible',
-        field: 'visible',
-        align: 'left',
-        sortable: true,
+        format: (row, dashIfEmpty) => dashIfEmpty(row.visible),
+        hidden: true,
     },
     {
+        align: 'left',
         label: t('ticketSale.available'),
         name: 'available',
-        field: 'available',
-        align: 'left',
-        sortable: true,
+        format: (row, dashIfEmpty) => dashIfEmpty(row.available),
+        hidden: true,
     },
     {
+        align: 'left',
         label: t('ticketSale.id'),
         name: 'itemFk',
-        field: 'itemFk',
-        align: 'left',
-        sortable: true,
+        hidden: true,
     },
     {
+        align: 'left',
         label: t('ticketSale.quantity'),
         name: 'quantity',
-        field: 'quantity',
-        align: 'left',
-        sortable: true,
+        cardVisible: true,
+        format: (row) => toCurrency(row.quantity),
+        hidden: true,
     },
     {
+        align: 'left',
         label: t('ticketSale.item'),
         name: 'item',
-        field: 'item',
-        align: 'left',
-        sortable: true,
+        format: (row) => row?.item?.name,
+        columnClass: 'expand',
+        cardVisible: true,
+        hidden: true,
     },
     {
+        align: 'left',
         label: t('ticketSale.price'),
         name: 'price',
-        field: 'price',
-        align: 'left',
-        sortable: true,
-        format: (val) => toCurrency(val),
+        cardVisible: true,
+        format: (row) => toCurrency(row.price),
+        hidden: true,
     },
     {
+        align: 'left',
         label: t('ticketSale.discount'),
         name: 'discount',
-        field: 'discount',
-        align: 'left',
-        sortable: true,
+        cardVisible: true,
+        format: (row) => toPercentage(row.discount),
+        hidden: true,
     },
     {
+        align: 'left',
         label: t('ticketSale.amount'),
         name: 'amount',
-        field: 'amount',
-        align: 'left',
-        sortable: true,
-        format: (val) => toCurrency(val),
+        format: (row) => parseInt(row.amount * row.quantity),
+        hidden: true,
     },
     {
+        align: 'left',
         label: t('ticketSale.packaging'),
         name: 'itemPackingTypeFk',
-        field: 'item',
-        align: 'left',
-        sortable: true,
-        format: (val) => dashIfEmpty(val?.itemPackingTypeFk),
+        cardVisible: true,
+        format: (row, dashIfEmpty) => dashIfEmpty(row?.item?.itemPackingTypeFk),
+        hidden: true,
     },
     {
-        label: '',
-        name: 'history',
-        align: 'left',
-        columnFilter: null,
+        align: 'right',
+        name: 'tableActions',
+        actions: [
+            {
+                title: t('ticketSale.history'),
+                icon: 'history',
+                isPrimary: true,
+                action: (row) => goToLog(row.id),
+            },
+        ],
     },
 ]);
 
@@ -478,7 +498,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                     :ticket="store.data"
                     :is-ticket-editable="isTicketEditable"
                     :sales="selectedValidSales"
-                    :disable="!selectedSales.length"
+                    :disable="!hasSelectedRows"
                     :mana="mana"
                     :ticket-config="ticketConfig"
                     @get-mana="getMana()"
@@ -487,7 +507,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                 <QBtn
                     color="primary"
                     icon="delete"
-                    :disable="!isTicketEditable || !selectedSales.length"
+                    :disable="!isTicketEditable || !hasSelectedRows"
                     @click="
                         openConfirmationModal(
                             t('Continue anyway?'),
@@ -501,7 +521,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                 <QBtn
                     color="primary"
                     icon="vn:splitline"
-                    :disable="!isTicketEditable || !selectedSales.length"
+                    :disable="!isTicketEditable || !hasSelectedRows"
                     @click="setTransferParams()"
                 >
                     <QTooltip>{{ t('Transfer lines') }}</QTooltip>
@@ -540,17 +560,21 @@ onUnmounted(() => (stateStore.rightDrawer = false));
             </QCardSection>
         </div></QDrawer
     >
-    <QTable
-        :rows="sales"
+    <!-- TODO: el botón de añadir filas como está en salix-->
+    <VnTable
+        ref="tableRef"
+        data-key="TicketSales"
+        :url="`Tickets/${route.params.id}/getSales`"
         :columns="columns"
-        row-key="id"
-        :pagination="{ rowsPerPage: 0 }"
-        class="full-width q-mt-md"
-        selection="multiple"
-        v-model:selected="selectedSales"
-        :no-data-label="t('globals.noResults')"
+        v-model:selected="selectedRows"
+        :table="{
+            'row-key': 'id',
+            selection: 'multiple',
+        }"
+        :right-search="false"
+        auto-load
     >
-        <template #body-cell-statusIcons="{ row }">
+        <template #column-statusIcons="{ row }">
             <QTd class="q-gutter-x-xs">
                 <router-link
                     v-if="row.claim?.claimFk"
@@ -595,58 +619,40 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                 </QIcon>
             </QTd>
         </template>
-        <template #body-cell-picture="{ row }">
-            <QTd>
-                <div class="image-wrapper">
-                    <VnImg :id="row.itemFk" class="rounded" />
+        <template #column-image="{ row }">
+            <div class="image-wrapper">
+                <VnImg :id="parseInt(row?.item?.id)" class="rounded" />
+            </div>
+        </template>
+        <template #column-visible="{ row }">
+            <QBadge :color="row.available < 0 ? 'alert' : 'transparent'" dense>
+                {{ row.visible }}
+            </QBadge>
+        </template>
+        <template #column-available="{ row }">
+            <QBadge :color="row.available < 0 ? 'alert' : 'transparent'" dense>
+                {{ row.available }}
+            </QBadge>
+        </template>
+        <template #column-itemFk="{ row }">
+            <span class="link" @click.stop>
+                {{ row?.itemFk }}
+                <ItemDescriptorProxy :id="row?.itemFk" />
+            </span>
+        </template>
+        <template #column-item="{ row }">
+            <div class="row column full-width justify-between items-start">
+                {{ row?.item?.name }}
+                <div v-if="row?.item?.subName" class="subName">
+                    {{ row?.item?.subName.toUpperCase() }}
                 </div>
-            </QTd>
+            </div>
+            <FetchedTags :item="row?.item" :max-length="6" />
+            <QPopupProxy v-if="row.id && isTicketEditable">
+                <VnInput v-model="row.concept" @change="updateConcept(row)" />
+            </QPopupProxy>
         </template>
-        <template #body-cell-visible="{ row }">
-            <QTd @click.stop>
-                <QBadge :color="row.visible < 0 ? 'alert' : 'transparent'" dense>
-                    {{ row.visible }}
-                </QBadge>
-            </QTd>
-        </template>
-        <template #body-cell-available="{ row }">
-            <QTd @click.stop>
-                <QBadge :color="row.available < 0 ? 'alert' : 'transparent'" dense>
-                    {{ row.available }}
-                </QBadge>
-            </QTd>
-        </template>
-        <template #body-cell-itemFk="{ row }">
-            <QTd @click.stop>
-                <div v-if="row.id">
-                    <span class="link">
-                        <QBtn flat dense>
-                            {{ row.itemFk }}
-                        </QBtn>
-                        <ItemDescriptorProxy :id="row.itemFk" />
-                    </span>
-                </div>
-                <VnSelect
-                    v-else
-                    :options="itemsWithNameOptions"
-                    hide-selected
-                    option-label="name"
-                    option-value="id"
-                    @update:model-value="changeQuantity(row)"
-                    v-model="row.itemFk"
-                >
-                    <template #option="scope">
-                        <QItem v-bind="scope.itemProps">
-                            <QItemSection>
-                                <QItemLabel> #{{ scope.opt?.id }} </QItemLabel>
-                                <QItemLabel caption>{{ scope.opt?.name }}</QItemLabel>
-                            </QItemSection>
-                        </QItem>
-                    </template>
-                </VnSelect>
-            </QTd>
-        </template>
-        <template #body-cell-quantity="{ row }">
+        <template #column-quantity="{ row }">
             <QTd @click.stop>
                 <VnInput
                     v-if="isTicketEditable"
@@ -658,19 +664,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                 <span v-else>{{ row.quantity }}</span>
             </QTd>
         </template>
-        <template #body-cell-item="{ row }">
-            <QTd class="col">
-                <div class="column">
-                    <span>{{ row.concept }}</span>
-                    <span class="color-vn-label">{{ row.item?.subName }}</span>
-                    <FetchedTags v-if="row.item" :item="row.item" :max-length="6" />
-                    <QPopupProxy v-if="row.id && isTicketEditable">
-                        <VnInput v-model="row.concept" @change="updateConcept(row)" />
-                    </QPopupProxy>
-                </div>
-            </QTd>
-        </template>
-        <template #body-cell-price="{ row }">
+        <template #column-price="{ row }">
             <QTd>
                 <template v-if="isTicketEditable && row.id">
                     <QBtn flat color="primary" dense @click="onOpenEditPricePopover(row)">
@@ -692,7 +686,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                 <span v-else>{{ toCurrency(row.price) }}</span>
             </QTd>
         </template>
-        <template #body-cell-discount="{ row }">
+        <template #column-discount="{ row }">
             <QTd>
                 <template v-if="!isLocked && row.id">
                     <QBtn
@@ -718,21 +712,8 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                 <span v-else>{{ toPercentage(row.discount / 100) }}</span>
             </QTd>
         </template>
-        <template #body-cell-history="{ row }">
-            <QTd>
-                <QBtn
-                    v-if="row.$hasLogs"
-                    @click.stop="goToLog(row.id)"
-                    color="primary"
-                    icon="history"
-                    size="md"
-                    flat
-                >
-                    <QTooltip class="text-no-wrap">
-                        {{ t('ticketSale.history') }}
-                    </QTooltip>
-                </QBtn>
-            </QTd>
+        <template #column-amount="{ row }">
+            {{ toCurrency(row.quantity * row.price) }}
         </template>
         <template #bottom-row>
             <QBtn
@@ -750,7 +731,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                 </QTooltip>
             </QBtn>
         </template>
-    </QTable>
+    </VnTable>
 
     <QPageSticky :offset="[20, 20]">
         <QBtn @click="newOrderFromTicket()" color="primary" fab icon="add" />
@@ -760,6 +741,18 @@ onUnmounted(() => (stateStore.rightDrawer = false));
     </QPageSticky>
 </template>
 
+<style lang="scss" scoped>
+.image-wrapper {
+    height: 50px;
+    width: 50px;
+}
+
+.subName {
+    text-transform: uppercase;
+    color: var(--vn-label-color);
+}
+</style>
+
 <i18n>
 es:
     New item: Nuevo artículo
diff --git a/src/pages/Ticket/Card/TicketSaleTracking.vue b/src/pages/Ticket/Card/TicketSaleTracking.vue
index 93aa627e6..8097c68ef 100644
--- a/src/pages/Ticket/Card/TicketSaleTracking.vue
+++ b/src/pages/Ticket/Card/TicketSaleTracking.vue
@@ -345,7 +345,7 @@ const qCheckBoxController = (sale, action) => {
         :no-data-label="t('globals.noResults')"
     >
         <template #body-cell-isChecked="{ row }">
-            <QTd @click.stop>
+            <QTd @click.stop style="width: 20%">
                 <QCheckbox
                     :model-value="!!row.hasSaleGroupDetail"
                     color="pink"
@@ -404,7 +404,7 @@ const qCheckBoxController = (sale, action) => {
             </QTd>
         </template>
         <template #body-cell-item="{ row }">
-            <QTd @click.stop>
+            <QTd @click.stop style="width: 20%">
                 <div>
                     <span class="link">
                         <QBtn flat>
@@ -426,8 +426,18 @@ const qCheckBoxController = (sale, action) => {
                 </div>
             </QTd>
         </template>
+        <template #body-cell-quantity="{ row }">
+            <QTd style="width: 10%">
+                {{ row.quantity }}
+            </QTd>
+        </template>
+        <template #body-cell-parking="{ row }">
+            <QTd style="width: 10%">
+                {{ dashIfEmpty(row.parkingFk) }}
+            </QTd>
+        </template>
         <template #body-cell-actions="{ row }">
-            <QTd>
+            <QTd style="width: 20%">
                 <QBtn
                     @click.stop="showLog(row)"
                     color="primary"

From f2be2b430010d647f2547a8a6d8a2b7604b894dd Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Mon, 5 Aug 2024 15:42:57 +0200
Subject: [PATCH 007/281] fea: stockBought add form and formDetail

---
 src/components/VnTable/VnTable.vue            |  14 +-
 src/components/common/VnInputDate.vue         |   2 +-
 src/components/common/VnInputTime.vue         |   2 +-
 src/i18n/locale/en.yml                        |   1 +
 src/pages/Entry/EntryStockBought.vue          | 142 ++++++++++++++++++
 src/pages/Entry/EntryStockBoughtDetail.vue    | 102 +++++++++++++
 src/pages/Route/RouteList.vue                 |   3 +-
 src/router/modules/entry.js                   |  11 +-
 .../integration/entry/stockBought.spec.js     |  36 +++++
 9 files changed, 302 insertions(+), 11 deletions(-)
 create mode 100644 src/pages/Entry/EntryStockBought.vue
 create mode 100644 src/pages/Entry/EntryStockBoughtDetail.vue
 create mode 100644 test/cypress/integration/entry/stockBought.spec.js

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 4e40c0ba6..8a20023f2 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -107,7 +107,7 @@ const orders = ref(parseOrder(routeQuery.filter?.order));
 const CrudModelRef = ref({});
 const showForm = ref(false);
 const splittedColumns = ref({ columns: [] });
-const columnsVisibilitySkiped = ref();
+const columnsVisibilitySkipped = ref();
 const tableModes = [
     {
         icon: 'view_column',
@@ -133,7 +133,7 @@ onMounted(() => {
             ? CARD_MODE
             : $props.defaultMode;
     stateStore.rightDrawer = true;
-    columnsVisibilitySkiped.value = [
+    columnsVisibilitySkipped.value = [
         ...splittedColumns.value.columns
             .filter((c) => c.visible == false)
             .map((c) => c.name),
@@ -325,11 +325,11 @@ defineExpose({
     <div class="q-px-md">
         <CrudModel
             v-bind="$attrs"
-            :limit="20"
+            :limit="$attrs.limit ?? 20"
             ref="CrudModelRef"
             @on-fetch="(...args) => emit('onFetch', ...args)"
             :search-url="searchUrl"
-            :disable-infinite-scroll="isTableMode"
+            :disable-infinite-scroll="$attrs['disable-infinite-scroll'] ?? isTableMode"
             @save-changes="reload"
             :has-sub-toolbar="$attrs['hasSubToolbar'] ?? isEditable"
             :auto-load="hasParams || $attrs['auto-load']"
@@ -351,9 +351,8 @@ defineExpose({
                     :grid="!isTableMode"
                     table-header-class="bg-header"
                     card-container-class="grid-three"
-                    flat
                     :style="isTableMode && `max-height: ${tableHeight}`"
-                    virtual-scroll
+                    :virtual-scroll="!isTableMode"
                     @virtual-scroll="
                         (event) =>
                             event.index > rows.length - 2 &&
@@ -361,6 +360,7 @@ defineExpose({
                     "
                     @row-click="(_, row) => rowClickFunction && rowClickFunction(row)"
                     @update:selected="emit('update:selected', $event)"
+                    flat
                 >
                     <template #top-left v-if="!$props.withoutHeader">
                         <slot name="top-left"></slot>
@@ -370,7 +370,7 @@ defineExpose({
                             v-if="isTableMode"
                             v-model="splittedColumns.columns"
                             :table-code="tableCode ?? route.name"
-                            :skip="columnsVisibilitySkiped"
+                            :skip="columnsVisibilitySkipped"
                         />
                         <QBtnToggle
                             v-model="mode"
diff --git a/src/components/common/VnInputDate.vue b/src/components/common/VnInputDate.vue
index 6e57a8a53..76eee86fc 100644
--- a/src/components/common/VnInputDate.vue
+++ b/src/components/common/VnInputDate.vue
@@ -45,7 +45,7 @@ const formattedDate = computed({
         if (value) {
             // parse input
             if (value.includes('/')) {
-                if (value.length == 6) value = value + new Date().getFullYear();
+                if (value.length == 6) value = value + Date.vnNew().getFullYear();
                 if (value.length >= 10) {
                     if (value.at(2) == '/') value = value.split('/').reverse().join('/');
                     value = date.formatDate(
diff --git a/src/components/common/VnInputTime.vue b/src/components/common/VnInputTime.vue
index a59f0e9e8..2c387bf0b 100644
--- a/src/components/common/VnInputTime.vue
+++ b/src/components/common/VnInputTime.vue
@@ -62,7 +62,7 @@ const formattedTime = computed({
 function dateToTime(newDate) {
     return date.formatDate(new Date(newDate), dateFormat);
 }
-const timeField = ref();
+
 watch(
     () => model.value,
     (val) => (formattedTime.value = val),
diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 78c1fa18d..867f338e4 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -142,6 +142,7 @@ globals:
         dms: File management
         entryCreate: New entry
         latestBuys: Latest buys
+        reserves: Reserves
         tickets: Tickets
         ticketCreate: New Tickets
         boxing: Boxing
diff --git a/src/pages/Entry/EntryStockBought.vue b/src/pages/Entry/EntryStockBought.vue
new file mode 100644
index 000000000..5277cc5e1
--- /dev/null
+++ b/src/pages/Entry/EntryStockBought.vue
@@ -0,0 +1,142 @@
+<script setup>
+import { ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useState } from 'src/composables/useState';
+import { useQuasar } from 'quasar';
+
+import VnTable from 'components/VnTable/VnTable.vue';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
+import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
+import EntryStockBoughtDetail from 'src/pages/Entry/EntryStockBoughtDetail.vue';
+
+const { t } = useI18n();
+const quasar = useQuasar();
+const tableRef = ref();
+const state = useState();
+const user = state.getUser();
+const columns = [
+    {
+        align: 'left',
+        label: 'Id',
+        name: 'id',
+        isTitle: true,
+        isId: true,
+        columnFilter: false,
+        visible: false,
+    },
+    {
+        align: 'left',
+        name: 'workerFk',
+        label: t('Buyer'),
+        columnFilter: false,
+    },
+    {
+        align: 'left',
+        label: t('Reserve'),
+        name: 'reserve',
+        columnFilter: false,
+        create: true,
+        component: 'number',
+    },
+    {
+        align: 'left',
+        name: 'workerFk',
+        label: t('Buyer'),
+        component: 'select',
+        create: true,
+        visible: false,
+        columnFilter: false,
+        attrs: {
+            url: 'Workers/activeWithInheritedRole',
+            fields: ['id', 'name'],
+            where: { role: 'buyer' },
+            optionFilter: 'firstName',
+            optionLabel: 'name',
+            optionValue: 'id',
+            useLike: false,
+        },
+    },
+    {
+        align: 'left',
+        label: t('Bought'),
+        name: 'bought',
+        columnFilter: false,
+    },
+    {
+        align: 'left',
+        label: t('Date'),
+        name: 'dated',
+        component: 'date',
+        visible: false,
+        create: true,
+    },
+    {
+        align: 'left',
+        name: 'tableActions',
+        actions: [
+            {
+                title: t('More'),
+                icon: 'search',
+                isPrimary: true,
+                action: (row) => {
+                    console.log('workerFk: ', row.workerFk);
+                    quasar.dialog({
+                        component: EntryStockBoughtDetail,
+                        componentProps: {
+                            workerFk: row.workerFk,
+                            dated: row.dated,
+                        },
+                        maximized: true,
+                    });
+                },
+            },
+        ],
+    },
+];
+</script>
+<template>
+    <VnSubToolbar />
+    <VnTable
+        ref="tableRef"
+        data-key="StockBoughts"
+        url="StockBoughts/getStockBought"
+        save-url="StockBoughts/crud"
+        order="reserve DESC"
+        :is-editable="true"
+        :disable-option="{ card: true }"
+        :create="{
+            urlCreate: 'StockBoughts',
+            title: t('Reserve some space'),
+            onDataSaved: () => tableRef.reload(),
+            formInitialData: {
+                workerFk: user.id,
+                dated: Date.now(),
+            },
+        }"
+        :columns="columns"
+    >
+        <template #column-workerFk="{ row }">
+            <span class="link" @click.stop>
+                {{ row?.worker?.user?.name }}
+                <WorkerDescriptorProxy :id="row?.workerFk" />
+            </span>
+        </template>
+    </VnTable>
+</template>
+<i18n>
+    en:
+        Buyer: Buyer
+        Reserve: Reserve
+        Bought: Bought
+        More: More
+        Date: Date
+        This buyer has already made a reservation for this date: This buyer has already made a reservation for this date
+    es:
+        Buyer: Comprador
+        Reserve: Reservado
+        Bought: Comprado
+        More: Más
+        Date: Fecha
+        Reserve some space: Reservar espacio
+        This buyer has already made a reservation for this date: Este comprador ya ha hecho una reserva para esta fecha
+</i18n>
diff --git a/src/pages/Entry/EntryStockBoughtDetail.vue b/src/pages/Entry/EntryStockBoughtDetail.vue
new file mode 100644
index 000000000..908f5dd20
--- /dev/null
+++ b/src/pages/Entry/EntryStockBoughtDetail.vue
@@ -0,0 +1,102 @@
+<script setup>
+import { ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import VnTable from 'components/VnTable/VnTable.vue';
+import EntryDescriptorProxy from 'src/pages/Entry/Card/EntryDescriptorProxy.vue';
+import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
+
+const { t } = useI18n();
+const tableRef = ref();
+const $props = defineProps({
+    workerFk: {
+        type: Number,
+        required: true,
+    },
+    dated: {
+        type: String,
+        required: true,
+    },
+});
+console.log('$props: ', $props.workerFk, $props.dated);
+const customUrl = `StockBoughts/getStockBoughtDetail?workerFk=${$props.workerFk}`;
+const columns = [
+    {
+        align: 'left',
+        label: 'Entry',
+        name: 'entryFk',
+        isTitle: true,
+        isId: true,
+        columnFilter: false,
+    },
+    {
+        align: 'left',
+        name: 'itemFk',
+        label: t('Item'),
+        columnFilter: false,
+    },
+    {
+        align: 'left',
+        label: t('Name'),
+        name: 'itemName',
+        columnFilter: false,
+        create: true,
+        columnClass: 'expand',
+    },
+    {
+        align: 'left',
+        name: 'volume',
+        label: t('Volume'),
+        columnFilter: false,
+    },
+    {
+        align: 'left',
+        label: t('Packaging'),
+        name: 'packagingFk',
+        columnFilter: false,
+    },
+    {
+        align: 'left',
+        label: 'Packing',
+        name: 'packing',
+        columnFilter: false,
+    },
+];
+</script>
+<template>
+    <QDialog>
+        <VnTable
+            ref="tableRef"
+            data-key="StockBoughtsDetail"
+            :url="customUrl"
+            order="itemName DESC"
+            :columns="columns"
+            :right-search="false"
+            :disable-infinite-scroll="true"
+            :disable-option="{ card: true }"
+            :limit="0"
+            auto-load
+        >
+            <template #column-entryFk="{ row }">
+                <span class="link" @click.stop>
+                    {{ row?.entryFk }}
+                    <EntryDescriptorProxy :id="row.entryFk" />
+                </span>
+            </template>
+            <template #column-itemName="{ row }">
+                <span class="link" @click.stop>
+                    {{ row?.itemName }}
+                    <ItemDescriptorProxy :id="row.itemFk" />
+                </span>
+            </template>
+        </VnTable>
+    </QDialog>
+</template>
+<i18n>
+    es:
+        Buyer: Comprador
+        Reserve: Reservado
+        Bought: Comprado
+        More: Más
+        Date: Fecha
+</i18n>
diff --git a/src/pages/Route/RouteList.vue b/src/pages/Route/RouteList.vue
index b13e8cacd..7d5dd5c68 100644
--- a/src/pages/Route/RouteList.vue
+++ b/src/pages/Route/RouteList.vue
@@ -139,7 +139,7 @@ const columns = computed(() => [
     {
         align: 'center',
         name: 'm3',
-        label: 'volume',
+        label: t('Volume'),
         cardVisible: true,
     },
     {
@@ -379,4 +379,5 @@ es:
     Route is not served: La ruta no está servida
     hourStarted: Hora de inicio
     hourFinished: Hora de fin
+    Volume: Volumen
 </i18n>
diff --git a/src/router/modules/entry.js b/src/router/modules/entry.js
index 0d38ed626..fd5490fbd 100644
--- a/src/router/modules/entry.js
+++ b/src/router/modules/entry.js
@@ -11,7 +11,7 @@ export default {
     component: RouterView,
     redirect: { name: 'EntryMain' },
     menus: {
-        main: ['EntryList', 'MyEntries', 'EntryLatestBuys'],
+        main: ['EntryList', 'MyEntries', 'EntryLatestBuys', 'EntryStockBought'],
         card: ['EntryBasicData', 'EntryBuys', 'EntryNotes', 'EntryDms', 'EntryLog'],
     },
     children: [
@@ -57,6 +57,15 @@ export default {
                     },
                     component: () => import('src/pages/Entry/EntryLatestBuys.vue'),
                 },
+                {
+                    path: 'stock-Bought',
+                    name: 'EntryStockBought',
+                    meta: {
+                        title: 'reserves',
+                        icon: 'deployed_code_history',
+                    },
+                    component: () => import('src/pages/Entry/EntryStockBought.vue'),
+                },
             ],
         },
         {
diff --git a/test/cypress/integration/entry/stockBought.spec.js b/test/cypress/integration/entry/stockBought.spec.js
new file mode 100644
index 000000000..8e4fe225c
--- /dev/null
+++ b/test/cypress/integration/entry/stockBought.spec.js
@@ -0,0 +1,36 @@
+describe('EntryStockBought', () => {
+    const reserveField = 'input[name="reserve"]';
+    beforeEach(() => {
+        cy.viewport(1920, 1080);
+        cy.login('buyer');
+        cy.visit(
+            `/#/entry/stock-Bought?table={"filter":"{}","dated":"2000-12-31T23:00:00.000Z"}`
+        );
+    });
+    it('Should edit the reserved space', () => {
+        cy.get('tBody > tr').its('length').should('eq', 1);
+        cy.get(reserveField).type('10{enter}');
+        cy.get('button[title="Save"]').click();
+        cy.get('.q-notification__message').should('have.text', 'Data saved');
+    });
+    it('Should add a new reserved space for buyerBoss', () => {
+        cy.get('.q-page-sticky > div > .q-btn > .q-btn__content > .q-icon').click();
+        cy.get('input[aria-label="Reserve"]').type('1');
+        cy.get('input[aria-label="Date"]').eq(1).clear();
+        cy.get('input[aria-label="Date"]').eq(1).type('01-01');
+        cy.get('input[aria-label="Buyer"]').type('buyerboss{downarrow}{enter}');
+        cy.get('.q-notification__message').should('have.text', 'Data created');
+        cy.get('tBody > tr').its('length').should('eq', 2);
+    });
+    it('Should check detail for the buyer', () => {
+        cy.get(':nth-child(1) > .sticky > .q-btn > .q-btn__content > .q-icon').click();
+        cy.get('tBody > tr').eq(1).its('length').should('eq', 1);
+    });
+    it('Should check detail for the buyerBoss and had no content', () => {
+        cy.get(':nth-child(2) > .sticky > .q-btn > .q-btn__content > .q-icon').click();
+        cy.get('.q-table__bottom.row.items-center.q-table__bottom--nodata').should(
+            'have.text',
+            'warningNo data available'
+        );
+    });
+});

From de94b3629e6470ba0f8ba9f6b3fad807c6ec01ab Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Mon, 5 Aug 2024 15:44:37 +0200
Subject: [PATCH 008/281] fix: remove console.log

---
 src/pages/Entry/EntryStockBought.vue       | 1 -
 src/pages/Entry/EntryStockBoughtDetail.vue | 1 -
 2 files changed, 2 deletions(-)

diff --git a/src/pages/Entry/EntryStockBought.vue b/src/pages/Entry/EntryStockBought.vue
index 5277cc5e1..e0063bb62 100644
--- a/src/pages/Entry/EntryStockBought.vue
+++ b/src/pages/Entry/EntryStockBought.vue
@@ -79,7 +79,6 @@ const columns = [
                 icon: 'search',
                 isPrimary: true,
                 action: (row) => {
-                    console.log('workerFk: ', row.workerFk);
                     quasar.dialog({
                         component: EntryStockBoughtDetail,
                         componentProps: {
diff --git a/src/pages/Entry/EntryStockBoughtDetail.vue b/src/pages/Entry/EntryStockBoughtDetail.vue
index 908f5dd20..f7e89c691 100644
--- a/src/pages/Entry/EntryStockBoughtDetail.vue
+++ b/src/pages/Entry/EntryStockBoughtDetail.vue
@@ -18,7 +18,6 @@ const $props = defineProps({
         required: true,
     },
 });
-console.log('$props: ', $props.workerFk, $props.dated);
 const customUrl = `StockBoughts/getStockBoughtDetail?workerFk=${$props.workerFk}`;
 const columns = [
     {

From ffd7d98e9cc25cf218b2c577d0c7ef98df7cf59b Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Tue, 13 Aug 2024 17:56:07 +0200
Subject: [PATCH 009/281] feat: travel m3

---
 src/components/VnTable/VnTable.vue         | 20 +++++++++++
 src/pages/Entry/EntryStockBought.vue       | 39 +++++++++++++++++++++-
 src/pages/Entry/EntryStockBoughtDetail.vue |  2 +-
 src/pages/Travel/Card/TravelBasicData.vue  |  3 ++
 4 files changed, 62 insertions(+), 2 deletions(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 8a20023f2..dbe5d1622 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -15,6 +15,7 @@ import VnTableChip from 'components/VnTable/VnChip.vue';
 import VnVisibleColumn from 'src/components/VnTable/VnVisibleColumn.vue';
 import VnLv from 'components/ui/VnLv.vue';
 import VnTableOrder from 'src/components/VnTable/VnOrder.vue';
+import item from 'src/router/modules/item';
 
 const $props = defineProps({
     columns: {
@@ -609,6 +610,25 @@ defineExpose({
                             </QCard>
                         </component>
                     </template>
+                    <template #bottom-row="{ cols }">
+                        <QTr>
+                            <QTh
+                                v-for="col of cols.filter((cols) => cols.visible ?? true)"
+                                :key="col.id"
+                                class="text-center"
+                            >
+                                <span v-if="col.summation">
+                                    {{
+                                        rows.reduce(
+                                            (sum, currentRow) =>
+                                                sum + currentRow[col.name],
+                                            0
+                                        )
+                                    }}
+                                </span>
+                            </QTh>
+                        </QTr>
+                    </template>
                 </QTable>
             </template>
         </CrudModel>
diff --git a/src/pages/Entry/EntryStockBought.vue b/src/pages/Entry/EntryStockBought.vue
index e0063bb62..12fc96214 100644
--- a/src/pages/Entry/EntryStockBought.vue
+++ b/src/pages/Entry/EntryStockBought.vue
@@ -5,6 +5,10 @@ import { useState } from 'src/composables/useState';
 import { useQuasar } from 'quasar';
 
 import VnTable from 'components/VnTable/VnTable.vue';
+import VnRow from 'src/components/ui/VnRow.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import VnLv from 'src/components/ui/VnLv.vue';
+import FetchData from 'src/components/FetchData.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
 import EntryStockBoughtDetail from 'src/pages/Entry/EntryStockBoughtDetail.vue';
@@ -37,6 +41,7 @@ const columns = [
         columnFilter: false,
         create: true,
         component: 'number',
+        summation: true,
     },
     {
         align: 'left',
@@ -61,6 +66,7 @@ const columns = [
         label: t('Bought'),
         name: 'bought',
         columnFilter: false,
+        summation: true,
     },
     {
         align: 'left',
@@ -92,6 +98,21 @@ const columns = [
         ],
     },
 ];
+function getFilter(dated = Date.vnNow()) {
+    console.log('dated: ', new Date(dated * 1000));
+    return {
+        fields: ['id', 'm3'],
+        where: { dated },
+        include: [
+            {
+                relation: 'warehouseIn',
+                where: { code: 'vnh' },
+            },
+        ],
+    };
+}
+const travel = ref();
+const fetchDataRef = ref();
 </script>
 <template>
     <VnSubToolbar />
@@ -109,11 +130,27 @@ const columns = [
             onDataSaved: () => tableRef.reload(),
             formInitialData: {
                 workerFk: user.id,
-                dated: Date.now(),
+                dated: Date.vnNow(),
             },
         }"
         :columns="columns"
+        auto-load
+        @on-fetch="() => fetchDataRef.fetch()"
     >
+        <template #moreFilterPanel="{ params }">
+            <FetchData
+                ref="fetchDataRef"
+                url="Travels"
+                limit="1"
+                auto-load
+                :filter="getFilter(params?.date)"
+                @on-fetch="(data) => (travel = data)"
+            />
+            <VnRow class="q-pa-md" style="align-items: center" v-if="travel?.length">
+                <span>{{ t('Booked trucks: ') + travel[0]?.m3 }}</span>
+                <QBtn style="max-width: 20%" flat icon="edit" />
+            </VnRow>
+        </template>
         <template #column-workerFk="{ row }">
             <span class="link" @click.stop>
                 {{ row?.worker?.user?.name }}
diff --git a/src/pages/Entry/EntryStockBoughtDetail.vue b/src/pages/Entry/EntryStockBoughtDetail.vue
index f7e89c691..9212f1115 100644
--- a/src/pages/Entry/EntryStockBoughtDetail.vue
+++ b/src/pages/Entry/EntryStockBoughtDetail.vue
@@ -38,9 +38,9 @@ const columns = [
         align: 'left',
         label: t('Name'),
         name: 'itemName',
-        columnFilter: false,
         create: true,
         columnClass: 'expand',
+        columnFilter: false,
     },
     {
         align: 'left',
diff --git a/src/pages/Travel/Card/TravelBasicData.vue b/src/pages/Travel/Card/TravelBasicData.vue
index 8a369a0dd..a3620a6ba 100644
--- a/src/pages/Travel/Card/TravelBasicData.vue
+++ b/src/pages/Travel/Card/TravelBasicData.vue
@@ -70,6 +70,9 @@ const agenciesOptions = ref([]);
                     hide-selected
                 />
             </VnRow>
+            <VnRow>
+                <VnInput v-model="data.m3" label="m3" />
+            </VnRow>
             <VnRow>
                 <QCheckbox
                     :label="t('travel.basicData.delivered')"

From 92130b4c9c770c6cc49e1253885f7837bcba29cf Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 14 Aug 2024 08:09:27 +0200
Subject: [PATCH 010/281] WIP: 59262019 Merge pull request '#7283 finish item
 card sections' (!588) from 7283-itemSectionsMigration into dev

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

diff --git a/src/components/common/VnLocation.vue b/src/components/common/VnLocation.vue
index 4d429a995..8256ec5b0 100644
--- a/src/components/common/VnLocation.vue
+++ b/src/components/common/VnLocation.vue
@@ -1,124 +1,39 @@
 <script setup>
-import { ref, toRefs, computed, watch, onMounted } from 'vue';
 import CreateNewPostcode from 'src/components/CreateNewPostcodeForm.vue';
 import VnSelectDialog from 'components/common/VnSelectDialog.vue';
-import FetchData from 'components/FetchData.vue';
-const emit = defineEmits(['update:modelValue', 'update:options']);
 import { useI18n } from 'vue-i18n';
-import { useArrayData } from 'src/composables/useArrayData';
 
 const { t } = useI18n();
-const postcodesOptions = ref([]);
-const postcodesRef = 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 { options } = toRefs($props);
-const myOptions = ref([]);
-const myOptionsOriginal = ref([]);
-
-const value = computed({
-    get() {
-        return $props.modelValue;
-    },
-    set(value) {
-        emit(
-            'update:modelValue',
-            postcodesOptions.value.find((p) => p.code === value)
-        );
-    },
-});
-
-onMounted(() => {
-    locationFilter($props.modelValue);
-});
-
-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);
-});
+const value = defineModel({ type: [String, Number, Object] });
 
 function showLabel(data) {
     return `${data.code} - ${data.town}(${data.province}), ${data.country}`;
 }
-
-function locationFilter(search = '') {
-    if (
-        search &&
-        (search.includes('undefined') || search.startsWith(`${$props.modelValue} - `))
-    )
-        return;
-    let where = { search };
-    postcodesRef.value.fetch({ filter: { where }, limit: 30 });
-}
-
-function handleFetch(data) {
-    postcodesOptions.value = data;
-}
-function onDataSaved(newPostcode) {
-    postcodesOptions.value.push(newPostcode);
-    value.value = newPostcode.code;
-}
 </script>
 <template>
     <VnSelectDialog
-        v-if="postcodesRef"
-        :option-label="(opt) => showLabel(opt) ?? 'code'"
-        :option-value="(opt) => opt.code"
         v-model="value"
-        :options="postcodesOptions"
+        option-value="code"
+        option-filter-value="search"
+        :option-label="(opt) => showLabel(opt)"
+        url="Postcodes/filter"
+        :use-like="false"
         :label="t('Location')"
-        @update:model-value="handleInput"
         :placeholder="t('search_by_postalcode')"
-        @input-value="locationFilter"
-        :default-filter="false"
         :input-debounce="300"
         :class="{ required: $attrs.required }"
         v-bind="$attrs"
         clearable
+        :emit-value="false"
     >
         <template #form>
-            <CreateNewPostcode @on-data-saved="onDataSaved" />
+            <CreateNewPostcode @on-data-saved="(newValue) => (value = newValue)" />
         </template>
         <template #option="{ itemProps, opt }">
             <QItem v-bind="itemProps">
                 <QItemSection v-if="opt.code">
                     <QItemLabel>{{ opt.code }}</QItemLabel>
-                    <QItemLabel caption>{{ opt.label }}</QItemLabel>
+                    <QItemLabel caption>{{ showLabel(opt) }}</QItemLabel>
                 </QItemSection>
             </QItem>
         </template>

From 55b9cd9ff44f29fb95da4958c29d18ea1ae4207d Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 14 Aug 2024 09:18:24 +0200
Subject: [PATCH 011/281] feat: handle same multiple CP

---
 src/components/common/VnLocation.vue          | 24 ++++++++++++-----
 src/i18n/locale/en.yml                        |  1 +
 src/i18n/locale/es.yml                        |  1 +
 src/pages/Customer/Card/CustomerAddress.vue   | 26 ++++++-------------
 .../Customer/Card/CustomerFiscalData.vue      |  2 +-
 src/pages/Customer/CustomerCreate.vue         |  1 -
 src/pages/Customer/CustomerList.vue           |  1 -
 .../components/CustomerAddressCreate.vue      |  1 -
 .../components/CustomerAddressEdit.vue        |  7 ++++-
 src/pages/Supplier/Card/SupplierAddresses.vue |  8 +++++-
 .../Supplier/Card/SupplierAddressesCreate.vue | 12 ++++++++-
 .../Supplier/Card/SupplierFiscalData.vue      | 24 ++++++++++++++++-
 src/pages/Worker/WorkerCreate.vue             |  1 -
 src/pages/Worker/WorkerList.vue               |  1 -
 src/router/modules/customer.js                |  2 +-
 15 files changed, 77 insertions(+), 35 deletions(-)

diff --git a/src/components/common/VnLocation.vue b/src/components/common/VnLocation.vue
index 8256ec5b0..778932be3 100644
--- a/src/components/common/VnLocation.vue
+++ b/src/components/common/VnLocation.vue
@@ -2,20 +2,32 @@
 import CreateNewPostcode from 'src/components/CreateNewPostcodeForm.vue';
 import VnSelectDialog from 'components/common/VnSelectDialog.vue';
 import { useI18n } from 'vue-i18n';
-
+import { ref } from 'vue';
 const { t } = useI18n();
-const value = defineModel({ type: [String, Number, Object] });
 
+const props = defineProps({
+    location: {
+        type: Object,
+        default: null,
+    },
+});
+const modelValue = ref(
+    props.location
+        ? `${props.location?.postcode} - ${props.location?.city}(${props.location?.province?.name}), ${props.location?.country?.name}`
+        : null
+);
 function showLabel(data) {
     return `${data.code} - ${data.town}(${data.province}), ${data.country}`;
 }
 </script>
 <template>
+    {{ modelValue }}
     <VnSelectDialog
-        v-model="value"
-        option-value="code"
+        v-model="modelValue"
         option-filter-value="search"
-        :option-label="(opt) => showLabel(opt)"
+        :option-label="
+            (opt) => (typeof modelValue === 'string' ? modelValue : showLabel(opt))
+        "
         url="Postcodes/filter"
         :use-like="false"
         :label="t('Location')"
@@ -27,7 +39,7 @@ function showLabel(data) {
         :emit-value="false"
     >
         <template #form>
-            <CreateNewPostcode @on-data-saved="(newValue) => (value = newValue)" />
+            <CreateNewPostcode @on-data-saved="(newValue) => (modelValue = newValue)" />
         </template>
         <template #option="{ itemProps, opt }">
             <QItem v-bind="itemProps">
diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index ee53da80c..f61dda8a4 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -95,6 +95,7 @@ globals:
     to: To
     pageTitles:
         logIn: Login
+        addressEdit: Update address
         summary: Summary
         basicData: Basic data
         log: Logs
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 86963f3dc..4e71a69fb 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -95,6 +95,7 @@ globals:
     to: Hasta
     pageTitles:
         logIn: Inicio de sesión
+        addressEdit: Modificar consignatario
         summary: Resumen
         basicData: Datos básicos
         log: Historial
diff --git a/src/pages/Customer/Card/CustomerAddress.vue b/src/pages/Customer/Card/CustomerAddress.vue
index 6c8279d84..a97b45a50 100644
--- a/src/pages/Customer/Card/CustomerAddress.vue
+++ b/src/pages/Customer/Card/CustomerAddress.vue
@@ -5,15 +5,12 @@ import { useRoute, useRouter } from 'vue-router';
 
 import axios from 'axios';
 
-import FetchData from 'components/FetchData.vue';
-
 const { t } = useI18n();
 const route = useRoute();
 const router = useRouter();
 
 const addresses = ref([]);
 const client = ref(null);
-const provincesLocation = ref([]);
 
 const addressFilter = {
     fields: [
@@ -41,7 +38,13 @@ const addressFilter = {
         {
             relation: 'province',
             scope: {
-                fields: ['id', 'name'],
+                fields: ['id', 'name', 'countryFk'],
+                include: [
+                    {
+                        relation: 'country',
+                        scope: { fields: ['id', 'name'] },
+                    },
+                ],
             },
         },
     ],
@@ -83,13 +86,6 @@ const getClientData = async (id) => {
     }
 };
 
-const setProvince = (provinceFk) => {
-    const result = provincesLocation.value.filter(
-        (province) => province.id === provinceFk
-    );
-    return result[0]?.name || '';
-};
-
 const isDefaultAddress = (address) => {
     return client?.value?.defaultAddressFk === address.id ? 1 : 0;
 };
@@ -128,12 +124,6 @@ const toCustomerAddressEdit = (addressId) => {
 </script>
 
 <template>
-    <FetchData
-        @on-fetch="(data) => (provincesLocation = data)"
-        auto-load
-        url="Provinces/location"
-    />
-
     <div class="full-width flex justify-center">
         <QCard class="card-width q-pa-lg" v-if="addresses.length">
             <QCardSection>
@@ -177,7 +167,7 @@ const toCustomerAddressEdit = (addressId) => {
                         <div>{{ item.street }}</div>
                         <div>
                             {{ item.postalCode }} - {{ item.city }},
-                            {{ setProvince(item.provinceFk) }}
+                            {{ item.province.name }}
                         </div>
                         <div class="flex">
                             <QCheckbox
diff --git a/src/pages/Customer/Card/CustomerFiscalData.vue b/src/pages/Customer/Card/CustomerFiscalData.vue
index 5cc656bb3..54b8adb70 100644
--- a/src/pages/Customer/Card/CustomerFiscalData.vue
+++ b/src/pages/Customer/Card/CustomerFiscalData.vue
@@ -94,7 +94,7 @@ function handleLocation(data, location) {
                 <VnLocation
                     :rules="validate('Worker.postcode')"
                     :roles-allowed-to-create="['deliveryAssistant']"
-                    v-model="data.postcode"
+                    :location="data"
                     @update:model-value="(location) => handleLocation(data, location)"
                 />
             </VnRow>
diff --git a/src/pages/Customer/CustomerCreate.vue b/src/pages/Customer/CustomerCreate.vue
index 041c92d17..193ed59c9 100644
--- a/src/pages/Customer/CustomerCreate.vue
+++ b/src/pages/Customer/CustomerCreate.vue
@@ -87,7 +87,6 @@ function handleLocation(data, location) {
                     <VnLocation
                         :rules="validate('Worker.postcode')"
                         :roles-allowed-to-create="['deliveryAssistant']"
-                        v-model="data.location"
                         @update:model-value="(location) => handleLocation(data, location)"
                     >
                     </VnLocation>
diff --git a/src/pages/Customer/CustomerList.vue b/src/pages/Customer/CustomerList.vue
index 82ad559ad..1dc0dab43 100644
--- a/src/pages/Customer/CustomerList.vue
+++ b/src/pages/Customer/CustomerList.vue
@@ -413,7 +413,6 @@ function handleLocation(data, location) {
         <template #more-create-dialog="{ data }">
             <VnLocation
                 :roles-allowed-to-create="['deliveryAssistant']"
-                v-model="data.location"
                 @update:model-value="(location) => handleLocation(data, location)"
             />
             <QInput v-model="data.userName" :label="t('Web user')" />
diff --git a/src/pages/Customer/components/CustomerAddressCreate.vue b/src/pages/Customer/components/CustomerAddressCreate.vue
index 30e4b21d0..e37306a94 100644
--- a/src/pages/Customer/components/CustomerAddressCreate.vue
+++ b/src/pages/Customer/components/CustomerAddressCreate.vue
@@ -93,7 +93,6 @@ function handleLocation(data, location) {
             <VnLocation
                 :rules="validate('Worker.postcode')"
                 :roles-allowed-to-create="['deliveryAssistant']"
-                v-model="data.location"
                 @update:model-value="(location) => handleLocation(data, location)"
             />
 
diff --git a/src/pages/Customer/components/CustomerAddressEdit.vue b/src/pages/Customer/components/CustomerAddressEdit.vue
index 7a4c44014..133d2fabc 100644
--- a/src/pages/Customer/components/CustomerAddressEdit.vue
+++ b/src/pages/Customer/components/CustomerAddressEdit.vue
@@ -177,7 +177,12 @@ function handleLocation(data, location) {
                     <VnLocation
                         :rules="validate('Worker.postcode')"
                         :roles-allowed-to-create="['deliveryAssistant']"
-                        v-model="data.postalCode"
+                        :location="{
+                            postcode: data.postalCode,
+                            city: data.city,
+                            province: data.province,
+                            country: data.province.country,
+                        }"
                         @update:model-value="(location) => handleLocation(data, location)"
                     ></VnLocation>
                 </div>
diff --git a/src/pages/Supplier/Card/SupplierAddresses.vue b/src/pages/Supplier/Card/SupplierAddresses.vue
index 735b50625..4b2174d0b 100644
--- a/src/pages/Supplier/Card/SupplierAddresses.vue
+++ b/src/pages/Supplier/Card/SupplierAddresses.vue
@@ -26,7 +26,13 @@ const addressesFilter = {
         {
             relation: 'province',
             scope: {
-                fields: ['id', 'name'],
+                fields: ['id', 'name', 'countryFk'],
+                include: [
+                    {
+                        relation: 'country',
+                        scope: { fields: ['id', 'name'] },
+                    },
+                ],
             },
         },
     ],
diff --git a/src/pages/Supplier/Card/SupplierAddressesCreate.vue b/src/pages/Supplier/Card/SupplierAddressesCreate.vue
index da6549a24..df98b6091 100644
--- a/src/pages/Supplier/Card/SupplierAddressesCreate.vue
+++ b/src/pages/Supplier/Card/SupplierAddressesCreate.vue
@@ -21,6 +21,7 @@ const newAddressForm = reactive({
     provinceFk: null,
     phone: null,
     mobile: null,
+    province: null,
 });
 
 const onDataSaved = () => {
@@ -84,7 +85,16 @@ function handleLocation(data, location) {
                     <VnLocation
                         :rules="validate('Worker.postcode')"
                         :roles-allowed-to-create="['deliveryAssistant']"
-                        v-model="data.location"
+                        :location="
+                            data.postalCode
+                                ? {
+                                      postcode: data.postalCode,
+                                      city: data.city,
+                                      province: data.province,
+                                      country: data.province.country,
+                                  }
+                                : null
+                        "
                         @update:model-value="(location) => handleLocation(data, location)"
                     >
                     </VnLocation>
diff --git a/src/pages/Supplier/Card/SupplierFiscalData.vue b/src/pages/Supplier/Card/SupplierFiscalData.vue
index c638abbdc..c2cb42c6a 100644
--- a/src/pages/Supplier/Card/SupplierFiscalData.vue
+++ b/src/pages/Supplier/Card/SupplierFiscalData.vue
@@ -51,6 +51,23 @@ function handleLocation(data, location) {
         :url="`Suppliers/${route.params.id}`"
         :url-update="`Suppliers/${route.params.id}/updateFiscalData`"
         model="supplier"
+        :filter="{
+            fields: ['id', 'name', 'city', 'postCode', 'countryFk', 'provinceFk'],
+            include: [
+                {
+                    relation: 'province',
+                    scope: {
+                        fields: ['id', 'name'],
+                    },
+                },
+                {
+                    relation: 'country',
+                    scope: {
+                        fields: ['id', 'name'],
+                    },
+                },
+            ],
+        }"
         auto-load
         :clear-store-on-unmount="false"
     >
@@ -130,7 +147,12 @@ function handleLocation(data, location) {
                 <VnLocation
                     :rules="validate('Worker.postcode')"
                     :roles-allowed-to-create="['deliveryAssistant']"
-                    v-model="data.postCode"
+                    :location="{
+                        postcode: data.postCode,
+                        city: data.city,
+                        province: data.province,
+                        country: data.country,
+                    }"
                     @update:model-value="(location) => handleLocation(data, location)"
                 >
                 </VnLocation>
diff --git a/src/pages/Worker/WorkerCreate.vue b/src/pages/Worker/WorkerCreate.vue
index a1ded2bfd..5f96c136d 100644
--- a/src/pages/Worker/WorkerCreate.vue
+++ b/src/pages/Worker/WorkerCreate.vue
@@ -172,7 +172,6 @@ onBeforeMount(async () => {
                     <VnLocation
                         :rules="validate('Worker.postcode')"
                         :roles-allowed-to-create="['deliveryAssistant']"
-                        v-model="data.location"
                         @update:model-value="(location) => handleLocation(data, location)"
                         :disable="formData.isFreelance"
                     >
diff --git a/src/pages/Worker/WorkerList.vue b/src/pages/Worker/WorkerList.vue
index 0c2656597..9d4c3acbf 100644
--- a/src/pages/Worker/WorkerList.vue
+++ b/src/pages/Worker/WorkerList.vue
@@ -223,7 +223,6 @@ function uppercaseStreetModel(data) {
                     <VnLocation
                         :roles-allowed-to-create="['deliveryAssistant']"
                         :options="postcodesOptions"
-                        v-model="data.location"
                         @update:model-value="(location) => handleLocation(data, location)"
                         :disable="data.isFreelance"
                     >
diff --git a/src/router/modules/customer.js b/src/router/modules/customer.js
index 684b83b0f..f364bd862 100644
--- a/src/router/modules/customer.js
+++ b/src/router/modules/customer.js
@@ -174,7 +174,7 @@ export default {
                                     path: 'edit',
                                     name: 'CustomerAddressEdit',
                                     meta: {
-                                        title: 'address-edit',
+                                        title: 'addressEdit',
                                     },
                                     component: () =>
                                         import(

From 8acd008f42e02a80f0c491394f41335705dc3b85 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 14 Aug 2024 09:47:27 +0200
Subject: [PATCH 012/281] feat: handle newValue

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

diff --git a/src/components/common/VnLocation.vue b/src/components/common/VnLocation.vue
index 778932be3..2fbe357ba 100644
--- a/src/components/common/VnLocation.vue
+++ b/src/components/common/VnLocation.vue
@@ -4,6 +4,7 @@ import VnSelectDialog from 'components/common/VnSelectDialog.vue';
 import { useI18n } from 'vue-i18n';
 import { ref } from 'vue';
 const { t } = useI18n();
+const emit = defineEmits(['update:model-value', 'update:options']);
 
 const props = defineProps({
     location: {
@@ -39,7 +40,14 @@ function showLabel(data) {
         :emit-value="false"
     >
         <template #form>
-            <CreateNewPostcode @on-data-saved="(newValue) => (modelValue = newValue)" />
+            <CreateNewPostcode
+                @on-data-saved="
+                    (newValue) => {
+                        modelValue = newValue;
+                        emit('update:model-value', newValue);
+                    }
+                "
+            />
         </template>
         <template #option="{ itemProps, opt }">
             <QItem v-bind="itemProps">

From 9eff6b56ea4f78fbc8938dbbf5d22f89a4cd843a Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 14 Aug 2024 09:48:59 +0200
Subject: [PATCH 013/281] fix: remove print variable

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

diff --git a/src/components/common/VnLocation.vue b/src/components/common/VnLocation.vue
index 2fbe357ba..e95d5a043 100644
--- a/src/components/common/VnLocation.vue
+++ b/src/components/common/VnLocation.vue
@@ -22,7 +22,6 @@ function showLabel(data) {
 }
 </script>
 <template>
-    {{ modelValue }}
     <VnSelectDialog
         v-model="modelValue"
         option-filter-value="search"

From 4a57c53c3da495a67b9849886b988eda54a06b11 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Mon, 19 Aug 2024 11:30:20 +0200
Subject: [PATCH 014/281] fix: refs #7553 & #7356 migration

---
 src/components/VnTable/VnTable.vue            |  21 +
 src/composables/useArrayData.js               |   2 +-
 src/i18n/locale/en.yml                        |   8 +-
 src/i18n/locale/es.yml                        |   6 +
 src/pages/Ticket/Card/TicketDescriptor.vue    |  21 +
 .../Ticket/Card/TicketDescriptorMenu.vue      | 107 ++++-
 src/pages/Ticket/Card/TicketSale.vue          |  92 ++--
 src/pages/Ticket/Card/TicketService.vue       |   2 +-
 src/pages/Ticket/Card/TicketSummary.vue       |  47 +-
 src/pages/Ticket/Card/TicketTracking.vue      |  12 +-
 src/pages/Ticket/Card/TicketVolume.vue        |  10 +-
 src/pages/Ticket/TicketAdvance.vue            | 414 ++++++------------
 src/pages/Ticket/TicketList.vue               | 296 +++++++++++++
 src/pages/Ticket/locale/en.yml                |  19 +
 src/pages/Ticket/locale/es.yml                |  19 +
 15 files changed, 730 insertions(+), 346 deletions(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 3344f53b4..1fc4947f0 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -49,6 +49,10 @@ const $props = defineProps({
         type: Object,
         default: null,
     },
+    bottom: {
+        type: Object,
+        default: null,
+    },
     cardClass: {
         type: String,
         default: 'flex-one',
@@ -388,6 +392,11 @@ defineExpose({
                             @click="stateStore.toggleRightDrawer()"
                         />
                     </template>
+                    <template #top>
+                        <div class="full-width-slot">
+                            <slot name="before-header" />
+                        </div>
+                    </template>
                     <template #header-cell="{ col }">
                         <QTh v-if="col.visible ?? true">
                             <div
@@ -482,6 +491,9 @@ defineExpose({
                             />
                         </QTd>
                     </template>
+                    <template #bottom v-if="bottom">
+                        <slot name="bottom-table" />
+                    </template>
                     <template #item="{ row, colsMap }">
                         <component
                             :is="$props.redirect ? 'router-link' : 'span'"
@@ -780,4 +792,13 @@ es:
     cursor: text;
     user-select: all;
 }
+
+.full-width-slot {
+    width: 100%;
+    display: flex;
+    text-align: center;
+    color: var(--vn-text-color);
+    margin-bottom: -1%;
+    background-color: var(--vn-header-color);
+}
 </style>
diff --git a/src/composables/useArrayData.js b/src/composables/useArrayData.js
index 50d620a34..651bcefb0 100644
--- a/src/composables/useArrayData.js
+++ b/src/composables/useArrayData.js
@@ -28,7 +28,7 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
             delete params.filter;
             store.userParams = { ...params, ...store.userParams };
             store.userFilter = { ...filter, ...store.userFilter };
-            if (filter.order) store.order = filter.order;
+            if (filter?.order) store.order = filter.order;
         }
     });
 
diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 6943252c9..a04b3af15 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -578,6 +578,8 @@ ticket:
         warehouse: Warehouse
         customerCard: Customer card
         alias: Alias
+        ticketList: Ticket List
+        newOrder: New Order
     boxing:
         expedition: Expedition
         item: Item
@@ -628,6 +630,11 @@ ticket:
         weight: Weight
         goTo: Go to
         summaryAmount: Summary
+        purchaseRequest: Purchase request
+        service: Service
+        description: Description
+        attender: Attender
+        ok: Ok
     create:
         client: Client
         address: Address
@@ -651,7 +658,6 @@ invoiceOut:
         client: Client
         company: Company
         customerCard: Customer card
-        ticketList: Ticket List
     summary:
         issued: Issued
         created: Created
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index f32562313..642017c8e 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -584,6 +584,8 @@ ticket:
         warehouse: Almacén
         customerCard: Ficha del cliente
         alias: Alias
+        ticketList: Listado de tickets
+        newOrder: Nuevo pedido
     boxing:
         expedition: Expedición
         item: Artículo
@@ -634,6 +636,10 @@ ticket:
         weight: Peso
         goTo: Ir a
         summaryAmount: Resumen
+        purchaseRequest: Petición de compra
+        service: Servicio
+        description: Descripción
+        attender: Comprador
     create:
         client: Cliente
         address: Dirección
diff --git a/src/pages/Ticket/Card/TicketDescriptor.vue b/src/pages/Ticket/Card/TicketDescriptor.vue
index f68c897db..e4a349f12 100644
--- a/src/pages/Ticket/Card/TicketDescriptor.vue
+++ b/src/pages/Ticket/Card/TicketDescriptor.vue
@@ -87,6 +87,11 @@ const filter = {
 };
 
 const data = ref(useCardDescription());
+
+function ticketFilter(ticket) {
+    console.log('ticket: ', ticket);
+    return JSON.stringify({ clientFk: ticket.clientFk });
+}
 </script>
 
 <template>
@@ -159,6 +164,22 @@ const data = ref(useCardDescription());
                 >
                     <QTooltip>{{ t('ticket.card.customerCard') }}</QTooltip>
                 </QBtn>
+                <QBtn
+                    size="md"
+                    icon="vn:ticket"
+                    color="primary"
+                    :to="{ name: 'TicketList', query: { table: ticketFilter(entity) } }"
+                >
+                    <QTooltip>{{ t('ticket.card.ticketList') }}</QTooltip>
+                </QBtn>
+                <QBtn
+                    size="md"
+                    icon="vn:basketadd"
+                    color="primary"
+                    :to="{ name: 'OrderList' }"
+                >
+                    <QTooltip>{{ t('ticket.card.newOrder') }}</QTooltip>
+                </QBtn>
             </QCardActions>
         </template>
     </CardDescriptor>
diff --git a/src/pages/Ticket/Card/TicketDescriptorMenu.vue b/src/pages/Ticket/Card/TicketDescriptorMenu.vue
index c7784bc2a..31f85582c 100644
--- a/src/pages/Ticket/Card/TicketDescriptorMenu.vue
+++ b/src/pages/Ticket/Card/TicketDescriptorMenu.vue
@@ -24,6 +24,7 @@ const { openReport, sendEmail } = usePrintService();
 
 const ticket = ref(props.ticket);
 const ticketId = currentRoute.value.params.id;
+const showWeightDialog = ref(false);
 const actions = {
     clone: async () => {
         const opts = { message: t('Ticket cloned'), type: 'positive' };
@@ -153,30 +154,66 @@ function openConfirmDialog(callback) {
         },
     });
 }
+
+function createPdfDialog() {
+    dialog({
+        component: VnConfirm,
+        componentProps: {
+            promise: createPdfInvoice,
+        },
+    });
+}
+
+async function createPdfInvoice() {
+    const { data } = await axios.get('invoiceOuts', {
+        params: {
+            filter: JSON.stringify({
+                where: { ref: ticket.value.refFk },
+            }),
+        },
+    });
+    const invoiceId = data[0].id;
+    const { response } = await axios.post(`InvoiceOuts/${invoiceId}/createPdf`);
+    if (!response) {
+        notify({
+            message: 'The invoice PDF document has been regenerated',
+            type: 'positive',
+        });
+    }
+}
+
+function setWeightToTicket(weight) {
+    console.log('weight: ', weight);
+    const { data } = axios.patch(`Tickets/${ticketId}`, {
+        weight: weight,
+    });
+    console.log('data: ', data);
+    if (data) window.location.reload();
+}
 </script>
 <template>
     <QItem v-ripple clickable>
         <QItemSection avatar>
             <QIcon name="picture_as_pdf" />
         </QItemSection>
-        <QItemSection>{{ t('Open Delivery Note...') }}</QItemSection>
+        <QItemSection>{{ t('Show Delivery Note...') }}</QItemSection>
         <QItemSection side>
             <QIcon name="keyboard_arrow_right" />
         </QItemSection>
         <QMenu anchor="top end" self="top start" auto-close bordered>
             <QList>
                 <QItem @click="openDeliveryNote('deliveryNote')" v-ripple clickable>
-                    <QItemSection>{{ t('With prices') }}</QItemSection>
+                    <QItemSection>{{ t('as PDF') }}</QItemSection>
                 </QItem>
                 <QItem @click="openDeliveryNote('withoutPrices')" v-ripple clickable>
-                    <QItemSection>{{ t('Without prices') }}</QItemSection>
+                    <QItemSection>{{ t('as PDF without prices') }}</QItemSection>
                 </QItem>
                 <QItem
                     @click="openDeliveryNote('deliveryNote', 'csv')"
                     v-ripple
                     clickable
                 >
-                    <QItemSection>{{ t('As CSV') }}</QItemSection>
+                    <QItemSection>{{ t('as CSV') }}</QItemSection>
                 </QItem>
             </QList>
         </QMenu>
@@ -196,21 +233,21 @@ function openConfirmDialog(callback) {
                     v-ripple
                     clickable
                 >
-                    <QItemSection>{{ t('With prices') }}</QItemSection>
+                    <QItemSection>{{ t('Send PDF') }}</QItemSection>
                 </QItem>
                 <QItem
                     @click="sendDeliveryNoteConfirmation('withoutPrices')"
                     v-ripple
                     clickable
                 >
-                    <QItemSection>{{ t('Without prices') }}</QItemSection>
+                    <QItemSection>{{ t('Send PDF to tablet') }}</QItemSection>
                 </QItem>
                 <QItem
                     @click="sendDeliveryNoteConfirmation('deliveryNote', 'csv')"
                     v-ripple
                     clickable
                 >
-                    <QItemSection>{{ t('As CSV') }}</QItemSection>
+                    <QItemSection>{{ t('Send CSV') }}</QItemSection>
                 </QItem>
             </QList>
         </QMenu>
@@ -219,7 +256,7 @@ function openConfirmDialog(callback) {
         <QItemSection avatar>
             <QIcon name="receipt" />
         </QItemSection>
-        <QItemSection>{{ t('Open Proforma Invoice') }}</QItemSection>
+        <QItemSection>{{ t('Show Proforma') }}</QItemSection>
     </QItem>
     <QItem v-ripple clickable>
         <QItemSection avatar>
@@ -235,24 +272,54 @@ function openConfirmDialog(callback) {
                     <QItemSection>{{ t('Pending payment') }}</QItemSection>
                 </QItem>
                 <QItem @click="showSmsDialog('minAmount')" v-ripple clickable>
-                    <QItemSection>{{ t('Minimum amount') }}</QItemSection>
+                    <QItemSection>{{ t('Minimum import') }}</QItemSection>
                 </QItem>
                 <QItem
                     @click="showSmsDialogWithChanges('orderChanges')"
                     v-ripple
                     clickable
                 >
-                    <QItemSection>{{ t('Order changes') }}</QItemSection>
+                    <QItemSection>{{ t('Notify changes') }}</QItemSection>
                 </QItem>
             </QList>
         </QMenu>
     </QItem>
+    <QItem @click="createPdfDialog()" v-ripple clickable>
+        <QItemSection avatar>
+            <QIcon name="picture_as_pdf" />
+        </QItemSection>
+        <QItemSection>{{ t('Regenerate PDF invoice') }}</QItemSection>
+    </QItem>
     <QItem @click="openConfirmDialog('clone')" v-ripple clickable>
         <QItemSection avatar>
             <QIcon name="content_copy" />
         </QItemSection>
         <QItemSection>{{ t('To clone ticket') }}</QItemSection>
     </QItem>
+    <QItem @click="showWeightDialog = !showWeightDialog" v-ripple clickable>
+        <QItemSection avatar>
+            <QIcon name="content_paste" />
+        </QItemSection>
+        <QItemSection>{{ t('Set ticket weight') }}</QItemSection>
+    </QItem>
+    <QDialog v-model="showWeightDialog" transition-show="scale" transition-hide="scale">
+        <QCard>
+            <QCardSection>
+                <QInput
+                    v-model="weight"
+                    type="number"
+                    :label="t('Weight')"
+                    @update:model-value="setWeightToTicket"
+                />
+                <QBtn flat v-close-popup class="text-primary">
+                    {{ t('Close') }}
+                </QBtn>
+                <QBTn flat @click="setWeightToTicket" class="text-primary">
+                    {{ t('Save') }}
+                </QBTn>
+            </QCardSection>
+        </QCard>
+    </QDialog>
     <template v-if="!ticket.isDeleted">
         <QSeparator />
         <QItem @click="openConfirmDialog('remove')" v-ripple clickable>
@@ -266,20 +333,26 @@ function openConfirmDialog(callback) {
 
 <i18n>
 es:
-    Open Delivery Note...: Abrir albarán...
+    Show Delivery Note...: Ver albarán...
     Send Delivery Note...: Enviar albarán...
-    With prices: Con precios
-    Without prices: Sin precios
-    As CSV: Como CSV
-    Open Proforma Invoice: Abrir factura proforma
+    as PDF: como PDF
+    as PDF without prices: como PDF sin precios
+    as CSV: Como CSV
+    Send PDF: Enviar PDF
+    Send PDF to tablet: Enviar PDF a tablet
+    Send CSV: Enviar CSV
+    Show Proforma: Ver proforma
     Delete ticket: Eliminar ticket
     Send SMS...: Enviar SMS
     Pending payment: Pago pendiente
-    Minimum amount: Importe mínimo
-    Order changes: Cambios del pedido
+    Minimum import: Importe mínimo
+    Notify changes: Notificar cambios
     Ticket deleted: Ticket eliminado
     You can undo this action within the first hour: Puedes deshacer esta acción dentro de la primera hora
     To clone ticket: Clonar ticket
     Ticket cloned: Ticked clonado
     It was not able to clone the ticket: No se pudo clonar el ticket
+    Regenerate PDF invoice: Regenerar PDF factura
+    The invoice PDF document has been regenerated: El documento PDF de la factura ha sido regenerado
+    Set ticket weight: Establecer peso al ticket
 </i18n>
diff --git a/src/pages/Ticket/Card/TicketSale.vue b/src/pages/Ticket/Card/TicketSale.vue
index 853913285..f2c5228b4 100644
--- a/src/pages/Ticket/Card/TicketSale.vue
+++ b/src/pages/Ticket/Card/TicketSale.vue
@@ -22,6 +22,7 @@ import { useVnConfirm } from 'composables/useVnConfirm';
 import useNotify from 'src/composables/useNotify.js';
 import axios from 'axios';
 import VnTable from 'src/components/VnTable/VnTable.vue';
+import FormModelPopup from 'src/components/FormModelPopup.vue';
 
 const route = useRoute();
 const router = useRouter();
@@ -50,6 +51,9 @@ const transfer = ref({
     lastActiveTickets: [],
     sales: [],
 });
+const tableRef = ref([]);
+const formModelPopupRef = ref();
+const showForm = ref(false);
 
 watch(
     () => route.params.id,
@@ -395,7 +399,7 @@ const changeTicketState = async (val) => {
 };
 
 const removeSelectedSales = () => {
-    selectedSales.value.forEach((sale) => {
+    selectedRows.value.forEach((sale) => {
         const index = sales.value.indexOf(sale);
         sales.value.splice(index, 1);
     });
@@ -403,17 +407,16 @@ const removeSelectedSales = () => {
 
 const removeSales = async () => {
     try {
-        const params = { sales: selectedValidSales.value, ticketId: store.data.id };
+        const params = { sales: selectedRows.value, ticketId: store.data.id };
         await axios.post('Sales/deleteSales', params);
         removeSelectedSales();
         notify('globals.dataSaved', 'positive');
+        window.location.reload();
     } catch (err) {
         console.error('Error deleting sales', err);
     }
 };
 
-const insertRow = () => sales.value.push({ ...DEFAULT_EDIT });
-
 const setTransferParams = async () => {
     try {
         const checkedSales = JSON.parse(JSON.stringify(selectedSales.value));
@@ -442,6 +445,15 @@ onMounted(async () => {
 });
 
 onUnmounted(() => (stateStore.rightDrawer = false));
+
+async function save(item) {
+    const { data } = await axios.post(`Tickets/${route.params.id}/addSale`, {
+        id: route.params.id,
+        barcode: item.itemFk,
+        quantity: parseInt(item.quantity),
+    });
+    if (data) window.location.reload();
+}
 </script>
 
 <template>
@@ -455,12 +467,6 @@ onUnmounted(() => (stateStore.rightDrawer = false));
         auto-load
         @on-fetch="(data) => (isLocked = data)"
     />
-    <FetchData
-        url="Items/withName"
-        :filter="{ fields: ['id', 'name'], order: 'id DESC' }"
-        auto-load
-        @on-fetch="(data) => (itemsWithNameOptions = data)"
-    />
     <FetchData
         url="States/editableStates"
         :filter="{ fields: ['code', 'name', 'id', 'alertLevel'], order: 'name ASC' }"
@@ -560,13 +566,13 @@ onUnmounted(() => (stateStore.rightDrawer = false));
             </QCardSection>
         </div></QDrawer
     >
-    <!-- TODO: el botón de añadir filas como está en salix-->
     <VnTable
         ref="tableRef"
         data-key="TicketSales"
         :url="`Tickets/${route.params.id}/getSales`"
         :columns="columns"
         v-model:selected="selectedRows"
+        :bottom="true"
         :table="{
             'row-key': 'id',
             selection: 'multiple',
@@ -625,7 +631,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
             </div>
         </template>
         <template #column-visible="{ row }">
-            <QBadge :color="row.available < 0 ? 'alert' : 'transparent'" dense>
+            <QBadge :color="row.visible < 0 ? 'alert' : 'transparent'" dense>
                 {{ row.visible }}
             </QBadge>
         </template>
@@ -667,7 +673,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
         <template #column-price="{ row }">
             <QTd>
                 <template v-if="isTicketEditable && row.id">
-                    <QBtn flat color="primary" dense @click="onOpenEditPricePopover(row)">
+                    <QBtn flat class="link" dense @click="onOpenEditPricePopover(row)">
                         {{ toCurrency(row.price) }}
                     </QBtn>
                     <TicketEditManaProxy
@@ -689,12 +695,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
         <template #column-discount="{ row }">
             <QTd>
                 <template v-if="!isLocked && row.id">
-                    <QBtn
-                        flat
-                        color="primary"
-                        dense
-                        @click="onOpenEditDiscountPopover(row)"
-                    >
+                    <QBtn flat class="link" dense @click="onOpenEditDiscountPopover(row)">
                         {{ toPercentage(row.discount / 100) }}
                     </QBtn>
                     <TicketEditManaProxy
@@ -715,21 +716,54 @@ onUnmounted(() => (stateStore.rightDrawer = false));
         <template #column-amount="{ row }">
             {{ toCurrency(row.quantity * row.price) }}
         </template>
-        <template #bottom-row>
-            <QBtn
-                class="cursor-pointer fill-icon q-ml-md q-my-lg"
+        <template #bottom-table v-if="isTicketEditable">
+            <QIcon
+                @click="showForm = !showForm"
+                class="fill-icon-on-hover"
                 color="primary"
-                icon="add_circle"
-                size="md"
-                round
-                flat
-                :disable="!isTicketEditable"
-                @click="insertRow()"
+                name="add_circle"
+                size="sm"
             >
                 <QTooltip>
                     {{ t('Add item') }}
                 </QTooltip>
-            </QBtn>
+            </QIcon>
+            <QDialog v-model="showForm" transition-show="scale" transition-hide="scale">
+                <FormModelPopup
+                    ref="formModelPopupRef"
+                    :url-create="`Tickets/${route.params.id}/addSale`"
+                    :title="t('New item')"
+                    :form-initial-data="{
+                        price: 0,
+                        discount: 0,
+                        visible: 0,
+                        available: 0,
+                        packaging: null,
+                    }"
+                    :save-fn="save"
+                >
+                    <template #form-inputs="{ data }">
+                        <VnSelect
+                            url="Items/withName"
+                            :option-filter="{
+                                order: 'id DESC',
+                            }"
+                            :fields="['id', 'name']"
+                            :label="t('Items')"
+                            option-label="name"
+                            option-value="id"
+                            :options="itemsWithNameOptions"
+                            hide-selected
+                            v-model="data.itemFk"
+                        />
+                        <VnInput
+                            v-model="data.quantity"
+                            :label="t('Quantity')"
+                            type="number"
+                        />
+                    </template>
+                </FormModelPopup>
+            </QDialog>
         </template>
     </VnTable>
 
diff --git a/src/pages/Ticket/Card/TicketService.vue b/src/pages/Ticket/Card/TicketService.vue
index 63dd454ba..bdfb7ea8c 100644
--- a/src/pages/Ticket/Card/TicketService.vue
+++ b/src/pages/Ticket/Card/TicketService.vue
@@ -50,7 +50,7 @@ const createRefund = async () => {
         if (!selected.value.length) return;
 
         const params = {
-            servicesIds: selected.value.map((s) => +s.ticketFk),
+            servicesIds: selected.value.map((s) => +s.id),
             withWarehouse: false,
             negative: true,
         };
diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index 295e8bca5..4a0839655 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -425,7 +425,7 @@ async function changeState(value) {
                 <VnTitle :url="ticketUrl + 'package'" :text="t('globals.packages')" />
                 <QTable :rows="ticket.packagings" flat>
                     <template #header="props">
-                        <QTr :props="props">
+                        <QTr class="tr-header" :props="props">
                             <QTh auto-width>{{ t('ticket.summary.created') }}</QTh>
                             <QTh auto-width>{{ t('ticket.summary.package') }}</QTh>
                             <QTh auto-width>{{ t('ticket.summary.quantity') }}</QTh>
@@ -445,7 +445,7 @@ async function changeState(value) {
                 />
                 <QTable :rows="ticket.services" flat>
                     <template #header="props">
-                        <QTr :props="props">
+                        <QTr class="tr-header" :props="props">
                             <QTh auto-width>{{ t('ticket.summary.quantity') }}</QTh>
                             <QTh auto-width>{{ t('globals.description') }}</QTh>
                             <QTh auto-width>{{ t('ticket.summary.price') }}</QTh>
@@ -466,6 +466,49 @@ async function changeState(value) {
                     </template>
                 </QTable>
             </QCard>
+            <QCard class="vn-max" v-if="ticket.requests.length > 0">
+                <VnTitle
+                    :url="ticketUrl + 'request'"
+                    :text="t('ticket.summary.purchaseRequest')"
+                />
+                <QTable :rows="ticket.requests" flat>
+                    <template #header="props">
+                        <QTr class="tr-header" :props="props">
+                            <QTh auto-width>{{ t('ticket.summary.description') }}</QTh>
+                            <QTh auto-width>{{ t('ticket.summary.created') }}</QTh>
+                            <QTh auto-width>{{ t('ticket.summary.requester') }}</QTh>
+                            <QTh auto-width>{{ t('ticket.summary.attender') }}</QTh>
+                            <QTh auto-width>{{ t('ticket.summary.quantity') }}</QTh>
+                            <QTh auto-width>{{ t('ticket.summary.price') }}</QTh>
+                            <QTh auto-width>{{ t('ticket.summary.item') }}</QTh>
+                            <QTh auto-width>{{ t('ticket.summary.ok') }}</QTh>
+                        </QTr>
+                    </template>
+                    <template #body="props">
+                        <QTr :props="props">
+                            <QTd>{{ toDate(props.row.created) }}</QTd>
+                            <QTd>{{ props.row.description }}</QTd>
+                            <QTd>{{ props.row.requester?.user?.username }}</QTd>
+                            <QTd>{{ props.row.atender?.user?.username }}</QTd>
+                            <QTd>{{ props.row.quantity }}</QTd>
+                            <QTd>{{ toCurrency(props.row.price) }}</QTd>
+                            <QTd>
+                                <span class="link" v-if="props.row.isOk">
+                                    {{ props.row.itemFk }}
+                                    <ItemDescriptorProxy :id="props.row.itemFk" />
+                                </span>
+                            </QTd>
+                            <QTd>
+                                <QCheckbox
+                                    v-model="props.row.isOk"
+                                    disable
+                                    :toggle-indeterminate="false"
+                                />
+                            </QTd>
+                        </QTr>
+                    </template>
+                </QTable>
+            </QCard>
         </template>
     </CardSummary>
 </template>
diff --git a/src/pages/Ticket/Card/TicketTracking.vue b/src/pages/Ticket/Card/TicketTracking.vue
index 62d755c4d..f747ae024 100644
--- a/src/pages/Ticket/Card/TicketTracking.vue
+++ b/src/pages/Ticket/Card/TicketTracking.vue
@@ -94,13 +94,11 @@ const openCreateModal = () => createTrackingDialogRef.value.show();
                     :no-data-label="t('globals.noResults')"
                 >
                     <template #body-cell-worker="{ row }">
-                        <QTd @click.stop>
-                            <span class="link">
-                                <QBtn flat>
-                                    {{ row.user?.name }}
-                                    <WorkerDescriptorProxy :id="row.user?.worker?.id" />
-                                </QBtn>
-                            </span>
+                        <QTd>
+                            <QBtn flat class="link" @click.stop>
+                                {{ row.user?.name }}
+                                <WorkerDescriptorProxy :id="row.user?.worker?.id" />
+                            </QBtn>
                         </QTd>
                     </template>
                 </QTable>
diff --git a/src/pages/Ticket/Card/TicketVolume.vue b/src/pages/Ticket/Card/TicketVolume.vue
index a021cfbf1..a47a127c1 100644
--- a/src/pages/Ticket/Card/TicketVolume.vue
+++ b/src/pages/Ticket/Card/TicketVolume.vue
@@ -134,12 +134,10 @@ onUnmounted(() => (stateStore.rightDrawer = false));
     >
         <template #body-cell-item="{ row }">
             <QTd>
-                <span class="link">
-                    <QBtn flat>
-                        {{ row.itemFk }}
-                        <ItemDescriptorProxy :id="row.itemFk" />
-                    </QBtn>
-                </span>
+                <QBtn flat class="link" @click.stop>
+                    {{ row.itemFk }}
+                    <ItemDescriptorProxy :id="row.itemFk" />
+                </QBtn>
             </QTd>
         </template>
         <template #body-cell-description="{ row }">
diff --git a/src/pages/Ticket/TicketAdvance.vue b/src/pages/Ticket/TicketAdvance.vue
index bf4000fdf..1c926491c 100644
--- a/src/pages/Ticket/TicketAdvance.vue
+++ b/src/pages/Ticket/TicketAdvance.vue
@@ -3,8 +3,8 @@ import { onMounted, ref, computed, reactive } from 'vue';
 import { useI18n } from 'vue-i18n';
 
 import FetchData from 'components/FetchData.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
+// import VnInput from 'src/components/common/VnInput.vue';
+// import VnSelect from 'src/components/common/VnSelect.vue';
 import TicketDescriptorProxy from 'src/pages/Ticket/Card/TicketDescriptorProxy.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
@@ -19,13 +19,14 @@ import useNotify from 'src/composables/useNotify.js';
 import { useState } from 'src/composables/useState';
 import { toDateFormat } from 'src/filters/date.js';
 import axios from 'axios';
+import VnTable from 'src/components/VnTable/VnTable.vue';
 
 const state = useState();
 const { t } = useI18n();
 const { openConfirmationModal } = useVnConfirm();
 const { notify } = useNotify();
 const user = state.getUser();
-
+const tableRef = ref();
 const itemPackingTypesOptions = ref([]);
 const zonesOptions = ref([]);
 const selectedTickets = ref([]);
@@ -44,15 +45,14 @@ const exprBuilder = (param, value) => {
         case 'notMovableLines':
         case 'futureZoneFk':
             return { [param]: value };
-        case 'iptColFilter':
-            return { ipt: { like: `%${value}%` } };
-        case 'futureIptColFilter':
-            return { futureIpt: { like: `%${value}%` } };
+        case 'ipt':
+            return { [param]: { like: `%${value}%` } };
+        case 'futureIpt':
+            return { [param]: { like: `%${value}%` } };
     }
 };
 
 const userParams = reactive({});
-
 const arrayData = useArrayData('AdvanceTickets', {
     url: 'Tickets/getTicketsAdvance',
     userParams: userParams,
@@ -82,220 +82,123 @@ const getInputEvents = (col) => {
           };
 };
 
-const ticketColumns = computed(() => [
+const columns = computed(() => [
     {
         label: '',
         name: 'icons',
-        align: 'left',
-        columnFilter: null,
+        hidden: true,
     },
     {
-        label: t('advanceTickets.ticketId'),
-        name: 'ticketId',
         align: 'center',
-        sortable: true,
-        columnFilter: {
-            component: VnInput,
-            type: 'text',
-            filterValue: null,
-            filterParamKey: 'id',
-            event: getInputEvents,
-            attrs: {
-                dense: true,
-            },
-        },
+        label: t('advanceTickets.ticketId'),
+        name: 'id',
     },
     {
+        align: 'left',
         label: t('advanceTickets.ipt'),
         name: 'ipt',
-        field: 'ipt',
-        align: 'left',
-        sortable: true,
         columnFilter: {
-            component: VnSelect,
-            filterParamKey: 'iptColFilter',
-            type: 'select',
-            filterValue: null,
-            event: getInputEvents,
+            component: 'select',
             attrs: {
-                options: itemPackingTypesOptions.value,
-                'option-value': 'code',
-                'option-label': 'description',
-                dense: true,
+                url: 'itemPackingTypes',
+                fields: ['code', 'description'],
+                where: { isActive: true },
+                optionValue: 'code',
+                optionLabel: 'description',
             },
         },
-        format: (val) => dashIfEmpty(val),
+        format: (row, dashIfEmpty) => dashIfEmpty(row.ipt),
     },
     {
+        align: 'left',
         label: t('advanceTickets.state'),
         name: 'state',
-        align: 'left',
-        sortable: true,
-        columnFilter: null,
+        hidden: true,
     },
     {
+        align: 'left',
         label: t('advanceTickets.liters'),
         name: 'liters',
-        field: 'liters',
-        align: 'left',
-        sortable: true,
-        columnFilter: {
-            component: VnInput,
-            type: 'text',
-            filterValue: null,
-            event: getInputEvents,
-            attrs: {
-                dense: true,
-            },
-        },
     },
     {
+        align: 'left',
         label: t('advanceTickets.lines'),
         name: 'lines',
-        field: 'lines',
-        align: 'left',
-        sortable: true,
-        columnFilter: {
-            component: VnInput,
-            type: 'text',
-            filterValue: null,
-            event: getInputEvents,
-            attrs: {
-                dense: true,
-            },
-        },
-        format: (val) => dashIfEmpty(val),
+        format: (row, dashIfEmpty) => dashIfEmpty(row.lines),
     },
     {
+        align: 'left',
         label: t('advanceTickets.import'),
-        field: 'import',
-        name: 'import',
-        align: 'left',
-        sortable: true,
+        name: 'totalWithVat',
+        hidden: true,
+        format: (row) => toCurrency(row.totalWithVat),
     },
     {
+        align: 'left',
         label: t('advanceTickets.futureId'),
         name: 'futureId',
-        align: 'left',
-        sortable: true,
-        columnFilter: {
-            component: VnInput,
-            type: 'text',
-            filterValue: null,
-            filterParamKey: 'futureId',
-            event: getInputEvents,
-            attrs: {
-                dense: true,
-            },
-        },
     },
     {
+        align: 'left',
         label: t('advanceTickets.futureIpt'),
         name: 'futureIpt',
-        field: 'futureIpt',
-        align: 'left',
-        sortable: true,
         columnFilter: {
-            component: VnSelect,
-            filterParamKey: 'futureIptColFilter',
-            type: 'select',
-            filterValue: null,
-            event: getInputEvents,
+            component: 'select',
             attrs: {
-                options: itemPackingTypesOptions.value,
-                'option-value': 'code',
-                'option-label': 'description',
-                dense: true,
+                url: 'itemPackingTypes',
+                fields: ['code', 'description'],
+                where: { isActive: true },
+                optionValue: 'code',
+                optionLabel: 'description',
             },
         },
-        format: (val) => dashIfEmpty(val),
+        format: (row, dashIfEmpty) => dashIfEmpty(row.futureIpt),
     },
     {
+        align: 'left',
         label: t('advanceTickets.futureState'),
         name: 'futureState',
-        align: 'left',
-        sortable: true,
-        columnFilter: null,
-        format: (val) => dashIfEmpty(val),
+        hidden: true,
     },
     {
+        align: 'left',
         label: t('advanceTickets.futureLiters'),
         name: 'futureLiters',
-        field: 'futureLiters',
-        align: 'left',
-        sortable: true,
-        columnFilter: {
-            component: VnInput,
-            type: 'text',
-            filterValue: null,
-            event: getInputEvents,
-            attrs: {
-                dense: true,
-            },
-        },
-        format: (val) => dashIfEmpty(val),
     },
     {
+        align: 'left',
         label: t('advanceTickets.futureZone'),
-        name: 'futureZoneName',
-        field: 'futureZoneName',
-        align: 'left',
-        sortable: true,
+        name: 'futureZoneFk',
+        columnClass: 'expand',
         columnFilter: {
-            component: VnSelect,
-            type: 'select',
-            filterValue: null,
-            filterParamKey: 'futureZoneFk',
-            event: getInputEvents,
+            component: 'select',
+            inWhere: true,
             attrs: {
-                options: zonesOptions.value,
-                'option-value': 'id',
-                'option-label': 'name',
-                dense: true,
+                url: 'Zones',
+                fields: ['id', 'name'],
             },
         },
-        format: (val) => dashIfEmpty(val),
+        columnField: {
+            component: null,
+        },
+        format: (row, dashIfEmpty) => dashIfEmpty(row.futureZoneName),
     },
     {
+        align: 'left',
         label: t('advanceTickets.notMovableLines'),
         name: 'notMovableLines',
-        field: 'notMovableLines',
-        align: 'left',
-        sortable: true,
-        columnFilter: {
-            component: VnInput,
-            type: 'text',
-            filterValue: null,
-            event: getInputEvents,
-            attrs: {
-                dense: true,
-            },
-        },
-        format: (val) => dashIfEmpty(val),
     },
     {
+        align: 'left',
         label: t('advanceTickets.futureLines'),
         name: 'futureLines',
-        field: 'futureLines',
-        align: 'left',
-        sortable: true,
-        columnFilter: {
-            component: VnInput,
-            type: 'text',
-            filterValue: null,
-            event: getInputEvents,
-            attrs: {
-                dense: true,
-            },
-        },
-        format: (val) => dashIfEmpty(val),
     },
     {
-        label: t('advanceTickets.futureImport'),
-        name: 'futureImport',
         align: 'left',
-        sortable: true,
-        columnFilter: null,
+        label: t('advanceTickets.futureImport'),
+        name: 'futureTotalWithVat',
+        hidden: true,
+        format: (row) => toCurrency(row.futureTotalWithVat),
     },
 ]);
 
@@ -457,6 +360,13 @@ onMounted(async () => {
     const filter = { limit: 0 };
     await arrayData.addFilter({ filter, userParams });
 });
+
+const getColor = (row) => {
+    return row?.classColor ? `bg-${row.classColor}` : 'bg-orange';
+};
+const getFutureColor = (row) => {
+    return row?.futureClassColor ? `bg-${row.futureClassColor}` : 'bg-orange';
+};
 </script>
 
 <template>
@@ -480,9 +390,9 @@ onMounted(async () => {
         @on-fetch="(data) => (zonesOptions = data)"
     />
     <VnSearchbar
-        data-key="WeeklyTickets"
-        :label="t('weeklyTickets.search')"
-        :info="t('weeklyTickets.searchInfo')"
+        data-key="AdvanceTickets"
+        :label="t('advanceTickets.search')"
+        :info="t('advanceTickets.searchInfo')"
     />
     <VnSubToolbar>
         <template #st-data>
@@ -531,73 +441,32 @@ onMounted(async () => {
         </template>
     </RightMenu>
     <QPage class="column items-center q-pa-md">
-        <QTable
-            :rows="tickets"
-            :columns="ticketColumns"
-            row-key="index"
-            selection="multiple"
+        <VnTable
+            ref="tableRef"
+            data-key="AdvanceTickets"
+            url="TicketWeeklies/filter"
+            :columns="columns"
+            auto-load
+            :right-search="false"
+            :disable-option="{ card: true }"
             v-model:selected="selectedTickets"
-            :pagination="{ rowsPerPage: 0 }"
-            :no-data-label="t('globals.noResults')"
-            style="max-width: 99%"
+            :table="{
+                'row-key': 'id',
+                selection: 'multiple',
+            }"
         >
-            <template #header="props">
-                <QTr :props="props">
-                    <QTh
-                        class="horizontal-separator text-uppercase color-vn-label"
-                        colspan="7"
-                        translate
-                    >
-                        {{ t('advanceTickets.destination') }}
-                        {{ toDateFormat(userParams.dateToAdvance) }}
-                    </QTh>
-                    <QTh
-                        class="horizontal-separator text-uppercase color-vn-label"
-                        colspan="9"
-                        translate
-                    >
-                        {{ t('advanceTickets.origin') }}
-                        {{ toDateFormat(userParams.dateFuture) }}
-                    </QTh>
-                </QTr>
-                <QTr>
-                    <QTh>
-                        <QCheckbox v-model="props.selected" />
-                    </QTh>
-                    <QTh
-                        v-for="(col, index) in ticketColumns"
-                        :key="index"
-                        :class="{ 'vertical-separator': col.name === 'futureId' }"
-                    >
-                        {{ col.label }}
-                    </QTh>
-                </QTr>
+            <!--TODO: arreglar estilos-->
+            <template #before-header>
+                <span class="horizontal-separator" translate>
+                    {{ t('advanceTickets.destination') }}
+                    {{ toDateFormat(userParams.dateToAdvance) }}
+                </span>
+                <span class="horizontal-separator" translate>
+                    {{ t('advanceTickets.origin') }}
+                    {{ toDateFormat(userParams.dateFuture) }}
+                </span>
             </template>
-            <template #top-row="{ cols }">
-                <QTr>
-                    <QTd />
-                    <QTd
-                        v-for="(col, index) in cols"
-                        :key="index"
-                        style="max-width: 100px"
-                    >
-                        <component
-                            :is="col.columnFilter.component"
-                            v-if="col.columnFilter"
-                            v-model="col.columnFilter.filterValue"
-                            v-bind="col.columnFilter.attrs"
-                            v-on="col.columnFilter.event(col)"
-                            dense
-                        />
-                    </QTd>
-                </QTr>
-            </template>
-            <template #header-cell-availableLines="{ col }">
-                <QTh class="vertical-separator">
-                    {{ col.label }}
-                </QTh>
-            </template>
-            <template #body-cell-icons="{ row }">
+            <template #column-icons="{ row }">
                 <QTd class="q-gutter-x-xs">
                     <QIcon
                         v-if="row.futureAgency !== row.agency && row.agency"
@@ -624,73 +493,52 @@ onMounted(async () => {
                     </QIcon>
                 </QTd>
             </template>
-            <template #body-cell-ticketId="{ row }">
-                <QTd>
-                    <QBtn flat class="link">
-                        {{ row.id }}
-                        <TicketDescriptorProxy :id="row.id" />
-                    </QBtn>
-                </QTd>
+            <template #column-id="{ row }">
+                <span class="link" @click.stop>
+                    {{ row.id }}
+                    <TicketDescriptorProxy :id="row.id" />
+                </span>
             </template>
-            <template #body-cell-state="{ row }">
-                <QTd>
-                    <QBadge
-                        text-color="black"
-                        :color="row.classColor"
-                        class="q-ma-none"
-                        dense
-                    >
-                        {{ row.state }}
-                    </QBadge>
-                </QTd>
+            <template #column-state="{ row }">
+                <QChip :class="getColor(row)" dense square>
+                    {{ row.state }}
+                </QChip>
             </template>
-            <template #body-cell-import="{ row }">
-                <QTd>
-                    <QBadge
-                        :text-color="isLessThan50(row.totalWithVat) ? 'black' : 'white'"
-                        :color="totalPriceColor(row.totalWithVat)"
-                        class="q-ma-none"
-                        dense
-                    >
-                        {{ toCurrency(row.totalWithVat || 0) }}
-                    </QBadge>
-                </QTd>
+            <template #column-totalWithVat="{ row }">
+                <QBadge
+                    :text-color="isLessThan50(row.totalWithVat) ? 'black' : 'white'"
+                    :color="totalPriceColor(row.totalWithVat)"
+                    class="q-ma-none"
+                    dense
+                >
+                    {{ toCurrency(row.totalWithVat || 0) }}
+                </QBadge>
             </template>
-            <template #body-cell-futureId="{ row }">
-                <QTd class="vertical-separator">
-                    <QBtn flat class="link" dense>
+            <template #column-futureId="{ row }">
+                <!--TODO: arreglar estilos para que se muestre como antes, slot?-->
+                <div class="vertical-separator">
+                    <span class="link" @click.stop>
                         {{ row.futureId }}
                         <TicketDescriptorProxy :id="row.futureId" />
-                    </QBtn>
-                </QTd>
+                    </span>
+                </div>
             </template>
-            <template #body-cell-futureState="{ row }">
-                <QTd>
-                    <QBadge
-                        text-color="black"
-                        :color="row.futureClassColor"
-                        class="q-ma-none"
-                        dense
-                    >
-                        {{ row.futureState }}
-                    </QBadge>
-                </QTd>
+            <template #column-futureState="{ row }">
+                <QChip :class="getFutureColor(row)" dense square>
+                    {{ row.futureState }}
+                </QChip>
             </template>
-            <template #body-cell-futureImport="{ row }">
-                <QTd>
-                    <QBadge
-                        :text-color="
-                            isLessThan50(row.futureTotalWithVat) ? 'black' : 'white'
-                        "
-                        :color="totalPriceColor(row.futureTotalWithVat)"
-                        class="q-ma-none"
-                        dense
-                    >
-                        {{ toCurrency(row.futureTotalWithVat || 0) }}
-                    </QBadge>
-                </QTd>
+            <template #column-futureTotalWithVat="{ row }">
+                <QBadge
+                    :text-color="isLessThan50(row.futureTotalWithVat) ? 'black' : 'white'"
+                    :color="totalPriceColor(row.futureTotalWithVat)"
+                    class="q-ma-none"
+                    dense
+                >
+                    {{ toCurrency(row.futureTotalWithVat || 0) }}
+                </QBadge>
             </template>
-        </QTable>
+        </VnTable>
         <VnProgress
             :progress="progressPercentage"
             :cancelled="cancelProgress"
@@ -714,6 +562,8 @@ onMounted(async () => {
 }
 
 .horizontal-separator {
-    border-bottom: 4px solid white !important;
+    width: 100%;
+    margin-top: 1%;
+    border-bottom: 5px solid white !important;
 }
 </style>
diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index ad53935bc..30e365490 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -2,7 +2,9 @@
 import axios from 'axios';
 import { computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
+import { useQuasar } from 'quasar';
 import { toDate, toCurrency } from 'src/filters/index';
+import useNotify from 'src/composables/useNotify';
 import TicketSummary from './Card/TicketSummary.vue';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
@@ -10,14 +12,25 @@ import VnTable from 'src/components/VnTable/VnTable.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
 import VnRow from 'src/components/ui/VnRow.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import FetchData from 'src/components/FetchData.vue';
 
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
 const tableRef = ref();
+const quasar = useQuasar();
+const { notify } = useNotify();
 const clientsOptions = ref([]);
 const addressesOptions = ref([]);
 const agenciesOptions = ref([]);
 const selectedClient = ref();
+const selectedRows = ref([]);
+const hasSelectedRows = computed(() => selectedRows.value.length > 0);
+const showForm = ref(false);
+const dialogData = ref();
+const companiesOptions = ref([]);
+const accountingOptions = ref([]);
+const amountToReturn = ref();
 
 const columns = computed(() => [
     {
@@ -187,9 +200,158 @@ const fetchAddresses = async (formData) => {
 const getColor = (row) => {
     return row?.classColor ? `bg-${row.classColor}` : 'bg-orange';
 };
+
+async function makeInvoice(ticket) {
+    const ticketsIds = ticket.map((item) => item.id);
+    const { data } = await axios.post(`Tickets/invoiceTicketsAndPdf`, { ticketsIds });
+    const response = data;
+    if (response)
+        quasar.notify({
+            message: t('globals.dataSaved'),
+            type: 'positive',
+        });
+}
+
+async function sendDocuware(ticket) {
+    try {
+        let ticketIds = ticket.map((item) => item.id);
+
+        const { data } = await axios.post(`Docuwares/upload`, {
+            fileCabinet: 'deliveryNote',
+            ticketIds,
+        });
+
+        for (let ticket of ticketIds) {
+            ticket.stateFk = data.id;
+            ticket.state = data.name;
+            ticket.alertLevel = data.alertLevel;
+            ticket.alertLevelCode = data.code;
+        }
+        notify('globals.dataSaved', 'positive');
+    } catch (err) {
+        console.log('err: ', err);
+    }
+}
+
+function openBalanceDialog(ticket) {
+    const checkedTickets = ticket;
+    const amountPaid = ref(0);
+    const clientFk = ref(null);
+    const description = ref([]);
+    const firstTicketClientId = checkedTickets[0].clientFk;
+    const isSameClient = checkedTickets.every(
+        (ticket) => ticket.clientFk === firstTicketClientId
+    );
+
+    if (!isSameClient) {
+        throw new Error('You cannot make a payment on account from multiple clients');
+    }
+
+    for (let ticketData of checkedTickets) {
+        console.log('ticketData: ', ticketData);
+        amountPaid.value += ticketData.totalWithVat;
+        clientFk.value = ticketData.clientFk;
+        description.value.push(ticketData.id);
+    }
+
+    const balanceCreateDialog = ref({
+        amountPaid: amountPaid.value,
+        clientFk: clientFk.value,
+        description: `Albaran: ${description.value.join(', ')}`,
+    });
+    dialogData.value = balanceCreateDialog;
+    showForm.value = true;
+}
+
+async function onSubmit() {
+    const { data: email } = await axios.get('Clients', {
+        params: {
+            filter: JSON.stringify({ where: { id: dialogData.value.value.clientFk } }),
+        },
+    });
+
+    const { data } = await axios.post(
+        `Clients/${dialogData.value.value.clientFk}/createReceipt`,
+        {
+            payed: dialogData.value.payed,
+            companyFk: dialogData.value.companyFk,
+            bankFk: dialogData.value.bankFk,
+            amountPaid: dialogData.value.value.amountPaid,
+            description: dialogData.value.value.description,
+            clientFk: dialogData.value.value.clientFk,
+            email: email[0].email,
+        }
+    );
+
+    if (data) notify('globals.dataSaved', 'positive');
+    showForm.value = false;
+}
+
+const setAmountToReturn = (newAmountGiven) => {
+    const amountPaid = dialogData.value.value.amountPaid;
+
+    amountToReturn.value = newAmountGiven - amountPaid;
+};
+
+function setReference(data) {
+    console.log('entity: ', data);
+
+    let newDescription = '';
+
+    switch (data) {
+        case 1:
+            newDescription = `${t(
+                'ticketList.creditCard'
+            )}, ${dialogData.value.value.description.replace(
+                /^(Credit Card, |Cash, |Transfers, )/,
+                ''
+            )}`;
+            break;
+        case 2:
+            newDescription = `${t(
+                'ticketList.cash'
+            )}, ${dialogData.value.value.description.replace(
+                /^(Credit Card, |Cash, |Transfers, )/,
+                ''
+            )}`;
+            break;
+        case 3:
+            newDescription = `${newDescription.replace(
+                /^(Credit Card, |Cash, |Transfers, )/,
+                ''
+            )}`;
+            break;
+        case 4:
+            newDescription = `${t(
+                'ticketList.transfers'
+            )}, ${dialogData.value.value.description.replace(
+                /^(Credit Card, |Cash, |Transfers, )/,
+                ''
+            )}`;
+            break;
+        case 3317:
+            newDescription = '';
+            break;
+        default:
+            break;
+    }
+
+    dialogData.value.value.description = newDescription;
+    console.log('Updated description:', dialogData.value.value.description);
+}
 </script>
 
 <template>
+    <FetchData
+        url="Companies"
+        @on-fetch="(data) => (companiesOptions = data)"
+        auto-load
+    />
+    <FetchData
+        url="Accountings"
+        @on-fetch="(data) => (accountingOptions = data)"
+        auto-load
+    />
     <VnSearchbar
         data-key="Tickets"
         :label="t('Search ticket')"
@@ -209,6 +371,11 @@ const getColor = (row) => {
         :columns="columns"
         redirect="ticket"
         auto-load
+        v-model:selected="selectedRows"
+        :table="{
+            'row-key': 'id',
+            selection: 'multiple',
+        }"
     >
         <template #more-create-dialog="{ data }">
             <VnRow>
@@ -306,6 +473,135 @@ const getColor = (row) => {
             </QChip>
         </template>
     </VnTable>
+    <QPageSticky :offset="[20, 80]" style="z-index: 2">
+        <QBtn
+            v-if="hasSelectedRows"
+            @click="makeInvoice(selectedRows)"
+            color="primary"
+            fab
+            icon="vn:invoice-in"
+        />
+        <QTooltip>
+            {{ t('ticketList.createInvoice') }}
+        </QTooltip>
+    </QPageSticky>
+    <QPageSticky v-if="hasSelectedRows" :offset="[20, 140]" style="z-index: 2">
+        <QBtn
+            @click.stop="openBalanceDialog(selectedRows)"
+            color="primary"
+            fab
+            icon="vn:recovery"
+        />
+        <QTooltip>
+            {{ t('ticketList.accountPayment') }}
+        </QTooltip>
+    </QPageSticky>
+    <QDialog ref="dialogRef" v-model="showForm">
+        <QCard class="q-pa-md q-mb-md">
+            <QForm @submit="onSubmit()" class="q-pa-sm">
+                {{ t('ticketList.addPayment') }}
+                <VnRow>
+                    <VnInputDate
+                        :label="t('ticketList.date')"
+                        v-model="dialogData.payed"
+                    />
+                    <VnSelect
+                        :label="t('ticketList.company')"
+                        v-model="dialogData.companyFk"
+                        :options="companiesOptions"
+                        option-value="id"
+                        option-label="code"
+                        hide-selected
+                    >
+                    </VnSelect>
+                </VnRow>
+                <VnRow>
+                    <VnSelect
+                        :label="t('ticketList.bank')"
+                        v-model="dialogData.bankFk"
+                        :options="accountingOptions"
+                        option-value="id"
+                        option-label="bank"
+                        hide-selected
+                        @update:model-value="setReference"
+                    />
+                    <VnInput
+                        :label="t('ticketList.amount')"
+                        v-model="dialogData.value.amountPaid"
+                    />
+                </VnRow>
+                <VnRow v-if="dialogData.bankFk === 2">
+                    <span>
+                        {{ t('ticketList.cash') }}
+                    </span>
+                </VnRow>
+                <VnRow v-if="dialogData.bankFk === 2">
+                    <VnInput
+                        :label="t('ticketList.deliveredAmount')"
+                        v-model="dialogData.value.amountGiven"
+                        @update:model-value="setAmountToReturn"
+                        type="number"
+                    />
+                    <VnInput
+                        :label="t('ticketList.amountToReturn')"
+                        :model-value="amountToReturn"
+                        type="number"
+                        readonly
+                    />
+                </VnRow>
+                <VnRow v-if="dialogData.bankFk === 3 || dialogData.bankFk === 3117">
+                    <VnInput
+                        :label="t('ticketList.compensation')"
+                        v-model="dialogData.value.compensation"
+                        type="text"
+                    />
+                </VnRow>
+                <VnRow>
+                    <VnInput
+                        :label="t('ticketList.reference')"
+                        v-model="dialogData.value.description"
+                        type="text"
+                    />
+                </VnRow>
+                <VnRow v-if="dialogData.bankFk === 2">
+                    <QCheckbox
+                        :label="t('ticketList.viewReceipt')"
+                        v-model="dialogData.value.viewReceipt"
+                        :toggle-indeterminate="false"
+                    />
+                    <QCheckbox
+                        :label="t('ticketList.sendEmail')"
+                        v-model="dialogData.value.senEmail"
+                        :toggle-indeterminate="false"
+                    />
+                </VnRow>
+                <div class="q-mt-lg row justify-end">
+                    <QBtn
+                        :label="t('globals.save')"
+                        color="primary"
+                        @click="onSubmit()"
+                    />
+                    <QBtn
+                        flat
+                        :label="t('globals.close')"
+                        color="primary"
+                        v-close-popup
+                    />
+                </div>
+            </QForm>
+        </QCard>
+    </QDialog>
+    <QPageSticky v-if="hasSelectedRows" :offset="[20, 200]" style="z-index: 2">
+        <QBtn
+            @click="sendDocuware(selectedRows)"
+            color="primary"
+            fab
+            icon="install_mobile"
+        />
+        <QTooltip>
+            {{ t('ticketList.sendDocuware') }}
+        </QTooltip>
+    </QPageSticky>
 </template>
 
 <i18n>
diff --git a/src/pages/Ticket/locale/en.yml b/src/pages/Ticket/locale/en.yml
index 66a3787dd..ddd33128e 100644
--- a/src/pages/Ticket/locale/en.yml
+++ b/src/pages/Ticket/locale/en.yml
@@ -66,6 +66,8 @@ advanceTickets:
     advanceWithoutNegativeTitle: Advance tickets (without negatives)
     advanceWithoutNegativeSubtitle: Advance {selectedTickets} tickets confirmation
     errorsList: Errors list
+    search: Search advance tickets
+    searchInfo: Search advance tickets by ID or client ID
 futureTickets:
     problems: Problems
     ticketId: ID
@@ -239,3 +241,20 @@ ticketList:
     summary: Summary
     client: Customer
     createTicket: Create ticket
+    createInvoice: Create invoice
+    accountPayment: Account payment
+    sendDocuware: Set delivered and send delivery note(s) to the tablet
+    addPayment: Add payment
+    date: Date
+    company: Company
+    amount: Amount
+    reference: Reference
+    bank: Bank
+    cash: Cash
+    deliveredAmount: Delivered amount
+    amountToReturn: Amount to return
+    viewReceipt: View receipt
+    sendEmail: Send email
+    compensation: Compensation
+    creditCard: Credit card
+    transfers: Transfers
diff --git a/src/pages/Ticket/locale/es.yml b/src/pages/Ticket/locale/es.yml
index 59f5a7f91..97fd63060 100644
--- a/src/pages/Ticket/locale/es.yml
+++ b/src/pages/Ticket/locale/es.yml
@@ -113,6 +113,8 @@ advanceTickets:
     advanceWithoutNegativeTitle: Adelantar tickets (sin negativos)
     advanceWithoutNegativeSubtitle: '¿Desea adelantar {selectedTickets} tickets?'
     errorsList: Lista de errores
+    search: Buscar por tickets adelantados
+    searchInfo: Buscar tickets adelantados por el identificador o el identificador del cliente
 futureTickets:
     problems: Problemas
     ticketId: ID
@@ -242,3 +244,20 @@ ticketList:
     summary: Resumen
     client: Cliente
     createTicket: Crear ticket
+    createInvoice: Crear factura
+    accountPayment: Pago a cuenta...
+    sendDocuware: Marcar como servido/s y enviar albarán/es a la tablet
+    addPayment: Añadir pago
+    date: Fecha
+    company: Empresa
+    amount: Importe
+    reference: Referencia
+    bank: Caja
+    cash: Efectivo
+    deliveredAmount: Cantidad entregada
+    amountToReturn: Cantidad a devolver
+    viewReceipt: Ver recibido
+    sendEmail: Enviar correo
+    compensation: Compensación
+    creditCard: Tarjeta de crédito
+    transfers: Transferencias

From 574a2efc923240f8fc7700d7a133dd45a4928fb8 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Mon, 19 Aug 2024 13:03:38 +0200
Subject: [PATCH 015/281] feat: refs #7553 added transferClient function

---
 src/pages/Ticket/Card/TicketDescriptor.vue    |  1 -
 .../Ticket/Card/TicketDescriptorMenu.vue      | 85 ++++++++++++-------
 2 files changed, 52 insertions(+), 34 deletions(-)

diff --git a/src/pages/Ticket/Card/TicketDescriptor.vue b/src/pages/Ticket/Card/TicketDescriptor.vue
index e4a349f12..148b0dc35 100644
--- a/src/pages/Ticket/Card/TicketDescriptor.vue
+++ b/src/pages/Ticket/Card/TicketDescriptor.vue
@@ -89,7 +89,6 @@ const filter = {
 const data = ref(useCardDescription());
 
 function ticketFilter(ticket) {
-    console.log('ticket: ', ticket);
     return JSON.stringify({ clientFk: ticket.clientFk });
 }
 </script>
diff --git a/src/pages/Ticket/Card/TicketDescriptorMenu.vue b/src/pages/Ticket/Card/TicketDescriptorMenu.vue
index 31f85582c..89c061507 100644
--- a/src/pages/Ticket/Card/TicketDescriptorMenu.vue
+++ b/src/pages/Ticket/Card/TicketDescriptorMenu.vue
@@ -9,6 +9,8 @@ import SendEmailDialog from 'components/common/SendEmailDialog.vue';
 import VnConfirm from 'components/ui/VnConfirm.vue';
 import VnSmsDialog from 'components/common/VnSmsDialog.vue';
 import toDate from 'filters/toDate';
+import FormPopup from 'components/FormPopup.vue';
+import VnSelect from 'components/common/VnSelect.vue';
 
 const props = defineProps({
     ticket: {
@@ -24,7 +26,9 @@ const { openReport, sendEmail } = usePrintService();
 
 const ticket = ref(props.ticket);
 const ticketId = currentRoute.value.params.id;
-const showWeightDialog = ref(false);
+const client = ref();
+const showTransferDialog = ref(false);
+const dialogRef = ref();
 const actions = {
     clone: async () => {
         const opts = { message: t('Ticket cloned'), type: 'positive' };
@@ -182,16 +186,54 @@ async function createPdfInvoice() {
     }
 }
 
-function setWeightToTicket(weight) {
-    console.log('weight: ', weight);
-    const { data } = axios.patch(`Tickets/${ticketId}`, {
-        weight: weight,
-    });
-    console.log('data: ', data);
+async function transferClient(client) {
+    const params = {
+        clientFk: client,
+    };
+
+    const { data } = await axios.patch(`Tickets/${ticketId}/transferClient`, params);
+
     if (data) window.location.reload();
 }
 </script>
 <template>
+    <QItem @click="showTransferDialog = !showTransferDialog" v-ripple clickable>
+        <QItemSection avatar>
+            <QIcon name="content_paste" />
+        </QItemSection>
+        <QItemSection>{{ t('Transfer client') }}</QItemSection>
+    </QItem>
+    <QDialog ref="dialogRef" v-model="showTransferDialog">
+        <FormPopup
+            @on-submit="transferClient(client)"
+            :title="t('Transfer client')"
+            :custom-submit-button-label="t('Transfer client')"
+            :default-cancel-button="false"
+        >
+            <template #form-inputs>
+                <VnSelect
+                    url="Clients"
+                    :fields="['id', 'name']"
+                    option-label="name"
+                    option-value="id"
+                    v-model="client"
+                    :label="t('Client')"
+                    auto-load
+                >
+                    <template #option="scope">
+                        <QItem v-bind="scope.itemProps">
+                            <QItemSection>
+                                <QItemLabel>
+                                    {{ `#${scope.opt.id} - ` }}
+                                    {{ scope.opt.name }}
+                                </QItemLabel>
+                            </QItemSection>
+                        </QItem>
+                    </template>
+                </VnSelect>
+            </template>
+        </FormPopup>
+    </QDialog>
     <QItem v-ripple clickable>
         <QItemSection avatar>
             <QIcon name="picture_as_pdf" />
@@ -296,30 +338,6 @@ function setWeightToTicket(weight) {
         </QItemSection>
         <QItemSection>{{ t('To clone ticket') }}</QItemSection>
     </QItem>
-    <QItem @click="showWeightDialog = !showWeightDialog" v-ripple clickable>
-        <QItemSection avatar>
-            <QIcon name="content_paste" />
-        </QItemSection>
-        <QItemSection>{{ t('Set ticket weight') }}</QItemSection>
-    </QItem>
-    <QDialog v-model="showWeightDialog" transition-show="scale" transition-hide="scale">
-        <QCard>
-            <QCardSection>
-                <QInput
-                    v-model="weight"
-                    type="number"
-                    :label="t('Weight')"
-                    @update:model-value="setWeightToTicket"
-                />
-                <QBtn flat v-close-popup class="text-primary">
-                    {{ t('Close') }}
-                </QBtn>
-                <QBTn flat @click="setWeightToTicket" class="text-primary">
-                    {{ t('Save') }}
-                </QBTn>
-            </QCardSection>
-        </QCard>
-    </QDialog>
     <template v-if="!ticket.isDeleted">
         <QSeparator />
         <QItem @click="openConfirmDialog('remove')" v-ripple clickable>
@@ -343,7 +361,7 @@ es:
     Send CSV: Enviar CSV
     Show Proforma: Ver proforma
     Delete ticket: Eliminar ticket
-    Send SMS...: Enviar SMS
+    Send SMS...: Enviar SMS...
     Pending payment: Pago pendiente
     Minimum import: Importe mínimo
     Notify changes: Notificar cambios
@@ -354,5 +372,6 @@ es:
     It was not able to clone the ticket: No se pudo clonar el ticket
     Regenerate PDF invoice: Regenerar PDF factura
     The invoice PDF document has been regenerated: El documento PDF de la factura ha sido regenerado
-    Set ticket weight: Establecer peso al ticket
+    Transfer client: Transferir cliente
+    Client: Cliente
 </i18n>

From 511d53d1099ed2444427f29edc4c05b08747b786 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Mon, 19 Aug 2024 13:48:55 +0200
Subject: [PATCH 016/281] feat: refs #7553 added refund and add turn functions
 to descriptor

---
 .../Ticket/Card/TicketDescriptorMenu.vue      | 138 ++++++++++++++++++
 1 file changed, 138 insertions(+)

diff --git a/src/pages/Ticket/Card/TicketDescriptorMenu.vue b/src/pages/Ticket/Card/TicketDescriptorMenu.vue
index 89c061507..1b64d7979 100644
--- a/src/pages/Ticket/Card/TicketDescriptorMenu.vue
+++ b/src/pages/Ticket/Card/TicketDescriptorMenu.vue
@@ -28,6 +28,7 @@ const ticket = ref(props.ticket);
 const ticketId = currentRoute.value.params.id;
 const client = ref();
 const showTransferDialog = ref(false);
+const showTurnDialog = ref(false);
 const dialogRef = ref();
 const actions = {
     clone: async () => {
@@ -195,6 +196,37 @@ async function transferClient(client) {
 
     if (data) window.location.reload();
 }
+
+async function addTurn(day) {
+    const params = {
+        ticketFk: parseInt(ticketId),
+        weekDay: day,
+        agencyModeFk: ticket.value.agencyModeFk,
+    };
+    await axios.patch(`TicketWeeklies`, params);
+
+    notify({
+        message: t('Current ticket deleted and added to shift'),
+        type: 'positive',
+    });
+    window.location.reload();
+}
+
+async function createRefund(withWarehouse) {
+    const params = {
+        ticketsIds: [parseInt(ticketId)],
+        withWarehouse: withWarehouse,
+    };
+    const { data } = await axios.post(`Tickets/refund`, params);
+    console.log('data: ', data);
+
+    if (data) {
+        const refundTicket = data;
+        console.log('refundTicket: ', refundTicket);
+
+        push({ name: 'TicketSale', params: { id: refundTicket[0].id } });
+    }
+}
 </script>
 <template>
     <QItem @click="showTransferDialog = !showTransferDialog" v-ripple clickable>
@@ -234,6 +266,75 @@ async function transferClient(client) {
             </template>
         </FormPopup>
     </QDialog>
+    <QItem @click="showTurnDialog = !showTurnDialog" v-ripple clickable>
+        <QItemSection avatar>
+            <QIcon name="content_paste" />
+        </QItemSection>
+        <QItemSection>{{ t('addTurn') }}</QItemSection>
+    </QItem>
+    <QDialog ref="dialogRef" v-model="showTurnDialog">
+        <FormPopup
+            @on-submit="addTurn"
+            :title="t('What is the day of receipt of the ticket?')"
+            :default-submit-button="false"
+            :default-cancel-button="false"
+            style="text-align: center"
+        >
+            <template #form-inputs>
+                <QBtnGroup spread>
+                    <QBtn
+                        :label="t('weekdays.mon')"
+                        color="primary"
+                        @click="addTurn(0)"
+                        v-ripple
+                        class="weekdaysBtn"
+                    />
+                    <QBtn
+                        :label="t('weekdays.tue')"
+                        color="primary"
+                        @click="addTurn(1)"
+                        v-ripple
+                        class="weekdaysBtn"
+                    />
+                    <QBtn
+                        :label="t('weekdays.wed')"
+                        color="primary"
+                        @click="addTurn(2)"
+                        v-ripple
+                        class="weekdaysBtn"
+                    />
+                    <QBtn
+                        :label="t('weekdays.thu')"
+                        color="primary"
+                        @click="addTurn(3)"
+                        v-ripple
+                        class="weekdaysBtn"
+                    />
+                    <QBtn
+                        :label="t('weekdays.fri')"
+                        color="primary"
+                        @click="addTurn(4)"
+                        v-ripple
+                        class="weekdaysBtn"
+                    />
+                    <QBtn
+                        :label="t('weekdays.sat')"
+                        color="primary"
+                        @click="addTurn(5)"
+                        v-ripple
+                        class="weekdaysBtn"
+                    />
+                    <QBtn
+                        :label="t('weekdays.sun')"
+                        color="primary"
+                        @click="addTurn(6)"
+                        v-ripple
+                        class="weekdaysBtn"
+                    />
+                </QBtnGroup>
+            </template>
+        </FormPopup>
+    </QDialog>
     <QItem v-ripple clickable>
         <QItemSection avatar>
             <QIcon name="picture_as_pdf" />
@@ -338,6 +439,29 @@ async function transferClient(client) {
         </QItemSection>
         <QItemSection>{{ t('To clone ticket') }}</QItemSection>
     </QItem>
+    <QItem v-ripple clickable>
+        <QItemSection avatar>
+            <QIcon name="monetization_on" />
+        </QItemSection>
+        <QItemSection>{{ t('Refund all...') }}</QItemSection>
+        <QItemSection side>
+            <QIcon name="keyboard_arrow_right" />
+        </QItemSection>
+        <QMenu anchor="top end" self="top start" auto-close bordered>
+            <QList>
+                <QItem v-ripple clickable @click="createRefund(true)">
+                    <QItemSection>
+                        {{ t('with warehouse') }}
+                    </QItemSection>
+                </QItem>
+                <QItem v-ripple clickable @click="createRefund(false)">
+                    <QItemSection>
+                        {{ t('without warehouse') }}
+                    </QItemSection>
+                </QItem>
+            </QList>
+        </QMenu>
+    </QItem>
     <template v-if="!ticket.isDeleted">
         <QSeparator />
         <QItem @click="openConfirmDialog('remove')" v-ripple clickable>
@@ -349,7 +473,15 @@ async function transferClient(client) {
     </template>
 </template>
 
+<style lang="scss" scoped>
+.weekdaysBtn {
+    margin: 1%;
+}
+</style>
+
 <i18n>
+en:
+    addTurn: Add turn
 es:
     Show Delivery Note...: Ver albarán...
     Send Delivery Note...: Enviar albarán...
@@ -374,4 +506,10 @@ es:
     The invoice PDF document has been regenerated: El documento PDF de la factura ha sido regenerado
     Transfer client: Transferir cliente
     Client: Cliente
+    addTurn: Añadir a turno
+    What is the day of receipt of the ticket?: ¿Cuál es el día de preparación del pedido?
+    Current ticket deleted and added to shift: Ticket actual eliminado y añadido al turno
+    Refund all...: Abonar todo...
+    with warehouse: con almacén
+    without warehouse: sin almacén
 </i18n>

From 85bc61029855cce21546744884924ba32926d9d6 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Tue, 20 Aug 2024 09:36:27 +0200
Subject: [PATCH 017/281] feat: refs #7553 refs #7356 & #7553 added rest of
 missing functions in the descriptor menu

---
 src/pages/Ticket/Card/TicketDescriptor.vue    |   2 +-
 .../Ticket/Card/TicketDescriptorMenu.vue      | 130 +++++++++++++++++-
 2 files changed, 124 insertions(+), 8 deletions(-)

diff --git a/src/pages/Ticket/Card/TicketDescriptor.vue b/src/pages/Ticket/Card/TicketDescriptor.vue
index 148b0dc35..b3dba2849 100644
--- a/src/pages/Ticket/Card/TicketDescriptor.vue
+++ b/src/pages/Ticket/Card/TicketDescriptor.vue
@@ -30,7 +30,7 @@ const filter = {
         {
             relation: 'address',
             scope: {
-                fields: ['id', 'name', 'mobile', 'phone'],
+                fields: ['id', 'name', 'mobile', 'phone', 'incotermsFk'],
             },
         },
         {
diff --git a/src/pages/Ticket/Card/TicketDescriptorMenu.vue b/src/pages/Ticket/Card/TicketDescriptorMenu.vue
index 1b64d7979..4c1cfad76 100644
--- a/src/pages/Ticket/Card/TicketDescriptorMenu.vue
+++ b/src/pages/Ticket/Card/TicketDescriptorMenu.vue
@@ -1,6 +1,6 @@
 <script setup>
 import axios from 'axios';
-import { ref } from 'vue';
+import { ref, toRefs } from 'vue';
 import { useQuasar } from 'quasar';
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
@@ -11,6 +11,8 @@ import VnSmsDialog from 'components/common/VnSmsDialog.vue';
 import toDate from 'filters/toDate';
 import FormPopup from 'components/FormPopup.vue';
 import VnSelect from 'components/common/VnSelect.vue';
+import FetchData from 'components/FetchData.vue';
+import VnInputTime from 'src/components/common/VnInputTime.vue';
 
 const props = defineProps({
     ticket: {
@@ -24,12 +26,16 @@ const { dialog, notify } = useQuasar();
 const { t } = useI18n();
 const { openReport, sendEmail } = usePrintService();
 
-const ticket = ref(props.ticket);
+const { ticket } = toRefs(props);
 const ticketId = currentRoute.value.params.id;
 const client = ref();
 const showTransferDialog = ref(false);
 const showTurnDialog = ref(false);
+const showChangeTimeDialog = ref(false);
 const dialogRef = ref();
+const isEditable = ref();
+const hasInvoicing = ref();
+const hasPdf = ref();
 const actions = {
     clone: async () => {
         const opts = { message: t('Ticket cloned'), type: 'positive' };
@@ -187,6 +193,26 @@ async function createPdfInvoice() {
     }
 }
 
+function makeInvoiceDialog() {
+    //TODO: lo de abajo?
+    // if (ticket.value.address?.incotermsFk && !ticket.value.weight && !force)
+    dialog({
+        component: VnConfirm,
+        componentProps: {
+            promise: makeInvoice,
+        },
+    });
+}
+async function makeInvoice() {
+    console.log(ticket.value);
+    const params = {
+        ticketsIds: [parseInt(ticketId)],
+    };
+    const { data } = await axios.post(`Tickets/invoiceTicketsAndPdf`, params);
+
+    if (data) window.location.reload();
+}
+
 async function transferClient(client) {
     const params = {
         clientFk: client,
@@ -218,17 +244,65 @@ async function createRefund(withWarehouse) {
         withWarehouse: withWarehouse,
     };
     const { data } = await axios.post(`Tickets/refund`, params);
-    console.log('data: ', data);
 
     if (data) {
         const refundTicket = data;
-        console.log('refundTicket: ', refundTicket);
 
         push({ name: 'TicketSale', params: { id: refundTicket[0].id } });
     }
 }
+
+async function changeShippedHour(time) {
+    console.log('time: ', time);
+    const params = {
+        shipped: time,
+    };
+
+    const { data } = await axios.post(`Tickets/${ticketId}/updateEditableTicket`, params);
+
+    if (data) window.location.reload();
+}
+
+function openRecalculateDialog() {
+    dialog({
+        component: VnConfirm,
+        componentProps: {
+            title: t('Recalculate components'),
+            message: t('Are you sure you want to recalculate components?'),
+            promise: recalculateComponents,
+        },
+    });
+}
+
+async function recalculateComponents() {
+    await axios.post(`Tickets/${ticketId}/recalculateComponents`);
+    notify({
+        message: t('Data saved'),
+        type: 'positive',
+    });
+    window.location.reload();
+}
+
+const handleFetchData = (data) => {
+    isEditable.value = data;
+    handleInvoiceOutData();
+};
+
+async function handleInvoiceOutData() {
+    const { data } = await axios.get(`InvoiceOuts`, {
+        params: {
+            filter: JSON.stringify({ where: { ref: ticket.value.refFk } }),
+        },
+    });
+    hasPdf.value = data[0]?.hasPdf;
+}
 </script>
 <template>
+    <FetchData
+        :url="`Tickets/${ticketId}/isEditable`"
+        auto-load
+        @on-fetch="handleFetchData"
+    />
     <QItem @click="showTransferDialog = !showTransferDialog" v-ripple clickable>
         <QItemSection avatar>
             <QIcon name="content_paste" />
@@ -268,7 +342,7 @@ async function createRefund(withWarehouse) {
     </QDialog>
     <QItem @click="showTurnDialog = !showTurnDialog" v-ripple clickable>
         <QItemSection avatar>
-            <QIcon name="content_paste" />
+            <QIcon name="vn:calendar" />
         </QItemSection>
         <QItemSection>{{ t('addTurn') }}</QItemSection>
     </QItem>
@@ -401,6 +475,20 @@ async function createRefund(withWarehouse) {
         </QItemSection>
         <QItemSection>{{ t('Show Proforma') }}</QItemSection>
     </QItem>
+    <QItem @click="showChangeTimeDialog = !showChangeTimeDialog" v-ripple clickable>
+        <QItemSection avatar>
+            <QIcon name="schedule" />
+        </QItemSection>
+        <QItemSection>{{ t('Change shipped hour') }}</QItemSection>
+    </QItem>
+    <QDialog ref="dialogRef" v-model="showChangeTimeDialog">
+        <FormPopup @on-submit="changeShippedHour(time)" :title="t('Change shipped hour')">
+            <template #form-inputs>
+                <!--TODO: pone el año a 1970, corregir-->
+                <VnInputTime v-model="time" :label="t('Shipped hour')" clearable />
+            </template>
+        </FormPopup>
+    </QDialog>
     <QItem v-ripple clickable>
         <QItemSection avatar>
             <QIcon name="sms" />
@@ -427,11 +515,26 @@ async function createRefund(withWarehouse) {
             </QList>
         </QMenu>
     </QItem>
-    <QItem @click="createPdfDialog()" v-ripple clickable>
+    <!--TODO: acabar esta parte, falta la función makeInvoice-->
+    <QItem @click="makeInvoiceDialog()" v-ripple clickable v-if="isEditable">
         <QItemSection avatar>
             <QIcon name="picture_as_pdf" />
         </QItemSection>
-        <QItemSection>{{ t('Regenerate PDF invoice') }}</QItemSection>
+        <QItemSection>{{ t('Make invoice') }}</QItemSection>
+    </QItem>
+    <!--TODO: acabar esta parte, falta el campo hasInvoicing-->
+    <QItem
+        @click="createPdfDialog()"
+        v-ripple
+        clickable
+        v-if="ticket.refFk !== null && (ticket.hasInvoicing || hasPdf)"
+    >
+        <QItemSection avatar>
+            <QIcon name="picture_as_pdf" />
+        </QItemSection>
+        <QItemSection>{{
+            hasPdf.value ? t('Regenerate PDF invoice') : t('Generate PDF invoice')
+        }}</QItemSection>
     </QItem>
     <QItem @click="openConfirmDialog('clone')" v-ripple clickable>
         <QItemSection avatar>
@@ -439,6 +542,12 @@ async function createRefund(withWarehouse) {
         </QItemSection>
         <QItemSection>{{ t('To clone ticket') }}</QItemSection>
     </QItem>
+    <QItem @click="openRecalculateDialog()" v-ripple clickable>
+        <QItemSection avatar>
+            <QIcon name="refresh" />
+        </QItemSection>
+        <QItemSection>{{ t('Recalculate components') }}</QItemSection>
+    </QItem>
     <QItem v-ripple clickable>
         <QItemSection avatar>
             <QIcon name="monetization_on" />
@@ -502,6 +611,7 @@ es:
     To clone ticket: Clonar ticket
     Ticket cloned: Ticked clonado
     It was not able to clone the ticket: No se pudo clonar el ticket
+    Generate PDF invoice: Generar PDF factura
     Regenerate PDF invoice: Regenerar PDF factura
     The invoice PDF document has been regenerated: El documento PDF de la factura ha sido regenerado
     Transfer client: Transferir cliente
@@ -512,4 +622,10 @@ es:
     Refund all...: Abonar todo...
     with warehouse: con almacén
     without warehouse: sin almacén
+    Make invoice: Crear factura
+    Change shipped hour: Cambiar hora de envío
+    Shipped hour: Hora de envío
+    Recalculate components: Recalcular componentes
+    Are you sure you want to recalculate components?: ¿Seguro que quieres recalcular los componentes?
+    Data saved: Datos guardados
 </i18n>

From 5f63a9b05884aa80d09f619d21326e5f293b5e74 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Tue, 20 Aug 2024 10:02:23 +0200
Subject: [PATCH 018/281] refactor: refs #7553 & #7356 changed makeInvoice
 function and dialogs

---
 src/pages/Ticket/Card/TicketDescriptorMenu.vue | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/pages/Ticket/Card/TicketDescriptorMenu.vue b/src/pages/Ticket/Card/TicketDescriptorMenu.vue
index 4c1cfad76..aec920002 100644
--- a/src/pages/Ticket/Card/TicketDescriptorMenu.vue
+++ b/src/pages/Ticket/Card/TicketDescriptorMenu.vue
@@ -194,23 +194,26 @@ async function createPdfInvoice() {
 }
 
 function makeInvoiceDialog() {
-    //TODO: lo de abajo?
-    // if (ticket.value.address?.incotermsFk && !ticket.value.weight && !force)
     dialog({
         component: VnConfirm,
         componentProps: {
+            title: t('Are you sure you want to invoice this ticket?'),
+            message: t('You are going to invoice this ticket'),
             promise: makeInvoice,
         },
     });
 }
 async function makeInvoice() {
-    console.log(ticket.value);
     const params = {
         ticketsIds: [parseInt(ticketId)],
     };
-    const { data } = await axios.post(`Tickets/invoiceTicketsAndPdf`, params);
+    await axios.post(`Tickets/invoiceTicketsAndPdf`, params);
 
-    if (data) window.location.reload();
+    notify({
+        message: t('Ticket invoiced'),
+        type: 'positive',
+    });
+    window.location.reload();
 }
 
 async function transferClient(client) {
@@ -515,7 +518,6 @@ async function handleInvoiceOutData() {
             </QList>
         </QMenu>
     </QItem>
-    <!--TODO: acabar esta parte, falta la función makeInvoice-->
     <QItem @click="makeInvoiceDialog()" v-ripple clickable v-if="isEditable">
         <QItemSection avatar>
             <QIcon name="picture_as_pdf" />
@@ -628,4 +630,7 @@ es:
     Recalculate components: Recalcular componentes
     Are you sure you want to recalculate components?: ¿Seguro que quieres recalcular los componentes?
     Data saved: Datos guardados
+    Are you sure you want to invoice this ticket?: ¿Seguro que quieres facturar este ticket?
+    You are going to invoice this ticket: Vas a facturar este ticket
+    Ticket invoiced: Ticket facturado
 </i18n>

From 79a26d7b94c75708157f8f1ed1b4deda62aafd2d Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Wed, 21 Aug 2024 11:42:03 +0200
Subject: [PATCH 019/281] feat: refs #7553 refs  #7356 added VnTable in
 TicketVolume & fixed QBadge in summary

---
 src/pages/Ticket/Card/TicketSummary.vue | 11 ++--
 src/pages/Ticket/Card/TicketVolume.vue  | 69 ++++++++++++-------------
 2 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index 155b3a820..634568e46 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -137,11 +137,14 @@ async function changeState(value) {
                     :url="ticketUrl + 'basic-data/step-one'"
                     :text="t('globals.summary.basicData')"
                 />
-                <VnLv :label="t('ticket.summary.state')">
+                <VnLv v-if="ticket.ticketState" :label="t('ticket.summary.state')">
                     <template #value>
-                        <QChip :color="ticket.ticketState?.state?.classColor ?? 'dark'">
-                            {{ ticket.ticketState?.state?.name }}
-                        </QChip>
+                        <QBadge
+                            text-color="black"
+                            :color="ticket.ticketState.state.classColor"
+                        >
+                            {{ ticket.ticketState.state.name }}
+                        </QBadge>
                     </template>
                 </VnLv>
                 <VnLv :label="t('ticket.summary.salesPerson')">
diff --git a/src/pages/Ticket/Card/TicketVolume.vue b/src/pages/Ticket/Card/TicketVolume.vue
index a47a127c1..e6db759d0 100644
--- a/src/pages/Ticket/Card/TicketVolume.vue
+++ b/src/pages/Ticket/Card/TicketVolume.vue
@@ -11,11 +11,13 @@ import FetchData from 'components/FetchData.vue';
 import { useStateStore } from 'stores/useStateStore';
 import { dashIfEmpty } from 'src/filters';
 import axios from 'axios';
+import VnTable from 'src/components/VnTable/VnTable.vue';
 
 const route = useRoute();
 const stateStore = useStateStore();
 const { t } = useI18n();
 const salesRef = ref(null);
+const tableRef = ref();
 
 watch(
     () => route.params.id,
@@ -34,37 +36,34 @@ const salesFilter = computed(() => ({
 
 const sales = ref([]);
 const packingTypeVolume = ref([]);
-const rows = computed(() => sales.value);
 
 const columns = computed(() => [
     {
+        align: 'left',
         label: t('volume.item'),
-        name: 'item',
-        align: 'left',
+        name: 'itemFk',
     },
     {
+        align: 'left',
         label: t('volume.description'),
-        name: 'description',
-        align: 'left',
+        name: 'concept',
+        columnClass: 'expand',
     },
     {
+        align: 'left',
         label: t('volume.packingType'),
-        name: 'quantity',
-        field: (row) => row.item.itemPackingTypeFk,
-        align: 'left',
-        format: (val) => dashIfEmpty(val),
+        name: 'itemPackingTypeFk',
+        format: (row, dashIfEmpty) => dashIfEmpty(row.item.itemPackingTypeFk),
     },
     {
+        align: 'left',
         label: t('volume.quantity'),
         name: 'quantity',
-        field: 'quantity',
-        align: 'left',
     },
     {
-        label: t('volume.volumeQuantity'),
-        name: 'quantity',
-        field: (row) => row.saleVolume?.volume,
         align: 'left',
+        label: t('volume.volumeQuantity'),
+        name: 'volume',
     },
 ]);
 
@@ -124,30 +123,28 @@ onUnmounted(() => (stateStore.rightDrawer = false));
             </QCard>
         </template>
     </RightMenu>
-    <QTable
-        :rows="rows"
+    <VnTable
+        ref="tableRef"
+        data-key="TicketVolume"
+        :url="`Tickets/${route.params.id}/getSales`"
         :columns="columns"
-        row-key="id"
-        :pagination="{ rowsPerPage: 0 }"
-        class="full-width q-mt-md"
-        :no-data-label="t('globals.noResults')"
+        :right-search="false"
+        :column-search="false"
+        auto-load
     >
-        <template #body-cell-item="{ row }">
-            <QTd>
-                <QBtn flat class="link" @click.stop>
-                    {{ row.itemFk }}
-                    <ItemDescriptorProxy :id="row.itemFk" />
-                </QBtn>
-            </QTd>
+        <template #column-itemFk="{ row }">
+            <span class="link">
+                {{ row.itemFk }}
+                <ItemDescriptorProxy :id="row.itemFk" />
+            </span>
         </template>
-        <template #body-cell-description="{ row }">
-            <QTd>
-                <div class="column">
-                    <span>{{ row.item.name }}</span>
-                    <span class="color-vn-label">{{ row.item.subName }}</span>
-                    <FetchedTags :item="row.item" :max-length="6" />
-                </div>
-            </QTd>
+        <template #column-concept="{ row }">
+            <span>{{ row.item.name }}</span>
+            <span class="color-vn-label q-pl-md">{{ row.item.subName }}</span>
+            <FetchedTags :item="row.item" :max-length="6" />
         </template>
-    </QTable>
+        <template #column-volume="{ rowIndex }">
+            <span>{{ packingTypeVolume?.[rowIndex]?.volume }}</span>
+        </template>
+    </VnTable>
 </template>

From 87eca93ef867b9bf797879356379bce4dc041861 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 21 Aug 2024 12:16:21 +0200
Subject: [PATCH 020/281] fix: use class link

---
 .../Ticket/Card/BasicData/BasicDataTable.vue  | 263 ------------------
 src/pages/Ticket/Card/TicketComponents.vue    |   6 +-
 2 files changed, 3 insertions(+), 266 deletions(-)
 delete mode 100644 src/pages/Ticket/Card/BasicData/BasicDataTable.vue

diff --git a/src/pages/Ticket/Card/BasicData/BasicDataTable.vue b/src/pages/Ticket/Card/BasicData/BasicDataTable.vue
deleted file mode 100644
index 48b8c882f..000000000
--- a/src/pages/Ticket/Card/BasicData/BasicDataTable.vue
+++ /dev/null
@@ -1,263 +0,0 @@
-<script setup>
-import { ref, computed, onMounted, onUnmounted, watch } from 'vue';
-import { useI18n } from 'vue-i18n';
-
-import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
-import FetchedTags from 'components/ui/FetchedTags.vue';
-import RightMenu from 'src/components/common/RightMenu.vue';
-import FetchData from 'components/FetchData.vue';
-
-import { useStateStore } from 'stores/useStateStore';
-import { toCurrency } from 'filters/index';
-import { useRole } from 'src/composables/useRole';
-
-const $props = defineProps({
-    formData: {
-        type: Object,
-        required: true,
-    },
-    haveNegatives: {
-        type: Boolean,
-        required: true,
-        default: false,
-    },
-});
-
-const emit = defineEmits(['updateForm', 'update:haveNegatives']);
-
-const stateStore = useStateStore();
-const { t } = useI18n();
-const { hasAny } = useRole();
-
-const _ticketData = ref($props.formData);
-const ticketUpdateActions = ref(null);
-const haveNegatives = computed({
-    get: () => $props.haveNegatives,
-    set: (val) => emit('update:haveNegatives', val),
-});
-const rows = computed(() => _ticketData.value?.sale?.items || []);
-
-watch(
-    () => _ticketData.value,
-    (val) => emit('updateForm', val),
-    { deep: true }
-);
-
-const columns = computed(() => [
-    {
-        required: true,
-        label: t('basicData.item'),
-        name: 'item',
-        align: 'left',
-        format: (val) => val.name,
-    },
-    {
-        required: true,
-        label: t('basicData.description'),
-        name: 'description',
-        align: 'left',
-        hidden: true,
-    },
-    {
-        label: t('basicData.movable'),
-        name: 'movable',
-        align: 'left',
-    },
-    {
-        required: true,
-        label: t('basicData.quantity'),
-        name: 'quantity',
-        field: 'quantity',
-        align: 'left',
-    },
-    {
-        required: true,
-        label: t('basicData.pricePPU'),
-        name: 'price',
-        field: 'price',
-        align: 'left',
-        format: (val) => toCurrency(val),
-    },
-    {
-        required: true,
-        label: t('basicData.newPricePPU'),
-        name: 'newPrice',
-        field: (row) => row.component.newPrice,
-        align: 'left',
-        format: (val) => toCurrency(val),
-    },
-    {
-        required: true,
-        label: t('basicData.difference'),
-        name: 'difference',
-        field: (row) => row.component.difference,
-        align: 'left',
-        format: (val) => toCurrency(val),
-    },
-]);
-
-const loadDefaultTicketAction = () => {
-    const isSalesAssistant = hasAny(['salesAssistant']);
-    _ticketData.value.option = isSalesAssistant ? 'mana' : 'renewPrices';
-};
-
-const totalPrice = computed(() => {
-    return rows.value.reduce((acc, item) => acc + item.price * item.quantity, 0);
-});
-
-const totalNewPrice = computed(() => {
-    return rows.value.reduce(
-        (acc, item) => acc + item.component.newPrice * item.quantity,
-        0
-    );
-});
-
-const totalDifference = computed(() => {
-    return rows.value.reduce((acc, item) => acc + item.component?.difference || 0, 0);
-});
-const showMovablecolumn = computed(() => (haveDifferences.value > 0 ? ['movable'] : []));
-const haveDifferences = computed(() => _ticketData.value.sale?.haveDifferences);
-const ticketHaveNegatives = () => {
-    let _haveNegatives = false;
-    let haveNotNegatives = false;
-    _ticketData.value.withoutNegatives = false;
-    _ticketData.value?.sale?.items.forEach((item) => {
-        if (item.quantity > item.movable) _haveNegatives = true;
-        else haveNotNegatives = true;
-    });
-
-    haveNegatives.value = _haveNegatives && haveNotNegatives && haveDifferences.value;
-    if (haveNegatives.value) _ticketData.value.withoutNegatives = true;
-};
-
-onMounted(() => {
-    stateStore.rightDrawer = true;
-    loadDefaultTicketAction();
-    ticketHaveNegatives();
-});
-
-onUnmounted(() => (stateStore.rightDrawer = false));
-</script>
-
-<template>
-    <FetchData
-        url="TicketUpdateActions"
-        @on-fetch="(data) => (ticketUpdateActions = data)"
-        auto-load
-    />
-    <RightMenu>
-        <template #right-panel>
-            <QCard
-                class="q-pa-md q-mb-md q-ma-md color-vn-text"
-                bordered
-                flat
-                style="border-color: black"
-            >
-                <QCardSection horizontal>
-                    <span class="text-weight-bold text-subtitle1 text-center full-width">
-                        {{ t('basicData.total') }}
-                    </span>
-                </QCardSection>
-                <QCardSection class="column items-center" horizontal>
-                    <span>
-                        {{ t('basicData.price') }}:
-                        {{ toCurrency(totalPrice) }}
-                    </span>
-                </QCardSection>
-                <QCardSection class="column items-center" horizontal>
-                    <span>
-                        {{ t('basicData.newPrice') }}: {{ toCurrency(totalNewPrice) }}
-                    </span>
-                </QCardSection>
-                <QCardSection class="column items-center" horizontal>
-                    <span>
-                        {{ t('basicData.difference') }}: {{ toCurrency(totalDifference) }}
-                    </span>
-                </QCardSection>
-            </QCard>
-            <QCard
-                v-if="totalDifference"
-                class="q-pa-md q-mb-md q-ma-md color-vn-text"
-                bordered
-                flat
-                style="border-color: black"
-            >
-                <QCardSection horizontal>
-                    <span class="text-weight-bold text-subtitle1 text-center full-width">
-                        {{ t('basicData.chargeDifference') }}
-                    </span>
-                </QCardSection>
-                <QCardSection
-                    v-for="(action, index) in ticketUpdateActions"
-                    :key="index"
-                    horizontal
-                >
-                    <QRadio
-                        v-model="_ticketData.option"
-                        :val="action.code"
-                        :label="action.description"
-                        dense
-                    />
-                </QCardSection>
-            </QCard>
-            <QCard
-                v-if="haveNegatives"
-                class="q-pa-md q-mb-md q-ma-md color-vn-text"
-                bordered
-                flat
-                style="border-color: black"
-            >
-                <QCardSection horizontal class="flex row items-center">
-                    <QCheckbox
-                        :label="t('basicData.withoutNegatives')"
-                        v-model="_ticketData.withoutNegatives"
-                        :toggle-indeterminate="false"
-                    />
-                    <QIcon name="info" size="xs" class="q-ml-sm">
-                        <QTooltip max-width="350px">
-                            {{ t('basicData.withoutNegativesInfo') }}
-                        </QTooltip>
-                    </QIcon>
-                </QCardSection>
-            </QCard>
-        </template>
-    </RightMenu>
-    <QTable
-        :visible-columns="showMovablecolumn"
-        :rows="rows"
-        :columns="columns"
-        row-key="id"
-        :pagination="{ rowsPerPage: 0 }"
-        class="full-width q-mt-md"
-        :no-data-label="t('globals.noResults')"
-        flat
-    >
-        <template #body-cell-item="{ row }">
-            <QTd>
-                <QBtn flat color="primary">
-                    {{ row.itemFk }}
-                    <ItemDescriptorProxy :id="row.itemFk" />
-                </QBtn>
-            </QTd>
-        </template>
-        <template #body-cell-description="{ row }">
-            <QTd>
-                <div class="column">
-                    <span>{{ row.item.name }}</span>
-                    <span class="color-vn-label">{{ row.item.subName }}</span>
-                    <FetchedTags :item="row.item" :max-length="6" />
-                </div>
-            </QTd>
-        </template>
-        <template #body-cell-movable="{ row }">
-            <QTd>
-                <QBadge
-                    v-if="_ticketData?.sale?.haveDifferences"
-                    :text-color="row.quantity > row.movable ? 'black' : 'white'"
-                    :color="row.quantity > row.movable ? 'negative' : 'transparent'"
-                    :label="row.movable"
-                />
-            </QTd>
-        </template>
-    </QTable>
-</template>
diff --git a/src/pages/Ticket/Card/TicketComponents.vue b/src/pages/Ticket/Card/TicketComponents.vue
index 3954b5a62..0f14f5956 100644
--- a/src/pages/Ticket/Card/TicketComponents.vue
+++ b/src/pages/Ticket/Card/TicketComponents.vue
@@ -298,9 +298,9 @@ onUnmounted(() => (stateStore.rightDrawer = false));
         :no-data-label="t('globals.noResults')"
     >
         <template #body-cell-item="{ row }">
-            <QTd>
-                <QBtn flat color="primary">
-                    <span class="link">{{ row.itemFk }}</span>
+            <QTd @click.stop class="link">
+                <QBtn flat>
+                    <span>{{ row.itemFk }}</span>
                     <ItemDescriptorProxy :id="row.itemFk" />
                 </QBtn>
             </QTd>

From 6218463e7e82699b0aaf4d6b26e7388d529dfaad Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 21 Aug 2024 12:16:29 +0200
Subject: [PATCH 021/281] perf: rename component

---
 .../Ticket/Card/BasicData/TicketBasicData.vue | 263 ++++++++++++++++++
 .../Card/BasicData/TicketBasicDataView.vue    |   4 +-
 2 files changed, 265 insertions(+), 2 deletions(-)
 create mode 100644 src/pages/Ticket/Card/BasicData/TicketBasicData.vue

diff --git a/src/pages/Ticket/Card/BasicData/TicketBasicData.vue b/src/pages/Ticket/Card/BasicData/TicketBasicData.vue
new file mode 100644
index 000000000..61337a3c9
--- /dev/null
+++ b/src/pages/Ticket/Card/BasicData/TicketBasicData.vue
@@ -0,0 +1,263 @@
+<script setup>
+import { ref, computed, onMounted, onUnmounted, watch } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
+import FetchedTags from 'components/ui/FetchedTags.vue';
+import RightMenu from 'src/components/common/RightMenu.vue';
+import FetchData from 'components/FetchData.vue';
+
+import { useStateStore } from 'stores/useStateStore';
+import { toCurrency } from 'filters/index';
+import { useRole } from 'src/composables/useRole';
+
+const $props = defineProps({
+    formData: {
+        type: Object,
+        required: true,
+    },
+    haveNegatives: {
+        type: Boolean,
+        required: true,
+        default: false,
+    },
+});
+
+const emit = defineEmits(['updateForm', 'update:haveNegatives']);
+
+const stateStore = useStateStore();
+const { t } = useI18n();
+const { hasAny } = useRole();
+
+const _ticketData = ref($props.formData);
+const ticketUpdateActions = ref(null);
+const haveNegatives = computed({
+    get: () => $props.haveNegatives,
+    set: (val) => emit('update:haveNegatives', val),
+});
+const rows = computed(() => _ticketData.value?.sale?.items || []);
+
+watch(
+    () => _ticketData.value,
+    (val) => emit('updateForm', val),
+    { deep: true }
+);
+
+const columns = computed(() => [
+    {
+        required: true,
+        label: t('basicData.item'),
+        name: 'item',
+        align: 'left',
+        format: (val) => val.name,
+    },
+    {
+        required: true,
+        label: t('basicData.description'),
+        name: 'description',
+        align: 'left',
+        hidden: true,
+    },
+    {
+        label: t('basicData.movable'),
+        name: 'movable',
+        align: 'left',
+    },
+    {
+        required: true,
+        label: t('basicData.quantity'),
+        name: 'quantity',
+        field: 'quantity',
+        align: 'left',
+    },
+    {
+        required: true,
+        label: t('basicData.pricePPU'),
+        name: 'price',
+        field: 'price',
+        align: 'left',
+        format: (val) => toCurrency(val),
+    },
+    {
+        required: true,
+        label: t('basicData.newPricePPU'),
+        name: 'newPrice',
+        field: (row) => row.component.newPrice,
+        align: 'left',
+        format: (val) => toCurrency(val),
+    },
+    {
+        required: true,
+        label: t('basicData.difference'),
+        name: 'difference',
+        field: (row) => row.component.difference,
+        align: 'left',
+        format: (val) => toCurrency(val),
+    },
+]);
+
+const loadDefaultTicketAction = () => {
+    const isSalesAssistant = hasAny(['salesAssistant']);
+    _ticketData.value.option = isSalesAssistant ? 'mana' : 'renewPrices';
+};
+
+const totalPrice = computed(() => {
+    return rows.value.reduce((acc, item) => acc + item.price * item.quantity, 0);
+});
+
+const totalNewPrice = computed(() => {
+    return rows.value.reduce(
+        (acc, item) => acc + item.component.newPrice * item.quantity,
+        0
+    );
+});
+
+const totalDifference = computed(() => {
+    return rows.value.reduce((acc, item) => acc + item.component?.difference || 0, 0);
+});
+const showMovablecolumn = computed(() => (haveDifferences.value > 0 ? ['movable'] : []));
+const haveDifferences = computed(() => _ticketData.value.sale?.haveDifferences);
+const ticketHaveNegatives = () => {
+    let _haveNegatives = false;
+    let haveNotNegatives = false;
+    _ticketData.value.withoutNegatives = false;
+    _ticketData.value?.sale?.items.forEach((item) => {
+        if (item.quantity > item.movable) _haveNegatives = true;
+        else haveNotNegatives = true;
+    });
+
+    haveNegatives.value = _haveNegatives && haveNotNegatives && haveDifferences.value;
+    if (haveNegatives.value) _ticketData.value.withoutNegatives = true;
+};
+
+onMounted(() => {
+    stateStore.rightDrawer = true;
+    loadDefaultTicketAction();
+    ticketHaveNegatives();
+});
+
+onUnmounted(() => (stateStore.rightDrawer = false));
+</script>
+
+<template>
+    <FetchData
+        url="TicketUpdateActions"
+        @on-fetch="(data) => (ticketUpdateActions = data)"
+        auto-load
+    />
+    <RightMenu>
+        <template #right-panel>
+            <QCard
+                class="q-pa-md q-mb-md q-ma-md color-vn-text"
+                bordered
+                flat
+                style="border-color: black"
+            >
+                <QCardSection horizontal>
+                    <span class="text-weight-bold text-subtitle1 text-center full-width">
+                        {{ t('basicData.total') }}
+                    </span>
+                </QCardSection>
+                <QCardSection class="column items-center" horizontal>
+                    <span>
+                        {{ t('basicData.price') }}:
+                        {{ toCurrency(totalPrice) }}
+                    </span>
+                </QCardSection>
+                <QCardSection class="column items-center" horizontal>
+                    <span>
+                        {{ t('basicData.newPrice') }}: {{ toCurrency(totalNewPrice) }}
+                    </span>
+                </QCardSection>
+                <QCardSection class="column items-center" horizontal>
+                    <span>
+                        {{ t('basicData.difference') }}: {{ toCurrency(totalDifference) }}
+                    </span>
+                </QCardSection>
+            </QCard>
+            <QCard
+                v-if="totalDifference"
+                class="q-pa-md q-mb-md q-ma-md color-vn-text"
+                bordered
+                flat
+                style="border-color: black"
+            >
+                <QCardSection horizontal>
+                    <span class="text-weight-bold text-subtitle1 text-center full-width">
+                        {{ t('basicData.chargeDifference') }}
+                    </span>
+                </QCardSection>
+                <QCardSection
+                    v-for="(action, index) in ticketUpdateActions"
+                    :key="index"
+                    horizontal
+                >
+                    <QRadio
+                        v-model="_ticketData.option"
+                        :val="action.code"
+                        :label="action.description"
+                        dense
+                    />
+                </QCardSection>
+            </QCard>
+            <QCard
+                v-if="haveNegatives"
+                class="q-pa-md q-mb-md q-ma-md color-vn-text"
+                bordered
+                flat
+                style="border-color: black"
+            >
+                <QCardSection horizontal class="flex row items-center">
+                    <QCheckbox
+                        :label="t('basicData.withoutNegatives')"
+                        v-model="_ticketData.withoutNegatives"
+                        :toggle-indeterminate="false"
+                    />
+                    <QIcon name="info" size="xs" class="q-ml-sm">
+                        <QTooltip max-width="350px">
+                            {{ t('basicData.withoutNegativesInfo') }}
+                        </QTooltip>
+                    </QIcon>
+                </QCardSection>
+            </QCard>
+        </template>
+    </RightMenu>
+    <QTable
+        :visible-columns="showMovablecolumn"
+        :rows="rows"
+        :columns="columns"
+        row-key="id"
+        :pagination="{ rowsPerPage: 0 }"
+        class="full-width q-mt-md"
+        :no-data-label="t('globals.noResults')"
+        flat
+    >
+        <template #body-cell-item="{ row }">
+            <QTd @click.stop class="link">
+                <QBtn flat>
+                    {{ row.itemFk }}
+                    <ItemDescriptorProxy :id="row.itemFk" />
+                </QBtn>
+            </QTd>
+        </template>
+        <template #body-cell-description="{ row }">
+            <QTd>
+                <div class="column">
+                    <span>{{ row.item.name }}</span>
+                    <span class="color-vn-label">{{ row.item.subName }}</span>
+                    <FetchedTags :item="row.item" :max-length="6" />
+                </div>
+            </QTd>
+        </template>
+        <template #body-cell-movable="{ row }">
+            <QTd>
+                <QBadge
+                    v-if="_ticketData?.sale?.haveDifferences"
+                    :text-color="row.quantity > row.movable ? 'black' : 'white'"
+                    :color="row.quantity > row.movable ? 'negative' : 'transparent'"
+                    :label="row.movable"
+                />
+            </QTd>
+        </template>
+    </QTable>
+</template>
diff --git a/src/pages/Ticket/Card/BasicData/TicketBasicDataView.vue b/src/pages/Ticket/Card/BasicData/TicketBasicDataView.vue
index af47761a2..a88e5e6d6 100644
--- a/src/pages/Ticket/Card/BasicData/TicketBasicDataView.vue
+++ b/src/pages/Ticket/Card/BasicData/TicketBasicDataView.vue
@@ -3,7 +3,7 @@ import { ref, onBeforeMount } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute, useRouter } from 'vue-router';
 
-import BasicDataTable from './BasicDataTable.vue';
+import TicketBasicData from './TicketBasicData.vue';
 import TicketBasicDataForm from './TicketBasicDataForm.vue';
 import { useVnConfirm } from 'composables/useVnConfirm';
 
@@ -168,7 +168,7 @@ onBeforeMount(async () => await getTicketData());
             />
         </QStep>
         <QStep :name="2" :title="t('basicData.priceDifference')">
-            <BasicDataTable
+            <TicketBasicData
                 :form-data="formData"
                 v-model:haveNegatives="haveNegatives"
                 @update-form="($event) => (formData = $event)"

From 56c461f085aecf4ba8f994871085a2f0fb3de890 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Wed, 21 Aug 2024 12:41:04 +0200
Subject: [PATCH 022/281] refactor: refs #7553 refs #7356 changed generatePdf
 name, fixed changeTime & added order in TicketVolume

---
 .../Ticket/Card/TicketDescriptorMenu.vue      | 19 ++++++++++++-------
 src/pages/Ticket/Card/TicketVolume.vue        |  1 +
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/pages/Ticket/Card/TicketDescriptorMenu.vue b/src/pages/Ticket/Card/TicketDescriptorMenu.vue
index aec920002..3354da966 100644
--- a/src/pages/Ticket/Card/TicketDescriptorMenu.vue
+++ b/src/pages/Ticket/Card/TicketDescriptorMenu.vue
@@ -166,16 +166,16 @@ function openConfirmDialog(callback) {
     });
 }
 
-function createPdfDialog() {
+function generatePdfDialog() {
     dialog({
         component: VnConfirm,
         componentProps: {
-            promise: createPdfInvoice,
+            promise: generatePdfInvoice,
         },
     });
 }
 
-async function createPdfInvoice() {
+async function generatePdfInvoice() {
     const { data } = await axios.get('invoiceOuts', {
         params: {
             filter: JSON.stringify({
@@ -478,7 +478,12 @@ async function handleInvoiceOutData() {
         </QItemSection>
         <QItemSection>{{ t('Show Proforma') }}</QItemSection>
     </QItem>
-    <QItem @click="showChangeTimeDialog = !showChangeTimeDialog" v-ripple clickable>
+    <QItem
+        v-if="isEditable"
+        @click="showChangeTimeDialog = !showChangeTimeDialog"
+        v-ripple
+        clickable
+    >
         <QItemSection avatar>
             <QIcon name="schedule" />
         </QItemSection>
@@ -487,7 +492,7 @@ async function handleInvoiceOutData() {
     <QDialog ref="dialogRef" v-model="showChangeTimeDialog">
         <FormPopup @on-submit="changeShippedHour(time)" :title="t('Change shipped hour')">
             <template #form-inputs>
-                <!--TODO: pone el año a 1970, corregir-->
+                <!--TODO: pone el año a 1970, esperar corrección componente VnInputTime-->
                 <VnInputTime v-model="time" :label="t('Shipped hour')" clearable />
             </template>
         </FormPopup>
@@ -526,7 +531,7 @@ async function handleInvoiceOutData() {
     </QItem>
     <!--TODO: acabar esta parte, falta el campo hasInvoicing-->
     <QItem
-        @click="createPdfDialog()"
+        @click="generatePdfDialog()"
         v-ripple
         clickable
         v-if="ticket.refFk !== null && (ticket.hasInvoicing || hasPdf)"
@@ -544,7 +549,7 @@ async function handleInvoiceOutData() {
         </QItemSection>
         <QItemSection>{{ t('To clone ticket') }}</QItemSection>
     </QItem>
-    <QItem @click="openRecalculateDialog()" v-ripple clickable>
+    <QItem v-if="isEditable" @click="openRecalculateDialog()" v-ripple clickable>
         <QItemSection avatar>
             <QIcon name="refresh" />
         </QItemSection>
diff --git a/src/pages/Ticket/Card/TicketVolume.vue b/src/pages/Ticket/Card/TicketVolume.vue
index e6db759d0..61f9b83d9 100644
--- a/src/pages/Ticket/Card/TicketVolume.vue
+++ b/src/pages/Ticket/Card/TicketVolume.vue
@@ -130,6 +130,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
         :columns="columns"
         :right-search="false"
         :column-search="false"
+        :order="['itemPackingTypeFk']"
         auto-load
     >
         <template #column-itemFk="{ row }">

From ffa6ef57fe18230e2828ec238c8eb6471ede3899 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Wed, 21 Aug 2024 13:18:43 +0200
Subject: [PATCH 023/281] fix: refs #7553 refs #7356 fix generatePdf function

---
 src/pages/Ticket/Card/TicketDescriptorMenu.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/pages/Ticket/Card/TicketDescriptorMenu.vue b/src/pages/Ticket/Card/TicketDescriptorMenu.vue
index 3354da966..d8efe08c1 100644
--- a/src/pages/Ticket/Card/TicketDescriptorMenu.vue
+++ b/src/pages/Ticket/Card/TicketDescriptorMenu.vue
@@ -13,6 +13,7 @@ import FormPopup from 'components/FormPopup.vue';
 import VnSelect from 'components/common/VnSelect.vue';
 import FetchData from 'components/FetchData.vue';
 import VnInputTime from 'src/components/common/VnInputTime.vue';
+import { useAcl } from 'src/composables/useAcl';
 
 const props = defineProps({
     ticket: {
@@ -34,7 +35,7 @@ const showTurnDialog = ref(false);
 const showChangeTimeDialog = ref(false);
 const dialogRef = ref();
 const isEditable = ref();
-const hasInvoicing = ref();
+const hasInvoicing = useAcl('invoicing');
 const hasPdf = ref();
 const actions = {
     clone: async () => {
@@ -529,18 +530,17 @@ async function handleInvoiceOutData() {
         </QItemSection>
         <QItemSection>{{ t('Make invoice') }}</QItemSection>
     </QItem>
-    <!--TODO: acabar esta parte, falta el campo hasInvoicing-->
     <QItem
         @click="generatePdfDialog()"
         v-ripple
         clickable
-        v-if="ticket.refFk !== null && (ticket.hasInvoicing || hasPdf)"
+        v-if="ticket.refFk !== null && (hasInvoicing || hasPdf)"
     >
         <QItemSection avatar>
             <QIcon name="picture_as_pdf" />
         </QItemSection>
         <QItemSection>{{
-            hasPdf.value ? t('Regenerate PDF invoice') : t('Generate PDF invoice')
+            hasPdf ? t('Regenerate PDF invoice') : t('Generate PDF invoice')
         }}</QItemSection>
     </QItem>
     <QItem @click="openConfirmDialog('clone')" v-ripple clickable>

From a131cb559dbbc8f012f650bd6cbdd0130042a6d4 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 21 Aug 2024 13:34:40 +0200
Subject: [PATCH 024/281] feat: add max rule

---
 src/components/common/VnInput.vue | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/components/common/VnInput.vue b/src/components/common/VnInput.vue
index 75d4b8a28..e79a235d5 100644
--- a/src/components/common/VnInput.vue
+++ b/src/components/common/VnInput.vue
@@ -67,9 +67,13 @@ const mixinRules = [
     requiredFieldRule,
     ...($attrs.rules ?? []),
     (val) => {
-        const { min } = vnInputRef.value.$attrs;
+        const { min, max } = vnInputRef.value.$attrs;
         if (!min) return null;
         if (min >= 0) if (Math.floor(val) < min) return t('inputMin', { value: min });
+        if (!max) return null;
+        if (max > 0) {
+            if (Math.floor(val) > max) return t('inputMax', { value: max });
+        }
     },
 ];
 </script>
@@ -116,6 +120,8 @@ const mixinRules = [
 <i18n>
     en:
         inputMin: Must be more than {value}
+        inputMax: Must be less than {value}
     es:
         inputMin: Debe ser mayor a {value}
+        inputMax: Debe ser menor a {value}
 </i18n>

From 14961d0aec9bba8f374430d46ff6ad89bd3cb278 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 22 Aug 2024 23:40:29 +0200
Subject: [PATCH 025/281] fix: change order column by default

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

diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index ee0471770..12df8a2d3 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -387,7 +387,7 @@ function setReference(data) {
             formInitialData: {},
         }"
         default-mode="table"
-        order="id DESC"
+        order="shipped DESC"
         :columns="columns"
         :user-params="userParams"
         :right-search="false"

From 390ab9cfd16d266aaadac97ac48e6849cf96e2b8 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 23 Aug 2024 10:34:54 +0200
Subject: [PATCH 026/281] feat: CustomerConsumptionFilter

---
 .../Card/CustomerConsumptionFilter.vue        | 93 ++++++++++++++++++-
 .../Card/SupplierConsumptionFilter.vue        | 52 +++--------
 2 files changed, 102 insertions(+), 43 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerConsumptionFilter.vue b/src/pages/Customer/Card/CustomerConsumptionFilter.vue
index 4d2c5ff3c..91536e954 100644
--- a/src/pages/Customer/Card/CustomerConsumptionFilter.vue
+++ b/src/pages/Customer/Card/CustomerConsumptionFilter.vue
@@ -5,6 +5,8 @@ import VnInput from 'src/components/common/VnInput.vue';
 import { QItem } from 'quasar';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import { QItemSection } from 'quasar';
+import VnInputDate from 'src/components/common/VnInputDate.vue';
+import { toDate } from 'src/filters';
 
 const { t } = useI18n();
 defineProps({ dataKey: { type: String, required: true } });
@@ -33,6 +35,8 @@ defineProps({ dataKey: { type: String, required: true } });
                     <VnSelect
                         v-model="params.buyerId"
                         url="TicketRequests/getItemTypeWorker"
+                        :fields="['id', 'nickname']"
+                        sort-by="nickname ASC"
                         :label="t('params.buyer')"
                         option-value="id"
                         option-label="nickname"
@@ -48,30 +52,93 @@ defineProps({ dataKey: { type: String, required: true } });
                     <VnSelect
                         v-model="params.typeId"
                         url="ItemTypes"
-                        :label="t('params.type')"
+                        :include="['category']"
+                        :fields="['id', 'name', 'categoryFk']"
+                        sort-by="name ASC"
+                        :label="t('params.typeId')"
                         option-label="name"
                         option-value="id"
                         dense
                         outlined
                         rounded
                     >
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection>
+                                    <QItemLabel>{{ scope.opt?.name }}</QItemLabel>
+                                    <QItemLabel caption>{{
+                                        scope.opt?.category?.name
+                                    }}</QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template>
                     </VnSelect>
                 </QItemSection>
             </QItem>
             <QItem>
                 <QItemSection>
                     <VnSelect
+                        v-model="params.categoryId"
                         url="ItemCategories"
-                        :label="t('params.category')"
+                        :fields="['id', 'name']"
+                        sort-by="name ASC"
+                        :label="t('params.categoryId')"
                         option-label="name"
                         option-value="id"
-                        v-model="params.categoryId"
                         dense
                         outlined
                         rounded
                     />
                 </QItemSection>
             </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnSelect
+                        v-model="params.campaignId"
+                        url="Campaigns/latest"
+                        sort-by="dated DESC"
+                        :label="t('params.campaignId')"
+                        option-label="code"
+                        option-value="id"
+                        dense
+                        outlined
+                        rounded
+                    >
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection>
+                                    <QItemLabel>{{
+                                        t(`params.${scope.opt?.code}`)
+                                    }}</QItemLabel>
+                                    <QItemLabel caption>{{
+                                        toDate(scope.opt.dated)
+                                    }}</QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelect>
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInputDate
+                        :label="t('params.from')"
+                        v-model="params.from"
+                        @update:model-value="searchFn()"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInputDate
+                        :label="t('params.to')"
+                        v-model="params.to"
+                        @update:model-value="searchFn()"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
         </template>
     </VnFilterPanel>
 </template>
@@ -82,10 +149,30 @@ en:
         buyer: Buyer
         type: Type
         category: Category
+        itemId: Item id
+        buyerId: Buyer
+        typeId: Type
+        categoryId: Category
+        from: From
+        to: To
+        campaignId: Campaña
+        valentinesDay: Valentine's Day
+        mothersDay: Mother's Day
+        allSaints: All Saints' Day
 es:
     params:
         item: Id artículo
         buyer: Comprador
         type: Tipo
         category: Categoría
+        itemId: Id Artículo
+        buyerId: Comprador
+        typeId: Tipo
+        categoryId: Reino
+        from: Desde
+        to: Hasta
+        campaignId: Campaña
+        valentinesDay: Día de San Valentín
+        mothersDay: Día de la Madre
+        allSaints: Día de Todos los Santos
 </i18n>
diff --git a/src/pages/Supplier/Card/SupplierConsumptionFilter.vue b/src/pages/Supplier/Card/SupplierConsumptionFilter.vue
index 3fc61b15e..401bde8fa 100644
--- a/src/pages/Supplier/Card/SupplierConsumptionFilter.vue
+++ b/src/pages/Supplier/Card/SupplierConsumptionFilter.vue
@@ -1,56 +1,21 @@
 <script setup>
-import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
-
 import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
 import VnSelect from 'src/components/common/VnSelect.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({
+defineProps({
     dataKey: {
         type: String,
         required: true,
     },
 });
-
-const buyersOptions = ref([]);
-const itemTypesOptions = ref([]);
-const itemCategoriesOptions = ref([]);
 </script>
 
 <template>
-    <FetchData
-        url="TicketRequests/getItemTypeWorker"
-        :filter="{
-            fields: ['id', 'nickname'],
-            order: 'nickname ASC',
-        }"
-        @on-fetch="(data) => (buyersOptions = data)"
-        auto-load
-    />
-    <FetchData
-        url="ItemTypes"
-        :filter="{
-            fields: ['id', 'name', 'categoryFk'],
-            include: 'category',
-            order: 'name ASC',
-        }"
-        @on-fetch="(data) => (itemTypesOptions = data)"
-        auto-load
-    />
-    <FetchData
-        url="ItemCategories"
-        :filter="{
-            fields: ['id', 'name'],
-            order: 'name ASC',
-        }"
-        @on-fetch="(data) => (itemCategoriesOptions = data)"
-        auto-load
-    />
-    <VnFilterPanel :data-key="props.dataKey" :search-button="true" :redirect="false">
+    <VnFilterPanel :data-key="dataKey" :search-button="true" :redirect="false">
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">
                 <strong>{{ t(`params.${tag.label}`) }}: </strong>
@@ -82,7 +47,9 @@ const itemCategoriesOptions = ref([]);
                         :label="t('params.buyerId')"
                         v-model="params.buyerId"
                         @update:model-value="searchFn()"
-                        :options="buyersOptions"
+                        url="TicketRequests/getItemTypeWorker"
+                        :fields="['id', 'nickname']"
+                        sort-by="nickname ASC"
                         option-value="id"
                         option-label="nickname"
                         hide-selected
@@ -98,7 +65,10 @@ const itemCategoriesOptions = ref([]);
                         :label="t('params.typeId')"
                         v-model="params.typeId"
                         @update:model-value="searchFn()"
-                        :options="itemTypesOptions"
+                        url="ItemTypes"
+                        :include="['category']"
+                        :fields="['id', 'name', 'categoryFk']"
+                        sort-by="name ASC"
                         option-value="id"
                         option-label="name"
                         hide-selected
@@ -125,7 +95,9 @@ const itemCategoriesOptions = ref([]);
                         :label="t('params.categoryId')"
                         v-model="params.categoryId"
                         @update:model-value="searchFn()"
-                        :options="itemCategoriesOptions"
+                        url="ItemCategories"
+                        :fields="['id', 'name']"
+                        sort-by="name ASC"
                         option-value="id"
                         option-label="name"
                         hide-selected

From 071f3ba4d085c22f231ff96972f5d4c48ac8b183 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 27 Aug 2024 11:58:26 +0200
Subject: [PATCH 027/281] perf: TicketSummary issues

---
 .../Card/InvoiceOutDescriptorProxy.vue        |  7 ++++-
 src/pages/Ticket/Card/TicketSummary.vue       | 31 ++++++++++---------
 2 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/src/pages/InvoiceOut/Card/InvoiceOutDescriptorProxy.vue b/src/pages/InvoiceOut/Card/InvoiceOutDescriptorProxy.vue
index 9ef0ed4b8..8e49fa16a 100644
--- a/src/pages/InvoiceOut/Card/InvoiceOutDescriptorProxy.vue
+++ b/src/pages/InvoiceOut/Card/InvoiceOutDescriptorProxy.vue
@@ -1,5 +1,6 @@
 <script setup>
 import InvoiceOutDescriptor from './InvoiceOutDescriptor.vue';
+import InvoiceOutSummary from './InvoiceOutSummary.vue';
 
 const $props = defineProps({
     id: {
@@ -10,6 +11,10 @@ const $props = defineProps({
 </script>
 <template>
     <QPopupProxy>
-        <InvoiceOutDescriptor v-if="$props.id" :id="$props.id" />
+        <InvoiceOutDescriptor
+            v-if="$props.id"
+            :id="$props.id"
+            :summary="InvoiceOutSummary"
+        />
     </QPopupProxy>
 </template>
diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index 634568e46..643390c7d 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -1,4 +1,5 @@
 <script setup>
+import RouteDescriptorProxy from 'pages/Route/Card/RouteDescriptorProxy.vue';
 import { onMounted, ref, computed } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
 import { useI18n } from 'vue-i18n';
@@ -178,7 +179,14 @@ async function changeState(value) {
                         </a>
                     </template>
                 </VnLv>
-                <VnLv :label="t('ticket.summary.route')" :value="ticket.routeFk" />
+                <VnLv :label="t('ticket.summary.route')">
+                    <template #value>
+                        <span class="link">
+                            {{ ticket.routeFk }}
+                            <RouteDescriptorProxy
+                                :id="ticket.routeFk"
+                            /> </span></template
+                ></VnLv>
                 <VnLv :label="t('ticket.summary.invoice')">
                     <template #value>
                         <span :class="{ link: ticket.refFk }">
@@ -195,7 +203,7 @@ async function changeState(value) {
                     :value="dashIfEmpty(ticket.weight)"
                 />
             </QCard>
-            <QCard class="vn-one">
+            <QCard class="vn-one" style="flex: 2 1">
                 <VnTitle
                     :url="ticketUrl + 'basic-data/step-one'"
                     :text="t('globals.summary.basicData')"
@@ -306,10 +314,9 @@ async function changeState(value) {
                                 <QBtn
                                     flat
                                     round
-                                    size="xs"
                                     icon="vn:claims"
                                     v-if="props.row.claim"
-                                    color="primary"
+                                    class="link"
                                     :to="{
                                         name: 'ClaimCard',
                                         params: {
@@ -325,10 +332,9 @@ async function changeState(value) {
                                 <QBtn
                                     flat
                                     round
-                                    size="xs"
                                     icon="vn:claims"
                                     v-if="props.row.claimBeginning"
-                                    color="primary"
+                                    class="link"
                                     :to="{
                                         name: 'ClaimCard',
                                         params: {
@@ -344,8 +350,7 @@ async function changeState(value) {
                                 <QIcon
                                     name="warning"
                                     v-show="props.row.visible < 0"
-                                    size="xs"
-                                    color="primary"
+                                    class="link"
                                 >
                                     <QTooltip
                                         >{{ t('ticket.summary.visible') }}:
@@ -355,8 +360,7 @@ async function changeState(value) {
                                 <QIcon
                                     name="vn:reserva"
                                     v-show="props.row.reserved"
-                                    size="xs"
-                                    color="primary"
+                                    class="link"
                                 >
                                     <QTooltip>
                                         {{ t('ticket.summary.reserved') }}
@@ -365,8 +369,7 @@ async function changeState(value) {
                                 <QIcon
                                     name="vn:unavailable"
                                     v-show="props.row.itemShortage"
-                                    size="xs"
-                                    color="primary"
+                                    class="link"
                                 >
                                     <QTooltip>
                                         {{ t('ticket.summary.itemShortage') }}
@@ -375,10 +378,10 @@ async function changeState(value) {
                                 <QIcon
                                     name="vn:components"
                                     v-show="props.row.hasComponentLack"
-                                    size="xs"
-                                    color="primary"
+                                    class="link"
                                 >
                                     <QTooltip>
+                                        {{ props.row }}
                                         {{ t('ticket.summary.hasComponentLack') }}
                                     </QTooltip>
                                 </QIcon>

From b8dea8551d405215301729b66069006664b8a014 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 27 Aug 2024 12:04:33 +0200
Subject: [PATCH 028/281] perf: TicketTransferSale

---
 src/pages/Ticket/Card/TicketSale.vue         |  2 +-
 src/pages/Ticket/Card/TicketTransfer.vue     | 29 ++-----
 src/pages/Ticket/Card/TicketTransferForm.vue | 84 ++++++++++++++++++++
 3 files changed, 90 insertions(+), 25 deletions(-)
 create mode 100644 src/pages/Ticket/Card/TicketTransferForm.vue

diff --git a/src/pages/Ticket/Card/TicketSale.vue b/src/pages/Ticket/Card/TicketSale.vue
index f2c5228b4..b269c75d4 100644
--- a/src/pages/Ticket/Card/TicketSale.vue
+++ b/src/pages/Ticket/Card/TicketSale.vue
@@ -615,7 +615,7 @@ async function save(item) {
                 </QIcon>
                 <QIcon
                     v-if="row.hasComponentLack"
-                    color="primary"
+                    class="link"
                     name="vn:components"
                     size="xs"
                 >
diff --git a/src/pages/Ticket/Card/TicketTransfer.vue b/src/pages/Ticket/Card/TicketTransfer.vue
index 9a22c764c..1944b80f4 100644
--- a/src/pages/Ticket/Card/TicketTransfer.vue
+++ b/src/pages/Ticket/Card/TicketTransfer.vue
@@ -4,6 +4,7 @@ import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
 
 import VnInput from 'src/components/common/VnInput.vue';
+import TicketTransferForm from './TicketTransferForm.vue';
 
 import { toDateFormat } from 'src/filters/date.js';
 import axios from 'axios';
@@ -135,9 +136,7 @@ onMounted(() => (_transfer.value = $props.transfer));
                 :columns="destinationTicketColumns"
                 :title="t('Destination ticket')"
                 row-key="id"
-                :pagination="{ rowsPerPage: 0 }"
                 class="full-width q-mt-md"
-                :no-data-label="t('globals.noResults')"
             >
                 <template #body-cell-address="{ row }">
                     <QTd @click.stop>
@@ -158,29 +157,11 @@ onMounted(() => (_transfer.value = $props.transfer));
                     </QTd>
                 </template>
 
+                <template #no-data>
+                    <TicketTransferForm v-bind="$props" />
+                </template>
                 <template #bottom>
-                    <QForm class="q-mt-lg full-width">
-                        <VnInput
-                            v-model.number="_transfer.ticketId"
-                            :label="t('Transfer to ticket')"
-                            :clearable="false"
-                        >
-                            <template #append>
-                                <QBtn
-                                    icon="keyboard_arrow_right"
-                                    color="primary"
-                                    @click="transferSales(_transfer.ticketId)"
-                                    style="width: 30px"
-                                />
-                            </template>
-                        </VnInput>
-                        <QBtn
-                            :label="t('New ticket')"
-                            color="primary"
-                            class="full-width q-my-lg"
-                            @click="transferSales()"
-                        />
-                    </QForm>
+                    <TicketTransferForm v-bind="$props" />
                 </template>
             </QTable>
         </QCard>
diff --git a/src/pages/Ticket/Card/TicketTransferForm.vue b/src/pages/Ticket/Card/TicketTransferForm.vue
new file mode 100644
index 000000000..b5c4a660f
--- /dev/null
+++ b/src/pages/Ticket/Card/TicketTransferForm.vue
@@ -0,0 +1,84 @@
+<script setup>
+import { ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useRouter } from 'vue-router';
+
+import VnInput from 'src/components/common/VnInput.vue';
+
+import axios from 'axios';
+
+const $props = defineProps({
+    mana: {
+        type: Number,
+        default: null,
+    },
+    newPrice: {
+        type: Number,
+        default: 0,
+    },
+    transfer: {
+        type: Object,
+        default: () => {},
+    },
+    ticket: {
+        type: Object,
+        default: () => {},
+    },
+});
+
+const emit = defineEmits(['refreshData']);
+
+const router = useRouter();
+const { t } = useI18n();
+
+const _transfer = ref($props.transfer);
+
+const transferSales = async (ticketId) => {
+    const params = {
+        ticketId: ticketId,
+        sales: $props.transfer.sales,
+    };
+
+    const { data } = await axios.post(
+        `tickets/${$props.ticket.id}/transferSales`,
+        params
+    );
+
+    if (data && data.id === $props.ticket.id) emit('refreshData');
+    else router.push({ name: 'TicketSale', params: { id: data.id } });
+};
+</script>
+
+<template>
+    {{ _transfer }}
+    <QForm class="q-mt-lg full-width">
+        <VnInput
+            v-model.number="_transfer.ticketId"
+            :label="t('Transfer to ticket')"
+            :clearable="false"
+        >
+            <template #append>
+                <QBtn
+                    icon="keyboard_arrow_right"
+                    color="primary"
+                    @click="transferSales(_transfer.ticketId)"
+                    style="width: 30px"
+                />
+            </template>
+        </VnInput>
+        <QBtn
+            :label="t('New ticket')"
+            color="primary"
+            class="full-width q-my-lg"
+            @click="transferSales()"
+        />
+    </QForm>
+</template>
+
+<i18n>
+es:
+    Sales to transfer: Líneas a transferir
+    Destination ticket: Ticket destinatario
+    Transfer to ticket: Transferir a ticket
+    New ticket: Nuevo ticket
+</i18n>

From 45d9322892fd940d40969b29b0a82865ba30493e Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Mon, 2 Sep 2024 11:24:06 +0200
Subject: [PATCH 029/281] feat: refs #7553 added icons, descriptors and missing
 columns in TicketList and minor changes

---
 src/i18n/locale/en.yml                        |   1 +
 src/i18n/locale/es.yml                        |   1 +
 .../Ticket/Card/TicketDescriptorMenu.vue      |   1 -
 src/pages/Ticket/Card/TicketSale.vue          |   2 +-
 src/pages/Ticket/Card/TicketSummary.vue       |  46 ++--
 src/pages/Ticket/TicketList.vue               | 251 ++++++++++++++----
 src/pages/Ticket/locale/en.yml                |   5 +
 src/pages/Ticket/locale/es.yml                |   5 +
 8 files changed, 241 insertions(+), 71 deletions(-)

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 65b8e68bc..b6abdb807 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -618,6 +618,7 @@ ticket:
         landed: Landed
         consigneePhone: Consignee phone
         consigneeMobile: Consignee mobile
+        consigneeAddress: Consignee address
         clientPhone: Client phone
         clientMobile: Client mobile
         consignee: Consignee
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 3f12c0e41..e2ef436b4 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -624,6 +624,7 @@ ticket:
         landed: Entregado
         consigneePhone: Tel. consignatario
         consigneeMobile: Móv. consignatario
+        consigneeAddress: Dir. consignatario
         clientPhone: Tel. cliente
         clientMobile: Móv. cliente
         consignee: Consignatario
diff --git a/src/pages/Ticket/Card/TicketDescriptorMenu.vue b/src/pages/Ticket/Card/TicketDescriptorMenu.vue
index d8efe08c1..ae88e1b7b 100644
--- a/src/pages/Ticket/Card/TicketDescriptorMenu.vue
+++ b/src/pages/Ticket/Card/TicketDescriptorMenu.vue
@@ -493,7 +493,6 @@ async function handleInvoiceOutData() {
     <QDialog ref="dialogRef" v-model="showChangeTimeDialog">
         <FormPopup @on-submit="changeShippedHour(time)" :title="t('Change shipped hour')">
             <template #form-inputs>
-                <!--TODO: pone el año a 1970, esperar corrección componente VnInputTime-->
                 <VnInputTime v-model="time" :label="t('Shipped hour')" clearable />
             </template>
         </FormPopup>
diff --git a/src/pages/Ticket/Card/TicketSale.vue b/src/pages/Ticket/Card/TicketSale.vue
index b269c75d4..f2c5228b4 100644
--- a/src/pages/Ticket/Card/TicketSale.vue
+++ b/src/pages/Ticket/Card/TicketSale.vue
@@ -615,7 +615,7 @@ async function save(item) {
                 </QIcon>
                 <QIcon
                     v-if="row.hasComponentLack"
-                    class="link"
+                    color="primary"
                     name="vn:components"
                     size="xs"
                 >
diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index 643390c7d..c1321b0d9 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -243,6 +243,15 @@ async function changeState(value) {
                 </VnLv>
                 <VnLv
                     :label="t('ticket.summary.consignee')"
+                    :value="
+                        ticket.client.salesPersonUser.nickname +
+                        ' #' +
+                        ticket.client.salesPersonUser.id
+                    "
+                >
+                </VnLv>
+                <VnLv
+                    :label="t('ticket.summary.consigneeAddress')"
                     :value="formattedAddress()"
                 />
             </QCard>
@@ -316,7 +325,7 @@ async function changeState(value) {
                                     round
                                     icon="vn:claims"
                                     v-if="props.row.claim"
-                                    class="link"
+                                    color="primary"
                                     :to="{
                                         name: 'ClaimCard',
                                         params: {
@@ -324,17 +333,17 @@ async function changeState(value) {
                                         },
                                     }"
                                 >
-                                    <QTooltip
-                                        >{{ t('ticket.summary.claim') }}:
-                                        {{ props.row.claim.claimFk }}</QTooltip
-                                    >
+                                    <QTooltip>
+                                        {{ t('ticket.summary.claim') }}:
+                                        {{ props.row.claim.claimFk }}
+                                    </QTooltip>
                                 </QBtn>
                                 <QBtn
                                     flat
                                     round
                                     icon="vn:claims"
                                     v-if="props.row.claimBeginning"
-                                    class="link"
+                                    color="primary"
                                     :to="{
                                         name: 'ClaimCard',
                                         params: {
@@ -342,25 +351,25 @@ async function changeState(value) {
                                         },
                                     }"
                                 >
-                                    <QTooltip
-                                        >{{ t('ticket.summary.claim') }}:
-                                        {{ props.row.claimBeginning.claimFk }}</QTooltip
-                                    >
+                                    <QTooltip>
+                                        {{ t('ticket.summary.claim') }}:
+                                        {{ props.row.claimBeginning.claimFk }}
+                                    </QTooltip>
                                 </QBtn>
                                 <QIcon
                                     name="warning"
                                     v-show="props.row.visible < 0"
-                                    class="link"
+                                    color="primary"
                                 >
-                                    <QTooltip
-                                        >{{ t('ticket.summary.visible') }}:
-                                        {{ props.row.visible }}</QTooltip
-                                    >
+                                    <QTooltip>
+                                        {{ t('ticket.summary.visible') }}:
+                                        {{ props.row.visible }}
+                                    </QTooltip>
                                 </QIcon>
                                 <QIcon
                                     name="vn:reserva"
                                     v-show="props.row.reserved"
-                                    class="link"
+                                    color="primary"
                                 >
                                     <QTooltip>
                                         {{ t('ticket.summary.reserved') }}
@@ -369,7 +378,7 @@ async function changeState(value) {
                                 <QIcon
                                     name="vn:unavailable"
                                     v-show="props.row.itemShortage"
-                                    class="link"
+                                    color="primary"
                                 >
                                     <QTooltip>
                                         {{ t('ticket.summary.itemShortage') }}
@@ -378,10 +387,9 @@ async function changeState(value) {
                                 <QIcon
                                     name="vn:components"
                                     v-show="props.row.hasComponentLack"
-                                    class="link"
+                                    color="primary"
                                 >
                                     <QTooltip>
-                                        {{ props.row }}
                                         {{ t('ticket.summary.hasComponentLack') }}
                                     </QTooltip>
                                 </QIcon>
diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index 12df8a2d3..e05e783d9 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -17,6 +17,9 @@ import RightMenu from 'src/components/common/RightMenu.vue';
 import TicketFilter from './TicketFilter.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import FetchData from 'src/components/FetchData.vue';
+import CustomerDescriptorProxy from '../Customer/Card/CustomerDescriptorProxy.vue';
+import ZoneDescriptorProxy from '../Zone/Card/ZoneDescriptorProxy.vue';
+import { toTimeFormat } from 'src/filters/date';
 
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
@@ -47,16 +50,9 @@ const amountToReturn = ref();
 const columns = computed(() => [
     {
         align: 'left',
-        name: 'stateFk',
-        label: t('ticketList.state'),
-        columnFilter: {
-            name: 'stateFk',
-            component: 'select',
-            attrs: {
-                url: 'States',
-                fields: ['id', 'name'],
-            },
-        },
+        name: 'statusIcons',
+        hidden: true,
+        format: () => '',
     },
     {
         align: 'left',
@@ -67,40 +63,6 @@ const columns = computed(() => [
         },
         isId: true,
     },
-    {
-        align: 'left',
-        name: 'nickname',
-        label: t('ticketList.nickname'),
-        isTitle: true,
-    },
-
-    {
-        align: 'left',
-        name: 'shipped',
-        cardVisible: true,
-        label: t('ticketList.shipped'),
-        columnFilter: {
-            component: 'date',
-            alias: 't',
-            inWhere: true,
-        },
-        format: ({ shipped }) => toDate(shipped),
-    },
-    {
-        align: 'left',
-        name: 'zoneFk',
-        label: t('ticketList.zone'),
-        columnFilter: {
-            component: 'select',
-            attrs: {
-                url: 'Zones',
-                fields: ['id', 'name'],
-            },
-            alias: 't',
-            inWhere: true,
-        },
-        format: (row, dashIfEmpty) => dashIfEmpty(row.zoneName),
-    },
     {
         align: 'left',
         label: t('ticketList.salesPerson'),
@@ -118,6 +80,77 @@ const columns = computed(() => [
         },
         format: (row, dashIfEmpty) => dashIfEmpty(row.salesPerson),
     },
+    {
+        align: 'left',
+        name: 'shippedDate',
+        cardVisible: true,
+        label: t('ticketList.shipped'),
+        columnFilter: {
+            component: 'date',
+            alias: 't',
+            inWhere: true,
+        },
+        format: ({ shippedDate }) => toDate(shippedDate),
+    },
+    {
+        align: 'left',
+        name: 'shipped',
+        label: t('ticketList.hour'),
+        format: (row) => toTimeFormat(row.shipped),
+    },
+    {
+        align: 'left',
+        name: 'zoneLanding',
+        label: t('ticketList.closure'),
+        format: (row, dashIfEmpty) => dashIfEmpty(toTimeFormat(row.zoneLanding)),
+    },
+    {
+        align: 'left',
+        name: 'nickname',
+        label: t('ticketList.nickname'),
+    },
+    {
+        align: 'left',
+        name: 'province',
+        label: t('ticketList.province'),
+        columnClass: 'expand',
+    },
+    {
+        align: 'left',
+        name: 'stateFk',
+        label: t('ticketList.state'),
+        columnFilter: {
+            name: 'stateFk',
+            component: 'select',
+            attrs: {
+                url: 'States',
+                fields: ['id', 'name'],
+            },
+        },
+        columnClass: 'expand',
+    },
+    {
+        align: 'left',
+        name: 'zoneFk',
+        label: t('ticketList.zone'),
+        columnFilter: {
+            component: 'select',
+            attrs: {
+                url: 'Zones',
+                fields: ['id', 'name'],
+            },
+            alias: 't',
+            inWhere: true,
+        },
+        columnClass: 'expand',
+        format: (row, dashIfEmpty) => dashIfEmpty(row.zoneName),
+    },
+    {
+        align: 'left',
+        name: 'warehouse',
+        label: t('ticketList.warehouse'),
+        columnClass: 'expand',
+    },
     {
         align: 'left',
         name: 'totalWithVat',
@@ -133,15 +166,27 @@ const columns = computed(() => [
         align: 'right',
         name: 'tableActions',
         actions: [
+            {
+                title: t('ticketList.toLines'),
+                icon: 'list',
+                isPrimary: true,
+                action: (row) => redirectToLines(row.id),
+            },
             {
                 title: t('ticketList.summary'),
                 icon: 'preview',
+                isPrimary: true,
                 action: (row) => viewSummary(row.id, TicketSummary),
             },
         ],
     },
 ]);
 
+function redirectToLines(id) {
+    const url = `#/ticket/${id}/sale`;
+    window.open(url, '_blank');
+}
+
 const onClientSelected = async (formData) => {
     await fetchClient(formData);
     await fetchAddresses(formData);
@@ -213,6 +258,21 @@ const getColor = (row) => {
     return row?.classColor ? `bg-${row.classColor}` : 'bg-orange';
 };
 
+const getDateColor = (date) => {
+    const today = Date.vnNew();
+    today.setHours(0, 0, 0, 0);
+    const timeTicket = new Date(date);
+    timeTicket.setHours(0, 0, 0, 0);
+    const comparation = today - timeTicket;
+    return comparation < 0 ? 'bg-success' : 'bg-warning';
+};
+
+const getTotalColor = () => {
+    // const total = row.totalWithVat;
+    // return total > 0 && total < 50 ? 'bg-warning' : '';
+    return 'bg-warning';
+};
+
 onMounted(() => (stateStore.rightDrawer = true));
 
 async function makeInvoice(ticket) {
@@ -387,7 +447,7 @@ function setReference(data) {
             formInitialData: {},
         }"
         default-mode="table"
-        order="shipped DESC"
+        :order="['shippedDate DESC', 'shippedHour ASC', 'zoneLanding ASC', 'id']"
         :columns="columns"
         :user-params="userParams"
         :right-search="false"
@@ -399,6 +459,101 @@ function setReference(data) {
             selection: 'multiple',
         }"
     >
+        <template #column-statusIcons="{ row }">
+            <QIcon
+                v-if="row.isTaxDataChecked === 0"
+                color="primary"
+                name="vn:no036"
+                size="xs"
+            >
+                <QTooltip>
+                    {{ t('No verified data') }}
+                </QTooltip>
+            </QIcon>
+            <QIcon v-if="row.hasTicketRequest" color="primary" name="vn:claims" size="xs">
+                <QTooltip>
+                    {{ t('Purchase request') }}
+                </QTooltip>
+            </QIcon>
+            <QIcon
+                v-if="row.itemShortage"
+                color="primary"
+                name="vn:unavailable"
+                size="xs"
+            >
+                <QTooltip>
+                    {{ t('Not visible') }}
+                </QTooltip>
+            </QIcon>
+            <QIcon v-if="row.isFreezed" color="primary" name="vn:frozen" size="xs">
+                <QTooltip>
+                    {{ t('Client frozen') }}
+                </QTooltip>
+            </QIcon>
+            <QIcon v-if="row.risk" color="primary" name="vn:risk" size="xs">
+                <QTooltip>
+                    {{ t('Risk') }}
+                </QTooltip>
+            </QIcon>
+            <QIcon
+                v-if="row.hasComponentLack"
+                color="primary"
+                name="vn:components"
+                size="xs"
+            >
+                <QTooltip>
+                    {{ t('Component lack') }}
+                </QTooltip>
+            </QIcon>
+            <QIcon
+                v-if="row.hasRounding"
+                color="primary"
+                name="vn:sync_problem"
+                size="xs"
+            >
+                <QTooltip>
+                    {{ t('Rounding') }}
+                </QTooltip>
+            </QIcon>
+        </template>
+        <template #column-salesPersonFk="{ row }">
+            <span class="link" @click.stop>
+                {{ row.salesPerson }}
+                <CustomerDescriptorProxy :id="row.salesPersonFk" />
+            </span>
+        </template>
+        <template #column-shippedDate="{ row }">
+            <QChip :class="getDateColor(row.shipped)" dense square>
+                {{ row.shippedDate }}
+            </QChip>
+        </template>
+        <template #column-nickname="{ row }">
+            <span class="link" @click.stop>
+                {{ row.nickname }}
+                <CustomerDescriptorProxy :id="row.clientFk" />
+            </span>
+        </template>
+        <template #column-stateFk="{ row }">
+            <QChip :class="getColor(row)" dense square>
+                {{ row.state }}
+            </QChip>
+        </template>
+        <template #column-zoneFk="{ row }">
+            <span class="link" @click.stop>
+                {{ row.zoneName }}
+                <ZoneDescriptorProxy :id="row.zoneFk" />
+            </span>
+        </template>
+        <template #column-totalWithVat="{ row }">
+            <QChip
+                v-if="row.totalWithVat > 0 && row.totalWithVat < 50"
+                :class="getTotalColor()"
+                dense
+                square
+            >
+                {{ row.totalWithVat }}
+            </QChip>
+        </template>
         <template #more-create-dialog="{ data }">
             <VnRow>
                 <VnSelect
@@ -490,11 +645,6 @@ function setReference(data) {
                 </div>
             </VnRow>
         </template>
-        <template #column-stateFk="{ row }">
-            <QChip :class="getColor(row)" dense square>
-                {{ row.state }}
-            </QChip>
-        </template>
     </VnTable>
     <QPageSticky :offset="[20, 80]" style="z-index: 2">
         <QBtn
@@ -633,4 +783,5 @@ es:
     You can search by ticket id or alias: Puedes buscar por id o alias del ticket
     Zone: Zona
     New ticket: Nuevo ticket
+    Component lack: Faltan componentes
 </i18n>
diff --git a/src/pages/Ticket/locale/en.yml b/src/pages/Ticket/locale/en.yml
index ddd33128e..115a5ebf7 100644
--- a/src/pages/Ticket/locale/en.yml
+++ b/src/pages/Ticket/locale/en.yml
@@ -258,3 +258,8 @@ ticketList:
     compensation: Compensation
     creditCard: Credit card
     transfers: Transfers
+    province: Province
+    warehouse: Warehouse
+    hour: Hour
+    closure: Closure
+    toLines: Go to lines
diff --git a/src/pages/Ticket/locale/es.yml b/src/pages/Ticket/locale/es.yml
index 97fd63060..1deda4bc4 100644
--- a/src/pages/Ticket/locale/es.yml
+++ b/src/pages/Ticket/locale/es.yml
@@ -261,3 +261,8 @@ ticketList:
     compensation: Compensación
     creditCard: Tarjeta de crédito
     transfers: Transferencias
+    province: Provincia
+    warehouse: Almacén
+    hour: Hora
+    closure: Cierre
+    toLines: Ir a lineas

From b622f6ef96af92c8fd9159a3ec30f384b61836de Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Tue, 3 Sep 2024 07:36:40 +0200
Subject: [PATCH 030/281] fix: refs #7553 fixed QChips like Salix

---
 src/pages/Ticket/TicketList.vue | 34 +++++++++++++++++++--------------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index e05e783d9..e35c63e43 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -255,7 +255,11 @@ const fetchAddresses = async (formData) => {
     }
 };
 const getColor = (row) => {
-    return row?.classColor ? `bg-${row.classColor}` : 'bg-orange';
+    // return row?.classColor ? `bg-${row.classColor}` : 'bg-orange';
+    if (row.alertLevelCode === 'OK') return 'bg-success';
+    else if (row.alertLevelCode === 'FREE') return 'bg-notice';
+    else if (row.alertLevel === 1) return 'bg-warning';
+    else if (row.alertLevel === 0) return 'bg-alert';
 };
 
 const getDateColor = (date) => {
@@ -264,13 +268,8 @@ const getDateColor = (date) => {
     const timeTicket = new Date(date);
     timeTicket.setHours(0, 0, 0, 0);
     const comparation = today - timeTicket;
-    return comparation < 0 ? 'bg-success' : 'bg-warning';
-};
-
-const getTotalColor = () => {
-    // const total = row.totalWithVat;
-    // return total > 0 && total < 50 ? 'bg-warning' : '';
-    return 'bg-warning';
+    if (comparation == 0) return 'bg-warning';
+    if (comparation < 0) return 'bg-success';
 };
 
 onMounted(() => (stateStore.rightDrawer = true));
@@ -523,9 +522,11 @@ function setReference(data) {
             </span>
         </template>
         <template #column-shippedDate="{ row }">
-            <QChip :class="getDateColor(row.shipped)" dense square>
-                {{ row.shippedDate }}
-            </QChip>
+            <span v-if="getDateColor(row.shipped)">
+                <QChip :class="getDateColor(row.shipped)" dense square>
+                    {{ row.shippedDate }}
+                </QChip>
+            </span>
         </template>
         <template #column-nickname="{ row }">
             <span class="link" @click.stop>
@@ -534,9 +535,14 @@ function setReference(data) {
             </span>
         </template>
         <template #column-stateFk="{ row }">
-            <QChip :class="getColor(row)" dense square>
+            <span v-if="getColor(row)">
+                <QChip :class="getColor(row)" dense square>
+                    {{ row.state }}
+                </QChip>
+            </span>
+            <span v-else>
                 {{ row.state }}
-            </QChip>
+            </span>
         </template>
         <template #column-zoneFk="{ row }">
             <span class="link" @click.stop>
@@ -547,7 +553,7 @@ function setReference(data) {
         <template #column-totalWithVat="{ row }">
             <QChip
                 v-if="row.totalWithVat > 0 && row.totalWithVat < 50"
-                :class="getTotalColor()"
+                class="bg-warning"
                 dense
                 square
             >

From d18ca14b4ee1d78b69cf5a5c4d364f00c32df6e1 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Tue, 3 Sep 2024 07:45:46 +0200
Subject: [PATCH 031/281] fix: refs #7553 merge changes

---
 src/pages/Ticket/Card/TicketExpedition.vue | 11 -------
 src/pages/Ticket/Card/TicketSale.vue       | 37 +++++++++++-----------
 2 files changed, 18 insertions(+), 30 deletions(-)

diff --git a/src/pages/Ticket/Card/TicketExpedition.vue b/src/pages/Ticket/Card/TicketExpedition.vue
index 1284ce00f..5ca57ae8e 100644
--- a/src/pages/Ticket/Card/TicketExpedition.vue
+++ b/src/pages/Ticket/Card/TicketExpedition.vue
@@ -3,7 +3,6 @@ import { onMounted, ref, computed, onUnmounted, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 
-import VnInput from 'src/components/common/VnInput.vue';
 import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
 import TableVisibleColumns from 'src/components/common/TableVisibleColumns.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
@@ -98,17 +97,7 @@ const columns = computed(() => [
         align: 'left',
         isTitle: true,
         columnFilter: {
-            component: VnSelect,
-            type: 'select',
-            filterValue: null,
-            event: getInputEvents,
             inWhere: true,
-            attrs: {
-                options: itemsOptions.value,
-                'option-value': 'id',
-                'option-label': 'name',
-                dense: true,
-            },
         },
     },
     {
diff --git a/src/pages/Ticket/Card/TicketSale.vue b/src/pages/Ticket/Card/TicketSale.vue
index 4fb3ca3dc..3dcaa0644 100644
--- a/src/pages/Ticket/Card/TicketSale.vue
+++ b/src/pages/Ticket/Card/TicketSale.vue
@@ -656,25 +656,24 @@ async function save(item) {
             <QPopupProxy v-if="row.id && isTicketEditable">
                 <VnInput v-model="row.concept" @change="updateConcept(row)" />
             </QPopupProxy>
-                <VnSelect
-                    v-else
-                    :options="itemsWithNameOptions"
-                    hide-selected
-                    option-label="name"
-                    option-value="id"
-                    @update:model-value="changeQuantity(row)"
-                    v-model="row.itemFk"
-                >
-                    <template #option="scope">
-                        <QItem v-bind="scope.itemProps">
-                            <QItemSection>
-                                <QItemLabel> #{{ scope.opt?.id }} </QItemLabel>
-                                <QItemLabel caption>{{ scope.opt?.name }}</QItemLabel>
-                            </QItemSection>
-                        </QItem>
-                    </template>
-                </VnSelect>
-            </QTd>
+            <VnSelect
+                v-else
+                :options="itemsWithNameOptions"
+                hide-selected
+                option-label="name"
+                option-value="id"
+                @update:model-value="changeQuantity(row)"
+                v-model="row.itemFk"
+            >
+                <template #option="scope">
+                    <QItem v-bind="scope.itemProps">
+                        <QItemSection>
+                            <QItemLabel> #{{ scope.opt?.id }} </QItemLabel>
+                            <QItemLabel caption>{{ scope.opt?.name }}</QItemLabel>
+                        </QItemSection>
+                    </QItem>
+                </template>
+            </VnSelect>
         </template>
         <template #column-quantity="{ row }">
             <QTd @click.stop>

From f35e33cf1037816f1cf0d33ab998dcb65cc4b33b Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Tue, 3 Sep 2024 12:54:44 +0200
Subject: [PATCH 032/281] fix: refs #7553 fixed TicketTransfer

---
 src/pages/Ticket/Card/TicketSale.vue         |  3 ++-
 src/pages/Ticket/Card/TicketTransfer.vue     | 28 ++------------------
 src/pages/Ticket/Card/TicketTransferForm.vue |  1 -
 src/pages/Ticket/TicketList.vue              |  4 +--
 4 files changed, 5 insertions(+), 31 deletions(-)

diff --git a/src/pages/Ticket/Card/TicketSale.vue b/src/pages/Ticket/Card/TicketSale.vue
index 3dcaa0644..3ce90b85e 100644
--- a/src/pages/Ticket/Card/TicketSale.vue
+++ b/src/pages/Ticket/Card/TicketSale.vue
@@ -283,7 +283,7 @@ const getMana = async () => {
 
 const selectedValidSales = computed(() => {
     if (!sales.value) return;
-    return selectedSales.value.filter((sale) => sale.id != undefined);
+    return [...selectedRows.value];
 });
 
 const onOpenEditPricePopover = async (sale) => {
@@ -418,6 +418,7 @@ const removeSales = async () => {
 
 const setTransferParams = async () => {
     try {
+        selectedSales.value = selectedValidSales.value;
         const checkedSales = JSON.parse(JSON.stringify(selectedSales.value));
         transfer.value = {
             lastActiveTickets: [],
diff --git a/src/pages/Ticket/Card/TicketTransfer.vue b/src/pages/Ticket/Card/TicketTransfer.vue
index 1944b80f4..93412aa9b 100644
--- a/src/pages/Ticket/Card/TicketTransfer.vue
+++ b/src/pages/Ticket/Card/TicketTransfer.vue
@@ -1,13 +1,11 @@
 <script setup>
 import { ref, computed, onMounted } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { useRouter } from 'vue-router';
 
 import VnInput from 'src/components/common/VnInput.vue';
 import TicketTransferForm from './TicketTransferForm.vue';
 
 import { toDateFormat } from 'src/filters/date.js';
-import axios from 'axios';
 
 const $props = defineProps({
     mana: {
@@ -28,13 +26,10 @@ const $props = defineProps({
     },
 });
 
-const emit = defineEmits(['refreshData']);
-
-const router = useRouter();
 const { t } = useI18n();
 const QPopupProxyRef = ref(null);
 
-const _transfer = ref(null);
+const _transfer = ref();
 
 const transferLinesColumns = computed(() => [
     {
@@ -85,29 +80,13 @@ const destinationTicketColumns = computed(() => [
     },
 ]);
 
-const transferSales = async (ticketId) => {
-    const params = {
-        ticketId: ticketId,
-        sales: $props.transfer.sales,
-    };
-
-    const { data } = await axios.post(
-        `tickets/${$props.ticket.id}/transferSales`,
-        params
-    );
-
-    if (data && data.id === $props.ticket.id) emit('refreshData');
-    else router.push({ name: 'TicketSale', params: { id: data.id } });
-};
-
 onMounted(() => (_transfer.value = $props.transfer));
 </script>
 
 <template>
     <QPopupProxy ref="QPopupProxyRef">
-        <QCard class="q-px-md" style="display: flex">
+        <QCard class="q-px-md" style="display: flex; width: 80vw">
             <QTable
-                v-if="transfer.sales"
                 :rows="transfer.sales"
                 :columns="transferLinesColumns"
                 :title="t('Sales to transfer')"
@@ -121,9 +100,6 @@ onMounted(() => (_transfer.value = $props.transfer));
                         <VnInput
                             v-model.number="row.quantity"
                             :clearable="false"
-                            @keyup.enter="changeQuantity(row)"
-                            @blur="changeQuantity(row)"
-                            @focus="edit.oldQuantity = row.quantity"
                             style="max-width: 60px"
                         />
                     </QTd>
diff --git a/src/pages/Ticket/Card/TicketTransferForm.vue b/src/pages/Ticket/Card/TicketTransferForm.vue
index b5c4a660f..c4b3906ae 100644
--- a/src/pages/Ticket/Card/TicketTransferForm.vue
+++ b/src/pages/Ticket/Card/TicketTransferForm.vue
@@ -50,7 +50,6 @@ const transferSales = async (ticketId) => {
 </script>
 
 <template>
-    {{ _transfer }}
     <QForm class="q-mt-lg full-width">
         <VnInput
             v-model.number="_transfer.ticketId"
diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index e35c63e43..07907aac9 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -490,9 +490,7 @@ function setReference(data) {
                 </QTooltip>
             </QIcon>
             <QIcon v-if="row.risk" color="primary" name="vn:risk" size="xs">
-                <QTooltip>
-                    {{ t('Risk') }}
-                </QTooltip>
+                <QTooltip> {{ t('Risk') }}: {{ row.risk }} </QTooltip>
             </QIcon>
             <QIcon
                 v-if="row.hasComponentLack"

From cb7d729b0f01ab15b5302abee21567b04fe4ebd1 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Wed, 4 Sep 2024 08:02:28 +0200
Subject: [PATCH 033/281] fix: refs #7553 fixed details in summary and data-key
 in TicketList

---
 src/pages/Ticket/Card/TicketSummary.vue | 97 ++++++++++++++++++++++---
 src/pages/Ticket/TicketList.vue         |  6 +-
 2 files changed, 88 insertions(+), 15 deletions(-)

diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index c1321b0d9..3330b4d1d 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -15,6 +15,7 @@ import { getUrl } from 'src/composables/getUrl';
 import VnUserLink from 'src/components/ui/VnUserLink.vue';
 import VnTitle from 'src/components/common/VnTitle.vue';
 import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
+import ZoneDescriptorProxy from 'src/pages/Zone/Card/ZoneDescriptorProxy.vue';
 
 const route = useRoute();
 const router = useRouter();
@@ -79,6 +80,29 @@ async function changeState(value) {
     await axios.post(`Tickets/state`, formData);
     router.go(route.fullPath);
 }
+
+function getNoteValue(description) {
+    switch (description) {
+        case 'ItemPicker':
+            return t('ItemPicker');
+        case 'Packager':
+            return t('Packager');
+        case 'Delivery':
+            return t('Delivery');
+        case 'SalesPerson':
+            return t('SalesPerson');
+        case 'Administrative':
+            return t('Administrative');
+        case 'Weight':
+            return t('Weight');
+        case 'InvoiceOut':
+            return t('InvoiceOut');
+        case 'DropOff':
+            return t('DropOff');
+        case 'Sustitución':
+            return t('Sustitución');
+    }
+}
 </script>
 
 <template>
@@ -160,7 +184,14 @@ async function changeState(value) {
                     :label="t('ticket.summary.agency')"
                     :value="ticket.agencyMode?.name"
                 />
-                <VnLv :label="t('ticket.summary.zone')" :value="ticket?.zone?.name" />
+                <VnLv :label="t('ticket.summary.zone')">
+                    <template #value>
+                        <span class="link" @click.stop>
+                            {{ ticket?.zone?.name }}
+                            <ZoneDescriptorProxy :id="ticket.zoneFk" />
+                        </span>
+                    </template>
+                </VnLv>
                 <VnLv
                     :label="t('ticket.summary.warehouse')"
                     :value="ticket.warehouse?.name"
@@ -263,7 +294,7 @@ async function changeState(value) {
                 <VnLv
                     v-for="note in ticket.notes"
                     :key="note.id"
-                    :label="note.observationType.description"
+                    :label="getNoteValue(note.observationType.description)"
                     :value="note.description"
                 >
                     <template #value>
@@ -291,6 +322,7 @@ async function changeState(value) {
                     <VnLv
                         :label="t('ticket.summary.total')"
                         :value="toCurrency(ticket.totalWithVat)"
+                        style="font-weight: bold"
                     />
                 </div>
             </QCard>
@@ -400,7 +432,17 @@ async function changeState(value) {
                                     <ItemDescriptorProxy :id="props.row.itemFk" />
                                 </QBtn>
                             </QTd>
-                            <QTd>{{ props.row.visible }}</QTd>
+                            <QTd>
+                                <QChip
+                                    dense
+                                    rounded
+                                    v-if="props.row.visible < 0"
+                                    :color="'negative'"
+                                >
+                                    {{ props.row.visible }}
+                                    {{ console.log(props.row) }}
+                                </QChip>
+                            </QTd>
                             <QTd>{{ props.row.available }}</QTd>
                             <QTd>{{ props.row.quantity }}</QTd>
                             <QTd class="description-cell">
@@ -432,12 +474,9 @@ async function changeState(value) {
                     </template>
                 </QTable>
             </QCard>
-            <QCard
-                class="vn-max"
-                v-if="ticket.packagings.length > 0 || ticket.services.length > 0"
-            >
+            <QCard class="vn-max" v-if="ticket.packagings.length != 0">
                 <VnTitle :url="ticketUrl + 'package'" :text="t('globals.packages')" />
-                <QTable :rows="ticket.packagings" flat>
+                <QTable :rows="ticket.packagings" flat style="text-align: center">
                     <template #header="props">
                         <QTr class="tr-header" :props="props">
                             <QTh auto-width>{{ t('ticket.summary.created') }}</QTh>
@@ -453,11 +492,13 @@ async function changeState(value) {
                         </QTr>
                     </template>
                 </QTable>
+            </QCard>
+            <QCard class="vn-max" v-if="ticket.services.length != 0">
                 <VnTitle
                     :url="ticketUrl + 'service'"
                     :text="t('ticket.summary.service')"
                 />
-                <QTable :rows="ticket.services" flat>
+                <QTable :rows="ticket.services" flat style="text-align: center">
                     <template #header="props">
                         <QTr class="tr-header" :props="props">
                             <QTh auto-width>{{ t('ticket.summary.quantity') }}</QTh>
@@ -480,12 +521,12 @@ async function changeState(value) {
                     </template>
                 </QTable>
             </QCard>
-            <QCard class="vn-max" v-if="ticket.requests.length > 0">
+            <QCard class="vn-max" v-if="ticket.requests.length != 0">
                 <VnTitle
                     :url="ticketUrl + 'request'"
                     :text="t('ticket.summary.purchaseRequest')"
                 />
-                <QTable :rows="ticket.requests" flat>
+                <QTable :rows="ticket.requests" flat style="text-align: center">
                     <template #header="props">
                         <QTr class="tr-header" :props="props">
                             <QTh auto-width>{{ t('ticket.summary.description') }}</QTh>
@@ -517,7 +558,14 @@ async function changeState(value) {
                                     v-model="props.row.isOk"
                                     disable
                                     :toggle-indeterminate="false"
-                                />
+                                >
+                                    <QTooltip v-if="props.row.isOk">
+                                        {{ t('Accepted') }}
+                                    </QTooltip>
+                                    <QTooltip v-else>
+                                        {{ t('Denied') }}
+                                    </QTooltip>
+                                </QCheckbox>
                             </QTd>
                         </QTr>
                     </template>
@@ -564,3 +612,28 @@ async function changeState(value) {
     color: $primary-light;
 }
 </style>
+
+<i18n>
+en:
+    ItemPicker: Item Picker
+    Packager: Packager
+    Delivery: Delivery
+    SalesPerson: Sales Person
+    Administrative: Administrative
+    Weight: Weight
+    InvoiceOut: Invoice Out
+    DropOff: Drop Off
+    Sustitución: Sustitution
+es:
+    ItemPicker: Items
+    Packager: Encajador
+    Delivery: Envío
+    SalesPerson: Comercial
+    Administrative: Administrativa
+    Weight: Peso
+    InvoiceOut: Facturas
+    DropOff: Despacho
+    Sustitución: Sustitución
+    Accepted: Aceptado
+    Denied: Denegado
+</i18n>
diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index 07907aac9..ad50f5433 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -426,18 +426,18 @@ function setReference(data) {
         auto-load
     />
     <VnSearchbar
-        data-key="Tickets"
+        data-key="Ticket"
         :label="t('Search ticket')"
         :info="t('You can search by ticket id or alias')"
     />
     <RightMenu>
         <template #right-panel>
-            <TicketFilter data-key="Tickets" />
+            <TicketFilter data-key="Ticket" />
         </template>
     </RightMenu>
     <VnTable
         ref="tableRef"
-        data-key="Tickets"
+        data-key="Ticket"
         url="Tickets/filter"
         :create="{
             urlCreate: 'Tickets/new',

From 5471607d327350ac5efe117d67693d70fef8e86a Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Wed, 4 Sep 2024 08:18:10 +0200
Subject: [PATCH 034/281] refactor: refs #7553 added order to Expedition table
 and tootltip in delete button

---
 src/pages/Ticket/Card/TicketExpedition.vue | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/pages/Ticket/Card/TicketExpedition.vue b/src/pages/Ticket/Card/TicketExpedition.vue
index 5ca57ae8e..cbbbfdee1 100644
--- a/src/pages/Ticket/Card/TicketExpedition.vue
+++ b/src/pages/Ticket/Card/TicketExpedition.vue
@@ -302,7 +302,9 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                             deleteExpedition
                         )
                     "
-                />
+                >
+                    <QTooltip>{{ t('Delete expedition') }}</QTooltip>
+                </QBtn>
             </QBtnGroup>
         </template>
     </VnSubToolbar>
@@ -320,6 +322,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
         }"
         default-mode="table"
         auto-load
+        order="created DESC"
     >
         <template #column-packagingItemFk="{ row }">
             <span class="link" @click.stop>
@@ -363,3 +366,8 @@ onUnmounted(() => (stateStore.rightDrawer = false));
         </QTable>
     </QDialog>
 </template>
+
+<i18n>
+es:
+    Delete expedition: Eliminar expedición
+</i18n>

From 0d9773a30fea6da93a50c91205bbbb3e9d56628d Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Wed, 4 Sep 2024 09:11:05 +0200
Subject: [PATCH 035/281] refactor: refs #7553 added default date in new
 expedition modal

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

diff --git a/src/pages/Ticket/Card/ExpeditionNewTicket.vue b/src/pages/Ticket/Card/ExpeditionNewTicket.vue
index 55ca700bc..9183ae405 100644
--- a/src/pages/Ticket/Card/ExpeditionNewTicket.vue
+++ b/src/pages/Ticket/Card/ExpeditionNewTicket.vue
@@ -31,6 +31,7 @@ const router = useRouter();
 const { notify } = useNotify();
 
 const newTicketFormData = reactive({});
+const date = new Date();
 
 const createTicket = async () => {
     try {
@@ -64,7 +65,11 @@ const createTicket = async () => {
     >
         <template #form-inputs="{ data }">
             <VnRow>
-                <VnInputDate :label="t('expedition.landed')" v-model="data.landed" />
+                <VnInputDate
+                    :label="t('expedition.landed')"
+                    v-model="data.landed"
+                    :model-value="date"
+                />
             </VnRow>
             <VnRow>
                 <VnInput

From 1889aa85b5bb755aa5d88a7c3abd72531d6f2b6d Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Wed, 4 Sep 2024 11:49:49 +0200
Subject: [PATCH 036/281] refactor: refs #7553 deleted expedition code and slot
 in VnTable

---
 src/components/VnTable/VnTable.vue         |  5 +++--
 src/pages/Ticket/Card/TicketExpedition.vue | 18 +-----------------
 src/pages/Ticket/locale/en.yml             |  3 ++-
 src/pages/Ticket/locale/es.yml             |  5 +++--
 4 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 9a5b748ba..5367ce4c9 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -408,11 +408,12 @@ defineExpose({
                         @click="stateStore.toggleRightDrawer()"
                     />
                 </template>
-                <template #top>
+                <!--TODO: este slot se carga los botones de mostrar tabla/card y columnas visibles-->
+                <!-- <template #top>
                     <div class="full-width-slot">
                         <slot name="before-header" />
                     </div>
-                </template>
+                </template> -->
                 <template #header-cell="{ col }">
                     <QTh v-if="col.visible ?? true">
                         <div
diff --git a/src/pages/Ticket/Card/TicketExpedition.vue b/src/pages/Ticket/Card/TicketExpedition.vue
index cbbbfdee1..4becb3db3 100644
--- a/src/pages/Ticket/Card/TicketExpedition.vue
+++ b/src/pages/Ticket/Card/TicketExpedition.vue
@@ -4,7 +4,6 @@ import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 
 import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
-import TableVisibleColumns from 'src/components/common/TableVisibleColumns.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import ExpeditionNewTicket from './ExpeditionNewTicket.vue';
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
@@ -28,7 +27,6 @@ const tableRef = ref();
 const expeditionsLogsData = ref([]);
 const selectedExpeditions = ref([]);
 const allColumnNames = ref([]);
-const visibleColumns = ref([]);
 const newTicketWithRoute = ref(false);
 const selectedRows = ref([]);
 const hasSelectedRows = computed(() => selectedRows.value.length > 0);
@@ -245,14 +243,6 @@ onUnmounted(() => (stateStore.rightDrawer = false));
 
 <template>
     <VnSubToolbar>
-        <template #st-data>
-            <TableVisibleColumns
-                :all-columns="allColumnNames"
-                table-code="expeditionIndex"
-                labels-traductions-path="expedition"
-                @on-config-saved="visibleColumns = [...$event, 'history']"
-            />
-        </template>
         <template #st-actions>
             <QBtnGroup push class="q-gutter-x-sm" flat>
                 <QBtnDropdown
@@ -303,7 +293,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                         )
                     "
                 >
-                    <QTooltip>{{ t('Delete expedition') }}</QTooltip>
+                    <QTooltip>{{ t('expedition.removeExpedition') }}</QTooltip>
                 </QBtn>
             </QBtnGroup>
         </template>
@@ -320,7 +310,6 @@ onUnmounted(() => (stateStore.rightDrawer = false));
             'row-key': 'id',
             selection: 'multiple',
         }"
-        default-mode="table"
         auto-load
         order="created DESC"
     >
@@ -366,8 +355,3 @@ onUnmounted(() => (stateStore.rightDrawer = false));
         </QTable>
     </QDialog>
 </template>
-
-<i18n>
-es:
-    Delete expedition: Eliminar expedición
-</i18n>
diff --git a/src/pages/Ticket/locale/en.yml b/src/pages/Ticket/locale/en.yml
index b2626faa3..7629633c8 100644
--- a/src/pages/Ticket/locale/en.yml
+++ b/src/pages/Ticket/locale/en.yml
@@ -106,7 +106,7 @@ expedition:
     name: Name
     packageType: Package type
     counter: Counter
-    externalId: externalId
+    externalId: external Id
     created: Created
     state: State
     historyAction: Status log
@@ -122,6 +122,7 @@ expedition:
     isScanned: Is scanned
     yes: Yes
     no: No
+    removeExpedition: Delete expedition
 basicData:
     next: Next
     back: Back
diff --git a/src/pages/Ticket/locale/es.yml b/src/pages/Ticket/locale/es.yml
index 879870b78..2e7dc4d1c 100644
--- a/src/pages/Ticket/locale/es.yml
+++ b/src/pages/Ticket/locale/es.yml
@@ -193,9 +193,9 @@ expedition:
     id: Expedición
     item: Artículo
     name: Nombre
-    packageType: Package type
+    packageType: Embalaje
     counter: Contador
-    externalId: externalId
+    externalId: ID externo
     created: Fecha creación
     state: Estado
     historyAction: Historial de estados
@@ -211,6 +211,7 @@ expedition:
     isScanned: Escaneado
     yes: Sí
     no: No
+    removeExpedition: Eliminar expedición
 package:
     package: Embalaje
     quantity: Cantidad

From f5eacea4830988f29829ce385cc4b104f5b69453 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Wed, 4 Sep 2024 14:12:27 +0200
Subject: [PATCH 037/281] refactor: refs #7553 modified QDrawer and table
 columns

---
 src/pages/Ticket/Card/TicketVolume.vue | 63 ++++++++++++++------------
 1 file changed, 35 insertions(+), 28 deletions(-)

diff --git a/src/pages/Ticket/Card/TicketVolume.vue b/src/pages/Ticket/Card/TicketVolume.vue
index 61f9b83d9..8d7036c8b 100644
--- a/src/pages/Ticket/Card/TicketVolume.vue
+++ b/src/pages/Ticket/Card/TicketVolume.vue
@@ -1,11 +1,10 @@
 <script setup>
-import { ref, computed, onMounted, onUnmounted, watch, nextTick } from 'vue';
+import { ref, computed, onUnmounted, watch, nextTick } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 
 import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
 import FetchedTags from 'components/ui/FetchedTags.vue';
-import RightMenu from 'src/components/common/RightMenu.vue';
 import FetchData from 'components/FetchData.vue';
 
 import { useStateStore } from 'stores/useStateStore';
@@ -42,28 +41,36 @@ const columns = computed(() => [
         align: 'left',
         label: t('volume.item'),
         name: 'itemFk',
+        chip: {
+            condition: () => true,
+        },
+        isId: true,
     },
     {
         align: 'left',
         label: t('volume.description'),
         name: 'concept',
         columnClass: 'expand',
+        cardVisible: true,
     },
     {
         align: 'left',
         label: t('volume.packingType'),
         name: 'itemPackingTypeFk',
+        cardVisible: true,
         format: (row, dashIfEmpty) => dashIfEmpty(row.item.itemPackingTypeFk),
     },
     {
         align: 'left',
         label: t('volume.quantity'),
         name: 'quantity',
+        cardVisible: true,
     },
     {
         align: 'left',
         label: t('volume.volumeQuantity'),
         name: 'volume',
+        cardVisible: true,
     },
 ]);
 
@@ -86,10 +93,6 @@ const applyVolumes = async (salesData) => {
     }
 };
 
-onMounted(() => {
-    stateStore.rightDrawer = true;
-});
-
 onUnmounted(() => (stateStore.rightDrawer = false));
 </script>
 
@@ -101,28 +104,32 @@ onUnmounted(() => (stateStore.rightDrawer = false));
         @on-fetch="(data) => applyVolumes(data)"
         auto-load
     />
-    <RightMenu v-if="packingTypeVolume.length">
-        <template #right-panel>
-            <QCard
-                v-for="(packingType, index) in packingTypeVolume"
-                :key="index"
-                class="q-pa-md q-mb-md q-ma-md color-vn-text"
-                bordered
-                flat
-                style="border-color: black"
-            >
-                <QCardSection class="column items-center" horizontal>
-                    <span>
-                        {{ t('volume.type') }}:
-                        {{ dashIfEmpty(packingType.description) }}
-                    </span>
-                </QCardSection>
-                <QCardSection class="column items-center" horizontal>
-                    <span> {{ t('volume.volume') }}: {{ packingType.volume }} </span>
-                </QCardSection>
-            </QCard>
-        </template>
-    </RightMenu>
+    <QDrawer
+        v-if="packingTypeVolume.length"
+        side="right"
+        :width="270"
+        v-model="stateStore.rightDrawer"
+    >
+        <QCard
+            v-for="(packingType, index) in packingTypeVolume"
+            :key="index"
+            class="q-pa-md q-mb-md q-ma-md color-vn-text"
+            bordered
+            flat
+            style="border-color: black"
+        >
+            <QCardSection class="column items-center" horizontal>
+                <span>
+                    {{ t('volume.type') }}:
+                    {{ dashIfEmpty(packingType.description) }}
+                </span>
+            </QCardSection>
+            <QCardSection class="column items-center" horizontal>
+                <span> {{ t('volume.volume') }}: {{ packingType.volume }} </span>
+            </QCardSection>
+        </QCard>
+    </QDrawer>
+
     <VnTable
         ref="tableRef"
         data-key="TicketVolume"

From 3dc720e2d0db55c61b7b28df6087d997af241b54 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Wed, 4 Sep 2024 14:40:36 +0200
Subject: [PATCH 038/281] feat: refs #7404 add m3 and fix detail

---
 src/components/VnTable/VnTable.vue            |  36 ++++-
 src/pages/Entry/EntryList.vue                 |   3 -
 src/pages/Entry/EntryStockBought.vue          | 136 +++++++++++-------
 src/pages/Entry/EntryStockBoughtDetail.vue    |   2 +-
 .../integration/entry/stockBought.spec.js     |   2 +-
 5 files changed, 118 insertions(+), 61 deletions(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 26b5c424a..0fd6d1dd1 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -90,6 +90,10 @@ const $props = defineProps({
         type: String,
         default: '90vh',
     },
+    footer: {
+        type: Boolean,
+        default: false,
+    },
 });
 const { t } = useI18n();
 const stateStore = useStateStore();
@@ -108,7 +112,7 @@ const orders = ref(parseOrder(routeQuery.filter?.order));
 const CrudModelRef = ref({});
 const showForm = ref(false);
 const splittedColumns = ref({ columns: [] });
-const columnsVisibilitySkippped = ref();
+const columnsVisibilitySkipped = ref();
 const createForm = ref();
 
 const tableModes = [
@@ -347,11 +351,11 @@ defineExpose({
     <CrudModel
         v-bind="$attrs"
         :class="$attrs['class'] ?? 'q-px-md'"
-        :limit="20"
+        :limit="$attrs.limit ?? 20"
         ref="CrudModelRef"
         @on-fetch="(...args) => emit('onFetch', ...args)"
         :search-url="searchUrl"
-        :disable-infinite-scroll="isTableMode"
+        :disable-infinite-scroll="$attrs['disable-infinite-scroll'] ?? isTableMode"
         @save-changes="reload"
         :has-sub-toolbar="$attrs['hasSubToolbar'] ?? isEditable"
         :auto-load="hasParams || $attrs['auto-load']"
@@ -371,7 +375,7 @@ defineExpose({
                 card-container-class="grid-three"
                 flat
                 :style="isTableMode && `max-height: ${tableHeight}`"
-                virtual-scroll
+                :virtual-scroll="!isTableMode"
                 @virtual-scroll="
                     (event) =>
                         event.index > rows.length - 2 &&
@@ -614,6 +618,28 @@ defineExpose({
                         </QCard>
                     </component>
                 </template>
+                <template #bottom-row="{ cols }" v-if="footer">
+                    <QTr v-if="rows.length" class="bg-header" style="height: 30px">
+                        <QTh
+                            v-for="col of cols.filter((cols) => cols.visible ?? true)"
+                            :key="col?.id"
+                            class="text-center"
+                        >
+                            <div
+                                v-if="col?.summation"
+                                :class="`text-${col?.align ?? 'left'}`"
+                                class="text-bold q-pa-sm"
+                            >
+                                {{
+                                    rows.reduce(
+                                        (sum, currentRow) => sum + currentRow[col.name],
+                                        0
+                                    )
+                                }}
+                            </div>
+                        </QTh>
+                    </QTr>
+                </template>
             </QTable>
         </template>
     </CrudModel>
@@ -672,7 +698,7 @@ es:
 }
 
 .bg-header {
-    background-color: var(--vn-header-color);
+    background-color: var(--vn-accent-color);
     color: var(--vn-text-color);
 }
 
diff --git a/src/pages/Entry/EntryList.vue b/src/pages/Entry/EntryList.vue
index c03c67edb..6f7ff1935 100644
--- a/src/pages/Entry/EntryList.vue
+++ b/src/pages/Entry/EntryList.vue
@@ -9,9 +9,6 @@ import RightMenu from 'src/components/common/RightMenu.vue';
 import { toDate } from 'src/filters';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import EntrySummary from './Card/EntrySummary.vue';
-import VnUserLink from 'components/ui/VnUserLink.vue';
-import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
-import CustomerDescriptorProxy from '../Customer/Card/CustomerDescriptorProxy.vue';
 import SupplierDescriptorProxy from 'src/pages/Supplier/Card/SupplierDescriptorProxy.vue';
 import TravelDescriptorProxy from 'src/pages/Travel/Card/TravelDescriptorProxy.vue';
 
diff --git a/src/pages/Entry/EntryStockBought.vue b/src/pages/Entry/EntryStockBought.vue
index 12fc96214..75d356bd2 100644
--- a/src/pages/Entry/EntryStockBought.vue
+++ b/src/pages/Entry/EntryStockBought.vue
@@ -6,24 +6,23 @@ import { useQuasar } from 'quasar';
 
 import VnTable from 'components/VnTable/VnTable.vue';
 import VnRow from 'src/components/ui/VnRow.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-import VnLv from 'src/components/ui/VnLv.vue';
 import FetchData from 'src/components/FetchData.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
 import EntryStockBoughtDetail from 'src/pages/Entry/EntryStockBoughtDetail.vue';
+import { useRouter } from 'vue-router';
 
 const { t } = useI18n();
 const quasar = useQuasar();
 const tableRef = ref();
 const state = useState();
 const user = state.getUser();
+const router = useRouter();
 const columns = [
     {
         align: 'left',
         label: 'Id',
         name: 'id',
-        isTitle: true,
         isId: true,
         columnFilter: false,
         visible: false,
@@ -32,6 +31,7 @@ const columns = [
         align: 'left',
         name: 'workerFk',
         label: t('Buyer'),
+        isTitle: true,
         columnFilter: false,
     },
     {
@@ -42,6 +42,7 @@ const columns = [
         create: true,
         component: 'number',
         summation: true,
+        cardVisible: true,
     },
     {
         align: 'left',
@@ -67,6 +68,7 @@ const columns = [
         name: 'bought',
         columnFilter: false,
         summation: true,
+        cardVisible: true,
     },
     {
         align: 'left',
@@ -89,7 +91,6 @@ const columns = [
                         component: EntryStockBoughtDetail,
                         componentProps: {
                             workerFk: row.workerFk,
-                            dated: row.dated,
                         },
                         maximized: true,
                     });
@@ -98,15 +99,22 @@ const columns = [
         ],
     },
 ];
-function getFilter(dated = Date.vnNow()) {
-    console.log('dated: ', new Date(dated * 1000));
+
+function navigate(id) {
+    router.push({ path: `/travel/${id}/basic-data` });
+}
+
+function getFilter(dated) {
+    const shipped = dated ? new Date(dated) : Date.vnNew();
+    shipped.setHours(0, 0, 0, 0);
     return {
-        fields: ['id', 'm3'],
-        where: { dated },
+        where: {
+            shipped,
+            m3: { neq: null },
+        },
         include: [
             {
                 relation: 'warehouseIn',
-                where: { code: 'vnh' },
             },
         ],
     };
@@ -116,49 +124,74 @@ const fetchDataRef = ref();
 </script>
 <template>
     <VnSubToolbar />
-    <VnTable
-        ref="tableRef"
-        data-key="StockBoughts"
-        url="StockBoughts/getStockBought"
-        save-url="StockBoughts/crud"
-        order="reserve DESC"
-        :is-editable="true"
-        :disable-option="{ card: true }"
-        :create="{
-            urlCreate: 'StockBoughts',
-            title: t('Reserve some space'),
-            onDataSaved: () => tableRef.reload(),
-            formInitialData: {
-                workerFk: user.id,
-                dated: Date.vnNow(),
-            },
-        }"
-        :columns="columns"
-        auto-load
-        @on-fetch="() => fetchDataRef.fetch()"
-    >
-        <template #moreFilterPanel="{ params }">
-            <FetchData
-                ref="fetchDataRef"
-                url="Travels"
-                limit="1"
-                auto-load
-                :filter="getFilter(params?.date)"
-                @on-fetch="(data) => (travel = data)"
-            />
-            <VnRow class="q-pa-md" style="align-items: center" v-if="travel?.length">
-                <span>{{ t('Booked trucks: ') + travel[0]?.m3 }}</span>
-                <QBtn style="max-width: 20%" flat icon="edit" />
-            </VnRow>
-        </template>
-        <template #column-workerFk="{ row }">
-            <span class="link" @click.stop>
-                {{ row?.worker?.user?.name }}
-                <WorkerDescriptorProxy :id="row?.workerFk" />
-            </span>
-        </template>
-    </VnTable>
+    <QPage class="column items-center q-pa-md">
+        <VnTable
+            ref="tableRef"
+            data-key="StockBoughts"
+            url="StockBoughts/getStockBought"
+            save-url="StockBoughts/crud"
+            order="reserve DESC"
+            :is-editable="true"
+            :create="{
+                urlCreate: 'StockBoughts',
+                title: t('Reserve some space'),
+                onDataSaved: () => tableRef.reload(),
+                formInitialData: {
+                    workerFk: user.id,
+                    dated: Date.vnNow(),
+                },
+            }"
+            :columns="columns"
+            auto-load
+            @on-fetch="() => console.log('fetching...', fetchDataRef.fetch())"
+            style="max-width: 40%"
+            :footer="true"
+        >
+            <template #moreFilterPanel="{ params }">
+                <FetchData
+                    ref="fetchDataRef"
+                    url="Travels"
+                    limit="1"
+                    auto-load
+                    :filter="getFilter(params?.dated)"
+                    @on-fetch="(data) => (travel = data)"
+                />
+                <div class="trucks">
+                    <div>
+                        <span style="color: var(--vn-label-color)">
+                            {{ t('Booked trucks') + ': ' }}
+                        </span>
+                    </div>
+                    <div v-if="travel">
+                        <span>
+                            {{ travel[0]?.m3 }}
+                        </span>
+                        <QBtn
+                            style="max-width: 20%"
+                            flat
+                            icon="edit"
+                            @click="navigate(travel[0]?.id)"
+                        />
+                    </div>
+                </div>
+            </template>
+            <template #column-workerFk="{ row }">
+                <span class="link" @click.stop>
+                    {{ row?.worker?.user?.name }}
+                    <WorkerDescriptorProxy :id="row?.workerFk" />
+                </span>
+            </template>
+        </VnTable>
+    </QPage>
 </template>
+<style lang="scss">
+.trucks {
+    text-align: center;
+    margin: 3%;
+    border: 3px solid var(--vn-header-color);
+    padding: 1%;
+}
+</style>
 <i18n>
     en:
         Buyer: Buyer
@@ -168,6 +201,7 @@ const fetchDataRef = ref();
         Date: Date
         This buyer has already made a reservation for this date: This buyer has already made a reservation for this date
     es:
+        Booked trucks: Camiones reservados
         Buyer: Comprador
         Reserve: Reservado
         Bought: Comprado
diff --git a/src/pages/Entry/EntryStockBoughtDetail.vue b/src/pages/Entry/EntryStockBoughtDetail.vue
index 9212f1115..b9420af71 100644
--- a/src/pages/Entry/EntryStockBoughtDetail.vue
+++ b/src/pages/Entry/EntryStockBoughtDetail.vue
@@ -18,7 +18,7 @@ const $props = defineProps({
         required: true,
     },
 });
-const customUrl = `StockBoughts/getStockBoughtDetail?workerFk=${$props.workerFk}`;
+const customUrl = `StockBoughts/getStockBoughtDetail?workerFk=${$props.workerFk}&date=${$props.dated}`;
 const columns = [
     {
         align: 'left',
diff --git a/test/cypress/integration/entry/stockBought.spec.js b/test/cypress/integration/entry/stockBought.spec.js
index 8e4fe225c..10af3ef42 100644
--- a/test/cypress/integration/entry/stockBought.spec.js
+++ b/test/cypress/integration/entry/stockBought.spec.js
@@ -8,7 +8,7 @@ describe('EntryStockBought', () => {
         );
     });
     it('Should edit the reserved space', () => {
-        cy.get('tBody > tr').its('length').should('eq', 1);
+        cy.get('tBody > tr').its('length').should('eq', 2);
         cy.get(reserveField).type('10{enter}');
         cy.get('button[title="Save"]').click();
         cy.get('.q-notification__message').should('have.text', 'Data saved');

From db6f4fd15a64d32e11d726142dd19bcd45f3502e Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Thu, 5 Sep 2024 14:32:22 +0200
Subject: [PATCH 039/281] refactor: refs #7553 deleted logs

---
 src/pages/Ticket/Card/TicketDescriptorMenu.vue |  1 -
 src/pages/Ticket/Card/TicketSummary.vue        | 12 ++++++++++--
 src/pages/Ticket/TicketList.vue                |  7 +------
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/pages/Ticket/Card/TicketDescriptorMenu.vue b/src/pages/Ticket/Card/TicketDescriptorMenu.vue
index e0c1da889..334939c97 100644
--- a/src/pages/Ticket/Card/TicketDescriptorMenu.vue
+++ b/src/pages/Ticket/Card/TicketDescriptorMenu.vue
@@ -259,7 +259,6 @@ async function createRefund(withWarehouse) {
 }
 
 async function changeShippedHour(time) {
-    console.log('time: ', time);
     const params = {
         shipped: time,
     };
diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index ee6ca6d91..17e4a96c0 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -440,10 +440,18 @@ function getNoteValue(description) {
                                     :color="'negative'"
                                 >
                                     {{ props.row.visible }}
-                                    {{ console.log(props.row) }}
                                 </QChip>
                             </QTd>
-                            <QTd>{{ props.row.available }}</QTd>
+                            <QTd>
+                                <QChip
+                                    dense
+                                    rounded
+                                    v-if="props.row.available < 0"
+                                    :color="'negative'"
+                                >
+                                    {{ props.row.available }}
+                                </QChip>
+                            </QTd>
                             <QTd>{{ props.row.quantity }}</QTd>
                             <QTd class="description-cell">
                                 <div class="row full-width justify-between">
diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index ad50f5433..ee6c4b6a7 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -302,7 +302,7 @@ async function sendDocuware(ticket) {
         }
         notify('globals.dataSaved', 'positive');
     } catch (err) {
-        console.log('err: ', err);
+        console.err('err: ', err);
     }
 }
 
@@ -321,7 +321,6 @@ function openBalanceDialog(ticket) {
     }
 
     for (let ticketData of checkedTickets) {
-        console.log('ticketData: ', ticketData);
         amountPaid.value += ticketData.totalWithVat;
         clientFk.value = ticketData.clientFk;
         description.value.push(ticketData.id);
@@ -367,8 +366,6 @@ const setAmountToReturn = (newAmountGiven) => {
 };
 
 function setReference(data) {
-    console.log('entity: ', data);
-
     let newDescription = '';
 
     switch (data) {
@@ -410,7 +407,6 @@ function setReference(data) {
     }
 
     dialogData.value.value.description = newDescription;
-    console.log('Updated description:', dialogData.value.value.description);
 }
 </script>
 
@@ -451,7 +447,6 @@ function setReference(data) {
         :user-params="userParams"
         :right-search="false"
         redirect="ticket"
-        auto-load
         v-model:selected="selectedRows"
         :table="{
             'row-key': 'id',

From 8ff9dae1d8b32de00fa5876fd441b4d033123054 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 6 Sep 2024 07:16:03 +0200
Subject: [PATCH 040/281] refactor: refs #7553 requested changes

---
 src/pages/Ticket/Card/TicketSummary.vue |  8 +++++++-
 src/pages/Ticket/TicketFilter.vue       | 10 ++++++++++
 src/pages/Ticket/TicketList.vue         |  1 -
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index 17e4a96c0..4562f2c60 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -351,7 +351,7 @@ function getNoteValue(description) {
                     </template>
                     <template #body="props">
                         <QTr :props="props">
-                            <QTd>
+                            <QTd class="q-gutter-x-xs">
                                 <QBtn
                                     flat
                                     round
@@ -392,6 +392,7 @@ function getNoteValue(description) {
                                     name="warning"
                                     v-show="props.row.visible < 0"
                                     color="primary"
+                                    size="xs"
                                 >
                                     <QTooltip>
                                         {{ t('ticket.summary.visible') }}:
@@ -402,6 +403,7 @@ function getNoteValue(description) {
                                     name="vn:reserva"
                                     v-show="props.row.reserved"
                                     color="primary"
+                                    size="xs"
                                 >
                                     <QTooltip>
                                         {{ t('ticket.summary.reserved') }}
@@ -411,6 +413,7 @@ function getNoteValue(description) {
                                     name="vn:unavailable"
                                     v-show="props.row.itemShortage"
                                     color="primary"
+                                    size="xs"
                                 >
                                     <QTooltip>
                                         {{ t('ticket.summary.itemShortage') }}
@@ -420,6 +423,7 @@ function getNoteValue(description) {
                                     name="vn:components"
                                     v-show="props.row.hasComponentLack"
                                     color="primary"
+                                    size="xs"
                                 >
                                     <QTooltip>
                                         {{ t('ticket.summary.hasComponentLack') }}
@@ -438,6 +442,7 @@ function getNoteValue(description) {
                                     rounded
                                     v-if="props.row.visible < 0"
                                     :color="'negative'"
+                                    text-color="white"
                                 >
                                     {{ props.row.visible }}
                                 </QChip>
@@ -448,6 +453,7 @@ function getNoteValue(description) {
                                     rounded
                                     v-if="props.row.available < 0"
                                     :color="'negative'"
+                                    text-color="white"
                                 >
                                     {{ props.row.available }}
                                 </QChip>
diff --git a/src/pages/Ticket/TicketFilter.vue b/src/pages/Ticket/TicketFilter.vue
index 3b9833ce2..b7389b93f 100644
--- a/src/pages/Ticket/TicketFilter.vue
+++ b/src/pages/Ticket/TicketFilter.vue
@@ -115,6 +115,15 @@ const warehouses = ref([]);
                     />
                 </QItemSection>
             </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInput
+                        v-model="params.scopedDays"
+                        :label="t('Days onward')"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
             <QItem>
                 <QItemSection>
                     <QCheckbox
@@ -278,4 +287,5 @@ es:
     Warehouse: Almacén
     Yes: Si
     No: No
+    Days onward: Días adelante
 </i18n>
diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index ee6c4b6a7..1f2687500 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -255,7 +255,6 @@ const fetchAddresses = async (formData) => {
     }
 };
 const getColor = (row) => {
-    // return row?.classColor ? `bg-${row.classColor}` : 'bg-orange';
     if (row.alertLevelCode === 'OK') return 'bg-success';
     else if (row.alertLevelCode === 'FREE') return 'bg-notice';
     else if (row.alertLevel === 1) return 'bg-warning';

From cd12343302c9fea5bc5419ac04731d43b75baf2d Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Fri, 6 Sep 2024 07:26:04 +0200
Subject: [PATCH 041/281] feat: refs #7404 add some style to the form and
 reorganize fields

---
 src/components/VnTable/VnColumn.vue        |   3 +
 src/components/VnTable/VnTable.vue         |   8 +-
 src/components/common/VnComponent.vue      |   6 +-
 src/pages/Entry/EntryStockBought.vue       | 119 ++++++++++-----------
 src/pages/Entry/EntryStockBoughtFilter.vue |  57 ++++++++++
 src/pages/Route/Card/RouteSearchbar.vue    |   1 -
 src/pages/Route/RouteList.vue              |   1 -
 7 files changed, 120 insertions(+), 75 deletions(-)
 create mode 100644 src/pages/Entry/EntryStockBoughtFilter.vue

diff --git a/src/components/VnTable/VnColumn.vue b/src/components/VnTable/VnColumn.vue
index ed34e9eee..ad120f02e 100644
--- a/src/components/VnTable/VnColumn.vue
+++ b/src/components/VnTable/VnColumn.vue
@@ -171,6 +171,8 @@ const components = computed(() => $props.components ?? defaultComponents);
             :value="{ row, model }"
             v-model="model"
         />
+
+        {{ console.log('model: ', col) }}
         <VnComponent
             v-if="col.component"
             :prop="col"
@@ -178,6 +180,7 @@ const components = computed(() => $props.components ?? defaultComponents);
             :value="{ row, model }"
             v-model="model"
         />
+
         <span :title="value" v-else>{{ value }}</span>
         <VnComponent
             v-if="col.after"
diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 0fd6d1dd1..b5d6e8d10 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -15,7 +15,6 @@ import VnTableChip from 'components/VnTable/VnChip.vue';
 import VnVisibleColumn from 'src/components/VnTable/VnVisibleColumn.vue';
 import VnLv from 'components/ui/VnLv.vue';
 import VnTableOrder from 'src/components/VnTable/VnOrder.vue';
-import item from 'src/router/modules/item';
 
 const $props = defineProps({
     columns: {
@@ -410,7 +409,7 @@ defineExpose({
                     />
                 </template>
                 <template #header-cell="{ col }">
-                    <QTh v-if="col.visible ?? true">
+                    <QTh table-header-style="max-width:50%" v-if="col.visible ?? true">
                         <div
                             class="column self-start q-ml-xs ellipsis"
                             :class="`text-${col?.align ?? 'left'}`"
@@ -665,6 +664,7 @@ defineExpose({
                         :column-name="column.name"
                         :label="column.label"
                     >
+                        {{ console.log('data: ', data) }}
                         <VnTableColumn
                             :column="column"
                             :row="{}"
@@ -708,9 +708,7 @@ es:
 
 .q-table--dark .q-table__bottom,
 .q-table--dark thead,
-.q-table--dark tr,
-.q-table--dark th,
-.q-table--dark td {
+.q-table--dark tr {
     border-color: var(--vn-section-color);
 }
 
diff --git a/src/components/common/VnComponent.vue b/src/components/common/VnComponent.vue
index fa99f9892..1ba1506d5 100644
--- a/src/components/common/VnComponent.vue
+++ b/src/components/common/VnComponent.vue
@@ -17,17 +17,16 @@ const $props = defineProps({
     },
 });
 
-let mixed;
 const componentArray = computed(() => {
     if (typeof $props.prop === 'object') return [$props.prop];
     return $props.prop;
 });
 
 function mix(toComponent) {
-    if (mixed) return mixed;
     const { component, attrs, event } = toComponent;
+    console.log('attrs: ', attrs);
     const customComponent = $props.components[component];
-    mixed = {
+    return {
         component: customComponent?.component ?? component,
         attrs: {
             ...toValueAttrs(attrs),
@@ -37,7 +36,6 @@ function mix(toComponent) {
         },
         event: { ...customComponent?.event, ...event },
     };
-    return mixed;
 }
 
 function toValueAttrs(attrs) {
diff --git a/src/pages/Entry/EntryStockBought.vue b/src/pages/Entry/EntryStockBought.vue
index 75d356bd2..8f197be92 100644
--- a/src/pages/Entry/EntryStockBought.vue
+++ b/src/pages/Entry/EntryStockBought.vue
@@ -4,20 +4,18 @@ import { useI18n } from 'vue-i18n';
 import { useState } from 'src/composables/useState';
 import { useQuasar } from 'quasar';
 
-import VnTable from 'components/VnTable/VnTable.vue';
-import VnRow from 'src/components/ui/VnRow.vue';
-import FetchData from 'src/components/FetchData.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
+import RightMenu from 'src/components/common/RightMenu.vue';
+import EntryStockBoughtFilter from './EntryStockBoughtFilter.vue';
+import VnTable from 'components/VnTable/VnTable.vue';
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
 import EntryStockBoughtDetail from 'src/pages/Entry/EntryStockBoughtDetail.vue';
-import { useRouter } from 'vue-router';
 
 const { t } = useI18n();
 const quasar = useQuasar();
 const tableRef = ref();
 const state = useState();
 const user = state.getUser();
-const router = useRouter();
 const columns = [
     {
         align: 'left',
@@ -31,8 +29,17 @@ const columns = [
         align: 'left',
         name: 'workerFk',
         label: t('Buyer'),
-        isTitle: true,
-        columnFilter: false,
+        component: 'select',
+        create: true,
+        attrs: {
+            url: 'Workers/activeWithInheritedRole',
+            fields: ['id', 'name'],
+            where: { role: 'buyer' },
+            optionFilter: 'firstName',
+            optionLabel: 'name',
+            optionValue: 'id',
+            useLike: false,
+        },
     },
     {
         align: 'left',
@@ -44,31 +51,13 @@ const columns = [
         summation: true,
         cardVisible: true,
     },
-    {
-        align: 'left',
-        name: 'workerFk',
-        label: t('Buyer'),
-        component: 'select',
-        create: true,
-        visible: false,
-        columnFilter: false,
-        attrs: {
-            url: 'Workers/activeWithInheritedRole',
-            fields: ['id', 'name'],
-            where: { role: 'buyer' },
-            optionFilter: 'firstName',
-            optionLabel: 'name',
-            optionValue: 'id',
-            useLike: false,
-        },
-    },
     {
         align: 'left',
         label: t('Bought'),
         name: 'bought',
-        columnFilter: false,
         summation: true,
         cardVisible: true,
+        columnFilter: false,
     },
     {
         align: 'left',
@@ -92,7 +81,6 @@ const columns = [
                         componentProps: {
                             workerFk: row.workerFk,
                         },
-                        maximized: true,
                     });
                 },
             },
@@ -100,10 +88,6 @@ const columns = [
     },
 ];
 
-function navigate(id) {
-    router.push({ path: `/travel/${id}/basic-data` });
-}
-
 function getFilter(dated) {
     const shipped = dated ? new Date(dated) : Date.vnNew();
     shipped.setHours(0, 0, 0, 0);
@@ -119,11 +103,46 @@ function getFilter(dated) {
         ],
     };
 }
-const travel = ref();
-const fetchDataRef = ref();
+const userParams = ref({
+    dated: Date.vnNew(),
+});
 </script>
 <template>
-    <VnSubToolbar />
+    <VnSubToolbar>
+        <template #st-data="{ params }">
+            <FetchData
+                ref="fetchDataRef"
+                url="Travels"
+                limit="1"
+                auto-load
+                :filter="getFilter(params?.dated)"
+                @on-fetch="(data) => (travel = data)"
+            />
+            <div>
+                <div>
+                    <span style="color: var(--vn-label-color)">
+                        {{ t('Booked trucks') + ': ' }}
+                    </span>
+                </div>
+                <div v-if="travel">
+                    <span>
+                        {{ travel[0]?.m3 }}
+                    </span>
+                    <QBtn
+                        style="max-width: 20%"
+                        flat
+                        icon="edit"
+                        @click="navigate(travel[0]?.id)"
+                    />
+                </div>
+            </div>
+        </template>
+    </VnSubToolbar>
+    <RightMenu>
+        <template #right-panel>
+            <EntryStockBoughtFilter data-key="StockBoughts" />
+        </template>
+    </RightMenu>
     <QPage class="column items-center q-pa-md">
         <VnTable
             ref="tableRef"
@@ -131,6 +150,7 @@ const fetchDataRef = ref();
             url="StockBoughts/getStockBought"
             save-url="StockBoughts/crud"
             order="reserve DESC"
+            :right-search="false"
             :is-editable="true"
             :create="{
                 urlCreate: 'StockBoughts',
@@ -142,39 +162,10 @@ const fetchDataRef = ref();
                 },
             }"
             :columns="columns"
+            :user-params="userParams"
             auto-load
-            @on-fetch="() => console.log('fetching...', fetchDataRef.fetch())"
-            style="max-width: 40%"
             :footer="true"
         >
-            <template #moreFilterPanel="{ params }">
-                <FetchData
-                    ref="fetchDataRef"
-                    url="Travels"
-                    limit="1"
-                    auto-load
-                    :filter="getFilter(params?.dated)"
-                    @on-fetch="(data) => (travel = data)"
-                />
-                <div class="trucks">
-                    <div>
-                        <span style="color: var(--vn-label-color)">
-                            {{ t('Booked trucks') + ': ' }}
-                        </span>
-                    </div>
-                    <div v-if="travel">
-                        <span>
-                            {{ travel[0]?.m3 }}
-                        </span>
-                        <QBtn
-                            style="max-width: 20%"
-                            flat
-                            icon="edit"
-                            @click="navigate(travel[0]?.id)"
-                        />
-                    </div>
-                </div>
-            </template>
             <template #column-workerFk="{ row }">
                 <span class="link" @click.stop>
                     {{ row?.worker?.user?.name }}
diff --git a/src/pages/Entry/EntryStockBoughtFilter.vue b/src/pages/Entry/EntryStockBoughtFilter.vue
new file mode 100644
index 000000000..3393113f2
--- /dev/null
+++ b/src/pages/Entry/EntryStockBoughtFilter.vue
@@ -0,0 +1,57 @@
+<script setup>
+import { ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { onMounted } from 'vue';
+import { useStateStore } from 'stores/useStateStore';
+
+import VnFilterPanel from 'src/components/ui/VnFilterPanel.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 companiesOptions = ref([]);
+const stateStore = useStateStore();
+onMounted(async () => {
+    stateStore.rightDrawer = true;
+});
+</script>
+
+<template>
+    <FetchData
+        ref="buyer"
+        url="Workers/activeWithInheritedRole"
+        :filter="{
+            fields: ['id', 'name'],
+            where: { role: 'buyer' },
+        }"
+        order="name"
+        @on-fetch="(data) => (companiesOptions = 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 }">
+            <QItem class="q-my-sm">
+                <QItemSection>
+                    <VnInputDate v-model="params.dated" :label="t('Date')" is-outlined />
+                </QItemSection>
+            </QItem>
+        </template>
+    </VnFilterPanel>
+</template>
+<i18n>
+    es:
+        Date: Fecha
+</i18n>
diff --git a/src/pages/Route/Card/RouteSearchbar.vue b/src/pages/Route/Card/RouteSearchbar.vue
index 48ad09151..a8e11cef6 100644
--- a/src/pages/Route/Card/RouteSearchbar.vue
+++ b/src/pages/Route/Card/RouteSearchbar.vue
@@ -3,7 +3,6 @@ import VnSearchbar from 'components/ui/VnSearchbar.vue';
 import { useI18n } from 'vue-i18n';
 const { t } = useI18n();
 </script>
-
 <template>
     <VnSearchbar
         data-key="RouteList"
diff --git a/src/pages/Route/RouteList.vue b/src/pages/Route/RouteList.vue
index ef544a68d..7e2358236 100644
--- a/src/pages/Route/RouteList.vue
+++ b/src/pages/Route/RouteList.vue
@@ -409,5 +409,4 @@ es:
     Route is not served: La ruta no está servida
     hourStarted: Hora de inicio
     hourFinished: Hora de fin
-    Volume: Volumen
 </i18n>

From 0e5607d685b19600ce99fea92ad83616eca8aa40 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 6 Sep 2024 13:59:50 +0200
Subject: [PATCH 042/281] feat: refs #7553 ticket component to vntable and
 fixed minor errors

---
 .../Ticket/Card/BasicData/TicketBasicData.vue | 151 ++++----
 src/pages/Ticket/Card/TicketComponents.vue    | 353 +++++++++---------
 .../Ticket/Card/TicketPurchaseRequest.vue     |  15 +-
 src/pages/Ticket/Card/TicketSale.vue          | 181 ++++-----
 src/pages/Ticket/Card/TicketVolume.vue        |   4 +-
 5 files changed, 338 insertions(+), 366 deletions(-)

diff --git a/src/pages/Ticket/Card/BasicData/TicketBasicData.vue b/src/pages/Ticket/Card/BasicData/TicketBasicData.vue
index 22e89d394..741231ca3 100644
--- a/src/pages/Ticket/Card/BasicData/TicketBasicData.vue
+++ b/src/pages/Ticket/Card/BasicData/TicketBasicData.vue
@@ -4,7 +4,6 @@ import { useI18n } from 'vue-i18n';
 
 import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
 import FetchedTags from 'components/ui/FetchedTags.vue';
-import RightMenu from 'src/components/common/RightMenu.vue';
 import FetchData from 'components/FetchData.vue';
 
 import { useStateStore } from 'stores/useStateStore';
@@ -145,83 +144,81 @@ onUnmounted(() => (stateStore.rightDrawer = false));
         @on-fetch="(data) => (ticketUpdateActions = data)"
         auto-load
     />
-    <RightMenu>
-        <template #right-panel>
-            <QCard
-                class="q-pa-md q-mb-md q-ma-md color-vn-text"
-                bordered
-                flat
-                style="border-color: black"
+    <QDrawer side="right" :width="270" v-model="stateStore.rightDrawer">
+        <QCard
+            class="q-pa-md q-mb-md q-ma-md color-vn-text"
+            bordered
+            flat
+            style="border-color: black"
+        >
+            <QCardSection horizontal>
+                <span class="text-weight-bold text-subtitle1 text-center full-width">
+                    {{ t('basicData.total') }}
+                </span>
+            </QCardSection>
+            <QCardSection class="column items-center" horizontal>
+                <span>
+                    {{ t('basicData.price') }}:
+                    {{ toCurrency(totalPrice) }}
+                </span>
+            </QCardSection>
+            <QCardSection class="column items-center" horizontal>
+                <span>
+                    {{ t('basicData.newPrice') }}: {{ toCurrency(totalNewPrice) }}
+                </span>
+            </QCardSection>
+            <QCardSection class="column items-center" horizontal>
+                <span>
+                    {{ t('basicData.difference') }}: {{ toCurrency(totalDifference) }}
+                </span>
+            </QCardSection>
+        </QCard>
+        <QCard
+            v-if="totalDifference"
+            class="q-pa-md q-mb-md q-ma-md color-vn-text"
+            bordered
+            flat
+            style="border-color: black"
+        >
+            <QCardSection horizontal>
+                <span class="text-weight-bold text-subtitle1 text-center full-width">
+                    {{ t('basicData.chargeDifference') }}
+                </span>
+            </QCardSection>
+            <QCardSection
+                v-for="(action, index) in ticketUpdateActions"
+                :key="index"
+                horizontal
             >
-                <QCardSection horizontal>
-                    <span class="text-weight-bold text-subtitle1 text-center full-width">
-                        {{ t('basicData.total') }}
-                    </span>
-                </QCardSection>
-                <QCardSection class="column items-center" horizontal>
-                    <span>
-                        {{ t('basicData.price') }}:
-                        {{ toCurrency(totalPrice) }}
-                    </span>
-                </QCardSection>
-                <QCardSection class="column items-center" horizontal>
-                    <span>
-                        {{ t('basicData.newPrice') }}: {{ toCurrency(totalNewPrice) }}
-                    </span>
-                </QCardSection>
-                <QCardSection class="column items-center" horizontal>
-                    <span>
-                        {{ t('basicData.difference') }}: {{ toCurrency(totalDifference) }}
-                    </span>
-                </QCardSection>
-            </QCard>
-            <QCard
-                v-if="totalDifference"
-                class="q-pa-md q-mb-md q-ma-md color-vn-text"
-                bordered
-                flat
-                style="border-color: black"
-            >
-                <QCardSection horizontal>
-                    <span class="text-weight-bold text-subtitle1 text-center full-width">
-                        {{ t('basicData.chargeDifference') }}
-                    </span>
-                </QCardSection>
-                <QCardSection
-                    v-for="(action, index) in ticketUpdateActions"
-                    :key="index"
-                    horizontal
-                >
-                    <QRadio
-                        v-model="_ticketData.option"
-                        :val="action.code"
-                        :label="action.description"
-                        dense
-                    />
-                </QCardSection>
-            </QCard>
-            <QCard
-                v-if="haveNegatives"
-                class="q-pa-md q-mb-md q-ma-md color-vn-text"
-                bordered
-                flat
-                style="border-color: black"
-            >
-                <QCardSection horizontal class="flex row items-center">
-                    <QCheckbox
-                        :label="t('basicData.withoutNegatives')"
-                        v-model="_ticketData.withoutNegatives"
-                        :toggle-indeterminate="false"
-                    />
-                    <QIcon name="info" size="xs" class="q-ml-sm">
-                        <QTooltip max-width="350px">
-                            {{ t('basicData.withoutNegativesInfo') }}
-                        </QTooltip>
-                    </QIcon>
-                </QCardSection>
-            </QCard>
-        </template>
-    </RightMenu>
+                <QRadio
+                    v-model="_ticketData.option"
+                    :val="action.code"
+                    :label="action.description"
+                    dense
+                />
+            </QCardSection>
+        </QCard>
+        <QCard
+            v-if="haveNegatives"
+            class="q-pa-md q-mb-md q-ma-md color-vn-text"
+            bordered
+            flat
+            style="border-color: black"
+        >
+            <QCardSection horizontal class="flex row items-center">
+                <QCheckbox
+                    :label="t('basicData.withoutNegatives')"
+                    v-model="_ticketData.withoutNegatives"
+                    :toggle-indeterminate="false"
+                />
+                <QIcon name="info" size="xs" class="q-ml-sm">
+                    <QTooltip max-width="350px">
+                        {{ t('basicData.withoutNegativesInfo') }}
+                    </QTooltip>
+                </QIcon>
+            </QCardSection>
+        </QCard>
+    </QDrawer>
     <QTable
         :visible-columns="showMovablecolumn"
         :rows="rows"
diff --git a/src/pages/Ticket/Card/TicketComponents.vue b/src/pages/Ticket/Card/TicketComponents.vue
index c008f8314..96462b8a6 100644
--- a/src/pages/Ticket/Card/TicketComponents.vue
+++ b/src/pages/Ticket/Card/TicketComponents.vue
@@ -5,15 +5,16 @@ import { useRoute } from 'vue-router';
 
 import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
 import FetchedTags from 'components/ui/FetchedTags.vue';
-import RightMenu from 'src/components/common/RightMenu.vue';
 import FetchData from 'components/FetchData.vue';
 import ZoneDescriptorProxy from 'src/pages/Zone/Card/ZoneDescriptorProxy.vue';
+import VnImg from 'src/components/ui/VnImg.vue';
 
 import { useStateStore } from 'stores/useStateStore';
 import { dashIfEmpty } from 'src/filters';
 import { useArrayData } from 'composables/useArrayData';
 import { toCurrency } from 'filters/index';
 import axios from 'axios';
+import VnTable from 'src/components/VnTable/VnTable.vue';
 
 const route = useRoute();
 const stateStore = useStateStore();
@@ -75,32 +76,39 @@ const columns = computed(() => [
         name: 'item',
         align: 'left',
     },
+    {
+        align: 'left',
+        label: t('lines.image'),
+        name: 'image',
+        columnField: {
+            component: VnImg,
+            attrs: (id) => {
+                return {
+                    id,
+                    width: '50px',
+                };
+            },
+        },
+        columnFilter: false,
+    },
     {
         label: t('ticketComponents.description'),
         name: 'description',
         align: 'left',
+        columnClass: 'expand',
     },
     {
         label: t('ticketComponents.quantity'),
         name: 'quantity',
         field: 'quantity',
         align: 'left',
-        format: (val) => dashIfEmpty(val),
+        format: (row) => dashIfEmpty(row.quantity),
     },
     {
         label: t('ticketComponents.serie'),
         name: 'serie',
         align: 'left',
-    },
-    {
-        label: t('ticketComponents.components'),
-        name: 'components',
-        align: 'left',
-    },
-    {
-        label: t('ticketComponents.import'),
-        name: 'import',
-        align: 'left',
+        format: (row) => dashIfEmpty(row.serie),
     },
     {
         label: t('ticketComponents.total'),
@@ -174,181 +182,166 @@ onUnmounted(() => (stateStore.rightDrawer = false));
         @on-fetch="(data) => (components = data)"
         auto-load
     />
-    <RightMenu>
-        <template #right-panel>
-            <QCard
-                class="q-pa-sm color-vn-text"
-                bordered
-                flat
-                style="border-color: black"
+    <QDrawer side="right" :width="270" v-model="stateStore.rightDrawer">
+        <QCard class="q-pa-sm color-vn-text" bordered flat style="border-color: black">
+            <QCardSection horizontal>
+                <span class="text-weight-bold text-subtitle1 text-center full-width">
+                    {{ t('ticketComponents.total') }}
+                </span>
+            </QCardSection>
+            <QCardSection horizontal>
+                <span class="q-mr-xs color-vn-label"
+                    >{{ t('ticketComponents.baseToCommission') }}:
+                </span>
+                <span>{{ toCurrency(getBase) }}</span>
+            </QCardSection>
+            <QCardSection horizontal>
+                <span class="q-mr-xs color-vn-label"
+                    >{{ t('ticketComponents.totalWithoutVat') }}:
+                </span>
+                <span>{{ toCurrency(getTotal) }}</span>
+            </QCardSection>
+        </QCard>
+        <QCard class="q-pa-sm color-vn-text" bordered flat style="border-color: black">
+            <QCardSection horizontal>
+                <span class="text-weight-bold text-subtitle1 text-center full-width">
+                    {{ t('ticketComponents.components') }}
+                </span>
+            </QCardSection>
+            <QCardSection
+                v-for="(component, index) in componentsList"
+                :key="index"
+                horizontal
             >
-                <QCardSection horizontal>
-                    <span class="text-weight-bold text-subtitle1 text-center full-width">
-                        {{ t('ticketComponents.total') }}
-                    </span>
-                </QCardSection>
-                <QCardSection horizontal>
-                    <span class="q-mr-xs color-vn-label"
-                        >{{ t('ticketComponents.baseToCommission') }}:
-                    </span>
-                    <span>{{ toCurrency(getBase) }}</span>
-                </QCardSection>
-                <QCardSection horizontal>
-                    <span class="q-mr-xs color-vn-label"
-                        >{{ t('ticketComponents.totalWithoutVat') }}:
-                    </span>
-                    <span>{{ toCurrency(getTotal) }}</span>
-                </QCardSection>
-            </QCard>
-            <QCard
-                class="q-pa-sm color-vn-text"
-                bordered
-                flat
-                style="border-color: black"
-            >
-                <QCardSection horizontal>
-                    <span class="text-weight-bold text-subtitle1 text-center full-width">
-                        {{ t('ticketComponents.components') }}
-                    </span>
-                </QCardSection>
-                <QCardSection
-                    v-for="(component, index) in componentsList"
-                    :key="index"
-                    horizontal
-                >
-                    <span v-if="component.name" class="q-mr-xs color-vn-label">
-                        {{ component.name }}:
-                    </span>
-                    <span v-if="component.value">{{
-                        toCurrency(component.value, 'EUR', 3)
-                    }}</span>
-                </QCardSection>
-            </QCard>
-            <QCard
-                class="q-pa-sm color-vn-text"
-                bordered
-                flat
-                style="border-color: black"
-            >
-                <QCardSection horizontal>
-                    <span class="text-weight-bold text-subtitle1 text-center full-width">
-                        {{ t('ticketComponents.zoneBreakdown') }}
-                    </span>
-                </QCardSection>
-                <QCardSection horizontal>
-                    <span class="q-mr-xs color-vn-label">
-                        {{ t('ticketComponents.price') }}:
-                    </span>
-                    <span>{{ toCurrency(ticketData?.zonePrice, 'EUR', 2) }}</span>
-                </QCardSection>
-                <QCardSection horizontal>
-                    <span class="q-mr-xs color-vn-label">
-                        {{ t('ticketComponents.bonus') }}:
-                    </span>
-                    <span>{{ toCurrency(ticketData?.zoneBonus, 'EUR', 2) }}</span>
-                </QCardSection>
-                <QCardSection horizontal>
-                    <span class="q-mr-xs color-vn-label">
-                        {{ t('ticketComponents.zone') }}:
-                    </span>
-                    <span class="link">
-                        {{ dashIfEmpty(ticketData?.zone?.name) }}
-                        <ZoneDescriptorProxy :id="ticketData?.zone?.id" />
-                    </span>
-                </QCardSection>
-                <QCardSection v-if="ticketData?.zone?.isVolumetric" horizontal>
-                    <span class="q-mr-xs color-vn-label">
-                        {{ t('ticketComponents.volume') }}:
-                    </span>
-                    <span>{{ ticketVolume }}</span>
-                </QCardSection>
-                <QCardSection horizontal>
-                    <span class="q-mr-xs color-vn-label">
-                        {{ t('ticketComponents.packages') }}:
-                    </span>
-                    <span>{{ dashIfEmpty(ticketData?.packages) }}</span>
-                </QCardSection>
-            </QCard>
-            <QCard
-                class="q-pa-sm color-vn-text"
-                bordered
-                flat
-                style="border-color: black"
-            >
-                <QCardSection horizontal>
-                    <span class="text-weight-bold text-subtitle1 text-center full-width">
-                        {{ t('ticketComponents.theoricalCost') }}
-                    </span>
-                </QCardSection>
-                <QCardSection horizontal>
-                    <span class="q-mr-xs color-vn-label">
-                        {{ t('ticketComponents.totalPrice') }}:
-                    </span>
-                    <span>{{ toCurrency(theoricalCost, 'EUR', 2) }}</span>
-                </QCardSection>
-            </QCard>
-        </template>
-    </RightMenu>
-    <QTable
-        :rows="components"
+                <span v-if="component.name" class="q-mr-xs color-vn-label">
+                    {{ component.name }}:
+                </span>
+                <span v-if="component.value">{{
+                    toCurrency(component.value, 'EUR', 3)
+                }}</span>
+            </QCardSection>
+        </QCard>
+        <QCard class="q-pa-sm color-vn-text" bordered flat style="border-color: black">
+            <QCardSection horizontal>
+                <span class="text-weight-bold text-subtitle1 text-center full-width">
+                    {{ t('ticketComponents.zoneBreakdown') }}
+                </span>
+            </QCardSection>
+            <QCardSection horizontal>
+                <span class="q-mr-xs color-vn-label">
+                    {{ t('ticketComponents.price') }}:
+                </span>
+                <span>{{ toCurrency(ticketData?.zonePrice, 'EUR', 2) }}</span>
+            </QCardSection>
+            <QCardSection horizontal>
+                <span class="q-mr-xs color-vn-label">
+                    {{ t('ticketComponents.bonus') }}:
+                </span>
+                <span>{{ toCurrency(ticketData?.zoneBonus, 'EUR', 2) }}</span>
+            </QCardSection>
+            <QCardSection horizontal>
+                <span class="q-mr-xs color-vn-label">
+                    {{ t('ticketComponents.zone') }}:
+                </span>
+                <span class="link">
+                    {{ dashIfEmpty(ticketData?.zone?.name) }}
+                    <ZoneDescriptorProxy :id="ticketData?.zone?.id" />
+                </span>
+            </QCardSection>
+            <QCardSection v-if="ticketData?.zone?.isVolumetric" horizontal>
+                <span class="q-mr-xs color-vn-label">
+                    {{ t('ticketComponents.volume') }}:
+                </span>
+                <span>{{ ticketVolume }}</span>
+            </QCardSection>
+            <QCardSection horizontal>
+                <span class="q-mr-xs color-vn-label">
+                    {{ t('ticketComponents.packages') }}:
+                </span>
+                <span>{{ dashIfEmpty(ticketData?.packages) }}</span>
+            </QCardSection>
+        </QCard>
+        <QCard class="q-pa-sm color-vn-text" bordered flat style="border-color: black">
+            <QCardSection horizontal>
+                <span class="text-weight-bold text-subtitle1 text-center full-width">
+                    {{ t('ticketComponents.theoricalCost') }}
+                </span>
+            </QCardSection>
+            <QCardSection horizontal>
+                <span class="q-mr-xs color-vn-label">
+                    {{ t('ticketComponents.totalPrice') }}:
+                </span>
+                <span>{{ toCurrency(theoricalCost, 'EUR', 2) }}</span>
+            </QCardSection>
+        </QCard>
+    </QDrawer>
+    <VnTable
+        ref="tableRef"
+        data-key="TicketComponents"
+        url="Sales"
+        :user-filter="salesFilter"
         :columns="columns"
-        row-key="id"
-        :pagination="{ rowsPerPage: 0 }"
-        class="full-width q-mt-md"
-        :no-data-label="t('globals.noResults')"
+        :right-search="false"
+        auto-load
+        :disable-option="{ card: true }"
+        :column-search="false"
     >
-        <template #body-cell-item="{ row }">
-            <QTd @click.stop class="link">
-                <QBtn flat>
-                    <span>{{ row.itemFk }}</span>
-                    <ItemDescriptorProxy :id="row.itemFk" />
-                </QBtn>
-            </QTd>
+        <template #column-item="{ row }">
+            <span @click.stop flat class="link">
+                {{ row.itemFk }}
+                <ItemDescriptorProxy :id="row.itemFk" />
+            </span>
         </template>
-        <template #body-cell-description="{ row }">
-            <QTd>
-                <div class="column">
-                    <span>{{ row.item.name }}</span>
-                    <span class="color-vn-label">{{ row.item.subName }}</span>
-                    <FetchedTags :item="row.item" />
-                </div>
-            </QTd>
+        <template #column-image="{ row }">
+            <div class="image-wrapper">
+                <VnImg :id="parseInt(row?.item?.id)" class="rounded" />
+            </div>
         </template>
-        <template #body-cell-serie="{ row }">
-            <QTd>
-                <div class="column">
-                    <span v-for="(saleComponent, index) in row.components" :key="index">
-                        {{ saleComponent.component?.componentType?.name }}
-                    </span>
-                </div>
-            </QTd>
+        <template #column-description="{ row }">
+            <div class="column">
+                <span>{{ row.item.name }}</span>
+                <span class="color-vn-label">{{ row.item.subName }}</span>
+                <FetchedTags :item="row.item" />
+            </div>
         </template>
-        <template #body-cell-components="{ row }">
-            <QTd>
-                <div class="column">
-                    <span v-for="(saleComponent, index) in row.components" :key="index">
-                        {{ saleComponent.component?.name }}
-                    </span>
-                </div>
-            </QTd>
+        <template #column-serie="{ row }">
+            <div class="column">
+                <span v-for="(saleComponent, index) in row.components" :key="index">
+                    {{ saleComponent.component?.componentType?.name }}
+                </span>
+            </div>
         </template>
-        <template #body-cell-import="{ row }">
-            <QTd>
-                <div class="column text-right">
-                    <span v-for="(saleComponent, index) in row.components" :key="index">
+        <!-- <template #column-components="{ row }">
+            <div class="column">
+                <span v-for="(saleComponent, index) in row.components" :key="index">
+                    {{ saleComponent.component?.name }}
+                </span>
+            </div>
+        </template> -->
+        <!-- <template #column-import="{ row }">
+            <div class="column text-left">
+                <span v-for="(saleComponent, index) in row.components" :key="index">
+                    {{ toCurrency(saleComponent.value, 'EUR', 3) }}
+                </span>
+            </div>
+        </template> -->
+        <template #column-total="{ row }">
+            <div class="column">
+                <span v-for="(saleComponent, index) in row.components" :key="index">
+                    {{ toCurrency(saleComponent.value * row.quantity, 'EUR', 3) }}
+                    <QTooltip>
+                        {{ saleComponent.component?.name }}:
                         {{ toCurrency(saleComponent.value, 'EUR', 3) }}
-                    </span>
-                </div>
-            </QTd>
+                    </QTooltip>
+                </span>
+            </div>
         </template>
-        <template #body-cell-total="{ row }">
-            <QTd>
-                <div class="column text-right">
-                    <span v-for="(saleComponent, index) in row.components" :key="index">
-                        {{ toCurrency(saleComponent.value * row.quantity, 'EUR', 3) }}
-                    </span>
-                </div>
-            </QTd>
-        </template>
-    </QTable>
+    </VnTable>
 </template>
+
+<style lang="scss" scoped>
+.image-wrapper {
+    width: 40px;
+    height: 40px;
+}
+</style>
diff --git a/src/pages/Ticket/Card/TicketPurchaseRequest.vue b/src/pages/Ticket/Card/TicketPurchaseRequest.vue
index 3efdcbef8..d0af9efd0 100644
--- a/src/pages/Ticket/Card/TicketPurchaseRequest.vue
+++ b/src/pages/Ticket/Card/TicketPurchaseRequest.vue
@@ -14,8 +14,11 @@ import VnSelect from 'src/components/common/VnSelect.vue';
 import FetchData from 'src/components/FetchData.vue';
 import { useVnConfirm } from 'composables/useVnConfirm';
 import useNotify from 'src/composables/useNotify.js';
+import { onMounted } from 'vue';
+import { useStateStore } from 'src/stores/useStateStore';
 
 const route = useRoute();
+const stateStore = useStateStore();
 const { t } = useI18n();
 const tableRef = ref();
 const attendersOptions = ref([]);
@@ -84,14 +87,12 @@ const columns = computed(() => [
             condition: () => true,
         },
         isId: true,
-        hidden: true,
     },
     {
         align: 'left',
         label: t('purchaseRequest.description'),
         name: 'description',
         columnClass: 'expand',
-        hidden: true,
     },
     {
         align: 'left',
@@ -99,7 +100,6 @@ const columns = computed(() => [
         name: 'created',
         format: (row) => toDateFormat(row.created),
         cardVisible: true,
-        hidden: true,
     },
     {
         align: 'left',
@@ -107,7 +107,6 @@ const columns = computed(() => [
         name: 'requesterFk',
         cardVisible: true,
         format: (row) => dashIfEmpty(row.requester?.user?.nickname),
-        hidden: true,
     },
     {
         align: 'left',
@@ -115,33 +114,28 @@ const columns = computed(() => [
         name: 'attenderFk',
         cardVisible: true,
         format: (row) => dashIfEmpty(row.atender?.user?.nickname),
-        hidden: true,
     },
     {
         align: 'left',
         label: t('purchaseRequest.quantity'),
         name: 'quantity',
-        hidden: true,
     },
     {
         align: 'left',
         label: t('purchaseRequest.price'),
         name: 'price',
-        hidden: true,
     },
     {
         align: 'left',
         label: t('purchaseRequest.saleFk'),
         name: 'saleFk',
         cardVisible: true,
-        hidden: true,
     },
     {
         align: 'left',
         label: t('purchaseRequest.state'),
         name: 'isOk',
         cardVisible: true,
-        isHidden: true,
     },
     {
         align: 'right',
@@ -186,6 +180,8 @@ async function removeLine(id) {
         console.error('Error ', err);
     }
 }
+
+onMounted(() => (stateStore.rightDrawer = false));
 </script>
 
 <template>
@@ -212,6 +208,7 @@ async function removeLine(id) {
         :columns="columns"
         :is-editable="true"
         :right-search="false"
+        :column-search="false"
         auto-load
     >
         <template #column-description="{ row }">
diff --git a/src/pages/Ticket/Card/TicketSale.vue b/src/pages/Ticket/Card/TicketSale.vue
index 3ce90b85e..2d51ed8ca 100644
--- a/src/pages/Ticket/Card/TicketSale.vue
+++ b/src/pages/Ticket/Card/TicketSale.vue
@@ -63,7 +63,6 @@ const columns = computed(() => [
     {
         align: 'left',
         name: 'statusIcons',
-        hidden: true,
     },
     {
         align: 'center',
@@ -85,20 +84,17 @@ const columns = computed(() => [
         label: t('ticketSale.visible'),
         name: 'visible',
         format: (row, dashIfEmpty) => dashIfEmpty(row.visible),
-        hidden: true,
     },
     {
         align: 'left',
         label: t('ticketSale.available'),
         name: 'available',
         format: (row, dashIfEmpty) => dashIfEmpty(row.available),
-        hidden: true,
     },
     {
         align: 'left',
         label: t('ticketSale.id'),
         name: 'itemFk',
-        hidden: true,
     },
     {
         align: 'left',
@@ -106,7 +102,6 @@ const columns = computed(() => [
         name: 'quantity',
         cardVisible: true,
         format: (row) => toCurrency(row.quantity),
-        hidden: true,
     },
     {
         align: 'left',
@@ -115,7 +110,6 @@ const columns = computed(() => [
         format: (row) => row?.item?.name,
         columnClass: 'expand',
         cardVisible: true,
-        hidden: true,
     },
     {
         align: 'left',
@@ -123,7 +117,6 @@ const columns = computed(() => [
         name: 'price',
         cardVisible: true,
         format: (row) => toCurrency(row.price),
-        hidden: true,
     },
     {
         align: 'left',
@@ -131,14 +124,12 @@ const columns = computed(() => [
         name: 'discount',
         cardVisible: true,
         format: (row) => toPercentage(row.discount),
-        hidden: true,
     },
     {
         align: 'left',
         label: t('ticketSale.amount'),
         name: 'amount',
         format: (row) => parseInt(row.amount * row.quantity),
-        hidden: true,
     },
     {
         align: 'left',
@@ -146,7 +137,6 @@ const columns = computed(() => [
         name: 'itemPackingTypeFk',
         cardVisible: true,
         format: (row, dashIfEmpty) => dashIfEmpty(row?.item?.itemPackingTypeFk),
-        hidden: true,
     },
     {
         align: 'right',
@@ -578,52 +568,51 @@ async function save(item) {
             selection: 'multiple',
         }"
         :right-search="false"
+        :column-search="false"
         auto-load
     >
         <template #column-statusIcons="{ row }">
-            <QTd class="q-gutter-x-xs">
-                <router-link
-                    v-if="row.claim?.claimFk"
-                    :to="{ name: 'ClaimBasicData', params: { id: row.claim?.claimFk } }"
-                >
-                    <QIcon color="primary" name="vn:claims" size="xs">
-                        <QTooltip>
-                            {{ t('ticketSale.claim') }}:
-                            {{ row.claim?.claimFk }}
-                        </QTooltip>
-                    </QIcon>
-                </router-link>
-                <QIcon v-if="row.visible < 0" color="primary" name="warning" size="xs">
+            <router-link
+                v-if="row.claim?.claimFk"
+                :to="{ name: 'ClaimBasicData', params: { id: row.claim?.claimFk } }"
+            >
+                <QIcon color="primary" name="vn:claims" size="xs">
                     <QTooltip>
-                        {{ t('ticketSale.visible') }}: {{ row.visible || 0 }}
+                        {{ t('ticketSale.claim') }}:
+                        {{ row.claim?.claimFk }}
                     </QTooltip>
                 </QIcon>
-                <QIcon v-if="row.reserved" color="primary" name="vn:reserva" size="xs">
-                    <QTooltip>
-                        {{ t('ticketSale.reserved') }}
-                    </QTooltip>
-                </QIcon>
-                <QIcon
-                    v-if="row.itemShortage"
-                    color="primary"
-                    name="vn:unavailable"
-                    size="xs"
-                >
-                    <QTooltip>
-                        {{ t('ticketSale.noVisible') }}
-                    </QTooltip>
-                </QIcon>
-                <QIcon
-                    v-if="row.hasComponentLack"
-                    color="primary"
-                    name="vn:components"
-                    size="xs"
-                >
-                    <QTooltip>
-                        {{ t('ticketSale.hasComponentLack') }}
-                    </QTooltip>
-                </QIcon>
-            </QTd>
+            </router-link>
+            <QIcon v-if="row.visible < 0" color="primary" name="warning" size="xs">
+                <QTooltip>
+                    {{ t('ticketSale.visible') }}: {{ row.visible || 0 }}
+                </QTooltip>
+            </QIcon>
+            <QIcon v-if="row.reserved" color="primary" name="vn:reserva" size="xs">
+                <QTooltip>
+                    {{ t('ticketSale.reserved') }}
+                </QTooltip>
+            </QIcon>
+            <QIcon
+                v-if="row.itemShortage"
+                color="primary"
+                name="vn:unavailable"
+                size="xs"
+            >
+                <QTooltip>
+                    {{ t('ticketSale.noVisible') }}
+                </QTooltip>
+            </QIcon>
+            <QIcon
+                v-if="row.hasComponentLack"
+                color="primary"
+                name="vn:components"
+                size="xs"
+            >
+                <QTooltip>
+                    {{ t('ticketSale.hasComponentLack') }}
+                </QTooltip>
+            </QIcon>
         </template>
         <template #column-image="{ row }">
             <div class="image-wrapper">
@@ -677,59 +666,53 @@ async function save(item) {
             </VnSelect>
         </template>
         <template #column-quantity="{ row }">
-            <QTd @click.stop>
-                <VnInput
-                    v-if="isTicketEditable"
-                    v-model.number="row.quantity"
-                    @keyup.enter="changeQuantity(row)"
-                    @blur="changeQuantity(row)"
-                    @focus="edit.oldQuantity = row.quantity"
-                />
-                <span v-else>{{ row.quantity }}</span>
-            </QTd>
+            <VnInput
+                v-if="isTicketEditable"
+                v-model.number="row.quantity"
+                @keyup.enter="changeQuantity(row)"
+                @blur="changeQuantity(row)"
+                @focus="edit.oldQuantity = row.quantity"
+            />
+            <span v-else>{{ row.quantity }}</span>
         </template>
         <template #column-price="{ row }">
-            <QTd>
-                <template v-if="isTicketEditable && row.id">
-                    <QBtn flat class="link" dense @click="onOpenEditPricePopover(row)">
-                        {{ toCurrency(row.price) }}
-                    </QBtn>
-                    <TicketEditManaProxy
-                        ref="editPriceProxyRef"
-                        :mana="mana"
-                        :new-price="getNewPrice"
-                        @save="updatePrice(row)"
-                    >
-                        <VnInput
-                            v-model.number="edit.price"
-                            :label="t('ticketSale.price')"
-                            type="number"
-                        />
-                    </TicketEditManaProxy>
-                </template>
-                <span v-else>{{ toCurrency(row.price) }}</span>
-            </QTd>
+            <template v-if="isTicketEditable && row.id">
+                <QBtn flat class="link" dense @click="onOpenEditPricePopover(row)">
+                    {{ toCurrency(row.price) }}
+                </QBtn>
+                <TicketEditManaProxy
+                    ref="editPriceProxyRef"
+                    :mana="mana"
+                    :new-price="getNewPrice"
+                    @save="updatePrice(row)"
+                >
+                    <VnInput
+                        v-model.number="edit.price"
+                        :label="t('ticketSale.price')"
+                        type="number"
+                    />
+                </TicketEditManaProxy>
+            </template>
+            <span v-else>{{ toCurrency(row.price) }}</span>
         </template>
         <template #column-discount="{ row }">
-            <QTd>
-                <template v-if="!isLocked && row.id">
-                    <QBtn flat class="link" dense @click="onOpenEditDiscountPopover(row)">
-                        {{ toPercentage(row.discount / 100) }}
-                    </QBtn>
-                    <TicketEditManaProxy
-                        :mana="mana"
-                        :new-price="getNewPrice"
-                        @save="changeDiscount(row)"
-                    >
-                        <VnInput
-                            v-model.number="edit.discount"
-                            :label="t('ticketSale.discount')"
-                            type="number"
-                        />
-                    </TicketEditManaProxy>
-                </template>
-                <span v-else>{{ toPercentage(row.discount / 100) }}</span>
-            </QTd>
+            <template v-if="!isLocked && row.id">
+                <QBtn flat class="link" dense @click="onOpenEditDiscountPopover(row)">
+                    {{ toPercentage(row.discount / 100) }}
+                </QBtn>
+                <TicketEditManaProxy
+                    :mana="mana"
+                    :new-price="getNewPrice"
+                    @save="changeDiscount(row)"
+                >
+                    <VnInput
+                        v-model.number="edit.discount"
+                        :label="t('ticketSale.discount')"
+                        type="number"
+                    />
+                </TicketEditManaProxy>
+            </template>
+            <span v-else>{{ toPercentage(row.discount / 100) }}</span>
         </template>
         <template #column-amount="{ row }">
             {{ toCurrency(row.quantity * row.price) }}
diff --git a/src/pages/Ticket/Card/TicketVolume.vue b/src/pages/Ticket/Card/TicketVolume.vue
index 00fdad006..2d40ca424 100644
--- a/src/pages/Ticket/Card/TicketVolume.vue
+++ b/src/pages/Ticket/Card/TicketVolume.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, computed, onUnmounted, watch, nextTick } from 'vue';
+import { ref, computed, onMounted, onUnmounted, watch, nextTick } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 
@@ -93,6 +93,8 @@ const applyVolumes = async (salesData) => {
     }
 };
 
+onMounted(() => (stateStore.rightDrawer = false));
+
 onUnmounted(() => (stateStore.rightDrawer = false));
 </script>
 

From 4630496361ca4c4a1da14924425fd8f97dded1f8 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Mon, 9 Sep 2024 08:10:05 +0200
Subject: [PATCH 043/281] refactor: refs #7553 changed fields in ticket
 component & ticket filter

---
 src/pages/Ticket/Card/TicketComponents.vue | 22 ++++++++++++++++------
 src/pages/Ticket/TicketFilter.vue          |  2 +-
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/pages/Ticket/Card/TicketComponents.vue b/src/pages/Ticket/Card/TicketComponents.vue
index 96462b8a6..9ac9771b8 100644
--- a/src/pages/Ticket/Card/TicketComponents.vue
+++ b/src/pages/Ticket/Card/TicketComponents.vue
@@ -110,6 +110,16 @@ const columns = computed(() => [
         align: 'left',
         format: (row) => dashIfEmpty(row.serie),
     },
+    {
+        label: t('ticketComponents.components'),
+        name: 'components',
+        align: 'left',
+    },
+    {
+        label: t('ticketComponents.import'),
+        name: 'import',
+        align: 'left',
+    },
     {
         label: t('ticketComponents.total'),
         name: 'total',
@@ -311,28 +321,28 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                 </span>
             </div>
         </template>
-        <!-- <template #column-components="{ row }">
+        <template #column-components="{ row }">
             <div class="column">
                 <span v-for="(saleComponent, index) in row.components" :key="index">
                     {{ saleComponent.component?.name }}
                 </span>
             </div>
-        </template> -->
-        <!-- <template #column-import="{ row }">
+        </template>
+        <template #column-import="{ row }">
             <div class="column text-left">
                 <span v-for="(saleComponent, index) in row.components" :key="index">
                     {{ toCurrency(saleComponent.value, 'EUR', 3) }}
                 </span>
             </div>
-        </template> -->
+        </template>
         <template #column-total="{ row }">
             <div class="column">
                 <span v-for="(saleComponent, index) in row.components" :key="index">
                     {{ toCurrency(saleComponent.value * row.quantity, 'EUR', 3) }}
-                    <QTooltip>
+                    <!-- <QTooltip>
                         {{ saleComponent.component?.name }}:
                         {{ toCurrency(saleComponent.value, 'EUR', 3) }}
-                    </QTooltip>
+                    </QTooltip> -->
                 </span>
             </div>
         </template>
diff --git a/src/pages/Ticket/TicketFilter.vue b/src/pages/Ticket/TicketFilter.vue
index b7389b93f..8f71aad08 100644
--- a/src/pages/Ticket/TicketFilter.vue
+++ b/src/pages/Ticket/TicketFilter.vue
@@ -118,7 +118,7 @@ const warehouses = ref([]);
             <QItem>
                 <QItemSection>
                     <VnInput
-                        v-model="params.scopedDays"
+                        v-model="params.scopeDays"
                         :label="t('Days onward')"
                         is-outlined
                     />

From 0b961050a0c12f49356c5398061bf5473d7f114e Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Mon, 9 Sep 2024 08:14:53 +0200
Subject: [PATCH 044/281] refactor: refs #7553 rollback ticket advance due to
 slot problems

---
 src/components/VnTable/VnTable.vue |   3 +-
 src/pages/Ticket/TicketAdvance.vue | 426 +++++++++++++++++++----------
 2 files changed, 290 insertions(+), 139 deletions(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 59afb406a..5a21ebd5e 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -408,7 +408,8 @@ defineExpose({
                         @click="stateStore.toggleRightDrawer()"
                     />
                 </template>
-                <!--TODO: este slot se carga los botones de mostrar tabla/card y columnas visibles-->
+                <!--TODO: este slot se carga los botones de mostrar tabla/card y columnas visibles
+                    por lo que no es viable para el uso que se le quiere dar-->
                 <!-- <template #top>
                     <div class="full-width-slot">
                         <slot name="before-header" />
diff --git a/src/pages/Ticket/TicketAdvance.vue b/src/pages/Ticket/TicketAdvance.vue
index 79c9f3559..bf4000fdf 100644
--- a/src/pages/Ticket/TicketAdvance.vue
+++ b/src/pages/Ticket/TicketAdvance.vue
@@ -3,8 +3,8 @@ import { onMounted, ref, computed, reactive } from 'vue';
 import { useI18n } from 'vue-i18n';
 
 import FetchData from 'components/FetchData.vue';
-// import VnInput from 'src/components/common/VnInput.vue';
-// import VnSelect from 'src/components/common/VnSelect.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 import TicketDescriptorProxy from 'src/pages/Ticket/Card/TicketDescriptorProxy.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
@@ -19,14 +19,13 @@ import useNotify from 'src/composables/useNotify.js';
 import { useState } from 'src/composables/useState';
 import { toDateFormat } from 'src/filters/date.js';
 import axios from 'axios';
-import VnTable from 'src/components/VnTable/VnTable.vue';
 
 const state = useState();
 const { t } = useI18n();
 const { openConfirmationModal } = useVnConfirm();
 const { notify } = useNotify();
 const user = state.getUser();
-const tableRef = ref();
+
 const itemPackingTypesOptions = ref([]);
 const zonesOptions = ref([]);
 const selectedTickets = ref([]);
@@ -45,14 +44,15 @@ const exprBuilder = (param, value) => {
         case 'notMovableLines':
         case 'futureZoneFk':
             return { [param]: value };
-        case 'ipt':
-            return { [param]: { like: `%${value}%` } };
-        case 'futureIpt':
-            return { [param]: { like: `%${value}%` } };
+        case 'iptColFilter':
+            return { ipt: { like: `%${value}%` } };
+        case 'futureIptColFilter':
+            return { futureIpt: { like: `%${value}%` } };
     }
 };
 
 const userParams = reactive({});
+
 const arrayData = useArrayData('AdvanceTickets', {
     url: 'Tickets/getTicketsAdvance',
     userParams: userParams,
@@ -82,123 +82,220 @@ const getInputEvents = (col) => {
           };
 };
 
-const columns = computed(() => [
+const ticketColumns = computed(() => [
     {
         label: '',
         name: 'icons',
-        hidden: true,
-    },
-    {
-        align: 'center',
-        label: t('advanceTickets.ticketId'),
-        name: 'id',
-    },
-    {
         align: 'left',
+        columnFilter: null,
+    },
+    {
+        label: t('advanceTickets.ticketId'),
+        name: 'ticketId',
+        align: 'center',
+        sortable: true,
+        columnFilter: {
+            component: VnInput,
+            type: 'text',
+            filterValue: null,
+            filterParamKey: 'id',
+            event: getInputEvents,
+            attrs: {
+                dense: true,
+            },
+        },
+    },
+    {
         label: t('advanceTickets.ipt'),
         name: 'ipt',
+        field: 'ipt',
+        align: 'left',
+        sortable: true,
         columnFilter: {
-            component: 'select',
+            component: VnSelect,
+            filterParamKey: 'iptColFilter',
+            type: 'select',
+            filterValue: null,
+            event: getInputEvents,
             attrs: {
-                url: 'itemPackingTypes',
-                fields: ['code', 'description'],
-                where: { isActive: true },
-                optionValue: 'code',
-                optionLabel: 'description',
+                options: itemPackingTypesOptions.value,
+                'option-value': 'code',
+                'option-label': 'description',
+                dense: true,
             },
         },
-        format: (row, dashIfEmpty) => dashIfEmpty(row.ipt),
+        format: (val) => dashIfEmpty(val),
     },
     {
-        align: 'left',
         label: t('advanceTickets.state'),
         name: 'state',
-        hidden: true,
+        align: 'left',
+        sortable: true,
+        columnFilter: null,
     },
     {
-        align: 'left',
         label: t('advanceTickets.liters'),
         name: 'liters',
+        field: 'liters',
+        align: 'left',
+        sortable: true,
+        columnFilter: {
+            component: VnInput,
+            type: 'text',
+            filterValue: null,
+            event: getInputEvents,
+            attrs: {
+                dense: true,
+            },
+        },
     },
     {
-        align: 'left',
         label: t('advanceTickets.lines'),
         name: 'lines',
-        format: (row, dashIfEmpty) => dashIfEmpty(row.lines),
+        field: 'lines',
+        align: 'left',
+        sortable: true,
+        columnFilter: {
+            component: VnInput,
+            type: 'text',
+            filterValue: null,
+            event: getInputEvents,
+            attrs: {
+                dense: true,
+            },
+        },
+        format: (val) => dashIfEmpty(val),
     },
     {
-        align: 'left',
         label: t('advanceTickets.import'),
-        name: 'totalWithVat',
-        hidden: true,
-        format: (row) => toCurrency(row.totalWithVat),
+        field: 'import',
+        name: 'import',
+        align: 'left',
+        sortable: true,
     },
     {
-        align: 'left',
         label: t('advanceTickets.futureId'),
         name: 'futureId',
+        align: 'left',
+        sortable: true,
+        columnFilter: {
+            component: VnInput,
+            type: 'text',
+            filterValue: null,
+            filterParamKey: 'futureId',
+            event: getInputEvents,
+            attrs: {
+                dense: true,
+            },
+        },
     },
     {
-        align: 'left',
         label: t('advanceTickets.futureIpt'),
         name: 'futureIpt',
+        field: 'futureIpt',
+        align: 'left',
+        sortable: true,
         columnFilter: {
-            component: 'select',
+            component: VnSelect,
+            filterParamKey: 'futureIptColFilter',
+            type: 'select',
+            filterValue: null,
+            event: getInputEvents,
             attrs: {
-                url: 'itemPackingTypes',
-                fields: ['code', 'description'],
-                where: { isActive: true },
-                optionValue: 'code',
-                optionLabel: 'description',
+                options: itemPackingTypesOptions.value,
+                'option-value': 'code',
+                'option-label': 'description',
+                dense: true,
             },
         },
-        format: (row, dashIfEmpty) => dashIfEmpty(row.futureIpt),
+        format: (val) => dashIfEmpty(val),
     },
     {
-        align: 'left',
         label: t('advanceTickets.futureState'),
         name: 'futureState',
-        hidden: true,
+        align: 'left',
+        sortable: true,
+        columnFilter: null,
+        format: (val) => dashIfEmpty(val),
     },
     {
-        align: 'left',
         label: t('advanceTickets.futureLiters'),
         name: 'futureLiters',
-    },
-    {
+        field: 'futureLiters',
         align: 'left',
-        label: t('advanceTickets.futureZone'),
-        name: 'futureZoneFk',
-        columnClass: 'expand',
+        sortable: true,
         columnFilter: {
-            component: 'select',
-            inWhere: true,
+            component: VnInput,
+            type: 'text',
+            filterValue: null,
+            event: getInputEvents,
             attrs: {
-                url: 'Zones',
-                fields: ['id', 'name'],
+                dense: true,
             },
         },
-        columnField: {
-            component: null,
-        },
-        format: (row, dashIfEmpty) => dashIfEmpty(row.futureZoneName),
+        format: (val) => dashIfEmpty(val),
     },
     {
+        label: t('advanceTickets.futureZone'),
+        name: 'futureZoneName',
+        field: 'futureZoneName',
         align: 'left',
+        sortable: true,
+        columnFilter: {
+            component: VnSelect,
+            type: 'select',
+            filterValue: null,
+            filterParamKey: 'futureZoneFk',
+            event: getInputEvents,
+            attrs: {
+                options: zonesOptions.value,
+                'option-value': 'id',
+                'option-label': 'name',
+                dense: true,
+            },
+        },
+        format: (val) => dashIfEmpty(val),
+    },
+    {
         label: t('advanceTickets.notMovableLines'),
         name: 'notMovableLines',
+        field: 'notMovableLines',
+        align: 'left',
+        sortable: true,
+        columnFilter: {
+            component: VnInput,
+            type: 'text',
+            filterValue: null,
+            event: getInputEvents,
+            attrs: {
+                dense: true,
+            },
+        },
+        format: (val) => dashIfEmpty(val),
     },
     {
-        align: 'left',
         label: t('advanceTickets.futureLines'),
         name: 'futureLines',
+        field: 'futureLines',
+        align: 'left',
+        sortable: true,
+        columnFilter: {
+            component: VnInput,
+            type: 'text',
+            filterValue: null,
+            event: getInputEvents,
+            attrs: {
+                dense: true,
+            },
+        },
+        format: (val) => dashIfEmpty(val),
     },
     {
-        align: 'left',
         label: t('advanceTickets.futureImport'),
-        name: 'futureTotalWithVat',
-        hidden: true,
-        format: (row) => toCurrency(row.futureTotalWithVat),
+        name: 'futureImport',
+        align: 'left',
+        sortable: true,
+        columnFilter: null,
     },
 ]);
 
@@ -351,7 +448,7 @@ const handleCloseProgressDialog = () => {
 const handleCancelProgress = () => (cancelProgress.value = true);
 
 onMounted(async () => {
-    let today = Date.vnNew().toISOString();
+    let today = Date.vnNew();
     const tomorrow = new Date(today);
     tomorrow.setDate(tomorrow.getDate() + 1);
     userParams.dateFuture = tomorrow;
@@ -360,13 +457,6 @@ onMounted(async () => {
     const filter = { limit: 0 };
     await arrayData.addFilter({ filter, userParams });
 });
-
-const getColor = (row) => {
-    return row?.classColor ? `bg-${row.classColor}` : 'bg-orange';
-};
-const getFutureColor = (row) => {
-    return row?.futureClassColor ? `bg-${row.futureClassColor}` : 'bg-orange';
-};
 </script>
 
 <template>
@@ -390,9 +480,9 @@ const getFutureColor = (row) => {
         @on-fetch="(data) => (zonesOptions = data)"
     />
     <VnSearchbar
-        data-key="AdvanceTickets"
-        :label="t('advanceTickets.search')"
-        :info="t('advanceTickets.searchInfo')"
+        data-key="WeeklyTickets"
+        :label="t('weeklyTickets.search')"
+        :info="t('weeklyTickets.searchInfo')"
     />
     <VnSubToolbar>
         <template #st-data>
@@ -441,32 +531,73 @@ const getFutureColor = (row) => {
         </template>
     </RightMenu>
     <QPage class="column items-center q-pa-md">
-        <VnTable
-            ref="tableRef"
-            data-key="AdvanceTickets"
-            url="TicketWeeklies/filter"
-            :columns="columns"
-            auto-load
-            :right-search="false"
-            :disable-option="{ card: true }"
+        <QTable
+            :rows="tickets"
+            :columns="ticketColumns"
+            row-key="index"
+            selection="multiple"
             v-model:selected="selectedTickets"
-            :table="{
-                'row-key': 'id',
-                selection: 'multiple',
-            }"
+            :pagination="{ rowsPerPage: 0 }"
+            :no-data-label="t('globals.noResults')"
+            style="max-width: 99%"
         >
-            <!--TODO: arreglar estilos-->
-            <template #before-header>
-                <span class="horizontal-separator" translate>
-                    {{ t('advanceTickets.destination') }}
-                    {{ toDateFormat(userParams.dateToAdvance) }}
-                </span>
-                <span class="horizontal-separator" translate>
-                    {{ t('advanceTickets.origin') }}
-                    {{ toDateFormat(userParams.dateFuture) }}
-                </span>
+            <template #header="props">
+                <QTr :props="props">
+                    <QTh
+                        class="horizontal-separator text-uppercase color-vn-label"
+                        colspan="7"
+                        translate
+                    >
+                        {{ t('advanceTickets.destination') }}
+                        {{ toDateFormat(userParams.dateToAdvance) }}
+                    </QTh>
+                    <QTh
+                        class="horizontal-separator text-uppercase color-vn-label"
+                        colspan="9"
+                        translate
+                    >
+                        {{ t('advanceTickets.origin') }}
+                        {{ toDateFormat(userParams.dateFuture) }}
+                    </QTh>
+                </QTr>
+                <QTr>
+                    <QTh>
+                        <QCheckbox v-model="props.selected" />
+                    </QTh>
+                    <QTh
+                        v-for="(col, index) in ticketColumns"
+                        :key="index"
+                        :class="{ 'vertical-separator': col.name === 'futureId' }"
+                    >
+                        {{ col.label }}
+                    </QTh>
+                </QTr>
             </template>
-            <template #column-icons="{ row }">
+            <template #top-row="{ cols }">
+                <QTr>
+                    <QTd />
+                    <QTd
+                        v-for="(col, index) in cols"
+                        :key="index"
+                        style="max-width: 100px"
+                    >
+                        <component
+                            :is="col.columnFilter.component"
+                            v-if="col.columnFilter"
+                            v-model="col.columnFilter.filterValue"
+                            v-bind="col.columnFilter.attrs"
+                            v-on="col.columnFilter.event(col)"
+                            dense
+                        />
+                    </QTd>
+                </QTr>
+            </template>
+            <template #header-cell-availableLines="{ col }">
+                <QTh class="vertical-separator">
+                    {{ col.label }}
+                </QTh>
+            </template>
+            <template #body-cell-icons="{ row }">
                 <QTd class="q-gutter-x-xs">
                     <QIcon
                         v-if="row.futureAgency !== row.agency && row.agency"
@@ -493,52 +624,73 @@ const getFutureColor = (row) => {
                     </QIcon>
                 </QTd>
             </template>
-            <template #column-id="{ row }">
-                <span class="link" @click.stop>
-                    {{ row.id }}
-                    <TicketDescriptorProxy :id="row.id" />
-                </span>
+            <template #body-cell-ticketId="{ row }">
+                <QTd>
+                    <QBtn flat class="link">
+                        {{ row.id }}
+                        <TicketDescriptorProxy :id="row.id" />
+                    </QBtn>
+                </QTd>
             </template>
-            <template #column-state="{ row }">
-                <QChip :class="getColor(row)" dense square>
-                    {{ row.state }}
-                </QChip>
+            <template #body-cell-state="{ row }">
+                <QTd>
+                    <QBadge
+                        text-color="black"
+                        :color="row.classColor"
+                        class="q-ma-none"
+                        dense
+                    >
+                        {{ row.state }}
+                    </QBadge>
+                </QTd>
             </template>
-            <template #column-totalWithVat="{ row }">
-                <QBadge
-                    :text-color="isLessThan50(row.totalWithVat) ? 'black' : 'white'"
-                    :color="totalPriceColor(row.totalWithVat)"
-                    class="q-ma-none"
-                    dense
-                >
-                    {{ toCurrency(row.totalWithVat || 0) }}
-                </QBadge>
+            <template #body-cell-import="{ row }">
+                <QTd>
+                    <QBadge
+                        :text-color="isLessThan50(row.totalWithVat) ? 'black' : 'white'"
+                        :color="totalPriceColor(row.totalWithVat)"
+                        class="q-ma-none"
+                        dense
+                    >
+                        {{ toCurrency(row.totalWithVat || 0) }}
+                    </QBadge>
+                </QTd>
             </template>
-            <template #column-futureId="{ row }">
-                <!--TODO: arreglar estilos para que se muestre como antes, slot?-->
-                <div class="vertical-separator">
-                    <span class="link" @click.stop>
+            <template #body-cell-futureId="{ row }">
+                <QTd class="vertical-separator">
+                    <QBtn flat class="link" dense>
                         {{ row.futureId }}
                         <TicketDescriptorProxy :id="row.futureId" />
-                    </span>
-                </div>
+                    </QBtn>
+                </QTd>
             </template>
-            <template #column-futureState="{ row }">
-                <QChip :class="getFutureColor(row)" dense square>
-                    {{ row.futureState }}
-                </QChip>
+            <template #body-cell-futureState="{ row }">
+                <QTd>
+                    <QBadge
+                        text-color="black"
+                        :color="row.futureClassColor"
+                        class="q-ma-none"
+                        dense
+                    >
+                        {{ row.futureState }}
+                    </QBadge>
+                </QTd>
             </template>
-            <template #column-futureTotalWithVat="{ row }">
-                <QBadge
-                    :text-color="isLessThan50(row.futureTotalWithVat) ? 'black' : 'white'"
-                    :color="totalPriceColor(row.futureTotalWithVat)"
-                    class="q-ma-none"
-                    dense
-                >
-                    {{ toCurrency(row.futureTotalWithVat || 0) }}
-                </QBadge>
+            <template #body-cell-futureImport="{ row }">
+                <QTd>
+                    <QBadge
+                        :text-color="
+                            isLessThan50(row.futureTotalWithVat) ? 'black' : 'white'
+                        "
+                        :color="totalPriceColor(row.futureTotalWithVat)"
+                        class="q-ma-none"
+                        dense
+                    >
+                        {{ toCurrency(row.futureTotalWithVat || 0) }}
+                    </QBadge>
+                </QTd>
             </template>
-        </VnTable>
+        </QTable>
         <VnProgress
             :progress="progressPercentage"
             :cancelled="cancelProgress"
@@ -562,8 +714,6 @@ const getFutureColor = (row) => {
 }
 
 .horizontal-separator {
-    width: 100%;
-    margin-top: 1%;
-    border-bottom: 5px solid white !important;
+    border-bottom: 4px solid white !important;
 }
 </style>

From 684215fc4613eb9e24f98775bc713eef916529d5 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Mon, 9 Sep 2024 09:59:22 +0200
Subject: [PATCH 045/281] feat(AccountBasicData): add twoFactorFk

---
 src/pages/Account/Card/AccountBasicData.vue         | 9 ++++++++-
 src/pages/Account/locale/en.yml                     | 1 +
 src/pages/Account/locale/es.yml                     | 1 +
 test/cypress/integration/outLogin/twoFactor.spec.js | 2 +-
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/pages/Account/Card/AccountBasicData.vue b/src/pages/Account/Card/AccountBasicData.vue
index f38299f9e..b223c4bc0 100644
--- a/src/pages/Account/Card/AccountBasicData.vue
+++ b/src/pages/Account/Card/AccountBasicData.vue
@@ -24,7 +24,7 @@ watch(
 <template>
     <FormModel
         ref="formModelRef"
-        :url="`VnUsers/preview`"
+        url="VnUsers/preview"
         :url-update="`VnUsers/${route.params.id}/update-user`"
         :filter="accountFilter"
         model="Accounts"
@@ -43,6 +43,13 @@ watch(
                     option-value="code"
                     option-label="code"
                 />
+                <VnSelect
+                    url="TwoFactorTypes"
+                    v-model="data.twoFactorFk"
+                    :label="t('account.card.twoFactor')"
+                    option-value="code"
+                    option-label="code"
+                />
             </div>
         </template>
     </FormModel>
diff --git a/src/pages/Account/locale/en.yml b/src/pages/Account/locale/en.yml
index 3cf861fb2..fe8707eb8 100644
--- a/src/pages/Account/locale/en.yml
+++ b/src/pages/Account/locale/en.yml
@@ -35,6 +35,7 @@ account:
         willDeactivated: User will be deactivated
         activated: User activated!
         deactivated: User deactivated!
+        twoFactor: Two factor
         actions:
             setPassword: Set password
             disableAccount:
diff --git a/src/pages/Account/locale/es.yml b/src/pages/Account/locale/es.yml
index b53a0153c..112ffe9cc 100644
--- a/src/pages/Account/locale/es.yml
+++ b/src/pages/Account/locale/es.yml
@@ -32,6 +32,7 @@ account:
         activated: ¡Usuario activado!
         deactivated: ¡Usuario desactivado!
         newUser: Nuevo usuario
+        twoFactor: Doble factor
         privileges:
             delegate: Puede delegar privilegios
         actions:
diff --git a/test/cypress/integration/outLogin/twoFactor.spec.js b/test/cypress/integration/outLogin/twoFactor.spec.js
index 4d8561f0f..259ddfc0f 100755
--- a/test/cypress/integration/outLogin/twoFactor.spec.js
+++ b/test/cypress/integration/outLogin/twoFactor.spec.js
@@ -12,7 +12,7 @@ describe('Two Factor', () => {
         cy.request(
             'PATCH',
             `http://localhost:3000/api/VnUsers/${userId}/update-user?access_token=DEFAULT_TOKEN`,
-            { twoFactor: 'email' }
+            { twoFactorFk: 'email' }
         );
     });
 

From 6248a4117d06e60ee4f141dcb5b65969c590bfbe Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Mon, 9 Sep 2024 13:52:41 +0200
Subject: [PATCH 046/281] refactor: refs #7553 requested changes

---
 src/components/CrudModel.vue                  |  2 +
 .../Ticket/Card/BasicData/TicketBasicData.vue | 12 ++--
 .../Card/BasicData/TicketBasicDataForm.vue    | 36 ++++++------
 .../Card/BasicData/TicketBasicDataView.vue    |  5 +-
 src/pages/Ticket/Card/TicketDescriptor.vue    | 56 ++++++++++++++++++-
 src/pages/Ticket/Card/TicketNotes.vue         |  7 ++-
 src/pages/Ticket/Card/TicketPackage.vue       | 25 +++++----
 src/pages/Ticket/Card/TicketSale.vue          |  6 +-
 src/pages/Ticket/Card/TicketSaleTracking.vue  | 40 ++++++++-----
 src/pages/Ticket/Card/TicketSummary.vue       | 53 ++++++++----------
 10 files changed, 150 insertions(+), 92 deletions(-)

diff --git a/src/components/CrudModel.vue b/src/components/CrudModel.vue
index 33c831e3f..f4797ffd4 100644
--- a/src/components/CrudModel.vue
+++ b/src/components/CrudModel.vue
@@ -234,6 +234,8 @@ async function remove(data) {
                 newData = newData.filter((form) => !ids.some((id) => id == form[pk]));
                 fetch(newData);
             });
+    } else {
+        reset();
     }
     emit('update:selected', []);
 }
diff --git a/src/pages/Ticket/Card/BasicData/TicketBasicData.vue b/src/pages/Ticket/Card/BasicData/TicketBasicData.vue
index 741231ca3..2ed84e50e 100644
--- a/src/pages/Ticket/Card/BasicData/TicketBasicData.vue
+++ b/src/pages/Ticket/Card/BasicData/TicketBasicData.vue
@@ -114,7 +114,7 @@ const totalNewPrice = computed(() => {
 const totalDifference = computed(() => {
     return rows.value.reduce((acc, item) => acc + item.component?.difference || 0, 0);
 });
-const showMovablecolumn = computed(() => (haveDifferences.value > 0 ? ['movable'] : []));
+const showMovableColumn = computed(() => (haveDifferences.value > 0 ? ['movable'] : []));
 const haveDifferences = computed(() => _ticketData.value.sale?.haveDifferences);
 const ticketHaveNegatives = () => {
     let _haveNegatives = false;
@@ -156,18 +156,18 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                     {{ t('basicData.total') }}
                 </span>
             </QCardSection>
-            <QCardSection class="column items-center" horizontal>
+            <QCardSection class="column items-left" horizontal>
                 <span>
                     {{ t('basicData.price') }}:
                     {{ toCurrency(totalPrice) }}
                 </span>
             </QCardSection>
-            <QCardSection class="column items-center" horizontal>
+            <QCardSection class="column items-left" horizontal>
                 <span>
                     {{ t('basicData.newPrice') }}: {{ toCurrency(totalNewPrice) }}
                 </span>
             </QCardSection>
-            <QCardSection class="column items-center" horizontal>
+            <QCardSection class="column items-left" horizontal>
                 <span>
                     {{ t('basicData.difference') }}: {{ toCurrency(totalDifference) }}
                 </span>
@@ -220,7 +220,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
         </QCard>
     </QDrawer>
     <QTable
-        :visible-columns="showMovablecolumn"
+        :visible-columns="showMovableColumn"
         :rows="rows"
         :columns="columns"
         row-key="id"
@@ -238,7 +238,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
             </QTd>
         </template>
         <template #body-cell-description="{ row }">
-            <QTd>
+            <QTd style="display: contents">
                 <div class="column">
                     <span>{{ row.item.name }}</span>
                     <span class="color-vn-label">{{ row.item.subName }}</span>
diff --git a/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue b/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
index 28c6fcf15..4b2e90a84 100644
--- a/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
+++ b/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
@@ -51,18 +51,18 @@ const agencyByWarehouseFilter = computed(() => ({
     },
 }));
 
-const zonesFilter = computed(() => ({
-    fields: ['id', 'name'],
-    order: 'name ASC',
-    where: formData.value?.agencyModeFk
-        ? {
-              shipped: formData.value?.shipped,
-              addressFk: formData.value?.addressFk,
-              agencyModeFk: formData.value?.agencyModeFk,
-              warehouseFk: formData.value?.warehouseFk,
-          }
-        : {},
-}));
+function zoneWhere() {
+    if (formData?.value?.agencyModeFk) {
+        return formData.value?.agencyModeFk
+            ? {
+                  shipped: formData.value?.shipped,
+                  addressFk: formData.value?.addressFk,
+                  agencyModeFk: formData.value?.agencyModeFk,
+                  warehouseFk: formData.value?.warehouseFk,
+              }
+            : {};
+    }
+}
 
 const getLanded = async (params) => {
     try {
@@ -293,13 +293,6 @@ onMounted(() => onFormModelInit());
         @on-fetch="(data) => (agenciesOptions = data)"
         auto-load
     />
-    <FetchData
-        ref="zonesFetchRef"
-        url="Zones/includingExpired"
-        :filter="zonesFilter"
-        @on-fetch="(data) => (zonesOptions = data)"
-        auto-load
-    />
     <QForm>
         <VnRow>
             <VnSelect
@@ -420,7 +413,10 @@ onMounted(() => onFormModelInit());
                 v-model="zoneId"
                 option-value="id"
                 option-label="name"
-                :options="zonesOptions"
+                url="Zones/includingExpired"
+                :fields="['id', 'name']"
+                sort-by="id"
+                :where="zoneWhere"
                 hide-selected
                 map-options
                 :required="true"
diff --git a/src/pages/Ticket/Card/BasicData/TicketBasicDataView.vue b/src/pages/Ticket/Card/BasicData/TicketBasicDataView.vue
index a88e5e6d6..92640f898 100644
--- a/src/pages/Ticket/Card/BasicData/TicketBasicDataView.vue
+++ b/src/pages/Ticket/Card/BasicData/TicketBasicDataView.vue
@@ -158,7 +158,10 @@ onBeforeMount(async () => await getTicketData());
         color="primary"
         animated
         keep-alive
-        style="max-width: 800px; margin: auto"
+        style="margin: auto"
+        :style="{
+            'max-width': step > 1 ? 'none' : '800px',
+        }"
     >
         <QStep :name="1" :title="t('globals.pageTitles.basicData')" :done="step > 1">
             <TicketBasicDataForm
diff --git a/src/pages/Ticket/Card/TicketDescriptor.vue b/src/pages/Ticket/Card/TicketDescriptor.vue
index b3dba2849..eef834cfa 100644
--- a/src/pages/Ticket/Card/TicketDescriptor.vue
+++ b/src/pages/Ticket/Card/TicketDescriptor.vue
@@ -2,13 +2,13 @@
 import { ref, computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-import { toDate } from 'src/filters';
 import CustomerDescriptorProxy from 'pages/Customer/Card/CustomerDescriptorProxy.vue';
 import CardDescriptor from 'components/ui/CardDescriptor.vue';
 import TicketDescriptorMenu from './TicketDescriptorMenu.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import useCardDescription from 'src/composables/useCardDescription';
 import VnUserLink from 'src/components/ui/VnUserLink.vue';
+import { toDateTimeFormat } from 'src/filters/date';
 
 const $props = defineProps({
     id: {
@@ -36,7 +36,18 @@ const filter = {
         {
             relation: 'client',
             scope: {
-                fields: ['id', 'name', 'salesPersonFk', 'phone', 'mobile', 'email'],
+                fields: [
+                    'id',
+                    'name',
+                    'salesPersonFk',
+                    'phone',
+                    'mobile',
+                    'email',
+                    'isActive',
+                    'isFreezed',
+                    'isTaxDataChecked',
+                    'hasElectronicInvoice',
+                ],
                 include: [
                     {
                         relation: 'user',
@@ -132,7 +143,10 @@ function ticketFilter(ticket) {
                     />
                 </template>
             </VnLv>
-            <VnLv :label="t('ticket.card.shipped')" :value="toDate(entity.shipped)" />
+            <VnLv
+                :label="t('ticket.card.shipped')"
+                :value="toDateTimeFormat(entity.shipped)"
+            />
             <VnLv
                 v-if="entity.agencyMode"
                 :label="t('ticket.card.agency')"
@@ -143,6 +157,38 @@ function ticketFilter(ticket) {
         </template>
         <template #icons="{ entity }">
             <QCardActions>
+                <QIcon
+                    v-if="entity.client.isActive == false"
+                    name="vn:disabled"
+                    size="xs"
+                    color="primary"
+                >
+                    <QTooltip>{{ t('Client inactive') }}</QTooltip>
+                </QIcon>
+                <QIcon
+                    v-if="entity.client.isFreezed == true"
+                    name="vn:frozen"
+                    size="xs"
+                    color="primary"
+                >
+                    <QTooltip>{{ t('Client Frozen') }}</QTooltip>
+                </QIcon>
+                <QIcon
+                    v-if="entity.problem.includes('hasRisk')"
+                    name="vn:risk"
+                    size="xs"
+                    color="primary"
+                >
+                    <QTooltip>{{ t('Client has debt') }}</QTooltip>
+                </QIcon>
+                <QIcon
+                    v-if="entity.client.isTaxDataChecked == false"
+                    name="vn:no036"
+                    size="xs"
+                    color="primary"
+                >
+                    <QTooltip>{{ t('Client not checked') }}</QTooltip>
+                </QIcon>
                 <QIcon
                     v-if="entity.isDeleted == true"
                     name="vn:deletedTicket"
@@ -188,4 +234,8 @@ function ticketFilter(ticket) {
 es:
     This ticket is deleted: Este ticket está eliminado
     Go to module index: Ir al índice del modulo
+    Client inactive: Cliente inactivo
+    Client not checked: Cliente no verificado
+    Client has debt: Cliente con deuda
+    Client Frozen: Cliente congelado
 </i18n>
diff --git a/src/pages/Ticket/Card/TicketNotes.vue b/src/pages/Ticket/Card/TicketNotes.vue
index cfc0c2431..881300399 100644
--- a/src/pages/Ticket/Card/TicketNotes.vue
+++ b/src/pages/Ticket/Card/TicketNotes.vue
@@ -33,6 +33,9 @@ watch(
         await ticketNotesCrudRef.value.reload();
     }
 );
+function handleDelete(row) {
+    ticketNotesCrudRef.value.remove([row]);
+}
 </script>
 
 <template>
@@ -74,12 +77,14 @@ watch(
                             v-model="row.description"
                             class="col"
                         />
+                        {{ index }},
+                        {{ row }}
                         <QIcon
                             name="delete"
                             size="sm"
                             class="cursor-pointer"
                             color="primary"
-                            @click="ticketNotesCrudRef.remove([row])"
+                            @click="handleDelete(row)"
                         >
                             <QTooltip>
                                 {{ t('ticketNotes.removeNote') }}
diff --git a/src/pages/Ticket/Card/TicketPackage.vue b/src/pages/Ticket/Card/TicketPackage.vue
index a76fce2b6..9dee76f8e 100644
--- a/src/pages/Ticket/Card/TicketPackage.vue
+++ b/src/pages/Ticket/Card/TicketPackage.vue
@@ -10,6 +10,7 @@ import FetchData from 'components/FetchData.vue';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
 
 import { useArrayData } from 'src/composables/useArrayData';
+import VnRow from 'src/components/ui/VnRow.vue';
 
 const route = useRoute();
 const { t } = useI18n();
@@ -114,17 +115,19 @@ watch(
                             </QTooltip>
                         </QIcon>
                     </div>
-                    <QIcon
-                        name="add_circle"
-                        class="fill-icon-on-hover q-ml-md"
-                        size="sm"
-                        color="primary"
-                        @click="ticketPackagingsCrudRef.insert()"
-                    >
-                        <QTooltip>
-                            {{ t('package.addPackage') }}
-                        </QTooltip>
-                    </QIcon>
+                    <VnRow>
+                        <QIcon
+                            name="add_circle"
+                            class="fill-icon-on-hover q-ml-md"
+                            size="sm"
+                            color="primary"
+                            @click="ticketPackagingsCrudRef.insert()"
+                        >
+                            <QTooltip>
+                                {{ t('package.addPackage') }}
+                            </QTooltip>
+                        </QIcon>
+                    </VnRow>
                 </QCard>
             </template>
         </CrudModel>
diff --git a/src/pages/Ticket/Card/TicketSale.vue b/src/pages/Ticket/Card/TicketSale.vue
index 2d51ed8ca..71dd56960 100644
--- a/src/pages/Ticket/Card/TicketSale.vue
+++ b/src/pages/Ticket/Card/TicketSale.vue
@@ -100,7 +100,6 @@ const columns = computed(() => [
         align: 'left',
         label: t('ticketSale.quantity'),
         name: 'quantity',
-        cardVisible: true,
         format: (row) => toCurrency(row.quantity),
     },
     {
@@ -109,20 +108,17 @@ const columns = computed(() => [
         name: 'item',
         format: (row) => row?.item?.name,
         columnClass: 'expand',
-        cardVisible: true,
     },
     {
         align: 'left',
         label: t('ticketSale.price'),
         name: 'price',
-        cardVisible: true,
         format: (row) => toCurrency(row.price),
     },
     {
         align: 'left',
         label: t('ticketSale.discount'),
         name: 'discount',
-        cardVisible: true,
         format: (row) => toPercentage(row.discount),
     },
     {
@@ -135,7 +131,6 @@ const columns = computed(() => [
         align: 'left',
         label: t('ticketSale.packaging'),
         name: 'itemPackingTypeFk',
-        cardVisible: true,
         format: (row, dashIfEmpty) => dashIfEmpty(row?.item?.itemPackingTypeFk),
     },
     {
@@ -569,6 +564,7 @@ async function save(item) {
         }"
         :right-search="false"
         :column-search="false"
+        :disable-option="{ card: true }"
         auto-load
     >
         <template #column-statusIcons="{ row }">
diff --git a/src/pages/Ticket/Card/TicketSaleTracking.vue b/src/pages/Ticket/Card/TicketSaleTracking.vue
index d2fec97ac..e7830bf37 100644
--- a/src/pages/Ticket/Card/TicketSaleTracking.vue
+++ b/src/pages/Ticket/Card/TicketSaleTracking.vue
@@ -25,7 +25,7 @@ const saleTrackingFetchDataRef = ref(null);
 
 const sales = ref([]);
 const saleTrackings = ref([]);
-const itemShelvignsSales = ref([]);
+const itemShelvingsSales = ref([]);
 const saleTrackingUrl = computed(() => `SaleTrackings/${route.params.id}/filter`);
 const oldQuantity = ref(null);
 
@@ -88,7 +88,7 @@ const logTableColumns = computed(() => [
         label: t('ticketSaleTracking.original'),
         name: 'original',
         field: 'originalQuantity',
-        align: 'original',
+        align: 'left',
         sortable: true,
     },
     {
@@ -177,7 +177,7 @@ const getItemShelvingSales = async (sale) => {
         const { data } = await axios.get(`ItemShelvingSales/filter`, {
             params: { filter: JSON.stringify(filter) },
         });
-        itemShelvignsSales.value = data;
+        itemShelvingsSales.value = data;
     } catch (error) {
         console.error(error);
     }
@@ -464,12 +464,14 @@ const qCheckBoxController = (sale, action) => {
             data-key="saleTrackingLog"
             :rows="saleTrackings"
             :columns="logTableColumns"
-            class="q-pa-sm"
+            class="q-pa-sm full-width"
         >
             <template #body-cell-worker="{ row }">
-                <QTd auto-width>
-                    <QBtn flat dense color="primary">{{ row.name }}</QBtn>
-                    <WorkerDescriptorProxy :id="row.workerFk" />
+                <QTd>
+                    <QBtn flat class="link">
+                        {{ row.name }}
+                        <WorkerDescriptorProxy :id="row.workerFk" />
+                    </QBtn>
                 </QTd>
             </template>
         </QTable>
@@ -481,12 +483,12 @@ const qCheckBoxController = (sale, action) => {
     >
         <QTable
             data-key="itemShelvingsSales"
-            :rows="itemShelvignsSales"
+            :rows="itemShelvingsSales"
             :columns="shelvingsTableColumns"
-            class="q-pa-sm"
+            class="q-pa-sm full-width"
         >
             <template #body-cell-quantity="{ row }">
-                <QTd auto-width>
+                <QTd>
                     <VnInput
                         v-model.number="row.quantity"
                         @keyup.enter="updateQuantity(row)"
@@ -496,13 +498,15 @@ const qCheckBoxController = (sale, action) => {
                 </QTd>
             </template>
             <template #body-cell-worker="{ row }">
-                <QTd auto-width>
-                    <QBtn flat dense color="primary">{{ row.name }}</QBtn>
-                    <WorkerDescriptorProxy :id="row.userFk" />
+                <QTd>
+                    <QBtn flat class="link">
+                        {{ row.name }}
+                        <WorkerDescriptorProxy :id="row.userFk" />
+                    </QBtn>
                 </QTd>
             </template>
             <template #body-cell-shelving="{ row }">
-                <QTd auto-width>
+                <QTd>
                     <VnSelect
                         url="Shelvings"
                         hide-selected
@@ -515,7 +519,7 @@ const qCheckBoxController = (sale, action) => {
                 </QTd>
             </template>
             <template #body-cell-parking="{ row }">
-                <QTd auto-width>
+                <QTd>
                     <VnSelect
                         url="Parkings"
                         hide-selected
@@ -550,4 +554,10 @@ $estados: (
         }
     }
 }
+
+@media (min-width: 560px) {
+    .q-dialog__inner--minimized > div {
+        max-width: 900px;
+    }
+}
 </style>
diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index 4562f2c60..8ad9a36d0 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -16,6 +16,7 @@ import VnUserLink from 'src/components/ui/VnUserLink.vue';
 import VnTitle from 'src/components/common/VnTitle.vue';
 import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
 import ZoneDescriptorProxy from 'src/pages/Zone/Card/ZoneDescriptorProxy.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 
 const route = useRoute();
 const router = useRouter();
@@ -103,13 +104,18 @@ function getNoteValue(description) {
             return t('Sustitución');
     }
 }
+
+function toTicketUrl(section) {
+    return '#/ticket/' + entityId.value + '/' + section;
+}
 </script>
 
 <template>
     <FetchData
         url="States/editableStates"
-        @on-fetch="(data) => (editableStates = data)"
+        :filter="{ fields: ['code', 'name', 'id', 'alertLevel'], order: 'name ASC' }"
         auto-load
+        @on-fetch="(data) => (editableStates = data)"
     />
     <CardSummary
         ref="summaryRef"
@@ -127,39 +133,26 @@ function getNoteValue(description) {
         </template>
         <template #header-right>
             <QBtnDropdown
-                side
-                top
                 color="black"
                 text-color="white"
                 :label="t('ticket.summary.changeState')"
                 :disable="!isEditable()"
             >
-                <QList>
-                    <QVirtualScroll
-                        style="max-height: 300px"
-                        :items="editableStates"
-                        separator
-                        v-slot="{ item, index }"
-                    >
-                        <QItem
-                            :key="index"
-                            dense
-                            clickable
-                            v-close-popup
-                            @click="changeState(item.code)"
-                        >
-                            <QItemSection>
-                                <QItemLabel>{{ item.name }}</QItemLabel>
-                            </QItemSection>
-                        </QItem>
-                    </QVirtualScroll>
-                </QList>
+                <VnSelect
+                    :options="editableStates"
+                    hide-selected
+                    option-label="name"
+                    option-value="code"
+                    hide-dropdown-icon
+                    focus-on-mount
+                    @update:model-value="changeState(item.code)"
+                />
             </QBtnDropdown>
         </template>
         <template #body>
             <QCard class="vn-one">
                 <VnTitle
-                    :url="ticketUrl + 'basic-data/step-one'"
+                    :url="toTicketUrl('basic-data')"
                     :text="t('globals.summary.basicData')"
                 />
                 <VnLv v-if="ticket.ticketState" :label="t('ticket.summary.state')">
@@ -236,7 +229,7 @@ function getNoteValue(description) {
             </QCard>
             <QCard class="vn-one" style="flex: 2 1">
                 <VnTitle
-                    :url="ticketUrl + 'basic-data/step-one'"
+                    :url="toTicketUrl('basic-data')"
                     :text="t('globals.summary.basicData')"
                 />
                 <VnLv
@@ -288,7 +281,7 @@ function getNoteValue(description) {
             </QCard>
             <QCard class="vn-one" v-if="ticket.notes.length">
                 <VnTitle
-                    :url="ticketUrl + 'observation'"
+                    :url="toTicketUrl('observation')"
                     :text="t('ticket.pageTitles.notes')"
                 />
                 <VnLv
@@ -328,7 +321,7 @@ function getNoteValue(description) {
             </QCard>
             <QCard class="vn-max">
                 <VnTitle
-                    :url="ticketUrl + 'sale'"
+                    :url="toTicketUrl('sale')"
                     :text="t('ticket.summary.saleLines')"
                 />
                 <QTable :rows="ticket.sales" style="text-align: center">
@@ -488,7 +481,7 @@ function getNoteValue(description) {
                 </QTable>
             </QCard>
             <QCard class="vn-max" v-if="ticket.packagings.length != 0">
-                <VnTitle :url="ticketUrl + 'package'" :text="t('globals.packages')" />
+                <VnTitle :url="toTicketUrl('package')" :text="t('globals.packages')" />
                 <QTable :rows="ticket.packagings" flat style="text-align: center">
                     <template #header="props">
                         <QTr class="tr-header" :props="props">
@@ -508,7 +501,7 @@ function getNoteValue(description) {
             </QCard>
             <QCard class="vn-max" v-if="ticket.services.length != 0">
                 <VnTitle
-                    :url="ticketUrl + 'service'"
+                    :url="toTicketUrl('service')"
                     :text="t('ticket.summary.service')"
                 />
                 <QTable :rows="ticket.services" flat style="text-align: center">
@@ -536,7 +529,7 @@ function getNoteValue(description) {
             </QCard>
             <QCard class="vn-max" v-if="ticket.requests.length != 0">
                 <VnTitle
-                    :url="ticketUrl + 'request'"
+                    :url="toTicketUrl('request')"
                     :text="t('ticket.summary.purchaseRequest')"
                 />
                 <QTable :rows="ticket.requests" flat style="text-align: center">

From c7e717c61108c59e29d35a2f65796aa5492f05bf Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Wed, 11 Sep 2024 07:55:12 +0200
Subject: [PATCH 047/281] feat: refs #7404 add travel m3 to reserves form

---
 src/components/VnTable/VnColumn.vue           |  3 -
 src/components/common/VnComponent.vue         |  1 -
 src/components/ui/VnFilterPanel.vue           |  1 +
 src/pages/Entry/EntryStockBought.vue          | 84 ++++++++++++++-----
 src/pages/Entry/EntryStockBoughtFilter.vue    | 11 ++-
 .../integration/entry/stockBought.spec.js     |  2 +-
 6 files changed, 76 insertions(+), 26 deletions(-)

diff --git a/src/components/VnTable/VnColumn.vue b/src/components/VnTable/VnColumn.vue
index ad120f02e..ed34e9eee 100644
--- a/src/components/VnTable/VnColumn.vue
+++ b/src/components/VnTable/VnColumn.vue
@@ -171,8 +171,6 @@ const components = computed(() => $props.components ?? defaultComponents);
             :value="{ row, model }"
             v-model="model"
         />
-
-        {{ console.log('model: ', col) }}
         <VnComponent
             v-if="col.component"
             :prop="col"
@@ -180,7 +178,6 @@ const components = computed(() => $props.components ?? defaultComponents);
             :value="{ row, model }"
             v-model="model"
         />
-
         <span :title="value" v-else>{{ value }}</span>
         <VnComponent
             v-if="col.after"
diff --git a/src/components/common/VnComponent.vue b/src/components/common/VnComponent.vue
index 1ba1506d5..bd25c787c 100644
--- a/src/components/common/VnComponent.vue
+++ b/src/components/common/VnComponent.vue
@@ -24,7 +24,6 @@ const componentArray = computed(() => {
 
 function mix(toComponent) {
     const { component, attrs, event } = toComponent;
-    console.log('attrs: ', attrs);
     const customComponent = $props.components[component];
     return {
         component: customComponent?.component ?? component,
diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue
index cebdc4bbf..b3bdec0a5 100644
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@@ -58,6 +58,7 @@ const $props = defineProps({
 });
 
 defineExpose({ search, sanitizer });
+
 const emit = defineEmits([
     'update:modelValue',
     'refresh',
diff --git a/src/pages/Entry/EntryStockBought.vue b/src/pages/Entry/EntryStockBought.vue
index 8f197be92..ad338acb1 100644
--- a/src/pages/Entry/EntryStockBought.vue
+++ b/src/pages/Entry/EntryStockBought.vue
@@ -1,10 +1,13 @@
 <script setup>
-import { ref } from 'vue';
+import { onMounted, ref, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useState } from 'src/composables/useState';
 import { useQuasar } from 'quasar';
 
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
+import axios from 'axios';
+import FetchData from 'components/FetchData.vue';
+import VnRow from 'components/ui/VnRow.vue';
 import RightMenu from 'src/components/common/RightMenu.vue';
 import EntryStockBoughtFilter from './EntryStockBoughtFilter.vue';
 import VnTable from 'components/VnTable/VnTable.vue';
@@ -13,7 +16,6 @@ import EntryStockBoughtDetail from 'src/pages/Entry/EntryStockBoughtDetail.vue';
 
 const { t } = useI18n();
 const quasar = useQuasar();
-const tableRef = ref();
 const state = useState();
 const user = state.getUser();
 const columns = [
@@ -88,7 +90,32 @@ const columns = [
     },
 ];
 
+const fetchDataRef = ref();
+const tableRef = ref();
+const travel = ref(null);
+const userParams = ref({
+    dated: Date.vnNew(),
+});
+const filter = ref({
+    where: {
+        shipped: (userParams.value.dated
+            ? new Date(userParams.value.dated)
+            : Date.vnNew()
+        ).setHours(0, 0, 0, 0),
+        m3: { neq: null },
+    },
+    include: [
+        {
+            relation: 'warehouseIn',
+            scope: {
+                where: { code: 'vnh' },
+            },
+        },
+    ],
+});
+
 function getFilter(dated) {
+    console.log('dated: ', dated);
     const shipped = dated ? new Date(dated) : Date.vnNew();
     shipped.setHours(0, 0, 0, 0);
     return {
@@ -99,48 +126,62 @@ function getFilter(dated) {
         include: [
             {
                 relation: 'warehouseIn',
+                scope: {
+                    where: { code: 'vnh' },
+                },
             },
         ],
     };
 }
-const userParams = ref({
-    dated: Date.vnNew(),
-});
+
+const setUserParams = async ({ dated }) => {
+    const shipped = (dated ? new Date(dated) : Date.vnNew()).setHours(0, 0, 0, 0);
+
+    filter.value.where.shipped = shipped;
+    fetchDataRef.value?.fetch();
+};
 </script>
 <template>
     <VnSubToolbar>
-        <template #st-data="{ params }">
+        <template #st-data>
             <FetchData
                 ref="fetchDataRef"
                 url="Travels"
                 limit="1"
                 auto-load
-                :filter="getFilter(params?.dated)"
+                :filter="filter"
                 @on-fetch="(data) => (travel = data)"
             />
-            <div>
-                <div>
-                    <span style="color: var(--vn-label-color)">
-                        {{ t('Booked trucks') + ': ' }}
-                    </span>
-                </div>
-                <div v-if="travel">
+
+            <VnRow>
+                <div v-if="travel" class="q-pa-md">
+                    <QIcon
+                        name="local_airport"
+                        class="fill-icon q-mr-sm"
+                        size="md"
+                        :title="t('Travel')"
+                        color="primary"
+                    />
                     <span>
-                        {{ travel[0]?.m3 }}
+                        {{ t('Booked trucks') + ': ' + travel[0]?.m3 }}
                     </span>
                     <QBtn
                         style="max-width: 20%"
                         flat
                         icon="edit"
                         @click="navigate(travel[0]?.id)"
+                        :title="t('Edit travel')"
                     />
                 </div>
-            </div>
+            </VnRow>
         </template>
     </VnSubToolbar>
     <RightMenu>
         <template #right-panel>
-            <EntryStockBoughtFilter data-key="StockBoughts" />
+            <EntryStockBoughtFilter
+                data-key="StockBoughts"
+                @set-user-params="setUserParams"
+            />
         </template>
     </RightMenu>
     <QPage class="column items-center q-pa-md">
@@ -155,7 +196,10 @@ const userParams = ref({
             :create="{
                 urlCreate: 'StockBoughts',
                 title: t('Reserve some space'),
-                onDataSaved: () => tableRef.reload(),
+                onDataSaved: () => {
+                    tableRef.reload();
+                    fetchDataRef.reload();
+                },
                 formInitialData: {
                     workerFk: user.id,
                     dated: Date.vnNow(),
@@ -163,8 +207,8 @@ const userParams = ref({
             }"
             :columns="columns"
             :user-params="userParams"
-            auto-load
             :footer="true"
+            auto-load
         >
             <template #column-workerFk="{ row }">
                 <span class="link" @click.stop>
@@ -192,6 +236,8 @@ const userParams = ref({
         Date: Date
         This buyer has already made a reservation for this date: This buyer has already made a reservation for this date
     es:
+        Edit travel: Editar envío
+        Travel: Envíos
         Booked trucks: Camiones reservados
         Buyer: Comprador
         Reserve: Reservado
diff --git a/src/pages/Entry/EntryStockBoughtFilter.vue b/src/pages/Entry/EntryStockBoughtFilter.vue
index 3393113f2..aaf9e7a5b 100644
--- a/src/pages/Entry/EntryStockBoughtFilter.vue
+++ b/src/pages/Entry/EntryStockBoughtFilter.vue
@@ -15,9 +15,12 @@ const props = defineProps({
         required: true,
     },
 });
-
 const companiesOptions = ref([]);
 const stateStore = useStateStore();
+const emit = defineEmits(['set-user-params']);
+const setUserParams = (params) => {
+    emit('set-user-params', params);
+};
 onMounted(async () => {
     stateStore.rightDrawer = true;
 });
@@ -35,7 +38,11 @@ onMounted(async () => {
         @on-fetch="(data) => (companiesOptions = data)"
         auto-load
     />
-    <VnFilterPanel :data-key="props.dataKey" :search-button="true">
+    <VnFilterPanel
+        :data-key="props.dataKey"
+        :search-button="true"
+        @set-user-params="setUserParams"
+    >
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">
                 <strong>{{ t(`params.${tag.label}`) }}: </strong>
diff --git a/test/cypress/integration/entry/stockBought.spec.js b/test/cypress/integration/entry/stockBought.spec.js
index 10af3ef42..a18e2bd2e 100644
--- a/test/cypress/integration/entry/stockBought.spec.js
+++ b/test/cypress/integration/entry/stockBought.spec.js
@@ -20,7 +20,7 @@ describe('EntryStockBought', () => {
         cy.get('input[aria-label="Date"]').eq(1).type('01-01');
         cy.get('input[aria-label="Buyer"]').type('buyerboss{downarrow}{enter}');
         cy.get('.q-notification__message').should('have.text', 'Data created');
-        cy.get('tBody > tr').its('length').should('eq', 2);
+        cy.get('tBody > tr').its('length').should('eq', 3);
     });
     it('Should check detail for the buyer', () => {
         cy.get(':nth-child(1) > .sticky > .q-btn > .q-btn__content > .q-icon').click();

From 2b012d2de4ce72f253b9d8d7e2a99f4ceb03f34f Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 11 Sep 2024 10:04:40 +0200
Subject: [PATCH 048/281] fix: refs #7353 use same datakey

---
 src/pages/Monitor/Ticket/MonitorTicketSearchbar.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/Monitor/Ticket/MonitorTicketSearchbar.vue b/src/pages/Monitor/Ticket/MonitorTicketSearchbar.vue
index 4950ab381..f1c347588 100644
--- a/src/pages/Monitor/Ticket/MonitorTicketSearchbar.vue
+++ b/src/pages/Monitor/Ticket/MonitorTicketSearchbar.vue
@@ -3,7 +3,7 @@ import VnSearchbar from 'components/ui/VnSearchbar.vue';
 </script>
 <template>
     <VnSearchbar
-        data-key="SalesMonitorTickets"
+        data-key="saleMonitorTickets"
         url="SalesMonitors/salesFilter"
         :redirect="false"
         :label="$t('searchBar.label')"

From ff7bcfb00a1a60c63cd0e770200e1080b65eb781 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Wed, 11 Sep 2024 10:16:42 +0200
Subject: [PATCH 049/281] refactor: refs #7553 modified ticket sale to create a
 row in the table

---
 src/components/VnTable/VnTable.vue   |  23 +++-
 src/pages/Ticket/Card/TicketSale.vue | 182 +++++++++++++++------------
 2 files changed, 122 insertions(+), 83 deletions(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 5d7b74fab..7c1d6a3ae 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -53,6 +53,10 @@ const $props = defineProps({
         type: Boolean,
         default: true,
     },
+    bottom: {
+        type: Object,
+        default: null,
+    },
     cardClass: {
         type: String,
         default: 'flex-one',
@@ -522,7 +526,24 @@ function handleOnDataSaved(_, res) {
                     </QTd>
                 </template>
                 <template #bottom v-if="bottom">
-                    <slot name="bottom-table" />
+                    <slot name="bottom-table">
+                        <QIcon
+                            @click="
+                                () =>
+                                    createAsDialog
+                                        ? (showForm = !showForm)
+                                        : handleOnDataSaved(create)
+                            "
+                            class="fill-icon-on-hover"
+                            color="primary"
+                            name="add_circle"
+                            size="sm"
+                            shortcut="+"
+                        />
+                        <QTooltip>
+                            {{ createForm.title }}
+                        </QTooltip>
+                    </slot>
                 </template>
                 <template #item="{ row, colsMap }">
                     <component
diff --git a/src/pages/Ticket/Card/TicketSale.vue b/src/pages/Ticket/Card/TicketSale.vue
index 71dd56960..ca89ff551 100644
--- a/src/pages/Ticket/Card/TicketSale.vue
+++ b/src/pages/Ticket/Card/TicketSale.vue
@@ -22,7 +22,6 @@ import { useVnConfirm } from 'composables/useVnConfirm';
 import useNotify from 'src/composables/useNotify.js';
 import axios from 'axios';
 import VnTable from 'src/components/VnTable/VnTable.vue';
-import FormModelPopup from 'src/components/FormModelPopup.vue';
 
 const route = useRoute();
 const router = useRouter();
@@ -51,8 +50,6 @@ const transfer = ref({
     sales: [],
 });
 const tableRef = ref([]);
-const formModelPopupRef = ref();
-const showForm = ref(false);
 
 watch(
     () => route.params.id,
@@ -219,6 +216,7 @@ const addSale = async (sale) => {
         sale.item = newSale.item;
 
         notify('globals.dataSaved', 'positive');
+        window.location.reload();
     } catch (err) {
         console.error('Error adding sale', err);
     }
@@ -427,18 +425,70 @@ onMounted(async () => {
     stateStore.rightDrawer = true;
     getConfig();
     getSales();
+    getItems();
 });
 
 onUnmounted(() => (stateStore.rightDrawer = false));
 
-async function save(item) {
-    const { data } = await axios.post(`Tickets/${route.params.id}/addSale`, {
-        id: route.params.id,
-        barcode: item.itemFk,
-        quantity: parseInt(item.quantity),
-    });
-    if (data) window.location.reload();
+const items = ref([]);
+const newRow = ref({});
+
+async function getItems() {
+    const { data } = await axios.get(`Items/withName`);
+    items.value = data;
 }
+
+const updateItem = (row) => {
+    const selectedItem = items.value.find((item) => item.id === row.itemFk);
+    if (selectedItem) {
+        row.item = selectedItem;
+        row.itemFk = selectedItem.id;
+        row.price = selectedItem.price;
+        row.discount = 0;
+        row.quantity = 0;
+        row.amount = row.price * row.quantity;
+    }
+    endNewRow(selectedItem);
+};
+
+function handleOnDataSave({ CrudModelRef }) {
+    const { copy } = addRow(CrudModelRef.formData);
+    CrudModelRef.insert(copy);
+}
+
+const addRow = (original = null) => {
+    let copy = null;
+    if (!original) {
+        copy = { isNew: true };
+    } else {
+        copy = {
+            itemFk: original.itemFk,
+            item: original.item,
+            quantity: original.quantity,
+            price: original.price,
+            discount: original.discount,
+            amount: original.amount,
+            isNew: true,
+        };
+    }
+    newRow.value = copy;
+    return { original, copy };
+};
+
+const endNewRow = (row) => {
+    if (row.itemFk && row.quantity) {
+        row.isNew = false;
+    }
+};
+
+watch(
+    () => newRow.value.itemFk,
+    (newItemFk) => {
+        if (newItemFk) {
+            updateItem(newRow.value);
+        }
+    }
+);
 </script>
 
 <template>
@@ -566,6 +616,16 @@ async function save(item) {
         :column-search="false"
         :disable-option="{ card: true }"
         auto-load
+        :create="{
+            onDataSaved: handleOnDataSave,
+        }"
+        :create-as-dialog="false"
+        :crud-model="{
+            paginate: false,
+        }"
+        :default-remove="false"
+        :default-reset="false"
+        :default-save="false"
     >
         <template #column-statusIcons="{ row }">
             <router-link
@@ -626,7 +686,26 @@ async function save(item) {
             </QBadge>
         </template>
         <template #column-itemFk="{ row }">
-            <span class="link" @click.stop>
+            <VnSelect
+                v-if="row.isNew"
+                url="Items"
+                :options="items"
+                option-label="name"
+                option-value="id"
+                v-model="row.itemFk"
+                @update:model-value="updateItem(row)"
+            >
+                <template #option="scope">
+                    <QItem v-bind="scope.itemProps">
+                        <QItemSection>
+                            <QItemLabel>
+                                {{ scope.opt?.id }} - {{ scope.opt?.name }}</QItemLabel
+                            >
+                        </QItemSection>
+                    </QItem>
+                </template>
+            </VnSelect>
+            <span v-else class="link" @click.stop>
                 {{ row?.itemFk }}
                 <ItemDescriptorProxy :id="row?.itemFk" />
             </span>
@@ -638,34 +717,22 @@ async function save(item) {
                     {{ row?.item?.subName.toUpperCase() }}
                 </div>
             </div>
-            <FetchedTags :item="row?.item" :max-length="6" />
+            <FetchedTags :item="row" :max-length="6" />
             <QPopupProxy v-if="row.id && isTicketEditable">
                 <VnInput v-model="row.concept" @change="updateConcept(row)" />
             </QPopupProxy>
-            <VnSelect
-                v-else
-                :options="itemsWithNameOptions"
-                hide-selected
-                option-label="name"
-                option-value="id"
-                @update:model-value="changeQuantity(row)"
-                v-model="row.itemFk"
-            >
-                <template #option="scope">
-                    <QItem v-bind="scope.itemProps">
-                        <QItemSection>
-                            <QItemLabel> #{{ scope.opt?.id }} </QItemLabel>
-                            <QItemLabel caption>{{ scope.opt?.name }}</QItemLabel>
-                        </QItemSection>
-                    </QItem>
-                </template>
-            </VnSelect>
         </template>
         <template #column-quantity="{ row }">
             <VnInput
-                v-if="isTicketEditable"
+                v-if="row.isNew"
+                v-model.number="row.quantity"
+                type="number"
+                @blur="changeQuantity(row)"
+                @focus="edit.oldQuantity = row.quantity"
+            />
+            <VnInput
+                v-else-if="isTicketEditable"
                 v-model.number="row.quantity"
-                @keyup.enter="changeQuantity(row)"
                 @blur="changeQuantity(row)"
                 @focus="edit.oldQuantity = row.quantity"
             />
@@ -713,58 +780,9 @@ async function save(item) {
         <template #column-amount="{ row }">
             {{ toCurrency(row.quantity * row.price) }}
         </template>
-        <template #bottom-table v-if="isTicketEditable">
-            <QIcon
-                @click="showForm = !showForm"
-                class="fill-icon-on-hover"
-                color="primary"
-                name="add_circle"
-                size="sm"
-            >
-                <QTooltip>
-                    {{ t('Add item') }}
-                </QTooltip>
-            </QIcon>
-            <QDialog v-model="showForm" transition-show="scale" transition-hide="scale">
-                <FormModelPopup
-                    ref="formModelPopupRef"
-                    :url-create="`Tickets/${route.params.id}/addSale`"
-                    :title="t('New item')"
-                    :form-initial-data="{
-                        price: 0,
-                        discount: 0,
-                        visible: 0,
-                        available: 0,
-                        packaging: null,
-                    }"
-                    :save-fn="save"
-                >
-                    <template #form-inputs="{ data }">
-                        <VnSelect
-                            url="Items/withName"
-                            :option-filter="{
-                                order: 'id DESC',
-                            }"
-                            :fields="['id', 'name']"
-                            :label="t('Items')"
-                            option-label="name"
-                            option-value="id"
-                            :options="itemsWithNameOptions"
-                            hide-selected
-                            v-model="data.itemFk"
-                        />
-                        <VnInput
-                            v-model="data.quantity"
-                            :label="t('Quantity')"
-                            type="number"
-                        />
-                    </template>
-                </FormModelPopup>
-            </QDialog>
-        </template>
     </VnTable>
 
-    <QPageSticky :offset="[20, 20]">
+    <QPageSticky :offset="[20, 20]" style="z-index: 2">
         <QBtn @click="newOrderFromTicket()" color="primary" fab icon="add" />
         <QTooltip class="text-no-wrap">
             {{ t('Add item to basket') }}

From b559f2f18c4a0fd370ac85e3f2e7254de8c9f8b4 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 11 Sep 2024 10:18:11 +0200
Subject: [PATCH 050/281] refactor: refs #7353 use global locales

---
 src/i18n/locale/en.yml                        |  9 +++++++
 src/i18n/locale/es.yml                        |  9 +++++++
 .../Monitor/Ticket/MonitorTicketFilter.vue    | 24 ++++---------------
 3 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 362c1ec9f..02f04c994 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -278,6 +278,15 @@ globals:
     createInvoiceIn: Create invoice in
     myAccount: My account
     noOne: No one
+    params:
+        search: General search
+        clientFk: Client id
+        salesPersonFk: Sales person
+        warehouseFk: Warehouse
+        provinceFk: Province
+        from: From
+        To: To
+        stateFk: State
 errors:
     statusUnauthorized: Access denied
     statusInternalServerError: An internal server error has ocurred
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 34383686c..caa6b6788 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -282,6 +282,15 @@ globals:
     createInvoiceIn: Crear factura recibida
     myAccount: Mi cuenta
     noOne: Nadie
+    params:
+        search: Búsqueda general
+        clientFk: Id cliente
+        salesPersonFk: Comercial
+        warehouseFk: Almacén
+        provinceFk: Provincia
+        from: Desde
+        To: Hasta
+        stateFk: Estado
 errors:
     statusUnauthorized: Acceso denegado
     statusInternalServerError: Ha ocurrido un error interno del servidor
diff --git a/src/pages/Monitor/Ticket/MonitorTicketFilter.vue b/src/pages/Monitor/Ticket/MonitorTicketFilter.vue
index 167a10465..17e26618d 100644
--- a/src/pages/Monitor/Ticket/MonitorTicketFilter.vue
+++ b/src/pages/Monitor/Ticket/MonitorTicketFilter.vue
@@ -64,7 +64,7 @@ const handleScopeDays = (params, days, callback) => {
             <QItem>
                 <QItemSection>
                     <VnInput
-                        :label="t('params.clientFk')"
+                        :label="t('globals.params.clientFk')"
                         v-model="params.clientFk"
                         is-outlined
                     />
@@ -105,7 +105,7 @@ const handleScopeDays = (params, days, callback) => {
                         outlined
                         dense
                         rounded
-                        :label="t('params.salesPersonFk')"
+                        :label="t('globals.params.salesPersonFk')"
                         v-model="params.salesPersonFk"
                         url="Workers/search"
                         :params="{ departmentCodes: ['VT'] }"
@@ -158,7 +158,7 @@ const handleScopeDays = (params, days, callback) => {
                         outlined
                         dense
                         rounded
-                        :label="t('params.stateFk')"
+                        :label="t('globals.params.stateFk')"
                         v-model="params.stateFk"
                         url="States"
                         is-outlined
@@ -184,7 +184,7 @@ const handleScopeDays = (params, days, callback) => {
                         outlined
                         dense
                         rounded
-                        :label="t('params.warehouseFk')"
+                        :label="t('globals.params.warehouseFk')"
                         v-model="params.warehouseFk"
                         :options="warehouses"
                     />
@@ -196,7 +196,7 @@ const handleScopeDays = (params, days, callback) => {
                         outlined
                         dense
                         rounded
-                        :label="t('params.provinceFk')"
+                        :label="t('globals.params.provinceFk')"
                         v-model="params.provinceFk"
                         url="Provinces"
                     />
@@ -235,22 +235,15 @@ const handleScopeDays = (params, days, callback) => {
 <i18n>
 en:
     params:
-        clientFk: Client id
         orderFk: Order id
         scopeDays: Days onward
         nickname: Nickname
-        salesPersonFk: Sales person
         refFk: Invoice
         agencyModeFk: Agency
-        stateFk: State
         groupedStates: Grouped State
-        warehouseFk: Warehouse
-        provinceFk: Province
         myTeam: My team
         problems: With problems
         pending: Pending
-        from: From
-        to: To
         alertLevel: Grouped State
     FREE: Free
     DELIVERED: Delivered
@@ -261,22 +254,15 @@ en:
     
 es:
     params:
-        clientFk: Id cliente
         orderFk: Id cesta
         scopeDays: Días en adelante
         nickname: Nombre mostrado
-        salesPersonFk: Comercial
         refFk: Factura
         agencyModeFk: Agencia
-        stateFk: Estado
         groupedStates: Estado agrupado
-        warehouseFk: Almacén
-        provinceFk: Provincia
         myTeam: Mi equipo
         problems: Con problemas
         pending: Pendiente
-        from: Desde
-        To: Hasta
         alertLevel: Estado agrupado
     FREE: Libre
     DELIVERED: Servido

From 422907447b40cceedc3e2207800704dd77b1fb5c Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Wed, 11 Sep 2024 10:27:08 +0200
Subject: [PATCH 051/281] refactor: refs #7553 merge conflicts

---
 .../Ticket/Card/TicketDescriptorMenu.vue      |  1 -
 src/pages/Ticket/Card/TicketSummary.vue       | 24 +++++++++----------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/pages/Ticket/Card/TicketDescriptorMenu.vue b/src/pages/Ticket/Card/TicketDescriptorMenu.vue
index 8bd072489..4140abcc8 100644
--- a/src/pages/Ticket/Card/TicketDescriptorMenu.vue
+++ b/src/pages/Ticket/Card/TicketDescriptorMenu.vue
@@ -639,7 +639,6 @@ async function handleInvoiceOutData() {
 <i18n>
 en:
     addTurn: Add turn
-en:
     invoiceIds: "Invoices have been generated with the following ids: {invoiceIds}"
 
 es:
diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index d959ad9d9..2a4a5e3c3 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -147,13 +147,13 @@ function toTicketUrl(section) {
                     :url="toTicketUrl('basic-data')"
                     :text="t('globals.summary.basicData')"
                 />
-                <VnLv v-if="ticket.ticketState" :label="t('ticket.summary.state')">
+                <VnLv v-if="entity.ticketState" :label="t('ticket.summary.state')">
                     <template #value>
                         <QBadge
                             text-color="black"
-                            :color="ticket.ticketState.state.classColor"
+                            :color="entity.ticketState.state.classColor"
                         >
-                            {{ ticket.ticketState.state.name }}
+                            {{ entity.ticketState.state.name }}
                         </QBadge>
                     </template>
                 </VnLv>
@@ -172,8 +172,8 @@ function toTicketUrl(section) {
                 <VnLv :label="t('ticket.summary.zone')">
                     <template #value>
                         <span class="link" @click.stop>
-                            {{ ticket?.zone?.name }}
-                            <ZoneDescriptorProxy :id="ticket.zoneFk" />
+                            {{ entity?.zone?.name }}
+                            <ZoneDescriptorProxy :id="entity.zoneFk" />
                         </span>
                     </template>
                 </VnLv>
@@ -198,11 +198,11 @@ function toTicketUrl(section) {
                 <VnLv :label="t('ticket.summary.route')">
                     <template #value>
                         <span class="link">
-                            {{ ticket.routeFk }}
-                            <RouteDescriptorProxy
-                                :id="ticket.routeFk"
-                            /> </span></template
-                ></VnLv>
+                            {{ entity.routeFk }}
+                            <RouteDescriptorProxy :id="entity.routeFk" />
+                        </span>
+                    </template>
+                </VnLv>
                 <VnLv :label="t('ticket.summary.invoice')">
                     <template #value>
                         <span :class="{ link: entity.refFk }">
@@ -260,9 +260,9 @@ function toTicketUrl(section) {
                 <VnLv
                     :label="t('ticket.summary.consignee')"
                     :value="
-                        ticket.client.salesPersonUser.nickname +
+                        entity.client.salesPersonUser.nickname +
                         ' #' +
-                        ticket.client.salesPersonUser.id
+                        entity.client.salesPersonUser.id
                     "
                 >
                 </VnLv>

From 9219fa07f57b4a317de6dd59bc9d037c744c1021 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 11 Sep 2024 11:23:14 +0200
Subject: [PATCH 052/281] fix: refs #7353 hide search param

---
 src/i18n/locale/en.yml                           | 1 -
 src/i18n/locale/es.yml                           | 1 -
 src/pages/Monitor/Ticket/MonitorTicketFilter.vue | 2 +-
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 02f04c994..19372f698 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -279,7 +279,6 @@ globals:
     myAccount: My account
     noOne: No one
     params:
-        search: General search
         clientFk: Client id
         salesPersonFk: Sales person
         warehouseFk: Warehouse
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index caa6b6788..60e61d51c 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -283,7 +283,6 @@ globals:
     myAccount: Mi cuenta
     noOne: Nadie
     params:
-        search: Búsqueda general
         clientFk: Id cliente
         salesPersonFk: Comercial
         warehouseFk: Almacén
diff --git a/src/pages/Monitor/Ticket/MonitorTicketFilter.vue b/src/pages/Monitor/Ticket/MonitorTicketFilter.vue
index 17e26618d..3c95f5cdd 100644
--- a/src/pages/Monitor/Ticket/MonitorTicketFilter.vue
+++ b/src/pages/Monitor/Ticket/MonitorTicketFilter.vue
@@ -40,7 +40,7 @@ const handleScopeDays = (params, days, callback) => {
     <VnFilterPanel
         :data-key="dataKey"
         :search-button="true"
-        :hidden-tags="['from', 'to']"
+        :hidden-tags="['from', 'to', 'search']"
         :custom-tags="['scopeDays']"
         :unremovable-params="['from', 'to', 'scopeDays']"
     >

From 6b79d70551f4bdc981c20816d1b014f6d4162fa7 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 12 Sep 2024 09:14:55 +0200
Subject: [PATCH 053/281] refactor: refs #7828 wip

---
 src/pages/Worker/Card/WorkerTimeControl.vue | 50 +++++++++------------
 1 file changed, 22 insertions(+), 28 deletions(-)

diff --git a/src/pages/Worker/Card/WorkerTimeControl.vue b/src/pages/Worker/Card/WorkerTimeControl.vue
index abf60a078..2f66fbcc1 100644
--- a/src/pages/Worker/Card/WorkerTimeControl.vue
+++ b/src/pages/Worker/Card/WorkerTimeControl.vue
@@ -271,44 +271,38 @@ const fetchWorkerTimeControlMails = async (filter) => {
 
 const fetchWeekData = async () => {
     try {
-        const filter = {
-            where: {
-                workerFk: route.params.id,
-                year: selectedDate.value ? selectedDate.value?.getFullYear() : null,
-                week: selectedWeekNumber.value,
-            },
-        };
-
-        const data = await fetchWorkerTimeControlMails(filter);
-        if (!data.length) {
-            state.value = null;
-        } else {
+        const data = (
+            await axios.get(`WorkerTimeControlMails/${route.params.id}/getWeeklyMail`, {
+                params: {
+                    workerFk: route.params.id,
+                    year: selectedDate.value.getFullYear(),
+                    week: selectedWeekNumber.value,
+                },
+            })
+        ).data;
+        if (!data.length) state.value = null;
+        else {
             const [mail] = data;
             state.value = mail.state;
             reason.value = mail.reason;
         }
 
-        await canBeResend();
+        canResend.value = !!(
+            await axios.get('WorkerTimeControlMails/count', {
+                filter: {
+                    where: {
+                        year: selectedDate.value.getFullYear(),
+                        week: selectedWeekNumber.value,
+                        limit: 1,
+                    },
+                },
+            })
+        ).data.count;
     } catch (err) {
         console.error('Error fetching week data');
     }
 };
 
-const canBeResend = async () => {
-    canResend.value = false;
-
-    const filter = {
-        where: {
-            year: selectedDate.value.getFullYear(),
-            week: selectedWeekNumber.value,
-        },
-        limit: 1,
-    };
-
-    const data = await fetchWorkerTimeControlMails(filter);
-    if (data.length) canResend.value = true;
-};
-
 const setHours = (data) => {
     for (const weekDay of weekDays.value) {
         if (data) {

From 4a1f5e922c1dedc57d558386e2e75432219e995b Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Thu, 12 Sep 2024 10:19:21 +0200
Subject: [PATCH 054/281] refactor: refs #7553 align ticket sale qdrawer fields

---
 src/pages/Ticket/Card/TicketSale.vue | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/pages/Ticket/Card/TicketSale.vue b/src/pages/Ticket/Card/TicketSale.vue
index ca89ff551..75204965a 100644
--- a/src/pages/Ticket/Card/TicketSale.vue
+++ b/src/pages/Ticket/Card/TicketSale.vue
@@ -580,22 +580,19 @@ watch(
             class="q-pa-md q-mb-md q-ma-md color-vn-text"
             style="border: 2px solid black"
         >
-            <QCardSection class="justify-center text-subtitle1" horizontal>
+            <QCardSection class="justify-end text-subtitle1" horizontal>
                 <span class="q-mr-xs color-vn-label"
                     >{{ t('ticketSale.subtotal') }}:
                 </span>
                 <span>{{ toCurrency(store.data?.totalWithoutVat) }}</span>
             </QCardSection>
-            <QCardSection class="justify-center text-subtitle1" horizontal>
+            <QCardSection class="justify-end text-subtitle1" horizontal>
                 <span class="q-mr-xs color-vn-label"> {{ t('ticketSale.tax') }}: </span>
                 <span>{{
                     toCurrency(store.data?.totalWithVat - store.data?.totalWithoutVat)
                 }}</span>
             </QCardSection>
-            <QCardSection
-                class="justify-center text-weight-bold text-subtitle1"
-                horizontal
-            >
+            <QCardSection class="justify-end text-weight-bold text-subtitle1" horizontal>
                 <span class="q-mr-xs color-vn-label"> {{ t('ticketSale.total') }}: </span>
                 <span>{{ toCurrency(store.data?.totalWithVat) }}</span>
             </QCardSection>

From b4c46dc153b9f3359dc599bf266017b5aa31fe14 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Thu, 12 Sep 2024 13:13:56 +0200
Subject: [PATCH 055/281] refactor: refs #7553 modified ticketSummary QChips,
 deleted useless code

---
 src/pages/Ticket/Card/TicketNotes.vue   |  2 --
 src/pages/Ticket/Card/TicketSummary.vue | 10 ++++++++--
 src/pages/Ticket/Card/TicketVolume.vue  |  2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/pages/Ticket/Card/TicketNotes.vue b/src/pages/Ticket/Card/TicketNotes.vue
index 881300399..ec2353eb3 100644
--- a/src/pages/Ticket/Card/TicketNotes.vue
+++ b/src/pages/Ticket/Card/TicketNotes.vue
@@ -77,8 +77,6 @@ function handleDelete(row) {
                             v-model="row.description"
                             class="col"
                         />
-                        {{ index }},
-                        {{ row }}
                         <QIcon
                             name="delete"
                             size="sm"
diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index 7f499f7b7..0c5366cce 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -428,25 +428,31 @@ function toTicketUrl(section) {
                             </QTd>
                             <QTd>
                                 <QChip
+                                    v-if="props.row.visible < 0"
                                     dense
                                     rounded
-                                    v-if="props.row.visible < 0"
                                     :color="'negative'"
                                     text-color="white"
                                 >
                                     {{ props.row.visible }}
                                 </QChip>
+                                <span v-else>
+                                    {{ props.row.visible }}
+                                </span>
                             </QTd>
                             <QTd>
                                 <QChip
+                                    v-if="props.row.available < 0"
                                     dense
                                     rounded
-                                    v-if="props.row.available < 0"
                                     :color="'negative'"
                                     text-color="white"
                                 >
                                     {{ props.row.available }}
                                 </QChip>
+                                <span v-else>
+                                    {{ props.row.available }}
+                                </span>
                             </QTd>
                             <QTd>{{ props.row.quantity }}</QTd>
                             <QTd class="description-cell">
diff --git a/src/pages/Ticket/Card/TicketVolume.vue b/src/pages/Ticket/Card/TicketVolume.vue
index 2d40ca424..16769b4e1 100644
--- a/src/pages/Ticket/Card/TicketVolume.vue
+++ b/src/pages/Ticket/Card/TicketVolume.vue
@@ -93,7 +93,7 @@ const applyVolumes = async (salesData) => {
     }
 };
 
-onMounted(() => (stateStore.rightDrawer = false));
+onMounted(() => (stateStore.rightDrawer = true));
 
 onUnmounted(() => (stateStore.rightDrawer = false));
 </script>

From 44fd356d63ee78589a3902ba1891ec41dd5d39ad Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 12 Sep 2024 13:19:31 +0200
Subject: [PATCH 056/281] feat: refs #7828 useAcl & cherry pick mail data
 worker

---
 src/pages/Worker/Card/WorkerTimeControl.vue | 63 +++++++--------------
 1 file changed, 22 insertions(+), 41 deletions(-)

diff --git a/src/pages/Worker/Card/WorkerTimeControl.vue b/src/pages/Worker/Card/WorkerTimeControl.vue
index 2f66fbcc1..3893305a5 100644
--- a/src/pages/Worker/Card/WorkerTimeControl.vue
+++ b/src/pages/Worker/Card/WorkerTimeControl.vue
@@ -12,7 +12,6 @@ import WorkerTimeControlCalendar from 'pages/Worker/Card/WorkerTimeControlCalend
 
 import useNotify from 'src/composables/useNotify.js';
 import axios from 'axios';
-import { useRole } from 'src/composables/useRole';
 import { useAcl } from 'src/composables/useAcl';
 import { useWeekdayStore } from 'src/stores/useWeekdayStore';
 import { useStateStore } from 'stores/useStateStore';
@@ -63,13 +62,16 @@ const selectedCalendarDates = ref([]);
 const selectedDateFormatted = ref(toDateString(defaultDate.value));
 
 const arrayData = useArrayData('workerData');
-
+const acl = useAcl();
 const worker = computed(() => arrayData.store?.data);
-
-const isHr = computed(() => useRole().hasAny(['hr']));
-
-const canSend = computed(() => useAcl().hasAny('WorkerTimeControl', 'sendMail', 'WRITE'));
-
+const canSend = computed(() =>
+    acl.hasAny([{ model: 'WorkerTimeControl', props: 'sendMail', accessType: 'WRITE' }])
+);
+const canUpdate = computed(() =>
+    acl.hasAny([
+        { model: 'WorkerTimeControl', props: 'updateMailState', accessType: 'WRITE' },
+    ])
+);
 const isHimself = computed(() => user.value.id === Number(route.params.id));
 
 const columns = computed(() => {
@@ -257,46 +259,25 @@ const fetchHours = async () => {
     }
 };
 
-const fetchWorkerTimeControlMails = async (filter) => {
-    try {
-        const { data } = await axios.get('WorkerTimeControlMails', {
-            params: { filter: JSON.stringify(filter) },
-        });
-
-        return data;
-    } catch (err) {
-        console.error('Error fetching worker time control mails');
-    }
-};
-
 const fetchWeekData = async () => {
+    const where = {
+        year: selectedDate.value.getFullYear(),
+        week: selectedWeekNumber.value,
+    };
     try {
-        const data = (
-            await axios.get(`WorkerTimeControlMails/${route.params.id}/getWeeklyMail`, {
-                params: {
-                    workerFk: route.params.id,
-                    year: selectedDate.value.getFullYear(),
-                    week: selectedWeekNumber.value,
-                },
+        const mail = (
+            await axios.get(`Workers/${route.params.id}/mail`, {
+                params: { filter: { where } },
             })
-        ).data;
-        if (!data.length) state.value = null;
+        ).data[0];
+        if (!mail) state.value = null;
         else {
-            const [mail] = data;
             state.value = mail.state;
             reason.value = mail.reason;
         }
 
         canResend.value = !!(
-            await axios.get('WorkerTimeControlMails/count', {
-                filter: {
-                    where: {
-                        year: selectedDate.value.getFullYear(),
-                        week: selectedWeekNumber.value,
-                        limit: 1,
-                    },
-                },
-            })
+            await axios.get('WorkerTimeControlMails/count', { params: { where } })
         ).data.count;
     } catch (err) {
         console.error('Error fetching week data');
@@ -443,7 +424,7 @@ onMounted(async () => {
         <div>
             <QBtnGroup push class="q-gutter-x-sm" flat>
                 <QBtn
-                    v-if="isHimself && state"
+                    v-if="canUpdate && state"
                     :label="t('Satisfied')"
                     color="primary"
                     type="submit"
@@ -451,7 +432,7 @@ onMounted(async () => {
                     @click="isSatisfied()"
                 />
                 <QBtn
-                    v-if="isHimself && state"
+                    v-if="canUpdate && state"
                     :label="t('Not satisfied')"
                     color="primary"
                     type="submit"
@@ -462,7 +443,7 @@ onMounted(async () => {
             </QBtnGroup>
             <QBtnGroup push class="q-gutter-x-sm q-ml-none" flat>
                 <QBtn
-                    v-if="reason && state && (isHimself || isHr)"
+                    v-if="reason && state && canUpdate"
                     :label="t('Reason')"
                     color="primary"
                     type="submit"

From bb1eb30a25338b3afd712123ef5935a27671039e Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Thu, 12 Sep 2024 13:22:53 +0200
Subject: [PATCH 057/281] fix: refs #7553 changed fields in order in purchase
 request table

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

diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index 0c5366cce..e8ba955d2 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -550,8 +550,8 @@ function toTicketUrl(section) {
                     </template>
                     <template #body="props">
                         <QTr :props="props">
-                            <QTd>{{ toDate(props.row.created) }}</QTd>
                             <QTd>{{ props.row.description }}</QTd>
+                            <QTd>{{ toDate(props.row.created) }}</QTd>
                             <QTd>{{ props.row.requester?.user?.username }}</QTd>
                             <QTd>{{ props.row.atender?.user?.username }}</QTd>
                             <QTd>{{ props.row.quantity }}</QTd>

From 8be1833f9e7bbf6b9d6bc8163b84eb090ecbb1b8 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Fri, 13 Sep 2024 08:49:36 +0200
Subject: [PATCH 058/281] refs #7155 scopeDays

---
 src/pages/Travel/TravelList.vue | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/pages/Travel/TravelList.vue b/src/pages/Travel/TravelList.vue
index c7ad908f9..0fba3a8d3 100644
--- a/src/pages/Travel/TravelList.vue
+++ b/src/pages/Travel/TravelList.vue
@@ -11,6 +11,7 @@ import TravelSummary from './Card/TravelSummary.vue';
 import VnSearchbar from 'components/ui/VnSearchbar.vue';
 import { toDate } from 'src/filters';
 import { getDateQBadgeColor } from 'src/composables/getDateQBadgeColor.js';
+import { dateRange } from 'src/filters';
 const { viewSummary } = useSummaryDialog();
 const router = useRouter();
 const { t } = useI18n();
@@ -29,6 +30,18 @@ const cloneTravel = (travelData) => {
     redirectToCreateView(stringifiedTravelData);
 };
 
+const handleScopeDays = (params, days, callback) => {
+    const [from, to] = dateRange(Date.vnNew());
+    if (!days) {
+        Object.assign(params, { from, to, scopeDays: 1 });
+    } else {
+        params.from = from;
+        to.setDate(to.getDate() + days);
+        params.to = to;
+    }
+    if (callback) callback();
+};
+
 const redirectToCreateView = (queryParams) => {
     router.push({ name: 'TravelCreate', query: { travelData: queryParams } });
 };

From a5ea940dd887b8f540e283c70db99aa0a4a42538 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 13 Sep 2024 09:23:15 +0200
Subject: [PATCH 059/281] fix: Customer module find salesPersons out of first
 get

---
 src/pages/Customer/Card/CustomerBasicData.vue | 1 -
 src/pages/Customer/CustomerList.vue           | 1 -
 2 files changed, 2 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerBasicData.vue b/src/pages/Customer/Card/CustomerBasicData.vue
index 91d9edc05..adbd476b0 100644
--- a/src/pages/Customer/Card/CustomerBasicData.vue
+++ b/src/pages/Customer/Card/CustomerBasicData.vue
@@ -99,7 +99,6 @@ const title = ref();
                     :fields="['id', 'nickname']"
                     sort-by="nickname ASC"
                     :rules="validate('client.salesPersonFk')"
-                    :use-like="false"
                     emit-value
                     auto-load
                 >
diff --git a/src/pages/Customer/CustomerList.vue b/src/pages/Customer/CustomerList.vue
index f6758bf4e..270acdb89 100644
--- a/src/pages/Customer/CustomerList.vue
+++ b/src/pages/Customer/CustomerList.vue
@@ -425,7 +425,6 @@ function handleLocation(data, location) {
                 }"
                 :fields="['id', 'nickname']"
                 sort-by="nickname ASC"
-                :use-like="false"
                 emit-value
                 auto-load
             >

From 58be11df046f33259a794effec4bc84b9e0728b0 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 13 Sep 2024 10:13:03 +0200
Subject: [PATCH 060/281] chore: refs #7828 fix e2e

---
 test/cypress/integration/ticket/ticketDescriptor.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/cypress/integration/ticket/ticketDescriptor.spec.js b/test/cypress/integration/ticket/ticketDescriptor.spec.js
index 516b0f13d..8192b7c7c 100644
--- a/test/cypress/integration/ticket/ticketDescriptor.spec.js
+++ b/test/cypress/integration/ticket/ticketDescriptor.spec.js
@@ -5,7 +5,7 @@ describe('Ticket descriptor', () => {
     const warehouseValue = ':nth-child(1) > :nth-child(6) > .value > span';
     const summaryHeader = '.summaryHeader > div';
     const weight = 25;
-    const weightValue = ':nth-child(10) > .value > span';
+    const weightValue = '.summaryBody.row :nth-child(1) > :nth-child(9) > .value > span';
     beforeEach(() => {
         cy.login('developer');
         cy.viewport(1920, 1080);

From 5796bc9c0a7e0dc27378b1b053eded6c07a53bbb Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 13 Sep 2024 10:32:40 +0200
Subject: [PATCH 061/281] fix: emit:updateModelValue

---
 src/components/common/VnLocation.vue          |  4 +++
 .../vnComponent/vnLocation.spec.js            | 32 ++++++++++++++++++-
 2 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/src/components/common/VnLocation.vue b/src/components/common/VnLocation.vue
index e95d5a043..b6cbfbafd 100644
--- a/src/components/common/VnLocation.vue
+++ b/src/components/common/VnLocation.vue
@@ -20,6 +20,9 @@ const modelValue = ref(
 function showLabel(data) {
     return `${data.code} - ${data.town}(${data.province}), ${data.country}`;
 }
+const handleModelValue = (data) => {
+    emit('update:model-value', data);
+};
 </script>
 <template>
     <VnSelectDialog
@@ -29,6 +32,7 @@ function showLabel(data) {
             (opt) => (typeof modelValue === 'string' ? modelValue : showLabel(opt))
         "
         url="Postcodes/filter"
+        @update:model-value="handleModelValue"
         :use-like="false"
         :label="t('Location')"
         :placeholder="t('search_by_postalcode')"
diff --git a/test/cypress/integration/vnComponent/vnLocation.spec.js b/test/cypress/integration/vnComponent/vnLocation.spec.js
index 614b93a8a..8c187cc7e 100644
--- a/test/cypress/integration/vnComponent/vnLocation.spec.js
+++ b/test/cypress/integration/vnComponent/vnLocation.spec.js
@@ -33,11 +33,40 @@ describe('VnLocation', () => {
             cy.login('developer');
             cy.visit('/#/supplier/567/fiscal-data', { timeout: 7000 });
             cy.waitForElement('.q-form');
-            cy.get(createLocationButton).click();
         });
+        it('Fin by postalCode', () => {
+            const postCode = '46600';
+            const firstOption = '[role="listbox"] .q-item:nth-child(1)';
+
+            cy.get(inputLocation).click();
+            cy.get(inputLocation).clear();
+            cy.get(inputLocation).type(postCode);
+            cy.get(locationOptions).should('have.length.at.least', 2);
+            cy.get(firstOption).click();
+            cy.get('.q-btn-group > .q-btn--standard > .q-btn__content > .q-icon').click();
+            cy.reload();
+            cy.waitForElement('.q-form');
+            // cy.get('[href="#/supplier/567/basic-data"] > .q-item__section--main').click();
+            // cy.get(
+            //     '[href="#/supplier/567/fiscal-data"] > .q-item__section--main'
+            // ).click();
+            cy.get(inputLocation).should(
+                'have.value',
+                '46600 - Valencia(Province one), España'
+            );
+
+            // cy.get('.q-form > .q-card > .vn-row:nth-child(6)')
+            // .find('input')
+            // .invoke('val')
+            // .then((text) => {
+            //     expect(text).to.contain('46600 - Valencia(Province one), España');
+            // });
+        });
+
         it('Create postCode', () => {
             const postCode = '1234475';
             const province = 'Valencia';
+            cy.get(createLocationButton).click();
             cy.get('.q-card > h1').should('have.text', 'New postcode');
             cy.get(dialogInputs).eq(0).clear();
             cy.get(dialogInputs).eq(0).type(postCode);
@@ -54,6 +83,7 @@ describe('VnLocation', () => {
         it('Create city', () => {
             const postCode = '9011';
             const province = 'Saskatchew';
+            cy.get(createLocationButton).click();
             cy.get(dialogInputs).eq(0).type(postCode);
             // city create button
             cy.get(

From a56dc7aa089c2b46d37bb92aa2c7279316f93b07 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 13 Sep 2024 10:33:08 +0200
Subject: [PATCH 062/281] test: fix test

---
 .../integration/vnComponent/vnLocation.spec.js        | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/test/cypress/integration/vnComponent/vnLocation.spec.js b/test/cypress/integration/vnComponent/vnLocation.spec.js
index 8c187cc7e..3533a3c1f 100644
--- a/test/cypress/integration/vnComponent/vnLocation.spec.js
+++ b/test/cypress/integration/vnComponent/vnLocation.spec.js
@@ -46,21 +46,10 @@ describe('VnLocation', () => {
             cy.get('.q-btn-group > .q-btn--standard > .q-btn__content > .q-icon').click();
             cy.reload();
             cy.waitForElement('.q-form');
-            // cy.get('[href="#/supplier/567/basic-data"] > .q-item__section--main').click();
-            // cy.get(
-            //     '[href="#/supplier/567/fiscal-data"] > .q-item__section--main'
-            // ).click();
             cy.get(inputLocation).should(
                 'have.value',
                 '46600 - Valencia(Province one), España'
             );
-
-            // cy.get('.q-form > .q-card > .vn-row:nth-child(6)')
-            // .find('input')
-            // .invoke('val')
-            // .then((text) => {
-            //     expect(text).to.contain('46600 - Valencia(Province one), España');
-            // });
         });
 
         it('Create postCode', () => {

From 48a5c15b9d8a466676c4b069a0e67b41f4b5c14c Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 13 Sep 2024 10:54:09 +0200
Subject: [PATCH 063/281] feat: refs #7828 create axios instance which no
 manage errors

---
 src/boot/axios.js                           | 8 ++++++--
 src/pages/Worker/Card/WorkerTimeControl.vue | 6 ++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/boot/axios.js b/src/boot/axios.js
index 9b32275bd..99a163cca 100644
--- a/src/boot/axios.js
+++ b/src/boot/axios.js
@@ -5,8 +5,10 @@ import useNotify from 'src/composables/useNotify.js';
 
 const session = useSession();
 const { notify } = useNotify();
+const baseUrl = '/api/';
 
-axios.defaults.baseURL = '/api/';
+axios.defaults.baseURL = baseUrl;
+const axiosNoError = axios.create({ baseURL: baseUrl });
 
 const onRequest = (config) => {
     const token = session.getToken();
@@ -79,5 +81,7 @@ const onResponseError = (error) => {
 
 axios.interceptors.request.use(onRequest, onRequestError);
 axios.interceptors.response.use(onResponse, onResponseError);
+axiosNoError.interceptors.request.use(onRequest);
+axiosNoError.interceptors.response.use(onResponse);
 
-export { onRequest, onResponseError };
+export { onRequest, onResponseError, axiosNoError };
diff --git a/src/pages/Worker/Card/WorkerTimeControl.vue b/src/pages/Worker/Card/WorkerTimeControl.vue
index 3893305a5..9ae91f8ce 100644
--- a/src/pages/Worker/Card/WorkerTimeControl.vue
+++ b/src/pages/Worker/Card/WorkerTimeControl.vue
@@ -2,6 +2,7 @@
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 import { onMounted, ref, computed, onBeforeMount, nextTick, reactive } from 'vue';
+import { axiosNoError } from 'src/boot/axios';
 
 import FetchData from 'components/FetchData.vue';
 import WorkerTimeHourChip from 'pages/Worker/Card/WorkerTimeHourChip.vue';
@@ -266,10 +267,11 @@ const fetchWeekData = async () => {
     };
     try {
         const mail = (
-            await axios.get(`Workers/${route.params.id}/mail`, {
+            await axiosNoError.get(`Workers/${route.params.id}/mail`, {
                 params: { filter: { where } },
             })
         ).data[0];
+
         if (!mail) state.value = null;
         else {
             state.value = mail.state;
@@ -277,7 +279,7 @@ const fetchWeekData = async () => {
         }
 
         canResend.value = !!(
-            await axios.get('WorkerTimeControlMails/count', { params: { where } })
+            await axiosNoError.get('WorkerTimeControlMails/count', { params: { where } })
         ).data.count;
     } catch (err) {
         console.error('Error fetching week data');

From 0f604ea8b5eaf3485a4678326aa5e327f9154a81 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 13 Sep 2024 11:34:45 +0200
Subject: [PATCH 064/281] fix: refs #7500 fixed e2e test

---
 test/cypress/integration/entry/entryDms.spec.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/cypress/integration/entry/entryDms.spec.js b/test/cypress/integration/entry/entryDms.spec.js
index ed4a3d79c..47dcdba9e 100644
--- a/test/cypress/integration/entry/entryDms.spec.js
+++ b/test/cypress/integration/entry/entryDms.spec.js
@@ -23,7 +23,7 @@ describe('EntryDms', () => {
             expect(value).to.have.length(newFileTd++);
             const newRowSelector = `tbody > :nth-child(${newFileTd})`;
             cy.waitForElement(newRowSelector);
-            cy.validateRow(newRowSelector, [u, u, u, u, 'ENTRADA ID 1']);
+            cy.validateRow(newRowSelector, [u, u, u, u, u, 'ENTRADA ID 1']);
 
             //Edit new dms
             const newDescription = 'entry id 1 modified';
@@ -38,7 +38,7 @@ describe('EntryDms', () => {
             cy.saveCard();
             cy.reload();
 
-            cy.validateRow(newRowSelector, [u, u, u, u, newDescription]);
+            cy.validateRow(newRowSelector, [u, u, u, u, u, newDescription]);
         });
     });
 });

From c291ea267cb355c2e0bdf59cd21efd5279821f3b Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 13 Sep 2024 12:07:45 +0200
Subject: [PATCH 065/281] refactor: refs #7553 added clickable event in
 transfer sales like Salix

---
 src/pages/Ticket/Card/TicketTransfer.vue     | 15 ++++++++++++---
 src/pages/Ticket/Card/TicketTransferForm.vue |  2 ++
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/pages/Ticket/Card/TicketTransfer.vue b/src/pages/Ticket/Card/TicketTransfer.vue
index 93412aa9b..3c9e32f9e 100644
--- a/src/pages/Ticket/Card/TicketTransfer.vue
+++ b/src/pages/Ticket/Card/TicketTransfer.vue
@@ -28,7 +28,7 @@ const $props = defineProps({
 
 const { t } = useI18n();
 const QPopupProxyRef = ref(null);
-
+const transferFormRef = ref(null);
 const _transfer = ref();
 
 const transferLinesColumns = computed(() => [
@@ -80,6 +80,14 @@ const destinationTicketColumns = computed(() => [
     },
 ]);
 
+const handleRowClick = (row) => {
+    console.log('row: ', row);
+    const ticketId = row.id;
+    if (transferFormRef.value) {
+        transferFormRef.value.transferSales(ticketId);
+    }
+};
+
 onMounted(() => (_transfer.value = $props.transfer));
 </script>
 
@@ -113,6 +121,7 @@ onMounted(() => (_transfer.value = $props.transfer));
                 :title="t('Destination ticket')"
                 row-key="id"
                 class="full-width q-mt-md"
+                @row-click="(_, row) => handleRowClick(row)"
             >
                 <template #body-cell-address="{ row }">
                     <QTd @click.stop>
@@ -134,10 +143,10 @@ onMounted(() => (_transfer.value = $props.transfer));
                 </template>
 
                 <template #no-data>
-                    <TicketTransferForm v-bind="$props" />
+                    <TicketTransferForm ref="transferFormRef" v-bind="$props" />
                 </template>
                 <template #bottom>
-                    <TicketTransferForm v-bind="$props" />
+                    <TicketTransferForm ref="transferFormRef" v-bind="$props" />
                 </template>
             </QTable>
         </QCard>
diff --git a/src/pages/Ticket/Card/TicketTransferForm.vue b/src/pages/Ticket/Card/TicketTransferForm.vue
index c4b3906ae..d07a9d2e7 100644
--- a/src/pages/Ticket/Card/TicketTransferForm.vue
+++ b/src/pages/Ticket/Card/TicketTransferForm.vue
@@ -47,6 +47,8 @@ const transferSales = async (ticketId) => {
     if (data && data.id === $props.ticket.id) emit('refreshData');
     else router.push({ name: 'TicketSale', params: { id: data.id } });
 };
+
+defineExpose({ transferSales });
 </script>
 
 <template>

From e90b78c4c5867f2afd48b9029c9b443d5291c385 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 13 Sep 2024 12:27:37 +0200
Subject: [PATCH 066/281] fix: refs #7702 rollback

---
 src/pages/Customer/Card/CustomerWebAccess.vue | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerWebAccess.vue b/src/pages/Customer/Card/CustomerWebAccess.vue
index 3dc025d9c..f990e720c 100644
--- a/src/pages/Customer/Card/CustomerWebAccess.vue
+++ b/src/pages/Customer/Card/CustomerWebAccess.vue
@@ -4,7 +4,6 @@ import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 import axios from 'axios';
 import { useQuasar } from 'quasar';
-import useNotify from 'src/composables/useNotify';
 import VnInput from 'src/components/common/VnInput.vue';
 import CustomerChangePassword from 'src/pages/Customer/components/CustomerChangePassword.vue';
 import FormModel from 'components/FormModel.vue';
@@ -13,7 +12,6 @@ const { t } = useI18n();
 const quasar = useQuasar();
 const route = useRoute();
 const canChangePassword = ref(0);
-const { notify } = useNotify();
 
 const filter = computed(() => {
     return {
@@ -32,13 +30,8 @@ const showChangePasswordDialog = () => {
 };
 
 async function hasCustomerRole() {
-    try {
-        canChangePassword.value = (
-            await axios(`Clients/${route.params.id}/hasCustomerRole`)
-        ).data;
-    } catch (e) {
-        notify('errors.writeRequest', 'negative');
-    }
+    const { data } = await axios(`Clients/${route.params.id}/hasCustomerRole`);
+    canChangePassword.value = data;
 }
 </script>
 

From 4bf8e1224d1d8cd0082174fe7830baeeddc45b0c Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 13 Sep 2024 12:28:07 +0200
Subject: [PATCH 067/281] chore: refs #7702 rollback

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

diff --git a/src/pages/Customer/Card/CustomerWebAccess.vue b/src/pages/Customer/Card/CustomerWebAccess.vue
index f990e720c..8d025a365 100644
--- a/src/pages/Customer/Card/CustomerWebAccess.vue
+++ b/src/pages/Customer/Card/CustomerWebAccess.vue
@@ -4,6 +4,7 @@ import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 import axios from 'axios';
 import { useQuasar } from 'quasar';
+
 import VnInput from 'src/components/common/VnInput.vue';
 import CustomerChangePassword from 'src/pages/Customer/components/CustomerChangePassword.vue';
 import FormModel from 'components/FormModel.vue';

From 842fb9de5fb1773738cca1d4f236a29171320287 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Fri, 13 Sep 2024 12:52:25 +0200
Subject: [PATCH 068/281] refs #7155 scopeDays fix

---
 src/components/VnTable/VnTable.vue |  1 +
 src/pages/Travel/TravelList.vue    | 43 +++++++++++++++++++-----------
 2 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 0ed3de261..798213c08 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -301,6 +301,7 @@ defineExpose({
     redirect: redirectFn,
     selected,
     CrudModelRef,
+    params,
 });
 
 function handleOnDataSaved(_) {
diff --git a/src/pages/Travel/TravelList.vue b/src/pages/Travel/TravelList.vue
index 0fba3a8d3..a0976e92c 100644
--- a/src/pages/Travel/TravelList.vue
+++ b/src/pages/Travel/TravelList.vue
@@ -12,6 +12,8 @@ import VnSearchbar from 'components/ui/VnSearchbar.vue';
 import { toDate } from 'src/filters';
 import { getDateQBadgeColor } from 'src/composables/getDateQBadgeColor.js';
 import { dateRange } from 'src/filters';
+import VnInputNumber from 'src/components/common/VnInputNumber.vue';
+
 const { viewSummary } = useSummaryDialog();
 const router = useRouter();
 const { t } = useI18n();
@@ -25,22 +27,26 @@ const $props = defineProps({
     },
 });
 const entityId = computed(() => $props.id || route.params.id);
+
+onMounted(async () => {
+    stateStore.rightDrawer = true;
+    handleScopeDays();
+});
+
 const cloneTravel = (travelData) => {
     const stringifiedTravelData = JSON.stringify(travelData);
     redirectToCreateView(stringifiedTravelData);
 };
 
-const handleScopeDays = (params, days, callback) => {
-    const [from, to] = dateRange(Date.vnNew());
-    if (!days) {
-        Object.assign(params, { from, to, scopeDays: 1 });
-    } else {
-        params.from = from;
-        to.setDate(to.getDate() + days);
-        params.to = to;
-    }
-    if (callback) callback();
-};
+function handleScopeDays(days = 7) {
+    days = +days;
+    tableRef.value.params.scopeDays = days;
+    const [landedFrom, landedTo] = dateRange(Date.vnNew());
+    landedTo.setDate(landedTo.getDate() + days);
+
+    tableRef.value.params.landedFrom = landedFrom;
+    tableRef.value.params.landedTo = landedTo;
+}
 
 const redirectToCreateView = (queryParams) => {
     router.push({ name: 'TravelCreate', query: { travelData: queryParams } });
@@ -50,10 +56,6 @@ const redirectCreateEntryView = (travelData) => {
     router.push({ name: 'EntryCreate', query: { travelFk: travelData.id } });
 };
 
-onMounted(async () => {
-    stateStore.rightDrawer = true;
-});
-
 const columns = computed(() => [
     {
         align: 'left',
@@ -254,6 +256,17 @@ const columns = computed(() => [
                 :class="{ 'is-active': row.isReceived }"
             />
         </template>
+        <template #moreFilterPanel="{ params }">
+            <VnInputNumber
+                :label="t('params.scopeDays')"
+                v-model.number="params.scopeDays"
+                @keyup.enter="(evt) => handleScopeDays(evt.target.value)"
+                @remove="handleScopeDays()"
+                class="q-px-xs q-pr-lg"
+                filled
+                dense
+            />
+        </template>
     </VnTable>
 </template>
 

From 6f9e46f7a011fe214a7fc00d83fdc025a8bcae65 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 13 Sep 2024 13:01:07 +0200
Subject: [PATCH 069/281] fix: refs #7553 deleted log

---
 src/pages/Ticket/Card/TicketTransfer.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/Ticket/Card/TicketTransfer.vue b/src/pages/Ticket/Card/TicketTransfer.vue
index 3c9e32f9e..e1a011a84 100644
--- a/src/pages/Ticket/Card/TicketTransfer.vue
+++ b/src/pages/Ticket/Card/TicketTransfer.vue
@@ -81,7 +81,6 @@ const destinationTicketColumns = computed(() => [
 ]);
 
 const handleRowClick = (row) => {
-    console.log('row: ', row);
     const ticketId = row.id;
     if (transferFormRef.value) {
         transferFormRef.value.transferSales(ticketId);

From eca34e2c0fb1eef9d4ab4e2d86d4e952d61766bd Mon Sep 17 00:00:00 2001
From: guillermo <guillermo@verdnatura.es>
Date: Fri, 13 Sep 2024 14:57:33 +0200
Subject: [PATCH 070/281] feat: refs #7644 Icon

---
 src/pages/Entry/EntryBuysTableDialog.vue | 4 ++--
 src/pages/Entry/locale/en.yml            | 2 +-
 src/pages/Entry/locale/es.yml            | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/pages/Entry/EntryBuysTableDialog.vue b/src/pages/Entry/EntryBuysTableDialog.vue
index 9a76770aa..0f9be6298 100644
--- a/src/pages/Entry/EntryBuysTableDialog.vue
+++ b/src/pages/Entry/EntryBuysTableDialog.vue
@@ -116,7 +116,7 @@ const entriesTableColumns = computed(() => [
                                         {{ col.value }}
                                     </QTd>
                                     <QBtn
-                                        icon="print"
+                                        icon="visibility"
                                         v-if="props.row.stickers > 0"
                                         :loading="isLoading"
                                         @click="
@@ -126,7 +126,7 @@ const entriesTableColumns = computed(() => [
                                         "
                                         unelevated
                                     >
-                                        <QTooltip>{{ t('printLabel') }}</QTooltip>
+                                        <QTooltip>{{ t('viewLabel') }}</QTooltip>
                                     </QBtn>
                                 </QTr>
                             </template>
diff --git a/src/pages/Entry/locale/en.yml b/src/pages/Entry/locale/en.yml
index f0965b097..a9faa814b 100644
--- a/src/pages/Entry/locale/en.yml
+++ b/src/pages/Entry/locale/en.yml
@@ -11,4 +11,4 @@ shipped: Shipped
 fromShipped: Shipped(from)
 toShipped: Shipped(to)
 printLabels: Print stickers
-printLabel: Print sticker
+viewLabel: View sticker
diff --git a/src/pages/Entry/locale/es.yml b/src/pages/Entry/locale/es.yml
index aba04571e..eb1e3f88a 100644
--- a/src/pages/Entry/locale/es.yml
+++ b/src/pages/Entry/locale/es.yml
@@ -15,4 +15,4 @@ shipped: F. salida
 fromShipped: F. salida(desde)
 toShipped: F. salida(hasta)
 printLabels: Imprimir etiquetas
-printLabel: Imprimir etiqueta
+viewLabel: Ver etiqueta

From 6e6af0af8085fb1e82da7f3c3c17620ba2ecf0e7 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 13 Sep 2024 15:16:40 +0200
Subject: [PATCH 071/281] perf: improve style

---
 src/pages/Item/ItemFixedPrice.vue | 110 ++++++++++++------------------
 1 file changed, 44 insertions(+), 66 deletions(-)

diff --git a/src/pages/Item/ItemFixedPrice.vue b/src/pages/Item/ItemFixedPrice.vue
index d91b5189e..bd8c4b78c 100644
--- a/src/pages/Item/ItemFixedPrice.vue
+++ b/src/pages/Item/ItemFixedPrice.vue
@@ -76,16 +76,8 @@ const columns = computed(() => [
         name: 'rate2',
         ...defaultColumnAttrs,
         cardVisible: true,
-        columnField: {
-            class: 'expand',
-            component: 'input',
-            type: 'number',
-        },
-        columnFilter: {
-            class: 'expand',
-            component: 'input',
-            type: 'number',
-        },
+        component: 'input',
+        type: 'number',
     },
     {
         label: t('item.fixedPrice.packingPrice'),
@@ -93,35 +85,18 @@ const columns = computed(() => [
         name: 'rate3',
         ...defaultColumnAttrs,
         cardVisible: true,
-        columnField: {
-            class: 'expand',
-            component: 'input',
-            type: 'number',
-        },
-        columnFilter: {
-            class: 'expand',
-            component: 'input',
-            type: 'number',
-        },
+        component: 'input',
+        type: 'number',
     },
 
     {
         label: t('item.fixedPrice.minPrice'),
         field: 'minPrice',
-        columnClass: 'shrink',
         name: 'minPrice',
         ...defaultColumnAttrs,
         cardVisible: true,
-        columnField: {
-            class: 'expand',
-            component: 'input',
-            type: 'number',
-        },
-        columnFilter: {
-            class: 'expand',
-            component: 'input',
-            type: 'number',
-        },
+        component: 'input',
+        type: 'number',
     },
     {
         label: t('item.fixedPrice.started'),
@@ -162,16 +137,9 @@ const columns = computed(() => [
         name: 'warehouseFk',
         ...defaultColumnAttrs,
         columnClass: 'shrink',
-        columnFilter: {
-            component: 'select',
-        },
-        columnField: {
-            component: 'select',
-            class: 'expand',
-        },
-        attrs: {
-            options: warehousesOptions,
-        },
+        component: 'select',
+
+        options: warehousesOptions,
     },
     {
         align: 'right',
@@ -518,29 +486,35 @@ function handleOnDataSave({ CrudModelRef }) {
                 </span>
                 <span class="subName">{{ row.subName }}</span>
                 <ItemDescriptorProxy :id="row.itemFk" />
-                <FetchedTags style="width: max-content; max-width: 220px" :item="row" />
+                <FetchedTags :item="row" />
             </template>
             <template #column-rate2="props">
-                <VnInput
-                    mask="###.##"
-                    v-model.number="props.row.rate2"
-                    v-on="getRowUpdateInputEvents(props)"
-                >
-                    <template #append>€</template>
-                </VnInput>
+                <QTd class="col">
+                    <VnInput
+                        type="currency"
+                        style="width: 75px"
+                        v-model.number="props.row.rate2"
+                        v-on="getRowUpdateInputEvents(props)"
+                    >
+                        <template #append>€</template>
+                    </VnInput>
+                </QTd>
             </template>
             <template #column-rate3="props">
-                <VnInput
-                    mask="###.##"
-                    v-model.number="props.row.rate3"
-                    v-on="getRowUpdateInputEvents(props)"
-                >
-                    <template #append>€</template>
-                </VnInput>
+                <QTd class="col">
+                    <VnInput
+                        style="width: 75px"
+                        type="currency"
+                        v-model.number="props.row.rate3"
+                        v-on="getRowUpdateInputEvents(props)"
+                    >
+                        <template #append>€</template>
+                    </VnInput>
+                </QTd>
             </template>
             <template #column-minPrice="props">
                 <QTd class="col">
-                    <div class="row" style="width: 115px">
+                    <div class="row">
                         <QCheckbox
                             :model-value="props.row.hasMinPrice"
                             @update:model-value="updateMinPrice($event, props)"
@@ -549,6 +523,8 @@ function handleOnDataSave({ CrudModelRef }) {
                         />
                         <VnInput
                             class="col"
+                            type="currency"
+                            mask="###.##"
                             :disable="props.row.hasMinPrice === 1"
                             v-model.number="props.row.minPrice"
                             v-on="getRowUpdateInputEvents(props)"
@@ -577,15 +553,17 @@ function handleOnDataSave({ CrudModelRef }) {
                 />
             </template>
             <template #column-warehouseFk="props">
-                <VnSelect
-                    style="max-width: 150px"
-                    :options="warehousesOptions"
-                    hide-selected
-                    option-label="name"
-                    option-value="id"
-                    v-model="props.row.warehouseFk"
-                    v-on="getRowUpdateInputEvents(props, false, 'select')"
-                />
+                <QTd class="col">
+                    <VnSelect
+                        style="max-width: 150px"
+                        :options="warehousesOptions"
+                        hide-selected
+                        option-label="name"
+                        option-value="id"
+                        v-model="props.row.warehouseFk"
+                        v-on="getRowUpdateInputEvents(props, false, 'select')"
+                    />
+                </QTd>
             </template>
             <template #column-deleteAction="{ row, rowIndex }">
                 <QIcon

From 98cdeabe9f91791faa4a623ed9e67237180b0666 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 13 Sep 2024 18:15:28 +0200
Subject: [PATCH 072/281] feat: refs #7702 vnChangePassword

---
 src/components/common/VnChangePassword.vue    | 112 ++++++++++++++++++
 src/pages/Customer/Card/CustomerWebAccess.vue |  28 ++---
 2 files changed, 124 insertions(+), 16 deletions(-)
 create mode 100644 src/components/common/VnChangePassword.vue

diff --git a/src/components/common/VnChangePassword.vue b/src/components/common/VnChangePassword.vue
new file mode 100644
index 000000000..d7c9ad02f
--- /dev/null
+++ b/src/components/common/VnChangePassword.vue
@@ -0,0 +1,112 @@
+<script setup>
+import { ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import VnRow from '../ui/VnRow.vue';
+import VnInput from './VnInput.vue';
+import FetchData from '../FetchData.vue';
+import useNotify from 'src/composables/useNotify';
+
+const props = defineProps({ submitFn: { type: Function, default: () => {} } });
+
+const { t } = useI18n();
+const { notify } = useNotify();
+
+const form = ref();
+const changePassDialog = ref();
+const passwords = ref({ newPassword: null, repeatPassword: null });
+const requirements = ref([]);
+
+const validate = async () => {
+    const { newPassword, repeatPassword } = passwords.value;
+    if (newPassword !== repeatPassword) {
+        notify(t("Passwords don't match"), 'negative');
+        return;
+    }
+    try {
+        await props.submitFn(newPassword);
+    } catch (e) {
+        notify('errors.writeRequest', 'negative');
+    } finally {
+        changePassDialog.value.hide();
+    }
+};
+
+defineExpose({ show: () => changePassDialog.value.show() });
+</script>
+<template>
+    <FetchData
+        url="UserPasswords/findOne"
+        auto-load
+        @on-fetch="(data) => (requirements = data)"
+    />
+    <QDialog ref="changePassDialog">
+        <QCard style="width: 350px">
+            <QCardSection>
+                <slot name="header">
+                    <VnRow class="items-center" style="flex-direction: row">
+                        <span class="text-h6" v-text="t('Change password')" />
+                        <QIcon
+                            class="cursor-pointer"
+                            name="close"
+                            size="xs"
+                            style="flex: 0"
+                            v-close-popup
+                        />
+                    </VnRow>
+                </slot>
+            </QCardSection>
+            <QForm ref="form">
+                <QCardSection>
+                    <VnInput
+                        :label="t('New password')"
+                        v-model="passwords.newPassword"
+                        type="password"
+                        :required="true"
+                        :info="
+                            t('passwordRequirements', {
+                                length: requirements.length,
+                                nAlpha: requirements.nAlpha,
+                                nUpper: requirements.nUpper,
+                                nDigits: requirements.nDigits,
+                                nPunct: requirements.nPunct,
+                            })
+                        "
+                        autofocus
+                    />
+
+                    <VnInput
+                        :label="t('Repeat password')"
+                        v-model="passwords.repeatPassword"
+                        type="password"
+                    />
+                </QCardSection>
+            </QForm>
+            <QCardActions>
+                <slot name="actions">
+                    <QBtn
+                        :label="t('globals.cancel')"
+                        class="q-ml-sm"
+                        color="primary"
+                        flat
+                        type="reset"
+                        v-close-popup
+                    />
+                    <QBtn
+                        :label="t('globals.confirm')"
+                        color="primary"
+                        @click="validate"
+                    />
+                </slot>
+            </QCardActions>
+        </QCard>
+    </QDialog>
+</template>
+
+<i18n>
+es:
+    Change password: Cambiar contraseña
+    New password: Nueva contraseña
+    Repeat password: Repetir contraseña
+    You must enter a new password: Debes introducir la nueva contraseña
+    Passwords don't match: Las contraseñas no coinciden
+</i18n>
diff --git a/src/pages/Customer/Card/CustomerWebAccess.vue b/src/pages/Customer/Card/CustomerWebAccess.vue
index 8d025a365..ba906a144 100644
--- a/src/pages/Customer/Card/CustomerWebAccess.vue
+++ b/src/pages/Customer/Card/CustomerWebAccess.vue
@@ -3,14 +3,11 @@ import { computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 import axios from 'axios';
-import { useQuasar } from 'quasar';
-
 import VnInput from 'src/components/common/VnInput.vue';
-import CustomerChangePassword from 'src/pages/Customer/components/CustomerChangePassword.vue';
 import FormModel from 'components/FormModel.vue';
+import VnChangePassword from 'src/components/common/VnChangePassword.vue';
 
 const { t } = useI18n();
-const quasar = useQuasar();
 const route = useRoute();
 const canChangePassword = ref(0);
 
@@ -21,21 +18,11 @@ const filter = computed(() => {
     };
 });
 
-const showChangePasswordDialog = () => {
-    quasar.dialog({
-        component: CustomerChangePassword,
-        componentProps: {
-            id: route.params.id,
-        },
-    });
-};
-
 async function hasCustomerRole() {
     const { data } = await axios(`Clients/${route.params.id}/hasCustomerRole`);
     canChangePassword.value = data;
 }
 </script>
-
 <template>
     <FormModel
         url="VnUsers/preview"
@@ -73,12 +60,21 @@ async function hasCustomerRole() {
                 color="primary"
                 icon="edit"
                 :disable="!canChangePassword"
-                @click="showChangePasswordDialog()"
+                @click="$refs.changePassRef.show"
             />
         </template>
     </FormModel>
+    <VnChangePassword
+        ref="changePassRef"
+        :submit-fn="
+            async (newPass) => {
+                await axios.patch(`Clients/${$route.params.id}/setPassword`, {
+                    newPassword: newPass,
+                });
+            }
+        "
+    />
 </template>
-
 <i18n>
 es:
     Enable web access: Habilitar acceso web

From 401400bdcfc8b03eab00a4e40dc78ad1ea1fe9e7 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 13 Sep 2024 22:52:26 +0200
Subject: [PATCH 073/281] fix: remove FetchData

---
 src/components/common/VnSelect.vue | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/components/common/VnSelect.vue b/src/components/common/VnSelect.vue
index 837a3d9f6..e767fb201 100644
--- a/src/components/common/VnSelect.vue
+++ b/src/components/common/VnSelect.vue
@@ -1,6 +1,7 @@
 <script setup>
-import { ref, toRefs, computed, watch, onMounted } from 'vue';
+import { ref, toRefs, computed, watch, onMounted, useAttrs } from 'vue';
 import { useI18n } from 'vue-i18n';
+import FetchData from 'src/components/FetchData.vue';
 import { useValidator } from 'src/composables/useValidator';
 
 const emit = defineEmits(['update:modelValue', 'update:options', 'remove']);
@@ -225,6 +226,16 @@ const getVal = (val) => ($props.useLike ? { like: `%${val}%` } : val);
 </script>
 
 <template>
+    <FetchData
+        ref="dataRef"
+        :url="$props.url"
+        @on-fetch="(data) => setOptions(data)"
+        :where="where || { [optionValue]: value }"
+        :limit="limit"
+        :sort-by="sortBy"
+        :fields="fields"
+        :params="params"
+    />
     <QSelect
         v-model="value"
         :options="myOptions"

From b6cce74449dfbf28c95ab36832635d41e20011bd Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 13 Sep 2024 23:11:18 +0200
Subject: [PATCH 074/281] fix: merge conflicts

---
 src/components/common/VnInputDate.vue | 53 ++++++++++++++-------------
 src/components/common/VnInputTime.vue |  6 ++-
 src/components/common/VnSelect.vue    | 12 +++---
 3 files changed, 37 insertions(+), 34 deletions(-)

diff --git a/src/components/common/VnInputDate.vue b/src/components/common/VnInputDate.vue
index 96e47d6d7..7113cadf9 100644
--- a/src/components/common/VnInputDate.vue
+++ b/src/components/common/VnInputDate.vue
@@ -2,6 +2,7 @@
 import { onMounted, watch, computed, ref } from 'vue';
 import { date } from 'quasar';
 import { useI18n } from 'vue-i18n';
+import { useAttrs } from 'vue';
 
 const model = defineModel({ type: [String, Date] });
 const $props = defineProps({
@@ -14,29 +15,19 @@ const $props = defineProps({
         default: true,
     },
 });
+import { useValidator } from 'src/composables/useValidator';
+const { validations } = useValidator();
 
 const { t } = useI18n();
-const requiredFieldRule = (val) => !!val || t('globals.fieldRequired');
+const requiredFieldRule = (val) => validations().required($attrs.required, val);
 
 const dateFormat = 'DD/MM/YYYY';
 const isPopupOpen = ref();
 const hover = ref();
 const mask = ref();
+const $attrs = useAttrs();
 
-onMounted(() => {
-    // fix quasar bug
-    mask.value = '##/##/####';
-});
-
-const styleAttrs = computed(() => {
-    return $props.isOutlined
-        ? {
-              dense: true,
-              outlined: true,
-              rounded: true,
-          }
-        : {};
-});
+const mixinRules = [requiredFieldRule, ...($attrs.rules ?? [])];
 
 const formattedDate = computed({
     get() {
@@ -48,15 +39,12 @@ const formattedDate = computed({
         let newDate;
         if (value) {
             // parse input
-            if (value.includes('/')) {
-                if (value.length == 6) value = value + new Date().getFullYear();
-                if (value.length >= 10) {
-                    if (value.at(2) == '/') value = value.split('/').reverse().join('/');
-                    value = date.formatDate(
-                        new Date(value).toISOString(),
-                        'YYYY-MM-DDTHH:mm:ss.SSSZ'
-                    );
-                }
+            if (value.includes('/') && value.length >= 10) {
+                if (value.at(2) == '/') value = value.split('/').reverse().join('/');
+                value = date.formatDate(
+                    new Date(value).toISOString(),
+                    'YYYY-MM-DDTHH:mm:ss.SSSZ'
+                );
             }
             const [year, month, day] = value.split('-').map((e) => parseInt(e));
             newDate = new Date(year, month - 1, day);
@@ -79,12 +67,25 @@ const formattedDate = computed({
 const popupDate = computed(() =>
     model.value ? date.formatDate(new Date(model.value), 'YYYY/MM/DD') : model.value
 );
-
+onMounted(() => {
+    // fix quasar bug
+    mask.value = '##/##/####';
+});
 watch(
     () => model.value,
     (val) => (formattedDate.value = val),
     { immediate: true }
 );
+
+const styleAttrs = computed(() => {
+    return $props.isOutlined
+        ? {
+              dense: true,
+              outlined: true,
+              rounded: true,
+          }
+        : {};
+});
 </script>
 
 <template>
@@ -96,7 +97,7 @@ watch(
             placeholder="dd/mm/aaaa"
             v-bind="{ ...$attrs, ...styleAttrs }"
             :class="{ required: $attrs.required }"
-            :rules="$attrs.required ? [requiredFieldRule] : null"
+            :rules="mixinRules"
             :clearable="false"
             @click="isPopupOpen = true"
         >
diff --git a/src/components/common/VnInputTime.vue b/src/components/common/VnInputTime.vue
index b610dc1e9..27395aa9e 100644
--- a/src/components/common/VnInputTime.vue
+++ b/src/components/common/VnInputTime.vue
@@ -1,8 +1,10 @@
 <script setup>
-import { computed, ref } from 'vue';
+import { computed, ref, useAttrs } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { date } from 'quasar';
-
+import { useValidator } from 'src/composables/useValidator';
+const { validations } = useValidator();
+const $attrs = useAttrs();
 const model = defineModel({ type: String });
 const props = defineProps({
     timeOnly: {
diff --git a/src/components/common/VnSelect.vue b/src/components/common/VnSelect.vue
index e767fb201..ed842103f 100644
--- a/src/components/common/VnSelect.vue
+++ b/src/components/common/VnSelect.vue
@@ -3,7 +3,6 @@ import { ref, toRefs, computed, watch, onMounted, useAttrs } from 'vue';
 import { useI18n } from 'vue-i18n';
 import FetchData from 'src/components/FetchData.vue';
 import { useValidator } from 'src/composables/useValidator';
-
 const emit = defineEmits(['update:modelValue', 'update:options', 'remove']);
 
 const $props = defineProps({
@@ -84,10 +83,11 @@ const $props = defineProps({
         default: false,
     },
 });
-
+const { validations } = useValidator();
+const requiredFieldRule = (val) => validations().required($attrs.required, val);
+const $attrs = useAttrs();
 const { t } = useI18n();
-const requiredFieldRule = (val) => val ?? t('globals.fieldRequired');
-
+const mixinRules = [requiredFieldRule, ...($attrs.rules ?? [])];
 const { optionLabel, optionValue, optionFilter, optionFilterValue, options, modelValue } =
     toRefs($props);
 const myOptions = ref([]);
@@ -100,7 +100,6 @@ const noOneOpt = ref({
     [optionValue.value]: false,
     [optionLabel.value]: noOneText,
 });
-const { validations } = useValidator();
 
 const value = computed({
     get() {
@@ -251,8 +250,9 @@ const getVal = (val) => ($props.useLike ? { like: `%${val}%` } : val);
         ref="vnSelectRef"
         lazy-rules
         :class="{ required: $attrs.required }"
-        :rules="$attrs.required ? [requiredFieldRule] : null"
+        :rules="mixinRules"
         virtual-scroll-slice-size="options.length"
+        hide-bottom-space
     >
         <template v-if="isClearable" #append>
             <QIcon

From 93488a5750b2a3de2c49ddff952defa55a3f3386 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 13 Sep 2024 23:19:16 +0200
Subject: [PATCH 075/281] fix: styles

---
 src/components/common/VnInputDate.vue | 1 +
 src/components/common/VnInputTime.vue | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/components/common/VnInputDate.vue b/src/components/common/VnInputDate.vue
index 7113cadf9..fd8993d6f 100644
--- a/src/components/common/VnInputDate.vue
+++ b/src/components/common/VnInputDate.vue
@@ -100,6 +100,7 @@ const styleAttrs = computed(() => {
             :rules="mixinRules"
             :clearable="false"
             @click="isPopupOpen = true"
+            hide-bottom-space
         >
             <template #append>
                 <QIcon
diff --git a/src/components/common/VnInputTime.vue b/src/components/common/VnInputTime.vue
index 27395aa9e..42ec79479 100644
--- a/src/components/common/VnInputTime.vue
+++ b/src/components/common/VnInputTime.vue
@@ -79,6 +79,7 @@ function dateToTime(newDate) {
             :rules="mixinRules"
             @click="isPopupOpen = false"
             type="time"
+            hide-bottom-space
         >
             <template #append>
                 <QIcon

From deb30ee9551cab217665947ec1fd1df37362536a Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Mon, 16 Sep 2024 08:59:36 +0200
Subject: [PATCH 076/281] feat: refs #7404 travel m3 form

---
 src/components/VnTable/VnOrder.vue            |   2 +-
 src/pages/Entry/EntryStockBought.vue          | 102 +++++++++---------
 src/pages/Entry/EntryStockBoughtDetail.vue    |  66 +++++++-----
 src/pages/Entry/EntryStockBoughtFilter.vue    |  29 +++--
 .../integration/entry/stockBought.spec.js     |  15 ++-
 5 files changed, 116 insertions(+), 98 deletions(-)

diff --git a/src/components/VnTable/VnOrder.vue b/src/components/VnTable/VnOrder.vue
index 98c7ab392..7fdd23b78 100644
--- a/src/components/VnTable/VnOrder.vue
+++ b/src/components/VnTable/VnOrder.vue
@@ -4,7 +4,7 @@ import { useArrayData } from 'composables/useArrayData';
 const model = defineModel({ type: Object });
 const $props = defineProps({
     name: {
-        type: String,
+        type: [String, Boolean],
         default: '',
     },
     label: {
diff --git a/src/pages/Entry/EntryStockBought.vue b/src/pages/Entry/EntryStockBought.vue
index ad338acb1..c8f147b1f 100644
--- a/src/pages/Entry/EntryStockBought.vue
+++ b/src/pages/Entry/EntryStockBought.vue
@@ -1,12 +1,13 @@
 <script setup>
-import { onMounted, ref, watch } from 'vue';
+import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useState } from 'src/composables/useState';
 import { useQuasar } from 'quasar';
 
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
-import axios from 'axios';
 import FetchData from 'components/FetchData.vue';
+import FormModelPopup from 'components/FormModelPopup.vue';
+import VnInput from 'src/components/common/VnInput.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import RightMenu from 'src/components/common/RightMenu.vue';
 import EntryStockBoughtFilter from './EntryStockBoughtFilter.vue';
@@ -31,7 +32,9 @@ const columns = [
         align: 'left',
         name: 'workerFk',
         label: t('Buyer'),
+        isTitle: true,
         component: 'select',
+        cardVisible: true,
         create: true,
         attrs: {
             url: 'Workers/activeWithInheritedRole',
@@ -82,6 +85,7 @@ const columns = [
                         component: EntryStockBoughtDetail,
                         componentProps: {
                             workerFk: row.workerFk,
+                            dated: userParams.value.dated,
                         },
                     });
                 },
@@ -91,6 +95,7 @@ const columns = [
 ];
 
 const fetchDataRef = ref();
+const travelDialogRef = ref(false);
 const tableRef = ref();
 const travel = ref(null);
 const userParams = ref({
@@ -108,38 +113,21 @@ const filter = ref({
         {
             relation: 'warehouseIn',
             scope: {
-                where: { code: 'vnh' },
+                fields: ['code'],
             },
         },
     ],
 });
 
-function getFilter(dated) {
-    console.log('dated: ', dated);
-    const shipped = dated ? new Date(dated) : Date.vnNew();
-    shipped.setHours(0, 0, 0, 0);
-    return {
-        where: {
-            shipped,
-            m3: { neq: null },
-        },
-        include: [
-            {
-                relation: 'warehouseIn',
-                scope: {
-                    where: { code: 'vnh' },
-                },
-            },
-        ],
-    };
-}
-
 const setUserParams = async ({ dated }) => {
     const shipped = (dated ? new Date(dated) : Date.vnNew()).setHours(0, 0, 0, 0);
-
     filter.value.where.shipped = shipped;
     fetchDataRef.value?.fetch();
 };
+
+function openDialog() {
+    travelDialogRef.value = true;
+}
 </script>
 <template>
     <VnSubToolbar>
@@ -147,35 +135,55 @@ const setUserParams = async ({ dated }) => {
             <FetchData
                 ref="fetchDataRef"
                 url="Travels"
-                limit="1"
                 auto-load
                 :filter="filter"
-                @on-fetch="(data) => (travel = data)"
+                @on-fetch="
+                    (data) => {
+                        travel = data.filter((data) => data.warehouseIn.code === 'VNH');
+                    }
+                "
             />
-
-            <VnRow>
-                <div v-if="travel" class="q-pa-md">
-                    <QIcon
-                        name="local_airport"
-                        class="fill-icon q-mr-sm"
-                        size="md"
-                        :title="t('Travel')"
-                        color="primary"
-                    />
+            <VnRow class="travel">
+                <div v-if="travel">
+                    <span style="color: var(--vn-label-color)">
+                        {{ t('Booked trucks') }}:
+                    </span>
                     <span>
-                        {{ t('Booked trucks') + ': ' + travel[0]?.m3 }}
+                        {{ travel[0]?.m3 }}
                     </span>
                     <QBtn
+                        v-if="travel[0]?.m3"
                         style="max-width: 20%"
                         flat
                         icon="edit"
-                        @click="navigate(travel[0]?.id)"
+                        @click="openDialog()"
                         :title="t('Edit travel')"
+                        color="primary"
                     />
                 </div>
             </VnRow>
         </template>
     </VnSubToolbar>
+    <QDialog v-model="travelDialogRef" :maximized="true" :class="['vn-row', 'wrap']">
+        <FormModelPopup
+            :url-update="`Travels/${travel[0].id}`"
+            model="travel"
+            :title="t('Travel m3')"
+            :form-initial-data="{ id: travel[0].id, m3: travel[0].m3 }"
+            @on-data-saved="fetchDataRef.fetch()"
+        >
+            <template #form-inputs="{ data }">
+                <VnInput
+                    v-model="data.id"
+                    :label="t('id')"
+                    type="number"
+                    disable
+                    readonly
+                />
+                <VnInput v-model="data.m3" :label="t('m3')" type="number" />
+            </template>
+        </FormModelPopup>
+    </QDialog>
     <RightMenu>
         <template #right-panel>
             <EntryStockBoughtFilter
@@ -196,10 +204,7 @@ const setUserParams = async ({ dated }) => {
             :create="{
                 urlCreate: 'StockBoughts',
                 title: t('Reserve some space'),
-                onDataSaved: () => {
-                    tableRef.reload();
-                    fetchDataRef.reload();
-                },
+                onDataSaved: () => tableRef.reload(),
                 formInitialData: {
                     workerFk: user.id,
                     dated: Date.vnNow(),
@@ -214,17 +219,14 @@ const setUserParams = async ({ dated }) => {
                 <span class="link" @click.stop>
                     {{ row?.worker?.user?.name }}
                     <WorkerDescriptorProxy :id="row?.workerFk" />
-                </span>
-            </template>
+                </span> </template
+            >0
         </VnTable>
     </QPage>
 </template>
-<style lang="scss">
-.trucks {
-    text-align: center;
-    margin: 3%;
-    border: 3px solid var(--vn-header-color);
-    padding: 1%;
+<style lang="css" scoped>
+.travel {
+    margin-bottom: 0px;
 }
 </style>
 <i18n>
diff --git a/src/pages/Entry/EntryStockBoughtDetail.vue b/src/pages/Entry/EntryStockBoughtDetail.vue
index b9420af71..6d9227ad2 100644
--- a/src/pages/Entry/EntryStockBoughtDetail.vue
+++ b/src/pages/Entry/EntryStockBoughtDetail.vue
@@ -14,7 +14,7 @@ const $props = defineProps({
         required: true,
     },
     dated: {
-        type: String,
+        type: Date,
         required: true,
     },
 });
@@ -63,34 +63,46 @@ const columns = [
 ];
 </script>
 <template>
-    <QDialog>
-        <VnTable
-            ref="tableRef"
-            data-key="StockBoughtsDetail"
-            :url="customUrl"
-            order="itemName DESC"
-            :columns="columns"
-            :right-search="false"
-            :disable-infinite-scroll="true"
-            :disable-option="{ card: true }"
-            :limit="0"
-            auto-load
-        >
-            <template #column-entryFk="{ row }">
-                <span class="link" @click.stop>
-                    {{ row?.entryFk }}
-                    <EntryDescriptorProxy :id="row.entryFk" />
-                </span>
-            </template>
-            <template #column-itemName="{ row }">
-                <span class="link" @click.stop>
-                    {{ row?.itemName }}
-                    <ItemDescriptorProxy :id="row.itemFk" />
-                </span>
-            </template>
-        </VnTable>
+    <QDialog position="bottom" :maximized="true">
+        <div class="container">
+            <VnTable
+                ref="tableRef"
+                data-key="StockBoughtsDetail"
+                :url="customUrl"
+                order="itemName DESC"
+                :columns="columns"
+                :right-search="false"
+                :disable-infinite-scroll="true"
+                :disable-option="{ card: true }"
+                :limit="0"
+                auto-load
+            >
+                <template #column-entryFk="{ row }">
+                    <span class="link" @click.stop>
+                        {{ row?.entryFk }}
+                        <EntryDescriptorProxy :id="row.entryFk" />
+                    </span>
+                </template>
+                <template #column-itemName="{ row }">
+                    <span class="link" @click.stop>
+                        {{ row?.itemName }}
+                        <ItemDescriptorProxy :id="row.itemFk" />
+                    </span>
+                </template>
+            </VnTable>
+        </div>
     </QDialog>
 </template>
+<style lang="css">
+.q-dialog__inner {
+    max-width: 50vw;
+    overflow: auto;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    margin: auto;
+}
+</style>
 <i18n>
     es:
         Buyer: Comprador
diff --git a/src/pages/Entry/EntryStockBoughtFilter.vue b/src/pages/Entry/EntryStockBoughtFilter.vue
index aaf9e7a5b..7694cfe6c 100644
--- a/src/pages/Entry/EntryStockBoughtFilter.vue
+++ b/src/pages/Entry/EntryStockBoughtFilter.vue
@@ -1,11 +1,9 @@
 <script setup>
-import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { onMounted } from 'vue';
 import { useStateStore } from 'stores/useStateStore';
 
 import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
-import FetchData from 'components/FetchData.vue';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
 
 const { t } = useI18n();
@@ -15,7 +13,6 @@ const props = defineProps({
         required: true,
     },
 });
-const companiesOptions = ref([]);
 const stateStore = useStateStore();
 const emit = defineEmits(['set-user-params']);
 const setUserParams = (params) => {
@@ -27,20 +24,10 @@ onMounted(async () => {
 </script>
 
 <template>
-    <FetchData
-        ref="buyer"
-        url="Workers/activeWithInheritedRole"
-        :filter="{
-            fields: ['id', 'name'],
-            where: { role: 'buyer' },
-        }"
-        order="name"
-        @on-fetch="(data) => (companiesOptions = data)"
-        auto-load
-    />
     <VnFilterPanel
         :data-key="props.dataKey"
         :search-button="true"
+        search-url="table"
         @set-user-params="setUserParams"
     >
         <template #tags="{ tag, formatFn }">
@@ -52,13 +39,25 @@ onMounted(async () => {
         <template #body="{ params }">
             <QItem class="q-my-sm">
                 <QItemSection>
-                    <VnInputDate v-model="params.dated" :label="t('Date')" is-outlined />
+                    <VnInputDate
+                        id="date"
+                        v-model="params.dated"
+                        :label="t('Date')"
+                        is-outlined
+                    />
                 </QItemSection>
             </QItem>
         </template>
     </VnFilterPanel>
 </template>
 <i18n>
+    en:
+        params:
+            dated: Date
+            workerFk: Worker
     es:
         Date: Fecha
+        params:
+            dated: Date
+            workerFk: Trabajador
 </i18n>
diff --git a/test/cypress/integration/entry/stockBought.spec.js b/test/cypress/integration/entry/stockBought.spec.js
index a18e2bd2e..b93afa520 100644
--- a/test/cypress/integration/entry/stockBought.spec.js
+++ b/test/cypress/integration/entry/stockBought.spec.js
@@ -1,15 +1,13 @@
 describe('EntryStockBought', () => {
-    const reserveField = 'input[name="reserve"]';
     beforeEach(() => {
         cy.viewport(1920, 1080);
         cy.login('buyer');
-        cy.visit(
-            `/#/entry/stock-Bought?table={"filter":"{}","dated":"2000-12-31T23:00:00.000Z"}`
-        );
+        cy.visit(`/#/entry/stock-Bought`);
     });
     it('Should edit the reserved space', () => {
+        cy.get('.q-field__native.q-placeholder').should('have.value', '01/01/2001');
         cy.get('tBody > tr').its('length').should('eq', 2);
-        cy.get(reserveField).type('10{enter}');
+        cy.get('input[name="reserve"]').type('10{enter}');
         cy.get('button[title="Save"]').click();
         cy.get('.q-notification__message').should('have.text', 'Data saved');
     });
@@ -33,4 +31,11 @@ describe('EntryStockBought', () => {
             'warningNo data available'
         );
     });
+    it('Should edit travel m3 and refresh', () => {
+        cy.get('.vn-row > div > .q-btn > .q-btn__content > .q-icon').click();
+        cy.get('input[aria-label="m3"]').clear();
+        cy.get('input[aria-label="m3"]').type('60');
+        cy.get('.q-mt-lg > .q-btn--standard > .q-btn__content > .block').click();
+        cy.get('.vn-row > div > :nth-child(2)').should('have.text', '60');
+    });
 });

From 8c4e4a16af99c429d3abbf0a355184df5a6e9769 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Mon, 16 Sep 2024 09:19:08 +0200
Subject: [PATCH 077/281] fix(VnSectionMain): add QPage

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

diff --git a/src/components/common/VnSectionMain.vue b/src/components/common/VnSectionMain.vue
index 0c1641ce1..97a150cf4 100644
--- a/src/components/common/VnSectionMain.vue
+++ b/src/components/common/VnSectionMain.vue
@@ -20,6 +20,8 @@ onMounted(() => (stateStore.leftDrawer = $props.leftDrawer));
         </QScrollArea>
     </QDrawer>
     <QPageContainer>
-        <RouterView></RouterView>
+        <QPage>
+            <RouterView></RouterView>
+        </QPage>
     </QPageContainer>
 </template>

From 4c8238455f9a21da8a59376a249d067352052fd0 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Mon, 16 Sep 2024 10:03:12 +0200
Subject: [PATCH 078/281] fix(ClaimList): fix summary

---
 src/components/VnTable/VnTable.vue      | 4 ++--
 src/components/common/VnSectionMain.vue | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 899e4d000..6f678d5c1 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -633,7 +633,7 @@ function handleOnDataSaved(_, res) {
             </QTable>
         </template>
     </CrudModel>
-    <QPageSticky :offset="[20, 20]" style="z-index: 2">
+    <QPageSticky v-if="$props.create" :offset="[20, 20]" style="z-index: 2">
         <QBtn
             @click="
                 () =>
@@ -645,7 +645,7 @@ function handleOnDataSaved(_, res) {
             shortcut="+"
         />
         <QTooltip>
-            {{ createForm.title }}
+            {{ createForm?.title }}
         </QTooltip>
     </QPageSticky>
     <QDialog v-model="showForm" transition-show="scale" transition-hide="scale">
diff --git a/src/components/common/VnSectionMain.vue b/src/components/common/VnSectionMain.vue
index 97a150cf4..9975b1011 100644
--- a/src/components/common/VnSectionMain.vue
+++ b/src/components/common/VnSectionMain.vue
@@ -21,7 +21,7 @@ onMounted(() => (stateStore.leftDrawer = $props.leftDrawer));
     </QDrawer>
     <QPageContainer>
         <QPage>
-            <RouterView></RouterView>
+            <RouterView />
         </QPage>
     </QPageContainer>
 </template>

From 9ec2fb4c77edede9e5b80a34a80263a33ac80a1c Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 16 Sep 2024 10:36:56 +0200
Subject: [PATCH 079/281] feat: refs #7702 fine tunning

---
 src/components/common/VnChangePassword.vue | 14 +++++++-
 src/pages/Worker/Card/WorkerDescriptor.vue | 40 ++++++++++------------
 2 files changed, 31 insertions(+), 23 deletions(-)

diff --git a/src/components/common/VnChangePassword.vue b/src/components/common/VnChangePassword.vue
index d7c9ad02f..a36c6bcff 100644
--- a/src/components/common/VnChangePassword.vue
+++ b/src/components/common/VnChangePassword.vue
@@ -7,7 +7,7 @@ import FetchData from '../FetchData.vue';
 import useNotify from 'src/composables/useNotify';
 
 const props = defineProps({ submitFn: { type: Function, default: () => {} } });
-
+const emit = defineEmits(['onSubmit']);
 const { t } = useI18n();
 const { notify } = useNotify();
 
@@ -15,19 +15,27 @@ const form = ref();
 const changePassDialog = ref();
 const passwords = ref({ newPassword: null, repeatPassword: null });
 const requirements = ref([]);
+const isLoading = ref(false);
 
 const validate = async () => {
     const { newPassword, repeatPassword } = passwords.value;
+    if (!newPassword) {
+        notify(t('You must enter a new password'), 'negative');
+        return;
+    }
     if (newPassword !== repeatPassword) {
         notify(t("Passwords don't match"), 'negative');
         return;
     }
     try {
+        isLoading.value = true;
         await props.submitFn(newPassword);
+        emit('onSubmit');
     } catch (e) {
         notify('errors.writeRequest', 'negative');
     } finally {
         changePassDialog.value.hide();
+        isLoading.value = false;
     }
 };
 
@@ -84,6 +92,8 @@ defineExpose({ show: () => changePassDialog.value.show() });
             <QCardActions>
                 <slot name="actions">
                     <QBtn
+                        :disabled="isLoading"
+                        :loading="isLoading"
                         :label="t('globals.cancel')"
                         class="q-ml-sm"
                         color="primary"
@@ -92,6 +102,8 @@ defineExpose({ show: () => changePassDialog.value.show() });
                         v-close-popup
                     />
                     <QBtn
+                        :disabled="isLoading"
+                        :loading="isLoading"
                         :label="t('globals.confirm')"
                         color="primary"
                         @click="validate"
diff --git a/src/pages/Worker/Card/WorkerDescriptor.vue b/src/pages/Worker/Card/WorkerDescriptor.vue
index be30537df..b48859e9b 100644
--- a/src/pages/Worker/Card/WorkerDescriptor.vue
+++ b/src/pages/Worker/Card/WorkerDescriptor.vue
@@ -5,7 +5,7 @@ import { useI18n } from 'vue-i18n';
 import CardDescriptor from 'src/components/ui/CardDescriptor.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import VnLinkPhone from 'src/components/ui/VnLinkPhone.vue';
-import WorkerChangePasswordForm from 'src/pages/Worker/Card/WorkerChangePasswordForm.vue';
+import VnChangePassword from 'src/components/common/VnChangePassword.vue';
 import { useState } from 'src/composables/useState';
 import axios from 'axios';
 import VnImg from 'src/components/ui/VnImg.vue';
@@ -24,18 +24,13 @@ const route = useRoute();
 const { t } = useI18n();
 const state = useState();
 const user = state.getUser();
-const changePasswordFormDialog = ref(null);
-const cardDescriptorRef = ref(null);
 const showEditPhotoForm = ref(false);
 const toggleEditPictureForm = () => {
     showEditPhotoForm.value = !showEditPhotoForm.value;
 };
-
 const entityId = computed(() => {
     return $props.id || route.params.id;
 });
-
-const worker = ref();
 const workerExcluded = ref(false);
 
 const getIsExcluded = async () => {
@@ -61,10 +56,10 @@ const handleExcluded = async () => {
 
     workerExcluded.value = !workerExcluded.value;
 };
+
 const handlePhotoUpdated = (evt = false) => {
     image.value.reload(evt);
 };
-const refetch = async () => await cardDescriptorRef.value.getData();
 </script>
 <template>
     <CardDescriptor
@@ -74,15 +69,10 @@ const refetch = async () => await cardDescriptorRef.value.getData();
         url="Workers/descriptor"
         :filter="{ where: { id: entityId } }"
         title="user.nickname"
-        @on-fetch="
-            (data) => {
-                worker = data;
-                getIsExcluded();
-            }
-        "
+        @on-fetch="getIsExcluded"
     >
-        <template #menu="{}">
-            <QItem v-ripple clickable @click="handleExcluded()">
+        <template #menu="{ entity }">
+            <QItem v-ripple clickable @click="handleExcluded">
                 <QItemSection>
                     {{
                         workerExcluded
@@ -92,16 +82,13 @@ const refetch = async () => await cardDescriptorRef.value.getData();
                 </QItemSection>
             </QItem>
             <QItem
-                v-if="!worker.user.emailVerified && user.id != worker.id"
+                v-if="!entity.user.emailVerified && user.id != entity.id"
                 v-ripple
                 clickable
-                @click="$refs.changePasswordFormDialog.show()"
+                @click="$refs.changePassRef.show"
             >
                 <QItemSection>
                     {{ t('Change password') }}
-                    <QDialog ref="changePasswordFormDialog">
-                        <WorkerChangePasswordForm @on-submit="refetch()" :id="entityId" />
-                    </QDialog>
                 </QItemSection>
             </QItem>
         </template>
@@ -163,10 +150,10 @@ const refetch = async () => await cardDescriptorRef.value.getData();
                     <VnLinkPhone :phone-number="entity.phone" />
                 </template>
             </VnLv>
-            <VnLv :value="worker?.sip?.extension">
+            <VnLv :value="entity?.sip?.extension">
                 <template #label>
                     {{ t('worker.summary.sipExtension') }}
-                    <VnLinkPhone :phone-number="worker?.sip?.extension" />
+                    <VnLinkPhone :phone-number="entity?.sip?.extension" />
                 </template>
             </VnLv>
         </template>
@@ -197,6 +184,15 @@ const refetch = async () => await cardDescriptorRef.value.getData();
             </QCardActions>
         </template>
     </CardDescriptor>
+    <VnChangePassword
+        ref="changePassRef"
+        :submit-fn="
+            async (newPass) => {
+                await axios.patch(`Workers/${$route.params.id}/setPassword`, { newPass });
+            }
+        "
+        @on-submit="$refs.cardDescriptorRef?.getData"
+    />
 </template>
 
 <style lang="scss" scoped>

From 91dccd10d370263d0e9c7087efd0b9e8156b2b8d Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 16 Sep 2024 10:39:39 +0200
Subject: [PATCH 080/281] feat: refs #7702 drop old components

---
 .../components/CustomerChangePassword.vue     | 139 ------------------
 .../Worker/Card/WorkerChangePasswordForm.vue  |  99 -------------
 2 files changed, 238 deletions(-)
 delete mode 100644 src/pages/Customer/components/CustomerChangePassword.vue
 delete mode 100644 src/pages/Worker/Card/WorkerChangePasswordForm.vue

diff --git a/src/pages/Customer/components/CustomerChangePassword.vue b/src/pages/Customer/components/CustomerChangePassword.vue
deleted file mode 100644
index 632b11dc9..000000000
--- a/src/pages/Customer/components/CustomerChangePassword.vue
+++ /dev/null
@@ -1,139 +0,0 @@
-<script setup>
-import { ref } from 'vue';
-import { useI18n } from 'vue-i18n';
-
-import axios from 'axios';
-import { useDialogPluginComponent } from 'quasar';
-
-import useNotify from 'src/composables/useNotify';
-
-import VnRow from 'components/ui/VnRow.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-import FetchData from 'src/components/FetchData.vue';
-
-const { dialogRef } = useDialogPluginComponent();
-const { notify } = useNotify();
-const { t } = useI18n();
-
-const $props = defineProps({
-    id: {
-        type: String,
-        required: true,
-    },
-    promise: {
-        type: Function,
-        required: true,
-    },
-});
-const userPasswords = ref({});
-
-const closeButton = ref(null);
-const isLoading = ref(false);
-const newPassword = ref('');
-const requestPassword = ref('');
-
-const onSubmit = async () => {
-    isLoading.value = true;
-
-    if (newPassword.value !== requestPassword.value) {
-        notify(t("Passwords don't match"), 'negative');
-        isLoading.value = false;
-        return;
-    }
-
-    const payload = {
-        newPassword: newPassword.value,
-    };
-    try {
-        await axios.patch(`Clients/${$props.id}/setPassword`, payload);
-        await $props.promise();
-    } catch (error) {
-        notify('errors.writeRequest', 'negative');
-    } finally {
-        isLoading.value = false;
-        if (closeButton.value) closeButton.value.click();
-    }
-};
-</script>
-
-<template>
-    <QDialog ref="dialogRef">
-        <FetchData
-            @on-fetch="(data) => (userPasswords = data[0])"
-            auto-load
-            url="UserPasswords"
-        />
-        <QCard class="q-pa-lg">
-            <QCardSection>
-                <QForm @submit.prevent="onSubmit">
-                    <span
-                        ref="closeButton"
-                        class="row justify-end close-icon"
-                        v-close-popup
-                    >
-                        <QIcon name="close" size="sm" />
-                    </span>
-
-                    <VnRow class="row q-gutter-md q-mb-md" style="flex-direction: column">
-                        <div class="col">
-                            <VnInput
-                                :label="t('New password')"
-                                clearable
-                                v-model="newPassword"
-                                type="password"
-                            >
-                                <template #append>
-                                    <QIcon name="info" class="cursor-info">
-                                        <QTooltip>
-                                            {{
-                                                t('customer.card.passwordRequirements', {
-                                                    ...userPasswords,
-                                                })
-                                            }}
-                                        </QTooltip>
-                                    </QIcon>
-                                </template>
-                            </VnInput>
-                        </div>
-                        <div class="col">
-                            <VnInput
-                                :label="t('Request password')"
-                                clearable
-                                v-model="requestPassword"
-                                type="password"
-                            />
-                        </div>
-                    </VnRow>
-
-                    <div class="q-mt-lg row justify-end">
-                        <QBtn
-                            :disabled="isLoading"
-                            :label="t('globals.cancel')"
-                            :loading="isLoading"
-                            class="q-ml-sm"
-                            color="primary"
-                            flat
-                            type="reset"
-                            v-close-popup
-                        />
-                        <QBtn
-                            :disabled="isLoading"
-                            :label="t('Change password')"
-                            :loading="isLoading"
-                            color="primary"
-                            type="submit"
-                        />
-                    </div>
-                </QForm>
-            </QCardSection>
-        </QCard>
-    </QDialog>
-</template>
-
-<i18n>
-es:
-    New password: Nueva contraseña
-    Request password: Repetir contraseña
-    Change password: Cambiar contraseña
-    Passwords don't match: Las contraseñas no coinciden
-</i18n>
diff --git a/src/pages/Worker/Card/WorkerChangePasswordForm.vue b/src/pages/Worker/Card/WorkerChangePasswordForm.vue
deleted file mode 100644
index 20132f21e..000000000
--- a/src/pages/Worker/Card/WorkerChangePasswordForm.vue
+++ /dev/null
@@ -1,99 +0,0 @@
-<script setup>
-import { ref, reactive, onMounted } from 'vue';
-import { useI18n } from 'vue-i18n';
-
-import VnRow from 'components/ui/VnRow.vue';
-import FormPopup from 'src/components/FormPopup.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-
-import axios from 'axios';
-import useNotify from 'src/composables/useNotify.js';
-
-const $props = defineProps({
-    id: {
-        type: Object,
-        default: () => {},
-    },
-});
-
-const emit = defineEmits(['onSubmit']);
-
-const { t } = useI18n();
-const { notify } = useNotify();
-
-const formData = reactive({
-    newPassword: null,
-    repeatPassword: null,
-});
-
-const passRequirements = ref([]);
-
-const setPassword = async () => {
-    try {
-        if (!formData.newPassword) {
-            notify(t('You must enter a new password'), 'negative');
-            return;
-        }
-
-        if (formData.newPassword != formData.repeatPassword) {
-            notify(t(`Passwords don't match`), 'negative');
-            return;
-        }
-
-        await axios.patch(`Workers/${$props.id}/setPassword`, {
-            newPass: formData.newPassword,
-        });
-        notify(t('Password changed!'), 'positive');
-        emit('onSubmit');
-    } catch (err) {
-        console.error('Error setting password', err);
-    }
-};
-
-const getPassRequirements = async () => {
-    const { data } = await axios.get('UserPasswords/findOne');
-    passRequirements.value = data;
-};
-
-onMounted(async () => await getPassRequirements());
-</script>
-
-<template>
-    <FormPopup :title="t('Reset password')" @on-submit="setPassword()">
-        <template #form-inputs>
-            <VnRow>
-                <VnInput
-                    :label="t('New password')"
-                    v-model="formData.newPassword"
-                    type="password"
-                    :required="true"
-                    :info="
-                        t('passwordRequirements', {
-                            length: passRequirements.length,
-                            nAlpha: passRequirements.nAlpha,
-                            nUpper: passRequirements.nUpper,
-                            nDigits: passRequirements.nDigits,
-                            nPunct: passRequirements.nPunct,
-                        })
-                    "
-                />
-            </VnRow>
-            <VnRow>
-                <VnInput
-                    :label="t('Repeat password')"
-                    v-model="formData.repeatPassword"
-                    type="password"
-                />
-            </VnRow>
-        </template>
-    </FormPopup>
-</template>
-
-<i18n>
-es:
-    Reset password: Restablecer contraseña
-    New password: Nueva contraseña
-    Repeat password: Repetir contraseña
-    You must enter a new password: Debes introducir la nueva contraseña
-    Passwords don't match: Las contraseñas no coinciden
-</i18n>

From b015397822a7c0212751672d5fa7d7a5761bb4ce Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 16 Sep 2024 10:59:32 +0200
Subject: [PATCH 081/281] feat: refs #7702 test wip

---
 .../common/VnChangePassword.spec.js           | 47 +++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 test/vitest/__tests__/components/common/VnChangePassword.spec.js

diff --git a/test/vitest/__tests__/components/common/VnChangePassword.spec.js b/test/vitest/__tests__/components/common/VnChangePassword.spec.js
new file mode 100644
index 000000000..a481efa81
--- /dev/null
+++ b/test/vitest/__tests__/components/common/VnChangePassword.spec.js
@@ -0,0 +1,47 @@
+import { createWrapper } from 'app/test/vitest/helper';
+import VnChangePassword from 'src/components/common/VnChangePassword.vue';
+import { vi, afterEach, beforeAll, describe, expect, it } from 'vitest';
+
+describe('VnSmsDialog', () => {
+    let vm;
+
+    beforeAll(() => {
+        vm = createWrapper(VnChangePassword, {
+            propsData: {
+                submitFn: vi.fn(),
+            },
+        }).vm;
+    });
+
+    afterEach(() => {
+        vi.clearAllMocks();
+    });
+
+    it('should notify when new password is empty', async () => {
+        vm.passwords.newPassword = '';
+        vm.passwords.repeatPassword = 'password';
+        vi.spyOn(vm, 'notify');
+        await vm.validate();
+        expect(vm.notify).toHaveBeenCalledWith(
+            expect.arguments({
+                message: 'You must enter a new password',
+                type: 'negative',
+            })
+        );
+    });
+
+    it("should notify when passwords don't match", async () => {
+        vm.passwords.newPassword = 'password1';
+        vm.passwords.repeatPassword = 'password2';
+        vi.spyOn(vm, 'notify');
+        await vm.validate();
+        expect(vm.notify).toHaveBeenCalledWith("Passwords don't match", 'negative');
+    });
+
+    it('should call submitFn and emit onSubmit when passwords match', async () => {
+        vm.passwords.newPassword = 'password';
+        vm.passwords.repeatPassword = 'password';
+        await vm.validate();
+        expect(vm.props.submitFn).toHaveBeenCalledWith('password');
+    });
+});

From 263dc29d7a4d4ba22d89fb7715a8f69d968bdfed Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Mon, 16 Sep 2024 12:19:03 +0200
Subject: [PATCH 082/281] fix: refs #7404 remove console.log

---
 src/components/VnTable/VnTable.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index a6a8aec11..b7321fe16 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -692,7 +692,6 @@ function handleOnDataSaved(_) {
                         :column-name="column.name"
                         :label="column.label"
                     >
-                        {{ console.log('data: ', data) }}
                         <VnTableColumn
                             :column="column"
                             :row="{}"

From d384894bf0faed5627933188f2bb9270bcfefecc Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 16 Sep 2024 10:29:36 +0000
Subject: [PATCH 083/281] fix: rule

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

diff --git a/src/pages/Customer/Card/CustomerBasicData.vue b/src/pages/Customer/Card/CustomerBasicData.vue
index adbd476b0..bf2bf4b19 100644
--- a/src/pages/Customer/Card/CustomerBasicData.vue
+++ b/src/pages/Customer/Card/CustomerBasicData.vue
@@ -34,7 +34,7 @@ const title = ref();
             <VnRow>
                 <VnInput
                     :label="t('globals.name')"
-                    :rules="validate('client.socialName')"
+                    :rules="validate('client.name')"
                     autofocus
                     clearable
                     v-model="data.name"

From eb8690a4224a6f79e0d9305af1846404a0c87766 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 16 Sep 2024 10:30:04 +0000
Subject: [PATCH 084/281] fix: remove promise execution

---
 src/pages/Customer/components/CustomerChangePassword.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/Customer/components/CustomerChangePassword.vue b/src/pages/Customer/components/CustomerChangePassword.vue
index 1bfc5e103..d92a10c5c 100644
--- a/src/pages/Customer/components/CustomerChangePassword.vue
+++ b/src/pages/Customer/components/CustomerChangePassword.vue
@@ -46,7 +46,6 @@ const onSubmit = async () => {
     };
     try {
         await axios.patch(`Clients/${$props.id}/setPassword`, payload);
-        await $props.promise();
     } catch (error) {
         notify('errors.create', 'negative');
     } finally {

From ae76bd0b0e524035a3fe92aa73bd2a819bab1c0c Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Mon, 16 Sep 2024 12:58:06 +0200
Subject: [PATCH 085/281] refactor: refs #6346 wagons to VnTable

---
 src/pages/Wagon/Type/WagonTypeList.vue | 105 +++++++-------
 src/pages/Wagon/WagonList.vue          | 184 +++++++++++++++++--------
 2 files changed, 186 insertions(+), 103 deletions(-)

diff --git a/src/pages/Wagon/Type/WagonTypeList.vue b/src/pages/Wagon/Type/WagonTypeList.vue
index 7615dea02..2f0d55fbe 100644
--- a/src/pages/Wagon/Type/WagonTypeList.vue
+++ b/src/pages/Wagon/Type/WagonTypeList.vue
@@ -2,14 +2,13 @@
 import { ref, computed } from 'vue';
 import axios from 'axios';
 import { useQuasar } from 'quasar';
-import VnPaginate from 'src/components/ui/VnPaginate.vue';
 import { useArrayData } from 'src/composables/useArrayData';
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
-import CardList from 'components/ui/CardList.vue';
 import FormModelPopup from 'src/components/FormModelPopup.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnRow from 'src/components/ui/VnRow.vue';
+import VnTable from 'src/components/VnTable/VnTable.vue';
 
 const quasar = useQuasar();
 const arrayData = useArrayData('WagonTypeList');
@@ -17,7 +16,7 @@ const store = arrayData.store;
 const dialog = ref();
 const { push } = useRouter();
 const { t } = useI18n();
-const paginate = ref();
+const tableRef = ref();
 
 const initialData = computed(() => {
     return {
@@ -25,10 +24,46 @@ const initialData = computed(() => {
     };
 });
 
-function reloadData() {
-    initialData.value.name = null;
-    paginate.value.fetch();
-}
+const columns = computed(() => [
+    {
+        align: 'left',
+        name: 'id',
+        label: t('ID'),
+        isId: true,
+        cardVisible: true,
+    },
+    {
+        align: 'left',
+        name: 'name',
+        label: t('Name'),
+        isTitle: true,
+    },
+    {
+        align: 'left',
+        name: 'divisible',
+        label: t('Divisible'),
+        cardVisible: true,
+        component: 'checkbox',
+    },
+    {
+        align: 'right',
+        name: 'tableActions',
+        actions: [
+            {
+                title: t('components.smartCard.openCard'),
+                icon: 'arrow_forward',
+                isPrimary: true,
+                action: (row) => navigate(row.id, row.name),
+            },
+            {
+                title: t('wagon.list.remove'),
+                icon: 'delete',
+                isPrimary: true,
+                action: (row) => remove(row),
+            },
+        ],
+    },
+]);
 
 function navigate(id, name) {
     push({ path: `/wagon/type/${id}/edit`, query: { name } });
@@ -41,51 +76,25 @@ async function remove(row) {
         type: 'positive',
     });
     store.data.splice(store.data.indexOf(row), 1);
+    window.location.reload();
 }
 </script>
 
 <template>
     <QPage class="column items-center q-pa-md">
-        <div class="vn-card-list">
-            <VnPaginate
-                ref="paginate"
-                data-key="WagonTypeList"
-                url="WagonTypes"
-                order="id DESC"
-                auto-load
-            >
-                <template #body="{ rows }">
-                    <CardList
-                        v-for="row of rows"
-                        :key="row.id"
-                        :title="(row.name || '').toString()"
-                        :id="row.id"
-                        @click="navigate(row.id, row.name)"
-                    >
-                        <template #list-items>
-                            <QCheckbox
-                                :label="t('Divisble')"
-                                :model-value="row.divisible"
-                                disable
-                            />
-                        </template>
-                        <template #actions>
-                            <QBtn
-                                :label="t('components.smartCard.openCard')"
-                                @click.stop="navigate(row.id, row.name)"
-                                outline
-                            />
-                            <QBtn
-                                :label="t('wagon.list.remove')"
-                                @click.stop="remove(row)"
-                                color="primary"
-                                style="margin-top: 15px"
-                            />
-                        </template>
-                    </CardList>
-                </template>
-            </VnPaginate>
-        </div>
+        <VnTable
+            ref="tableRef"
+            data-key="WagonTypeList"
+            url="WagonTypes"
+            :columns="columns"
+            auto-load
+            order="id DESC"
+            :right-search="false"
+            :column-search="false"
+            :default-mode="'card'"
+            :disable-option="{ table: true }"
+        >
+        </VnTable>
         <QPageSticky :offset="[18, 18]">
             <QBtn @click.stop="dialog.show()" color="primary" fab icon="add" shortcut="+">
                 <QDialog ref="dialog">
@@ -94,7 +103,7 @@ async function remove(row) {
                         url-create="WagonTypes"
                         model="WagonType"
                         :form-initial-data="initialData"
-                        @on-data-saved="reloadData()"
+                        @on-data-saved="window.location.reload()"
                         auto-load
                     >
                         <template #form-inputs="{ data }">
diff --git a/src/pages/Wagon/WagonList.vue b/src/pages/Wagon/WagonList.vue
index c4824b861..129e803f5 100644
--- a/src/pages/Wagon/WagonList.vue
+++ b/src/pages/Wagon/WagonList.vue
@@ -1,12 +1,13 @@
 <script setup>
 import axios from 'axios';
 import { useQuasar } from 'quasar';
-import VnPaginate from 'src/components/ui/VnPaginate.vue';
 import { useArrayData } from 'src/composables/useArrayData';
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
-import CardList from 'components/ui/CardList.vue';
-import VnLv from 'components/ui/VnLv.vue';
+import VnTable from 'src/components/VnTable/VnTable.vue';
+import { computed } from 'vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
+import VnInput from 'src/components/common/VnInput.vue';
 
 const quasar = useQuasar();
 const arrayData = useArrayData('WagonList');
@@ -23,14 +24,56 @@ const filter = {
     },
 };
 
+const columns = computed(() => [
+    {
+        align: 'left',
+        name: 'label',
+        label: t('Label'),
+        isTitle: true,
+    },
+    {
+        align: 'left',
+        name: 'plate',
+        label: t('wagon.list.plate'),
+        cardVisible: true,
+    },
+    {
+        align: 'left',
+        name: 'volume',
+        label: t('wagon.list.volume'),
+        cardVisible: true,
+    },
+    {
+        align: 'left',
+        name: 'name',
+        label: t('wagon.list.type'),
+        cardVisible: true,
+        format: (row) => row?.type?.name,
+    },
+    {
+        align: 'right',
+        name: 'tableActions',
+        actions: [
+            {
+                title: t('components.smartCard.openCard'),
+                icon: 'arrow_forward',
+                isPrimary: true,
+                action: (row) => navigate(row.id),
+            },
+            {
+                title: t('wagon.list.remove'),
+                icon: 'delete',
+                isPrimary: true,
+                action: (row) => remove(row),
+            },
+        ],
+    },
+]);
+
 function navigate(id) {
     router.push({ path: `/wagon/${id}/edit` });
 }
 
-function create() {
-    router.push({ path: `/wagon/create` });
-}
-
 async function remove(row) {
     try {
         await axios.delete(`Wagons/${row.id}`).then(async () => {
@@ -39,6 +82,7 @@ async function remove(row) {
                 type: 'positive',
             });
             store.data.splice(store.data.indexOf(row), 1);
+            window.location.reload();
         });
     } catch (error) {
         //
@@ -48,53 +92,83 @@ async function remove(row) {
 
 <template>
     <QPage class="column items-center q-pa-md">
-        <div class="vn-card-list">
-            <VnPaginate
-                data-key="WagonList"
-                url="/Wagons"
-                order="id DESC"
-                :filter="filter"
-                auto-load
-            >
-                <template #body="{ rows }">
-                    <CardList
-                        v-for="row of rows"
-                        :key="row.id"
-                        :title="(row.label || '').toString()"
-                        :id="row.id"
-                        @click="navigate(row.id)"
-                    >
-                        <template #list-items>
-                            <VnLv
-                                :label="t('wagon.list.plate')"
-                                :title-label="t('wagon.list.plate')"
-                                :value="row.plate"
-                            />
-                            <VnLv :label="t('wagon.list.volume')" :value="row?.volume" />
-                            <VnLv
-                                :label="t('wagon.list.type')"
-                                :value="row?.type?.name"
-                            />
-                        </template>
-                        <template #actions>
-                            <QBtn
-                                :label="t('components.smartCard.openCard')"
-                                @click.stop="navigate(row.id)"
-                                outline
-                            />
-                            <QBtn
-                                :label="t('wagon.list.remove')"
-                                @click.stop="remove(row)"
-                                color="primary"
-                                style="margin-top: 15px"
-                            />
-                        </template>
-                    </CardList>
-                </template>
-            </VnPaginate>
-        </div>
-        <QPageSticky position="bottom-right" :offset="[18, 18]">
-            <QBtn @click="create" fab icon="add" color="primary" shortcut="+" />
-        </QPageSticky>
+        <VnTable
+            ref="tableRef"
+            data-key="WagonList"
+            url="Wagons"
+            :filter="filter"
+            :columns="columns"
+            auto-load
+            order="id DESC"
+            :right-search="false"
+            :column-search="false"
+            :default-mode="'card'"
+            :disable-option="{ table: true }"
+            :create="{
+                urlCreate: 'Wagons',
+                title: t('Create new wagon'),
+                onDataSaved: () => {
+                    window.location.reload();
+                },
+                formInitialData: {},
+            }"
+        >
+            <template #more-create-dialog="{ data }">
+                <VnInput
+                    filled
+                    v-model="data.label"
+                    :label="t('wagon.create.label')"
+                    type="number"
+                    min="0"
+                    :rules="[(val) => !!val || t('wagon.warnings.labelNotEmpty')]"
+                />
+                <VnInput
+                    filled
+                    v-model="data.plate"
+                    :label="t('wagon.create.plate')"
+                    :rules="[(val) => !!val || t('wagon.warnings.plateNotEmpty')]"
+                />
+                <VnInput
+                    filled
+                    v-model="data.volume"
+                    :label="t('wagon.create.volume')"
+                    type="number"
+                    min="0"
+                    :rules="[(val) => !!val || t('wagon.warnings.volumeNotEmpty')]"
+                />
+                <VnSelect
+                    url="WagonTypes"
+                    filled
+                    v-model="data.typeFk"
+                    use-input
+                    fill-input
+                    hide-selected
+                    input-debounce="0"
+                    option-label="name"
+                    option-value="id"
+                    emit-value
+                    map-options
+                    :label="t('wagon.create.type')"
+                    :options="filteredWagonTypes"
+                    :rules="[(val) => !!val || t('wagon.warnings.typeNotEmpty')]"
+                    @filter="filterType"
+                >
+                    <template v-if="data.typeFk" #append>
+                        <QIcon
+                            name="cancel"
+                            @click.stop.prevent="data.typeFk = null"
+                            class="cursor-pointer"
+                        />
+                    </template>
+                    <template #no-option>
+                        <QItem>
+                            <QItemSection class="text-grey">
+                                {{ t('wagon.warnings.noData') }}
+                            </QItemSection>
+                        </QItem>
+                    </template>
+                </VnSelect>
+            </template>
+        </VnTable>
     </QPage>
 </template>

From 6ffd985575ad24c3b2c3fcacbfe78f618725a0a6 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 16 Sep 2024 13:33:07 +0200
Subject: [PATCH 086/281] perf: CustomerBasicData.salesPersonFk

---
 src/pages/Customer/Card/CustomerBasicData.vue | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/src/pages/Customer/Card/CustomerBasicData.vue b/src/pages/Customer/Card/CustomerBasicData.vue
index bf2bf4b19..cdd9e68b2 100644
--- a/src/pages/Customer/Card/CustomerBasicData.vue
+++ b/src/pages/Customer/Card/CustomerBasicData.vue
@@ -16,6 +16,21 @@ const { t } = useI18n();
 const businessTypes = ref([]);
 const contactChannels = ref([]);
 const title = ref();
+const handleSalesModelValue = (val) => {
+    if (salesPersonFilter.value.and.length == 0) salesPersonFilter.value.and.push = [];
+
+    salesPersonFilter.value.and[1] = {
+        or: [
+            { name: val },
+            { nickname: { like: '%' + val + '%' } },
+            { code: { like: `${val}%` } },
+        ],
+    };
+};
+
+const salesPersonFilter = ref({
+    and: [{ active: { neq: false } }],
+});
 </script>
 <template>
     <FetchData
@@ -96,9 +111,11 @@ const title = ref();
                     :params="{
                         departmentCodes: ['VT', 'shopping'],
                     }"
+                    :where="salesPersonFilter"
                     :fields="['id', 'nickname']"
                     sort-by="nickname ASC"
                     :rules="validate('client.salesPersonFk')"
+                    @filter="handleSalesModelValue"
                     emit-value
                     auto-load
                 >

From 09cdd2f7e795ec28913cacfa21f0e0f381ade840 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Mon, 16 Sep 2024 15:17:05 +0200
Subject: [PATCH 087/281] chore: changelog

---
 CHANGELOG.md | 181 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 181 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8e1d4c433..666d3f4dd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,184 @@
+# Version XX.XX - XXXX-XX-XX
+
+### Added 🆕
+
+- chore: refs #6772 fix e2e  (origin/6772-warmfix-fixE2e) by:jorgep
+- chore: refs #7323 worker changes  by:jorgep
+- chore: refs #7353 fix warnings  by:jorgep
+- chore: refs #7353 use Vue component nomenclature  by:jorgep
+- chore: refs #7356 fix type  by:jorgep
+- feat(AccountConnections): use VnToken  by:alexm
+- feat: add key to routerView  by:Javier Segarra
+- feat: add plus shortcut in VnTable  by:Javier Segarra
+- feat: add row  by:Javier Segarra
+- feat: addRow withour dialog  by:Javier Segarra
+- feat: apply mixin  by:Javier Segarra
+- feat  by:Javier Segarra
+- feat: change navBar buttons  by:Javier Segarra
+- feat: dense rows  by:Javier Segarra
+- feat: fields with wrong name  by:jgallego
+- feat: fix bugs and filters  by:Javier Segarra
+- feat: fix refund parameters  by:jgallego
+- feat: handle create row  by:Javier Segarra
+- feat: handle dates  by:Javier Segarra
+- feat: handle qCheckbox 3rd state  by:Javier Segarra
+- feat: imrpove VnInputTime to set cursor at start  by:Javier Segarra
+- feat: keyShortcut directive  by:Javier Segarra
+- feat: minor fixes  by:jgallego
+- feat: only filter by isDestiny  by:Javier Segarra
+- feat: refs #211153 businessDataLinkGrafana  by:robert
+- feat: refs #7129 add km start and end on create form  by:pablone
+- feat: refs #7353 add filter & fix customTags  by:jorgep
+- feat: refs #7353 add locale  by:jorgep
+- feat: refs #7353 add no one opt  by:jorgep
+- feat: refs #7353 add right icons  by:jorgep
+- feat: refs #7353 imporve toDateFormat  by:jorgep
+- feat: refs #7353 salesPerson nickname & id  by:jorgep
+- feat: refs #7353 split sections  by:jorgep
+- feat: refs #7847 remove reload btn  by:jorgep
+- feat: refs #7847 remove reload fn  by:jorgep
+- feat: refs #7889 added shortcuts to modules  by:Jon
+- feat: refs #7911 added shortcut to modules  by:Jon
+- feat: refuncInvoiceForm component  by:jgallego
+- feat: remove duplicity  by:Javier Segarra
+- feat: remove future itemFixedPrices  by:Javier Segarra
+- feat: replace stickyButtons by subtoolbar  by:Javier Segarra
+- feat: required validation  by:Javier Segarra
+- feat: show bad dates  by:Javier Segarra
+- feat: showdate icons  by:Javier Segarra
+- feat: solve ItemFixedFilterPanel  by:Javier Segarra
+- feat: transfer an invoice  by:jgallego
+- feat: try to fix ItemFixedFilterPanel  by:Javier Segarra
+- feat: unnecessary changes  by:Javier Segarra
+- feat: update changelog  (origin/7896_down_devToTest_2436) by:Javier Segarra
+- feat: updates  by:Javier Segarra
+- feat: update version and changelog  by:Javier Segarra
+- feat: vnInput*  by:Javier Segarra
+- feat:  with VnTable  by:Javier Segarra
+- refs #6772 feat: fix approach  by:Javier Segarra
+- refs #6772 feat: refresh shelving.basic-data  by:Javier Segarra
+- style: show subName value  by:Javier Segarra
+
+### Changed 📦
+
+- perf: add v-shortcut in VnCard  by:Javier Segarra
+- perf: approach  by:Javier Segarra
+- perf: change directive location  by:Javier Segarra
+- perf: change slots order  by:Javier Segarra
+- perf: examples  by:Javier Segarra
+- perf: hide icon for VnInputDate  by:Javier Segarra
+- perf: improve ItemFixedPricefilterPanel  by:Javier Segarra
+- perf: improve  mainShrotcutMixin  by:Javier Segarra
+- perf: minor clean code  by:Javier Segarra
+- perf: onRowchange  by:Javier Segarra
+- perf: order by  by:Javier Segarra
+- perf: order components  by:Javier Segarra
+- perf: refs #7889 perf shortcut test  by:Jon
+- perf: remove console.log  by:Javier Segarra
+- perf: remove icons in header slot  by:Javier Segarra
+- perf: remove print variables  by:Javier Segarra
+- perf: restore CustomerBasicData  by:Javier Segarra
+- refactor: deleted useless prop  by:Jon
+- refactor: deleted useless prop in FetchedTags  by:Jon
+- refactor: refs #7323 drop useless code  by:jorgep
+- refactor: refs #7353 clients correction  by:jorgep
+- refactor: refs #7353 clients correction wip  by:jorgep
+- refactor: refs #7353 ease logic  by:jorgep
+- refactor: refs #7353 order correction  by:jorgep
+- refactor: refs #7353 simplify code  by:jorgep
+- refactor: refs #7353 tickets correction  by:jorgep
+- refactor: refs #7353 use global locales  by:jorgep
+- refactor: refs #7354 changed descriptor menu options  by:Jon
+- refactor: refs #7354 changed icon color in table and notification when deleting a zone  by:Jon
+- refactor: refs #7354 fix tableFilters  by:Jon
+- refactor: refs #7354 modified VnInputTime  by:Jon
+- refactor: refs #7354 refactor deliveryPanel  by:Jon
+- refactor: refs #7354 refactor zones section and fixed e2e tests  by:Jon
+- refactor: refs #7354 requested changes  by:Jon
+- refactor: refs #7354 reverse deliveryPanel changes  by:Jon
+- refactor: refs #7354 Zone migration changes  by:Jon
+- refactor: refs #7889 deleted subtitle attr and use keyBinding instead  by:Jon
+- refactor: refs #7889 modified shortcut and dashboard, and added tootlip in LeftMenu  by:Jon
+- refs #6722 perf: not fetch when id not exists  by:Javier Segarra
+- refs #6772 perf: change variable name  by:JAVIER SEGARRA MARTINEZ
+- refs #6772 perf: use ArrayData  (6772_reload_sections) by:Javier Segarra
+- refs #7283 refactor fix ItemDescriptor  by:carlossa
+- refs #7283 refactor ItexDescriptor  by:carlossa
+
+### Fixed 🛠️
+
+- chore: refs #6772 fix e2e  (origin/6772-warmfix-fixE2e) by:jorgep
+- chore: refs #7353 fix warnings  by:jorgep
+- chore: refs #7356 fix type  by:jorgep
+- feat: fix bugs and filters  by:Javier Segarra
+- feat: fix refund parameters  by:jgallego
+- feat: minor fixes  by:jgallego
+- feat: refs #7353 add filter & fix customTags  by:jorgep
+- feat: try to fix ItemFixedFilterPanel  by:Javier Segarra
+- fix: add border-top  by:Javier Segarra
+- fix: added missing descriptors and small details  by:Jon
+- fix branch  by:carlossa
+- fix: call upsert when crudModel haschanges  by:Javier Segarra
+- fix(ClaimList): fix summary  by:alexm
+- fix: cli warnings  by:Javier Segarra
+- fix: editTableOptions  by:Javier Segarra
+- fix events and descriptor menu  by:Jon
+- fix: InvoiceIn sections  (origin/6772_reload_sections) by:Javier Segarra
+- fix: minor changes  by:Javier Segarra
+- fix: minor error whit dates  by:Javier Segarra
+- fix: module icon  by:Javier Segarra
+- fix: options QDate  by:Javier Segarra
+- fix: refs #6900 e2e error  by:jorgep
+- fix: refs #6900 rollback  by:jorgep
+- fix: refs #7353 css  by:jorgep
+- fix: refs #7353 hide search param  (origin/7353-warmfix-fixSearchbar) by:jorgep
+- fix: refs #7353 iron out filter  by:jorgep
+- fix: refs #7353 iron out ticket table  by:jorgep
+- fix: refs #7353 padding  by:jorgep
+- fix: refs #7353 salesClientTable  by:jorgep
+- fix: refs #7353 salesorderTable  by:jorgep
+- fix: refs #7353 saleTicketMonitors  by:jorgep
+- fix: refs #7353 use same datakey  by:jorgep
+- fix: refs #7353 vnTable colors  by:jorgep
+- fix: refs #7354 e2e tests  by:Jon
+- fix: refs #7354 fix delivery days  by:Jon
+- fix: refs #7354 fix list searchbar and filters  by:Jon
+- fix: refs #7354 fix VnSearchbar search for zone section & finished basic tests  by:Jon
+- fix: refs #7354 fix VnTable filters and agency field  by:Jon
+- fix: refs #7354 fix zoneSearchbar  by:Jon
+- fix: refs #7354 requested changes  by:Jon
+- fix: refs #7356 colors  by:jorgep
+- fix: refs #7356 create claim dialog  by:jorgep
+- fix: refs #7889 fixed shortcut test  by:Jon
+- fix: refs #7903 fixed ticket's search bar and keybinding tooltip  by:Jon
+- fix: refs #7911 fixed shortcut and related files  by:Jon
+- fix: remove condition duplicated  by:Javier Segarra
+- fix: remove property  by:Javier Segarra
+- fix tootltip  by:carlossa
+- fix traduction  by:carlossa
+- fix(VnSectionMain): add QPage  by:alexm
+- fix(zone): zoneLocation and the others searchbar  by:alexm
+- refactor: refs #7354 fix tableFilters  by:Jon
+- refactor: refs #7354 refactor zones section and fixed e2e tests  by:Jon
+- refs #6772 feat: fix approach  by:Javier Segarra
+- refs #6772 fix: claimPhoto reload  by:Javier Segarra
+- refs #6896 fix searchbar  by:carlossa
+- refs #6897 fix entry  by:carlossa
+- refs #6899 fix invoiceFix  by:carlossa
+- refs #6899 fix order  by:carlossa
+- refs #7283 fix  by:carlossa
+- refs #7283 fix ItemDescriptor warehouse  by:carlossa
+- refs #7283 refactor fix ItemDescriptor  by:carlossa
+- refs #7355 #7366 fix account, summary, list, travelList, tooltip  by:carlossa
+- refs #7355 fix accountPrivileges  by:carlossa
+- refs #7355 fix accounts, vnTable  by:carlossa
+- refs #7355 fix privileges  by:carlossa
+- refs #7355 fix roles filters  by:carlossa
+- refs #7355 fix total  by:carlossa
+- refs #7355 fix views summarys, entryList, travelList refact  by:carlossa
+- refs #7366  fix travel hours  by:carlossa
+- test: fix e2e  by:Javier Segarra
+
 # Version 24.36 - 2024-08-27
 
 ### Added 🆕

From dc047435f5c7bed72a3d035690b66d5d30de5baa Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Mon, 16 Sep 2024 15:17:31 +0200
Subject: [PATCH 088/281] chore: changelog

---
 CHANGELOG.md | 342 +++++++++++++++++++++++++--------------------------
 package.json |   2 +-
 2 files changed, 172 insertions(+), 172 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 666d3f4dd..f1d10b26e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,183 +1,183 @@
-# Version XX.XX - XXXX-XX-XX
+# Version 24.38 - 2024-09-17
 
 ### Added 🆕
 
-- chore: refs #6772 fix e2e  (origin/6772-warmfix-fixE2e) by:jorgep
-- chore: refs #7323 worker changes  by:jorgep
-- chore: refs #7353 fix warnings  by:jorgep
-- chore: refs #7353 use Vue component nomenclature  by:jorgep
-- chore: refs #7356 fix type  by:jorgep
-- feat(AccountConnections): use VnToken  by:alexm
-- feat: add key to routerView  by:Javier Segarra
-- feat: add plus shortcut in VnTable  by:Javier Segarra
-- feat: add row  by:Javier Segarra
-- feat: addRow withour dialog  by:Javier Segarra
-- feat: apply mixin  by:Javier Segarra
-- feat  by:Javier Segarra
-- feat: change navBar buttons  by:Javier Segarra
-- feat: dense rows  by:Javier Segarra
-- feat: fields with wrong name  by:jgallego
-- feat: fix bugs and filters  by:Javier Segarra
-- feat: fix refund parameters  by:jgallego
-- feat: handle create row  by:Javier Segarra
-- feat: handle dates  by:Javier Segarra
-- feat: handle qCheckbox 3rd state  by:Javier Segarra
-- feat: imrpove VnInputTime to set cursor at start  by:Javier Segarra
-- feat: keyShortcut directive  by:Javier Segarra
-- feat: minor fixes  by:jgallego
-- feat: only filter by isDestiny  by:Javier Segarra
-- feat: refs #211153 businessDataLinkGrafana  by:robert
-- feat: refs #7129 add km start and end on create form  by:pablone
-- feat: refs #7353 add filter & fix customTags  by:jorgep
-- feat: refs #7353 add locale  by:jorgep
-- feat: refs #7353 add no one opt  by:jorgep
-- feat: refs #7353 add right icons  by:jorgep
-- feat: refs #7353 imporve toDateFormat  by:jorgep
-- feat: refs #7353 salesPerson nickname & id  by:jorgep
-- feat: refs #7353 split sections  by:jorgep
-- feat: refs #7847 remove reload btn  by:jorgep
-- feat: refs #7847 remove reload fn  by:jorgep
-- feat: refs #7889 added shortcuts to modules  by:Jon
-- feat: refs #7911 added shortcut to modules  by:Jon
-- feat: refuncInvoiceForm component  by:jgallego
-- feat: remove duplicity  by:Javier Segarra
-- feat: remove future itemFixedPrices  by:Javier Segarra
-- feat: replace stickyButtons by subtoolbar  by:Javier Segarra
-- feat: required validation  by:Javier Segarra
-- feat: show bad dates  by:Javier Segarra
-- feat: showdate icons  by:Javier Segarra
-- feat: solve ItemFixedFilterPanel  by:Javier Segarra
-- feat: transfer an invoice  by:jgallego
-- feat: try to fix ItemFixedFilterPanel  by:Javier Segarra
-- feat: unnecessary changes  by:Javier Segarra
-- feat: update changelog  (origin/7896_down_devToTest_2436) by:Javier Segarra
-- feat: updates  by:Javier Segarra
-- feat: update version and changelog  by:Javier Segarra
-- feat: vnInput*  by:Javier Segarra
-- feat:  with VnTable  by:Javier Segarra
-- refs #6772 feat: fix approach  by:Javier Segarra
-- refs #6772 feat: refresh shelving.basic-data  by:Javier Segarra
-- style: show subName value  by:Javier Segarra
+-   chore: refs #6772 fix e2e (origin/6772-warmfix-fixE2e) by:jorgep
+-   chore: refs #7323 worker changes by:jorgep
+-   chore: refs #7353 fix warnings by:jorgep
+-   chore: refs #7353 use Vue component nomenclature by:jorgep
+-   chore: refs #7356 fix type by:jorgep
+-   feat(AccountConnections): use VnToken by:alexm
+-   feat: add key to routerView by:Javier Segarra
+-   feat: add plus shortcut in VnTable by:Javier Segarra
+-   feat: add row by:Javier Segarra
+-   feat: addRow withour dialog by:Javier Segarra
+-   feat: apply mixin by:Javier Segarra
+-   feat by:Javier Segarra
+-   feat: change navBar buttons by:Javier Segarra
+-   feat: dense rows by:Javier Segarra
+-   feat: fields with wrong name by:jgallego
+-   feat: fix bugs and filters by:Javier Segarra
+-   feat: fix refund parameters by:jgallego
+-   feat: handle create row by:Javier Segarra
+-   feat: handle dates by:Javier Segarra
+-   feat: handle qCheckbox 3rd state by:Javier Segarra
+-   feat: imrpove VnInputTime to set cursor at start by:Javier Segarra
+-   feat: keyShortcut directive by:Javier Segarra
+-   feat: minor fixes by:jgallego
+-   feat: only filter by isDestiny by:Javier Segarra
+-   feat: refs #211153 businessDataLinkGrafana by:robert
+-   feat: refs #7129 add km start and end on create form by:pablone
+-   feat: refs #7353 add filter & fix customTags by:jorgep
+-   feat: refs #7353 add locale by:jorgep
+-   feat: refs #7353 add no one opt by:jorgep
+-   feat: refs #7353 add right icons by:jorgep
+-   feat: refs #7353 imporve toDateFormat by:jorgep
+-   feat: refs #7353 salesPerson nickname & id by:jorgep
+-   feat: refs #7353 split sections by:jorgep
+-   feat: refs #7847 remove reload btn by:jorgep
+-   feat: refs #7847 remove reload fn by:jorgep
+-   feat: refs #7889 added shortcuts to modules by:Jon
+-   feat: refs #7911 added shortcut to modules by:Jon
+-   feat: refuncInvoiceForm component by:jgallego
+-   feat: remove duplicity by:Javier Segarra
+-   feat: remove future itemFixedPrices by:Javier Segarra
+-   feat: replace stickyButtons by subtoolbar by:Javier Segarra
+-   feat: required validation by:Javier Segarra
+-   feat: show bad dates by:Javier Segarra
+-   feat: showdate icons by:Javier Segarra
+-   feat: solve ItemFixedFilterPanel by:Javier Segarra
+-   feat: transfer an invoice by:jgallego
+-   feat: try to fix ItemFixedFilterPanel by:Javier Segarra
+-   feat: unnecessary changes by:Javier Segarra
+-   feat: update changelog (origin/7896_down_devToTest_2436) by:Javier Segarra
+-   feat: updates by:Javier Segarra
+-   feat: update version and changelog by:Javier Segarra
+-   feat: vnInput\* by:Javier Segarra
+-   feat: with VnTable by:Javier Segarra
+-   refs #6772 feat: fix approach by:Javier Segarra
+-   refs #6772 feat: refresh shelving.basic-data by:Javier Segarra
+-   style: show subName value by:Javier Segarra
 
 ### Changed 📦
 
-- perf: add v-shortcut in VnCard  by:Javier Segarra
-- perf: approach  by:Javier Segarra
-- perf: change directive location  by:Javier Segarra
-- perf: change slots order  by:Javier Segarra
-- perf: examples  by:Javier Segarra
-- perf: hide icon for VnInputDate  by:Javier Segarra
-- perf: improve ItemFixedPricefilterPanel  by:Javier Segarra
-- perf: improve  mainShrotcutMixin  by:Javier Segarra
-- perf: minor clean code  by:Javier Segarra
-- perf: onRowchange  by:Javier Segarra
-- perf: order by  by:Javier Segarra
-- perf: order components  by:Javier Segarra
-- perf: refs #7889 perf shortcut test  by:Jon
-- perf: remove console.log  by:Javier Segarra
-- perf: remove icons in header slot  by:Javier Segarra
-- perf: remove print variables  by:Javier Segarra
-- perf: restore CustomerBasicData  by:Javier Segarra
-- refactor: deleted useless prop  by:Jon
-- refactor: deleted useless prop in FetchedTags  by:Jon
-- refactor: refs #7323 drop useless code  by:jorgep
-- refactor: refs #7353 clients correction  by:jorgep
-- refactor: refs #7353 clients correction wip  by:jorgep
-- refactor: refs #7353 ease logic  by:jorgep
-- refactor: refs #7353 order correction  by:jorgep
-- refactor: refs #7353 simplify code  by:jorgep
-- refactor: refs #7353 tickets correction  by:jorgep
-- refactor: refs #7353 use global locales  by:jorgep
-- refactor: refs #7354 changed descriptor menu options  by:Jon
-- refactor: refs #7354 changed icon color in table and notification when deleting a zone  by:Jon
-- refactor: refs #7354 fix tableFilters  by:Jon
-- refactor: refs #7354 modified VnInputTime  by:Jon
-- refactor: refs #7354 refactor deliveryPanel  by:Jon
-- refactor: refs #7354 refactor zones section and fixed e2e tests  by:Jon
-- refactor: refs #7354 requested changes  by:Jon
-- refactor: refs #7354 reverse deliveryPanel changes  by:Jon
-- refactor: refs #7354 Zone migration changes  by:Jon
-- refactor: refs #7889 deleted subtitle attr and use keyBinding instead  by:Jon
-- refactor: refs #7889 modified shortcut and dashboard, and added tootlip in LeftMenu  by:Jon
-- refs #6722 perf: not fetch when id not exists  by:Javier Segarra
-- refs #6772 perf: change variable name  by:JAVIER SEGARRA MARTINEZ
-- refs #6772 perf: use ArrayData  (6772_reload_sections) by:Javier Segarra
-- refs #7283 refactor fix ItemDescriptor  by:carlossa
-- refs #7283 refactor ItexDescriptor  by:carlossa
+-   perf: add v-shortcut in VnCard by:Javier Segarra
+-   perf: approach by:Javier Segarra
+-   perf: change directive location by:Javier Segarra
+-   perf: change slots order by:Javier Segarra
+-   perf: examples by:Javier Segarra
+-   perf: hide icon for VnInputDate by:Javier Segarra
+-   perf: improve ItemFixedPricefilterPanel by:Javier Segarra
+-   perf: improve mainShrotcutMixin by:Javier Segarra
+-   perf: minor clean code by:Javier Segarra
+-   perf: onRowchange by:Javier Segarra
+-   perf: order by by:Javier Segarra
+-   perf: order components by:Javier Segarra
+-   perf: refs #7889 perf shortcut test by:Jon
+-   perf: remove console.log by:Javier Segarra
+-   perf: remove icons in header slot by:Javier Segarra
+-   perf: remove print variables by:Javier Segarra
+-   perf: restore CustomerBasicData by:Javier Segarra
+-   refactor: deleted useless prop by:Jon
+-   refactor: deleted useless prop in FetchedTags by:Jon
+-   refactor: refs #7323 drop useless code by:jorgep
+-   refactor: refs #7353 clients correction by:jorgep
+-   refactor: refs #7353 clients correction wip by:jorgep
+-   refactor: refs #7353 ease logic by:jorgep
+-   refactor: refs #7353 order correction by:jorgep
+-   refactor: refs #7353 simplify code by:jorgep
+-   refactor: refs #7353 tickets correction by:jorgep
+-   refactor: refs #7353 use global locales by:jorgep
+-   refactor: refs #7354 changed descriptor menu options by:Jon
+-   refactor: refs #7354 changed icon color in table and notification when deleting a zone by:Jon
+-   refactor: refs #7354 fix tableFilters by:Jon
+-   refactor: refs #7354 modified VnInputTime by:Jon
+-   refactor: refs #7354 refactor deliveryPanel by:Jon
+-   refactor: refs #7354 refactor zones section and fixed e2e tests by:Jon
+-   refactor: refs #7354 requested changes by:Jon
+-   refactor: refs #7354 reverse deliveryPanel changes by:Jon
+-   refactor: refs #7354 Zone migration changes by:Jon
+-   refactor: refs #7889 deleted subtitle attr and use keyBinding instead by:Jon
+-   refactor: refs #7889 modified shortcut and dashboard, and added tootlip in LeftMenu by:Jon
+-   refs #6722 perf: not fetch when id not exists by:Javier Segarra
+-   refs #6772 perf: change variable name by:JAVIER SEGARRA MARTINEZ
+-   refs #6772 perf: use ArrayData (6772_reload_sections) by:Javier Segarra
+-   refs #7283 refactor fix ItemDescriptor by:carlossa
+-   refs #7283 refactor ItexDescriptor by:carlossa
 
 ### Fixed 🛠️
 
-- chore: refs #6772 fix e2e  (origin/6772-warmfix-fixE2e) by:jorgep
-- chore: refs #7353 fix warnings  by:jorgep
-- chore: refs #7356 fix type  by:jorgep
-- feat: fix bugs and filters  by:Javier Segarra
-- feat: fix refund parameters  by:jgallego
-- feat: minor fixes  by:jgallego
-- feat: refs #7353 add filter & fix customTags  by:jorgep
-- feat: try to fix ItemFixedFilterPanel  by:Javier Segarra
-- fix: add border-top  by:Javier Segarra
-- fix: added missing descriptors and small details  by:Jon
-- fix branch  by:carlossa
-- fix: call upsert when crudModel haschanges  by:Javier Segarra
-- fix(ClaimList): fix summary  by:alexm
-- fix: cli warnings  by:Javier Segarra
-- fix: editTableOptions  by:Javier Segarra
-- fix events and descriptor menu  by:Jon
-- fix: InvoiceIn sections  (origin/6772_reload_sections) by:Javier Segarra
-- fix: minor changes  by:Javier Segarra
-- fix: minor error whit dates  by:Javier Segarra
-- fix: module icon  by:Javier Segarra
-- fix: options QDate  by:Javier Segarra
-- fix: refs #6900 e2e error  by:jorgep
-- fix: refs #6900 rollback  by:jorgep
-- fix: refs #7353 css  by:jorgep
-- fix: refs #7353 hide search param  (origin/7353-warmfix-fixSearchbar) by:jorgep
-- fix: refs #7353 iron out filter  by:jorgep
-- fix: refs #7353 iron out ticket table  by:jorgep
-- fix: refs #7353 padding  by:jorgep
-- fix: refs #7353 salesClientTable  by:jorgep
-- fix: refs #7353 salesorderTable  by:jorgep
-- fix: refs #7353 saleTicketMonitors  by:jorgep
-- fix: refs #7353 use same datakey  by:jorgep
-- fix: refs #7353 vnTable colors  by:jorgep
-- fix: refs #7354 e2e tests  by:Jon
-- fix: refs #7354 fix delivery days  by:Jon
-- fix: refs #7354 fix list searchbar and filters  by:Jon
-- fix: refs #7354 fix VnSearchbar search for zone section & finished basic tests  by:Jon
-- fix: refs #7354 fix VnTable filters and agency field  by:Jon
-- fix: refs #7354 fix zoneSearchbar  by:Jon
-- fix: refs #7354 requested changes  by:Jon
-- fix: refs #7356 colors  by:jorgep
-- fix: refs #7356 create claim dialog  by:jorgep
-- fix: refs #7889 fixed shortcut test  by:Jon
-- fix: refs #7903 fixed ticket's search bar and keybinding tooltip  by:Jon
-- fix: refs #7911 fixed shortcut and related files  by:Jon
-- fix: remove condition duplicated  by:Javier Segarra
-- fix: remove property  by:Javier Segarra
-- fix tootltip  by:carlossa
-- fix traduction  by:carlossa
-- fix(VnSectionMain): add QPage  by:alexm
-- fix(zone): zoneLocation and the others searchbar  by:alexm
-- refactor: refs #7354 fix tableFilters  by:Jon
-- refactor: refs #7354 refactor zones section and fixed e2e tests  by:Jon
-- refs #6772 feat: fix approach  by:Javier Segarra
-- refs #6772 fix: claimPhoto reload  by:Javier Segarra
-- refs #6896 fix searchbar  by:carlossa
-- refs #6897 fix entry  by:carlossa
-- refs #6899 fix invoiceFix  by:carlossa
-- refs #6899 fix order  by:carlossa
-- refs #7283 fix  by:carlossa
-- refs #7283 fix ItemDescriptor warehouse  by:carlossa
-- refs #7283 refactor fix ItemDescriptor  by:carlossa
-- refs #7355 #7366 fix account, summary, list, travelList, tooltip  by:carlossa
-- refs #7355 fix accountPrivileges  by:carlossa
-- refs #7355 fix accounts, vnTable  by:carlossa
-- refs #7355 fix privileges  by:carlossa
-- refs #7355 fix roles filters  by:carlossa
-- refs #7355 fix total  by:carlossa
-- refs #7355 fix views summarys, entryList, travelList refact  by:carlossa
-- refs #7366  fix travel hours  by:carlossa
-- test: fix e2e  by:Javier Segarra
+-   chore: refs #6772 fix e2e (origin/6772-warmfix-fixE2e) by:jorgep
+-   chore: refs #7353 fix warnings by:jorgep
+-   chore: refs #7356 fix type by:jorgep
+-   feat: fix bugs and filters by:Javier Segarra
+-   feat: fix refund parameters by:jgallego
+-   feat: minor fixes by:jgallego
+-   feat: refs #7353 add filter & fix customTags by:jorgep
+-   feat: try to fix ItemFixedFilterPanel by:Javier Segarra
+-   fix: add border-top by:Javier Segarra
+-   fix: added missing descriptors and small details by:Jon
+-   fix branch by:carlossa
+-   fix: call upsert when crudModel haschanges by:Javier Segarra
+-   fix(ClaimList): fix summary by:alexm
+-   fix: cli warnings by:Javier Segarra
+-   fix: editTableOptions by:Javier Segarra
+-   fix events and descriptor menu by:Jon
+-   fix: InvoiceIn sections (origin/6772_reload_sections) by:Javier Segarra
+-   fix: minor changes by:Javier Segarra
+-   fix: minor error whit dates by:Javier Segarra
+-   fix: module icon by:Javier Segarra
+-   fix: options QDate by:Javier Segarra
+-   fix: refs #6900 e2e error by:jorgep
+-   fix: refs #6900 rollback by:jorgep
+-   fix: refs #7353 css by:jorgep
+-   fix: refs #7353 hide search param (origin/7353-warmfix-fixSearchbar) by:jorgep
+-   fix: refs #7353 iron out filter by:jorgep
+-   fix: refs #7353 iron out ticket table by:jorgep
+-   fix: refs #7353 padding by:jorgep
+-   fix: refs #7353 salesClientTable by:jorgep
+-   fix: refs #7353 salesorderTable by:jorgep
+-   fix: refs #7353 saleTicketMonitors by:jorgep
+-   fix: refs #7353 use same datakey by:jorgep
+-   fix: refs #7353 vnTable colors by:jorgep
+-   fix: refs #7354 e2e tests by:Jon
+-   fix: refs #7354 fix delivery days by:Jon
+-   fix: refs #7354 fix list searchbar and filters by:Jon
+-   fix: refs #7354 fix VnSearchbar search for zone section & finished basic tests by:Jon
+-   fix: refs #7354 fix VnTable filters and agency field by:Jon
+-   fix: refs #7354 fix zoneSearchbar by:Jon
+-   fix: refs #7354 requested changes by:Jon
+-   fix: refs #7356 colors by:jorgep
+-   fix: refs #7356 create claim dialog by:jorgep
+-   fix: refs #7889 fixed shortcut test by:Jon
+-   fix: refs #7903 fixed ticket's search bar and keybinding tooltip by:Jon
+-   fix: refs #7911 fixed shortcut and related files by:Jon
+-   fix: remove condition duplicated by:Javier Segarra
+-   fix: remove property by:Javier Segarra
+-   fix tootltip by:carlossa
+-   fix traduction by:carlossa
+-   fix(VnSectionMain): add QPage by:alexm
+-   fix(zone): zoneLocation and the others searchbar by:alexm
+-   refactor: refs #7354 fix tableFilters by:Jon
+-   refactor: refs #7354 refactor zones section and fixed e2e tests by:Jon
+-   refs #6772 feat: fix approach by:Javier Segarra
+-   refs #6772 fix: claimPhoto reload by:Javier Segarra
+-   refs #6896 fix searchbar by:carlossa
+-   refs #6897 fix entry by:carlossa
+-   refs #6899 fix invoiceFix by:carlossa
+-   refs #6899 fix order by:carlossa
+-   refs #7283 fix by:carlossa
+-   refs #7283 fix ItemDescriptor warehouse by:carlossa
+-   refs #7283 refactor fix ItemDescriptor by:carlossa
+-   refs #7355 #7366 fix account, summary, list, travelList, tooltip by:carlossa
+-   refs #7355 fix accountPrivileges by:carlossa
+-   refs #7355 fix accounts, vnTable by:carlossa
+-   refs #7355 fix privileges by:carlossa
+-   refs #7355 fix roles filters by:carlossa
+-   refs #7355 fix total by:carlossa
+-   refs #7355 fix views summarys, entryList, travelList refact by:carlossa
+-   refs #7366 fix travel hours by:carlossa
+-   test: fix e2e by:Javier Segarra
 
 # Version 24.36 - 2024-08-27
 
diff --git a/package.json b/package.json
index f25e570a3..6a7c1ed55 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "salix-front",
-    "version": "24.36.0",
+    "version": "24.38.0",
     "description": "Salix frontend",
     "productName": "Salix",
     "author": "Verdnatura",

From 1ff15da8ca4ec1b5e39b2fb1c6cabe016d8eac5f Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 16 Sep 2024 16:33:09 +0200
Subject: [PATCH 089/281] fix: refs #7323 workerList

---
 src/i18n/locale/en.yml            |  5 +++
 src/i18n/locale/es.yml            |  5 +++
 src/pages/Worker/WorkerFilter.vue | 30 ++++++++++-------
 src/pages/Worker/WorkerList.vue   | 53 ++++++++++++++++++++++++++++---
 src/pages/Worker/locale/en.yml    |  5 +++
 src/pages/Worker/locale/es.yml    |  5 +++
 6 files changed, 86 insertions(+), 17 deletions(-)

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index f99244d42..3b1cb20fa 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -286,6 +286,7 @@ globals:
     myAccount: My account
     noOne: No one
     params:
+        id: ID
         clientFk: Client id
         salesPersonFk: Sales person
         warehouseFk: Warehouse
@@ -293,6 +294,10 @@ globals:
         from: From
         To: To
         stateFk: State
+        departmentFk: Department
+        email: Email
+        SSN: SSN
+        fi: FI
 errors:
     statusUnauthorized: Access denied
     statusInternalServerError: An internal server error has ocurred
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 360627fda..31010dfb0 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -290,6 +290,7 @@ globals:
     myAccount: Mi cuenta
     noOne: Nadie
     params:
+        id: Id
         clientFk: Id cliente
         salesPersonFk: Comercial
         warehouseFk: Almacén
@@ -297,6 +298,10 @@ globals:
         from: Desde
         To: Hasta
         stateFk: Estado
+        departmentFk: Departamento
+        email: Correo
+        SSN: NSS
+        fi: NIF
 errors:
     statusUnauthorized: Acceso denegado
     statusInternalServerError: Ha ocurrido un error interno del servidor
diff --git a/src/pages/Worker/WorkerFilter.vue b/src/pages/Worker/WorkerFilter.vue
index 765241341..61120f448 100644
--- a/src/pages/Worker/WorkerFilter.vue
+++ b/src/pages/Worker/WorkerFilter.vue
@@ -7,7 +7,7 @@ import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 
-const { t } = useI18n();
+const { t, te } = useI18n();
 const props = defineProps({
     dataKey: {
         type: String,
@@ -16,6 +16,11 @@ const props = defineProps({
 });
 
 const departments = ref();
+
+const getLocale = (label) => {
+    const globalLocale = `globals.params.${label}`;
+    return te(globalLocale) ? t(globalLocale) : t(`params.${label}`);
+};
 </script>
 
 <template>
@@ -23,7 +28,7 @@ const departments = ref();
     <VnFilterPanel :data-key="props.dataKey" :search-button="true">
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">
-                <strong>{{ t(`params.${tag.label}`) }}: </strong>
+                <strong>{{ getLocale(tag.label) }}: </strong>
                 <span>{{ formatFn(tag.value) }}</span>
             </div>
         </template>
@@ -64,10 +69,7 @@ const departments = ref();
                 </QItemSection>
             </QItem>
             <QItem>
-                <QItemSection v-if="!departments">
-                    <QSkeleton type="QInput" class="full-width" />
-                </QItemSection>
-                <QItemSection v-if="departments">
+                <QItemSection>
                     <VnSelect
                         :label="t('Department')"
                         v-model="params.departmentFk"
@@ -82,6 +84,16 @@ const departments = ref();
                     />
                 </QItemSection>
             </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInput :label="t('SSN')" v-model="params.SSN" is-outlined />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInput :label="t('Email')" v-model="params.email" is-outlined />
+                </QItemSection>
+            </QItem>
             <QItem>
                 <QItemSection>
                     <VnInput
@@ -99,23 +111,17 @@ const departments = ref();
 en:
     params:
         search: Contains
-        fi: FI
         firstName: First name
         lastName: Last name
         userName: User
         extension: Extension
-        departmentFk: Department
-        id: ID
 es:
     params:
         search: Contiene
-        fi: NIF
         firstName: Nombre
         lastName: Apellidos
         userName: Usuario
         extension: Extensión
-        departmentFk: Departamento
-        id: ID
     FI: NIF
     First Name: Nombre
     Last Name: Apellidos
diff --git a/src/pages/Worker/WorkerList.vue b/src/pages/Worker/WorkerList.vue
index b8ef3f9d8..9b6bb8b69 100644
--- a/src/pages/Worker/WorkerList.vue
+++ b/src/pages/Worker/WorkerList.vue
@@ -39,13 +39,31 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        name: 'nickname',
+        name: 'firstName',
         label: t('tableColumns.name'),
         isTitle: true,
         columnFilter: {
             name: 'firstName',
         },
     },
+    {
+        align: 'left',
+        name: 'lastName',
+        label: t('tableColumns.lastName'),
+        isTitle: true,
+        columnFilter: {
+            name: 'lastName',
+        },
+    },
+    {
+        align: 'left',
+        name: 'nickname',
+        label: t('tableColumns.userName'),
+        isTitle: true,
+        columnFilter: {
+            name: 'userName',
+        },
+    },
     {
         align: 'left',
         name: 'departmentFk',
@@ -60,16 +78,41 @@ const columns = computed(() => [
         },
         format: (row, dashIfEmpty) => dashIfEmpty(row.department),
     },
+    {
+        align: 'left',
+        name: 'fi',
+        label: t('tableColumns.fi'),
+        isTitle: true,
+        columnFilter: {
+            name: 'fi',
+        },
+    },
+    {
+        align: 'left',
+        name: 'SSN',
+        label: t('tableColumns.SSN'),
+        isTitle: true,
+        columnFilter: {
+            name: 'SSN',
+        },
+    },
     {
         align: 'left',
         name: 'email',
         label: t('tableColumns.email'),
         cardVisible: true,
         columnFilter: {
-            alias: 'mu',
-            inWhere: true,
+            name: 'email',
+        },
+    },
+    {
+        align: 'left',
+        name: 'extension',
+        label: t('tableColumns.extension'),
+        cardVisible: true,
+        columnFilter: {
+            name: 'extension',
         },
-        hidden: true,
     },
     {
         align: 'right',
@@ -180,7 +223,7 @@ async function autofillBic(worker) {
         default-mode="table"
         redirect="worker"
         :right-search="false"
-        auto-load
+        :order="['id DESC']"
     >
         <template #more-create-dialog="{ data }">
             <div class="q-pa-lg full-width">
diff --git a/src/pages/Worker/locale/en.yml b/src/pages/Worker/locale/en.yml
index 96df37919..7081e8fd0 100644
--- a/src/pages/Worker/locale/en.yml
+++ b/src/pages/Worker/locale/en.yml
@@ -2,5 +2,10 @@ passwordRequirements: 'The password must have at least { length } length charact
 tableColumns:
     id: ID
     name: Name
+    lastName: Last Name
+    userName: User Name
     department: Department
     email: Email
+    fi: FI
+    SSN: SSN
+    extension: Extension
diff --git a/src/pages/Worker/locale/es.yml b/src/pages/Worker/locale/es.yml
index 41812345f..61694dc83 100644
--- a/src/pages/Worker/locale/es.yml
+++ b/src/pages/Worker/locale/es.yml
@@ -7,5 +7,10 @@ passwordRequirements: 'La contraseña debe tener al menos { length } caracteres
 tableColumns:
     id: ID
     name: Nombre
+    lastName: Apellidos
+    userName: Nombre de usuario
     department: Departamento
     email: Email
+    fi: NIF
+    SSN: NSS
+    extension: Extensión

From da7d0326c091b4111296cbd9930a4cd2317a5957 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 16 Sep 2024 17:12:48 +0200
Subject: [PATCH 090/281] fix: refs #7323 workerBalance & arrayData
 setUserParams

---
 src/components/VnTable/VnTable.vue | 2 +-
 src/composables/useArrayData.js    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index d6008de0b..d71c85338 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -646,7 +646,7 @@ function handleOnDataSaved(_) {
             icon="add"
             shortcut="+"
         />
-        <QTooltip>
+        <QTooltip self="top right">
             {{ createForm?.title }}
         </QTooltip>
     </QPageSticky>
diff --git a/src/composables/useArrayData.js b/src/composables/useArrayData.js
index 651bcefb0..90cf45268 100644
--- a/src/composables/useArrayData.js
+++ b/src/composables/useArrayData.js
@@ -113,7 +113,7 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
             for (const row of response.data) store.data.push(row);
         } else {
             store.data = response.data;
-            if (!document.querySelectorAll('[role="dialog"]').length)
+            if (!document.querySelectorAll('[role="dialog"][aria-modal="true"]').length)
                 updateRouter && updateStateParams();
         }
 

From 479f2a8e53ffe91a5c7842758e37912acb9505fc Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Tue, 17 Sep 2024 08:31:02 +0200
Subject: [PATCH 091/281] feat: refs #7884 added new filter field

---
 src/i18n/locale/en.yml        | 1 +
 src/i18n/locale/es.yml        | 1 +
 src/pages/Entry/MyEntries.vue | 8 +++++++-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index f99244d42..27c904aaf 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -50,6 +50,7 @@ globals:
     summary:
         basicData: Basic data
     daysOnward: Days onward
+    daysAgo: Days ago
     today: Today
     yesterday: Yesterday
     dateFormat: en-GB
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 360627fda..e0614caaf 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -49,6 +49,7 @@ globals:
     summary:
         basicData: Datos básicos
     daysOnward: Días adelante
+    daysAgo: Días atras
     today: Hoy
     yesterday: Ayer
     dateFormat: es-ES
diff --git a/src/pages/Entry/MyEntries.vue b/src/pages/Entry/MyEntries.vue
index 1c56427f4..17b1f91c5 100644
--- a/src/pages/Entry/MyEntries.vue
+++ b/src/pages/Entry/MyEntries.vue
@@ -78,7 +78,13 @@ const columns = computed(() => [
     {
         align: 'left',
         label: t('globals.daysOnward'),
-        name: 'days',
+        name: 'daysOnward',
+        visible: false,
+    },
+    {
+        align: 'left',
+        label: t('globals.daysAgo'),
+        name: 'daysAgo',
         visible: false,
     },
     {

From 37b6a032888abba2695fa6549d327b41bf93dec1 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Tue, 17 Sep 2024 09:25:53 +0200
Subject: [PATCH 092/281] fix(itemDescriptor): fix redirection to itemDiary

---
 src/pages/Item/Card/ItemDescriptor.vue | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/src/pages/Item/Card/ItemDescriptor.vue b/src/pages/Item/Card/ItemDescriptor.vue
index baac0c608..da6859d30 100644
--- a/src/pages/Item/Card/ItemDescriptor.vue
+++ b/src/pages/Item/Card/ItemDescriptor.vue
@@ -11,7 +11,6 @@ import VnConfirm from 'components/ui/VnConfirm.vue';
 import RegularizeStockForm from 'components/RegularizeStockForm.vue';
 import ItemDescriptorImage from 'src/pages/Item/Card/ItemDescriptorImage.vue';
 import useCardDescription from 'src/composables/useCardDescription';
-import { getUrl } from 'src/composables/getUrl';
 import axios from 'axios';
 import { dashIfEmpty } from 'src/filters';
 
@@ -51,10 +50,8 @@ const entityId = computed(() => {
 const regularizeStockFormDialog = ref(null);
 const available = ref(null);
 const visible = ref(null);
-const salixUrl = ref();
 
 onMounted(async () => {
-    salixUrl.value = await getUrl('');
     await getItemConfigs();
     await updateStock();
 });
@@ -200,16 +197,10 @@ const openCloneDialog = async () => {
         <template #actions="{}">
             <QCardActions class="row justify-center">
                 <QBtn
-                    :href="
-                        salixUrl +
-                        'item/' +
-                        entityId +
-                        '/diary?' +
-                        'warehouseFk=' +
-                        warehouseFk +
-                        '&lineFk=' +
-                        $props.saleFk
-                    "
+                    :to="{
+                        name: 'ItemDiary',
+                        query: { warehouseFk, lineFk: $props.saleFk },
+                    }"
                     size="md"
                     icon="vn:transaction"
                     color="primary"

From 3d1bb0c67a035e770f6aa02cf84e51307d9a9c8b Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Tue, 17 Sep 2024 10:20:44 +0200
Subject: [PATCH 093/281] fix(itemDescriptor): fix redirection to itemDiary

---
 src/components/common/VnCard.vue       | 10 +++++++---
 src/pages/Item/Card/ItemCard.vue       |  2 +-
 src/pages/Item/Card/ItemDescriptor.vue |  1 +
 src/pages/Login/ResetPassword.vue      |  1 -
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/components/common/VnCard.vue b/src/components/common/VnCard.vue
index 7d29da232..0d80f43ce 100644
--- a/src/components/common/VnCard.vue
+++ b/src/components/common/VnCard.vue
@@ -24,7 +24,9 @@ const stateStore = useStateStore();
 const route = useRoute();
 const router = useRouter();
 const url = computed(() => {
-    if (props.baseUrl) return `${props.baseUrl}/${route.params.id}`;
+    if (props.baseUrl) {
+        return `${props.baseUrl}/${route.params.id}`;
+    }
     return props.customUrl;
 });
 const searchRightDataKey = computed(() => {
@@ -40,8 +42,10 @@ onBeforeMount(async () => {
     try {
         if (!props.baseUrl) arrayData.store.filter.where = { id: route.params.id };
         await arrayData.fetch({ append: false, updateRouter: false });
-    } catch (e) {
-        router.push({ name: 'WorkerList' });
+    } catch {
+        const { matched: matches } = router.currentRoute.value;
+        const { path } = matches.at(-1);
+        router.push({ path: path.replace(/:id.*/, '') });
     }
 });
 
diff --git a/src/pages/Item/Card/ItemCard.vue b/src/pages/Item/Card/ItemCard.vue
index 1162327c1..2412f2bf9 100644
--- a/src/pages/Item/Card/ItemCard.vue
+++ b/src/pages/Item/Card/ItemCard.vue
@@ -12,7 +12,7 @@ import ItemListFilter from '../ItemListFilter.vue';
         search-data-key="ItemList"
         :searchbar-props="{
             url: 'Items/filter',
-            label: 'searchbar.labelr',
+            label: 'searchbar.label',
             info: 'searchbar.info',
         }"
     />
diff --git a/src/pages/Item/Card/ItemDescriptor.vue b/src/pages/Item/Card/ItemDescriptor.vue
index da6859d30..ef844824f 100644
--- a/src/pages/Item/Card/ItemDescriptor.vue
+++ b/src/pages/Item/Card/ItemDescriptor.vue
@@ -199,6 +199,7 @@ const openCloneDialog = async () => {
                 <QBtn
                     :to="{
                         name: 'ItemDiary',
+                        params: { id: entityId },
                         query: { warehouseFk, lineFk: $props.saleFk },
                     }"
                     size="md"
diff --git a/src/pages/Login/ResetPassword.vue b/src/pages/Login/ResetPassword.vue
index eff718e97..2751f1ceb 100644
--- a/src/pages/Login/ResetPassword.vue
+++ b/src/pages/Login/ResetPassword.vue
@@ -33,7 +33,6 @@ async function onSubmit() {
     };
 
     try {
-        console.log('newPassword: ', newPassword);
         await axios.post(
             'VnUsers/reset-password',
             { newPassword: newPassword.value },

From 044156356c559eb8660d851bb641f57a4909dd68 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Tue, 17 Sep 2024 10:37:22 +0200
Subject: [PATCH 094/281] hotfix searchbar

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

diff --git a/src/pages/InvoiceOut/InvoiceOutList.vue b/src/pages/InvoiceOut/InvoiceOutList.vue
index 915b58b15..5157d957b 100644
--- a/src/pages/InvoiceOut/InvoiceOutList.vue
+++ b/src/pages/InvoiceOut/InvoiceOutList.vue
@@ -177,7 +177,7 @@ watchEffect(selectedRows);
     <VnSearchbar
         :info="t('youCanSearchByInvoiceReference')"
         :label="t('searchInvoice')"
-        data-key="InvoiceOutList"
+        data-key="invoiceOut"
     />
     <VnSubToolbar>
         <template #st-actions>

From 56f8cbe615de8996b100cab085716c45a62629fd Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 17 Sep 2024 11:37:44 +0200
Subject: [PATCH 095/281] fix: refs #7353 sales person filter and locale

---
 src/components/ui/VnFilterPanel.vue              | 15 +++++++++++++--
 src/pages/Monitor/Ticket/MonitorTicketFilter.vue | 11 ++++++++---
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue
index cebdc4bbf..12525c7cc 100644
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@@ -6,7 +6,7 @@ import { useRoute } from 'vue-router';
 import toDate from 'filters/toDate';
 import VnFilterPanelChip from 'components/ui/VnFilterPanelChip.vue';
 
-const { t } = useI18n();
+const { t, te } = useI18n();
 const $props = defineProps({
     modelValue: {
         type: Object,
@@ -200,6 +200,11 @@ function sanitizer(params) {
     }
     return params;
 }
+
+function getLocale(label) {
+    const globalLocale = `globals.params.${label}`;
+    return te(globalLocale) ? t(globalLocale) : t(`params.${label}`);
+}
 </script>
 
 <template>
@@ -248,7 +253,12 @@ function sanitizer(params) {
                         :removable="!unremovableParams?.includes(chip.label)"
                         @remove="remove(chip.label)"
                     >
-                        <slot name="tags" :tag="chip" :format-fn="formatValue">
+                        <slot
+                            name="tags"
+                            :tag="chip"
+                            :format-fn="formatValue"
+                            :locale-fn="getLocale"
+                        >
                             <div class="q-gutter-x-xs">
                                 <strong>{{ chip.label }}:</strong>
                                 <span>"{{ formatValue(chip.value) }}"</span>
@@ -262,6 +272,7 @@ function sanitizer(params) {
                         :tags="customTags"
                         :format-fn="formatValue"
                         :search-fn="search"
+                        :locale-fn="getLocale"
                     />
                 </div>
             </QItem>
diff --git a/src/pages/Monitor/Ticket/MonitorTicketFilter.vue b/src/pages/Monitor/Ticket/MonitorTicketFilter.vue
index 3c95f5cdd..01e9d65ec 100644
--- a/src/pages/Monitor/Ticket/MonitorTicketFilter.vue
+++ b/src/pages/Monitor/Ticket/MonitorTicketFilter.vue
@@ -11,7 +11,7 @@ import FetchData from 'src/components/FetchData.vue';
 import { dateRange } from 'src/filters';
 
 defineProps({ dataKey: { type: String, required: true } });
-const { t } = useI18n();
+const { t, te } = useI18n();
 const warehouses = ref();
 const groupedStates = ref();
 
@@ -26,6 +26,11 @@ const handleScopeDays = (params, days, callback) => {
     }
     if (callback) callback();
 };
+
+const getLocale = (label) => {
+    const globalLocale = `globals.params.${label}`;
+    return te(globalLocale) ? t(globalLocale) : t(`params.${label}`);
+};
 </script>
 <template>
     <FetchData url="Warehouses" auto-load @on-fetch="(data) => (warehouses = data)" />
@@ -46,7 +51,7 @@ const handleScopeDays = (params, days, callback) => {
     >
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">
-                <strong v-text="`${t(`params.${tag.label}`)}:`" />
+                <strong v-text="`${getLocale(tag.label)}:`" />
                 <span v-text="formatFn(tag.value)" />
             </div>
         </template>
@@ -110,7 +115,7 @@ const handleScopeDays = (params, days, callback) => {
                         url="Workers/search"
                         :params="{ departmentCodes: ['VT'] }"
                         is-outlined
-                        option-value="code"
+                        option-value="id"
                         option-label="name"
                         :no-one="true"
                     >

From 3f03f0d4e91e6cf40b51ccd264a206937a634782 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 17 Sep 2024 12:41:57 +0200
Subject: [PATCH 096/281] fix: refs #7353 show unremovable params

---
 src/pages/Monitor/Ticket/MonitorTicketFilter.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/Monitor/Ticket/MonitorTicketFilter.vue b/src/pages/Monitor/Ticket/MonitorTicketFilter.vue
index 01e9d65ec..2d48bd44e 100644
--- a/src/pages/Monitor/Ticket/MonitorTicketFilter.vue
+++ b/src/pages/Monitor/Ticket/MonitorTicketFilter.vue
@@ -48,6 +48,7 @@ const getLocale = (label) => {
         :hidden-tags="['from', 'to', 'search']"
         :custom-tags="['scopeDays']"
         :unremovable-params="['from', 'to', 'scopeDays']"
+        search-url="saleMonitorTickets"
     >
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">

From 2cb2ce16efacf8919e000026995a446b03b12820 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 17 Sep 2024 12:56:50 +0200
Subject: [PATCH 097/281] fix: refs #7353 locale

---
 src/pages/Monitor/Ticket/MonitorTicketFilter.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/pages/Monitor/Ticket/MonitorTicketFilter.vue b/src/pages/Monitor/Ticket/MonitorTicketFilter.vue
index 2d48bd44e..57248d580 100644
--- a/src/pages/Monitor/Ticket/MonitorTicketFilter.vue
+++ b/src/pages/Monitor/Ticket/MonitorTicketFilter.vue
@@ -28,8 +28,9 @@ const handleScopeDays = (params, days, callback) => {
 };
 
 const getLocale = (label) => {
-    const globalLocale = `globals.params.${label}`;
-    return te(globalLocale) ? t(globalLocale) : t(`params.${label}`);
+    const param = label.split('.').at(-1);
+    const globalLocale = `globals.params.${param}`;
+    return te(globalLocale) ? t(globalLocale) : t(`params.${param}`);
 };
 </script>
 <template>

From ed4a4e1e59ab55b6698c7d50ab85e8036bd0f2bf Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 17 Sep 2024 12:57:43 +0200
Subject: [PATCH 098/281] fix: refs #7353 rollback

---
 src/components/ui/VnFilterPanel.vue | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue
index 12525c7cc..03b01b0ab 100644
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@@ -200,11 +200,6 @@ function sanitizer(params) {
     }
     return params;
 }
-
-function getLocale(label) {
-    const globalLocale = `globals.params.${label}`;
-    return te(globalLocale) ? t(globalLocale) : t(`params.${label}`);
-}
 </script>
 
 <template>
@@ -253,12 +248,7 @@ function getLocale(label) {
                         :removable="!unremovableParams?.includes(chip.label)"
                         @remove="remove(chip.label)"
                     >
-                        <slot
-                            name="tags"
-                            :tag="chip"
-                            :format-fn="formatValue"
-                            :locale-fn="getLocale"
-                        >
+                        <slot name="tags" :tag="chip" :format-fn="formatValue">
                             <div class="q-gutter-x-xs">
                                 <strong>{{ chip.label }}:</strong>
                                 <span>"{{ formatValue(chip.value) }}"</span>
@@ -272,7 +262,6 @@ function getLocale(label) {
                         :tags="customTags"
                         :format-fn="formatValue"
                         :search-fn="search"
-                        :locale-fn="getLocale"
                     />
                 </div>
             </QItem>

From eb6f12ae3b28229372d16a87a4f46b7155da0ca5 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 17 Sep 2024 12:58:06 +0200
Subject: [PATCH 099/281] fix: refs #7353 rollback

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

diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue
index 03b01b0ab..cebdc4bbf 100644
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@@ -6,7 +6,7 @@ import { useRoute } from 'vue-router';
 import toDate from 'filters/toDate';
 import VnFilterPanelChip from 'components/ui/VnFilterPanelChip.vue';
 
-const { t, te } = useI18n();
+const { t } = useI18n();
 const $props = defineProps({
     modelValue: {
         type: Object,

From e559ab43d7bbbfb19ad5917255ed271290052cac Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Tue, 17 Sep 2024 13:40:27 +0200
Subject: [PATCH 100/281] fix: refs #7404 remove some style

---
 src/components/VnTable/VnTable.vue         | 2 +-
 src/pages/Entry/EntryStockBought.vue       | 4 ++--
 src/pages/Entry/EntryStockBoughtDetail.vue | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index b7321fe16..648b1fb3b 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -430,7 +430,7 @@ function handleOnDataSaved(_) {
                     />
                 </template>
                 <template #header-cell="{ col }">
-                    <QTh table-header-style="max-width:50%" v-if="col.visible ?? true">
+                    <QTh v-if="col.visible ?? true">
                         <div
                             class="column self-start q-ml-xs ellipsis"
                             :class="`text-${col?.align ?? 'left'}`"
diff --git a/src/pages/Entry/EntryStockBought.vue b/src/pages/Entry/EntryStockBought.vue
index c8f147b1f..5b4d43e06 100644
--- a/src/pages/Entry/EntryStockBought.vue
+++ b/src/pages/Entry/EntryStockBought.vue
@@ -219,8 +219,8 @@ function openDialog() {
                 <span class="link" @click.stop>
                     {{ row?.worker?.user?.name }}
                     <WorkerDescriptorProxy :id="row?.workerFk" />
-                </span> </template
-            >0
+                </span>
+            </template>
         </VnTable>
     </QPage>
 </template>
diff --git a/src/pages/Entry/EntryStockBoughtDetail.vue b/src/pages/Entry/EntryStockBoughtDetail.vue
index 6d9227ad2..744b9d3fe 100644
--- a/src/pages/Entry/EntryStockBoughtDetail.vue
+++ b/src/pages/Entry/EntryStockBoughtDetail.vue
@@ -63,7 +63,7 @@ const columns = [
 ];
 </script>
 <template>
-    <QDialog position="bottom" :maximized="true">
+    <QDialog :maximized="true">
         <div class="container">
             <VnTable
                 ref="tableRef"

From c7bef79c0a211a81d736965dae3a14634a382077 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 17 Sep 2024 13:48:17 +0200
Subject: [PATCH 101/281] perf: improve

---
 src/pages/Customer/Card/CustomerBasicData.vue | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerBasicData.vue b/src/pages/Customer/Card/CustomerBasicData.vue
index cdd9e68b2..3682ecd73 100644
--- a/src/pages/Customer/Card/CustomerBasicData.vue
+++ b/src/pages/Customer/Card/CustomerBasicData.vue
@@ -17,9 +17,7 @@ const businessTypes = ref([]);
 const contactChannels = ref([]);
 const title = ref();
 const handleSalesModelValue = (val) => {
-    if (salesPersonFilter.value.and.length == 0) salesPersonFilter.value.and.push = [];
-
-    salesPersonFilter.value.and[1] = {
+    filter.value.and[1] = {
         or: [
             { name: val },
             { nickname: { like: '%' + val + '%' } },
@@ -28,7 +26,7 @@ const handleSalesModelValue = (val) => {
     };
 };
 
-const salesPersonFilter = ref({
+const filter = ref({
     and: [{ active: { neq: false } }],
 });
 </script>
@@ -111,7 +109,7 @@ const salesPersonFilter = ref({
                     :params="{
                         departmentCodes: ['VT', 'shopping'],
                     }"
-                    :where="salesPersonFilter"
+                    :where="filter"
                     :fields="['id', 'nickname']"
                     sort-by="nickname ASC"
                     :rules="validate('client.salesPersonFk')"

From 4f662375cd34e6e08bfe376b409a6d636611f65b Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Tue, 17 Sep 2024 15:04:58 +0200
Subject: [PATCH 102/281] fix(VnTable): sanitizer value is defined

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

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 648b1fb3b..55028080c 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -200,7 +200,7 @@ function setUserParams(watchedParams, watchedOrder) {
 
 function sanitizer(params) {
     for (const [key, value] of Object.entries(params)) {
-        if (typeof value == 'object') {
+        if (value && typeof value == 'object') {
             const param = Object.values(value)[0];
             if (typeof param == 'string') params[key] = param.replaceAll('%', '');
         }

From 41c43fde76c35cf4766b4900e73418f9e5ff6fcc Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 17 Sep 2024 16:08:48 +0200
Subject: [PATCH 103/281] feat: refs #7323 hide log section

---
 src/router/modules/worker.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/router/modules/worker.js b/src/router/modules/worker.js
index b2716474b..7258881be 100644
--- a/src/router/modules/worker.js
+++ b/src/router/modules/worker.js
@@ -168,6 +168,7 @@ export default {
                     meta: {
                         title: 'log',
                         icon: 'vn:History',
+                        acls: [{ model: 'WorkerLog', props: 'find', accessType: 'READ' }],
                     },
                     component: () => import('src/pages/Worker/Card/WorkerLog.vue'),
                 },

From 566d657f70d45934a4aa8b3368379d2c985ac6de Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Wed, 18 Sep 2024 08:23:15 +0200
Subject: [PATCH 104/281] feat: refs #7884 added default params and chip
 translations

---
 src/components/ui/VnFilterPanel.vue | 7 ++++++-
 src/pages/Entry/MyEntries.vue       | 6 ++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue
index 637180c22..4f71fdea9 100644
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@@ -252,7 +252,7 @@ function sanitizer(params) {
                     >
                         <slot name="tags" :tag="chip" :format-fn="formatValue">
                             <div class="q-gutter-x-xs">
-                                <strong>{{ chip.label }}:</strong>
+                                <strong>{{ t(`${chip.label}`) }}:</strong>
                                 <span>"{{ formatValue(chip.value) }}"</span>
                             </div>
                         </slot>
@@ -286,6 +286,9 @@ function sanitizer(params) {
 </style>
 
 <i18n>
+en:
+    daysOnward: Days onward
+    daysAgo: Days ago
 es:
     No filters applied: No se han aplicado filtros
     Applied filters: Filtros aplicados
@@ -294,4 +297,6 @@ es:
     Search: Buscar
     Yes: Si
     No: No
+    daysOnward: Días Adelante
+    daysAgo: Días Atrás
 </i18n>
diff --git a/src/pages/Entry/MyEntries.vue b/src/pages/Entry/MyEntries.vue
index 17b1f91c5..b95c73847 100644
--- a/src/pages/Entry/MyEntries.vue
+++ b/src/pages/Entry/MyEntries.vue
@@ -9,6 +9,11 @@ import VnTable from 'components/VnTable/VnTable.vue';
 
 const { t } = useI18n();
 const quasar = useQuasar();
+const params = {
+    daysOnward: 7,
+    daysAgo: 3,
+};
+
 const columns = computed(() => [
     {
         align: 'left',
@@ -120,6 +125,7 @@ const printBuys = (rowId) => {
         data-key="myEntriesList"
         url="Entries/filter"
         :columns="columns"
+        :user-params="params"
         default-mode="card"
         order="shipped DESC"
         auto-load

From aa6dac39449cc1db11c8130edc488717fc8a487a Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 18 Sep 2024 07:28:10 +0000
Subject: [PATCH 105/281] fix: SupplierFiscalData VnLocation

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

diff --git a/src/pages/Supplier/Card/SupplierFiscalData.vue b/src/pages/Supplier/Card/SupplierFiscalData.vue
index 60cd6770b..553fc0f94 100644
--- a/src/pages/Supplier/Card/SupplierFiscalData.vue
+++ b/src/pages/Supplier/Card/SupplierFiscalData.vue
@@ -19,8 +19,8 @@ const sageTransactionTypesOptions = ref([]);
 const supplierActivitiesOptions = ref([]);
 
 function handleLocation(data, location) {
-    const { town, label, provinceFk, countryFk } = location ?? {};
-    data.postCode = label;
+    const { town, code, provinceFk, countryFk } = location ?? {};
+    data.postCode = code;
     data.city = town;
     data.provinceFk = provinceFk;
     data.countryFk = countryFk;

From 21a7fafba5c63a3238b248a5b1b6832ba32b5bb3 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Wed, 18 Sep 2024 09:57:21 +0200
Subject: [PATCH 106/281] feat: create VnSelectEnum and add in AccountBasicData
 and ClaimBasicData

---
 src/components/common/VnSelectEnum.vue        | 52 ++++++++++++++
 src/pages/Account/Card/AccountBasicData.vue   |  9 ++-
 src/pages/Claim/Card/ClaimBasicData.vue       | 72 ++++---------------
 .../integration/outLogin/twoFactor.spec.js    |  2 +-
 4 files changed, 71 insertions(+), 64 deletions(-)
 create mode 100644 src/components/common/VnSelectEnum.vue

diff --git a/src/components/common/VnSelectEnum.vue b/src/components/common/VnSelectEnum.vue
new file mode 100644
index 000000000..b9db67c37
--- /dev/null
+++ b/src/components/common/VnSelectEnum.vue
@@ -0,0 +1,52 @@
+<script setup>
+import { onBeforeMount, ref, useAttrs } from 'vue';
+import axios from 'axios';
+import VnSelect from 'components/common/VnSelect.vue';
+
+const { schema, table, column, translation, defaultOptions } = defineProps({
+    schema: {
+        type: String,
+        default: 'vn',
+    },
+    table: {
+        type: String,
+        required: true,
+    },
+    column: {
+        type: String,
+        required: true,
+    },
+    translation: {
+        type: Function,
+        default: null,
+    },
+    defaultOptions: {
+        type: Array,
+        default: () => [],
+    },
+});
+
+const $attrs = useAttrs();
+const options = ref([]);
+onBeforeMount(async () => {
+    options.value = [].concat(defaultOptions);
+    const { data } = await axios.get(`Applications/get-enum-values`, {
+        params: { schema, table, column },
+    });
+
+    for (const value of data)
+        options.value.push({
+            [$attrs['option-value'] ?? 'id']: value,
+            [$attrs['option-label'] ?? 'name']: translation ? translation(value) : value,
+        });
+});
+</script>
+
+<template>
+    <VnSelect
+        v-bind="$attrs"
+        :options="options"
+        :key="options.length"
+        :input-debounce="0"
+    />
+</template>
diff --git a/src/pages/Account/Card/AccountBasicData.vue b/src/pages/Account/Card/AccountBasicData.vue
index b223c4bc0..f1cdaf9df 100644
--- a/src/pages/Account/Card/AccountBasicData.vue
+++ b/src/pages/Account/Card/AccountBasicData.vue
@@ -2,6 +2,7 @@
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import VnSelect from 'src/components/common/VnSelect.vue';
+import VnSelectEnum from 'src/components/common/VnSelectEnum.vue';
 import FormModel from 'components/FormModel.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import { ref, watch } from 'vue';
@@ -43,9 +44,11 @@ watch(
                     option-value="code"
                     option-label="code"
                 />
-                <VnSelect
-                    url="TwoFactorTypes"
-                    v-model="data.twoFactorFk"
+                <VnSelectEnum
+                    schema="account"
+                    table="user"
+                    column="twoFactor"
+                    v-model="data.twoFactor"
                     :label="t('account.card.twoFactor')"
                     option-value="code"
                     option-label="code"
diff --git a/src/pages/Claim/Card/ClaimBasicData.vue b/src/pages/Claim/Card/ClaimBasicData.vue
index b1d3e24cd..63b0b7c0d 100644
--- a/src/pages/Claim/Card/ClaimBasicData.vue
+++ b/src/pages/Claim/Card/ClaimBasicData.vue
@@ -3,58 +3,18 @@ import { ref } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import VnSelect from 'src/components/common/VnSelect.vue';
+import VnSelectEnum from 'src/components/common/VnSelectEnum.vue';
 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 VnInputDate from 'components/common/VnInputDate.vue';
 
-import axios from 'axios';
 import VnAvatar from 'src/components/ui/VnAvatar.vue';
 
 const route = useRoute();
 const { t } = useI18n();
-
-const claimStates = ref([]);
-const claimStatesCopy = ref([]);
-const optionsList = ref([]);
-
 const workersOptions = ref([]);
-
-function setClaimStates(data) {
-    claimStates.value = data;
-    claimStatesCopy.value = data;
-}
-
-async function getEnumValues() {
-    optionsList.value = [{ id: null, description: t('claim.null') }];
-    const { data } = await axios.get(`Applications/get-enum-values`, {
-        params: {
-            schema: 'vn',
-            table: 'claim',
-            column: 'pickup',
-        },
-    });
-    for (let value of data)
-        optionsList.value.push({ id: value, description: t(`claim.${value}`) });
-}
-
-getEnumValues();
-
-const statesFilter = {
-    options: claimStates,
-    filterFn: (options, value) => {
-        const search = value.toLowerCase();
-
-        if (value === '') return claimStatesCopy.value;
-
-        return options.value.filter((row) => {
-            const description = row.description.toLowerCase();
-
-            return description.indexOf(search) > -1;
-        });
-    },
-};
 </script>
 <template>
     <FetchData
@@ -70,7 +30,7 @@ const statesFilter = {
         auto-load
         :reload="true"
     >
-        <template #form="{ data, validate, filter }">
+        <template #form="{ data, validate }">
             <VnRow>
                 <VnInput
                     v-model="data.client.name"
@@ -101,20 +61,14 @@ const statesFilter = {
                         />
                     </template>
                 </VnSelect>
-                <QSelect
+                <VnSelect
                     v-model="data.claimStateFk"
-                    :options="claimStates"
-                    option-value="id"
-                    option-label="description"
-                    emit-value
+                    url="ClaimStates"
                     :label="t('claim.state')"
-                    map-options
-                    use-input
-                    @filter="(value, update) => filter(value, update, statesFilter)"
+                    option-label="description"
                     :rules="validate('claim.claimStateFk')"
                     :input-debounce="0"
-                >
-                </QSelect>
+                />
             </VnRow>
             <VnRow>
                 <QInput
@@ -123,16 +77,14 @@ const statesFilter = {
                     :rules="validate('claim.packages')"
                     type="number"
                 />
-                <QSelect
+                <VnSelectEnum
                     v-model="data.pickup"
-                    :options="optionsList"
-                    option-value="id"
-                    option-label="description"
-                    emit-value
                     :label="t('claim.pickup')"
-                    map-options
-                    use-input
-                    :input-debounce="0"
+                    table="claim"
+                    column="pickup"
+                    option-label="description"
+                    :translation="(value) => t(`claim.${value}`)"
+                    :default-options="[{ id: null, description: t('claim.null') }]"
                 />
             </VnRow>
         </template>
diff --git a/test/cypress/integration/outLogin/twoFactor.spec.js b/test/cypress/integration/outLogin/twoFactor.spec.js
index 259ddfc0f..4d8561f0f 100755
--- a/test/cypress/integration/outLogin/twoFactor.spec.js
+++ b/test/cypress/integration/outLogin/twoFactor.spec.js
@@ -12,7 +12,7 @@ describe('Two Factor', () => {
         cy.request(
             'PATCH',
             `http://localhost:3000/api/VnUsers/${userId}/update-user?access_token=DEFAULT_TOKEN`,
-            { twoFactorFk: 'email' }
+            { twoFactor: 'email' }
         );
     });
 

From 34f70d026e25b0e2632d58239ef8ce5924543465 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Wed, 18 Sep 2024 11:50:00 +0200
Subject: [PATCH 107/281] feat: refs #7553 added new field in list and
 translations

---
 src/pages/Ticket/TicketList.vue | 13 +++++++++++++
 src/pages/Ticket/locale/en.yml  |  3 ++-
 src/pages/Ticket/locale/es.yml  |  3 ++-
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index be348b8e1..53c920179 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -122,6 +122,13 @@ const columns = computed(() => [
         align: 'left',
         name: 'nickname',
         label: t('ticketList.nickname'),
+        columnClass: 'expand',
+    },
+    {
+        align: 'left',
+        name: 'addressNickname',
+        label: t('ticketList.addressNickname'),
+        columnClass: 'expand',
     },
     {
         align: 'left',
@@ -543,6 +550,12 @@ function setReference(data) {
                 <CustomerDescriptorProxy :id="row.clientFk" />
             </span>
         </template>
+        <template #column-addressNickname="{ row }">
+            <span class="link" @click.stop>
+                {{ row.addressNickname }}
+                <CustomerDescriptorProxy :id="row.clientFk" />
+            </span>
+        </template>
         <template #column-stateFk="{ row }">
             <span v-if="getColor(row)">
                 <QChip :class="getColor(row)" dense square>
diff --git a/src/pages/Ticket/locale/en.yml b/src/pages/Ticket/locale/en.yml
index 7629633c8..34eee17e1 100644
--- a/src/pages/Ticket/locale/en.yml
+++ b/src/pages/Ticket/locale/en.yml
@@ -238,7 +238,7 @@ package:
     removePackage: Remove package
 ticketList:
     id: Id
-    nickname: Nickname
+    nickname: Ticket nickname
     state: State
     shipped: Shipped
     zone: Zone
@@ -269,3 +269,4 @@ ticketList:
     hour: Hour
     closure: Closure
     toLines: Go to lines
+    addressNickname: Address nickname
diff --git a/src/pages/Ticket/locale/es.yml b/src/pages/Ticket/locale/es.yml
index d9bb88a6b..e66a3514b 100644
--- a/src/pages/Ticket/locale/es.yml
+++ b/src/pages/Ticket/locale/es.yml
@@ -241,7 +241,7 @@ You can search by ticket id or alias: Puedes buscar por id o alias del ticket
 Select lines to see the options: Selecciona líneas para ver las opciones
 ticketList:
     id: Id
-    nickname: Alias
+    nickname: Alias ticket
     state: Estado
     shipped: F. Envío
     zone: Zona
@@ -272,3 +272,4 @@ ticketList:
     hour: Hora
     closure: Cierre
     toLines: Ir a lineas
+    addressNickname: Alias consignatario

From 3906fc386f6b99528a9973299b22b0a7c974147d Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Wed, 18 Sep 2024 12:49:45 +0200
Subject: [PATCH 108/281] hotFix: supplierDescriptor not use same data-key

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

diff --git a/src/pages/Supplier/Card/SupplierDescriptor.vue b/src/pages/Supplier/Card/SupplierDescriptor.vue
index 6e60a336c..5754031b3 100644
--- a/src/pages/Supplier/Card/SupplierDescriptor.vue
+++ b/src/pages/Supplier/Card/SupplierDescriptor.vue
@@ -109,7 +109,7 @@ const getEntryQueryParams = (supplier) => {
         :subtitle="data.subtitle"
         :filter="filter"
         @on-fetch="setData"
-        data-key="supplier"
+        data-key="supplierDescriptor"
         :summary="$props.summary"
     >
         <template #body="{ entity }">

From f86525e31dcf0bc79a5b04dc01ab8456efae34ef Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Wed, 18 Sep 2024 13:24:21 +0200
Subject: [PATCH 109/281] fix: not null variable

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

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 6f678d5c1..5b39265fb 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -192,7 +192,7 @@ function setUserParams(watchedParams, watchedOrder) {
 
 function sanitizer(params) {
     for (const [key, value] of Object.entries(params)) {
-        if (typeof value == 'object') {
+        if (value && typeof value == 'object') {
             const param = Object.values(value)[0];
             if (typeof param == 'string') params[key] = param.replaceAll('%', '');
         }

From 37329a73914ef10f355c9fe7698e9dd58a9a063a Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 18 Sep 2024 13:30:51 +0200
Subject: [PATCH 110/281] feat: add shortcut add event in some subSections

---
 src/pages/Customer/Card/CustomerContacts.vue        |  9 +++++----
 .../Customer/components/CustomerAddressEdit.vue     |  9 +++++----
 src/pages/Item/Card/ItemTags.vue                    |  9 +++++----
 src/pages/Route/Roadmap/RoadmapStops.vue            |  9 +++++----
 src/pages/Supplier/Card/SupplierAccounts.vue        | 13 ++++++-------
 src/pages/Supplier/Card/SupplierContacts.vue        |  9 +++++----
 src/pages/Worker/WorkerDepartmentTree.vue           |  9 +++++----
 7 files changed, 36 insertions(+), 31 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerContacts.vue b/src/pages/Customer/Card/CustomerContacts.vue
index cd4d553df..c420f650e 100644
--- a/src/pages/Customer/Card/CustomerContacts.vue
+++ b/src/pages/Customer/Card/CustomerContacts.vue
@@ -56,17 +56,18 @@ const customerContactsRef = ref(null);
                             </div>
                         </VnRow>
                         <VnRow>
-                            <QIcon
+                            <QBtn
                                 @click="customerContactsRef.insert()"
                                 class="cursor-pointer"
                                 color="primary"
-                                name="add"
-                                size="sm"
+                                flat
+                                icon="add"
+                                shortcut="+"
                             >
                                 <QTooltip>
                                     {{ t('Add contact') }}
                                 </QTooltip>
-                            </QIcon>
+                            </QBtn>
                         </VnRow>
                     </QCard>
                 </template>
diff --git a/src/pages/Customer/components/CustomerAddressEdit.vue b/src/pages/Customer/components/CustomerAddressEdit.vue
index 2252a96dc..82a190ae1 100644
--- a/src/pages/Customer/components/CustomerAddressEdit.vue
+++ b/src/pages/Customer/components/CustomerAddressEdit.vue
@@ -272,16 +272,17 @@ function handleLocation(data, location) {
                 </div>
             </VnRow>
 
-            <QIcon
+            <QBtn
                 @click.stop="addNote()"
                 class="cursor-pointer add-icon q-mt-md"
-                name="add"
-                size="sm"
+                flat
+                icon="add"
+                shortcut="+"
             >
                 <QTooltip>
                     {{ t('Add note') }}
                 </QTooltip>
-            </QIcon>
+            </QBtn>
         </template>
     </FormModel>
 </template>
diff --git a/src/pages/Item/Card/ItemTags.vue b/src/pages/Item/Card/ItemTags.vue
index 39723ae65..1b5eb28f0 100644
--- a/src/pages/Item/Card/ItemTags.vue
+++ b/src/pages/Item/Card/ItemTags.vue
@@ -168,19 +168,20 @@ const insertTag = (rows) => {
                             </div>
                         </VnRow>
                         <VnRow class="justify-center items-center">
-                            <QIcon
+                            <QBtn
                                 @click="insertTag(rows)"
                                 class="cursor-pointer"
                                 :disable="!validRow"
                                 color="primary"
-                                name="add"
-                                size="sm"
+                                flat
+                                icon="add"
+                                shortcut="+"
                                 style="flex: 0"
                             >
                                 <QTooltip>
                                     {{ t('itemTags.addTag') }}
                                 </QTooltip>
-                            </QIcon>
+                            </QBtn>
                         </VnRow>
                     </QCard>
                 </template>
diff --git a/src/pages/Route/Roadmap/RoadmapStops.vue b/src/pages/Route/Roadmap/RoadmapStops.vue
index 8ff044d2d..d8215ea49 100644
--- a/src/pages/Route/Roadmap/RoadmapStops.vue
+++ b/src/pages/Route/Roadmap/RoadmapStops.vue
@@ -65,9 +65,10 @@ const updateDefaultStop = (data) => {
                         </div>
                     </QCardSection>
                     <QCardSection>
-                        <QIcon
-                            name="add"
-                            size="sm"
+                        <QBtn
+                            flat
+                            icon="add"
+                            shortcut="+"
                             class="cursor-pointer"
                             color="primary"
                             @click="roadmapStopsCrudRef.insert()"
@@ -75,7 +76,7 @@ const updateDefaultStop = (data) => {
                             <QTooltip>
                                 {{ t('Add stop') }}
                             </QTooltip>
-                        </QIcon>
+                        </QBtn>
                     </QCardSection>
                 </QCard>
             </template>
diff --git a/src/pages/Supplier/Card/SupplierAccounts.vue b/src/pages/Supplier/Card/SupplierAccounts.vue
index b0e8b06e8..f8fbba0e4 100644
--- a/src/pages/Supplier/Card/SupplierAccounts.vue
+++ b/src/pages/Supplier/Card/SupplierAccounts.vue
@@ -102,9 +102,7 @@ const setWireTransfer = async () => {
                     <VnInput :label="t('supplier.accounts.iban')" v-model="row.iban">
                         <template #append>
                             <QIcon name="info" class="cursor-info">
-                                <QTooltip>{{
-                                    t('components.iban_tooltip')
-                                }}</QTooltip>
+                                <QTooltip>{{ t('components.iban_tooltip') }}</QTooltip>
                             </QIcon>
                         </template>
                     </VnInput>
@@ -165,9 +163,10 @@ const setWireTransfer = async () => {
                     </div>
                 </VnRow>
                 <VnRow>
-                    <QIcon
-                        name="add"
-                        size="sm"
+                    <QBtn
+                        flat
+                        icon="add"
+                        shortcut="+"
                         class="cursor-pointer"
                         color="primary"
                         @click="supplierAccountRef.insert()"
@@ -175,7 +174,7 @@ const setWireTransfer = async () => {
                         <QTooltip>
                             {{ t('Add account') }}
                         </QTooltip>
-                    </QIcon>
+                    </QBtn>
                 </VnRow>
             </QCard>
         </template>
diff --git a/src/pages/Supplier/Card/SupplierContacts.vue b/src/pages/Supplier/Card/SupplierContacts.vue
index 35e8b98fc..3f2063784 100644
--- a/src/pages/Supplier/Card/SupplierContacts.vue
+++ b/src/pages/Supplier/Card/SupplierContacts.vue
@@ -84,9 +84,10 @@ const insertRow = () => {
                     </VnRow>
                 </QCardSection>
                 <VnRow>
-                    <QIcon
-                        name="add"
-                        size="sm"
+                    <QBtn
+                        flat
+                        icon="add"
+                        shortcut="+"
                         class="cursor-pointer"
                         color="primary"
                         @click="insertRow()"
@@ -94,7 +95,7 @@ const insertRow = () => {
                         <QTooltip>
                             {{ t('Add contact') }}
                         </QTooltip>
-                    </QIcon>
+                    </QBtn>
                 </VnRow>
             </QCard>
         </template>
diff --git a/src/pages/Worker/WorkerDepartmentTree.vue b/src/pages/Worker/WorkerDepartmentTree.vue
index 392539c86..c73cb59b9 100644
--- a/src/pages/Worker/WorkerDepartmentTree.vue
+++ b/src/pages/Worker/WorkerDepartmentTree.vue
@@ -180,17 +180,18 @@ function handleEvent(type, event, node) {
                                 {{ t('Remove') }}
                             </QTooltip>
                         </QIcon>
-                        <QIcon
-                            name="add"
+                        <QBtn
                             color="primary"
-                            size="sm"
+                            flat
+                            icon="add"
+                            shortcut="+"
                             class="cursor-pointer"
                             @click.stop="showCreateNodeForm(node.id)"
                         >
                             <QTooltip>
                                 {{ t('Create') }}
                             </QTooltip>
-                        </QIcon>
+                        </QBtn>
                     </div>
                 </div>
             </template>

From 9db12a8deee76b83076b09cff24965f611753383 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Wed, 18 Sep 2024 13:46:37 +0200
Subject: [PATCH 111/281] fix: wagon reload

---
 src/pages/Wagon/Type/WagonTypeList.vue | 2 +-
 src/pages/Wagon/WagonList.vue          | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/pages/Wagon/Type/WagonTypeList.vue b/src/pages/Wagon/Type/WagonTypeList.vue
index 2f0d55fbe..c0943c58e 100644
--- a/src/pages/Wagon/Type/WagonTypeList.vue
+++ b/src/pages/Wagon/Type/WagonTypeList.vue
@@ -103,7 +103,7 @@ async function remove(row) {
                         url-create="WagonTypes"
                         model="WagonType"
                         :form-initial-data="initialData"
-                        @on-data-saved="window.location.reload()"
+                        @on-data-saved="tableRef.reload()"
                         auto-load
                     >
                         <template #form-inputs="{ data }">
diff --git a/src/pages/Wagon/WagonList.vue b/src/pages/Wagon/WagonList.vue
index 129e803f5..89f9d285a 100644
--- a/src/pages/Wagon/WagonList.vue
+++ b/src/pages/Wagon/WagonList.vue
@@ -5,7 +5,7 @@ import { useArrayData } from 'src/composables/useArrayData';
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
 import VnTable from 'src/components/VnTable/VnTable.vue';
-import { computed } from 'vue';
+import { computed, ref } from 'vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 
@@ -14,7 +14,7 @@ const arrayData = useArrayData('WagonList');
 const store = arrayData.store;
 const router = useRouter();
 const { t } = useI18n();
-
+const tableRef = ref();
 const filter = {
     include: {
         relation: 'type',
@@ -108,7 +108,7 @@ async function remove(row) {
                 urlCreate: 'Wagons',
                 title: t('Create new wagon'),
                 onDataSaved: () => {
-                    window.location.reload();
+                    tableRef.reload();
                 },
                 formInitialData: {},
             }"

From d76250f56f8d3ab70dff47ac9c2b1ff5b05e1e98 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 18 Sep 2024 12:27:48 +0000
Subject: [PATCH 112/281] fix: reset VnTable scroll properties

---
 src/components/VnTable/VnTable.vue | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 689be76ee..9b4341da1 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -69,10 +69,7 @@ const $props = defineProps({
         type: Boolean,
         default: false,
     },
-    disableInfiniteScroll: {
-        type: Boolean,
-        default: false,
-    },
+    
     hasSubToolbar: {
         type: Boolean,
         default: null,
@@ -368,9 +365,7 @@ function handleOnDataSaved(_) {
         ref="CrudModelRef"
         @on-fetch="(...args) => emit('onFetch', ...args)"
         :search-url="searchUrl"
-        :disable-infinite-scroll="
-            $attrs['disableInfiniteScroll'] ? isTableMode : !disableInfiniteScroll
-        "
+        :disable-infinite-scroll="isTableMode"
         @save-changes="reload"
         :has-sub-toolbar="$props.hasSubToolbar ?? isEditable"
         :auto-load="hasParams || $attrs['auto-load']"
@@ -390,7 +385,7 @@ function handleOnDataSaved(_) {
                 card-container-class="grid-three"
                 flat
                 :style="isTableMode && `max-height: ${tableHeight}`"
-                virtual-scroll
+                :virtual-scroll="isTableMode"
                 @virtual-scroll="
                     (event) =>
                         event.index > rows.length - 2 &&

From 5ca38ca825651c4d7ce98bab7082f1d43d34739a Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Wed, 18 Sep 2024 14:48:15 +0200
Subject: [PATCH 113/281] feat: global handler

---
 src/boot/quasar.js     | 6 ++++++
 src/i18n/locale/en.yml | 1 +
 src/i18n/locale/es.yml | 1 +
 3 files changed, 8 insertions(+)

diff --git a/src/boot/quasar.js b/src/boot/quasar.js
index e2035c880..5db6edd24 100644
--- a/src/boot/quasar.js
+++ b/src/boot/quasar.js
@@ -2,9 +2,15 @@ import { boot } from 'quasar/wrappers';
 import qFormMixin from './qformMixin';
 import mainShortcutMixin from './mainShortcutMixin';
 import keyShortcut from './keyShortcut';
+import useNotify from 'src/composables/useNotify.js';
+const { notify } = useNotify();
 
 export default boot(({ app }) => {
     app.mixin(qFormMixin);
     app.mixin(mainShortcutMixin);
     app.directive('shortcut', keyShortcut);
+    app.config.errorHandler = function (err) {
+        console.error(err);
+        notify('globals.error', 'negative', 'error');
+    };
 });
diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index e27dc7bd4..2e2365f7b 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -103,6 +103,7 @@ globals:
     ticket: Ticket
     campaign: Campaign
     weight: Weight
+    error: Ups! Something went wrong
     pageTitles:
         logIn: Login
         addressEdit: Update address
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index ed34c8761..53b487e9f 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -105,6 +105,7 @@ globals:
     ticket: Ticket
     campaign: Campaña
     weight: Peso
+    error: ¡Ups! Algo salió mal
     pageTitles:
         logIn: Inicio de sesión
         addressEdit: Modificar consignatario

From b3f27d9a84970050963f2b7598ae9fc1ad751087 Mon Sep 17 00:00:00 2001
From: jgallego <jgallego@verdnatura.es>
Date: Wed, 18 Sep 2024 17:51:49 +0200
Subject: [PATCH 114/281] feat: translations fixed

---
 src/pages/Route/Roadmap/RoadmapBasicData.vue | 4 ++--
 src/pages/Route/Roadmap/RoadmapFilter.vue    | 8 ++++----
 src/pages/Route/Roadmap/RoadmapSummary.vue   | 4 ++--
 src/pages/Route/RouteRoadmap.vue             | 1 +
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/pages/Route/Roadmap/RoadmapBasicData.vue b/src/pages/Route/Roadmap/RoadmapBasicData.vue
index e1611ed61..eeefaca2c 100644
--- a/src/pages/Route/Roadmap/RoadmapBasicData.vue
+++ b/src/pages/Route/Roadmap/RoadmapBasicData.vue
@@ -103,8 +103,8 @@ es:
     Roadmap: Troncal
     ETD date: Fecha ETD
     ETD hour: Hora ETD
-    Tractor plate: Matrícula tractor
-    Trailer plate: Matrícula trailer
+    Tractor plate: Matrícula tractora
+    Trailer plate: Matrícula remolque
     Carrier: Transportista
     Price: Precio
     Driver name: Nombre del conductor
diff --git a/src/pages/Route/Roadmap/RoadmapFilter.vue b/src/pages/Route/Roadmap/RoadmapFilter.vue
index 04c5c9696..ecf8d39fc 100644
--- a/src/pages/Route/Roadmap/RoadmapFilter.vue
+++ b/src/pages/Route/Roadmap/RoadmapFilter.vue
@@ -164,8 +164,8 @@ en:
         to: To
 es:
     params:
-        tractorPlate: Matrícula del tractor
-        trailerPlate: Matrícula del trailer
+        tractorPlate: Matrícula tractora
+        trailerPlate: Matrícula remolque
         supplierFk: Transportista
         price: Precio
         driverName: Nombre del conductor
@@ -174,8 +174,8 @@ es:
         to: Hasta
     From: Desde
     To: Hasta
-    Tractor Plate: Matrícula del tractor
-    Trailer Plate: Matrícula del trailer
+    Tractor Plate: Matrícula tractora
+    Trailer Plate: Matrícula remolque
     Carrier: Transportista
     Price: Precio
     Driver name: Nombre del conductor
diff --git a/src/pages/Route/Roadmap/RoadmapSummary.vue b/src/pages/Route/Roadmap/RoadmapSummary.vue
index 7f8b7107b..3fb36b4f7 100644
--- a/src/pages/Route/Roadmap/RoadmapSummary.vue
+++ b/src/pages/Route/Roadmap/RoadmapSummary.vue
@@ -149,8 +149,8 @@ const filter = {
 <i18n>
 es:
     Carrier: Transportista
-    Tractor Plate: Matrícula tractor
-    Trailer Plate: Matrícula trailer
+    Tractor Plate: Matrícula tractora
+    Trailer Plate: Matrícula remolque
     Phone: Teléfono
     Worker: Trabajador
     Observations: Observaciones
diff --git a/src/pages/Route/RouteRoadmap.vue b/src/pages/Route/RouteRoadmap.vue
index 306387cbe..d921dab1f 100644
--- a/src/pages/Route/RouteRoadmap.vue
+++ b/src/pages/Route/RouteRoadmap.vue
@@ -237,4 +237,5 @@ es:
     Price: Precio
     Observations: Observaciones
     Preview: Vista previa
+    Select the estimated date of departure (ETD): Selecciona la fecha estimada de salida
 </i18n>

From 1cb2981f97e42d4d678d26800e1a9a28fbefb0ad Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 18 Sep 2024 16:26:56 +0000
Subject: [PATCH 115/281] feat: apply color when today

---
 src/css/app.scss | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/css/app.scss b/src/css/app.scss
index 3c51dc8af..905934d4c 100644
--- a/src/css/app.scss
+++ b/src/css/app.scss
@@ -268,6 +268,7 @@ input::-webkit-inner-spin-button {
         max-width: 400px;
     }
 }
+
 .edit-photo-btn {
     position: absolute;
     right: 12px;
@@ -280,3 +281,10 @@ input::-webkit-inner-spin-button {
     color: var(--vn-label-color);
     text-transform: uppercase;
 }
+
+.q-date {
+    &__today {
+        border: 2px solid $info;
+        color: $info;
+    }
+}

From 08bec59a37cc97ac321924569f03f56d27a2f492 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 19 Sep 2024 00:02:45 +0200
Subject: [PATCH 116/281] add_circle

---
 src/components/ItemsFilterPanel.vue         |  7 +++---
 src/pages/Item/Card/ItemBarcode.vue         |  9 ++++----
 src/pages/Order/Card/OrderCatalogFilter.vue |  6 +++--
 src/pages/Ticket/Card/TicketNotes.vue       |  9 ++++----
 src/pages/Ticket/Card/TicketPackage.vue     | 25 ++++++++++++---------
 src/pages/Worker/Card/WorkerTimeControl.vue |  9 ++++----
 6 files changed, 37 insertions(+), 28 deletions(-)

diff --git a/src/components/ItemsFilterPanel.vue b/src/components/ItemsFilterPanel.vue
index 8449f9354..e89d32da4 100644
--- a/src/components/ItemsFilterPanel.vue
+++ b/src/components/ItemsFilterPanel.vue
@@ -297,11 +297,12 @@ const removeTag = (index, params, search) => {
                 />
             </QItem>
             <QItem class="q-mt-lg">
-                <QIcon
-                    name="add_circle"
+                <QBtn
+                    icon="add_circle"
+                    shortcut="+"
+                    flat
                     class="fill-icon-on-hover q-px-xs"
                     color="primary"
-                    size="sm"
                     @click="tagValues.push({})"
                 />
             </QItem>
diff --git a/src/pages/Item/Card/ItemBarcode.vue b/src/pages/Item/Card/ItemBarcode.vue
index b353d67c7..197e9142f 100644
--- a/src/pages/Item/Card/ItemBarcode.vue
+++ b/src/pages/Item/Card/ItemBarcode.vue
@@ -65,17 +65,18 @@ const focusLastInput = () => {
                                 </QTooltip>
                             </QIcon>
                         </div>
-                        <QIcon
+                        <QBtn
                             @click="insertRow()"
                             class="cursor-pointer fill-icon-on-hover"
                             color="primary"
-                            name="add_circle"
-                            size="sm"
+                            icon="add_circle"
+                            shortcut="+"
+                            flat
                         >
                             <QTooltip>
                                 {{ t('Add barcode') }}
                             </QTooltip>
-                        </QIcon>
+                        </QBtn>
                     </QCard>
                 </template>
             </CrudModel>
diff --git a/src/pages/Order/Card/OrderCatalogFilter.vue b/src/pages/Order/Card/OrderCatalogFilter.vue
index 938cc4fe2..354c44747 100644
--- a/src/pages/Order/Card/OrderCatalogFilter.vue
+++ b/src/pages/Order/Card/OrderCatalogFilter.vue
@@ -374,8 +374,10 @@ function addOrder(value, field, params) {
                 />
             </QItem>
             <QItem class="q-mt-lg">
-                <QIcon
-                    name="add_circle"
+                <QBtn
+                    icon="add_circle"
+                    shortcut="+"
+                    flat
                     class="filter-icon"
                     @click="tagValues.push({})"
                 />
diff --git a/src/pages/Ticket/Card/TicketNotes.vue b/src/pages/Ticket/Card/TicketNotes.vue
index cfc0c2431..1b9d98a8b 100644
--- a/src/pages/Ticket/Card/TicketNotes.vue
+++ b/src/pages/Ticket/Card/TicketNotes.vue
@@ -87,17 +87,18 @@ watch(
                         </QIcon>
                     </div>
                     <VnRow v-if="observationTypes.length > rows.length">
-                        <QIcon
-                            name="add_circle"
+                        <QBtn
+                            icon="add_circle"
+                            shortcut="+"
+                            flat
                             class="fill-icon-on-hover q-ml-md"
-                            size="sm"
                             color="primary"
                             @click="ticketNotesCrudRef.insert()"
                         >
                             <QTooltip>
                                 {{ t('ticketNotes.addNote') }}
                             </QTooltip>
-                        </QIcon>
+                        </QBtn>
                     </VnRow>
                 </QCard>
             </template>
diff --git a/src/pages/Ticket/Card/TicketPackage.vue b/src/pages/Ticket/Card/TicketPackage.vue
index a76fce2b6..c071d4f7f 100644
--- a/src/pages/Ticket/Card/TicketPackage.vue
+++ b/src/pages/Ticket/Card/TicketPackage.vue
@@ -114,17 +114,20 @@ watch(
                             </QTooltip>
                         </QIcon>
                     </div>
-                    <QIcon
-                        name="add_circle"
-                        class="fill-icon-on-hover q-ml-md"
-                        size="sm"
-                        color="primary"
-                        @click="ticketPackagingsCrudRef.insert()"
-                    >
-                        <QTooltip>
-                            {{ t('package.addPackage') }}
-                        </QTooltip>
-                    </QIcon>
+                    <VnRow>
+                        <QBtn
+                            icon="add_circle"
+                            shortcut="+"
+                            flat
+                            class="fill-icon-on-hover q-ml-md"
+                            color="primary"
+                            @click="ticketPackagingsCrudRef.insert()"
+                        >
+                            <QTooltip>
+                                {{ t('package.addPackage') }}
+                            </QTooltip>
+                        </QBtn>
+                    </VnRow>
                 </QCard>
             </template>
         </CrudModel>
diff --git a/src/pages/Worker/Card/WorkerTimeControl.vue b/src/pages/Worker/Card/WorkerTimeControl.vue
index 9ae91f8ce..fbfd4b28d 100644
--- a/src/pages/Worker/Card/WorkerTimeControl.vue
+++ b/src/pages/Worker/Card/WorkerTimeControl.vue
@@ -561,15 +561,16 @@ onMounted(async () => {
                             <span class="q-mb-md text-sm text-body1">
                                 {{ secondsToHoursMinutes(day.dayData?.workedHours) }}
                             </span>
-                            <QIcon
-                                name="add_circle"
+                            <QBtn
+                                icon="add_circle"
+                                shortcut="+"
+                                flat
                                 color="primary"
                                 class="fill-icon cursor-pointer"
-                                size="sm"
                                 @click="showWorkerTimeForm(day.dayData?.dated, 'create')"
                             >
                                 <QTooltip>{{ t('Add time') }}</QTooltip>
-                            </QIcon>
+                            </QBtn>
                         </div>
                     </QTd>
                 </QTr>

From 1550d79160421e7faeb177a9897be7a98a506cb6 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 19 Sep 2024 00:10:28 +0200
Subject: [PATCH 117/281] feat: add shortcut more buttons

---
 src/components/common/VnDmsList.vue                | 9 ++++++++-
 src/pages/Account/Role/Card/SubRoles.vue           | 8 +++++++-
 src/pages/Claim/Card/ClaimLines.vue                | 2 +-
 src/pages/Claim/Card/ClaimPhoto.vue                | 8 +++++++-
 src/pages/Customer/Card/CustomerFileManagement.vue | 1 +
 src/pages/Customer/Card/CustomerSamples.vue        | 8 +++++++-
 src/pages/Entry/Card/EntryNotes.vue                | 8 +++++++-
 src/pages/InvoiceIn/Card/InvoiceInBasicData.vue    | 1 +
 src/pages/InvoiceIn/Card/InvoiceInDueDay.vue       | 2 +-
 src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue    | 1 +
 src/pages/InvoiceIn/Card/InvoiceInVat.vue          | 1 +
 src/pages/Item/ItemRequestFilter.vue               | 1 +
 src/pages/Route/Agency/Card/AgencyWorkcenter.vue   | 2 +-
 src/pages/Route/RouteTickets.vue                   | 2 +-
 src/pages/Ticket/Card/TicketSale.vue               | 3 ++-
 src/pages/Ticket/Card/TicketService.vue            | 8 +++++++-
 src/pages/Travel/ExtraCommunityFilter.vue          | 1 +
 src/pages/Zone/Delivery/ZoneDeliveryList.vue       | 2 +-
 src/pages/Zone/Upcoming/ZoneUpcomingList.vue       | 2 +-
 19 files changed, 57 insertions(+), 13 deletions(-)

diff --git a/src/components/common/VnDmsList.vue b/src/components/common/VnDmsList.vue
index 16e3c641f..52dd6ef79 100644
--- a/src/components/common/VnDmsList.vue
+++ b/src/components/common/VnDmsList.vue
@@ -400,7 +400,14 @@ defineExpose({
         />
     </QDialog>
     <QPageSticky position="bottom-right" :offset="[25, 25]">
-        <QBtn fab color="primary" icon="add" @click="showFormDialog()" class="fill-icon">
+        <QBtn
+            fab
+            color="primary"
+            icon="add"
+            shortcut="+"
+            @click="showFormDialog()"
+            class="fill-icon"
+        >
             <QTooltip>
                 {{ t('Upload file') }}
             </QTooltip>
diff --git a/src/pages/Account/Role/Card/SubRoles.vue b/src/pages/Account/Role/Card/SubRoles.vue
index 7a0088bac..d17f96dd8 100644
--- a/src/pages/Account/Role/Card/SubRoles.vue
+++ b/src/pages/Account/Role/Card/SubRoles.vue
@@ -142,7 +142,13 @@ const redirectToRoleSummary = (id) =>
             <SubRoleCreateForm @on-submit-create-subrole="createSubRole" />
         </QDialog>
         <QPageSticky position="bottom-right" :offset="[18, 18]">
-            <QBtn fab icon="add" color="primary" @click="openCreateSubRoleForm()">
+            <QBtn
+                fab
+                icon="add"
+                shortcut="+"
+                color="primary"
+                @click="openCreateSubRoleForm()"
+            >
                 <QTooltip>{{ t('warehouses.add') }}</QTooltip>
             </QBtn>
         </QPageSticky>
diff --git a/src/pages/Claim/Card/ClaimLines.vue b/src/pages/Claim/Card/ClaimLines.vue
index 77c7dacf1..60c470d22 100644
--- a/src/pages/Claim/Card/ClaimLines.vue
+++ b/src/pages/Claim/Card/ClaimLines.vue
@@ -317,7 +317,7 @@ async function saveWhenHasChanges() {
     </div>
 
     <QPageSticky position="bottom-right" :offset="[25, 25]">
-        <QBtn fab color="primary" icon="add" @click="showImportDialog()" />
+        <QBtn fab color="primary" shortcut="+" icon="add" @click="showImportDialog()" />
     </QPageSticky>
 </template>
 
diff --git a/src/pages/Claim/Card/ClaimPhoto.vue b/src/pages/Claim/Card/ClaimPhoto.vue
index 21f1be6ed..ec619cc7d 100644
--- a/src/pages/Claim/Card/ClaimPhoto.vue
+++ b/src/pages/Claim/Card/ClaimPhoto.vue
@@ -246,7 +246,13 @@ function onDrag() {
     </QDialog>
     <QPageSticky position="bottom-right" :offset="[25, 25]">
         <label for="fileInput">
-            <QBtn fab @click="inputFile.nativeEl.click()" icon="add" color="primary">
+            <QBtn
+                fab
+                @click="inputFile.nativeEl.click()"
+                shortcut="+"
+                icon="add"
+                color="primary"
+            >
                 <QInput
                     ref="inputFile"
                     type="file"
diff --git a/src/pages/Customer/Card/CustomerFileManagement.vue b/src/pages/Customer/Card/CustomerFileManagement.vue
index 43aacf6a0..134d8dbd6 100644
--- a/src/pages/Customer/Card/CustomerFileManagement.vue
+++ b/src/pages/Customer/Card/CustomerFileManagement.vue
@@ -236,6 +236,7 @@ const toCustomerFileManagementCreate = () => {
             @click.stop="toCustomerFileManagementCreate()"
             color="primary"
             fab
+            shortcut="+"
             icon="add"
         />
         <QTooltip>
diff --git a/src/pages/Customer/Card/CustomerSamples.vue b/src/pages/Customer/Card/CustomerSamples.vue
index 8e2ab92a0..f12691112 100644
--- a/src/pages/Customer/Card/CustomerSamples.vue
+++ b/src/pages/Customer/Card/CustomerSamples.vue
@@ -99,7 +99,13 @@ const tableRef = ref();
     </VnTable>
 
     <QPageSticky :offset="[18, 18]">
-        <QBtn @click.stop="toCustomerSamplesCreate()" color="primary" fab icon="add" />
+        <QBtn
+            @click.stop="toCustomerSamplesCreate()"
+            color="primary"
+            fab
+            icon="add"
+            shortcut="+"
+        />
         <QTooltip>
             {{ t('Send sample') }}
         </QTooltip>
diff --git a/src/pages/Entry/Card/EntryNotes.vue b/src/pages/Entry/Card/EntryNotes.vue
index f07d0b233..55cac0437 100644
--- a/src/pages/Entry/Card/EntryNotes.vue
+++ b/src/pages/Entry/Card/EntryNotes.vue
@@ -138,7 +138,13 @@ const columns = computed(() => [
         </template>
     </CrudModel>
     <QPageSticky position="bottom-right" :offset="[25, 25]">
-        <QBtn fab color="primary" icon="add" @click="entryObservationsRef.insert()" />
+        <QBtn
+            fab
+            color="primary"
+            icon="add"
+            shortcut="+"
+            @click="entryObservationsRef.insert()"
+        />
     </QPageSticky>
 </template>
 <i18n>
diff --git a/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue b/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue
index 045517a3f..c9468557f 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue
@@ -281,6 +281,7 @@ async function onSubmit() {
                             v-else
                             icon="add_circle"
                             round
+                            shortcut="+"
                             padding="xs"
                             @click="setCreateDms()"
                         >
diff --git a/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue b/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue
index 1593ea1be..e8f73848b 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue
@@ -230,7 +230,7 @@ async function insert() {
         </template>
     </CrudModel>
     <QPageSticky position="bottom-right" :offset="[25, 25]">
-        <QBtn color="primary" icon="add" size="lg" round @click="insert" />
+        <QBtn color="primary" icon="add" shortcut="+" size="lg" round @click="insert" />
     </QPageSticky>
 </template>
 <style lang="scss" scoped>
diff --git a/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue b/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue
index 717f30b7f..bee50a07d 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue
@@ -224,6 +224,7 @@ const formatOpt = (row, { model, options }, prop) => {
         <QBtn
             color="primary"
             icon="add"
+            shortcut="+"
             size="lg"
             round
             @click="invoiceInFormRef.insert()"
diff --git a/src/pages/InvoiceIn/Card/InvoiceInVat.vue b/src/pages/InvoiceIn/Card/InvoiceInVat.vue
index d44880937..08834ecb8 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInVat.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInVat.vue
@@ -405,6 +405,7 @@ const formatOpt = (row, { model, options }, prop) => {
             color="primary"
             icon="add"
             size="lg"
+            shortcut="+"
             round
             @click="invoiceInFormRef.insert()"
         >
diff --git a/src/pages/Item/ItemRequestFilter.vue b/src/pages/Item/ItemRequestFilter.vue
index aa07b8d50..0e81ff5a5 100644
--- a/src/pages/Item/ItemRequestFilter.vue
+++ b/src/pages/Item/ItemRequestFilter.vue
@@ -212,6 +212,7 @@ const decrement = (paramsObj, key) => {
                                     flat
                                     dense
                                     size="12px"
+                                    shortcut="+"
                                     @click="add(params, 'scopeDays')"
                                 />
                                 <QBtn
diff --git a/src/pages/Route/Agency/Card/AgencyWorkcenter.vue b/src/pages/Route/Agency/Card/AgencyWorkcenter.vue
index 3531ad288..1f3cab5d0 100644
--- a/src/pages/Route/Agency/Card/AgencyWorkcenter.vue
+++ b/src/pages/Route/Agency/Card/AgencyWorkcenter.vue
@@ -88,7 +88,7 @@ async function deleteWorCenter(id) {
         </VnPaginate>
     </div>
     <QPageSticky :offset="[18, 18]">
-        <QBtn @click.stop="dialog.show()" color="primary" fab icon="add">
+        <QBtn @click.stop="dialog.show()" color="primary" fab shortcut="+" icon="add">
             <QDialog ref="dialog">
                 <FormModelPopup
                     :title="t('Add work center')"
diff --git a/src/pages/Route/RouteTickets.vue b/src/pages/Route/RouteTickets.vue
index 9356f7590..5960636b0 100644
--- a/src/pages/Route/RouteTickets.vue
+++ b/src/pages/Route/RouteTickets.vue
@@ -396,7 +396,7 @@ const openSmsDialog = async () => {
             </VnPaginate>
         </div>
         <QPageSticky :offset="[20, 20]">
-            <QBtn fab icon="add" color="primary" @click="openTicketsDialog">
+            <QBtn fab icon="add" shortcut="+" color="primary" @click="openTicketsDialog">
                 <QTooltip>
                     {{ t('Add ticket') }}
                 </QTooltip>
diff --git a/src/pages/Ticket/Card/TicketSale.vue b/src/pages/Ticket/Card/TicketSale.vue
index 2ea12bb05..f86863f05 100644
--- a/src/pages/Ticket/Card/TicketSale.vue
+++ b/src/pages/Ticket/Card/TicketSale.vue
@@ -735,6 +735,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                 size="md"
                 round
                 flat
+                shortcut="+"
                 :disable="!isTicketEditable"
                 @click="insertRow()"
             >
@@ -746,7 +747,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
     </QTable>
 
     <QPageSticky :offset="[20, 20]">
-        <QBtn @click="newOrderFromTicket()" color="primary" fab icon="add" />
+        <QBtn @click="newOrderFromTicket()" color="primary" fab icon="add" shortcut="+" />
         <QTooltip class="text-no-wrap">
             {{ t('Add item to basket') }}
         </QTooltip>
diff --git a/src/pages/Ticket/Card/TicketService.vue b/src/pages/Ticket/Card/TicketService.vue
index 63dd454ba..873051676 100644
--- a/src/pages/Ticket/Card/TicketService.vue
+++ b/src/pages/Ticket/Card/TicketService.vue
@@ -184,6 +184,12 @@ const columns = computed(() => [
         </template>
     </CrudModel>
     <QPageSticky position="bottom-right" :offset="[25, 25]">
-        <QBtn fab color="primary" icon="add" @click="ticketServiceCrudRef.insert()" />
+        <QBtn
+            fab
+            color="primary"
+            icon="add"
+            @click="ticketServiceCrudRef.insert()"
+            shortcut="+"
+        />
     </QPageSticky>
 </template>
diff --git a/src/pages/Travel/ExtraCommunityFilter.vue b/src/pages/Travel/ExtraCommunityFilter.vue
index a8bbde75b..75b744168 100644
--- a/src/pages/Travel/ExtraCommunityFilter.vue
+++ b/src/pages/Travel/ExtraCommunityFilter.vue
@@ -112,6 +112,7 @@ warehouses();
                         <template #append>
                             <QBtn
                                 icon="add"
+                                shortcut="+"
                                 flat
                                 dense
                                 size="12px"
diff --git a/src/pages/Zone/Delivery/ZoneDeliveryList.vue b/src/pages/Zone/Delivery/ZoneDeliveryList.vue
index ca87dbd84..975cbdb67 100644
--- a/src/pages/Zone/Delivery/ZoneDeliveryList.vue
+++ b/src/pages/Zone/Delivery/ZoneDeliveryList.vue
@@ -74,7 +74,7 @@ async function remove(row) {
             </VnPaginate>
         </div>
         <QPageSticky position="bottom-right" :offset="[18, 18]">
-            <QBtn @click="create" fab icon="add" color="primary" />
+            <QBtn @click="create" fab icon="add" shortcut="+" color="primary" />
         </QPageSticky>
     </QPage>
 </template>
diff --git a/src/pages/Zone/Upcoming/ZoneUpcomingList.vue b/src/pages/Zone/Upcoming/ZoneUpcomingList.vue
index 89e53132e..5a7f0bb4c 100644
--- a/src/pages/Zone/Upcoming/ZoneUpcomingList.vue
+++ b/src/pages/Zone/Upcoming/ZoneUpcomingList.vue
@@ -74,7 +74,7 @@ async function remove(row) {
             </VnPaginate>
         </div>
         <QPageSticky position="bottom-right" :offset="[18, 18]">
-            <QBtn @click="create" fab icon="add" color="primary" />
+            <QBtn @click="create" fab icon="add" shortcut="+" color="primary" />
         </QPageSticky>
     </QPage>
 </template>

From ccfe61d777f50b004898b64599c5a68d8d93a2a6 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 19 Sep 2024 01:10:14 +0200
Subject: [PATCH 118/281] feat: vnSelect exprBuilder

---
 src/components/common/VnSelect.vue            |  6 +++++
 src/pages/Customer/Card/CustomerBasicData.vue | 25 +++++++++----------
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/src/components/common/VnSelect.vue b/src/components/common/VnSelect.vue
index ed842103f..cd5608954 100644
--- a/src/components/common/VnSelect.vue
+++ b/src/components/common/VnSelect.vue
@@ -38,6 +38,10 @@ const $props = defineProps({
         type: [Array],
         default: () => [],
     },
+    exprBuilder: {
+        type: Function,
+        default: null,
+    },
     isClearable: {
         type: Boolean,
         default: true,
@@ -179,6 +183,8 @@ async function fetchFilter(val) {
         }, {});
     } else defaultWhere = { [key]: getVal(val) };
     const where = { ...(val ? defaultWhere : {}), ...$props.where };
+    if (typeof $props.exprBuilder === 'function')
+        Object.assign(where, $props.exprBuilder(key, val));
     const fetchOptions = { where, include, limit };
     if (fields) fetchOptions.fields = fields;
     if (sortBy) fetchOptions.order = sortBy;
diff --git a/src/pages/Customer/Card/CustomerBasicData.vue b/src/pages/Customer/Card/CustomerBasicData.vue
index 3682ecd73..6472a47ff 100644
--- a/src/pages/Customer/Card/CustomerBasicData.vue
+++ b/src/pages/Customer/Card/CustomerBasicData.vue
@@ -16,19 +16,19 @@ const { t } = useI18n();
 const businessTypes = ref([]);
 const contactChannels = ref([]);
 const title = ref();
-const handleSalesModelValue = (val) => {
-    filter.value.and[1] = {
-        or: [
-            { name: val },
-            { nickname: { like: '%' + val + '%' } },
-            { code: { like: `${val}%` } },
-        ],
+const handleSalesModelValue = (val) => ({
+    or: [
+        { name: val },
+        { nickname: { like: '%' + val + '%' } },
+        { code: { like: `${val}%` } },
+    ],
+});
+
+const exprBuilder = (param, value) => {
+    return {
+        and: [{ active: { neq: false } }, handleSalesModelValue(value)],
     };
 };
-
-const filter = ref({
-    and: [{ active: { neq: false } }],
-});
 </script>
 <template>
     <FetchData
@@ -109,11 +109,10 @@ const filter = ref({
                     :params="{
                         departmentCodes: ['VT', 'shopping'],
                     }"
-                    :where="filter"
                     :fields="['id', 'nickname']"
                     sort-by="nickname ASC"
                     :rules="validate('client.salesPersonFk')"
-                    @filter="handleSalesModelValue"
+                    :expr-builder="exprBuilder"
                     emit-value
                     auto-load
                 >

From 2e8397a34bc4defe40ba4bf5a8eab1ab082fa63d Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 19 Sep 2024 09:26:54 +0200
Subject: [PATCH 119/281] feat: refs #7323 use scopes

---
 src/pages/Worker/Card/WorkerDescriptor.vue |  6 +-
 src/pages/Worker/Card/WorkerSummary.vue    | 84 ++++++----------------
 2 files changed, 25 insertions(+), 65 deletions(-)

diff --git a/src/pages/Worker/Card/WorkerDescriptor.vue b/src/pages/Worker/Card/WorkerDescriptor.vue
index be30537df..3675d40f8 100644
--- a/src/pages/Worker/Card/WorkerDescriptor.vue
+++ b/src/pages/Worker/Card/WorkerDescriptor.vue
@@ -152,7 +152,11 @@ const refetch = async () => await cardDescriptorRef.value.getData();
         </template>
         <template #body="{ entity }">
             <VnLv :label="t('worker.card.user')" :value="entity.user?.name" />
-            <VnLv :label="t('worker.card.email')" :value="entity.user?.email" copy />
+            <VnLv
+                :label="t('worker.card.email')"
+                :value="entity.user?.emailUser?.email"
+                copy
+            />
             <VnLv
                 :label="t('worker.list.department')"
                 :value="entity.department ? entity.department.department.name : null"
diff --git a/src/pages/Worker/Card/WorkerSummary.vue b/src/pages/Worker/Card/WorkerSummary.vue
index 0e7bfd863..8fee52dd3 100644
--- a/src/pages/Worker/Card/WorkerSummary.vue
+++ b/src/pages/Worker/Card/WorkerSummary.vue
@@ -1,9 +1,9 @@
 <script setup>
-import { ref, onMounted, computed } from 'vue';
+import { ref, onBeforeMount, computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
+import axios from 'axios';
 import { dashIfEmpty, toDate } from 'src/filters';
-import { getUrl } from 'src/composables/getUrl';
 import VnLv from 'src/components/ui/VnLv.vue';
 import VnLinkPhone from 'src/components/ui/VnLinkPhone.vue';
 import CardSummary from 'components/ui/CardSummary.vue';
@@ -11,6 +11,7 @@ import VnUserLink from 'src/components/ui/VnUserLink.vue';
 import VnTitle from 'src/components/common/VnTitle.vue';
 import RoleDescriptorProxy from 'src/pages/Account/Role/Card/RoleDescriptorProxy.vue';
 import DepartmentDescriptorProxy from 'src/pages/Department/Card/DepartmentDescriptorProxy.vue';
+import { useRole } from 'src/composables/useRole';
 
 const route = useRoute();
 const { t } = useI18n();
@@ -23,64 +24,27 @@ const $props = defineProps({
 });
 
 const entityId = computed(() => $props.id || route.params.id);
-const workerUrl = ref();
+const basicDataUrl = ref(null);
+const isHr = computed(() => useRole().hasAny(['hr']));
+const advancedSummary = ref();
 
-onMounted(async () => {
-    workerUrl.value = (await getUrl('')) + `worker/${entityId.value}/`;
+onBeforeMount(async () => {
+    if (isHr.value) {
+        advancedSummary.value = (
+            await axios.get('Workers/advancedSummary', {
+                params: { filter: { where: { id: entityId.value } } },
+            })
+        ).data[0];
+        basicDataUrl.value = `#/worker/${entityId.value}/basic-data`;
+    }
 });
-
-const filter = {
-    include: [
-        {
-            relation: 'user',
-            scope: {
-                fields: ['name', 'nickname', 'roleFk'],
-
-                include: [
-                    {
-                        relation: 'role',
-                        scope: {
-                            fields: ['name'],
-                        },
-                    },
-                    {
-                        relation: 'emailUser',
-                        scope: {
-                            fields: ['email'],
-                        },
-                    },
-                ],
-            },
-        },
-        {
-            relation: 'department',
-            scope: {
-                include: {
-                    relation: 'department',
-                    scope: {
-                        fields: ['name'],
-                    },
-                },
-            },
-        },
-        {
-            relation: 'boss',
-        },
-        {
-            relation: 'client',
-        },
-        {
-            relation: 'sip',
-        },
-    ],
-};
 </script>
 
 <template>
     <CardSummary
         ref="summary"
-        :url="`Workers/${entityId}`"
-        :filter="filter"
+        :url="`Workers/summary`"
+        :filter="{ where: { id: entityId } }"
         data-key="WorkerSummary"
     >
         <template #header="{ entity }">
@@ -88,10 +52,7 @@ const filter = {
         </template>
         <template #body="{ entity: worker }">
             <QCard class="vn-one">
-                <VnTitle
-                    :url="`#/worker/${entityId}/basic-data`"
-                    :text="t('worker.summary.basicData')"
-                />
+                <VnTitle :url="basicDataUrl" :text="t('worker.summary.basicData')" />
                 <VnLv :label="t('worker.card.name')" :value="worker.user?.nickname" />
                 <VnLv :label="t('worker.list.department')">
                     <template #value>
@@ -128,13 +89,9 @@ const filter = {
                         <VnLinkPhone :phone-number="worker.client?.phone" />
                     </template>
                 </VnLv>
-                <VnLv :label="t('worker.summary.locker')" :value="worker.locker" />
             </QCard>
-            <QCard class="vn-one">
-                <VnTitle
-                    :url="`#/worker/${entityId}/basic-data`"
-                    :text="t('worker.summary.basicData')"
-                />
+            <QCard class="vn-one" v-if="advancedSummary">
+                <VnTitle :url="basicDataUrl" :text="t('worker.summary.basicData')" />
                 <VnLv
                     :label="t('worker.summary.fiDueDate')"
                     :value="toDate(worker.fiDueDate)"
@@ -162,7 +119,6 @@ const filter = {
             </QCard>
             <QCard class="vn-one">
                 <VnTitle :text="t('worker.summary.userData')" />
-                <VnLv :label="t('worker.summary.userId')" :value="worker?.user?.id" />
                 <VnLv :label="t('worker.card.name')" :value="worker?.user?.nickname" />
                 <VnLv
                     :label="t('worker.list.email')"

From 8fa11263e8f8f1c721b8ddb411b26e64cb572e7d Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Thu, 19 Sep 2024 12:05:08 +0200
Subject: [PATCH 120/281] fix: fix wagon list reload

---
 src/pages/Wagon/WagonList.vue | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/pages/Wagon/WagonList.vue b/src/pages/Wagon/WagonList.vue
index 89f9d285a..02e3b6d16 100644
--- a/src/pages/Wagon/WagonList.vue
+++ b/src/pages/Wagon/WagonList.vue
@@ -107,9 +107,7 @@ async function remove(row) {
             :create="{
                 urlCreate: 'Wagons',
                 title: t('Create new wagon'),
-                onDataSaved: () => {
-                    tableRef.reload();
-                },
+                onDataSaved: () => tableRef.reload(),
                 formInitialData: {},
             }"
         >

From 8b379faa52758aad7301bedb777fa83727965283 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 19 Sep 2024 12:06:00 +0200
Subject: [PATCH 121/281] perf: imrpove exprBuilder

---
 src/components/common/VnSelect.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/components/common/VnSelect.vue b/src/components/common/VnSelect.vue
index cd5608954..aa629767d 100644
--- a/src/components/common/VnSelect.vue
+++ b/src/components/common/VnSelect.vue
@@ -183,8 +183,7 @@ async function fetchFilter(val) {
         }, {});
     } else defaultWhere = { [key]: getVal(val) };
     const where = { ...(val ? defaultWhere : {}), ...$props.where };
-    if (typeof $props.exprBuilder === 'function')
-        Object.assign(where, $props.exprBuilder(key, val));
+    $props.exprBuilder && Object.assign(where, $props.exprBuilder(key, val));
     const fetchOptions = { where, include, limit };
     if (fields) fetchOptions.fields = fields;
     if (sortBy) fetchOptions.order = sortBy;

From 8e96265106b229292a1ae1bf3347e20ecb083c8a Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 19 Sep 2024 12:51:49 +0200
Subject: [PATCH 122/281] fix: CustomerFilter

---
 src/pages/Customer/CustomerFilter.vue | 72 ++++++++++-----------------
 src/pages/Customer/CustomerList.vue   | 10 +++-
 2 files changed, 33 insertions(+), 49 deletions(-)

diff --git a/src/pages/Customer/CustomerFilter.vue b/src/pages/Customer/CustomerFilter.vue
index 043bcdadb..6c50cc9df 100644
--- a/src/pages/Customer/CustomerFilter.vue
+++ b/src/pages/Customer/CustomerFilter.vue
@@ -1,35 +1,20 @@
 <script setup>
-import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
-
-import FetchData from 'components/FetchData.vue';
 import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
 import VnSelect from 'components/common/VnSelect.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 
 const { t } = useI18n();
-const props = defineProps({
+defineProps({
     dataKey: {
         type: String,
         required: true,
     },
 });
-
-const provinces = ref();
-const workers = ref();
-const zones = ref();
 </script>
 
 <template>
-    <FetchData url="Provinces" @on-fetch="(data) => (provinces = data)" auto-load />
-    <FetchData url="Zones" @on-fetch="(data) => (zones = data)" auto-load />
-    <FetchData
-        url="Workers/activeWithInheritedRole"
-        :filter="{ where: { role: 'salesPerson' } }"
-        @on-fetch="(data) => (workers = data)"
-        auto-load
-    />
-    <VnFilterPanel :data-key="props.dataKey" :search-button="true" search-url="table">
+    <VnFilterPanel :data-key="dataKey" :search-button="true" search-url="table">
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">
                 <strong>{{ t(`params.${tag.label}`) }}: </strong>
@@ -65,15 +50,14 @@ const zones = ref();
                 </QItemSection>
             </QItem>
             <QItem class="q-mb-sm">
-                <QItemSection v-if="!workers">
-                    <QSkeleton type="QInput" class="full-width" />
-                </QItemSection>
-                <QItemSection v-if="workers">
+                <QItemSection>
                     <VnSelect
+                        url="Workers/activeWithInheritedRole"
+                        :filter="{ where: { role: 'salesPerson' } }"
+                        auto-load
                         :label="t('Salesperson')"
                         v-model="params.salesPersonFk"
                         @update:model-value="searchFn()"
-                        :options="workers"
                         option-value="id"
                         option-label="name"
                         emit-value
@@ -88,15 +72,12 @@ const zones = ref();
                 </QItemSection>
             </QItem>
             <QItem class="q-mb-sm">
-                <QItemSection v-if="!provinces">
-                    <QSkeleton type="QInput" class="full-width" />
-                </QItemSection>
-                <QItemSection v-if="provinces">
-                    <VnSelect
+                <QItemSection
+                    ><VnSelect
+                        url="Provinces"
                         :label="t('Province')"
                         v-model="params.provinceFk"
                         @update:model-value="searchFn()"
-                        :options="provinces"
                         option-value="id"
                         option-label="name"
                         emit-value
@@ -105,6 +86,7 @@ const zones = ref();
                         dense
                         outlined
                         rounded
+                        auto-load
                         :input-debounce="0"
                     />
                 </QItemSection>
@@ -135,25 +117,21 @@ const zones = ref();
                     </QItemSection>
                 </QItem>
                 <QItem>
-                    <QItemSection v-if="!zones">
-                        <QSkeleton type="QInput" class="full-width" />
-                    </QItemSection>
-                    <QItemSection v-if="zones">
-                        <VnSelect
-                            :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>
+                    <VnSelect
+                        url="Zones"
+                        :label="t('Zone')"
+                        v-model="params.zoneFk"
+                        @update:model-value="searchFn()"
+                        option-value="id"
+                        option-label="name"
+                        emit-value
+                        map-options
+                        hide-selected
+                        dense
+                        outlined
+                        rounded
+                        auto-load
+                    />
                 </QItem>
                 <QItem>
                     <QItemSection>
diff --git a/src/pages/Customer/CustomerList.vue b/src/pages/Customer/CustomerList.vue
index 270acdb89..0428c0c7b 100644
--- a/src/pages/Customer/CustomerList.vue
+++ b/src/pages/Customer/CustomerList.vue
@@ -8,10 +8,10 @@ import VnLocation from 'src/components/common/VnLocation.vue';
 import VnSearchbar from 'components/ui/VnSearchbar.vue';
 import CustomerSummary from './Card/CustomerSummary.vue';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
-
+import RightMenu from 'src/components/common/RightMenu.vue';
 import VnLinkPhone from 'src/components/ui/VnLinkPhone.vue';
-
 import { toDate } from 'src/filters';
+import CustomerFilter from './CustomerFilter.vue';
 
 const { t } = useI18n();
 const router = useRouter();
@@ -397,6 +397,11 @@ function handleLocation(data, location) {
         :label="t('Search customer')"
         data-key="Customer"
     />
+    <RightMenu>
+        <template #right-panel>
+            <CustomerFilter data-key="Customer" />
+        </template>
+    </RightMenu>
     <VnTable
         ref="tableRef"
         data-key="Customer"
@@ -413,6 +418,7 @@ function handleLocation(data, location) {
         order="id DESC"
         :columns="columns"
         redirect="customer"
+        :right-search="false"
         auto-load
     >
         <template #more-create-dialog="{ data }">

From 44d98865feb33ff0ddbfdf07bc8b4fbacc1f5e8b Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 20 Sep 2024 09:04:31 +0200
Subject: [PATCH 123/281] fix: refs #7553 requested changes

---
 src/i18n/locale/es.yml                        |   6 +-
 src/pages/Order/OrderList.vue                 |   4 +-
 .../Card/BasicData/TicketBasicDataForm.vue    |  13 +-
 src/pages/Ticket/Card/TicketDescriptor.vue    |   7 +-
 .../Ticket/Card/TicketDescriptorMenu.vue      |  12 +-
 src/pages/Ticket/Card/TicketSale.vue          |   4 +-
 src/pages/Ticket/Card/TicketService.vue       |  32 +++++
 src/pages/Ticket/Card/TicketSummary.vue       |   9 --
 src/pages/Ticket/TicketAdvance.vue            |   3 +
 src/pages/Ticket/TicketAdvanceFilter.vue      |  10 ++
 src/pages/Ticket/TicketList.vue               | 130 ++++++++++--------
 src/pages/Ticket/locale/en.yml                |   1 +
 src/pages/Ticket/locale/es.yml                |   1 +
 src/router/modules/ticket.js                  |   2 +-
 14 files changed, 157 insertions(+), 77 deletions(-)

diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 4cbc449b9..e7f1f3507 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -63,7 +63,7 @@ globals:
     shipped: F. envío
     totalEntries: Ent. totales
     amount: Importe
-    packages: Bultos
+    packages: Embalajes
     download: Descargar
     downloadPdf: Descargar PDF
     selectRows: 'Seleccionar las { numberRows } filas(s)'
@@ -265,7 +265,7 @@ globals:
         tracking: Estados
         components: Componentes
         pictures: Fotos
-        packages: Bultos
+        packages: Embalajes
         ldap: LDAP
         samba: Samba
         twoFactor: Doble factor
@@ -484,7 +484,7 @@ ticket:
         tracking: Estados
         components: Componentes
         pictures: Fotos
-        packages: Bultos
+        packages: Embalajes
     list:
         nickname: Alias
         state: Estado
diff --git a/src/pages/Order/OrderList.vue b/src/pages/Order/OrderList.vue
index d96a33ef5..f5c8a44de 100644
--- a/src/pages/Order/OrderList.vue
+++ b/src/pages/Order/OrderList.vue
@@ -20,7 +20,6 @@ const { viewSummary } = useSummaryDialog();
 const tableRef = ref();
 const agencyList = ref([]);
 const addressesList = ref([]);
-const clientId = ref();
 
 const columns = computed(() => [
     {
@@ -191,6 +190,7 @@ const getDateColor = (date) => {
             formInitialData: {
                 active: true,
                 addressId: null,
+                clientFk: null,
             },
         }"
         :user-params="{ showEmpty: false }"
@@ -221,7 +221,7 @@ const getDateColor = (date) => {
             <VnSelect
                 url="Clients"
                 :include="{ relation: 'addresses' }"
-                v-model="clientId"
+                v-model="data.clientFk"
                 :label="t('module.customer')"
                 @update:model-value="(id) => fetchClientAddress(id, data)"
             />
diff --git a/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue b/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
index 4b2e90a84..fdc75abda 100644
--- a/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
+++ b/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
@@ -12,6 +12,7 @@ import VnInputTime from 'components/common/VnInputTime.vue';
 
 import axios from 'axios';
 import useNotify from 'src/composables/useNotify.js';
+import { useValidator } from 'src/composables/useValidator';
 import { toTimeFormat } from 'filters/date.js';
 
 const $props = defineProps({
@@ -23,7 +24,7 @@ const $props = defineProps({
 });
 
 const emit = defineEmits(['updateForm']);
-
+const { validate } = useValidator();
 const { notify } = useNotify();
 const router = useRouter();
 const { t } = useI18n();
@@ -306,6 +307,7 @@ onMounted(() => onFormModelInit());
                 hide-selected
                 map-options
                 :required="true"
+                :rules="validate('basicData.client')"
             >
                 <template #option="scope">
                     <QItem v-bind="scope.itemProps">
@@ -326,6 +328,7 @@ onMounted(() => onFormModelInit());
                 hide-selected
                 map-options
                 :required="true"
+                :rules="validate('basicData.warehouse')"
             />
         </VnRow>
         <VnRow>
@@ -338,6 +341,7 @@ onMounted(() => onFormModelInit());
                 hide-selected
                 map-options
                 :required="true"
+                :rules="validate('basicData.address')"
             >
                 <template #option="scope">
                     <QItem v-bind="scope.itemProps">
@@ -385,6 +389,7 @@ onMounted(() => onFormModelInit());
                 :label="t('basicData.alias')"
                 v-model="formData.nickname"
                 :required="true"
+                :rules="validate('basicData.alias')"
             />
         </VnRow>
         <VnRow class="row q-gutter-md q-mb-md no-wrap">
@@ -397,6 +402,7 @@ onMounted(() => onFormModelInit());
                 hide-selected
                 map-options
                 :required="true"
+                :rules="validate('basicData.company')"
             />
             <VnSelect
                 :label="t('basicData.agency')"
@@ -407,6 +413,7 @@ onMounted(() => onFormModelInit());
                 hide-selected
                 map-options
                 @focus="agencyFetchRef.fetch()"
+                :rules="validate('basicData.agency')"
             />
             <VnSelect
                 :label="t('basicData.zone')"
@@ -421,6 +428,7 @@ onMounted(() => onFormModelInit());
                 map-options
                 :required="true"
                 @focus="zonesFetchRef.fetch()"
+                :rules="validate('basicData.zone')"
             >
                 <template #option="scope">
                     <QItem v-bind="scope.itemProps">
@@ -440,16 +448,19 @@ onMounted(() => onFormModelInit());
                 :label="t('basicData.shipped')"
                 v-model="formData.shipped"
                 :required="true"
+                :rules="validate('basicData.shipped')"
             />
             <VnInputTime
                 :label="t('basicData.shippedHour')"
                 v-model="formData.shipped"
                 :required="true"
+                :rules="validate('basicData.shippedHour')"
             />
             <VnInputDate
                 :label="t('basicData.landed')"
                 v-model="formData.landed"
                 :required="true"
+                :rules="validate('basicData.landed')"
             />
         </VnRow>
     </QForm>
diff --git a/src/pages/Ticket/Card/TicketDescriptor.vue b/src/pages/Ticket/Card/TicketDescriptor.vue
index eef834cfa..3855240cb 100644
--- a/src/pages/Ticket/Card/TicketDescriptor.vue
+++ b/src/pages/Ticket/Card/TicketDescriptor.vue
@@ -221,7 +221,12 @@ function ticketFilter(ticket) {
                     size="md"
                     icon="vn:basketadd"
                     color="primary"
-                    :to="{ name: 'OrderList' }"
+                    :to="{
+                        name: 'OrderList',
+                        query: {
+                            createForm: JSON.stringify({}),
+                        },
+                    }"
                 >
                     <QTooltip>{{ t('ticket.card.newOrder') }}</QTooltip>
                 </QBtn>
diff --git a/src/pages/Ticket/Card/TicketDescriptorMenu.vue b/src/pages/Ticket/Card/TicketDescriptorMenu.vue
index 4140abcc8..705d8df7d 100644
--- a/src/pages/Ticket/Card/TicketDescriptorMenu.vue
+++ b/src/pages/Ticket/Card/TicketDescriptorMenu.vue
@@ -100,10 +100,14 @@ const actions = {
 
 function openDeliveryNote(type = 'deliveryNote', documentType = 'pdf') {
     const path = `Tickets/${ticket.value.id}/delivery-note-${documentType}`;
-    openReport(path, {
-        recipientId: ticket.value.clientFk,
-        type: type,
-    });
+    openReport(
+        path,
+        {
+            recipientId: ticket.value.clientFk,
+            type: type,
+        },
+        '_blank'
+    );
 }
 
 function sendDeliveryNoteConfirmation(type = 'deliveryNote', documentType = 'pdf') {
diff --git a/src/pages/Ticket/Card/TicketSale.vue b/src/pages/Ticket/Card/TicketSale.vue
index 75204965a..660c4b1f2 100644
--- a/src/pages/Ticket/Card/TicketSale.vue
+++ b/src/pages/Ticket/Card/TicketSale.vue
@@ -685,7 +685,9 @@ watch(
         <template #column-itemFk="{ row }">
             <VnSelect
                 v-if="row.isNew"
-                url="Items"
+                url="Items/WithName"
+                :fields="['id', 'name']"
+                :sort-by="['id DESC']"
                 :options="items"
                 option-label="name"
                 option-value="id"
diff --git a/src/pages/Ticket/Card/TicketService.vue b/src/pages/Ticket/Card/TicketService.vue
index bdfb7ea8c..b5ae5efc5 100644
--- a/src/pages/Ticket/Card/TicketService.vue
+++ b/src/pages/Ticket/Card/TicketService.vue
@@ -104,7 +104,21 @@ const columns = computed(() => [
         sortable: true,
         align: 'left',
     },
+    {
+        label: '',
+        name: 'actions',
+        align: 'left',
+        columnFilter: null,
+    },
 ]);
+
+async function deleteService(row) {
+    const serviceId = row.id;
+
+    const { data } = await axios.delete(`TicketServices/${serviceId}`);
+    if (data) notify('Service deleted successfully', 'positive');
+    ticketServiceCrudRef.value.reload();
+}
 </script>
 
 <template>
@@ -123,6 +137,8 @@ const columns = computed(() => [
         :data-required="crudModelRequiredData"
         auto-load
         v-model:selected="selected"
+        :order="['description ASC']"
+        :default-remove="false"
     >
         <template #moreBeforeActions>
             <QBtn
@@ -180,6 +196,21 @@ const columns = computed(() => [
                         />
                     </QTd>
                 </template>
+                <template #body-cell-actions="{ row }">
+                    <QTd auto-width>
+                        <QIcon
+                            color="primary"
+                            name="delete"
+                            class="cursor-pointer"
+                            size="sm"
+                            @click.stop="deleteService(row)"
+                        >
+                            <QTooltip class="text-no-wrap">
+                                {{ t('globals.delete') }}
+                            </QTooltip>
+                        </QIcon>
+                    </QTd>
+                </template>
             </QTable>
         </template>
     </CrudModel>
@@ -187,3 +218,4 @@ const columns = computed(() => [
         <QBtn fab color="primary" icon="add" @click="ticketServiceCrudRef.insert()" />
     </QPageSticky>
 </template>
+ñ
diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index e8ba955d2..fc107c315 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -260,15 +260,6 @@ function toTicketUrl(section) {
                 </VnLv>
                 <VnLv
                     :label="t('ticket.summary.consignee')"
-                    :value="
-                        entity.client.salesPersonUser.nickname +
-                        ' #' +
-                        entity.client.salesPersonUser.id
-                    "
-                >
-                </VnLv>
-                <VnLv
-                    :label="t('ticket.summary.consigneeAddress')"
                     :value="formattedAddress()"
                 />
             </QCard>
diff --git a/src/pages/Ticket/TicketAdvance.vue b/src/pages/Ticket/TicketAdvance.vue
index f56c7cb36..7ae959443 100644
--- a/src/pages/Ticket/TicketAdvance.vue
+++ b/src/pages/Ticket/TicketAdvance.vue
@@ -59,6 +59,7 @@ const arrayData = useArrayData('AdvanceTickets', {
     exprBuilder: exprBuilder,
     limit: 0,
 });
+console.log('arrayData: ', arrayData);
 const { store } = arrayData;
 const tickets = computed(() =>
     (store.data || []).map((ticket, index) => ({ ...ticket, index: index }))
@@ -461,6 +462,7 @@ onMounted(async () => {
     tomorrow.setDate(tomorrow.getDate() + 1);
     userParams.dateFuture = tomorrow;
     userParams.dateToAdvance = today;
+    userParams.scopeDays = 1;
     userParams.warehouseFk = user.value.warehouseFk;
     const filter = { limit: 0 };
     await arrayData.addFilter({ filter, userParams });
@@ -550,6 +552,7 @@ onMounted(async () => {
             style="max-width: 99%"
         >
             <template #header="props">
+                {{ userParams.scopeDays }}
                 <QTr :props="props">
                     <QTh
                         class="horizontal-separator text-uppercase color-vn-label"
diff --git a/src/pages/Ticket/TicketAdvanceFilter.vue b/src/pages/Ticket/TicketAdvanceFilter.vue
index 209a1a307..b25ebdea6 100644
--- a/src/pages/Ticket/TicketAdvanceFilter.vue
+++ b/src/pages/Ticket/TicketAdvanceFilter.vue
@@ -9,6 +9,7 @@ import VnInputDate from 'src/components/common/VnInputDate.vue';
 
 import axios from 'axios';
 import { onMounted } from 'vue';
+import VnInputNumber from 'src/components/common/VnInputNumber.vue';
 
 const { t } = useI18n();
 const props = defineProps({
@@ -116,6 +117,15 @@ onMounted(async () => await getItemPackingTypes());
                     </VnSelect>
                 </QItemSection>
             </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInputNumber
+                        v-model="params.scopeDays"
+                        :label="t('Days onward')"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
             <QItem>
                 <QItemSection>
                     <QCheckbox
diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index 53c920179..1cb46582d 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -5,7 +5,7 @@ import { useRoute } from 'vue-router';
 import { useStateStore } from 'stores/useStateStore';
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
-import { toDate, toCurrency } from 'src/filters/index';
+import { toDate, toCurrency, dashIfEmpty } from 'src/filters/index';
 import useNotify from 'src/composables/useNotify';
 import TicketSummary from './Card/TicketSummary.vue';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
@@ -21,6 +21,7 @@ import FetchData from 'src/components/FetchData.vue';
 import CustomerDescriptorProxy from '../Customer/Card/CustomerDescriptorProxy.vue';
 import ZoneDescriptorProxy from '../Zone/Card/ZoneDescriptorProxy.vue';
 import { toTimeFormat } from 'src/filters/date';
+import InvoiceOutDescriptorProxy from '../InvoiceOut/Card/InvoiceOutDescriptorProxy.vue';
 
 const route = useRoute();
 const { t } = useI18n();
@@ -150,6 +151,11 @@ const columns = computed(() => [
         },
         columnClass: 'expand',
     },
+    {
+        align: 'left',
+        name: 'refFk',
+        label: t('ticketList.ref'),
+    },
     {
         align: 'left',
         name: 'zoneFk',
@@ -477,59 +483,66 @@ function setReference(data) {
         }"
     >
         <template #column-statusIcons="{ row }">
-            <QIcon
-                v-if="row.isTaxDataChecked === 0"
-                color="primary"
-                name="vn:no036"
-                size="xs"
-            >
-                <QTooltip>
-                    {{ t('No verified data') }}
-                </QTooltip>
-            </QIcon>
-            <QIcon v-if="row.hasTicketRequest" color="primary" name="vn:claims" size="xs">
-                <QTooltip>
-                    {{ t('Purchase request') }}
-                </QTooltip>
-            </QIcon>
-            <QIcon
-                v-if="row.itemShortage"
-                color="primary"
-                name="vn:unavailable"
-                size="xs"
-            >
-                <QTooltip>
-                    {{ t('Not visible') }}
-                </QTooltip>
-            </QIcon>
-            <QIcon v-if="row.isFreezed" color="primary" name="vn:frozen" size="xs">
-                <QTooltip>
-                    {{ t('Client frozen') }}
-                </QTooltip>
-            </QIcon>
-            <QIcon v-if="row.risk" color="primary" name="vn:risk" size="xs">
-                <QTooltip> {{ t('Risk') }}: {{ row.risk }} </QTooltip>
-            </QIcon>
-            <QIcon
-                v-if="row.hasComponentLack"
-                color="primary"
-                name="vn:components"
-                size="xs"
-            >
-                <QTooltip>
-                    {{ t('Component lack') }}
-                </QTooltip>
-            </QIcon>
-            <QIcon
-                v-if="row.hasRounding"
-                color="primary"
-                name="vn:sync_problem"
-                size="xs"
-            >
-                <QTooltip>
-                    {{ t('Rounding') }}
-                </QTooltip>
-            </QIcon>
+            <div class="q-gutter-x-xs">
+                <QIcon
+                    v-if="row.isTaxDataChecked === 0"
+                    color="primary"
+                    name="vn:no036"
+                    size="xs"
+                >
+                    <QTooltip>
+                        {{ t('No verified data') }}
+                    </QTooltip>
+                </QIcon>
+                <QIcon
+                    v-if="row.hasTicketRequest"
+                    color="primary"
+                    name="vn:buyrequest"
+                    size="xs"
+                >
+                    <QTooltip>
+                        {{ t('Purchase request') }}
+                    </QTooltip>
+                </QIcon>
+                <QIcon
+                    v-if="row.itemShortage"
+                    color="primary"
+                    name="vn:unavailable"
+                    size="xs"
+                >
+                    <QTooltip>
+                        {{ t('Not visible') }}
+                    </QTooltip>
+                </QIcon>
+                <QIcon v-if="row.isFreezed" color="primary" name="vn:frozen" size="xs">
+                    <QTooltip>
+                        {{ t('Client frozen') }}
+                    </QTooltip>
+                </QIcon>
+                <QIcon v-if="row.risk" color="primary" name="vn:risk" size="xs">
+                    <QTooltip> {{ t('Risk') }}: {{ row.risk }} </QTooltip>
+                </QIcon>
+                <QIcon
+                    v-if="row.hasComponentLack"
+                    color="primary"
+                    name="vn:components"
+                    size="xs"
+                >
+                    <QTooltip>
+                        {{ t('Component lack') }}
+                    </QTooltip>
+                </QIcon>
+                <QIcon
+                    v-if="row.hasRounding"
+                    color="primary"
+                    name="sync_problem"
+                    size="xs"
+                >
+                    <QTooltip>
+                        {{ t('Rounding') }}
+                    </QTooltip>
+                </QIcon>
+            </div>
         </template>
         <template #column-salesPersonFk="{ row }">
             <span class="link" @click.stop>
@@ -566,9 +579,15 @@ function setReference(data) {
                 {{ row.state }}
             </span>
         </template>
+        <template #column-refFk="{ row }">
+            <span class="link" @click.stop>
+                {{ dashIfEmpty(row.refFk) }}
+                <InvoiceOutDescriptorProxy :id="row.invoiceOutId" />
+            </span>
+        </template>
         <template #column-zoneFk="{ row }">
             <span class="link" @click.stop>
-                {{ row.zoneName }}
+                {{ dashIfEmpty(row.zoneName) }}
                 <ZoneDescriptorProxy :id="row.zoneFk" />
             </span>
         </template>
@@ -586,6 +605,7 @@ function setReference(data) {
             <VnRow>
                 <VnSelect
                     url="Clients"
+                    :fields="['id', 'name']"
                     :label="t('ticketList.client')"
                     v-model="data.clientId"
                     :options="clientsOptions"
diff --git a/src/pages/Ticket/locale/en.yml b/src/pages/Ticket/locale/en.yml
index 34eee17e1..fb944730e 100644
--- a/src/pages/Ticket/locale/en.yml
+++ b/src/pages/Ticket/locale/en.yml
@@ -270,3 +270,4 @@ ticketList:
     closure: Closure
     toLines: Go to lines
     addressNickname: Address nickname
+    ref: Reference
diff --git a/src/pages/Ticket/locale/es.yml b/src/pages/Ticket/locale/es.yml
index e66a3514b..24971529c 100644
--- a/src/pages/Ticket/locale/es.yml
+++ b/src/pages/Ticket/locale/es.yml
@@ -273,3 +273,4 @@ ticketList:
     closure: Cierre
     toLines: Ir a lineas
     addressNickname: Alias consignatario
+    ref: Referencia
diff --git a/src/router/modules/ticket.js b/src/router/modules/ticket.js
index dcc238f95..6e407b88b 100644
--- a/src/router/modules/ticket.js
+++ b/src/router/modules/ticket.js
@@ -198,7 +198,7 @@ export default {
                     name: 'TicketPackage',
                     meta: {
                         title: 'packages',
-                        icon: 'vn:bin',
+                        icon: 'vn:bucket',
                     },
                     component: () => import('src/pages/Ticket/Card/TicketPackage.vue'),
                 },

From 45b54332060a2dd2faf3db663bedc7b079e2510c Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Fri, 20 Sep 2024 09:14:11 +0200
Subject: [PATCH 124/281] refs #6898 fix filter

---
 src/components/CreateNewPostcodeForm.vue       |  2 +-
 src/components/VnSelectProvince.vue            |  2 +-
 src/i18n/locale/en.yml                         |  1 +
 src/i18n/locale/es.yml                         |  1 +
 src/pages/Supplier/Card/SupplierFiscalData.vue |  2 +-
 src/pages/Supplier/SupplierList.vue            | 13 +++++++++++++
 6 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/components/CreateNewPostcodeForm.vue b/src/components/CreateNewPostcodeForm.vue
index a426ac2b4..f920303c4 100644
--- a/src/components/CreateNewPostcodeForm.vue
+++ b/src/components/CreateNewPostcodeForm.vue
@@ -105,7 +105,7 @@ async function setProvince(id, data) {
                     option-label="name"
                     option-value="id"
                     :rules="validate('postcode.city')"
-                    :roles-allowed-to-create="['deliveryAssistant']"
+                    :roles-allowed-to-create="['deliveryAssistant', 'administrative']"
                     :emit-value="false"
                     clearable
                 >
diff --git a/src/components/VnSelectProvince.vue b/src/components/VnSelectProvince.vue
index ea10ace19..d50e292ce 100644
--- a/src/components/VnSelectProvince.vue
+++ b/src/components/VnSelectProvince.vue
@@ -38,7 +38,7 @@ async function onProvinceCreated(_, data) {
         hide-selected
         v-model="provinceFk"
         :rules="validate && validate('postcode.provinceFk')"
-        :roles-allowed-to-create="['deliveryAssistant']"
+        :roles-allowed-to-create="['deliveryAssistant', 'administrative']"
     >
         <template #option="{ itemProps, opt }">
             <QItem v-bind="itemProps">
diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index ed42d0ce1..1d1a287c2 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -1010,6 +1010,7 @@ supplier:
             account: Account
             payMethod: Pay Method
             payDay: Pay Day
+            country: Country
     summary:
         responsible: Responsible
         notes: Notes
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 4b1543a1e..db717824a 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -994,6 +994,7 @@ supplier:
             account: Cuenta
             payMethod: Método de pago
             payDay: Dia de pago
+            country: País
     summary:
         responsible: Responsable
         notes: Notas
diff --git a/src/pages/Supplier/Card/SupplierFiscalData.vue b/src/pages/Supplier/Card/SupplierFiscalData.vue
index fd9667112..bcce93e53 100644
--- a/src/pages/Supplier/Card/SupplierFiscalData.vue
+++ b/src/pages/Supplier/Card/SupplierFiscalData.vue
@@ -129,7 +129,7 @@ function handleLocation(data, location) {
             <VnRow>
                 <VnLocation
                     :rules="validate('Worker.postcode')"
-                    :roles-allowed-to-create="['deliveryAssistant']"
+                    :roles-allowed-to-create="['deliveryAssistant', 'administrative']"
                     v-model="data.postCode"
                     @update:model-value="(location) => handleLocation(data, location)"
                 >
diff --git a/src/pages/Supplier/SupplierList.vue b/src/pages/Supplier/SupplierList.vue
index d8404632c..ad668f0c0 100644
--- a/src/pages/Supplier/SupplierList.vue
+++ b/src/pages/Supplier/SupplierList.vue
@@ -75,6 +75,19 @@ const columns = computed(() => [
         },
         visible: false,
     },
+    {
+        align: 'left',
+        label: t('supplier.list.tableVisibleColumns.country'),
+        name: 'country',
+        columnFilter: {
+            component: 'select',
+            name: 'countryFk',
+            attrs: {
+                url: 'countries',
+                fields: ['id', 'name'],
+            },
+        },
+    },
 ]);
 </script>
 

From 2537e58ff3839f7ab901ca6c31bd0de7a617892e Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 20 Sep 2024 09:56:04 +0200
Subject: [PATCH 125/281] fix: refs #7524 dynamic fetch

---
 .../Travel/Card/TravelThermographsForm.vue    | 35 +++++--------------
 1 file changed, 9 insertions(+), 26 deletions(-)

diff --git a/src/pages/Travel/Card/TravelThermographsForm.vue b/src/pages/Travel/Card/TravelThermographsForm.vue
index 7f40873b1..c61e8c46f 100644
--- a/src/pages/Travel/Card/TravelThermographsForm.vue
+++ b/src/pages/Travel/Card/TravelThermographsForm.vue
@@ -28,18 +28,8 @@ const route = useRoute();
 const router = useRouter();
 const state = useState();
 const { notify } = useNotify();
-
-const thermographFilter = {
-    fields: ['thermographFk'],
-    where: {
-        travelFk: null,
-    },
-    order: 'thermographFk ASC',
-};
-const fetchTravelThermographsRef = ref(null);
 const allowedContentTypes = ref('');
 const user = state.getUser();
-const thermographsOptions = ref([]);
 const dmsTypesOptions = ref([]);
 const companiesOptions = ref([]);
 const warehousesOptions = ref([]);
@@ -166,26 +156,13 @@ const updateThermograph = async () => {
         console.error('Error creating thermograph');
     }
 };
-
-const onThermographCreated = async (data) => {
-    await fetchTravelThermographsRef.value.fetch();
-    thermographForm.thermographId = data.thermographId;
-};
 </script>
-
 <template>
     <FetchData
         url="DmsContainers/allowedContentTypes"
         @on-fetch="(data) => (allowedContentTypes = data.join(', '))"
         auto-load
     />
-    <FetchData
-        ref="fetchTravelThermographsRef"
-        url="TravelThermographs"
-        @on-fetch="(data) => (thermographsOptions = data)"
-        :filter="thermographFilter"
-        auto-load
-    />
     <FetchData
         url="DmsTypes"
         :filter="{ order: 'name' }"
@@ -239,15 +216,22 @@ const onThermographCreated = async (data) => {
                     <VnSelectDialog
                         :label="t('travel.thermographs.thermograph')"
                         v-model="thermographForm.thermographId"
-                        :options="thermographsOptions"
+                        url="TravelThermographs"
                         option-value="thermographFk"
                         option-label="thermographFk"
+                        :fields="['thermographFk']"
+                        :where="{ travelFk: null }"
+                        sort-by="thermographFk ASC"
                         :disable="viewAction === 'edit'"
                         :tooltip="t('New thermograph')"
                     >
                         <template #form>
                             <CreateThermographForm
-                                @on-data-saved="onThermographCreated($event, data)"
+                                @on-data-saved="
+                                    (data) =>
+                                        (thermographForm.thermographId =
+                                            data.thermographFk)
+                                "
                             />
                         </template>
                     </VnSelectDialog>
@@ -323,7 +307,6 @@ const onThermographCreated = async (data) => {
         </QForm>
     </QPage>
 </template>
-
 <i18n>
 es:
     Select files: Selecciona ficheros

From 3b709c20cf13389c85880a7165d240f9eb45a1e0 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 20 Sep 2024 10:05:28 +0200
Subject: [PATCH 126/281] fix: refs #7524 use id

---
 src/pages/Travel/Card/TravelThermographsForm.vue | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/pages/Travel/Card/TravelThermographsForm.vue b/src/pages/Travel/Card/TravelThermographsForm.vue
index c61e8c46f..d8dc6edc8 100644
--- a/src/pages/Travel/Card/TravelThermographsForm.vue
+++ b/src/pages/Travel/Card/TravelThermographsForm.vue
@@ -228,9 +228,7 @@ const updateThermograph = async () => {
                         <template #form>
                             <CreateThermographForm
                                 @on-data-saved="
-                                    (data) =>
-                                        (thermographForm.thermographId =
-                                            data.thermographFk)
+                                    (data) => (thermographForm.thermographId = data.id)
                                 "
                             />
                         </template>

From b2cc74d890770aa0aa1c204bf36cdee06d828ca5 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 20 Sep 2024 10:27:24 +0200
Subject: [PATCH 127/281] fix: refs #7524 use id

---
 src/pages/Travel/Card/TravelThermographsForm.vue | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/pages/Travel/Card/TravelThermographsForm.vue b/src/pages/Travel/Card/TravelThermographsForm.vue
index d8dc6edc8..4f16b0a49 100644
--- a/src/pages/Travel/Card/TravelThermographsForm.vue
+++ b/src/pages/Travel/Card/TravelThermographsForm.vue
@@ -156,6 +156,10 @@ const updateThermograph = async () => {
         console.error('Error creating thermograph');
     }
 };
+
+const onThermographCreated = async (data) => {
+    thermographForm.thermographId = data.id;
+};
 </script>
 <template>
     <FetchData

From ac6d98cd36691ee748ca41b365e9cf25a4280ad1 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 20 Sep 2024 11:22:51 +0200
Subject: [PATCH 128/281] fix: refs #7353 horizontal scroll

---
 src/components/VnTable/VnTable.vue          | 20 +++--
 src/components/VnTable/VnVisibleColumn.vue  |  2 +-
 src/pages/Monitor/MonitorClients.vue        |  7 +-
 src/pages/Monitor/Ticket/MonitorTickets.vue | 92 +++++++++------------
 4 files changed, 59 insertions(+), 62 deletions(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 5b39265fb..2c9526ec0 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -415,7 +415,7 @@ function handleOnDataSaved(_, res) {
                     <QBtn
                         v-if="$props.rightSearch"
                         icon="filter_alt"
-                        class="bg-vn-section-color q-ml-md"
+                        class="bg-vn-section-color q-ml-sm"
                         dense
                         @click="stateStore.toggleRightDrawer()"
                     />
@@ -502,8 +502,9 @@ function handleOnDataSaved(_, res) {
                             :key="index"
                             :title="btn.title"
                             :icon="btn.icon"
-                            class="q-px-sm"
+                            class="q-pa-xs"
                             flat
+                            dense
                             :class="
                                 btn.isPrimary ? 'text-primary-light' : 'color-vn-text '
                             "
@@ -745,10 +746,16 @@ es:
     }
 }
 
-.q-table th {
-    padding: 0;
-}
+.q-table {
+    th {
+        padding: 0;
+    }
 
+    &__top {
+        padding: 12px 0px;
+        top: 0;
+    }
+}
 .vnTable {
     thead tr th {
         position: sticky;
@@ -757,9 +764,6 @@ es:
     thead tr:first-child th {
         top: 0;
     }
-    .q-table__top {
-        top: 0;
-    }
     tbody {
         .q-checkbox {
             display: flex;
diff --git a/src/components/VnTable/VnVisibleColumn.vue b/src/components/VnTable/VnVisibleColumn.vue
index 36f5ed7de..f5c3458cd 100644
--- a/src/components/VnTable/VnVisibleColumn.vue
+++ b/src/components/VnTable/VnVisibleColumn.vue
@@ -135,7 +135,7 @@ onMounted(async () => {
 });
 </script>
 <template>
-    <QBtn icon="vn:visible_columns" class="bg-vn-section-color q-mr-md q-px-sm" dense>
+    <QBtn icon="vn:visible_columns" class="bg-vn-section-color q-mr-sm q-px-sm" dense>
         <QPopupProxy ref="popupProxyRef">
             <QCard class="column q-pa-md">
                 <QIcon name="info" size="sm" class="info-icon">
diff --git a/src/pages/Monitor/MonitorClients.vue b/src/pages/Monitor/MonitorClients.vue
index ff51e4464..68b24b400 100644
--- a/src/pages/Monitor/MonitorClients.vue
+++ b/src/pages/Monitor/MonitorClients.vue
@@ -139,7 +139,10 @@ const columns = computed(() => [
     </VnTable>
 </template>
 <style lang="scss" scoped>
-.full-width .vn-row > * {
-    flex: 0.4;
+.full-width .vn-row {
+    margin-bottom: 0;
+    > * {
+        flex: 0.3;
+    }
 }
 </style>
diff --git a/src/pages/Monitor/Ticket/MonitorTickets.vue b/src/pages/Monitor/Ticket/MonitorTickets.vue
index 258b5022f..29bf42915 100644
--- a/src/pages/Monitor/Ticket/MonitorTickets.vue
+++ b/src/pages/Monitor/Ticket/MonitorTickets.vue
@@ -54,7 +54,7 @@ const columns = computed(() => [
         label: t('salesTicketsTable.problems'),
         name: 'totalProblems',
         align: 'left',
-
+        columnClass: 'no-padding',
         columnFilter: false,
         attrs: {
             dense: true,
@@ -65,7 +65,6 @@ const columns = computed(() => [
         name: 'id',
         field: 'id',
         align: 'left',
-
         columnFilter: {
             component: 'number',
             name: 'id',
@@ -110,7 +109,6 @@ const columns = computed(() => [
         name: 'shippedDate',
         style: { 'max-width': '100px' },
         align: 'left',
-
         columnFilter: {
             component: 'date',
             name: 'shippedDate',
@@ -164,7 +162,6 @@ const columns = computed(() => [
         label: t('salesTicketsTable.state'),
         name: 'state',
         align: 'left',
-        style: { 'max-width': '100px' },
         columnFilter: {
             component: 'select',
             name: 'stateFk',
@@ -193,7 +190,6 @@ const columns = computed(() => [
         label: t('salesTicketsTable.zone'),
         name: 'zoneFk',
         align: 'left',
-
         columnFilter: {
             component: 'select',
             name: 'zoneFk',
@@ -210,8 +206,7 @@ const columns = computed(() => [
         name: 'totalWithVat',
         field: 'totalWithVat',
         align: 'left',
-        style: { 'max-width': '75px' },
-
+        style: 'max-width: 75px',
         columnFilter: {
             component: 'number',
             name: 'totalWithVat',
@@ -370,7 +365,7 @@ const openTab = (id) =>
             </QCheckbox>
         </template>
         <template #column-totalProblems="{ row }">
-            <QTd class="no-padding" style="max-width: 60px">
+            <span>
                 <QIcon
                     v-if="row.isTaxDataChecked === 0"
                     name="vn:no036"
@@ -424,46 +419,40 @@ const openTab = (id) =>
                 >
                     <QTooltip>{{ $t('salesTicketsTable.tooLittle') }}</QTooltip>
                 </QIcon>
-            </QTd>
+            </span>
         </template>
         <template #column-id="{ row }">
-            <QTd class="no-padding">
-                <span class="link" @click.stop.prevent>
-                    {{ row.id }}
-                    <TicketDescriptorProxy :id="row.id" />
-                </span>
-            </QTd>
+            <span class="link" @click.stop.prevent>
+                {{ row.id }}
+                <TicketDescriptorProxy :id="row.id" />
+            </span>
         </template>
         <template #column-clientFk="{ row }">
-            <QTd class="no-padding" @click.stop :title="row.nickname">
-                <span class="link">{{ row.nickname }}</span>
+            <div @click.stop :title="row.nickname">
+                <span class="link" v-text="row.nickname" />
                 <CustomerDescriptorProxy :id="row.clientFk" />
-            </QTd>
+            </div>
         </template>
         <template #column-salesPersonFk="{ row }">
-            <QTd class="no-padding" @click.stop :title="row.userName">
+            <div @click.stop :title="row.userName">
                 <span class="link" v-text="dashIfEmpty(row.userName)" />
                 <WorkerDescriptorProxy :id="row.salesPersonFk" />
-            </QTd>
+            </div>
         </template>
         <template #column-shippedDate="{ row }">
-            <QTd class="no-padding">
-                <QBadge
-                    v-bind="getBadgeAttrs(row.shippedDate)"
-                    class="q-pa-sm"
-                    style="font-size: 14px"
-                >
-                    {{ formatShippedDate(row.shippedDate) }}
-                </QBadge>
-            </QTd>
+            <QBadge
+                v-bind="getBadgeAttrs(row.shippedDate)"
+                class="q-pa-sm"
+                style="font-size: 14px"
+            >
+                {{ formatShippedDate(row.shippedDate) }}
+            </QBadge>
         </template>
         <template #column-provinceFk="{ row }">
-            <QTd class="no-padding">
-                <span :title="row.province" v-text="row.province" />
-            </QTd>
+            <span :title="row.province" v-text="row.province" />
         </template>
         <template #column-state="{ row }">
-            <QTd class="no-padding" @click.stop.prevent>
+            <div @click.stop.prevent>
                 <div v-if="row.refFk">
                     <span class="link">{{ row.refFk }}</span>
                     <InvoiceOutDescriptorProxy :id="row.invoiceOutId" />
@@ -477,32 +466,33 @@ const openTab = (id) =>
                 >
                     {{ row.state }}
                 </QBadge>
-            </QTd>
+            </div>
         </template>
         <template #column-isFragile="{ row }">
-            <QTd class="no-padding">
-                <QIcon v-if="row.isFragile" name="local_bar" color="primary" size="sm">
-                    <QTooltip>{{ $t('salesTicketsTable.isFragile') }}</QTooltip>
-                </QIcon>
-            </QTd>
+            <QIcon v-if="row.isFragile" name="local_bar" color="primary" size="sm">
+                <QTooltip>{{ $t('salesTicketsTable.isFragile') }}</QTooltip>
+            </QIcon>
         </template>
         <template #column-zoneFk="{ row }">
-            <QTd class="no-padding" @click.stop.prevent :title="row.zoneName">
+            <div @click.stop.prevent :title="row.zoneName">
                 <span class="link">{{ row.zoneName }}</span>
                 <ZoneDescriptorProxy :id="row.zoneFk" />
-            </QTd>
+            </div>
         </template>
         <template #column-totalWithVat="{ row }">
-            <QTd class="no-padding">
-                <QBadge
-                    :color="totalPriceColor(row) || 'transparent'"
-                    :text-color="totalPriceColor(row) ? 'black' : 'white'"
-                    class="q-pa-sm"
-                    style="font-size: 14px"
-                >
-                    {{ toCurrency(row.totalWithVat) }}
-                </QBadge>
-            </QTd>
+            <QBadge
+                :color="totalPriceColor(row) || 'transparent'"
+                :text-color="totalPriceColor(row) ? 'black' : 'white'"
+                class="q-pa-sm"
+                style="font-size: 14px"
+            >
+                {{ toCurrency(row.totalWithVat) }}
+            </QBadge>
         </template>
     </VnTable>
 </template>
+<style lang="scss" scoped>
+td .q-icon {
+    margin: 0 2px;
+}
+</style>

From 271e33a999d54cf06788aa41dce6164658aaf6ab Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 20 Sep 2024 11:57:15 +0200
Subject: [PATCH 129/281] feat: formatLocation when field is null

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

diff --git a/src/components/common/VnLocation.vue b/src/components/common/VnLocation.vue
index b6cbfbafd..c3b07c72c 100644
--- a/src/components/common/VnLocation.vue
+++ b/src/components/common/VnLocation.vue
@@ -12,14 +12,46 @@ const props = defineProps({
         default: null,
     },
 });
+const formatLocation = (obj, properties) => {
+    // Crear un array con las propiedades del objeto
+    const parts = properties.map((prop) => {
+        if (typeof prop === 'string') {
+            return obj[prop];
+        } else if (typeof prop === 'function') {
+            return prop(obj);
+        }
+        return null;
+    });
+
+    // Filtrar los valores que no son null o undefined
+    const filteredParts = parts.filter(
+        (part) => part !== null && part !== undefined && part !== ''
+    );
+
+    // Unir los valores filtrados con el formato deseado
+    return filteredParts.join(', ');
+};
+
+const locationProperties = [
+    'postcode',
+    (obj) =>
+        obj.city
+            ? `${obj.city}${obj.province?.name ? `(${obj.province.name})` : ''}`
+            : null,
+    (obj) => obj.country?.name,
+];
 const modelValue = ref(
-    props.location
-        ? `${props.location?.postcode} - ${props.location?.city}(${props.location?.province?.name}), ${props.location?.country?.name}`
-        : null
+    props.location ? formatLocation(props.location, locationProperties) : null
 );
 function showLabel(data) {
-    return `${data.code} - ${data.town}(${data.province}), ${data.country}`;
+    const dataProperties = [
+        'code',
+        (obj) => (obj.town ? `${obj.town}(${obj.province})` : null),
+        'country',
+    ];
+    return formatLocation(data, dataProperties);
 }
+
 const handleModelValue = (data) => {
     emit('update:model-value', data);
 };

From e1f3589110f55936bb916ed20cc915fc8e0242fa Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 20 Sep 2024 12:17:10 +0200
Subject: [PATCH 130/281] fix: refs #7353 horizontal scroll

---
 src/pages/Monitor/Ticket/MonitorTickets.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/Monitor/Ticket/MonitorTickets.vue b/src/pages/Monitor/Ticket/MonitorTickets.vue
index 29bf42915..4c6daca87 100644
--- a/src/pages/Monitor/Ticket/MonitorTickets.vue
+++ b/src/pages/Monitor/Ticket/MonitorTickets.vue
@@ -54,7 +54,6 @@ const columns = computed(() => [
         label: t('salesTicketsTable.problems'),
         name: 'totalProblems',
         align: 'left',
-        columnClass: 'no-padding',
         columnFilter: false,
         attrs: {
             dense: true,

From 87efc2f355d5bcc4dacc44ac6f90b2ca07698297 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 20 Sep 2024 13:00:34 +0200
Subject: [PATCH 131/281] fix: refs #7353 responsive filters

---
 src/pages/Monitor/MonitorClients.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/pages/Monitor/MonitorClients.vue b/src/pages/Monitor/MonitorClients.vue
index 68b24b400..e98e11c6d 100644
--- a/src/pages/Monitor/MonitorClients.vue
+++ b/src/pages/Monitor/MonitorClients.vue
@@ -141,8 +141,9 @@ const columns = computed(() => [
 <style lang="scss" scoped>
 .full-width .vn-row {
     margin-bottom: 0;
+    flex-direction: row;
     > * {
-        flex: 0.3;
+        max-width: 105px;
     }
 }
 </style>

From 3e101242f64b72cd6ab727e93fd4a9ddabd99b34 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 20 Sep 2024 13:20:40 +0200
Subject: [PATCH 132/281] chore: refs #7353 drop useless code

---
 src/pages/Monitor/Ticket/MonitorTickets.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/Monitor/Ticket/MonitorTickets.vue b/src/pages/Monitor/Ticket/MonitorTickets.vue
index 4c6daca87..f6e9848cf 100644
--- a/src/pages/Monitor/Ticket/MonitorTickets.vue
+++ b/src/pages/Monitor/Ticket/MonitorTickets.vue
@@ -205,7 +205,6 @@ const columns = computed(() => [
         name: 'totalWithVat',
         field: 'totalWithVat',
         align: 'left',
-        style: 'max-width: 75px',
         columnFilter: {
             component: 'number',
             name: 'totalWithVat',

From 7a253d314c6940c25100c3c78aa7dd79cf1126bd Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 20 Sep 2024 13:22:15 +0200
Subject: [PATCH 133/281] chore: refs #7353 drop useless code

---
 src/pages/Monitor/Ticket/MonitorTickets.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/Monitor/Ticket/MonitorTickets.vue b/src/pages/Monitor/Ticket/MonitorTickets.vue
index f6e9848cf..16d5abffb 100644
--- a/src/pages/Monitor/Ticket/MonitorTickets.vue
+++ b/src/pages/Monitor/Ticket/MonitorTickets.vue
@@ -106,7 +106,6 @@ const columns = computed(() => [
     {
         label: t('salesTicketsTable.date'),
         name: 'shippedDate',
-        style: { 'max-width': '100px' },
         align: 'left',
         columnFilter: {
             component: 'date',

From b822c7722bb3176120c87aa74abbb7c2c33ec88d Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 20 Sep 2024 13:45:43 +0200
Subject: [PATCH 134/281] feat: formatLocation when field is null

---
 src/components/common/VnLocation.vue | 68 +++++++++++++++++++++++++---
 1 file changed, 61 insertions(+), 7 deletions(-)

diff --git a/src/components/common/VnLocation.vue b/src/components/common/VnLocation.vue
index 8256ec5b0..c1b921915 100644
--- a/src/components/common/VnLocation.vue
+++ b/src/components/common/VnLocation.vue
@@ -2,21 +2,68 @@
 import CreateNewPostcode from 'src/components/CreateNewPostcodeForm.vue';
 import VnSelectDialog from 'components/common/VnSelectDialog.vue';
 import { useI18n } from 'vue-i18n';
-
+import { ref } from 'vue';
 const { t } = useI18n();
-const value = defineModel({ type: [String, Number, Object] });
+const emit = defineEmits(['update:model-value', 'update:options']);
+
+const props = defineProps({
+    location: {
+        type: Object,
+        default: null,
+    },
+});
+const formatLocation = (obj, properties) => {
+    const parts = properties.map((prop) => {
+        if (typeof prop === 'string') {
+            return obj[prop];
+        } else if (typeof prop === 'function') {
+            return prop(obj);
+        }
+        return null;
+    });
+
+    const filteredParts = parts.filter(
+        (part) => part !== null && part !== undefined && part !== ''
+    );
+
+    return filteredParts.join(', ');
+};
+
+const locationProperties = [
+    'postcode',
+    (obj) =>
+        obj.city
+            ? `${obj.city}${obj.province?.name ? `(${obj.province.name})` : ''}`
+            : null,
+    (obj) => obj.country?.name,
+];
+
+const modelValue = ref(
+    props.location ? formatLocation(props.location, locationProperties) : null
+);
+
+const handleModelValue = (data) => {
+    emit('update:model-value', data);
+};
 
 function showLabel(data) {
-    return `${data.code} - ${data.town}(${data.province}), ${data.country}`;
+    const dataProperties = [
+        'code',
+        (obj) => (obj.town ? `${obj.town}(${obj.province})` : null),
+        'country',
+    ];
+    return formatLocation(data, dataProperties);
 }
 </script>
 <template>
     <VnSelectDialog
-        v-model="value"
-        option-value="code"
+        v-model="modelValue"
         option-filter-value="search"
-        :option-label="(opt) => showLabel(opt)"
+        :option-label="
+            (opt) => (typeof modelValue === 'string' ? modelValue : showLabel(opt))
+        "
         url="Postcodes/filter"
+        @update:model-value="handleModelValue"
         :use-like="false"
         :label="t('Location')"
         :placeholder="t('search_by_postalcode')"
@@ -27,7 +74,14 @@ function showLabel(data) {
         :emit-value="false"
     >
         <template #form>
-            <CreateNewPostcode @on-data-saved="(newValue) => (value = newValue)" />
+            <CreateNewPostcode
+                @on-data-saved="
+                    (newValue) => {
+                        modelValue = newValue;
+                        emit('update:model-value', newValue);
+                    }
+                "
+            />
         </template>
         <template #option="{ itemProps, opt }">
             <QItem v-bind="itemProps">

From ddf42d9659d2fc0678885921ec58d38293e4dc3c Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 20 Sep 2024 13:46:07 +0200
Subject: [PATCH 135/281] feat: update VnLocation instances

---
 .../Customer/Card/CustomerFiscalData.vue      |  5 +-
 src/pages/Customer/CustomerCreate.vue         |  2 +-
 src/pages/Customer/CustomerList.vue           | 52 ++++++++++++++++---
 .../components/CustomerAddressCreate.vue      |  6 +--
 .../components/CustomerAddressEdit.vue        | 26 ++++++----
 .../Supplier/Card/SupplierAddressesCreate.vue | 13 ++++-
 .../Supplier/Card/SupplierFiscalData.vue      | 25 ++++++++-
 src/pages/Worker/WorkerList.vue               |  4 +-
 8 files changed, 106 insertions(+), 27 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerFiscalData.vue b/src/pages/Customer/Card/CustomerFiscalData.vue
index 5cc656bb3..a66fd8712 100644
--- a/src/pages/Customer/Card/CustomerFiscalData.vue
+++ b/src/pages/Customer/Card/CustomerFiscalData.vue
@@ -93,8 +93,9 @@ function handleLocation(data, location) {
             <VnRow>
                 <VnLocation
                     :rules="validate('Worker.postcode')"
-                    :roles-allowed-to-create="['deliveryAssistant']"
-                    v-model="data.postcode"
+                    :roles-allowed-to-create="['deliveryAssistant', 'administrative']"
+                    :acls="[{ model: 'Town', props: '*', accessType: 'WRITE' }]"
+                    :location="data"
                     @update:model-value="(location) => handleLocation(data, location)"
                 />
             </VnRow>
diff --git a/src/pages/Customer/CustomerCreate.vue b/src/pages/Customer/CustomerCreate.vue
index 041c92d17..79da63283 100644
--- a/src/pages/Customer/CustomerCreate.vue
+++ b/src/pages/Customer/CustomerCreate.vue
@@ -86,7 +86,7 @@ function handleLocation(data, location) {
                 <VnRow>
                     <VnLocation
                         :rules="validate('Worker.postcode')"
-                        :roles-allowed-to-create="['deliveryAssistant']"
+                        :acls="[{ model: 'Town', props: '*', accessType: 'WRITE' }]"
                         v-model="data.location"
                         @update:model-value="(location) => handleLocation(data, location)"
                     >
diff --git a/src/pages/Customer/CustomerList.vue b/src/pages/Customer/CustomerList.vue
index 0dc7f09be..f6758bf4e 100644
--- a/src/pages/Customer/CustomerList.vue
+++ b/src/pages/Customer/CustomerList.vue
@@ -2,6 +2,7 @@
 import { ref, computed, markRaw } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
+import VnSelect from 'src/components/common/VnSelect.vue';
 import VnTable from 'components/VnTable/VnTable.vue';
 import VnLocation from 'src/components/common/VnLocation.vue';
 import VnSearchbar from 'components/ui/VnSearchbar.vue';
@@ -69,7 +70,7 @@ const columns = computed(() => [
             optionFilter: 'firstName',
             useLike: false,
         },
-        create: true,
+        create: false,
         columnField: {
             component: null,
         },
@@ -195,6 +196,8 @@ const columns = computed(() => [
         component: 'select',
         attrs: {
             url: 'BusinessTypes',
+            fields: ['code', 'description'],
+            sortBy: 'description ASC ',
             optionLabel: 'description',
             optionValue: 'code',
         },
@@ -353,12 +356,13 @@ const columns = computed(() => [
             {
                 title: t('Client ticket list'),
                 icon: 'vn:ticket',
-                action: redirectToCreateView,
+                action: redirectToTicketsList,
                 isPrimary: true,
             },
             {
                 title: t('components.smartCard.viewSummary'),
                 icon: 'preview',
+                isPrimary: true,
                 action: (row) => viewSummary(row.id, CustomerSummary),
             },
         ],
@@ -366,11 +370,12 @@ const columns = computed(() => [
 ]);
 
 const { viewSummary } = useSummaryDialog();
-const redirectToCreateView = (row) => {
+const redirectToTicketsList = (row) => {
     router.push({
         name: 'TicketList',
+
         query: {
-            params: JSON.stringify({
+            table: JSON.stringify({
                 clientFk: row.id,
             }),
         },
@@ -395,10 +400,10 @@ function handleLocation(data, location) {
     <VnTable
         ref="tableRef"
         data-key="Customer"
-        url="Clients/extendedListFilter"
+        url="Clients/filter"
         :create="{
             urlCreate: 'Clients/createWithUser',
-            title: 'Create client',
+            title: t('globals.pageTitles.customerCreate'),
             onDataSaved: ({ id }) => tableRef.redirect(id),
             formInitialData: {
                 active: true,
@@ -411,8 +416,41 @@ function handleLocation(data, location) {
         auto-load
     >
         <template #more-create-dialog="{ data }">
+            <VnSelect
+                url="Workers/search"
+                v-model="data.salesPersonFk"
+                :label="t('customer.basicData.salesPerson')"
+                :params="{
+                    departmentCodes: ['VT', 'shopping'],
+                }"
+                :fields="['id', 'nickname']"
+                sort-by="nickname ASC"
+                :use-like="false"
+                emit-value
+                auto-load
+            >
+                <template #prepend>
+                    <VnAvatar
+                        :worker-id="data.salesPersonFk"
+                        color="primary"
+                        :title="title"
+                    />
+                </template>
+                <template #option="scope">
+                    <QItem v-bind="scope.itemProps">
+                        <QItemSection>
+                            <QItemLabel>{{ scope.opt?.name }}</QItemLabel>
+                            <QItemLabel caption
+                                >{{ scope.opt?.nickname }},
+                                {{ scope.opt?.code }}</QItemLabel
+                            >
+                        </QItemSection>
+                    </QItem>
+                </template>
+            </VnSelect>
+
             <VnLocation
-                :roles-allowed-to-create="['deliveryAssistant']"
+                :acls="[{ model: 'Province', props: '*', accessType: 'WRITE' }]"
                 v-model="data.location"
                 @update:model-value="(location) => handleLocation(data, location)"
             />
diff --git a/src/pages/Customer/components/CustomerAddressCreate.vue b/src/pages/Customer/components/CustomerAddressCreate.vue
index 30e4b21d0..7826c3579 100644
--- a/src/pages/Customer/components/CustomerAddressCreate.vue
+++ b/src/pages/Customer/components/CustomerAddressCreate.vue
@@ -57,12 +57,12 @@ function handleLocation(data, location) {
 </script>
 
 <template>
-    <fetch-data
+    <FetchData
         @on-fetch="(data) => (agencyModes = data)"
         auto-load
         url="AgencyModes/isActive"
     />
-    <fetch-data @on-fetch="(data) => (incoterms = data)" auto-load url="Incoterms" />
+    <FetchData @on-fetch="(data) => (incoterms = data)" auto-load url="Incoterms" />
 
     <FormModel
         :form-initial-data="formInitialData"
@@ -92,7 +92,7 @@ function handleLocation(data, location) {
 
             <VnLocation
                 :rules="validate('Worker.postcode')"
-                :roles-allowed-to-create="['deliveryAssistant']"
+                :acls="[{ model: 'Town', props: '*', accessType: 'WRITE' }]"
                 v-model="data.location"
                 @update:model-value="(location) => handleLocation(data, location)"
             />
diff --git a/src/pages/Customer/components/CustomerAddressEdit.vue b/src/pages/Customer/components/CustomerAddressEdit.vue
index 7a4c44014..82a190ae1 100644
--- a/src/pages/Customer/components/CustomerAddressEdit.vue
+++ b/src/pages/Customer/components/CustomerAddressEdit.vue
@@ -113,18 +113,18 @@ function handleLocation(data, location) {
 </script>
 
 <template>
-    <fetch-data
+    <FetchData
         @on-fetch="(data) => (agencyModes = data)"
         auto-load
         url="AgencyModes/isActive"
     />
-    <fetch-data @on-fetch="(data) => (incoterms = data)" auto-load url="Incoterms" />
-    <fetch-data
+    <FetchData @on-fetch="(data) => (incoterms = data)" auto-load url="Incoterms" />
+    <FetchData
         @on-fetch="(data) => (customsAgents = data)"
         auto-load
         url="CustomsAgents"
     />
-    <fetch-data @on-fetch="getData" auto-load url="ObservationTypes" />
+    <FetchData @on-fetch="getData" auto-load url="ObservationTypes" />
 
     <FormModel
         :observe-form-changes="false"
@@ -176,8 +176,13 @@ function handleLocation(data, location) {
                 <div class="col">
                     <VnLocation
                         :rules="validate('Worker.postcode')"
-                        :roles-allowed-to-create="['deliveryAssistant']"
-                        v-model="data.postalCode"
+                        :acls="[{ model: 'Town', props: '*', accessType: 'WRITE' }]"
+                        :location="{
+                            postcode: data.postalCode,
+                            city: data.city,
+                            province: data.province,
+                            country: data.province.country,
+                        }"
                         @update:model-value="(location) => handleLocation(data, location)"
                     ></VnLocation>
                 </div>
@@ -267,16 +272,17 @@ function handleLocation(data, location) {
                 </div>
             </VnRow>
 
-            <QIcon
+            <QBtn
                 @click.stop="addNote()"
                 class="cursor-pointer add-icon q-mt-md"
-                name="add"
-                size="sm"
+                flat
+                icon="add"
+                shortcut="+"
             >
                 <QTooltip>
                     {{ t('Add note') }}
                 </QTooltip>
-            </QIcon>
+            </QBtn>
         </template>
     </FormModel>
 </template>
diff --git a/src/pages/Supplier/Card/SupplierAddressesCreate.vue b/src/pages/Supplier/Card/SupplierAddressesCreate.vue
index da6549a24..0feceb74a 100644
--- a/src/pages/Supplier/Card/SupplierAddressesCreate.vue
+++ b/src/pages/Supplier/Card/SupplierAddressesCreate.vue
@@ -21,6 +21,7 @@ const newAddressForm = reactive({
     provinceFk: null,
     phone: null,
     mobile: null,
+    province: null,
 });
 
 const onDataSaved = () => {
@@ -84,7 +85,17 @@ function handleLocation(data, location) {
                     <VnLocation
                         :rules="validate('Worker.postcode')"
                         :roles-allowed-to-create="['deliveryAssistant']"
-                        v-model="data.location"
+                        :acls="[{ model: 'Town', props: '*', accessType: 'WRITE' }]"
+                        :location="
+                            data.postalCode
+                                ? {
+                                      postcode: data.postalCode,
+                                      city: data.city,
+                                      province: data.province,
+                                      country: data.province.country,
+                                  }
+                                : null
+                        "
                         @update:model-value="(location) => handleLocation(data, location)"
                     >
                     </VnLocation>
diff --git a/src/pages/Supplier/Card/SupplierFiscalData.vue b/src/pages/Supplier/Card/SupplierFiscalData.vue
index bcce93e53..396cf15a2 100644
--- a/src/pages/Supplier/Card/SupplierFiscalData.vue
+++ b/src/pages/Supplier/Card/SupplierFiscalData.vue
@@ -51,6 +51,23 @@ function handleLocation(data, location) {
         :url="`Suppliers/${route.params.id}`"
         :url-update="`Suppliers/${route.params.id}/updateFiscalData`"
         model="supplier"
+        :filter="{
+            fields: ['id', 'name', 'city', 'postCode', 'countryFk', 'provinceFk'],
+            include: [
+                {
+                    relation: 'province',
+                    scope: {
+                        fields: ['id', 'name'],
+                    },
+                },
+                {
+                    relation: 'country',
+                    scope: {
+                        fields: ['id', 'name'],
+                    },
+                },
+            ],
+        }"
         auto-load
         :clear-store-on-unmount="false"
     >
@@ -130,7 +147,13 @@ function handleLocation(data, location) {
                 <VnLocation
                     :rules="validate('Worker.postcode')"
                     :roles-allowed-to-create="['deliveryAssistant', 'administrative']"
-                    v-model="data.postCode"
+                    :acls="[{ model: 'Town', props: '*', accessType: 'WRITE' }]"
+                    :location="{
+                        postcode: data.postCode,
+                        city: data.city,
+                        province: data.province,
+                        country: data.country,
+                    }"
                     @update:model-value="(location) => handleLocation(data, location)"
                 >
                 </VnLocation>
diff --git a/src/pages/Worker/WorkerList.vue b/src/pages/Worker/WorkerList.vue
index 91d96a162..6b3b117b6 100644
--- a/src/pages/Worker/WorkerList.vue
+++ b/src/pages/Worker/WorkerList.vue
@@ -263,8 +263,8 @@ async function autofillBic(worker) {
                 <VnRow>
                     <VnLocation
                         :roles-allowed-to-create="['deliveryAssistant']"
+                        :acls="[{ model: 'Town', props: '*', accessType: 'WRITE' }]"
                         :options="postcodesOptions"
-                        v-model="data.location"
                         @update:model-value="(location) => handleLocation(data, location)"
                         :disable="data.isFreelance"
                     >
@@ -311,7 +311,7 @@ async function autofillBic(worker) {
                         option-label="name"
                         option-value="id"
                         hide-selected
-                        :roles-allowed-to-create="['salesAssistant', 'hr']"
+                        :acls="[{ model: 'BankEntity', props: '*', accessType: 'WRITE' }]"
                         :disable="data.isFreelance"
                         @update:model-value="autofillBic(data)"
                         :filter-options="['bic', 'name']"

From deff8a1cf407a1660db06d5fe51d7b0ccab43a98 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 20 Sep 2024 13:58:26 +0200
Subject: [PATCH 136/281] feat: hide menus on small view

---
 src/components/VnTable/VnTable.vue      | 2 +-
 src/components/common/VnSectionMain.vue | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 3e982919b..a3b64d264 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -147,7 +147,7 @@ onMounted(() => {
         quasar.platform.is.mobile && !$props.disableOption?.card
             ? CARD_MODE
             : $props.defaultMode;
-    stateStore.rightDrawer = true;
+    stateStore.rightDrawer = quasar.screen.gt.xs;
     columnsVisibilitySkipped.value = [
         ...splittedColumns.value.columns
             .filter((c) => c.visible == false)
diff --git a/src/components/common/VnSectionMain.vue b/src/components/common/VnSectionMain.vue
index 9975b1011..15be6ad9a 100644
--- a/src/components/common/VnSectionMain.vue
+++ b/src/components/common/VnSectionMain.vue
@@ -2,6 +2,7 @@
 import { useStateStore } from 'stores/useStateStore';
 import LeftMenu from 'components/LeftMenu.vue';
 import { onMounted } from 'vue';
+import { useQuasar } from 'quasar';
 
 const stateStore = useStateStore();
 const $props = defineProps({
@@ -10,7 +11,9 @@ const $props = defineProps({
         default: true,
     },
 });
-onMounted(() => (stateStore.leftDrawer = $props.leftDrawer));
+onMounted(
+    () => (stateStore.leftDrawer = useQuasar().screen.gt.xs ? $props.leftDrawer : false)
+);
 </script>
 
 <template>

From edea17340dbbb388faae05ba386c8f206758cd0c Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 20 Sep 2024 14:33:59 +0200
Subject: [PATCH 137/281] refactor: refs #7553 adjust ticket notes view  in
 summary

---
 src/pages/Ticket/Card/TicketSummary.vue | 5 +++--
 src/pages/Ticket/TicketList.vue         | 2 ++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index fc107c315..b6a60122c 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -281,6 +281,7 @@ function toTicketUrl(section) {
                             type="textarea"
                             class="notes"
                             readonly
+                            autogrow
                         />
                     </template>
                 </VnLv>
@@ -377,7 +378,7 @@ function toTicketUrl(section) {
                                     </QTooltip>
                                 </QIcon>
                                 <QIcon
-                                    name="vn:reserva"
+                                    name="vn:reserved"
                                     v-show="props.row.reserved"
                                     color="primary"
                                     size="xs"
@@ -576,7 +577,7 @@ function toTicketUrl(section) {
 </template>
 <style lang="scss" scoped>
 .notes {
-    width: max-content;
+    width: fit-content;
 }
 
 .q-card.q-card--dark.q-dark.vn-one {
diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index 1cb46582d..0fac89550 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -36,6 +36,7 @@ const selectedClient = ref();
 const stateStore = useStateStore();
 const from = Date.vnNew();
 from.setHours(0, 0, 0, 0);
+from.setDate(from.getDate() - 7);
 const to = Date.vnNew();
 to.setHours(23, 59, 0, 0);
 to.setDate(to.getDate() + 1);
@@ -68,6 +69,7 @@ const columns = computed(() => [
         name: 'statusIcons',
         hidden: true,
         format: () => '',
+        columnClass: 'expand',
     },
     {
         align: 'left',

From df56eefe2f0ab236f475fd177ec22e0e9c435e14 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 20 Sep 2024 15:46:54 +0200
Subject: [PATCH 138/281] fix: refs #7353 fine tunning ui

---
 src/pages/Monitor/MonitorClients.vue | 2 +-
 src/pages/Monitor/MonitorOrders.vue  | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/pages/Monitor/MonitorClients.vue b/src/pages/Monitor/MonitorClients.vue
index e98e11c6d..c1958cdcb 100644
--- a/src/pages/Monitor/MonitorClients.vue
+++ b/src/pages/Monitor/MonitorClients.vue
@@ -143,7 +143,7 @@ const columns = computed(() => [
     margin-bottom: 0;
     flex-direction: row;
     > * {
-        max-width: 105px;
+        max-width: 125px;
     }
 }
 </style>
diff --git a/src/pages/Monitor/MonitorOrders.vue b/src/pages/Monitor/MonitorOrders.vue
index eb455a239..52d442d0a 100644
--- a/src/pages/Monitor/MonitorOrders.vue
+++ b/src/pages/Monitor/MonitorOrders.vue
@@ -132,7 +132,6 @@ const openTab = (id) =>
         :table="{
             'row-key': 'id',
             selection: 'multiple',
-            'hide-bottom': true,
         }"
         default-mode="table"
         :row-click="({ id }) => openTab(id)"

From 6cc8ca6731e0b691d0862dad0953366a8bf32d08 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 20 Sep 2024 17:38:02 +0200
Subject: [PATCH 139/281] chore: refs #7702 add tests

---
 src/components/common/VnChangePassword.vue    |  6 +++++
 .../common/VnChangePassword.spec.js           | 26 ++++++++++++++-----
 2 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/src/components/common/VnChangePassword.vue b/src/components/common/VnChangePassword.vue
index a36c6bcff..18f538fc3 100644
--- a/src/components/common/VnChangePassword.vue
+++ b/src/components/common/VnChangePassword.vue
@@ -19,6 +19,8 @@ const isLoading = ref(false);
 
 const validate = async () => {
     const { newPassword, repeatPassword } = passwords.value;
+    console.log('Validating passwords:', newPassword, repeatPassword);
+
     if (!newPassword) {
         notify(t('You must enter a new password'), 'negative');
         return;
@@ -29,11 +31,15 @@ const validate = async () => {
     }
     try {
         isLoading.value = true;
+        console.log('Calling submitFn with:', newPassword);
+
         await props.submitFn(newPassword);
         emit('onSubmit');
     } catch (e) {
+        console.error('submitFn failed:', e);
         notify('errors.writeRequest', 'negative');
     } finally {
+        console.log('Entering finally block');
         changePassDialog.value.hide();
         isLoading.value = false;
     }
diff --git a/test/vitest/__tests__/components/common/VnChangePassword.spec.js b/test/vitest/__tests__/components/common/VnChangePassword.spec.js
index a481efa81..e7a3bdcf7 100644
--- a/test/vitest/__tests__/components/common/VnChangePassword.spec.js
+++ b/test/vitest/__tests__/components/common/VnChangePassword.spec.js
@@ -1,11 +1,15 @@
-import { createWrapper } from 'app/test/vitest/helper';
+import { createWrapper, axios } from 'app/test/vitest/helper';
 import VnChangePassword from 'src/components/common/VnChangePassword.vue';
-import { vi, afterEach, beforeAll, describe, expect, it } from 'vitest';
+import { vi, beforeEach, afterEach, beforeAll, describe, expect, it } from 'vitest';
+import { Notify } from 'quasar';
 
 describe('VnSmsDialog', () => {
     let vm;
 
     beforeAll(() => {
+        vi.spyOn(axios, 'get').mockResolvedValue({
+            data: [],
+        });
         vm = createWrapper(VnChangePassword, {
             propsData: {
                 submitFn: vi.fn(),
@@ -13,6 +17,10 @@ describe('VnSmsDialog', () => {
         }).vm;
     });
 
+    beforeEach(() => {
+        Notify.create = vi.fn();
+    });
+
     afterEach(() => {
         vi.clearAllMocks();
     });
@@ -20,10 +28,10 @@ describe('VnSmsDialog', () => {
     it('should notify when new password is empty', async () => {
         vm.passwords.newPassword = '';
         vm.passwords.repeatPassword = 'password';
-        vi.spyOn(vm, 'notify');
+
         await vm.validate();
-        expect(vm.notify).toHaveBeenCalledWith(
-            expect.arguments({
+        expect(Notify.create).toHaveBeenCalledWith(
+            expect.objectContaining({
                 message: 'You must enter a new password',
                 type: 'negative',
             })
@@ -33,9 +41,13 @@ describe('VnSmsDialog', () => {
     it("should notify when passwords don't match", async () => {
         vm.passwords.newPassword = 'password1';
         vm.passwords.repeatPassword = 'password2';
-        vi.spyOn(vm, 'notify');
         await vm.validate();
-        expect(vm.notify).toHaveBeenCalledWith("Passwords don't match", 'negative');
+        expect(Notify.create).toHaveBeenCalledWith(
+            expect.objectContaining({
+                message: `Passwords don't match`,
+                type: 'negative',
+            })
+        );
     });
 
     it('should call submitFn and emit onSubmit when passwords match', async () => {

From f84444d894f61c67bc04bc3ac48cb66d0ebe419b Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Sat, 21 Sep 2024 01:22:25 +0200
Subject: [PATCH 140/281] feat: add tooltip CustomerNewCustomAgent

---
 src/pages/Customer/components/CustomerAddressCreate.vue | 1 +
 src/pages/Customer/components/CustomerAddressEdit.vue   | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/pages/Customer/components/CustomerAddressCreate.vue b/src/pages/Customer/components/CustomerAddressCreate.vue
index 7826c3579..659114744 100644
--- a/src/pages/Customer/components/CustomerAddressCreate.vue
+++ b/src/pages/Customer/components/CustomerAddressCreate.vue
@@ -134,6 +134,7 @@ function handleLocation(data, location) {
                     option-label="fiscalName"
                     option-value="id"
                     v-model="data.customsAgentFk"
+                    :tooltip="t('Create a new expense')"
                 >
                     <template #form>
                         <CustomerNewCustomsAgent @on-data-saved="refreshData()" />
diff --git a/src/pages/Customer/components/CustomerAddressEdit.vue b/src/pages/Customer/components/CustomerAddressEdit.vue
index 82a190ae1..606867388 100644
--- a/src/pages/Customer/components/CustomerAddressEdit.vue
+++ b/src/pages/Customer/components/CustomerAddressEdit.vue
@@ -11,7 +11,7 @@ import VnRow from 'components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import VnSelectDialog from 'src/components/common/VnSelectDialog.vue';
-import CustomsNewCustomsAgent from 'src/pages/Customer/components/CustomerNewCustomsAgent.vue';
+import CustomerNewCustomsAgent from 'src/pages/Customer/components/CustomerNewCustomsAgent.vue';
 
 const { t } = useI18n();
 const route = useRoute();
@@ -226,9 +226,10 @@ function handleLocation(data, location) {
                         option-label="fiscalName"
                         option-value="id"
                         v-model="data.customsAgentFk"
+                        :tooltip="t('New customs agent')"
                     >
                         <template #form>
-                            <CustomsNewCustomsAgent />
+                            <CustomerNewCustomsAgent />
                         </template>
                     </VnSelectDialog>
                 </div>
@@ -309,6 +310,7 @@ es:
     Mobile: Movíl
     Incoterms: Incoterms
     Customs agent: Agente de aduanas
+    New customs agent: Nuevo agente de aduanas
     Notes: Notas
     Observation type: Tipo de observación
     Description: Descripción

From d81d562edf153aace8e73d847542e0aa131f46c5 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Sat, 21 Sep 2024 01:30:37 +0200
Subject: [PATCH 141/281] feat: goToSupplier

---
 src/pages/Customer/Card/CustomerDescriptor.vue | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/pages/Customer/Card/CustomerDescriptor.vue b/src/pages/Customer/Card/CustomerDescriptor.vue
index b18f90d20..43103bd68 100644
--- a/src/pages/Customer/Card/CustomerDescriptor.vue
+++ b/src/pages/Customer/Card/CustomerDescriptor.vue
@@ -190,6 +190,18 @@ const setData = (entity) => (data.value = useCardDescription(entity?.name, entit
                 >
                     <QTooltip>{{ t('Go to user') }}</QTooltip>
                 </QBtn>
+                <QBtn
+                    v-if="entity.supplier"
+                    :to="{
+                        name: 'SupplierSummary',
+                        params: { id: entity.supplier.id },
+                    }"
+                    size="md"
+                    icon="vn:supplier"
+                    color="primary"
+                >
+                    <QTooltip>{{ t('Go to supplier') }}</QTooltip>
+                </QBtn>
             </QCardActions>
         </template>
     </CardDescriptor>
@@ -204,6 +216,7 @@ es:
     Customer ticket list: Listado de tickets del cliente
     Customer invoice out list: Listado de facturas del cliente
     Go to user: Ir al usuario
+    Go to supplier: Ir al proveedor
     Customer unpaid: Cliente impago
     Unpaid: Impagado
     unpaidDated: 'Fecha {dated}'

From 8bbea9c90355695acbf5b9f8fd365a51722fa376 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 23 Sep 2024 09:47:54 +0200
Subject: [PATCH 142/281] feat: change order

---
 src/pages/Customer/Card/CustomerFiscalData.vue | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerFiscalData.vue b/src/pages/Customer/Card/CustomerFiscalData.vue
index d8c07a46f..3a62fd954 100644
--- a/src/pages/Customer/Card/CustomerFiscalData.vue
+++ b/src/pages/Customer/Card/CustomerFiscalData.vue
@@ -122,6 +122,13 @@ function handleLocation(data, location) {
                 />
             </VnRow>
 
+            <VnRow>
+                <QCheckbox
+                    :label="t('Electronic invoice')"
+                    v-model="data.hasElectronicInvoice"
+                />
+                <QCheckbox :label="t('Daily invoice')" v-model="data.hasDailyInvoice" />
+            </VnRow>
             <VnRow>
                 <div>
                     <QCheckbox
@@ -136,14 +143,6 @@ function handleLocation(data, location) {
                 </div>
                 <QCheckbox :label="t('Verified data')" v-model="data.isTaxDataChecked" />
             </VnRow>
-
-            <VnRow>
-                <QCheckbox
-                    :label="t('Electronic invoice')"
-                    v-model="data.hasElectronicInvoice"
-                />
-                <QCheckbox :label="t('Daily invoice')" v-model="data.hasDailyInvoice" />
-            </VnRow>
         </template>
     </FormModel>
 </template>

From 17bb144bce5087508a6f4612836b445f09390f9d Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Mon, 23 Sep 2024 10:04:45 +0200
Subject: [PATCH 143/281] fix: refs #7404 translates and some minor style fixes

---
 src/i18n/locale/es.yml                        |   1 +
 src/pages/Entry/EntryStockBought.vue          | 108 +++++++++---------
 src/pages/Entry/EntryStockBoughtDetail.vue    |  23 +++-
 .../integration/entry/stockBought.spec.js     |   2 -
 4 files changed, 75 insertions(+), 59 deletions(-)

diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 53b487e9f..423775658 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -162,6 +162,7 @@ globals:
         dms: Gestión documental
         entryCreate: Nueva entrada
         latestBuys: Últimas compras
+        reserves: Reservas
         tickets: Tickets
         ticketCreate: Nuevo ticket
         boxing: Encajado
diff --git a/src/pages/Entry/EntryStockBought.vue b/src/pages/Entry/EntryStockBought.vue
index 5b4d43e06..5027ad511 100644
--- a/src/pages/Entry/EntryStockBought.vue
+++ b/src/pages/Entry/EntryStockBought.vue
@@ -54,7 +54,6 @@ const columns = [
         create: true,
         component: 'number',
         summation: true,
-        cardVisible: true,
     },
     {
         align: 'left',
@@ -101,14 +100,9 @@ const travel = ref(null);
 const userParams = ref({
     dated: Date.vnNew(),
 });
+
 const filter = ref({
-    where: {
-        shipped: (userParams.value.dated
-            ? new Date(userParams.value.dated)
-            : Date.vnNew()
-        ).setHours(0, 0, 0, 0),
-        m3: { neq: null },
-    },
+    fields: ['id', 'm3', 'warehouseInFk'],
     include: [
         {
             relation: 'warehouseIn',
@@ -117,6 +111,13 @@ const filter = ref({
             },
         },
     ],
+    where: {
+        shipped: (userParams.value.dated
+            ? new Date(userParams.value.dated)
+            : Date.vnNew()
+        ).setHours(0, 0, 0, 0),
+        m3: { neq: null },
+    },
 });
 
 const setUserParams = async ({ dated }) => {
@@ -139,7 +140,7 @@ function openDialog() {
                 :filter="filter"
                 @on-fetch="
                     (data) => {
-                        travel = data.filter((data) => data.warehouseIn.code === 'VNH');
+                        travel = data.find((data) => data.warehouseIn.code === 'VNH');
                     }
                 "
             />
@@ -149,10 +150,10 @@ function openDialog() {
                         {{ t('Booked trucks') }}:
                     </span>
                     <span>
-                        {{ travel[0]?.m3 }}
+                        {{ travel?.m3 }}
                     </span>
                     <QBtn
-                        v-if="travel[0]?.m3"
+                        v-if="travel?.m3"
                         style="max-width: 20%"
                         flat
                         icon="edit"
@@ -166,10 +167,10 @@ function openDialog() {
     </VnSubToolbar>
     <QDialog v-model="travelDialogRef" :maximized="true" :class="['vn-row', 'wrap']">
         <FormModelPopup
-            :url-update="`Travels/${travel[0].id}`"
+            :url-update="`Travels/${travel?.id}`"
             model="travel"
             :title="t('Travel m3')"
-            :form-initial-data="{ id: travel[0].id, m3: travel[0].m3 }"
+            :form-initial-data="{ id: travel?.id, m3: travel?.m3 }"
             @on-data-saved="fetchDataRef.fetch()"
         >
             <template #form-inputs="{ data }">
@@ -192,51 +193,56 @@ function openDialog() {
             />
         </template>
     </RightMenu>
-    <QPage class="column items-center q-pa-md">
-        <VnTable
-            ref="tableRef"
-            data-key="StockBoughts"
-            url="StockBoughts/getStockBought"
-            save-url="StockBoughts/crud"
-            order="reserve DESC"
-            :right-search="false"
-            :is-editable="true"
-            :create="{
-                urlCreate: 'StockBoughts',
-                title: t('Reserve some space'),
-                onDataSaved: () => tableRef.reload(),
-                formInitialData: {
-                    workerFk: user.id,
-                    dated: Date.vnNow(),
-                },
-            }"
-            :columns="columns"
-            :user-params="userParams"
-            :footer="true"
-            auto-load
-        >
-            <template #column-workerFk="{ row }">
-                <span class="link" @click.stop>
-                    {{ row?.worker?.user?.name }}
-                    <WorkerDescriptorProxy :id="row?.workerFk" />
-                </span>
-            </template>
-        </VnTable>
-    </QPage>
+    <div class="table-container">
+        <QPage class="column items-center q-pa-md">
+            <VnTable
+                ref="tableRef"
+                data-key="StockBoughts"
+                url="StockBoughts/getStockBought"
+                save-url="StockBoughts/crud"
+                order="reserve DESC"
+                :right-search="false"
+                :is-editable="true"
+                :create="{
+                    urlCreate: 'StockBoughts',
+                    title: t('Reserve some space'),
+                    onDataSaved: () => tableRef.reload(),
+                    formInitialData: {
+                        workerFk: user.id,
+                        dated: Date.vnNow(),
+                    },
+                }"
+                :columns="columns"
+                :user-params="userParams"
+                :footer="true"
+                auto-load
+            >
+                <template #column-workerFk="{ row }">
+                    <span class="link" @click.stop>
+                        {{ row?.worker?.user?.name }}
+                        <WorkerDescriptorProxy :id="row?.workerFk" />
+                    </span>
+                </template>
+            </VnTable>
+        </QPage>
+    </div>
 </template>
 <style lang="css" scoped>
 .travel {
     margin-bottom: 0px;
 }
+.table-container {
+    display: flex;
+    justify-content: center;
+}
+.column {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    width: 40%;
+}
 </style>
 <i18n>
-    en:
-        Buyer: Buyer
-        Reserve: Reserve
-        Bought: Bought
-        More: More
-        Date: Date
-        This buyer has already made a reservation for this date: This buyer has already made a reservation for this date
     es:
         Edit travel: Editar envío
         Travel: Envíos
diff --git a/src/pages/Entry/EntryStockBoughtDetail.vue b/src/pages/Entry/EntryStockBoughtDetail.vue
index 744b9d3fe..9489c2362 100644
--- a/src/pages/Entry/EntryStockBoughtDetail.vue
+++ b/src/pages/Entry/EntryStockBoughtDetail.vue
@@ -22,7 +22,7 @@ const customUrl = `StockBoughts/getStockBoughtDetail?workerFk=${$props.workerFk}
 const columns = [
     {
         align: 'left',
-        label: 'Entry',
+        label: t('Entry'),
         name: 'entryFk',
         isTitle: true,
         isId: true,
@@ -41,24 +41,28 @@ const columns = [
         create: true,
         columnClass: 'expand',
         columnFilter: false,
+        cardVisible: true,
     },
     {
         align: 'left',
         name: 'volume',
         label: t('Volume'),
         columnFilter: false,
+        cardVisible: true,
     },
     {
         align: 'left',
         label: t('Packaging'),
         name: 'packagingFk',
         columnFilter: false,
+        cardVisible: true,
     },
     {
         align: 'left',
         label: 'Packing',
         name: 'packing',
         columnFilter: false,
+        cardVisible: true,
     },
 ];
 </script>
@@ -73,18 +77,20 @@ const columns = [
                 :columns="columns"
                 :right-search="false"
                 :disable-infinite-scroll="true"
-                :disable-option="{ card: true }"
                 :limit="0"
                 auto-load
             >
+                <template #top-left>
+                    <QBtn flat icon="Close" v-close-popup />
+                </template>
                 <template #column-entryFk="{ row }">
-                    <span class="link" @click.stop>
+                    <span class="link">
                         {{ row?.entryFk }}
                         <EntryDescriptorProxy :id="row.entryFk" />
                     </span>
                 </template>
                 <template #column-itemName="{ row }">
-                    <span class="link" @click.stop>
+                    <span class="link">
                         {{ row?.itemName }}
                         <ItemDescriptorProxy :id="row.itemFk" />
                     </span>
@@ -93,8 +99,8 @@ const columns = [
         </div>
     </QDialog>
 </template>
-<style lang="css">
-.q-dialog__inner {
+<style lang="css" scoped>
+.container {
     max-width: 50vw;
     overflow: auto;
     display: flex;
@@ -110,4 +116,9 @@ const columns = [
         Bought: Comprado
         More: Más
         Date: Fecha
+        Entry: Entrada
+        Item: Artículo
+        Name: Nombre
+        Volume: Volumen
+        Packaging: Embalage 
 </i18n>
diff --git a/test/cypress/integration/entry/stockBought.spec.js b/test/cypress/integration/entry/stockBought.spec.js
index b93afa520..66e06b79e 100644
--- a/test/cypress/integration/entry/stockBought.spec.js
+++ b/test/cypress/integration/entry/stockBought.spec.js
@@ -6,7 +6,6 @@ describe('EntryStockBought', () => {
     });
     it('Should edit the reserved space', () => {
         cy.get('.q-field__native.q-placeholder').should('have.value', '01/01/2001');
-        cy.get('tBody > tr').its('length').should('eq', 2);
         cy.get('input[name="reserve"]').type('10{enter}');
         cy.get('button[title="Save"]').click();
         cy.get('.q-notification__message').should('have.text', 'Data saved');
@@ -18,7 +17,6 @@ describe('EntryStockBought', () => {
         cy.get('input[aria-label="Date"]').eq(1).type('01-01');
         cy.get('input[aria-label="Buyer"]').type('buyerboss{downarrow}{enter}');
         cy.get('.q-notification__message').should('have.text', 'Data created');
-        cy.get('tBody > tr').its('length').should('eq', 3);
     });
     it('Should check detail for the buyer', () => {
         cy.get(':nth-child(1) > .sticky > .q-btn > .q-btn__content > .q-icon').click();

From f025b4361ee7fb69eee4689ad73102cdb1a38b4b Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Mon, 23 Sep 2024 10:21:30 +0200
Subject: [PATCH 144/281] refactor: refs #7553 last requested changes

---
 src/components/VnTable/VnTable.vue            | 15 ++++++++---
 src/i18n/locale/es.yml                        |  2 +-
 src/pages/Order/OrderList.vue                 | 11 +++++++-
 src/pages/Ticket/Card/TicketDescriptor.vue    |  4 +--
 .../Ticket/Card/TicketDescriptorMenu.vue      |  5 ++++
 src/pages/Ticket/Card/TicketSale.vue          | 27 +++++++------------
 src/pages/Ticket/Card/TicketService.vue       | 10 ++++---
 src/pages/Ticket/TicketAdvance.vue            |  1 -
 src/pages/Ticket/TicketList.vue               |  3 ++-
 9 files changed, 47 insertions(+), 31 deletions(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 46910f685..848e5b49f 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -106,6 +106,10 @@ const $props = defineProps({
         type: Boolean,
         default: false,
     },
+    disabledAttr: {
+        type: Boolean,
+        default: false,
+    },
 });
 const { t } = useI18n();
 const stateStore = useStateStore();
@@ -529,18 +533,21 @@ function handleOnDataSaved(_) {
                 </template>
                 <template #bottom v-if="bottom">
                     <slot name="bottom-table">
-                        <QIcon
+                        <QBtn
                             @click="
                                 () =>
                                     createAsDialog
                                         ? (showForm = !showForm)
                                         : handleOnDataSaved(create)
                             "
-                            class="fill-icon-on-hover"
+                            class="cursor-pointer fill-icon"
                             color="primary"
-                            name="add_circle"
-                            size="sm"
+                            icon="add_circle"
+                            size="md"
+                            round
+                            flat
                             shortcut="+"
+                            :disabled="!disabledAttr"
                         />
                         <QTooltip>
                             {{ createForm.title }}
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index e704a682a..8c8b3e6ff 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -559,7 +559,7 @@ ticket:
         purchaseRequest: Petición de compra
         service: Servicio
         description: Descripción
-        attender: Comprador
+        attender: Consignatario
     create:
         client: Cliente
         address: Dirección
diff --git a/src/pages/Order/OrderList.vue b/src/pages/Order/OrderList.vue
index f5c8a44de..7d1fd0056 100644
--- a/src/pages/Order/OrderList.vue
+++ b/src/pages/Order/OrderList.vue
@@ -14,13 +14,15 @@ import OrderFilter from './Card/OrderFilter.vue';
 import CustomerDescriptorProxy from '../Customer/Card/CustomerDescriptorProxy.vue';
 import WorkerDescriptorProxy from '../Worker/Card/WorkerDescriptorProxy.vue';
 import { toDateTimeFormat } from 'src/filters/date';
+import { onMounted } from 'vue';
+import { useRoute } from 'vue-router';
 
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
 const tableRef = ref();
 const agencyList = ref([]);
 const addressesList = ref([]);
-
+const route = useRoute();
 const columns = computed(() => [
     {
         align: 'left',
@@ -168,6 +170,13 @@ const getDateColor = (date) => {
     if (comparation == 0) return 'bg-warning';
     if (comparation < 0) return 'bg-success';
 };
+
+onMounted(() => {
+    if (!route.query.createForm) return;
+    const clientId = route.query.createForm;
+    const id = JSON.parse(clientId);
+    fetchClientAddress(id.clientFk, id);
+});
 </script>
 <template>
     <OrderSearchbar />
diff --git a/src/pages/Ticket/Card/TicketDescriptor.vue b/src/pages/Ticket/Card/TicketDescriptor.vue
index 3855240cb..70fd9ab1e 100644
--- a/src/pages/Ticket/Card/TicketDescriptor.vue
+++ b/src/pages/Ticket/Card/TicketDescriptor.vue
@@ -156,7 +156,7 @@ function ticketFilter(ticket) {
             <VnLv :label="t('ticket.card.alias')" :value="entity.nickname" />
         </template>
         <template #icons="{ entity }">
-            <QCardActions>
+            <QCardActions class="q-gutter-x-xs">
                 <QIcon
                     v-if="entity.client.isActive == false"
                     name="vn:disabled"
@@ -224,7 +224,7 @@ function ticketFilter(ticket) {
                     :to="{
                         name: 'OrderList',
                         query: {
-                            createForm: JSON.stringify({}),
+                            createForm: JSON.stringify({ clientFk: entity.clientFk }),
                         },
                     }"
                 >
diff --git a/src/pages/Ticket/Card/TicketDescriptorMenu.vue b/src/pages/Ticket/Card/TicketDescriptorMenu.vue
index 705d8df7d..12e03551b 100644
--- a/src/pages/Ticket/Card/TicketDescriptorMenu.vue
+++ b/src/pages/Ticket/Card/TicketDescriptorMenu.vue
@@ -89,6 +89,7 @@ const actions = {
             notify({
                 message: t('You can undo this action within the first hour'),
                 icon: 'info',
+                type: 'warning',
             });
 
             push({ name: 'TicketList' });
@@ -190,6 +191,8 @@ function openConfirmDialog(callback) {
     dialog({
         component: VnConfirm,
         componentProps: {
+            title: t('This ticket will be removed from current route! Continue anyway?'),
+            message: t('You are going to delete this ticket'),
             promise: actions[callback],
         },
     });
@@ -689,4 +692,6 @@ es:
     Weight set: Peso establecido
     This ticket may be invoiced, do you want to continue?: Es posible que se facture este ticket, desea continuar?
     invoiceIds: "Se han generado las facturas con los siguientes ids: {invoiceIds}"
+    This ticket will be removed from current route! Continue anyway?: ¡Se eliminará el ticket de la ruta actual! ¿Continuar de todas formas?
+    You are going to delete this ticket: Vas a eliminar este ticket
 </i18n>
diff --git a/src/pages/Ticket/Card/TicketSale.vue b/src/pages/Ticket/Card/TicketSale.vue
index e8a6d27da..767c31cdd 100644
--- a/src/pages/Ticket/Card/TicketSale.vue
+++ b/src/pages/Ticket/Card/TicketSale.vue
@@ -388,8 +388,17 @@ const removeSelectedSales = () => {
 };
 
 const removeSales = async () => {
+    let paramsOk = true;
     try {
         const params = { sales: selectedRows.value, ticketId: store.data.id };
+        params.sales.forEach((sale) => {
+            if (!sale.itemFk) {
+                tableRef.value.reload();
+                paramsOk = false;
+            }
+        });
+
+        if (!paramsOk) return;
         await axios.post('Sales/deleteSales', params);
         removeSelectedSales();
         notify('globals.dataSaved', 'positive');
@@ -623,6 +632,7 @@ watch(
         :default-remove="false"
         :default-reset="false"
         :default-save="false"
+        :disabled-attr="isTicketEditable"
     >
         <template #column-statusIcons="{ row }">
             <router-link
@@ -779,23 +789,6 @@ watch(
         <template #column-amount="{ row }">
             {{ toCurrency(row.quantity * row.price) }}
         </template>
-        <template #bottom-row>
-            <QBtn
-                class="cursor-pointer fill-icon q-ml-md q-my-lg"
-                color="primary"
-                icon="add_circle"
-                size="md"
-                round
-                flat
-                shortcut="+"
-                :disable="!isTicketEditable"
-                @click="insertRow()"
-            >
-                <QTooltip>
-                    {{ t('Add item') }}
-                </QTooltip>
-            </QBtn>
-        </template>
     </VnTable>
 
     <QPageSticky :offset="[20, 20]" style="z-index: 2">
diff --git a/src/pages/Ticket/Card/TicketService.vue b/src/pages/Ticket/Card/TicketService.vue
index 57d6977df..c5bf7437e 100644
--- a/src/pages/Ticket/Card/TicketService.vue
+++ b/src/pages/Ticket/Card/TicketService.vue
@@ -114,10 +114,12 @@ const columns = computed(() => [
 
 async function deleteService(row) {
     const serviceId = row.id;
-
-    const { data } = await axios.delete(`TicketServices/${serviceId}`);
-    if (data) notify('Service deleted successfully', 'positive');
-    ticketServiceCrudRef.value.reload();
+    if (!row.id) ticketServiceCrudRef.value.reset();
+    else {
+        const { data } = await axios.delete(`TicketServices/${serviceId}`);
+        if (data) notify('Service deleted successfully', 'positive');
+        ticketServiceCrudRef.value.reload();
+    }
 }
 </script>
 
diff --git a/src/pages/Ticket/TicketAdvance.vue b/src/pages/Ticket/TicketAdvance.vue
index 7ae959443..43b500dc0 100644
--- a/src/pages/Ticket/TicketAdvance.vue
+++ b/src/pages/Ticket/TicketAdvance.vue
@@ -59,7 +59,6 @@ const arrayData = useArrayData('AdvanceTickets', {
     exprBuilder: exprBuilder,
     limit: 0,
 });
-console.log('arrayData: ', arrayData);
 const { store } = arrayData;
 const tickets = computed(() =>
     (store.data || []).map((ticket, index) => ({ ...ticket, index: index }))
diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index 0fac89550..ad97e75c1 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -555,7 +555,7 @@ function setReference(data) {
         <template #column-shippedDate="{ row }">
             <span v-if="getDateColor(row.shipped)">
                 <QChip :class="getDateColor(row.shipped)" dense square>
-                    {{ row.shippedDate }}
+                    {{ toDate(row.shippedDate) }}
                 </QChip>
             </span>
         </template>
@@ -615,6 +615,7 @@ function setReference(data) {
                     option-label="name"
                     hide-selected
                     @update:model-value="(client) => onClientSelected(data)"
+                    :sort-by="'id ASC'"
                 >
                     <template #option="scope">
                         <QItem v-bind="scope.itemProps">

From 88fd40eae619a06a213e8b47fb76555f88333e83 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 23 Sep 2024 11:05:58 +0200
Subject: [PATCH 145/281] feat: minor changes

---
 .../Customer/Card/CustomerFiscalData.vue      | 19 +++++++++++--------
 src/pages/Customer/locale/es.yml              |  2 +-
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerFiscalData.vue b/src/pages/Customer/Card/CustomerFiscalData.vue
index 3a62fd954..300d275c0 100644
--- a/src/pages/Customer/Card/CustomerFiscalData.vue
+++ b/src/pages/Customer/Card/CustomerFiscalData.vue
@@ -122,13 +122,6 @@ function handleLocation(data, location) {
                 />
             </VnRow>
 
-            <VnRow>
-                <QCheckbox
-                    :label="t('Electronic invoice')"
-                    v-model="data.hasElectronicInvoice"
-                />
-                <QCheckbox :label="t('Daily invoice')" v-model="data.hasDailyInvoice" />
-            </VnRow>
             <VnRow>
                 <div>
                     <QCheckbox
@@ -141,7 +134,17 @@ function handleLocation(data, location) {
                         </QTooltip>
                     </QIcon>
                 </div>
-                <QCheckbox :label="t('Verified data')" v-model="data.isTaxDataChecked" />
+                <QCheckbox :label="t('Daily invoice')" v-model="data.hasDailyInvoice" />
+            </VnRow>
+
+            <VnRow>
+                <QCheckbox
+                    :label="t('Electronic invoice')"
+                    v-model="data.hasElectronicInvoice"
+                /><QCheckbox
+                    :label="t('Verified data')"
+                    v-model="data.isTaxDataChecked"
+                />
             </VnRow>
         </template>
     </FormModel>
diff --git a/src/pages/Customer/locale/es.yml b/src/pages/Customer/locale/es.yml
index 4fcbe3fa2..451784425 100644
--- a/src/pages/Customer/locale/es.yml
+++ b/src/pages/Customer/locale/es.yml
@@ -58,7 +58,7 @@ customer:
         vies: VIES
         payMethod: Método de pago
         bankAccount: Cuenta bancaria
-        dueDay: Día de pago
+        dueDay: Vencimiento
         hasLcr: Recibido LCR
         hasCoreVnl: Recibido core VNL
         hasB2BVnl: Recibido B2B VNL

From 66cb06910911ea3ae60ee6208a88e0bb23114fa1 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 23 Sep 2024 11:06:08 +0200
Subject: [PATCH 146/281] perf: CustomerBalance

---
 src/composables/usePrintService.js          |  5 +-
 src/pages/Customer/Card/CustomerBalance.vue | 55 ++++++++-------------
 2 files changed, 25 insertions(+), 35 deletions(-)

diff --git a/src/composables/usePrintService.js b/src/composables/usePrintService.js
index 68a009d7b..c6c212ad8 100644
--- a/src/composables/usePrintService.js
+++ b/src/composables/usePrintService.js
@@ -1,15 +1,18 @@
 import { useSession } from './useSession';
 import axios from 'axios';
 import { useQuasar } from 'quasar';
+import { useI18n } from 'vue-i18n';
 
 export function usePrintService() {
     const quasar = useQuasar();
+    const { t } = useI18n();
+
     const { getTokenMultimedia } = useSession();
 
     function sendEmail(path, params) {
         return axios.post(path, params).then(() =>
             quasar.notify({
-                message: 'Notification sent',
+                message: t('globals.notificationSent'),
                 type: 'positive',
                 icon: 'check',
             })
diff --git a/src/pages/Customer/Card/CustomerBalance.vue b/src/pages/Customer/Card/CustomerBalance.vue
index 2a1991bbd..f148194f8 100644
--- a/src/pages/Customer/Card/CustomerBalance.vue
+++ b/src/pages/Customer/Card/CustomerBalance.vue
@@ -16,7 +16,7 @@ import { useVnConfirm } from 'composables/useVnConfirm';
 import VnTable from 'components/VnTable/VnTable.vue';
 import VnInput from 'components/common/VnInput.vue';
 import VnSubToolbar from 'components/ui/VnSubToolbar.vue';
-import VnFilter from 'components/VnTable/VnFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 
 import CustomerNewPayment from 'src/pages/Customer/components/CustomerNewPayment.vue';
 import InvoiceOutDescriptorProxy from 'src/pages/InvoiceOut/Card/InvoiceOutDescriptorProxy.vue';
@@ -33,9 +33,9 @@ const stateStore = useStateStore();
 const user = state.getUser();
 
 const clientRisk = ref([]);
+const companies = ref([]);
 const tableRef = ref();
 const companyId = ref(user.value.companyFk);
-const companyLastId = ref(user.value.companyFk);
 const balances = ref([]);
 const vnFilterRef = ref({});
 const filter = computed(() => {
@@ -45,33 +45,6 @@ const filter = computed(() => {
     };
 });
 
-const companyFilterColumn = {
-    align: 'left',
-    name: 'companyId',
-    label: t('Company'),
-    component: 'select',
-    attrs: {
-        url: 'Companies',
-        optionLabel: 'code',
-        sortBy: 'code',
-        limit: 0,
-    },
-    columnFilter: {
-        event: {
-            remove: () => (companyId.value = null),
-            'update:modelValue': (newCompanyFk) => {
-                if (!newCompanyFk) return;
-                vnFilterRef.value.addFilter(newCompanyFk);
-                companyLastId.value = newCompanyFk;
-            },
-            blur: () =>
-                !companyId.value &&
-                (companyId.value = companyLastId.value ?? user.value.companyFk),
-        },
-    },
-    visible: false,
-};
-
 const columns = computed(() => [
     {
         align: 'right',
@@ -166,6 +139,11 @@ onBeforeMount(() => {
 });
 
 async function getCurrentBalance(data) {
+    currentBalance.value[companyId.value] = {
+        amount: 0,
+        code: companies.value.find((c) => c.id === companyId.value)?.code,
+    };
+
     for (const balance of data) {
         currentBalance.value[balance.companyFk] = {
             code: balance.company.code,
@@ -192,14 +170,21 @@ const showBalancePdf = ({ id }) => {
 
 <template>
     <FetchData
+        url="Companies"
+        auto-load
+        @on-fetch="(data) => (companies = data)"
+    ></FetchData>
+    <FetchData
+        v-if="companies.length > 0"
         url="clientRisks"
         :filter="{
             include: { relation: 'company', scope: { fields: ['code'] } },
-            where: { clientFk: route.params.id, companyFk: companyId },
+            where: { clientFk: route.params.id },
         }"
         auto-load
         @on-fetch="getCurrentBalance"
     ></FetchData>
+
     <VnSubToolbar class="q-mb-md">
         <template #st-data>
             <div class="column justify-center q-px-md q-py-sm">
@@ -212,13 +197,15 @@ const showBalancePdf = ({ id }) => {
         </template>
         <template #st-actions>
             <div>
-                <VnFilter
+                <VnSelect
+                    :label="t('Company')"
                     ref="vnFilterRef"
                     v-model="companyId"
                     data-key="CustomerBalance"
-                    :column="companyFilterColumn"
-                    search-url="balance"
-                />
+                    :options="companies"
+                    option-label="code"
+                    option-value="id"
+                ></VnSelect>
             </div>
         </template>
     </VnSubToolbar>

From 951b8fc1fa8f011c6d4a0ce3b31088eff93bfc43 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Mon, 23 Sep 2024 11:15:11 +0200
Subject: [PATCH 147/281] warmFix: e2e claimDevelopment

---
 test/cypress/integration/claim/claimDevelopment.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/cypress/integration/claim/claimDevelopment.spec.js b/test/cypress/integration/claim/claimDevelopment.spec.js
index 3b73a24d9..81fc33ecd 100755
--- a/test/cypress/integration/claim/claimDevelopment.spec.js
+++ b/test/cypress/integration/claim/claimDevelopment.spec.js
@@ -37,7 +37,7 @@ describe('ClaimDevelopment', () => {
         cy.wait(['@workers', '@workers']);
         cy.addCard();
 
-        cy.get(thirdRow).should('exist');
+        cy.waitForElement(thirdRow);
 
         const rowData = [
             false,

From 29cc14673aaa90769af9ee3e14f7873fafe55e86 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Mon, 23 Sep 2024 11:15:17 +0200
Subject: [PATCH 148/281] warmFix: e2e claimDevelopment

---
 test/cypress/support/commands.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/cypress/support/commands.js b/test/cypress/support/commands.js
index a9a405313..43788f59f 100755
--- a/test/cypress/support/commands.js
+++ b/test/cypress/support/commands.js
@@ -140,6 +140,7 @@ Cypress.Commands.add('removeCard', () => {
 });
 Cypress.Commands.add('addCard', () => {
     cy.waitForElement('tbody');
+    cy.waitForElement('.q-page-sticky > div > .q-btn');
     cy.get('.q-page-sticky > div > .q-btn').click();
 });
 Cypress.Commands.add('clickConfirm', () => {

From 7bbad14f53c74f7ae64b4f610aa7d24eb89da095 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 23 Sep 2024 11:38:27 +0200
Subject: [PATCH 149/281] feat: refs #7323 delete btn

---
 src/components/VnTable/VnTable.vue        |  2 ++
 src/pages/Worker/Card/WorkerBalance.vue   | 22 +++++++++++++++++-----
 src/pages/Worker/Card/WorkerFormation.vue | 20 ++++++++++++++++++++
 src/pages/Worker/Card/WorkerMedical.vue   | 13 +++++++++++++
 4 files changed, 52 insertions(+), 5 deletions(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index d87c08395..4aa49ce38 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -472,6 +472,7 @@ function handleOnDataSaved(_) {
                         auto-width
                         class="no-margin q-px-xs"
                         :class="[getColAlign(col), col.columnClass]"
+                        :style="col.style"
                         v-if="col.visible ?? true"
                         @click.ctrl="
                             ($event) =>
@@ -500,6 +501,7 @@ function handleOnDataSaved(_) {
                         :class="getColAlign(col)"
                         class="sticky no-padding"
                         @click="stopEventPropagation($event)"
+                        :style="col.style"
                     >
                         <QBtn
                             v-for="(btn, index) of col.actions"
diff --git a/src/pages/Worker/Card/WorkerBalance.vue b/src/pages/Worker/Card/WorkerBalance.vue
index 037a65eaf..88fc7c1df 100644
--- a/src/pages/Worker/Card/WorkerBalance.vue
+++ b/src/pages/Worker/Card/WorkerBalance.vue
@@ -57,9 +57,21 @@ const columns = computed(() => [
         field: 'concept',
         cardVisible: true,
     },
+    {
+        align: 'right',
+        name: 'tableActions',
+        style: 'max-width: 20px; text-align: initial;',
+        actions: [
+            {
+                title: t('delete'),
+                icon: 'delete',
+                action: async (row) => await tableRef.value.CrudModelRef.remove([row]),
+                isPrimary: true,
+            },
+        ],
+    },
 ]);
 </script>
-
 <template>
     <VnTable
         ref="tableRef"
@@ -69,8 +81,8 @@ const columns = computed(() => [
         save-url="WorkerIncomes/crud"
         :create="{
             urlCreate: 'workerIncomes',
-            title: t('Create workerBalance'),
-            onDataSaved: () => tableRef.reload(),
+            title: t('Create balance'),
+            onDataSaved: () => $refs.tableRef.reload(),
             formInitialData: {
                 workerFk: entityId,
             },
@@ -81,10 +93,10 @@ const columns = computed(() => [
         :right-search="false"
         :is-editable="true"
         :use-model="true"
+        :default-remove="false"
     />
 </template>
-
 <i18n>
     es:
-        Create workerBalance: Crear balance
+        Create balance: Crear balance
 </i18n>
diff --git a/src/pages/Worker/Card/WorkerFormation.vue b/src/pages/Worker/Card/WorkerFormation.vue
index 71c5cba5d..c11dd019e 100644
--- a/src/pages/Worker/Card/WorkerFormation.vue
+++ b/src/pages/Worker/Card/WorkerFormation.vue
@@ -96,10 +96,23 @@ const columns = computed(() => [
         label: t('worker.formation.tableVisibleColumns.hasDiploma'),
         create: true,
     },
+    {
+        align: 'right',
+        name: 'tableActions',
+        actions: [
+            {
+                title: t('delete'),
+                icon: 'delete',
+                action: async (row) => await tableRef.value.CrudModelRef.remove([row]),
+                isPrimary: true,
+            },
+        ],
+    },
 ]);
 </script>
 <template>
     <VnTable
+        class="worker-formation"
         ref="tableRef"
         data-key="WorkerFormation"
         :url="`Workers/${entityId}/trainingCourse`"
@@ -120,8 +133,15 @@ const columns = computed(() => [
         :right-search="false"
         :is-editable="true"
         :use-model="true"
+        :default-remove="false"
     />
 </template>
+<style lang="scss" scoped>
+:global(.worker-formation thead > tr > th:nth-child(7)),
+:global(.worker-formation thead > tr > th:nth-child(8)) {
+    max-width: 50px;
+}
+</style>
 <i18n>
 es:
     Create training course: Crear curso de formación
diff --git a/src/pages/Worker/Card/WorkerMedical.vue b/src/pages/Worker/Card/WorkerMedical.vue
index 6bca4ae85..fab1416c9 100644
--- a/src/pages/Worker/Card/WorkerMedical.vue
+++ b/src/pages/Worker/Card/WorkerMedical.vue
@@ -65,6 +65,18 @@ const columns = [
         create: true,
         component: 'input',
     },
+    {
+        align: 'right',
+        name: 'tableActions',
+        actions: [
+            {
+                title: t('delete'),
+                icon: 'delete',
+                action: async (row) => await tableRef.value.CrudModelRef.remove([row]),
+                isPrimary: true,
+            },
+        ],
+    },
 ];
 </script>
 <template>
@@ -87,5 +99,6 @@ const columns = [
         :right-search="false"
         :is-editable="true"
         :use-model="true"
+        :default-remove="false"
     />
 </template>

From f06723a9192a158bbdff8fb160e664d994692f68 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 23 Sep 2024 11:39:10 +0200
Subject: [PATCH 150/281] test: VnLocation

---
 .../integration/vnComponent/vnLocation.spec.js      | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/test/cypress/integration/vnComponent/vnLocation.spec.js b/test/cypress/integration/vnComponent/vnLocation.spec.js
index 3533a3c1f..15ab53d17 100644
--- a/test/cypress/integration/vnComponent/vnLocation.spec.js
+++ b/test/cypress/integration/vnComponent/vnLocation.spec.js
@@ -36,20 +36,23 @@ describe('VnLocation', () => {
         });
         it('Fin by postalCode', () => {
             const postCode = '46600';
+            const postCodeLabel = '46600, Valencia(Province one), España';
             const firstOption = '[role="listbox"] .q-item:nth-child(1)';
 
             cy.get(inputLocation).click();
             cy.get(inputLocation).clear();
             cy.get(inputLocation).type(postCode);
-            cy.get(locationOptions).should('have.length.at.least', 2);
+            cy.get(locationOptions)
+                .get(':nth-child(1)')
+                .should('have.length.at.least', 2);
+            cy.get(
+                firstOption.concat(' > .q-item__section > .q-item__label--caption')
+            ).should('have.text', postCodeLabel);
             cy.get(firstOption).click();
             cy.get('.q-btn-group > .q-btn--standard > .q-btn__content > .q-icon').click();
             cy.reload();
             cy.waitForElement('.q-form');
-            cy.get(inputLocation).should(
-                'have.value',
-                '46600 - Valencia(Province one), España'
-            );
+            cy.get(inputLocation).should('have.value', postCodeLabel);
         });
 
         it('Create postCode', () => {

From 013a76cbce074ef727b371ce949bbf79b8f75f7e Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 23 Sep 2024 11:48:00 +0200
Subject: [PATCH 151/281] test: VnLocation

---
 src/components/common/VnLocation.vue                    | 3 ---
 test/cypress/integration/vnComponent/vnLocation.spec.js | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/components/common/VnLocation.vue b/src/components/common/VnLocation.vue
index c3b07c72c..633d32b85 100644
--- a/src/components/common/VnLocation.vue
+++ b/src/components/common/VnLocation.vue
@@ -13,7 +13,6 @@ const props = defineProps({
     },
 });
 const formatLocation = (obj, properties) => {
-    // Crear un array con las propiedades del objeto
     const parts = properties.map((prop) => {
         if (typeof prop === 'string') {
             return obj[prop];
@@ -23,12 +22,10 @@ const formatLocation = (obj, properties) => {
         return null;
     });
 
-    // Filtrar los valores que no son null o undefined
     const filteredParts = parts.filter(
         (part) => part !== null && part !== undefined && part !== ''
     );
 
-    // Unir los valores filtrados con el formato deseado
     return filteredParts.join(', ');
 };
 
diff --git a/test/cypress/integration/vnComponent/vnLocation.spec.js b/test/cypress/integration/vnComponent/vnLocation.spec.js
index 15ab53d17..1872d3591 100644
--- a/test/cypress/integration/vnComponent/vnLocation.spec.js
+++ b/test/cypress/integration/vnComponent/vnLocation.spec.js
@@ -34,7 +34,7 @@ describe('VnLocation', () => {
             cy.visit('/#/supplier/567/fiscal-data', { timeout: 7000 });
             cy.waitForElement('.q-form');
         });
-        it('Fin by postalCode', () => {
+        it('Find by postalCode', () => {
             const postCode = '46600';
             const postCodeLabel = '46600, Valencia(Province one), España';
             const firstOption = '[role="listbox"] .q-item:nth-child(1)';

From 1ae20202ccd84c09428572fb14c3764dd11ccf1c Mon Sep 17 00:00:00 2001
From: robert <robert@verdnatura.es>
Date: Mon, 23 Sep 2024 11:56:20 +0200
Subject: [PATCH 152/281] feat: refs #8000 add column into zoneBasicData

---
 src/pages/Zone/Card/ZoneBasicData.vue | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/pages/Zone/Card/ZoneBasicData.vue b/src/pages/Zone/Card/ZoneBasicData.vue
index 512d07636..c60a4c77b 100644
--- a/src/pages/Zone/Card/ZoneBasicData.vue
+++ b/src/pages/Zone/Card/ZoneBasicData.vue
@@ -64,6 +64,15 @@ const agencyOptions = ref([]);
                     type="number"
                     min="0"
                 />
+
+                <VnInput
+                    class="mw-10"
+                    v-model="data.itemMaxLength"
+                    :label="t('Max length m³')"
+                    clearable
+                    type="number"
+                    min="0"
+                />
             </VnRow>
 
             <VnRow>
@@ -128,4 +137,5 @@ es:
     Bonus: Bonificación
     Inflation: Inflación
     Volumetric: Volumétrico
+    Max length m³: Medidad máxima tumbado
 </i18n>

From 5ebbb1cf737aa405717efe4b8851601287898333 Mon Sep 17 00:00:00 2001
From: robert <robert@verdnatura.es>
Date: Mon, 23 Sep 2024 12:24:19 +0200
Subject: [PATCH 153/281] feat: refs #8000 fix

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

diff --git a/src/pages/Zone/Card/ZoneBasicData.vue b/src/pages/Zone/Card/ZoneBasicData.vue
index c60a4c77b..535f2393d 100644
--- a/src/pages/Zone/Card/ZoneBasicData.vue
+++ b/src/pages/Zone/Card/ZoneBasicData.vue
@@ -137,5 +137,5 @@ es:
     Bonus: Bonificación
     Inflation: Inflación
     Volumetric: Volumétrico
-    Max length m³: Medidad máxima tumbado
+    Max length m³: Medida máxima tumbado
 </i18n>

From a52cdf8f949af83b8856a1c6f36b755f117f0fb8 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 23 Sep 2024 10:25:11 +0000
Subject: [PATCH 154/281] fix: i18n en preparation label

---
 src/pages/Ticket/locale/en.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/Ticket/locale/en.yml b/src/pages/Ticket/locale/en.yml
index 305228669..06699e00b 100644
--- a/src/pages/Ticket/locale/en.yml
+++ b/src/pages/Ticket/locale/en.yml
@@ -39,6 +39,7 @@ ticketSale:
     agency: Agency
     address: Address
 advanceTickets:
+    preparation: Preparation
     origin: Origin
     destination: Destination
     originAgency: 'Origin agency: {agency}'

From 279a100f8b1bfeb1ed76cd784faec709bde5878c Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 23 Sep 2024 10:25:44 +0000
Subject: [PATCH 155/281] fix: i18n en preparation label

---
 src/pages/Ticket/locale/es.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/Ticket/locale/es.yml b/src/pages/Ticket/locale/es.yml
index 30c5550be..efd7177e9 100644
--- a/src/pages/Ticket/locale/es.yml
+++ b/src/pages/Ticket/locale/es.yml
@@ -86,6 +86,7 @@ weeklyTickets:
     search: Buscar por tickets programados
     searchInfo: Buscar tickets programados por el identificador o el identificador del cliente
 advanceTickets:
+    preparation: Preparation    
     origin: Origen
     destination: Destinatario
     originAgency: 'Agencia origen: {agency}'

From f809e0fb317de0c4762cb684bc3bb58f870d8958 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 23 Sep 2024 12:55:39 +0200
Subject: [PATCH 156/281] fix: refs #7323 show prev month week color

---
 src/pages/Worker/Card/WorkerTimeControl.vue | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/pages/Worker/Card/WorkerTimeControl.vue b/src/pages/Worker/Card/WorkerTimeControl.vue
index fbfd4b28d..c6ca9d74a 100644
--- a/src/pages/Worker/Card/WorkerTimeControl.vue
+++ b/src/pages/Worker/Card/WorkerTimeControl.vue
@@ -326,16 +326,21 @@ const updateData = async () => {
 };
 
 const getMailStates = async (date) => {
+    const url = `WorkerTimeControls/${route.params.id}/getMailStates`;
+    const month = date.getMonth() + 1;
+    const prevMonth = month == 1 ? 12 : month - 1;
+    let prevMonthStates = [];
+
     const params = {
-        month: date.getMonth() + 1,
+        month,
         year: date.getFullYear(),
     };
 
-    const { data } = await axios.get(
-        `WorkerTimeControls/${route.params.id}/getMailStates`,
-        { params }
-    );
-    workerTimeControlMails.value = data;
+    const curMonthStates = (await axios.get(url, { params })).data;
+    prevMonthStates = (await axios.get(url, { params: { ...params, month: prevMonth } }))
+        .data;
+
+    workerTimeControlMails.value = curMonthStates.concat(prevMonthStates);
 };
 
 const showWorkerTimeForm = (propValue, formType) => {

From e700f6f4a8cb71c22216fdd11e1a409ea1dbdb37 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Mon, 23 Sep 2024 13:14:25 +0200
Subject: [PATCH 157/281] feat: refs #7404 style dynamic text color

---
 src/components/VnTable/VnTable.vue         | 16 ++------
 src/components/ui/VnPaginate.vue           |  5 +--
 src/css/quasar.variables.scss              |  1 -
 src/pages/Entry/Card/EntrySummary.vue      | 26 ++++++------
 src/pages/Entry/EntryLatestBuys.vue        | 15 +++----
 src/pages/Entry/EntryLatestBuysFilter.vue  |  2 +
 src/pages/Entry/EntryStockBought.vue       | 46 +++++++++++++++++++++-
 src/pages/Entry/EntryStockBoughtDetail.vue | 10 ++++-
 8 files changed, 83 insertions(+), 38 deletions(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index a3b64d264..621e2acfc 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -639,18 +639,10 @@ function handleOnDataSaved(_) {
                             :key="col?.id"
                             class="text-center"
                         >
-                            <div
-                                v-if="col?.summation"
-                                :class="`text-${col?.align ?? 'left'}`"
-                                class="text-bold q-pa-sm"
-                            >
-                                {{
-                                    rows.reduce(
-                                        (sum, currentRow) => sum + currentRow[col.name],
-                                        0
-                                    )
-                                }}
-                            </div>
+                            <slot
+                                :name="`column-footer-${col.name}`"
+                                :class="getColAlign(col)"
+                            />
                         </QTh>
                     </QTr>
                 </template>
diff --git a/src/components/ui/VnPaginate.vue b/src/components/ui/VnPaginate.vue
index 79a79c383..37101dafe 100644
--- a/src/components/ui/VnPaginate.vue
+++ b/src/components/ui/VnPaginate.vue
@@ -131,9 +131,8 @@ async function fetch(params) {
     useArrayData(props.dataKey, params);
     arrayData.reset(['filter.skip', 'skip']);
     await arrayData.fetch({ append: false });
-    if (!store.hasMoreData) {
-        isLoading.value = false;
-    }
+    if (!store.hasMoreData) isLoading.value = false;
+
     emit('onFetch', store.data);
     return store.data;
 }
diff --git a/src/css/quasar.variables.scss b/src/css/quasar.variables.scss
index aeac483be..9f7c62848 100644
--- a/src/css/quasar.variables.scss
+++ b/src/css/quasar.variables.scss
@@ -36,7 +36,6 @@ $color-font-secondary: #777;
 .bg-success {
     background-color: $positive;
 }
-
 .bg-notice {
     background-color: $info;
 }
diff --git a/src/pages/Entry/Card/EntrySummary.vue b/src/pages/Entry/Card/EntrySummary.vue
index 379be1d2f..58a5c2e1b 100644
--- a/src/pages/Entry/Card/EntrySummary.vue
+++ b/src/pages/Entry/Card/EntrySummary.vue
@@ -10,6 +10,7 @@ import TravelDescriptorProxy from 'src/pages/Travel/Card/TravelDescriptorProxy.v
 import { toDate, toCurrency } from 'src/filters';
 import { getUrl } from 'src/composables/getUrl';
 import axios from 'axios';
+import FetchedTags from 'src/components/ui/FetchedTags.vue';
 
 const route = useRoute();
 const { t } = useI18n();
@@ -163,7 +164,7 @@ const fetchEntryBuys = async () => {
     >
         <template #header-left>
             <router-link
-                v-if="route.name !== 'EntrySummary'"
+                v-if="route?.name !== 'EntrySummary'"
                 :to="{ name: 'EntrySummary', params: { id: entityId } }"
                 class="header link"
                 :href="entryUrl"
@@ -184,7 +185,10 @@ const fetchEntryBuys = async () => {
                     <QIcon name="open_in_new" />
                 </router-link>
                 <VnLv :label="t('entry.summary.commission')" :value="entry.commission" />
-                <VnLv :label="t('entry.summary.currency')" :value="entry.currency.name" />
+                <VnLv
+                    :label="t('entry.summary.currency')"
+                    :value="entry.currency?.name"
+                />
                 <VnLv :label="t('entry.summary.company')" :value="entry.company.code" />
                 <VnLv :label="t('entry.summary.reference')" :value="entry.reference" />
                 <VnLv
@@ -210,12 +214,12 @@ const fetchEntryBuys = async () => {
                 </VnLv>
                 <VnLv
                     :label="t('entry.summary.travelAgency')"
-                    :value="entry.travel.agency.name"
+                    :value="entry.travel.agency?.name"
                 />
                 <VnLv :label="t('shipped')" :value="toDate(entry.travel.shipped)" />
                 <VnLv
                     :label="t('entry.summary.travelWarehouseOut')"
-                    :value="entry.travel.warehouseOut.name"
+                    :value="entry.travel.warehouseOut?.name"
                 />
                 <QCheckbox
                     :label="t('entry.summary.travelDelivered')"
@@ -225,7 +229,7 @@ const fetchEntryBuys = async () => {
                 <VnLv :label="t('landed')" :value="toDate(entry.travel.landed)" />
                 <VnLv
                     :label="t('entry.summary.travelWarehouseIn')"
-                    :value="entry.travel.warehouseIn.name"
+                    :value="entry.travel.warehouseIn?.name"
                 />
                 <QCheckbox
                     :label="t('entry.summary.travelReceived')"
@@ -281,17 +285,17 @@ const fetchEntryBuys = async () => {
                 >
                     <template #body="{ cols, row, rowIndex }">
                         <QTr no-hover>
-                            <QTd v-for="col in cols" :key="col.name">
+                            <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)"
+                                    :is="tableColumnComponents[col?.name].component()"
+                                    v-bind="tableColumnComponents[col?.name].props()"
+                                    @click="tableColumnComponents[col?.name].event()"
                                     class="col-content"
                                 >
                                     <template
                                         v-if="
-                                            col.name !== 'observation' &&
-                                            col.name !== 'isConfirmed'
+                                            col?.name !== 'observation' &&
+                                            col?.name !== 'isConfirmed'
                                         "
                                         >{{ col.value }}</template
                                     >
diff --git a/src/pages/Entry/EntryLatestBuys.vue b/src/pages/Entry/EntryLatestBuys.vue
index 7c4354b65..61c430b23 100644
--- a/src/pages/Entry/EntryLatestBuys.vue
+++ b/src/pages/Entry/EntryLatestBuys.vue
@@ -1,16 +1,17 @@
 <script setup>
 import { onMounted, onUnmounted, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
-import RightMenu from 'src/components/common/RightMenu.vue';
-import VnTable from 'components/VnTable/VnTable.vue';
-import EntryLatestBuysFilter from './EntryLatestBuysFilter.vue';
 import { useStateStore } from 'stores/useStateStore';
+import { toDate } from 'src/filters';
+
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
+import RightMenu from 'src/components/common/RightMenu.vue';
+import EntryLatestBuysFilter from './EntryLatestBuysFilter.vue';
+import VnTable from 'components/VnTable/VnTable.vue';
+import VnImg from 'src/components/ui/VnImg.vue';
+
 const stateStore = useStateStore();
 const { t } = useI18n();
-import { toDate } from 'src/filters';
-import VnImg from 'src/components/ui/VnImg.vue';
-import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
-
 const columns = [
     {
         align: 'center',
diff --git a/src/pages/Entry/EntryLatestBuysFilter.vue b/src/pages/Entry/EntryLatestBuysFilter.vue
index f147a3c6f..83124c1bf 100644
--- a/src/pages/Entry/EntryLatestBuysFilter.vue
+++ b/src/pages/Entry/EntryLatestBuysFilter.vue
@@ -4,6 +4,7 @@ import { useI18n } from 'vue-i18n';
 
 import FetchData from 'components/FetchData.vue';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
+import VnInput from 'components/common/VnInput.vue';
 import VnSelect from 'components/common/VnSelect.vue';
 import ItemsFilterPanel from 'src/components/ItemsFilterPanel.vue';
 
@@ -18,6 +19,7 @@ defineProps({
 
 const itemTypeWorkersOptions = ref([]);
 const suppliersOptions = ref([]);
+const tagValues = ref([]);
 </script>
 
 <template>
diff --git a/src/pages/Entry/EntryStockBought.vue b/src/pages/Entry/EntryStockBought.vue
index 5027ad511..fa4b1e6b6 100644
--- a/src/pages/Entry/EntryStockBought.vue
+++ b/src/pages/Entry/EntryStockBought.vue
@@ -56,7 +56,7 @@ const columns = [
         summation: true,
     },
     {
-        align: 'left',
+        align: 'center',
         label: t('Bought'),
         name: 'bought',
         summation: true,
@@ -129,6 +129,18 @@ const setUserParams = async ({ dated }) => {
 function openDialog() {
     travelDialogRef.value = true;
 }
+
+function setFooter(data) {
+    const footer = {
+        bought: 0,
+        reserve: 0,
+    };
+    data.forEach((row) => {
+        footer.bought += row?.bought;
+        footer.reserve += row?.reserve;
+    });
+    tableRef.value.footer = footer;
+}
 </script>
 <template>
     <VnSubToolbar>
@@ -203,6 +215,7 @@ function openDialog() {
                 order="reserve DESC"
                 :right-search="false"
                 :is-editable="true"
+                @on-fetch="(data) => setFooter(data)"
                 :create="{
                     urlCreate: 'StockBoughts',
                     title: t('Reserve some space'),
@@ -223,11 +236,31 @@ function openDialog() {
                         <WorkerDescriptorProxy :id="row?.workerFk" />
                     </span>
                 </template>
+                <template #column-bought="{ row }">
+                    <span :class="{ 'text-negative': row.reserve < row.bought }">
+                        {{ row?.bought }}
+                    </span>
+                </template>
+                <template #column-footer-reserve>
+                    <span>
+                        {{ tableRef.footer.reserve }}
+                    </span>
+                </template>
+                <template #column-footer-bought>
+                    <span
+                        :class="{
+                            'text-negative':
+                                tableRef.footer.reserve < tableRef.footer.bought,
+                        }"
+                    >
+                        {{ tableRef.footer.bought }}
+                    </span>
+                </template>
             </VnTable>
         </QPage>
     </div>
 </template>
-<style lang="css" scoped>
+<style lang="scss" scoped>
 .travel {
     margin-bottom: 0px;
 }
@@ -241,6 +274,15 @@ function openDialog() {
     align-items: center;
     width: 40%;
 }
+.text-negative {
+    color: $negative !important;
+}
+.input-container {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    height: 100%;
+}
 </style>
 <i18n>
     es:
diff --git a/src/pages/Entry/EntryStockBoughtDetail.vue b/src/pages/Entry/EntryStockBoughtDetail.vue
index 9489c2362..cdcd28381 100644
--- a/src/pages/Entry/EntryStockBoughtDetail.vue
+++ b/src/pages/Entry/EntryStockBoughtDetail.vue
@@ -81,7 +81,13 @@ const columns = [
                 auto-load
             >
                 <template #top-left>
-                    <QBtn flat icon="Close" v-close-popup />
+                    <QBtn
+                        flat
+                        icon="Close"
+                        color="primary"
+                        class="bg-vn-section-color q-pa-xs"
+                        v-close-popup
+                    />
                 </template>
                 <template #column-entryFk="{ row }">
                     <span class="link">
@@ -103,10 +109,10 @@ const columns = [
 .container {
     max-width: 50vw;
     overflow: auto;
-    display: flex;
     justify-content: center;
     align-items: center;
     margin: auto;
+    background-color: var(--vn-section-color);
 }
 </style>
 <i18n>

From b04564d5a81c1d686e641210f2c7f420ac9b6b15 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Mon, 23 Sep 2024 13:23:25 +0200
Subject: [PATCH 158/281] fix: refs #7404 style non center pop up

---
 src/components/VnTable/VnTable.vue         | 4 ----
 src/pages/Entry/EntryStockBought.vue       | 6 ------
 src/pages/Entry/EntryStockBoughtDetail.vue | 3 +--
 3 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 621e2acfc..0f7dd3a02 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -727,10 +727,6 @@ es:
     border-color: var(--vn-section-color);
 }
 
-.q-table__container > div:first-child {
-    background-color: var(--vn-page-color);
-}
-
 .grid-three {
     display: grid;
     grid-template-columns: repeat(auto-fit, minmax(400px, max-content));
diff --git a/src/pages/Entry/EntryStockBought.vue b/src/pages/Entry/EntryStockBought.vue
index fa4b1e6b6..4750a8417 100644
--- a/src/pages/Entry/EntryStockBought.vue
+++ b/src/pages/Entry/EntryStockBought.vue
@@ -277,12 +277,6 @@ function setFooter(data) {
 .text-negative {
     color: $negative !important;
 }
-.input-container {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    height: 100%;
-}
 </style>
 <i18n>
     es:
diff --git a/src/pages/Entry/EntryStockBoughtDetail.vue b/src/pages/Entry/EntryStockBoughtDetail.vue
index cdcd28381..2c1a5a47e 100644
--- a/src/pages/Entry/EntryStockBoughtDetail.vue
+++ b/src/pages/Entry/EntryStockBoughtDetail.vue
@@ -67,7 +67,7 @@ const columns = [
 ];
 </script>
 <template>
-    <QDialog :maximized="true">
+    <QDialog>
         <div class="container">
             <VnTable
                 ref="tableRef"
@@ -112,7 +112,6 @@ const columns = [
     justify-content: center;
     align-items: center;
     margin: auto;
-    background-color: var(--vn-section-color);
 }
 </style>
 <i18n>

From 6a8ed89a71b85a42acdaef4974cd84e8fa7ae1f1 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 23 Sep 2024 11:41:30 +0000
Subject: [PATCH 159/281] fix: VnLocation test

---
 .../integration/vnComponent/vnLocation.spec.js    | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/test/cypress/integration/vnComponent/vnLocation.spec.js b/test/cypress/integration/vnComponent/vnLocation.spec.js
index 3533a3c1f..1872d3591 100644
--- a/test/cypress/integration/vnComponent/vnLocation.spec.js
+++ b/test/cypress/integration/vnComponent/vnLocation.spec.js
@@ -34,22 +34,25 @@ describe('VnLocation', () => {
             cy.visit('/#/supplier/567/fiscal-data', { timeout: 7000 });
             cy.waitForElement('.q-form');
         });
-        it('Fin by postalCode', () => {
+        it('Find by postalCode', () => {
             const postCode = '46600';
+            const postCodeLabel = '46600, Valencia(Province one), España';
             const firstOption = '[role="listbox"] .q-item:nth-child(1)';
 
             cy.get(inputLocation).click();
             cy.get(inputLocation).clear();
             cy.get(inputLocation).type(postCode);
-            cy.get(locationOptions).should('have.length.at.least', 2);
+            cy.get(locationOptions)
+                .get(':nth-child(1)')
+                .should('have.length.at.least', 2);
+            cy.get(
+                firstOption.concat(' > .q-item__section > .q-item__label--caption')
+            ).should('have.text', postCodeLabel);
             cy.get(firstOption).click();
             cy.get('.q-btn-group > .q-btn--standard > .q-btn__content > .q-icon').click();
             cy.reload();
             cy.waitForElement('.q-form');
-            cy.get(inputLocation).should(
-                'have.value',
-                '46600 - Valencia(Province one), España'
-            );
+            cy.get(inputLocation).should('have.value', postCodeLabel);
         });
 
         it('Create postCode', () => {

From 0829b6d0d298ec5d7f2dad7584c64f8c584ddcc3 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 23 Sep 2024 11:42:47 +0000
Subject: [PATCH 160/281] fix: i18n en preparation label

---
 src/pages/Ticket/locale/es.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/Ticket/locale/es.yml b/src/pages/Ticket/locale/es.yml
index efd7177e9..0a27519ad 100644
--- a/src/pages/Ticket/locale/es.yml
+++ b/src/pages/Ticket/locale/es.yml
@@ -86,7 +86,7 @@ weeklyTickets:
     search: Buscar por tickets programados
     searchInfo: Buscar tickets programados por el identificador o el identificador del cliente
 advanceTickets:
-    preparation: Preparation    
+    preparation: Preparación    
     origin: Origen
     destination: Destinatario
     originAgency: 'Agencia origen: {agency}'

From 3716507f93cbb95c3e2701a64adc48583ff09117 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Mon, 23 Sep 2024 13:51:20 +0200
Subject: [PATCH 161/281] perf: refs #7553 removeSales function

---
 src/pages/Ticket/Card/TicketSale.vue | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/pages/Ticket/Card/TicketSale.vue b/src/pages/Ticket/Card/TicketSale.vue
index 767c31cdd..2dc67872f 100644
--- a/src/pages/Ticket/Card/TicketSale.vue
+++ b/src/pages/Ticket/Card/TicketSale.vue
@@ -388,17 +388,18 @@ const removeSelectedSales = () => {
 };
 
 const removeSales = async () => {
-    let paramsOk = true;
     try {
-        const params = { sales: selectedRows.value, ticketId: store.data.id };
-        params.sales.forEach((sale) => {
-            if (!sale.itemFk) {
-                tableRef.value.reload();
-                paramsOk = false;
-            }
-        });
+        const params = {
+            sales: selectedRows.value.filter((sale) => sale.id),
+            ticketId: store.data.id,
+        };
+        selectedRows.value
+            .filter((sale) => !sale.id)
+            .forEach((sale) =>
+                tableRef.value.CrudModelRef.formData.splice(sale.$index, 1)
+            );
 
-        if (!paramsOk) return;
+        if (params.sales.length == 0) return;
         await axios.post('Sales/deleteSales', params);
         removeSelectedSales();
         notify('globals.dataSaved', 'positive');

From ac8aa6bcc14d4edca83c1a967a6a00395e62bc5b Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 23 Sep 2024 14:21:41 +0200
Subject: [PATCH 162/281] fix: table order

---
 src/i18n/locale/en.yml            |  2 +-
 src/i18n/locale/es.yml            |  2 +-
 src/pages/Item/ItemFixedPrice.vue | 20 ++++++++++----------
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 2e2365f7b..089f417f9 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -1074,7 +1074,7 @@ item:
         producer: Producer
         landed: Landed
     fixedPrice:
-        itemId: Item ID
+        itemFk: Item ID
         groupingPrice: Grouping price
         packingPrice: Packing price
         hasMinPrice: Has min price
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 53b487e9f..338332eb1 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -1058,7 +1058,7 @@ item:
         producer: Productor
         landed: F. entrega
     fixedPrice:
-        itemId: ID Artículo
+        itemFk: ID Artículo
         groupingPrice: Precio grouping
         packingPrice: Precio packing
         hasMinPrice: Tiene precio mínimo
diff --git a/src/pages/Item/ItemFixedPrice.vue b/src/pages/Item/ItemFixedPrice.vue
index bd8c4b78c..fddf154a2 100644
--- a/src/pages/Item/ItemFixedPrice.vue
+++ b/src/pages/Item/ItemFixedPrice.vue
@@ -36,23 +36,23 @@ const user = state.getUser();
 const fixedPrices = ref([]);
 const warehousesOptions = ref([]);
 const rowsSelected = ref([]);
-
 const itemFixedPriceFilterRef = ref();
-
 const params = reactive({});
-const defaultColumnAttrs = {
-    align: 'left',
-    sortable: true,
-};
+
 onMounted(async () => {
     stateStore.rightDrawer = true;
     params.warehouseFk = user.value.warehouseFk;
 });
 onUnmounted(() => (stateStore.rightDrawer = false));
+
+const defaultColumnAttrs = {
+    align: 'left',
+    sortable: true,
+};
 const columns = computed(() => [
     {
-        label: t('item.fixedPrice.itemId'),
-        name: 'itemId',
+        label: t('item.fixedPrice.itemFk'),
+        name: 'itemFk',
         ...defaultColumnAttrs,
         isId: true,
         cardVisible: true,
@@ -426,7 +426,7 @@ function handleOnDataSave({ CrudModelRef }) {
             :default-save="false"
             data-key="ItemFixedPrices"
             url="FixedPrices/filter"
-            :order="['itemFk ASC']"
+            :order="['description DESC']"
             save-url="FixedPrices/crud"
             :user-params="{ warehouseFk: user.warehouseFk }"
             ref="tableRef"
@@ -460,7 +460,7 @@ function handleOnDataSave({ CrudModelRef }) {
                 <QCheckbox flat v-model="scope.selected" />
             </template>
 
-            <template #column-itemId="props">
+            <template #column-itemFk="props">
                 <VnSelect
                     style="max-width: 100px"
                     url="Items/withName"

From caddcf45c3b6c3efb085bf3e742debac77f440b9 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 23 Sep 2024 12:43:52 +0000
Subject: [PATCH 163/281] fix: Options VnSelect properties

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

diff --git a/src/pages/Customer/Card/CustomerBasicData.vue b/src/pages/Customer/Card/CustomerBasicData.vue
index 6472a47ff..4987fc7ba 100644
--- a/src/pages/Customer/Card/CustomerBasicData.vue
+++ b/src/pages/Customer/Card/CustomerBasicData.vue
@@ -111,6 +111,8 @@ const exprBuilder = (param, value) => {
                     }"
                     :fields="['id', 'nickname']"
                     sort-by="nickname ASC"
+                    :option-label="'nickname'"
+                    :option-value="'id'"
                     :rules="validate('client.salesPersonFk')"
                     :expr-builder="exprBuilder"
                     emit-value

From ab0c38810a4bb155672bb05e5e04084279b399dc Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 23 Sep 2024 12:44:37 +0000
Subject: [PATCH 164/281] fix: Options VnSelect properties

---
 src/pages/Customer/CustomerList.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/pages/Customer/CustomerList.vue b/src/pages/Customer/CustomerList.vue
index 0428c0c7b..6b6a45e15 100644
--- a/src/pages/Customer/CustomerList.vue
+++ b/src/pages/Customer/CustomerList.vue
@@ -428,7 +428,9 @@ function handleLocation(data, location) {
                 :label="t('customer.basicData.salesPerson')"
                 :params="{
                     departmentCodes: ['VT', 'shopping'],
-                }"
+                }"                
+                :option-label="'nickname'"
+                :option-value="'id'"
                 :fields="['id', 'nickname']"
                 sort-by="nickname ASC"
                 emit-value

From 27a3e36b589930db022428737f9ec17f983a8171 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 23 Sep 2024 14:56:34 +0200
Subject: [PATCH 165/281] fix: comments

---
 src/pages/Customer/Card/CustomerBasicData.vue | 4 ++--
 src/pages/Customer/CustomerList.vue           | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerBasicData.vue b/src/pages/Customer/Card/CustomerBasicData.vue
index 4987fc7ba..79ae79ad9 100644
--- a/src/pages/Customer/Card/CustomerBasicData.vue
+++ b/src/pages/Customer/Card/CustomerBasicData.vue
@@ -111,8 +111,8 @@ const exprBuilder = (param, value) => {
                     }"
                     :fields="['id', 'nickname']"
                     sort-by="nickname ASC"
-                    :option-label="'nickname'"
-                    :option-value="'id'"
+                    option-label="nickname"
+                    option-value="id"
                     :rules="validate('client.salesPersonFk')"
                     :expr-builder="exprBuilder"
                     emit-value
diff --git a/src/pages/Customer/CustomerList.vue b/src/pages/Customer/CustomerList.vue
index 6b6a45e15..5e24a1c2d 100644
--- a/src/pages/Customer/CustomerList.vue
+++ b/src/pages/Customer/CustomerList.vue
@@ -428,9 +428,9 @@ function handleLocation(data, location) {
                 :label="t('customer.basicData.salesPerson')"
                 :params="{
                     departmentCodes: ['VT', 'shopping'],
-                }"                
-                :option-label="'nickname'"
-                :option-value="'id'"
+                }"
+                option-label="nickname"
+                option-value="id"
                 :fields="['id', 'nickname']"
                 sort-by="nickname ASC"
                 emit-value

From e9e2caee85b0f1826b9a73d295800ed35efef463 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 23 Sep 2024 13:18:14 +0000
Subject: [PATCH 166/281] feat: autofocus after clear

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

diff --git a/src/components/common/VnInput.vue b/src/components/common/VnInput.vue
index 26160929c..1246eedcd 100644
--- a/src/components/common/VnInput.vue
+++ b/src/components/common/VnInput.vue
@@ -103,6 +103,7 @@ const mixinRules = [
                     @click="
                         () => {
                             value = null;
+                            vnInputRef.focus();
                             emit('remove');
                         }
                     "

From b4b31c0c92227c697d0bb5550773d51d0f3082ca Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 23 Sep 2024 15:21:07 +0200
Subject: [PATCH 167/281] fix: enable autofocus

---
 src/components/common/VnInputDate.vue | 3 +++
 src/components/common/VnInputTime.vue | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/src/components/common/VnInputDate.vue b/src/components/common/VnInputDate.vue
index fd8993d6f..3d5afaf80 100644
--- a/src/components/common/VnInputDate.vue
+++ b/src/components/common/VnInputDate.vue
@@ -20,6 +20,7 @@ const { validations } = useValidator();
 
 const { t } = useI18n();
 const requiredFieldRule = (val) => validations().required($attrs.required, val);
+const vnInputDateRef = ref(null);
 
 const dateFormat = 'DD/MM/YYYY';
 const isPopupOpen = ref();
@@ -91,6 +92,7 @@ const styleAttrs = computed(() => {
 <template>
     <div @mouseover="hover = true" @mouseleave="hover = false">
         <QInput
+            ref="vnInputDateRef"
             v-model="formattedDate"
             class="vn-input-date"
             :mask="mask"
@@ -113,6 +115,7 @@ const styleAttrs = computed(() => {
                         !$attrs.disable
                     "
                     @click="
+                        vnInputDateRef.focus();
                         model = null;
                         isPopupOpen = false;
                     "
diff --git a/src/components/common/VnInputTime.vue b/src/components/common/VnInputTime.vue
index 42ec79479..a5e7d3002 100644
--- a/src/components/common/VnInputTime.vue
+++ b/src/components/common/VnInputTime.vue
@@ -16,6 +16,7 @@ const props = defineProps({
         default: false,
     },
 });
+const vnInputTimeRef = ref(null);
 const initialDate = ref(model.value ?? Date.vnNew());
 const { t } = useI18n();
 const requiredFieldRule = (val) => validations().required($attrs.required, val);
@@ -69,6 +70,7 @@ function dateToTime(newDate) {
 <template>
     <div @mouseover="hover = true" @mouseleave="hover = false">
         <QInput
+            ref="vnInputTimeRef"
             class="vn-input-time"
             mask="##:##"
             placeholder="--:--"
@@ -92,6 +94,7 @@ function dateToTime(newDate) {
                         !$attrs.disable
                     "
                     @click="
+                        vnInputTimeRef.focus();
                         model = null;
                         isPopupOpen = false;
                     "

From 2cb9899de14a5a9d1a3520c993dffc428b1cc0e6 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 23 Sep 2024 15:38:54 +0200
Subject: [PATCH 168/281] feat: refs #7207 show queue

---
 src/pages/Worker/Card/WorkerSummary.vue | 1 +
 src/pages/Worker/locale/en.yml          | 1 +
 src/pages/Worker/locale/es.yml          | 1 +
 3 files changed, 3 insertions(+)

diff --git a/src/pages/Worker/Card/WorkerSummary.vue b/src/pages/Worker/Card/WorkerSummary.vue
index 8fee52dd3..ed34e771d 100644
--- a/src/pages/Worker/Card/WorkerSummary.vue
+++ b/src/pages/Worker/Card/WorkerSummary.vue
@@ -139,6 +139,7 @@ onBeforeMount(async () => {
                         <VnLinkPhone :phone-number="worker?.sip?.extension" />
                     </template>
                 </VnLv>
+                <VnLv :label="t('queue')" :value="worker.sip?.queueMember?.queue" />
             </QCard>
         </template>
     </CardSummary>
diff --git a/src/pages/Worker/locale/en.yml b/src/pages/Worker/locale/en.yml
index 96df37919..96764ffd1 100644
--- a/src/pages/Worker/locale/en.yml
+++ b/src/pages/Worker/locale/en.yml
@@ -4,3 +4,4 @@ tableColumns:
     name: Name
     department: Department
     email: Email
+queue: Queue
diff --git a/src/pages/Worker/locale/es.yml b/src/pages/Worker/locale/es.yml
index 41812345f..cf6bc3afe 100644
--- a/src/pages/Worker/locale/es.yml
+++ b/src/pages/Worker/locale/es.yml
@@ -9,3 +9,4 @@ tableColumns:
     name: Nombre
     department: Departamento
     email: Email
+queue: Cola

From 3ede256dc554c7739e9cb7106f0f27d31063d48d Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 23 Sep 2024 18:30:14 +0000
Subject: [PATCH 169/281] feat: change label because its more natural

---
 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 b6cbfbafd..e5ed14a40 100644
--- a/src/components/common/VnLocation.vue
+++ b/src/components/common/VnLocation.vue
@@ -14,11 +14,11 @@ const props = defineProps({
 });
 const modelValue = ref(
     props.location
-        ? `${props.location?.postcode} - ${props.location?.city}(${props.location?.province?.name}), ${props.location?.country?.name}`
+        ? `${props.location?.postcode}, ${props.location?.city}(${props.location?.province?.name}), ${props.location?.country?.name}`
         : null
 );
 function showLabel(data) {
-    return `${data.code} - ${data.town}(${data.province}), ${data.country}`;
+    return `${data.code}, ${data.town}(${data.province}), ${data.country}`;
 }
 const handleModelValue = (data) => {
     emit('update:model-value', data);

From a5c6d628ca9eb4378cd548e4a4d9b79bc554592e Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 23 Sep 2024 18:48:58 +0000
Subject: [PATCH 170/281] feat: enable notify positive when user update self
 data

---
 src/components/UserPanel.vue | 43 +++++++++++++++++++++++++++---------
 1 file changed, 32 insertions(+), 11 deletions(-)

diff --git a/src/components/UserPanel.vue b/src/components/UserPanel.vue
index 98334460a..5276f9e20 100644
--- a/src/components/UserPanel.vue
+++ b/src/components/UserPanel.vue
@@ -13,12 +13,14 @@ import FetchData from 'components/FetchData.vue';
 import { useClipboard } from 'src/composables/useClipboard';
 import { useRole } from 'src/composables/useRole';
 import VnAvatar from './ui/VnAvatar.vue';
+import useNotify from 'src/composables/useNotify';
 
 const state = useState();
 const session = useSession();
 const router = useRouter();
 const { t, locale } = useI18n();
 const { copyText } = useClipboard();
+const { notify } = useNotify();
 
 const userLocale = computed({
     get() {
@@ -53,6 +55,7 @@ const user = state.getUser();
 const warehousesData = ref();
 const companiesData = ref();
 const accountBankData = ref();
+const isEmployee = computed(() => useRole().isEmployee());
 
 onMounted(async () => {
     updatePreferences();
@@ -70,18 +73,28 @@ function updatePreferences() {
 
 async function saveDarkMode(value) {
     const query = `/UserConfigs/${user.value.id}`;
-    await axios.patch(query, {
-        darkMode: value,
-    });
-    user.value.darkMode = value;
+    try {
+        await axios.patch(query, {
+            darkMode: value,
+        });
+        user.value.darkMode = value;
+        notify('globals.dataSaved', 'positive');
+    } catch (error) {
+        console.error(error);
+    }
 }
 
 async function saveLanguage(value) {
     const query = `/VnUsers/${user.value.id}`;
-    await axios.patch(query, {
-        lang: value,
-    });
-    user.value.lang = value;
+    try {
+        await axios.patch(query, {
+            lang: value,
+        });
+        user.value.lang = value;
+        notify('globals.dataSaved', 'positive');
+    } catch (error) {
+        console.error(error);
+    }
 }
 
 function logout() {
@@ -98,10 +111,18 @@ function localUserData() {
 }
 
 function saveUserData(param, value) {
-    axios.post('UserConfigs/setUserConfig', { [param]: value });
-    localUserData();
+    try {
+        axios.post('UserConfigs/setUserConfig', { [param]: value });
+        localUserData();
+        notify('globals.dataSaved', 'positive');
+    } catch (error) {
+        console.error(error);
+    }
 }
-const isEmployee = computed(() => useRole().isEmployee());
+
+const onDataSaved = () => {
+    notify('globals.dataSaved', 'positive');
+};
 </script>
 
 <template>

From 8124a341a08f65dda51d70ca279e4ed208c9d6de Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Tue, 24 Sep 2024 07:25:17 +0200
Subject: [PATCH 171/281] feat: refs #7129 route extended list and simplify
 route list

---
 src/components/VnTable/VnTable.vue    |   6 +-
 src/filters/toHour.js                 |   3 +-
 src/i18n/locale/en.yml                |   1 +
 src/i18n/locale/es.yml                |   1 +
 src/pages/Route/Agency/AgencyList.vue |  41 ++-
 src/pages/Route/RouteExtendedList.vue | 411 ++++++++++++++++++++++++++
 src/pages/Route/RouteList.vue         | 297 ++-----------------
 src/router/modules/route.js           |  23 +-
 8 files changed, 485 insertions(+), 298 deletions(-)
 create mode 100644 src/pages/Route/RouteExtendedList.vue

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index a3b64d264..b6023203e 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -10,7 +10,7 @@ import FormModelPopup from 'components/FormModelPopup.vue';
 
 import VnFilterPanel from 'components/ui/VnFilterPanel.vue';
 import VnTableColumn from 'components/VnTable/VnColumn.vue';
-import VnTableFilter from 'components/VnTable/VnFilter.vue';
+import VnFilter from 'components/VnTable/VnFilter.vue';
 import VnTableChip from 'components/VnTable/VnChip.vue';
 import VnVisibleColumn from 'src/components/VnTable/VnVisibleColumn.vue';
 import VnLv from 'components/ui/VnLv.vue';
@@ -335,7 +335,7 @@ function handleOnDataSaved(_) {
                         )"
                         :key="col.id"
                     >
-                        <VnTableFilter
+                        <VnFilter
                             :column="col"
                             :data-key="$attrs['data-key']"
                             v-model="params[columnName(col)]"
@@ -442,7 +442,7 @@ function handleOnDataSaved(_) {
                                     :search-url="searchUrl"
                                 />
                             </div>
-                            <VnTableFilter
+                            <VnFilter
                                 v-if="$props.columnSearch"
                                 :column="col"
                                 :show-title="true"
diff --git a/src/filters/toHour.js b/src/filters/toHour.js
index 40821e237..b5cc61c81 100644
--- a/src/filters/toHour.js
+++ b/src/filters/toHour.js
@@ -1,10 +1,11 @@
 import isValidDate from 'filters/isValidDate';
 
 export default function toHour(date) {
+    console.log('date: ', date);
     if (!isValidDate(date)) {
         return '--:--';
     }
-    return (new Date(date || '')).toLocaleTimeString([], {
+    return new Date(date || '').toLocaleTimeString([], {
         hour: '2-digit',
         minute: '2-digit',
     });
diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 2e2365f7b..f6c9b15fd 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -872,6 +872,7 @@ route:
         tickets: Tickets
         log: Log
         autonomous: Autonomous
+        RouteExtendedList: Extended list
     cmr:
         list:
             results: results
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 53b487e9f..201c73d43 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -216,6 +216,7 @@ globals:
         RouteRoadmap: Troncales
         RouteRoadmapCreate: Crear troncal
         autonomous: Autónomos
+        RouteExtendedList: Listado extendido
         suppliers: Proveedores
         supplier: Proveedor
         supplierCreate: Nuevo proveedor
diff --git a/src/pages/Route/Agency/AgencyList.vue b/src/pages/Route/Agency/AgencyList.vue
index 42aede8a0..30ee52f54 100644
--- a/src/pages/Route/Agency/AgencyList.vue
+++ b/src/pages/Route/Agency/AgencyList.vue
@@ -27,12 +27,15 @@ const columns = computed(() => [
             condition: () => true,
         },
         isId: true,
+        columnFilter: false,
     },
     {
         align: 'left',
         label: t('globals.name'),
         name: 'name',
         isTitle: true,
+        columnFilter: false,
+        columnClass: 'expand',
     },
     {
         align: 'left',
@@ -70,18 +73,34 @@ const columns = computed(() => [
         data-key="AgencyList"
         :expr-builder="exprBuilder"
     />
-    <VnTable
-        ref="tableRef"
-        data-key="AgencyList"
-        url="Agencies"
-        order="name"
-        :columns="columns"
-        :right-search="false"
-        :use-model="true"
-        redirect="agency"
-        default-mode="card"
-    />
+    <div class="list-container">
+        <div class="list">
+            <VnTable
+                ref="tableRef"
+                data-key="AgencyList"
+                url="Agencies"
+                order="name"
+                :columns="columns"
+                :right-search="false"
+                :use-model="true"
+                redirect="agency"
+                default-mode="card"
+            />
+        </div>
+    </div>
 </template>
+<style lang="scss" scoped>
+.list {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    width: 55%;
+}
+.list-container {
+    display: flex;
+    justify-content: center;
+}
+</style>
 <i18n>
     es:
         isOwn: Tiene propietario
diff --git a/src/pages/Route/RouteExtendedList.vue b/src/pages/Route/RouteExtendedList.vue
new file mode 100644
index 000000000..1e20df99c
--- /dev/null
+++ b/src/pages/Route/RouteExtendedList.vue
@@ -0,0 +1,411 @@
+<script setup>
+import { computed, ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useSession } from 'composables/useSession';
+import { useSummaryDialog } from 'src/composables/useSummaryDialog';
+import { useQuasar } from 'quasar';
+import { toDate } from 'src/filters';
+import { useRouter } from 'vue-router';
+
+import axios from 'axios';
+import RouteSearchbar from 'pages/Route/Card/RouteSearchbar.vue';
+import RouteListTicketsDialog from 'pages/Route/Card/RouteListTicketsDialog.vue';
+import RouteSummary from 'pages/Route/Card/RouteSummary.vue';
+import RightMenu from 'src/components/common/RightMenu.vue';
+import RouteFilter from 'pages/Route/Card/RouteFilter.vue';
+
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
+import VnInputDate from 'components/common/VnInputDate.vue';
+import VnTable from 'components/VnTable/VnTable.vue';
+import { usePrintService } from 'src/composables/usePrintService';
+
+const { openReport } = usePrintService();
+const { t } = useI18n();
+const { viewSummary } = useSummaryDialog();
+const quasar = useQuasar();
+const session = useSession();
+const selectedRows = ref([]);
+const tableRef = ref([]);
+const confirmationDialog = ref(false);
+const startingDate = ref(null);
+const router = useRouter();
+const routeFilter = {
+    include: [
+        {
+            relation: 'workers',
+            scope: {
+                fields: ['id', 'firstName'],
+            },
+        },
+    ],
+};
+const columns = computed(() => [
+    {
+        align: 'left',
+        name: 'id',
+        label: 'Id',
+        chip: {
+            condition: () => true,
+        },
+        isId: true,
+        columnFilter: false,
+    },
+    {
+        align: 'left',
+        name: 'workerFk',
+        label: t('Worker'),
+        create: true,
+        component: 'select',
+        attrs: {
+            url: 'Workers/activeWithInheritedRole',
+            fields: ['id', 'name'],
+            useLike: false,
+            optionFilter: 'firstName',
+            find: {
+                value: 'workerFk',
+                label: 'workerUserName',
+            },
+        },
+        columnFilter: {
+            inWhere: true,
+        },
+        useLike: false,
+        cardVisible: true,
+        format: (row, dashIfEmpty) => dashIfEmpty(row.travelRef),
+    },
+    {
+        align: 'left',
+        name: 'agencyModeFk',
+        label: t('Agency'),
+        isTitle: true,
+        cardVisible: true,
+        create: true,
+        component: 'select',
+        attrs: {
+            url: 'agencyModes',
+            fields: ['id', 'name'],
+            find: {
+                value: 'agencyModeFk',
+                label: 'agencyName',
+            },
+        },
+        columnClass: 'expand',
+    },
+    {
+        align: 'left',
+        name: 'vehicleFk',
+        label: t('Vehicle'),
+        cardVisible: true,
+        create: true,
+        component: 'select',
+        attrs: {
+            url: 'vehicles',
+            fields: ['id', 'numberPlate'],
+            optionLabel: 'numberPlate',
+            optionFilterValue: 'numberPlate',
+            find: {
+                value: 'vehicleFk',
+                label: 'vehiclePlateNumber',
+            },
+        },
+        columnFilter: {
+            inWhere: true,
+        },
+    },
+    {
+        align: 'left',
+        name: 'created',
+        label: t('Date'),
+        columnFilter: false,
+        cardVisible: true,
+        create: true,
+        component: 'date',
+        format: ({ date }) => toDate(date),
+    },
+    {
+        align: 'left',
+        name: 'from',
+        label: t('From'),
+        visible: false,
+        cardVisible: true,
+        create: true,
+        component: 'date',
+        format: ({ date }) => toDate(date),
+    },
+    {
+        align: 'left',
+        name: 'to',
+        label: t('To'),
+        visible: false,
+        cardVisible: true,
+        create: true,
+        component: 'date',
+        format: ({ date }) => toDate(date),
+    },
+    {
+        align: 'center',
+        name: 'm3',
+        label: t('Volume'),
+        cardVisible: true,
+        columnClass: 'shrink',
+    },
+    {
+        align: 'left',
+        name: 'started',
+        label: t('hourStarted'),
+        component: 'time',
+        columnFilter: false,
+    },
+    {
+        align: 'left',
+        name: 'finished',
+        label: t('hourFinished'),
+        component: 'time',
+        columnFilter: false,
+    },
+    {
+        align: 'center',
+        name: 'kmStart',
+        label: t('KmStart'),
+        columnClass: 'shrink',
+        create: true,
+        visible: false,
+    },
+    {
+        align: 'center',
+        name: 'kmEnd',
+        label: t('KmEnd'),
+        columnClass: 'shrink',
+        create: true,
+        visible: false,
+    },
+    {
+        align: 'left',
+        name: 'description',
+        label: t('Description'),
+        isTitle: true,
+        create: true,
+        component: 'input',
+        field: 'description',
+    },
+    {
+        align: 'left',
+        name: 'isOk',
+        label: t('Served'),
+        component: 'checkbox',
+        columnFilter: false,
+        columnClass: 'shrink',
+    },
+    {
+        align: 'right',
+        name: 'tableActions',
+        actions: [
+            {
+                title: t('Add tickets'),
+                icon: 'vn:ticketAdd',
+                action: (row) => openTicketsDialog(row?.id),
+            },
+            {
+                title: t('components.smartCard.viewSummary'),
+                icon: 'preview',
+                action: (row) => viewSummary(row?.id, RouteSummary),
+            },
+            {
+                title: t('Route summary'),
+                icon: 'arrow_forward',
+                isPrimary: true,
+                action: (row) => navigate(row?.id),
+            },
+        ],
+    },
+]);
+
+function navigate(id) {
+    router.push({ path: `/route/${id}` });
+}
+
+const cloneRoutes = () => {
+    if (!selectedRows.value.length || !startingDate.value) return;
+    axios.post('Routes/clone', {
+        created: startingDate.value,
+        ids: selectedRows.value.map((row) => row?.id),
+    });
+    startingDate.value = null;
+    tableRef.value.reload();
+};
+
+const showRouteReport = () => {
+    const ids = selectedRows.value.map((row) => row?.id);
+    const idString = ids.join(',');
+    let url = `Routes/${idString}/driver-route-pdf`;
+    let params = {};
+    if (selectedRows.value.length >= 1) {
+        params = {
+            id: idString,
+        };
+        url = `Routes/downloadZip`;
+    }
+    openReport(url, params, '_blank');
+};
+
+function markAsServed() {
+    selectedRows.value.forEach(async (row) => {
+        await axios.patch(`Routes/${row?.id}`, { isOk: true });
+    });
+    tableRef.value.reload();
+    startingDate.value = null;
+}
+
+const openTicketsDialog = (id) => {
+    quasar
+        .dialog({
+            component: RouteListTicketsDialog,
+            componentProps: {
+                id,
+            },
+        })
+        .onOk(() => tableRef.value.reload());
+};
+</script>
+
+<template>
+    <RouteSearchbar />
+    <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('globals.clone') }}
+                </QBtn>
+            </QCardActions>
+        </QCard>
+    </QDialog>
+    <VnSubToolbar />
+    <RightMenu>
+        <template #right-panel>
+            <RouteFilter data-key="RouteList" />
+        </template>
+    </RightMenu>
+    <VnTable
+        class="route-list"
+        ref="tableRef"
+        data-key="RouteList"
+        url="Routes/filter"
+        :columns="columns"
+        :right-search="false"
+        :is-editable="true"
+        :filter="routeFilter"
+        redirect="route"
+        :row-click="false"
+        :create="{
+            urlCreate: 'Routes',
+            title: t('Create route'),
+            onDataSaved: ({ id }) => tableRef.redirect(id),
+            formInitialData: {},
+        }"
+        save-url="Routes/crud"
+        :disable-option="{ card: true }"
+        table-height="85vh"
+        v-model:selected="selectedRows"
+        :table="{
+            'row-key': 'id',
+            selection: 'multiple',
+        }"
+    >
+        <template #moreBeforeActions>
+            <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="cloud_download"
+                color="primary"
+                class="q-mr-sm"
+                :disable="!selectedRows?.length"
+                @click="showRouteReport"
+            >
+                <QTooltip>{{ t('Download selected routes as PDF') }}</QTooltip>
+            </QBtn>
+            <QBtn
+                icon="check"
+                color="primary"
+                class="q-mr-sm"
+                :disable="!selectedRows?.length"
+                @click="markAsServed()"
+            >
+                <QTooltip>{{ t('Mark as served') }}</QTooltip>
+            </QBtn>
+        </template>
+    </VnTable>
+</template>
+
+<style lang="scss" scoped>
+.table-input-cell {
+    max-width: 143px;
+}
+
+.route-list {
+    width: 100%;
+    max-height: 100%;
+}
+
+.table-actions {
+    gap: 12px;
+}
+th:last-child,
+td:last-child {
+    background-color: var(--vn-section-color);
+    position: sticky;
+    right: 0;
+}
+</style>
+<i18n>
+en:
+    newRoute: New Route
+    hourStarted: Started hour
+    hourFinished: Finished hour
+es:
+    From: Desde
+    To: Hasta
+    Worker: Trabajador
+    Agency: Agencia
+    Vehicle: Vehículo
+    Volume: Volumen
+    Date: Fecha
+    Description: Descripción
+    Hour started: Hora inicio
+    Hour finished: Hora fin
+    KmStart: Km inicio
+    KmEnd: Km fin
+    Served: Servida
+    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
+    Mark as served: Marcar como servidas
+    Download selected routes as PDF: Descargar rutas seleccionadas como PDF
+    Add ticket: Añadir tickets
+    Preview: Vista previa
+    Summary: Resumen
+    Route is closed: La ruta está cerrada
+    Route is not served: La ruta no está servida
+    hourStarted: Hora de inicio
+    hourFinished: Hora de fin
+</i18n>
diff --git a/src/pages/Route/RouteList.vue b/src/pages/Route/RouteList.vue
index 1e20df99c..20e5deb1e 100644
--- a/src/pages/Route/RouteList.vue
+++ b/src/pages/Route/RouteList.vue
@@ -1,34 +1,19 @@
 <script setup>
 import { computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { useSession } from 'composables/useSession';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
-import { useQuasar } from 'quasar';
-import { toDate } from 'src/filters';
-import { useRouter } from 'vue-router';
+import { toHour } from 'src/filters';
 
-import axios from 'axios';
 import RouteSearchbar from 'pages/Route/Card/RouteSearchbar.vue';
-import RouteListTicketsDialog from 'pages/Route/Card/RouteListTicketsDialog.vue';
 import RouteSummary from 'pages/Route/Card/RouteSummary.vue';
 import RightMenu from 'src/components/common/RightMenu.vue';
 import RouteFilter from 'pages/Route/Card/RouteFilter.vue';
-
-import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
-import VnInputDate from 'components/common/VnInputDate.vue';
 import VnTable from 'components/VnTable/VnTable.vue';
-import { usePrintService } from 'src/composables/usePrintService';
+import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
 
-const { openReport } = usePrintService();
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
-const quasar = useQuasar();
-const session = useSession();
-const selectedRows = ref([]);
 const tableRef = ref([]);
-const confirmationDialog = ref(false);
-const startingDate = ref(null);
-const router = useRouter();
 const routeFilter = {
     include: [
         {
@@ -42,12 +27,12 @@ const routeFilter = {
 const columns = computed(() => [
     {
         align: 'left',
+        isId: true,
         name: 'id',
         label: 'Id',
         chip: {
             condition: () => true,
         },
-        isId: true,
         columnFilter: false,
     },
     {
@@ -55,138 +40,52 @@ const columns = computed(() => [
         name: 'workerFk',
         label: t('Worker'),
         create: true,
-        component: 'select',
-        attrs: {
-            url: 'Workers/activeWithInheritedRole',
-            fields: ['id', 'name'],
-            useLike: false,
-            optionFilter: 'firstName',
-            find: {
-                value: 'workerFk',
-                label: 'workerUserName',
-            },
-        },
-        columnFilter: {
-            inWhere: true,
-        },
-        useLike: false,
         cardVisible: true,
         format: (row, dashIfEmpty) => dashIfEmpty(row.travelRef),
+        columnFilter: false,
     },
     {
         align: 'left',
-        name: 'agencyModeFk',
+        name: 'agencyModeName',
         label: t('Agency'),
-        isTitle: true,
         cardVisible: true,
         create: true,
-        component: 'select',
-        attrs: {
-            url: 'agencyModes',
-            fields: ['id', 'name'],
-            find: {
-                value: 'agencyModeFk',
-                label: 'agencyName',
-            },
-        },
         columnClass: 'expand',
+        columnFilter: false,
     },
     {
         align: 'left',
-        name: 'vehicleFk',
+        name: 'vehiclePlateNumber',
         label: t('Vehicle'),
         cardVisible: true,
         create: true,
-        component: 'select',
-        attrs: {
-            url: 'vehicles',
-            fields: ['id', 'numberPlate'],
-            optionLabel: 'numberPlate',
-            optionFilterValue: 'numberPlate',
-            find: {
-                value: 'vehicleFk',
-                label: 'vehiclePlateNumber',
-            },
-        },
-        columnFilter: {
-            inWhere: true,
-        },
-    },
-    {
-        align: 'left',
-        name: 'created',
-        label: t('Date'),
         columnFilter: false,
-        cardVisible: true,
-        create: true,
-        component: 'date',
-        format: ({ date }) => toDate(date),
-    },
-    {
-        align: 'left',
-        name: 'from',
-        label: t('From'),
-        visible: false,
-        cardVisible: true,
-        create: true,
-        component: 'date',
-        format: ({ date }) => toDate(date),
-    },
-    {
-        align: 'left',
-        name: 'to',
-        label: t('To'),
-        visible: false,
-        cardVisible: true,
-        create: true,
-        component: 'date',
-        format: ({ date }) => toDate(date),
-    },
-    {
-        align: 'center',
-        name: 'm3',
-        label: t('Volume'),
-        cardVisible: true,
-        columnClass: 'shrink',
     },
     {
         align: 'left',
         name: 'started',
         label: t('hourStarted'),
-        component: 'time',
+        cardVisible: true,
         columnFilter: false,
+        format: (row) => toHour(row.started),
     },
     {
         align: 'left',
         name: 'finished',
         label: t('hourFinished'),
-        component: 'time',
+        cardVisible: true,
         columnFilter: false,
-    },
-    {
-        align: 'center',
-        name: 'kmStart',
-        label: t('KmStart'),
-        columnClass: 'shrink',
-        create: true,
-        visible: false,
-    },
-    {
-        align: 'center',
-        name: 'kmEnd',
-        label: t('KmEnd'),
-        columnClass: 'shrink',
-        create: true,
-        visible: false,
+        format: (row) => toHour(row.started),
     },
     {
         align: 'left',
         name: 'description',
         label: t('Description'),
+        cardVisible: true,
         isTitle: true,
         create: true,
-        component: 'input',
         field: 'description',
+        columnFilter: false,
     },
     {
         align: 'left',
@@ -200,111 +99,29 @@ const columns = computed(() => [
         align: 'right',
         name: 'tableActions',
         actions: [
-            {
-                title: t('Add tickets'),
-                icon: 'vn:ticketAdd',
-                action: (row) => openTicketsDialog(row?.id),
-            },
             {
                 title: t('components.smartCard.viewSummary'),
                 icon: 'preview',
                 action: (row) => viewSummary(row?.id, RouteSummary),
-            },
-            {
-                title: t('Route summary'),
-                icon: 'arrow_forward',
-                isPrimary: true,
-                action: (row) => navigate(row?.id),
+                color: 'primary',
             },
         ],
     },
 ]);
-
-function navigate(id) {
-    router.push({ path: `/route/${id}` });
-}
-
-const cloneRoutes = () => {
-    if (!selectedRows.value.length || !startingDate.value) return;
-    axios.post('Routes/clone', {
-        created: startingDate.value,
-        ids: selectedRows.value.map((row) => row?.id),
-    });
-    startingDate.value = null;
-    tableRef.value.reload();
-};
-
-const showRouteReport = () => {
-    const ids = selectedRows.value.map((row) => row?.id);
-    const idString = ids.join(',');
-    let url = `Routes/${idString}/driver-route-pdf`;
-    let params = {};
-    if (selectedRows.value.length >= 1) {
-        params = {
-            id: idString,
-        };
-        url = `Routes/downloadZip`;
-    }
-    openReport(url, params, '_blank');
-};
-
-function markAsServed() {
-    selectedRows.value.forEach(async (row) => {
-        await axios.patch(`Routes/${row?.id}`, { isOk: true });
-    });
-    tableRef.value.reload();
-    startingDate.value = null;
-}
-
-const openTicketsDialog = (id) => {
-    quasar
-        .dialog({
-            component: RouteListTicketsDialog,
-            componentProps: {
-                id,
-            },
-        })
-        .onOk(() => tableRef.value.reload());
-};
 </script>
-
 <template>
     <RouteSearchbar />
-    <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('globals.clone') }}
-                </QBtn>
-            </QCardActions>
-        </QCard>
-    </QDialog>
-    <VnSubToolbar />
     <RightMenu>
         <template #right-panel>
             <RouteFilter data-key="RouteList" />
         </template>
     </RightMenu>
     <VnTable
-        class="route-list"
         ref="tableRef"
         data-key="RouteList"
         url="Routes/filter"
         :columns="columns"
         :right-search="false"
-        :is-editable="true"
         :filter="routeFilter"
         redirect="route"
         :row-click="false"
@@ -314,98 +131,22 @@ const openTicketsDialog = (id) => {
             onDataSaved: ({ id }) => tableRef.redirect(id),
             formInitialData: {},
         }"
-        save-url="Routes/crud"
-        :disable-option="{ card: true }"
         table-height="85vh"
-        v-model:selected="selectedRows"
-        :table="{
-            'row-key': 'id',
-            selection: 'multiple',
-        }"
     >
-        <template #moreBeforeActions>
-            <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="cloud_download"
-                color="primary"
-                class="q-mr-sm"
-                :disable="!selectedRows?.length"
-                @click="showRouteReport"
-            >
-                <QTooltip>{{ t('Download selected routes as PDF') }}</QTooltip>
-            </QBtn>
-            <QBtn
-                icon="check"
-                color="primary"
-                class="q-mr-sm"
-                :disable="!selectedRows?.length"
-                @click="markAsServed()"
-            >
-                <QTooltip>{{ t('Mark as served') }}</QTooltip>
-            </QBtn>
+        <template #column-workerFk="{ row }">
+            <span class="link" @click.stop>
+                {{ row?.workerUserName }}
+                <WorkerDescriptorProxy :id="row?.workerFk" v-if="row?.workerFk" />
+            </span>
         </template>
     </VnTable>
 </template>
-
-<style lang="scss" scoped>
-.table-input-cell {
-    max-width: 143px;
-}
-
-.route-list {
-    width: 100%;
-    max-height: 100%;
-}
-
-.table-actions {
-    gap: 12px;
-}
-th:last-child,
-td:last-child {
-    background-color: var(--vn-section-color);
-    position: sticky;
-    right: 0;
-}
-</style>
 <i18n>
-en:
-    newRoute: New Route
-    hourStarted: Started hour
-    hourFinished: Finished hour
 es:
-    From: Desde
-    To: Hasta
     Worker: Trabajador
     Agency: Agencia
     Vehicle: Vehículo
-    Volume: Volumen
-    Date: Fecha
     Description: Descripción
     Hour started: Hora inicio
     Hour finished: Hora fin
-    KmStart: Km inicio
-    KmEnd: Km fin
-    Served: Servida
-    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
-    Mark as served: Marcar como servidas
-    Download selected routes as PDF: Descargar rutas seleccionadas como PDF
-    Add ticket: Añadir tickets
-    Preview: Vista previa
-    Summary: Resumen
-    Route is closed: La ruta está cerrada
-    Route is not served: La ruta no está servida
-    hourStarted: Hora de inicio
-    hourFinished: Hora de fin
 </i18n>
diff --git a/src/router/modules/route.js b/src/router/modules/route.js
index 3c5c860cf..9a7b16df3 100644
--- a/src/router/modules/route.js
+++ b/src/router/modules/route.js
@@ -11,7 +11,14 @@ export default {
     component: RouterView,
     redirect: { name: 'RouteMain' },
     menus: {
-        main: ['RouteList', 'RouteAutonomous', 'RouteRoadmap', 'CmrList', 'AgencyList'],
+        main: [
+            'RouteList',
+            'RouteExtendedList',
+            'RouteAutonomous',
+            'RouteRoadmap',
+            'CmrList',
+            'AgencyList',
+        ],
         card: ['RouteBasicData', 'RouteTickets', 'RouteLog'],
     },
     children: [
@@ -19,9 +26,6 @@ export default {
             path: '/route',
             name: 'RouteMain',
             component: () => import('src/components/common/VnSectionMain.vue'),
-            props: {
-                leftDrawer: false,
-            },
             redirect: { name: 'RouteList' },
             children: [
                 {
@@ -33,6 +37,15 @@ export default {
                     },
                     component: () => import('src/pages/Route/RouteList.vue'),
                 },
+                {
+                    path: 'extended-list',
+                    name: 'RouteExtendedList',
+                    meta: {
+                        title: 'RouteExtendedList',
+                        icon: 'format_list_bulleted',
+                    },
+                    component: () => import('src/pages/Route/RouteExtendedList.vue'),
+                },
                 {
                     path: 'create',
                     name: 'RouteCreate',
@@ -78,7 +91,7 @@ export default {
                             name: 'AgencyList',
                             meta: {
                                 title: 'agencyList',
-                                icon: 'view_list',
+                                icon: 'list',
                             },
                             component: () =>
                                 import('src/pages/Route/Agency/AgencyList.vue'),

From 876078166081102fc0cfba3cd76601aee361a153 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Tue, 24 Sep 2024 08:15:44 +0200
Subject: [PATCH 172/281] fix: merge in dev

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

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index a6948494c..a7c4e6378 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -789,11 +789,11 @@ es:
     thead tr:first-child th {
         top: 0;
     }
-    <<<<<<< HEAD .q-table__top {
+    .q-table__top {
         top: 0;
         padding: 12px 0;
     }
-    =======>>>>>>>d13cab0a240a3a10db97a793022ba0f5ded48965 tbody {
+    tbody {
         .q-checkbox {
             display: flex;
             margin-bottom: 9px;

From c400929c9956587d5cfe9cab8a2a10082ff1cd5b Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Tue, 24 Sep 2024 08:33:16 +0200
Subject: [PATCH 173/281] fix: refs #7129 translate page title

---
 src/i18n/locale/en.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index f6c9b15fd..11fe8c41c 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -135,7 +135,7 @@ globals:
         fiscalData: Fiscal data
         billingData: Billing data
         consignees: Consignees
-        'address-create': New address
+        address-create: New address
         notes: Notes
         credits: Credits
         greuges: Greuges
@@ -273,6 +273,7 @@ globals:
         clientsActionsMonitor: Clients and actions
         serial: Serial
         medical: Mutual
+        RouteExtendedList: Extended list
     supplier: Supplier
     created: Created
     worker: Worker

From 2c73ce28c30cd652c2359d9146981d10985aebd1 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Tue, 24 Sep 2024 09:02:35 +0200
Subject: [PATCH 174/281] fix: fixed wagon tests

---
 .../integration/wagon/wagonCreate.spec.js     | 25 ++++++++++++++-----
 .../wagonType/wagonTypeCreate.spec.js         |  2 +-
 .../wagonType/wagonTypeEdit.spec.js           | 14 +++++------
 3 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/test/cypress/integration/wagon/wagonCreate.spec.js b/test/cypress/integration/wagon/wagonCreate.spec.js
index 9aff3a819..57d0f8fec 100644
--- a/test/cypress/integration/wagon/wagonCreate.spec.js
+++ b/test/cypress/integration/wagon/wagonCreate.spec.js
@@ -11,7 +11,9 @@ describe('WagonCreate', () => {
         cy.get('input').eq(1).type('1234ABCD');
         cy.get('input').eq(2).type('100');
         cy.get('input').eq(3).click();
-        cy.get('div[role="listbox"]').find('div.q-item').click();
+        cy.get('.q-select > .q-field__inner > .q-field__control').type(
+            '{downarrow}{enter}'
+        );
 
         // Save
         cy.get('button[type="submit"]').click();
@@ -19,12 +21,23 @@ describe('WagonCreate', () => {
         // Check data has been saved successfully
         cy.waitForElement('.q-card');
 
-        cy.get('.title').should('have.text', '1234');
-        cy.get('[title-label="Plate"] > .value > span').should('have.text', '1234ABCD');
-        cy.get(':nth-child(2) > .value > span').should('have.text', '100');
-        cy.get(':nth-child(3) > .value > span').should('have.text', 'Wagon Type #1');
+        // cy.get('.cursor-text').should('have.text', '1234');
+        // cy.get(':nth-child(1) > .vn-label-value > .label > span').should(
+        //     'have.text',
+        //     '1234ABCD'
+        // );
+        // cy.get(':nth-child(2) > .vn-label-value > .label > span').should(
+        //     'have.text',
+        //     '100'
+        // );
+        // cy.get(':nth-child(3) > .vn-label-value > .label > span').should(
+        //     'have.text',
+        //     'Wagon Type #1'
+        // );
 
         // Delete wagon type created
-        cy.get('.actions > .q-btn--standard').click();
+        cy.get(
+            '[to="/null/2"] > .q-card > .column > [title="Remove"] > .q-btn__content > .q-icon'
+        ).click();
     });
 });
diff --git a/test/cypress/integration/wagonType/wagonTypeCreate.spec.js b/test/cypress/integration/wagonType/wagonTypeCreate.spec.js
index cd7ffa58f..0ad98e597 100644
--- a/test/cypress/integration/wagonType/wagonTypeCreate.spec.js
+++ b/test/cypress/integration/wagonType/wagonTypeCreate.spec.js
@@ -13,7 +13,7 @@ describe('WagonTypeCreate', () => {
     });
     it('delete a wagon type', () => {
         cy.get(
-            ':nth-child(2) > :nth-child(1) > .card-list-body > .actions > .q-btn--standard'
+            '[to="/null/2"] > .q-card > .column > [title="Remove"] > .q-btn__content > .q-icon'
         ).click();
     });
 });
diff --git a/test/cypress/integration/wagonType/wagonTypeEdit.spec.js b/test/cypress/integration/wagonType/wagonTypeEdit.spec.js
index 6e5816e51..36dd83411 100644
--- a/test/cypress/integration/wagonType/wagonTypeEdit.spec.js
+++ b/test/cypress/integration/wagonType/wagonTypeEdit.spec.js
@@ -4,7 +4,7 @@ describe('WagonTypeEdit', () => {
     beforeEach(() => {
         cy.viewport(1920, 1080);
         cy.login('developer');
-        cy.visit('/#/wagon/type/2/edit');
+        cy.visit('/#/wagon/type/1/edit');
     });
 
     it('should edit the name and the divisible field of the wagon type', () => {
@@ -14,14 +14,14 @@ describe('WagonTypeEdit', () => {
         cy.get('.q-btn--standard').click();
     });
 
-    it('should create a tray', () => {
-        cy.get('.action-button > .q-btn > .q-btn__content > .q-icon').click();
-        cy.get('input').last().type('150');
-        cy.get(trayColorRow).type('{downArrow}{downArrow}{enter}');
-    });
-
     it('should delete a tray', () => {
         cy.get('.action-button > .q-btn > .q-btn__content > .q-icon').first().click();
         cy.reload();
     });
+
+    it('should create a tray', () => {
+        cy.get('.action-button > .q-btn > .q-btn__content > .q-icon').last().click();
+        cy.get('input').last().type('150');
+        cy.get(trayColorRow).type('{downArrow}{downArrow}{downArrow}{enter}');
+    });
 });

From 768e15755fb63d645d43e123802cdbb5e0978936 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Tue, 24 Sep 2024 09:18:10 +0200
Subject: [PATCH 175/281] fix: deleted code

---
 .../integration/wagon/wagonCreate.spec.js       | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/test/cypress/integration/wagon/wagonCreate.spec.js b/test/cypress/integration/wagon/wagonCreate.spec.js
index 57d0f8fec..881e51f42 100644
--- a/test/cypress/integration/wagon/wagonCreate.spec.js
+++ b/test/cypress/integration/wagon/wagonCreate.spec.js
@@ -18,23 +18,6 @@ describe('WagonCreate', () => {
         // Save
         cy.get('button[type="submit"]').click();
 
-        // Check data has been saved successfully
-        cy.waitForElement('.q-card');
-
-        // cy.get('.cursor-text').should('have.text', '1234');
-        // cy.get(':nth-child(1) > .vn-label-value > .label > span').should(
-        //     'have.text',
-        //     '1234ABCD'
-        // );
-        // cy.get(':nth-child(2) > .vn-label-value > .label > span').should(
-        //     'have.text',
-        //     '100'
-        // );
-        // cy.get(':nth-child(3) > .vn-label-value > .label > span').should(
-        //     'have.text',
-        //     'Wagon Type #1'
-        // );
-
         // Delete wagon type created
         cy.get(
             '[to="/null/2"] > .q-card > .column > [title="Remove"] > .q-btn__content > .q-icon'

From f2ae231efb4f032c58b284d84206dccadce97175 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Tue, 24 Sep 2024 09:35:34 +0200
Subject: [PATCH 176/281] fix: missing code

---
 .../integration/wagon/wagonCreate.spec.js        | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/test/cypress/integration/wagon/wagonCreate.spec.js b/test/cypress/integration/wagon/wagonCreate.spec.js
index 881e51f42..cd248d1bb 100644
--- a/test/cypress/integration/wagon/wagonCreate.spec.js
+++ b/test/cypress/integration/wagon/wagonCreate.spec.js
@@ -18,6 +18,22 @@ describe('WagonCreate', () => {
         // Save
         cy.get('button[type="submit"]').click();
 
+        // Check data has been saved successfully
+        cy.waitForElement('.q-card');
+
+        cy.get(
+            '[to="/null/1"] > .q-card > .no-padding > .q-py-none > .cursor-text'
+        ).should('have.text', '1234');
+        cy.get(
+            '[to="/null/1"] > .q-card > .no-padding > .q-pr-lg > :nth-child(1) > .vn-label-value > .value > :nth-child(1) > .row > span'
+        ).should('have.text', '1234ABCD');
+        cy.get(
+            '[to="/null/1"] > .q-card > .no-padding > .q-pr-lg > :nth-child(2) > .vn-label-value > .value > :nth-child(1) > .row > span'
+        ).should('have.text', '100');
+        cy.get(
+            '[to="/null/1"] > .q-card > .no-padding > .q-pr-lg > :nth-child(3) > .vn-label-value > .value > :nth-child(1) > .row > span'
+        ).should('have.text', 'Wagon Type #1');
+
         // Delete wagon type created
         cy.get(
             '[to="/null/2"] > .q-card > .column > [title="Remove"] > .q-btn__content > .q-icon'

From edb6e9ce61f80f59af84c99a4ba75cb6c366d4ea Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Tue, 24 Sep 2024 09:57:05 +0200
Subject: [PATCH 177/281] feat(TravelList): add daysOnward

---
 src/components/VnTable/VnFilter.vue | 10 ++++++----
 src/components/VnTable/VnTable.vue  | 22 ++++++++++++++++++++--
 src/components/ui/VnFilterPanel.vue | 11 ++++++++---
 src/composables/useArrayData.js     |  3 ++-
 src/i18n/locale/en.yml              |  1 +
 src/i18n/locale/es.yml              |  1 +
 src/pages/Travel/TravelList.vue     | 18 +++++++++++++++++-
 7 files changed, 55 insertions(+), 11 deletions(-)

diff --git a/src/components/VnTable/VnFilter.vue b/src/components/VnTable/VnFilter.vue
index fd3c29fa3..c796b8827 100644
--- a/src/components/VnTable/VnFilter.vue
+++ b/src/components/VnTable/VnFilter.vue
@@ -10,8 +10,6 @@ import VnInputDate from 'components/common/VnInputDate.vue';
 import VnInputTime from 'components/common/VnInputTime.vue';
 import VnTableColumn from 'components/VnTable/VnColumn.vue';
 
-defineExpose({ addFilter });
-
 const $props = defineProps({
     column: {
         type: Object,
@@ -30,6 +28,9 @@ const $props = defineProps({
         default: 'params',
     },
 });
+
+defineExpose({ addFilter, props: $props });
+
 const model = defineModel(undefined, { required: true });
 const arrayData = useArrayData($props.dataKey, { searchUrl: $props.searchUrl });
 const columnFilter = computed(() => $props.column?.columnFilter);
@@ -115,11 +116,12 @@ const components = {
     rawSelect: selectComponent,
 };
 
-async function addFilter(value) {
+async function addFilter(value, name) {
     value ??= undefined;
     if (value && typeof value === 'object') value = model.value;
     value = value === '' ? undefined : value;
-    let field = columnFilter.value?.name ?? $props.column.name;
+    let field = columnFilter.value?.name ?? $props.column.name ?? name;
+    console.log('field: ', field);
 
     if (columnFilter.value?.inWhere) {
         if (columnFilter.value.alias) field = columnFilter.value.alias + '.' + field;
diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 2c9526ec0..ca6246137 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -97,6 +97,10 @@ const $props = defineProps({
         type: String,
         default: '90vh',
     },
+    translationPrefix: {
+        type: String,
+        default: null,
+    },
 });
 const { t } = useI18n();
 const stateStore = useStateStore();
@@ -117,6 +121,7 @@ const showForm = ref(false);
 const splittedColumns = ref({ columns: [] });
 const columnsVisibilitySkipped = ref();
 const createForm = ref();
+const tableFilterRef = ref([]);
 
 const tableModes = [
     {
@@ -219,7 +224,7 @@ function splitColumns(columns) {
         if (col.cardVisible) splittedColumns.value.cardVisible.push(col);
         if ($props.isEditable && col.disable == null) col.disable = false;
         if ($props.useModel && col.columnFilter != false)
-            col.columnFilter = { ...col.columnFilter, inWhere: true };
+            col.columnFilter = { inWhere: true, ...col.columnFilter };
         splittedColumns.value.columns.push(col);
     }
     // Status column
@@ -320,6 +325,13 @@ function handleOnDataSaved(_, res) {
                 :search-url="searchUrl"
                 :redirect="!!redirect"
                 @set-user-params="setUserParams"
+                :disable-submit-event="true"
+                @remove="
+                    (key) =>
+                        tableFilterRef
+                            .find((f) => f.props?.column.name == key)
+                            ?.addFilter()
+                "
             >
                 <template #body>
                     <div
@@ -330,6 +342,7 @@ function handleOnDataSaved(_, res) {
                         :key="col.id"
                     >
                         <VnTableFilter
+                            ref="tableFilterRef"
                             :column="col"
                             :data-key="$attrs['data-key']"
                             v-model="params[columnName(col)]"
@@ -353,10 +366,15 @@ function handleOnDataSaved(_, res) {
                         :columns="splittedColumns.columns"
                     />
                 </template>
+                <template #tags="{ tag, formatFn }" v-if="translationPrefix">
+                    <div class="q-gutter-x-xs">
+                        <strong>{{ t(`${translationPrefix}.${tag.label}`) }}: </strong>
+                        <span>{{ formatFn(tag.value) }}</span>
+                    </div>
+                </template>
             </VnFilterPanel>
         </QScrollArea>
     </QDrawer>
-    <!-- class in div to fix warn-->
 
     <CrudModel
         v-bind="$attrs"
diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue
index cebdc4bbf..c2c6cf45e 100644
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@@ -112,9 +112,9 @@ watch(
 );
 
 const isLoading = ref(false);
-async function search(evt) {
+async function search() {
     try {
-        if (evt && $props.disableSubmitEvent) return;
+        if ($props.disableSubmitEvent) return;
 
         store.filter.where = {};
         isLoading.value = true;
@@ -165,7 +165,7 @@ const tagsList = computed(() => {
     for (const key of Object.keys(userParams.value)) {
         const value = userParams.value[key];
         if (value == null || ($props.hiddenTags || []).includes(key)) continue;
-        tagList.push({ label: key, value });
+        tagList.push({ label: aliasField(key), value });
     }
     return tagList;
 });
@@ -200,6 +200,11 @@ function sanitizer(params) {
     }
     return params;
 }
+
+function aliasField(field) {
+    const split = field.split('.');
+    return split[1] ?? split[0];
+}
 </script>
 
 <template>
diff --git a/src/composables/useArrayData.js b/src/composables/useArrayData.js
index 651bcefb0..b1c150410 100644
--- a/src/composables/useArrayData.js
+++ b/src/composables/useArrayData.js
@@ -26,7 +26,8 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
             const params = JSON.parse(query[searchUrl]);
             const filter = params?.filter && JSON.parse(params?.filter ?? '{}');
             delete params.filter;
-            store.userParams = { ...params, ...store.userParams };
+
+            store.userParams = { ...store.userParams, ...params };
             store.userFilter = { ...filter, ...store.userFilter };
             if (filter?.order) store.order = filter.order;
         }
diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 1d1a287c2..bd9f83fbe 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -1109,6 +1109,7 @@ travel:
             warehouseOut: Warehouse out
             totalEntries: Total entries
             totalEntriesTooltip: Total entries
+            daysOnward: Landed days onwards
     summary:
         confirmed: Confirmed
         entryId: Entry Id
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index db717824a..aefa7580a 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -1093,6 +1093,7 @@ travel:
             warehouseOut: Alm.entrada
             totalEntries: ∑
             totalEntriesTooltip: Entradas totales
+            daysOnward: Días de llegada en adelante
     summary:
         confirmed: Confirmado
         entryId: Id entrada
diff --git a/src/pages/Travel/TravelList.vue b/src/pages/Travel/TravelList.vue
index c7ad908f9..b2a4a6baa 100644
--- a/src/pages/Travel/TravelList.vue
+++ b/src/pages/Travel/TravelList.vue
@@ -11,6 +11,7 @@ import TravelSummary from './Card/TravelSummary.vue';
 import VnSearchbar from 'components/ui/VnSearchbar.vue';
 import { toDate } from 'src/filters';
 import { getDateQBadgeColor } from 'src/composables/getDateQBadgeColor.js';
+
 const { viewSummary } = useSummaryDialog();
 const router = useRouter();
 const { t } = useI18n();
@@ -24,11 +25,15 @@ const $props = defineProps({
     },
 });
 const entityId = computed(() => $props.id || route.params.id);
+
+onMounted(async () => {
+    stateStore.rightDrawer = true;
+});
+
 const cloneTravel = (travelData) => {
     const stringifiedTravelData = JSON.stringify(travelData);
     redirectToCreateView(stringifiedTravelData);
 };
-
 const redirectToCreateView = (queryParams) => {
     router.push({ name: 'TravelCreate', query: { travelData: queryParams } });
 };
@@ -158,6 +163,15 @@ const columns = computed(() => [
         cardVisible: true,
         create: true,
     },
+    {
+        align: 'left',
+        name: 'daysOnward',
+        label: t('travel.travelList.tableVisibleColumns.daysOnward'),
+        visible: false,
+        columnFilter: {
+            inWhere: false,
+        },
+    },
     {
         align: 'right',
         label: '',
@@ -204,12 +218,14 @@ const columns = computed(() => [
                 editorFk: entityId,
             },
         }"
+        :user-params="{ daysOnward: 7 }"
         order="landed DESC"
         :columns="columns"
         auto-load
         redirect="travel"
         :is-editable="false"
         :use-model="true"
+        translation-prefix="travel.travelList.tableVisibleColumns"
     >
         <template #column-shipped="{ row }">
             <QBadge

From cd96003c0ea3221676986ad505246b8bb9ccae90 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Tue, 24 Sep 2024 10:35:59 +0200
Subject: [PATCH 178/281] refactor: refs #7553 requested changes and added
 keyup.enter

---
 src/components/VnTable/VnTable.vue                    |  7 -------
 src/pages/Customer/Card/CustomerConsumptionFilter.vue |  1 -
 src/pages/Order/Card/OrderLines.vue                   |  2 +-
 src/pages/Order/OrderList.vue                         |  2 +-
 src/pages/Order/locale/en.yml                         |  1 +
 src/pages/Order/locale/es.yml                         |  1 +
 src/pages/Ticket/Card/BasicData/TicketBasicData.vue   |  2 +-
 src/pages/Ticket/Card/TicketComponents.vue            |  2 +-
 src/pages/Ticket/Card/TicketNotes.vue                 | 10 ++++++++++
 src/pages/Ticket/Card/TicketSale.vue                  |  2 +-
 src/pages/Ticket/Card/TicketService.vue               | 11 ++++++++++-
 src/pages/Ticket/Card/TicketVolume.vue                |  2 +-
 12 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 325b0e997..6dabf51f5 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -433,13 +433,6 @@ function handleOnDataSaved(_) {
                         @click="stateStore.toggleRightDrawer()"
                     />
                 </template>
-                <!--TODO: este slot se carga los botones de mostrar tabla/card y columnas visibles
-                    por lo que no es viable para el uso que se le quiere dar-->
-                <!-- <template #top>
-                    <div class="full-width-slot">
-                        <slot name="before-header" />
-                    </div>
-                </template> -->
                 <template #header-cell="{ col }">
                     <QTh v-if="col.visible ?? true">
                         <div
diff --git a/src/pages/Customer/Card/CustomerConsumptionFilter.vue b/src/pages/Customer/Card/CustomerConsumptionFilter.vue
index 91536e954..289b2eb08 100644
--- a/src/pages/Customer/Card/CustomerConsumptionFilter.vue
+++ b/src/pages/Customer/Card/CustomerConsumptionFilter.vue
@@ -47,7 +47,6 @@ defineProps({ dataKey: { type: String, required: true } });
                 </QItemSection>
             </QItem>
             <QItem>
-                <!--It's required to include the relation category !! There's 413 records in production-->
                 <QItemSection>
                     <VnSelect
                         v-model="params.typeId"
diff --git a/src/pages/Order/Card/OrderLines.vue b/src/pages/Order/Card/OrderLines.vue
index 17a157797..175c956e1 100644
--- a/src/pages/Order/Card/OrderLines.vue
+++ b/src/pages/Order/Card/OrderLines.vue
@@ -249,7 +249,7 @@ watch(
         @on-fetch="(data) => (orderSummary.vat = data)"
         auto-load
     />
-    <QDrawer side="right" :width="270" v-model="stateStore.rightDrawer">
+    <QDrawer side="right" :width="265" v-model="stateStore.rightDrawer">
         <QCard
             class="order-lines-summary q-pa-lg"
             v-if="orderSummary.vat && orderSummary.total"
diff --git a/src/pages/Order/OrderList.vue b/src/pages/Order/OrderList.vue
index 7d1fd0056..6b6b41828 100644
--- a/src/pages/Order/OrderList.vue
+++ b/src/pages/Order/OrderList.vue
@@ -192,7 +192,7 @@ onMounted(() => {
         :order="['landed DESC', 'clientFk ASC', 'id DESC']"
         :create="{
             urlCreate: 'Orders/new',
-            title: 'Create Order',
+            title: t('module.cerateOrder'),
             onDataSaved: (url) => {
                 tableRef.redirect(url);
             },
diff --git a/src/pages/Order/locale/en.yml b/src/pages/Order/locale/en.yml
index b630a18ed..4349bc76f 100644
--- a/src/pages/Order/locale/en.yml
+++ b/src/pages/Order/locale/en.yml
@@ -10,6 +10,7 @@ module:
     total: Total
     salesPerson: Sales Person
     address: Address
+    cerateOrder: Create order
 lines:
     item: Item
     warehouse: Warehouse
diff --git a/src/pages/Order/locale/es.yml b/src/pages/Order/locale/es.yml
index 055d22719..cef06cb6d 100644
--- a/src/pages/Order/locale/es.yml
+++ b/src/pages/Order/locale/es.yml
@@ -10,6 +10,7 @@ module:
     total: Total
     salesPerson: Comercial
     address: Dirección
+    cerateOrder: Crear cesta
 lines:
     item: Artículo
     warehouse: Almacén
diff --git a/src/pages/Ticket/Card/BasicData/TicketBasicData.vue b/src/pages/Ticket/Card/BasicData/TicketBasicData.vue
index 2ed84e50e..ab96a6e75 100644
--- a/src/pages/Ticket/Card/BasicData/TicketBasicData.vue
+++ b/src/pages/Ticket/Card/BasicData/TicketBasicData.vue
@@ -144,7 +144,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
         @on-fetch="(data) => (ticketUpdateActions = data)"
         auto-load
     />
-    <QDrawer side="right" :width="270" v-model="stateStore.rightDrawer">
+    <QDrawer side="right" :width="265" v-model="stateStore.rightDrawer">
         <QCard
             class="q-pa-md q-mb-md q-ma-md color-vn-text"
             bordered
diff --git a/src/pages/Ticket/Card/TicketComponents.vue b/src/pages/Ticket/Card/TicketComponents.vue
index 9ac9771b8..0bccdaacd 100644
--- a/src/pages/Ticket/Card/TicketComponents.vue
+++ b/src/pages/Ticket/Card/TicketComponents.vue
@@ -192,7 +192,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
         @on-fetch="(data) => (components = data)"
         auto-load
     />
-    <QDrawer side="right" :width="270" v-model="stateStore.rightDrawer">
+    <QDrawer side="right" :width="265" v-model="stateStore.rightDrawer">
         <QCard class="q-pa-sm color-vn-text" bordered flat style="border-color: black">
             <QCardSection horizontal>
                 <span class="text-weight-bold text-subtitle1 text-center full-width">
diff --git a/src/pages/Ticket/Card/TicketNotes.vue b/src/pages/Ticket/Card/TicketNotes.vue
index f6bcc4533..ea06cd9f6 100644
--- a/src/pages/Ticket/Card/TicketNotes.vue
+++ b/src/pages/Ticket/Card/TicketNotes.vue
@@ -17,6 +17,7 @@ const ticketNotesCrudRef = ref(null);
 const observationTypes = ref([]);
 const arrayData = useArrayData('TicketNotes');
 const { store } = arrayData;
+const isSaving = ref(false);
 
 const crudModelFilter = reactive({
     where: { ticketFk: route.params.id },
@@ -36,6 +37,14 @@ watch(
 function handleDelete(row) {
     ticketNotesCrudRef.value.remove([row]);
 }
+
+async function handleSave() {
+    if (!isSaving.value) {
+        isSaving.value = true;
+        await ticketNotesCrudRef.value?.saveChanges();
+        isSaving.value = false;
+    }
+}
 </script>
 
 <template>
@@ -76,6 +85,7 @@ function handleDelete(row) {
                             :label="t('ticketNotes.description')"
                             v-model="row.description"
                             class="col"
+                            @keyup.enter="handleSave"
                         />
                         <QIcon
                             name="delete"
diff --git a/src/pages/Ticket/Card/TicketSale.vue b/src/pages/Ticket/Card/TicketSale.vue
index 2dc67872f..d87f6c402 100644
--- a/src/pages/Ticket/Card/TicketSale.vue
+++ b/src/pages/Ticket/Card/TicketSale.vue
@@ -585,7 +585,7 @@ watch(
             </QBtnGroup>
         </template>
     </VnSubToolbar>
-    <QDrawer side="right" :width="270" v-model="stateStore.rightDrawer">
+    <QDrawer side="right" :width="265" v-model="stateStore.rightDrawer">
         <div
             class="q-pa-md q-mb-md q-ma-md color-vn-text"
             style="border: 2px solid black"
diff --git a/src/pages/Ticket/Card/TicketService.vue b/src/pages/Ticket/Card/TicketService.vue
index c5bf7437e..45a870f7f 100644
--- a/src/pages/Ticket/Card/TicketService.vue
+++ b/src/pages/Ticket/Card/TicketService.vue
@@ -25,7 +25,7 @@ const { notify } = useNotify();
 
 const selected = ref([]);
 const defaultTaxClass = ref(null);
-
+const isSaving = ref(false);
 const crudModelFilter = computed(() => ({
     where: { ticketFk: route.params.id },
 }));
@@ -121,6 +121,14 @@ async function deleteService(row) {
         ticketServiceCrudRef.value.reload();
     }
 }
+
+async function handleSave() {
+    if (!isSaving.value) {
+        isSaving.value = true;
+        await ticketServiceCrudRef.value?.saveChanges();
+        isSaving.value = false;
+    }
+}
 </script>
 
 <template>
@@ -195,6 +203,7 @@ async function deleteService(row) {
                             v-model.number="row.price"
                             type="number"
                             min="0"
+                            @keyup.enter="handleSave"
                         />
                     </QTd>
                 </template>
diff --git a/src/pages/Ticket/Card/TicketVolume.vue b/src/pages/Ticket/Card/TicketVolume.vue
index 16769b4e1..2cf7ffc42 100644
--- a/src/pages/Ticket/Card/TicketVolume.vue
+++ b/src/pages/Ticket/Card/TicketVolume.vue
@@ -109,7 +109,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
     <QDrawer
         v-if="packingTypeVolume.length"
         side="right"
-        :width="270"
+        :width="265"
         v-model="stateStore.rightDrawer"
     >
         <QCard

From 3d34d9c6bb7973e2d63c4b5971f31f530cd1e8de Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Tue, 24 Sep 2024 10:54:17 +0200
Subject: [PATCH 179/281] chore: refs #7155 remove console.log

---
 src/components/VnTable/VnFilter.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/VnTable/VnFilter.vue b/src/components/VnTable/VnFilter.vue
index c796b8827..b17fd4407 100644
--- a/src/components/VnTable/VnFilter.vue
+++ b/src/components/VnTable/VnFilter.vue
@@ -121,7 +121,6 @@ async function addFilter(value, name) {
     if (value && typeof value === 'object') value = model.value;
     value = value === '' ? undefined : value;
     let field = columnFilter.value?.name ?? $props.column.name ?? name;
-    console.log('field: ', field);
 
     if (columnFilter.value?.inWhere) {
         if (columnFilter.value.alias) field = columnFilter.value.alias + '.' + field;

From c9e4ab490d5ede89588842c4fdfb80c759be381c Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Tue, 24 Sep 2024 12:23:19 +0200
Subject: [PATCH 180/281] build: init version 2442

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index ead0193c9..eaaa0b812 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "salix-front",
-    "version": "24.40.0",
+    "version": "24.42.0",
     "description": "Salix frontend",
     "productName": "Salix",
     "author": "Verdnatura",

From 70d640dc378e9c7df5ddcf2312284021d1a73b9c Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Tue, 24 Sep 2024 12:54:34 +0200
Subject: [PATCH 181/281] fix: refs #7129 some style issues

---
 src/pages/Route/Card/RouteListTicketsDialog.vue | 2 +-
 src/pages/Route/RouteList.vue                   | 3 +--
 src/pages/Route/RouteRoadmap.vue                | 2 +-
 src/pages/Route/RouteTickets.vue                | 9 +++------
 4 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/pages/Route/Card/RouteListTicketsDialog.vue b/src/pages/Route/Card/RouteListTicketsDialog.vue
index ba07f859f..b9b2ee36b 100644
--- a/src/pages/Route/Card/RouteListTicketsDialog.vue
+++ b/src/pages/Route/Card/RouteListTicketsDialog.vue
@@ -167,8 +167,8 @@ const setTicketsRoute = async () => {
                         <QTd :props="props">
                             <span class="link">
                                 {{ props.value }}
-                                <TicketDescriptorProxy :id="props?.row?.id" />
                             </span>
+                            <TicketDescriptorProxy :id="props?.row?.id" />
                         </QTd>
                     </template>
                     <template #body-cell-client="props">
diff --git a/src/pages/Route/RouteList.vue b/src/pages/Route/RouteList.vue
index 20e5deb1e..b6c23f8ed 100644
--- a/src/pages/Route/RouteList.vue
+++ b/src/pages/Route/RouteList.vue
@@ -46,7 +46,7 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        name: 'agencyModeName',
+        name: 'agencyName',
         label: t('Agency'),
         cardVisible: true,
         create: true,
@@ -124,7 +124,6 @@ const columns = computed(() => [
         :right-search="false"
         :filter="routeFilter"
         redirect="route"
-        :row-click="false"
         :create="{
             urlCreate: 'Routes',
             title: t('Create route'),
diff --git a/src/pages/Route/RouteRoadmap.vue b/src/pages/Route/RouteRoadmap.vue
index d921dab1f..3687442f5 100644
--- a/src/pages/Route/RouteRoadmap.vue
+++ b/src/pages/Route/RouteRoadmap.vue
@@ -87,7 +87,7 @@ const columns = computed(() => [
         actions: [
             {
                 title: t('Ver cmr'),
-                icon: 'visibility',
+                icon: 'preview',
                 isPrimary: true,
                 action: (row) => viewSummary(row?.id, RoadmapSummary),
             },
diff --git a/src/pages/Route/RouteTickets.vue b/src/pages/Route/RouteTickets.vue
index 5960636b0..3bdad4fec 100644
--- a/src/pages/Route/RouteTickets.vue
+++ b/src/pages/Route/RouteTickets.vue
@@ -342,10 +342,7 @@ const openSmsDialog = async () => {
                             </template>
                             <template #body-cell-city="{ value, row }">
                                 <QTd auto-width>
-                                    <span
-                                        class="text-primary cursor-pointer"
-                                        @click="goToBuscaman(row)"
-                                    >
+                                    <span class="link" @click="goToBuscaman(row)">
                                         {{ value }}
                                         <QTooltip>{{ t('Open buscaman') }}</QTooltip>
                                     </span>
@@ -353,7 +350,7 @@ const openSmsDialog = async () => {
                             </template>
                             <template #body-cell-client="{ value, row }">
                                 <QTd auto-width>
-                                    <span class="text-primary cursor-pointer">
+                                    <span class="link">
                                         {{ value }}
                                         <CustomerDescriptorProxy :id="row?.clientFk" />
                                     </span>
@@ -361,7 +358,7 @@ const openSmsDialog = async () => {
                             </template>
                             <template #body-cell-ticket="{ value, row }">
                                 <QTd auto-width class="text-center">
-                                    <span class="text-primary cursor-pointer">
+                                    <span class="link">
                                         {{ value }}
                                         <TicketDescriptorProxy :id="row?.id" />
                                     </span>

From f0c2baa60edf2d281c393e69b2df5c097fd61361 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Tue, 24 Sep 2024 12:56:14 +0200
Subject: [PATCH 182/281] fix: refs #7129  remove consoleLog

---
 src/filters/toHour.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/filters/toHour.js b/src/filters/toHour.js
index b5cc61c81..52df9c8cd 100644
--- a/src/filters/toHour.js
+++ b/src/filters/toHour.js
@@ -1,7 +1,6 @@
 import isValidDate from 'filters/isValidDate';
 
 export default function toHour(date) {
-    console.log('date: ', date);
     if (!isValidDate(date)) {
         return '--:--';
     }

From 991ad21c777eae42a571e36ea20681733917f907 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Tue, 24 Sep 2024 13:16:34 +0200
Subject: [PATCH 183/281] fix: refs #7155 remove userParams in watcher

---
 src/components/ui/VnPaginate.vue | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/components/ui/VnPaginate.vue b/src/components/ui/VnPaginate.vue
index 37101dafe..c6f57b479 100644
--- a/src/components/ui/VnPaginate.vue
+++ b/src/components/ui/VnPaginate.vue
@@ -119,10 +119,9 @@ watch(
 );
 
 watch(
-    () => [props.url, props.filter, props.userParams],
-    ([url, filter, userParams]) => mounted.value && fetch({ url, filter, userParams })
+    () => [props.url, props.filter],
+    ([url, filter]) => mounted.value && fetch({ url, filter })
 );
-
 const addFilter = async (filter, params) => {
     await arrayData.addFilter({ filter, params });
 };

From d35b40a891d3c894b0e21e6881bc7216c41214ef Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Tue, 24 Sep 2024 14:07:04 +0200
Subject: [PATCH 184/281] fix: vnTable color

---
 src/components/VnTable/VnTable.vue | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 52cd3ed47..f53f3c645 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -731,6 +731,10 @@ es:
     border-color: var(--vn-section-color);
 }
 
+.q-table__container > div:first-child {
+    background-color: var(--vn-page-color);
+}
+
 .grid-three {
     display: grid;
     grid-template-columns: repeat(auto-fit, minmax(400px, max-content));

From b54d358617b3cfcd1f2e6c47c05696820af6ade4 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 25 Sep 2024 09:14:35 +0200
Subject: [PATCH 185/281] fix: refs #7207 use right locale

---
 src/pages/InvoiceIn/InvoiceInFilter.vue | 2 +-
 src/pages/InvoiceIn/locale/es.yml       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/InvoiceIn/InvoiceInFilter.vue b/src/pages/InvoiceIn/InvoiceInFilter.vue
index bf4e023a9..b19e047fa 100644
--- a/src/pages/InvoiceIn/InvoiceInFilter.vue
+++ b/src/pages/InvoiceIn/InvoiceInFilter.vue
@@ -170,7 +170,7 @@ es:
         awb: AWB
         amount: Importe
         issued: Emitida
-        isBooked: Conciliada
+        isBooked: Contabilizada
         account: Cuenta contable
         created: Creada
         dued: Vencida
diff --git a/src/pages/InvoiceIn/locale/es.yml b/src/pages/InvoiceIn/locale/es.yml
index 944708364..2d3b137f4 100644
--- a/src/pages/InvoiceIn/locale/es.yml
+++ b/src/pages/InvoiceIn/locale/es.yml
@@ -7,7 +7,7 @@ invoiceIn:
         shortIssued: F. emisión
         file: Fichero
         issued: Fecha emisión
-        isBooked: Conciliada
+        isBooked: Contabilizada
         awb: AWB
         amount: Importe
     card:

From 45b3ed6e17ce1c3d6b70fea9a62d29cbd516776e Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 25 Sep 2024 09:53:06 +0200
Subject: [PATCH 186/281] fix: refs #7207 te2e

---
 test/cypress/integration/ticket/ticketDescriptor.spec.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/cypress/integration/ticket/ticketDescriptor.spec.js b/test/cypress/integration/ticket/ticketDescriptor.spec.js
index 8192b7c7c..cc3a1d65a 100644
--- a/test/cypress/integration/ticket/ticketDescriptor.spec.js
+++ b/test/cypress/integration/ticket/ticketDescriptor.spec.js
@@ -1,7 +1,7 @@
 /// <reference types="cypress" />
 describe('Ticket descriptor', () => {
-    const toCloneOpt = '[role="menu"] .q-list > :nth-child(5)';
-    const setWeightOpt = '[role="menu"] .q-list > :nth-child(6)';
+    const toCloneOpt = '[role="menu"] .q-list > :nth-child(8)';
+    const setWeightOpt = '[role="menu"] .q-list > :nth-child(13)';
     const warehouseValue = ':nth-child(1) > :nth-child(6) > .value > span';
     const summaryHeader = '.summaryHeader > div';
     const weight = 25;

From 72ddeaa90ae3a8f871dfc136fa73045cb7709538 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 25 Sep 2024 10:53:38 +0200
Subject: [PATCH 187/281] test: refs #8031 e2e

---
 src/components/UserPanel.vue                  | 20 ++++---
 src/i18n/locale/en.yml                        |  1 +
 src/i18n/locale/es.yml                        |  1 +
 .../integration/vnComponent/UserPanel.spec.js | 58 +++++++++++++++++++
 test/cypress/support/commands.js              |  6 ++
 5 files changed, 78 insertions(+), 8 deletions(-)
 create mode 100644 test/cypress/integration/vnComponent/UserPanel.spec.js

diff --git a/src/components/UserPanel.vue b/src/components/UserPanel.vue
index 5276f9e20..810f63044 100644
--- a/src/components/UserPanel.vue
+++ b/src/components/UserPanel.vue
@@ -78,9 +78,9 @@ async function saveDarkMode(value) {
             darkMode: value,
         });
         user.value.darkMode = value;
-        notify('globals.dataSaved', 'positive');
+        onDataSaved();
     } catch (error) {
-        console.error(error);
+        onDataError();
     }
 }
 
@@ -91,9 +91,9 @@ async function saveLanguage(value) {
             lang: value,
         });
         user.value.lang = value;
-        notify('globals.dataSaved', 'positive');
+        onDataSaved();
     } catch (error) {
-        console.error(error);
+        onDataError();
     }
 }
 
@@ -110,19 +110,23 @@ function localUserData() {
     state.setUser(user.value);
 }
 
-function saveUserData(param, value) {
+async function saveUserData(param, value) {
     try {
-        axios.post('UserConfigs/setUserConfig', { [param]: value });
+        await axios.post('UserConfigs/setUserConfig', { [param]: value });
         localUserData();
-        notify('globals.dataSaved', 'positive');
+        onDataSaved();
     } catch (error) {
-        console.error(error);
+        onDataError();
     }
 }
 
 const onDataSaved = () => {
     notify('globals.dataSaved', 'positive');
 };
+
+const onDataError = () => {
+    notify('errors.updateUserConfig', 'negative');
+};
 </script>
 
 <template>
diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 9e1038b96..8d17b7e5f 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -302,6 +302,7 @@ errors:
     statusBadGateway: It seems that the server has fall down
     statusGatewayTimeout: Could not contact the server
     userConfig: Error fetching user config
+    updateUserConfig: Error updating user config
     tokenConfig: Error fetching token config
     writeRequest: The requested operation could not be completed
 login:
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index c07e1f631..7a7a16dbc 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -306,6 +306,7 @@ errors:
     statusBadGateway: Parece ser que el servidor ha caído
     statusGatewayTimeout: No se ha podido contactar con el servidor
     userConfig: Error al obtener configuración de usuario
+    updateUserConfig: Error al actualizar la configuración de usuario
     tokenConfig: Error al obtener configuración de token
     writeRequest: No se pudo completar la operación solicitada
 login:
diff --git a/test/cypress/integration/vnComponent/UserPanel.spec.js b/test/cypress/integration/vnComponent/UserPanel.spec.js
new file mode 100644
index 000000000..e83d07954
--- /dev/null
+++ b/test/cypress/integration/vnComponent/UserPanel.spec.js
@@ -0,0 +1,58 @@
+/// <reference types="cypress" />
+describe('UserPanel', () => {
+    beforeEach(() => {
+        cy.viewport(1280, 720);
+        cy.login('developer');
+        cy.visit(`/#dashboard`);
+        cy.waitForElement('.q-page', 6000);
+    });
+
+    it('should notify when update user warehouse', () => {
+        const userWarehouse =
+            '.q-menu .q-gutter-xs > :nth-child(3) > .q-field > .q-field__inner > .q-field__control > .q-field__control-container > .q-field__native> .q-field__input';
+
+        // Abro el panel
+        cy.openUserPanel();
+
+        // Compruebo la opcion inicial
+        cy.get(userWarehouse).should('have.value', 'VNL').click();
+
+        // Actualizo la opción
+        getOption(3);
+
+        //Compruebo la notificación
+        cy.get('.q-notification').should('be.visible');
+        cy.get(userWarehouse).should('have.value', 'VNH');
+
+        //Restauro el valor
+        cy.get(userWarehouse).click();
+        getOption(2);
+    });
+    it('should notify when update user company', () => {
+        const userCompany =
+            '.q-menu .q-gutter-xs > :nth-child(2)  >  .q-field--float > .q-field__inner > .q-field__control > .q-field__control-container > .q-field__native> .q-field__input';
+
+        // Abro el panel
+        cy.openUserPanel();
+
+        // Compruebo la opcion inicial
+        cy.get(userCompany).should('have.value', 'Warehouse One').click();
+
+        //Actualizo la opción
+        getOption(2);
+
+        //Compruebo la notificación
+        cy.get('.q-notification').should('be.visible');
+        cy.get(userCompany).should('have.value', 'Warehouse Two');
+
+        //Restauro el valor
+        cy.get(userCompany).click();
+        getOption(1);
+    });
+});
+
+function getOption(index) {
+    cy.waitForElement('[role="listbox"]');
+    const option = `[role="listbox"] .q-item:nth-child(${index})`;
+    cy.get(option).click();
+}
diff --git a/test/cypress/support/commands.js b/test/cypress/support/commands.js
index 43788f59f..83f45b721 100755
--- a/test/cypress/support/commands.js
+++ b/test/cypress/support/commands.js
@@ -248,3 +248,9 @@ Cypress.Commands.add('validateContent', (selector, expectedValue) => {
 Cypress.Commands.add('openActionsDescriptor', () => {
     cy.get('.header > :nth-child(3) > .q-btn__content > .q-icon').click();
 });
+
+Cypress.Commands.add('openUserPanel', () => {
+    cy.get(
+        '.column > .q-avatar > .q-avatar__content > .q-img > .q-img__container > .q-img__image'
+    ).click();
+});

From 27b699ebf4f96fcdff05f58a35c1893655824076 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Wed, 25 Sep 2024 11:16:27 +0200
Subject: [PATCH 188/281] fix: refs #7129 some component styles

---
 src/i18n/locale/en.yml                  |   8 +-
 src/i18n/locale/es.yml                  |   6 +-
 src/pages/Item/ItemFixedPrice.vue       |   2 -
 src/pages/Route/Agency/AgencyList.vue   |   1 -
 src/pages/Route/RouteExtendedList.vue   | 119 +++++++-----------------
 src/pages/Route/RouteList.vue           |  28 ++----
 src/pages/Route/locale/en.yml           |  25 +++++
 src/pages/Route/locale/es.yml           |  25 +++++
 src/pages/Travel/Card/TravelSummary.vue |   2 +-
 9 files changed, 101 insertions(+), 115 deletions(-)
 create mode 100644 src/pages/Route/locale/en.yml
 create mode 100644 src/pages/Route/locale/es.yml

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 6b9a4a1e1..f1e502998 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -111,7 +111,7 @@ globals:
         basicData: Basic data
         log: Logs
         parkingList: Parkings list
-        agencyList: Agencies list
+        agencyList: Agencies
         agency: Agency
         workCenters: Work centers
         modes: Modes
@@ -207,7 +207,7 @@ globals:
         roadmap: Roadmap
         stops: Stops
         routes: Routes
-        cmrsList: CMRs list
+        cmrsList: CMRs
         RouteList: List
         routeCreate: New route
         RouteRoadmap: Roadmaps
@@ -273,7 +273,7 @@ globals:
         clientsActionsMonitor: Clients and actions
         serial: Serial
         medical: Mutual
-        RouteExtendedList: Extended list
+        RouteExtendedList: Router
     supplier: Supplier
     created: Created
     worker: Worker
@@ -880,7 +880,7 @@ route:
         tickets: Tickets
         log: Log
         autonomous: Autonomous
-        RouteExtendedList: Extended list
+        RouteExtendedList: Router
     cmr:
         list:
             results: results
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 15eba6706..e62553446 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -113,7 +113,7 @@ globals:
         basicData: Datos básicos
         log: Historial
         parkingList: Listado de parkings
-        agencyList: Listado de agencias
+        agencyList: Agencias
         agency: Agencia
         workCenters: Centros de trabajo
         modes: Modos
@@ -211,13 +211,13 @@ globals:
         roadmap: Troncales
         stops: Paradas
         routes: Rutas
-        cmrsList: Listado de CMRs
+        cmrsList: CMRs
         RouteList: Listado
         routeCreate: Nueva ruta
         RouteRoadmap: Troncales
         RouteRoadmapCreate: Crear troncal
         autonomous: Autónomos
-        RouteExtendedList: Listado extendido
+        RouteExtendedList: Enrutador
         suppliers: Proveedores
         supplier: Proveedor
         supplierCreate: Nuevo proveedor
diff --git a/src/pages/Item/ItemFixedPrice.vue b/src/pages/Item/ItemFixedPrice.vue
index fddf154a2..2158065bd 100644
--- a/src/pages/Item/ItemFixedPrice.vue
+++ b/src/pages/Item/ItemFixedPrice.vue
@@ -600,11 +600,9 @@ function handleOnDataSave({ CrudModelRef }) {
 .q-table th,
 .q-table td {
     padding-inline: 5px !important;
-    // text-align: -webkit-right;
 }
 .q-table tbody td {
     max-width: none;
-
     .q-td.col {
         & .vnInputDate {
             min-width: 90px;
diff --git a/src/pages/Route/Agency/AgencyList.vue b/src/pages/Route/Agency/AgencyList.vue
index 30ee52f54..9d456c1da 100644
--- a/src/pages/Route/Agency/AgencyList.vue
+++ b/src/pages/Route/Agency/AgencyList.vue
@@ -76,7 +76,6 @@ const columns = computed(() => [
     <div class="list-container">
         <div class="list">
             <VnTable
-                ref="tableRef"
                 data-key="AgencyList"
                 url="Agencies"
                 order="name"
diff --git a/src/pages/Route/RouteExtendedList.vue b/src/pages/Route/RouteExtendedList.vue
index 1e20df99c..b90434f4f 100644
--- a/src/pages/Route/RouteExtendedList.vue
+++ b/src/pages/Route/RouteExtendedList.vue
@@ -1,11 +1,11 @@
 <script setup>
 import { computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { useSession } from 'composables/useSession';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import { useQuasar } from 'quasar';
 import { toDate } from 'src/filters';
 import { useRouter } from 'vue-router';
+import { usePrintService } from 'src/composables/usePrintService';
 
 import axios from 'axios';
 import RouteSearchbar from 'pages/Route/Card/RouteSearchbar.vue';
@@ -13,17 +13,14 @@ import RouteListTicketsDialog from 'pages/Route/Card/RouteListTicketsDialog.vue'
 import RouteSummary from 'pages/Route/Card/RouteSummary.vue';
 import RightMenu from 'src/components/common/RightMenu.vue';
 import RouteFilter from 'pages/Route/Card/RouteFilter.vue';
-
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
 import VnTable from 'components/VnTable/VnTable.vue';
-import { usePrintService } from 'src/composables/usePrintService';
 
 const { openReport } = usePrintService();
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
 const quasar = useQuasar();
-const session = useSession();
 const selectedRows = ref([]);
 const tableRef = ref([]);
 const confirmationDialog = ref(false);
@@ -53,7 +50,7 @@ const columns = computed(() => [
     {
         align: 'left',
         name: 'workerFk',
-        label: t('Worker'),
+        label: t('route.Worker'),
         create: true,
         component: 'select',
         attrs: {
@@ -76,7 +73,7 @@ const columns = computed(() => [
     {
         align: 'left',
         name: 'agencyModeFk',
-        label: t('Agency'),
+        label: t('route.Agency'),
         isTitle: true,
         cardVisible: true,
         create: true,
@@ -94,7 +91,7 @@ const columns = computed(() => [
     {
         align: 'left',
         name: 'vehicleFk',
-        label: t('Vehicle'),
+        label: t('route.Vehicle'),
         cardVisible: true,
         create: true,
         component: 'select',
@@ -115,7 +112,7 @@ const columns = computed(() => [
     {
         align: 'left',
         name: 'created',
-        label: t('Date'),
+        label: t('route.Date'),
         columnFilter: false,
         cardVisible: true,
         create: true,
@@ -125,7 +122,7 @@ const columns = computed(() => [
     {
         align: 'left',
         name: 'from',
-        label: t('From'),
+        label: t('route.From'),
         visible: false,
         cardVisible: true,
         create: true,
@@ -135,7 +132,7 @@ const columns = computed(() => [
     {
         align: 'left',
         name: 'to',
-        label: t('To'),
+        label: t('route.To'),
         visible: false,
         cardVisible: true,
         create: true,
@@ -145,28 +142,28 @@ const columns = computed(() => [
     {
         align: 'center',
         name: 'm3',
-        label: t('Volume'),
+        label: 'm3',
         cardVisible: true,
         columnClass: 'shrink',
     },
     {
         align: 'left',
         name: 'started',
-        label: t('hourStarted'),
+        label: t('route.hourStarted'),
         component: 'time',
         columnFilter: false,
     },
     {
         align: 'left',
         name: 'finished',
-        label: t('hourFinished'),
+        label: t('route.hourFinished'),
         component: 'time',
         columnFilter: false,
     },
     {
         align: 'center',
         name: 'kmStart',
-        label: t('KmStart'),
+        label: t('route.KmStart'),
         columnClass: 'shrink',
         create: true,
         visible: false,
@@ -174,7 +171,7 @@ const columns = computed(() => [
     {
         align: 'center',
         name: 'kmEnd',
-        label: t('KmEnd'),
+        label: t('route.KmEnd'),
         columnClass: 'shrink',
         create: true,
         visible: false,
@@ -182,7 +179,7 @@ const columns = computed(() => [
     {
         align: 'left',
         name: 'description',
-        label: t('Description'),
+        label: t('route.Description'),
         isTitle: true,
         create: true,
         component: 'input',
@@ -191,7 +188,7 @@ const columns = computed(() => [
     {
         align: 'left',
         name: 'isOk',
-        label: t('Served'),
+        label: t('route.Served'),
         component: 'checkbox',
         columnFilter: false,
         columnClass: 'shrink',
@@ -201,20 +198,22 @@ const columns = computed(() => [
         name: 'tableActions',
         actions: [
             {
-                title: t('Add tickets'),
+                title: t('route.Add tickets'),
                 icon: 'vn:ticketAdd',
                 action: (row) => openTicketsDialog(row?.id),
+                isPrimary: true,
             },
             {
-                title: t('components.smartCard.viewSummary'),
+                title: t('route.components.smartCard.viewSummary'),
                 icon: 'preview',
                 action: (row) => viewSummary(row?.id, RouteSummary),
+                isPrimary: true,
             },
             {
-                title: t('Route summary'),
+                title: t('route.Route summary'),
                 icon: 'arrow_forward',
-                isPrimary: true,
                 action: (row) => navigate(row?.id),
+                isPrimary: true,
             },
         ],
     },
@@ -226,7 +225,7 @@ function navigate(id) {
 
 const cloneRoutes = () => {
     if (!selectedRows.value.length || !startingDate.value) return;
-    axios.post('Routes/clone', {
+    axios.post('route.Routes/clone', {
         created: startingDate.value,
         ids: selectedRows.value.map((row) => row?.id),
     });
@@ -273,20 +272,25 @@ const openTicketsDialog = (id) => {
     <QDialog v-model="confirmationDialog">
         <QCard style="min-width: 350px">
             <QCardSection>
-                <p class="text-h6 q-ma-none">{{ t('Select the starting date') }}</p>
+                <p class="text-h6 q-ma-none">{{ t('route.Select the starting date') }}</p>
             </QCardSection>
 
             <QCardSection class="q-pt-none">
                 <VnInputDate
-                    :label="t('Stating date')"
+                    :label="t('route.Stating date')"
                     v-model="startingDate"
                     autofocus
                 />
             </QCardSection>
             <QCardActions align="right">
-                <QBtn flat :label="t('Cancel')" v-close-popup class="text-primary" />
+                <QBtn
+                    flat
+                    :label="t('route.Cancel')"
+                    v-close-popup
+                    class="text-primary"
+                />
                 <QBtn color="primary" v-close-popup @click="cloneRoutes">
-                    {{ t('globals.clone') }}
+                    {{ t('route.globals.clone') }}
                 </QBtn>
             </QCardActions>
         </QCard>
@@ -310,7 +314,7 @@ const openTicketsDialog = (id) => {
         :row-click="false"
         :create="{
             urlCreate: 'Routes',
-            title: t('Create route'),
+            title: t('route.createRoute'),
             onDataSaved: ({ id }) => tableRef.redirect(id),
             formInitialData: {},
         }"
@@ -331,7 +335,7 @@ const openTicketsDialog = (id) => {
                 :disable="!selectedRows?.length"
                 @click="confirmationDialog = true"
             >
-                <QTooltip>{{ t('Clone Selected Routes') }}</QTooltip>
+                <QTooltip>{{ t('route.Clone Selected Routes') }}</QTooltip>
             </QBtn>
             <QBtn
                 icon="cloud_download"
@@ -340,7 +344,7 @@ const openTicketsDialog = (id) => {
                 :disable="!selectedRows?.length"
                 @click="showRouteReport"
             >
-                <QTooltip>{{ t('Download selected routes as PDF') }}</QTooltip>
+                <QTooltip>{{ t('route.Download selected routes as PDF') }}</QTooltip>
             </QBtn>
             <QBtn
                 icon="check"
@@ -349,63 +353,8 @@ const openTicketsDialog = (id) => {
                 :disable="!selectedRows?.length"
                 @click="markAsServed()"
             >
-                <QTooltip>{{ t('Mark as served') }}</QTooltip>
+                <QTooltip>{{ t('route.Mark as served') }}</QTooltip>
             </QBtn>
         </template>
     </VnTable>
 </template>
-
-<style lang="scss" scoped>
-.table-input-cell {
-    max-width: 143px;
-}
-
-.route-list {
-    width: 100%;
-    max-height: 100%;
-}
-
-.table-actions {
-    gap: 12px;
-}
-th:last-child,
-td:last-child {
-    background-color: var(--vn-section-color);
-    position: sticky;
-    right: 0;
-}
-</style>
-<i18n>
-en:
-    newRoute: New Route
-    hourStarted: Started hour
-    hourFinished: Finished hour
-es:
-    From: Desde
-    To: Hasta
-    Worker: Trabajador
-    Agency: Agencia
-    Vehicle: Vehículo
-    Volume: Volumen
-    Date: Fecha
-    Description: Descripción
-    Hour started: Hora inicio
-    Hour finished: Hora fin
-    KmStart: Km inicio
-    KmEnd: Km fin
-    Served: Servida
-    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
-    Mark as served: Marcar como servidas
-    Download selected routes as PDF: Descargar rutas seleccionadas como PDF
-    Add ticket: Añadir tickets
-    Preview: Vista previa
-    Summary: Resumen
-    Route is closed: La ruta está cerrada
-    Route is not served: La ruta no está servida
-    hourStarted: Hora de inicio
-    hourFinished: Hora de fin
-</i18n>
diff --git a/src/pages/Route/RouteList.vue b/src/pages/Route/RouteList.vue
index b6c23f8ed..d0feb9a65 100644
--- a/src/pages/Route/RouteList.vue
+++ b/src/pages/Route/RouteList.vue
@@ -38,7 +38,7 @@ const columns = computed(() => [
     {
         align: 'left',
         name: 'workerFk',
-        label: t('Worker'),
+        label: t('route.Worker'),
         create: true,
         cardVisible: true,
         format: (row, dashIfEmpty) => dashIfEmpty(row.travelRef),
@@ -47,7 +47,7 @@ const columns = computed(() => [
     {
         align: 'left',
         name: 'agencyName',
-        label: t('Agency'),
+        label: t('route.Agency'),
         cardVisible: true,
         create: true,
         columnClass: 'expand',
@@ -56,7 +56,7 @@ const columns = computed(() => [
     {
         align: 'left',
         name: 'vehiclePlateNumber',
-        label: t('Vehicle'),
+        label: t('route.Vehicle'),
         cardVisible: true,
         create: true,
         columnFilter: false,
@@ -64,7 +64,7 @@ const columns = computed(() => [
     {
         align: 'left',
         name: 'started',
-        label: t('hourStarted'),
+        label: t('route.hourStarted'),
         cardVisible: true,
         columnFilter: false,
         format: (row) => toHour(row.started),
@@ -72,7 +72,7 @@ const columns = computed(() => [
     {
         align: 'left',
         name: 'finished',
-        label: t('hourFinished'),
+        label: t('route.hourFinished'),
         cardVisible: true,
         columnFilter: false,
         format: (row) => toHour(row.started),
@@ -80,7 +80,7 @@ const columns = computed(() => [
     {
         align: 'left',
         name: 'description',
-        label: t('Description'),
+        label: t('route.Description'),
         cardVisible: true,
         isTitle: true,
         create: true,
@@ -90,7 +90,7 @@ const columns = computed(() => [
     {
         align: 'left',
         name: 'isOk',
-        label: t('Served'),
+        label: t('route.Served'),
         component: 'checkbox',
         columnFilter: false,
         columnClass: 'shrink',
@@ -103,7 +103,7 @@ const columns = computed(() => [
                 title: t('components.smartCard.viewSummary'),
                 icon: 'preview',
                 action: (row) => viewSummary(row?.id, RouteSummary),
-                color: 'primary',
+                isPrimary: true,
             },
         ],
     },
@@ -117,7 +117,6 @@ const columns = computed(() => [
         </template>
     </RightMenu>
     <VnTable
-        ref="tableRef"
         data-key="RouteList"
         url="Routes/filter"
         :columns="columns"
@@ -126,7 +125,7 @@ const columns = computed(() => [
         redirect="route"
         :create="{
             urlCreate: 'Routes',
-            title: t('Create route'),
+            title: t('route.createRoute'),
             onDataSaved: ({ id }) => tableRef.redirect(id),
             formInitialData: {},
         }"
@@ -140,12 +139,3 @@ const columns = computed(() => [
         </template>
     </VnTable>
 </template>
-<i18n>
-es:
-    Worker: Trabajador
-    Agency: Agencia
-    Vehicle: Vehículo
-    Description: Descripción
-    Hour started: Hora inicio
-    Hour finished: Hora fin
-</i18n>
diff --git a/src/pages/Route/locale/en.yml b/src/pages/Route/locale/en.yml
new file mode 100644
index 000000000..617d704d2
--- /dev/null
+++ b/src/pages/Route/locale/en.yml
@@ -0,0 +1,25 @@
+route:
+    Worker: Worker
+    Agency: Agency
+    Vehicle: Vehicle
+    Description: Description
+    hourStarted: H.Start
+    hourFinished: H.End
+    createRoute: Create route
+    From: From
+    To: To
+    Date: Date
+    KmStart: Km start
+    KmEnd: Km end
+    Served: Served
+    Clone Selected Routes: Clone selected routes
+    Select the starting date: Select the starting date
+    Stating date: Starting date
+    Cancel: Cancel
+    Mark as served: Mark as served
+    Download selected routes as PDF: Download selected routes as PDF
+    Add ticket: Add ticket
+    Preview: Preview
+    Summary: Summary
+    Route is closed: Route is closed
+    Route is not served: Route is not served
diff --git a/src/pages/Route/locale/es.yml b/src/pages/Route/locale/es.yml
new file mode 100644
index 000000000..ed96ad915
--- /dev/null
+++ b/src/pages/Route/locale/es.yml
@@ -0,0 +1,25 @@
+route:
+    Worker: Trabajador
+    Agency: Agencia
+    Vehicle: Vehículo
+    Description: Descripción
+    hourStarted: H.Inicio
+    hourFinished: H.Fin
+    createRoute: Crear ruta
+    From: Desde
+    To: Hasta
+    Date: Fecha
+    KmStart: Km inicio
+    KmEnd: Km fin
+    Served: Servida
+    Clone Selected Routes: Clonar rutas seleccionadas
+    Select the starting date: Seleccione la fecha de inicio
+    Stating date: Fecha de inicio
+    Cancel: Cancelar
+    Mark as served: Marcar como servidas
+    Download selected routes as PDF: Descargar rutas seleccionadas como PDF
+    Add ticket: Añadir tickets
+    Preview: Vista previa
+    Summary: Resumen
+    Route is closed: La ruta está cerrada
+    Route is not served: La ruta no está servida
diff --git a/src/pages/Travel/Card/TravelSummary.vue b/src/pages/Travel/Card/TravelSummary.vue
index d7dce911b..829eb3a17 100644
--- a/src/pages/Travel/Card/TravelSummary.vue
+++ b/src/pages/Travel/Card/TravelSummary.vue
@@ -319,7 +319,7 @@ const getLink = (param) => `#/travel/${entityId.value}/${param}`;
                     </template>
                     <template #body-cell-id="{ col, value }">
                         <QTd>
-                            <QBtn v-if="col.name === 'id'" flat color="blue">
+                            <QBtn v-if="col.name === 'id'" flat class="link">
                                 {{ value }}
                                 <EntryDescriptorProxy :id="value" />
                             </QBtn>

From 77ad96a58b3f29e47b23caebf1ff05cf075f4dac Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 25 Sep 2024 11:30:18 +0200
Subject: [PATCH 189/281] fix: itemfixedPrice inputs

---
 src/pages/Item/ItemFixedPrice.vue | 110 ++++++++++++------------------
 1 file changed, 44 insertions(+), 66 deletions(-)

diff --git a/src/pages/Item/ItemFixedPrice.vue b/src/pages/Item/ItemFixedPrice.vue
index d91b5189e..bd8c4b78c 100644
--- a/src/pages/Item/ItemFixedPrice.vue
+++ b/src/pages/Item/ItemFixedPrice.vue
@@ -76,16 +76,8 @@ const columns = computed(() => [
         name: 'rate2',
         ...defaultColumnAttrs,
         cardVisible: true,
-        columnField: {
-            class: 'expand',
-            component: 'input',
-            type: 'number',
-        },
-        columnFilter: {
-            class: 'expand',
-            component: 'input',
-            type: 'number',
-        },
+        component: 'input',
+        type: 'number',
     },
     {
         label: t('item.fixedPrice.packingPrice'),
@@ -93,35 +85,18 @@ const columns = computed(() => [
         name: 'rate3',
         ...defaultColumnAttrs,
         cardVisible: true,
-        columnField: {
-            class: 'expand',
-            component: 'input',
-            type: 'number',
-        },
-        columnFilter: {
-            class: 'expand',
-            component: 'input',
-            type: 'number',
-        },
+        component: 'input',
+        type: 'number',
     },
 
     {
         label: t('item.fixedPrice.minPrice'),
         field: 'minPrice',
-        columnClass: 'shrink',
         name: 'minPrice',
         ...defaultColumnAttrs,
         cardVisible: true,
-        columnField: {
-            class: 'expand',
-            component: 'input',
-            type: 'number',
-        },
-        columnFilter: {
-            class: 'expand',
-            component: 'input',
-            type: 'number',
-        },
+        component: 'input',
+        type: 'number',
     },
     {
         label: t('item.fixedPrice.started'),
@@ -162,16 +137,9 @@ const columns = computed(() => [
         name: 'warehouseFk',
         ...defaultColumnAttrs,
         columnClass: 'shrink',
-        columnFilter: {
-            component: 'select',
-        },
-        columnField: {
-            component: 'select',
-            class: 'expand',
-        },
-        attrs: {
-            options: warehousesOptions,
-        },
+        component: 'select',
+
+        options: warehousesOptions,
     },
     {
         align: 'right',
@@ -518,29 +486,35 @@ function handleOnDataSave({ CrudModelRef }) {
                 </span>
                 <span class="subName">{{ row.subName }}</span>
                 <ItemDescriptorProxy :id="row.itemFk" />
-                <FetchedTags style="width: max-content; max-width: 220px" :item="row" />
+                <FetchedTags :item="row" />
             </template>
             <template #column-rate2="props">
-                <VnInput
-                    mask="###.##"
-                    v-model.number="props.row.rate2"
-                    v-on="getRowUpdateInputEvents(props)"
-                >
-                    <template #append>€</template>
-                </VnInput>
+                <QTd class="col">
+                    <VnInput
+                        type="currency"
+                        style="width: 75px"
+                        v-model.number="props.row.rate2"
+                        v-on="getRowUpdateInputEvents(props)"
+                    >
+                        <template #append>€</template>
+                    </VnInput>
+                </QTd>
             </template>
             <template #column-rate3="props">
-                <VnInput
-                    mask="###.##"
-                    v-model.number="props.row.rate3"
-                    v-on="getRowUpdateInputEvents(props)"
-                >
-                    <template #append>€</template>
-                </VnInput>
+                <QTd class="col">
+                    <VnInput
+                        style="width: 75px"
+                        type="currency"
+                        v-model.number="props.row.rate3"
+                        v-on="getRowUpdateInputEvents(props)"
+                    >
+                        <template #append>€</template>
+                    </VnInput>
+                </QTd>
             </template>
             <template #column-minPrice="props">
                 <QTd class="col">
-                    <div class="row" style="width: 115px">
+                    <div class="row">
                         <QCheckbox
                             :model-value="props.row.hasMinPrice"
                             @update:model-value="updateMinPrice($event, props)"
@@ -549,6 +523,8 @@ function handleOnDataSave({ CrudModelRef }) {
                         />
                         <VnInput
                             class="col"
+                            type="currency"
+                            mask="###.##"
                             :disable="props.row.hasMinPrice === 1"
                             v-model.number="props.row.minPrice"
                             v-on="getRowUpdateInputEvents(props)"
@@ -577,15 +553,17 @@ function handleOnDataSave({ CrudModelRef }) {
                 />
             </template>
             <template #column-warehouseFk="props">
-                <VnSelect
-                    style="max-width: 150px"
-                    :options="warehousesOptions"
-                    hide-selected
-                    option-label="name"
-                    option-value="id"
-                    v-model="props.row.warehouseFk"
-                    v-on="getRowUpdateInputEvents(props, false, 'select')"
-                />
+                <QTd class="col">
+                    <VnSelect
+                        style="max-width: 150px"
+                        :options="warehousesOptions"
+                        hide-selected
+                        option-label="name"
+                        option-value="id"
+                        v-model="props.row.warehouseFk"
+                        v-on="getRowUpdateInputEvents(props, false, 'select')"
+                    />
+                </QTd>
             </template>
             <template #column-deleteAction="{ row, rowIndex }">
                 <QIcon

From fb180f0198e8b1753d11bd2494591c661173b260 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 25 Sep 2024 11:31:05 +0200
Subject: [PATCH 190/281] fix: apply order

---
 src/pages/Item/ItemFixedPrice.vue | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/pages/Item/ItemFixedPrice.vue b/src/pages/Item/ItemFixedPrice.vue
index bd8c4b78c..fddf154a2 100644
--- a/src/pages/Item/ItemFixedPrice.vue
+++ b/src/pages/Item/ItemFixedPrice.vue
@@ -36,23 +36,23 @@ const user = state.getUser();
 const fixedPrices = ref([]);
 const warehousesOptions = ref([]);
 const rowsSelected = ref([]);
-
 const itemFixedPriceFilterRef = ref();
-
 const params = reactive({});
-const defaultColumnAttrs = {
-    align: 'left',
-    sortable: true,
-};
+
 onMounted(async () => {
     stateStore.rightDrawer = true;
     params.warehouseFk = user.value.warehouseFk;
 });
 onUnmounted(() => (stateStore.rightDrawer = false));
+
+const defaultColumnAttrs = {
+    align: 'left',
+    sortable: true,
+};
 const columns = computed(() => [
     {
-        label: t('item.fixedPrice.itemId'),
-        name: 'itemId',
+        label: t('item.fixedPrice.itemFk'),
+        name: 'itemFk',
         ...defaultColumnAttrs,
         isId: true,
         cardVisible: true,
@@ -426,7 +426,7 @@ function handleOnDataSave({ CrudModelRef }) {
             :default-save="false"
             data-key="ItemFixedPrices"
             url="FixedPrices/filter"
-            :order="['itemFk ASC']"
+            :order="['description DESC']"
             save-url="FixedPrices/crud"
             :user-params="{ warehouseFk: user.warehouseFk }"
             ref="tableRef"
@@ -460,7 +460,7 @@ function handleOnDataSave({ CrudModelRef }) {
                 <QCheckbox flat v-model="scope.selected" />
             </template>
 
-            <template #column-itemId="props">
+            <template #column-itemFk="props">
                 <VnSelect
                     style="max-width: 100px"
                     url="Items/withName"

From 53d5d123c2ce7c6604eb8eba629c259600bc6887 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 25 Sep 2024 11:36:44 +0200
Subject: [PATCH 191/281] feat: i18n

---
 src/i18n/locale/en.yml | 2 +-
 src/i18n/locale/es.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 1d1a287c2..f2ef57f05 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -1184,7 +1184,7 @@ item:
         producer: Producer
         landed: Landed
     fixedPrice:
-        itemId: Item ID
+        itemFk: Item ID
         groupingPrice: Grouping price
         packingPrice: Packing price
         hasMinPrice: Has min price
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index db717824a..924a50bfd 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -1168,7 +1168,7 @@ item:
         producer: Productor
         landed: F. entrega
     fixedPrice:
-        itemId: ID Artículo
+        itemFk: ID Artículo
         groupingPrice: Precio grouping
         packingPrice: Precio packing
         hasMinPrice: Tiene precio mínimo

From ca568c31ca5168b9825d2cd529fb955c5532899b Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Wed, 25 Sep 2024 11:51:51 +0200
Subject: [PATCH 192/281] fix: refs #7129 clone post

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

diff --git a/src/pages/Route/RouteExtendedList.vue b/src/pages/Route/RouteExtendedList.vue
index b90434f4f..bf5d844f6 100644
--- a/src/pages/Route/RouteExtendedList.vue
+++ b/src/pages/Route/RouteExtendedList.vue
@@ -225,7 +225,7 @@ function navigate(id) {
 
 const cloneRoutes = () => {
     if (!selectedRows.value.length || !startingDate.value) return;
-    axios.post('route.Routes/clone', {
+    axios.post('Routes/clone', {
         created: startingDate.value,
         ids: selectedRows.value.map((row) => row?.id),
     });

From d2996f083857201ac3ae2d2348fdef9c081fd13b Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 25 Sep 2024 12:23:41 +0200
Subject: [PATCH 193/281] fix: refs #6943 prevent null

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

diff --git a/src/components/CreateBankEntityForm.vue b/src/components/CreateBankEntityForm.vue
index 1117225c7..0a3c10f57 100644
--- a/src/components/CreateBankEntityForm.vue
+++ b/src/components/CreateBankEntityForm.vue
@@ -21,7 +21,7 @@ const customer = computed(() => state.get('customer'));
 const bankEntityFormData = reactive({
     name: null,
     bic: null,
-    countryFk: customer.value.countryFk,
+    countryFk: customer.value?.countryFk,
     id: null,
 });
 

From cea5edd506e93e043507b8b94591bfa749d77f1b Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Wed, 25 Sep 2024 12:33:19 +0200
Subject: [PATCH 194/281] fix: refs #7129 translate

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

diff --git a/src/pages/Route/RouteExtendedList.vue b/src/pages/Route/RouteExtendedList.vue
index bf5d844f6..51da4ec12 100644
--- a/src/pages/Route/RouteExtendedList.vue
+++ b/src/pages/Route/RouteExtendedList.vue
@@ -290,7 +290,7 @@ const openTicketsDialog = (id) => {
                     class="text-primary"
                 />
                 <QBtn color="primary" v-close-popup @click="cloneRoutes">
-                    {{ t('route.globals.clone') }}
+                    {{ t('globals.clone') }}
                 </QBtn>
             </QCardActions>
         </QCard>

From aab428494e50d2b31369e82fc8efd41f07882e25 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 25 Sep 2024 12:40:22 +0200
Subject: [PATCH 195/281] fix: refs #6898 add role

---
 src/pages/Supplier/Card/SupplierAccounts.vue | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/pages/Supplier/Card/SupplierAccounts.vue b/src/pages/Supplier/Card/SupplierAccounts.vue
index b0e8b06e8..1513a76db 100644
--- a/src/pages/Supplier/Card/SupplierAccounts.vue
+++ b/src/pages/Supplier/Card/SupplierAccounts.vue
@@ -102,9 +102,7 @@ const setWireTransfer = async () => {
                     <VnInput :label="t('supplier.accounts.iban')" v-model="row.iban">
                         <template #append>
                             <QIcon name="info" class="cursor-info">
-                                <QTooltip>{{
-                                    t('components.iban_tooltip')
-                                }}</QTooltip>
+                                <QTooltip>{{ t('components.iban_tooltip') }}</QTooltip>
                             </QIcon>
                         </template>
                     </VnInput>
@@ -115,6 +113,7 @@ const setWireTransfer = async () => {
                         option-label="bic"
                         option-value="id"
                         hide-selected
+                        :roles-allowed-to-create="['financial']"
                     >
                         <template #form>
                             <CreateBankEntityForm

From 6bd2835c594255000fa23932fb03dcd31ca81e97 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Wed, 25 Sep 2024 13:18:26 +0200
Subject: [PATCH 196/281] chore: refs #7155 typo

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

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 4ceb72028..10b55f9f5 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -98,7 +98,7 @@ const $props = defineProps({
         type: String,
         default: '90vh',
     },
-    translationPrefix: {
+    chipLocale: {
         type: String,
         default: null,
     },
@@ -372,9 +372,9 @@ function handleOnDataSaved(_) {
                         :columns="splittedColumns.columns"
                     />
                 </template>
-                <template #tags="{ tag, formatFn }" v-if="translationPrefix">
+                <template #tags="{ tag, formatFn }" v-if="chipLocale">
                     <div class="q-gutter-x-xs">
-                        <strong>{{ t(`${translationPrefix}.${tag.label}`) }}: </strong>
+                        <strong>{{ t(`${chipLocale}.${tag.label}`) }}: </strong>
                         <span>{{ formatFn(tag.value) }}</span>
                     </div>
                 </template>

From bcada72f04f69f24981e09cc6b710c95e45ba452 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Wed, 25 Sep 2024 13:24:22 +0200
Subject: [PATCH 197/281] fix: refs #7155 use chip-locale

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

diff --git a/src/pages/Travel/TravelList.vue b/src/pages/Travel/TravelList.vue
index 631ce6fb6..e56f5d2ff 100644
--- a/src/pages/Travel/TravelList.vue
+++ b/src/pages/Travel/TravelList.vue
@@ -220,7 +220,7 @@ const columns = computed(() => [
         redirect="travel"
         :is-editable="false"
         :use-model="true"
-        translation-prefix="travel.travelList.tableVisibleColumns"
+        chip-locale="travel.travelList.tableVisibleColumns"
     >
         <template #column-shipped="{ row }">
             <QBadge

From bd2fa374507a0ebfcdb5f600a4178b313239c7f5 Mon Sep 17 00:00:00 2001
From: jgallego <jgallego@verdnatura.es>
Date: Wed, 25 Sep 2024 13:34:43 +0200
Subject: [PATCH 198/281] feat: maxTemperature and minTemperature

---
 src/components/CreateThermographForm.vue      |   2 +-
 src/components/common/VnSelectDialog.vue      |   2 +-
 src/i18n/locale/en.yml                        |   2 +
 src/i18n/locale/es.yml                        |   2 +
 src/pages/Travel/Card/TravelThermographs.vue  |  24 ++-
 .../Travel/Card/TravelThermographsForm.vue    | 175 +++++++++---------
 6 files changed, 107 insertions(+), 100 deletions(-)

diff --git a/src/components/CreateThermographForm.vue b/src/components/CreateThermographForm.vue
index 65a1c2679..0b7e4c5c6 100644
--- a/src/components/CreateThermographForm.vue
+++ b/src/components/CreateThermographForm.vue
@@ -50,7 +50,7 @@ const onDataSaved = (dataSaved) => {
         model="thermograph"
         :title="t('New thermograph')"
         :form-initial-data="thermographFormData"
-        @on-data-saved="onDataSaved($event)"
+        @on-data-saved="(_, response) => onDataSaved(response)"
     >
         <template #form-inputs="{ data, validate }">
             <VnRow>
diff --git a/src/components/common/VnSelectDialog.vue b/src/components/common/VnSelectDialog.vue
index 17f893255..350aa9272 100644
--- a/src/components/common/VnSelectDialog.vue
+++ b/src/components/common/VnSelectDialog.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, computed } from 'vue';
+import { computed } from 'vue';
 import { useRole } from 'src/composables/useRole';
 import { useAcl } from 'src/composables/useAcl';
 
diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 2e2365f7b..5d5bc9c90 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -288,6 +288,8 @@ globals:
     createInvoiceIn: Create invoice in
     myAccount: My account
     noOne: No one
+    maxTemperature: Maximum Temperature
+    minTemperature: Minimum Temperatura
     params:
         clientFk: Client id
         salesPersonFk: Sales person
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 53b487e9f..52ef51475 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -291,6 +291,8 @@ globals:
     createInvoiceIn: Crear factura recibida
     myAccount: Mi cuenta
     noOne: Nadie
+    maxTemperature: Temperatura máxima
+    minTemperature: Temperatura mínima
     params:
         clientFk: Id cliente
         salesPersonFk: Comercial
diff --git a/src/pages/Travel/Card/TravelThermographs.vue b/src/pages/Travel/Card/TravelThermographs.vue
index 6d83581ee..38b9125b1 100644
--- a/src/pages/Travel/Card/TravelThermographs.vue
+++ b/src/pages/Travel/Card/TravelThermographs.vue
@@ -47,6 +47,18 @@ const TableColumns = computed(() => {
             name: 'temperatureFk',
             align: 'left',
         },
+        {
+            label: t('globals.maxTemperature'),
+            field: 'maxTemperature',
+            name: 'maxTemperature',
+            align: 'left',
+        },
+        {
+            label: t('globals.minTemperature'),
+            field: 'minTemperature',
+            name: 'minTemperature',
+            align: 'left',
+        },
         {
             label: t('travel.thermographs.state'),
             field: 'result',
@@ -92,11 +104,7 @@ const openRemoveDialog = async (id) => {
             },
         })
         .onOk(async () => {
-            try {
-                await removeThermograph(id);
-            } catch (err) {
-                console.error('Error removing thermograph');
-            }
+            await removeThermograph(id);
         });
 };
 
@@ -106,9 +114,7 @@ const redirectToThermographForm = (action, id) => {
     };
 
     if (action === 'edit' && id) {
-        const params = {};
-        params.thermographId = id;
-        routeDetails.params = params;
+        routeDetails.query = { travelThermographFk: id };
     }
     router.push(routeDetails);
 };
@@ -213,4 +219,6 @@ es:
     Thermograph removed: Termógrafo eliminado
     Are you sure you want to remove the thermograph?: ¿Seguro que quieres quitar el termógrafo?
     No results: Sin resultados
+    Max Temperature: Temperatura máxima
+    Min Temperature: Temperatura mínima
 </i18n>
diff --git a/src/pages/Travel/Card/TravelThermographsForm.vue b/src/pages/Travel/Card/TravelThermographsForm.vue
index 7f40873b1..2dc462bb0 100644
--- a/src/pages/Travel/Card/TravelThermographsForm.vue
+++ b/src/pages/Travel/Card/TravelThermographsForm.vue
@@ -1,6 +1,6 @@
 <script setup>
 import { useI18n } from 'vue-i18n';
-import { reactive, ref, onBeforeMount } from 'vue';
+import { ref, onBeforeMount } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
 
 import FetchData from 'components/FetchData.vue';
@@ -14,6 +14,7 @@ import { useState } from 'src/composables/useState';
 import { useStateStore } from 'stores/useStateStore';
 import axios from 'axios';
 import useNotify from 'src/composables/useNotify.js';
+import VnInputNumber from 'src/components/common/VnInputNumber.vue';
 
 const props = defineProps({
     viewAction: {
@@ -30,12 +31,13 @@ const state = useState();
 const { notify } = useNotify();
 
 const thermographFilter = {
-    fields: ['thermographFk'],
+    fields: ['id', 'thermographFk'],
     where: {
-        travelFk: null,
+        or: [{ travelFk: null }, { travelFk: route.params.id }],
     },
     order: 'thermographFk ASC',
 };
+
 const fetchTravelThermographsRef = ref(null);
 const allowedContentTypes = ref('');
 const user = state.getUser();
@@ -43,19 +45,10 @@ const thermographsOptions = ref([]);
 const dmsTypesOptions = ref([]);
 const companiesOptions = ref([]);
 const warehousesOptions = ref([]);
+const temperaturesOptions = ref([]);
+const thermographForm = ref({});
 const inputFileRef = ref(null);
 
-const thermographForm = reactive({
-    thermographId: null,
-    state: null,
-    reference: null,
-    dmsTypeId: null,
-    companyId: null,
-    warehouseId: null,
-    files: [],
-    description: null,
-});
-
 onBeforeMount(async () => {
     if (props.viewAction === 'create') {
         setCreateDefaultParams();
@@ -75,7 +68,7 @@ const fetchDmsTypes = async () => {
     try {
         const params = {
             filter: {
-                where: { code: 'miscellaneous' },
+                where: { code: 'thermograph' },
             },
         };
         const { data } = await axios.get('DmsTypes/findOne', { params });
@@ -87,89 +80,67 @@ const fetchDmsTypes = async () => {
 
 const setCreateDefaultParams = async () => {
     const dataResponse = await fetchDmsTypes();
-    thermographForm.companyId = user.value.companyFk;
-    thermographForm.warehouseId = user.value.warehouseFk;
-    thermographForm.reference = route.params.id;
-    thermographForm.dmsTypeId = dataResponse.id;
-    thermographForm.state = 'Ok';
-    thermographForm.description = t('travel.thermographs.travelFileDescription', {
+    thermographForm.value.companyId = user.value.companyFk;
+    thermographForm.value.warehouseId = user.value.warehouseFk;
+    thermographForm.value.reference = route.params.id;
+    thermographForm.value.dmsTypeId = dataResponse.id;
+    thermographForm.value.state = 'Ok';
+    thermographForm.value.description = t('travel.thermographs.travelFileDescription', {
         travelId: route.params.id,
     }).toUpperCase();
 };
 
 const setEditDefaultParams = async () => {
-    try {
-        const filterObj = { include: { relation: 'dms' } };
-        const filter = encodeURIComponent(JSON.stringify(filterObj));
-        const { data } = await axios.get(
-            `TravelThermographs/${route.params.thermographId}?filter=${filter}`
-        );
+    const filterObj = { include: { relation: 'dms' } };
+    const filter = encodeURIComponent(JSON.stringify(filterObj));
+    const { data } = await axios.get(
+        `TravelThermographs/${route.query.travelThermographFk}?filter=${filter}`
+    );
 
-        if (data) {
-            thermographForm.thermographId = data.thermographFk;
-            thermographForm.state = data.result;
-            thermographForm.reference = data.dms?.reference;
-            thermographForm.warehouseId = data.dms?.warehouseFk;
-            thermographForm.companyId = data.dms?.companyFk;
-            thermographForm.dmsTypeId = data.dms?.dmsTypeFk;
-            thermographForm.description = data.dms?.description || '';
-            thermographForm.hasFile = data.dms?.hasFile;
-            thermographForm.hasFileAttached = false;
-        }
-    } catch (err) {
-        console.error('Error fetching termograph');
+    if (data) {
+        thermographForm.value.thermographFk = data.thermographFk;
+        thermographForm.value.state = data.result;
+        thermographForm.value.reference = data.dms?.reference;
+        thermographForm.value.warehouseId = data.dms?.warehouseFk;
+        thermographForm.value.companyId = data.dms?.companyFk;
+        thermographForm.value.dmsTypeId = data.dms?.dmsTypeFk;
+        thermographForm.value.description = data.dms?.description || '';
+        thermographForm.value.hasFile = data.dms?.hasFile;
+        thermographForm.value.hasFileAttached = false;
+        thermographForm.value.maxTemperature = data.maxTemperature;
+        thermographForm.value.minTemperature = data.minTemperature;
+        thermographForm.value.temperatureFk = data.temperatureFk;
+        thermographForm.value.travelThermographFk = data.id;
     }
 };
 
-const onSubmit = () => {
-    props.viewAction === 'create' ? createThermograph() : updateThermograph();
-};
-
-const createThermograph = async () => {
+const onSubmit = async () => {
     const formData = new FormData();
-
-    thermographForm.files.forEach((file) => {
-        formData.append(file.name, file);
-    });
-
-    try {
-        await axios.post(`/travels/${route.params.id}/createThermograph`, formData, {
-            params: thermographForm,
-            headers: {
-                'Content-Type': 'multipart/form-data',
-            },
+    if (Array.isArray(thermographForm.value.files)) {
+        thermographForm.value.hasFileAttached = true;
+        thermographForm.value.files.forEach((file) => {
+            formData.append(file.name, file);
         });
-        router.push({ name: 'TravelThermographsIndex' });
-        notify(t('Thermograph created'), 'positive');
-    } catch (error) {
-        console.error('Error creating thermograph');
     }
-};
-
-const updateThermograph = async () => {
-    const formData = new FormData();
-
-    thermographForm.files.forEach((file) => {
-        formData.append(file.name, file);
+    delete thermographForm.value.files;
+    await axios.post(`/travels/${route.params.id}/saveThermograph`, formData, {
+        params: thermographForm.value,
+        headers: {
+            'Content-Type': 'multipart/form-data',
+        },
     });
-
-    try {
-        await axios.post(`travels/${route.params.id}/updateThermograph`, formData, {
-            params: thermographForm,
-            headers: {
-                'Content-Type': 'multipart/form-data',
-            },
-        });
-        router.push({ name: 'TravelThermographsIndex' });
-        notify(t('Thermograph created'), 'positive');
-    } catch (error) {
-        console.error('Error creating thermograph');
-    }
+    router.push({ name: 'TravelThermographsIndex' });
+    notify(t('Thermograph created'), 'positive');
 };
 
 const onThermographCreated = async (data) => {
     await fetchTravelThermographsRef.value.fetch();
-    thermographForm.thermographId = data.thermographId;
+    thermographForm.value = {
+        ...thermographForm.value,
+        ...data,
+        travelThermographFk: data.id,
+        warehouseId: data.warehouseFk,
+    };
 };
 </script>
 
@@ -204,6 +175,11 @@ const onThermographCreated = async (data) => {
         :filter="{ order: 'name' }"
         auto-load
     />
+    <FetchData
+        @on-fetch="(data) => (temperaturesOptions = data)"
+        auto-load
+        url="Temperatures"
+    />
     <QPage class="column items-center full-width">
         <QForm
             model="travel"
@@ -238,16 +214,16 @@ const onThermographCreated = async (data) => {
                 <VnRow>
                     <VnSelectDialog
                         :label="t('travel.thermographs.thermograph')"
-                        v-model="thermographForm.thermographId"
+                        v-model="thermographForm.travelThermographFk"
                         :options="thermographsOptions"
-                        option-value="thermographFk"
+                        option-value="id"
                         option-label="thermographFk"
                         :disable="viewAction === 'edit'"
                         :tooltip="t('New thermograph')"
                     >
                         <template #form>
                             <CreateThermographForm
-                                @on-data-saved="onThermographCreated($event, data)"
+                                @on-data-saved="onThermographCreated"
                             />
                         </template>
                     </VnSelectDialog>
@@ -285,6 +261,26 @@ const onThermographCreated = async (data) => {
                         option-label="name"
                     />
                 </VnRow>
+                <VnRow>
+                    <VnSelect
+                        :label="t('travel.thermographs.temperature')"
+                        :options="temperaturesOptions"
+                        hide-selected
+                        option-label="name"
+                        option-value="code"
+                        v-model="thermographForm.temperatureFk"
+                        :required="true"
+                    />
+                    <VnInputNumber
+                        v-model="thermographForm.maxTemperature"
+                        :label="t('globals.maxTemperature')"
+                    />
+                    <VnInputNumber
+                        v-model="thermographForm.minTemperature"
+                        :label="t('globals.minTemperature')"
+                    />
+                </VnRow>
+
                 <VnRow v-if="viewAction === 'edit'" class="row q-gutter-md q-mb-md">
                     <QInput
                         :label="t('globals.description')"
@@ -323,10 +319,9 @@ const onThermographCreated = async (data) => {
         </QForm>
     </QPage>
 </template>
-
 <i18n>
-es:
-    Select files: Selecciona ficheros
-    Thermograph created: Termógrafo creado
-    New thermograph: Nuevo termógrafo
-</i18n>
+    es:
+        Select files: Selecciona ficheros
+        Thermograph created: Termógrafo creado
+        New thermograph: Nuevo termógrafo
+    </i18n>

From dcfdabde3288a9a2e5482a4573ebac64cc1084ef Mon Sep 17 00:00:00 2001
From: jgallego <jgallego@verdnatura.es>
Date: Wed, 25 Sep 2024 14:17:26 +0200
Subject: [PATCH 199/281] feat: tabulation

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

diff --git a/src/pages/Travel/Card/TravelThermographsForm.vue b/src/pages/Travel/Card/TravelThermographsForm.vue
index 313c2e56e..1d3410903 100644
--- a/src/pages/Travel/Card/TravelThermographsForm.vue
+++ b/src/pages/Travel/Card/TravelThermographsForm.vue
@@ -322,4 +322,4 @@ const onThermographCreated = async (data) => {
         Select files: Selecciona ficheros
         Thermograph created: Termógrafo creado
         New thermograph: Nuevo termógrafo
-    </i18n>
+</i18n>

From e827d3aabfb3b03b39e01593bb2af12b4f443016 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 26 Sep 2024 09:47:54 +0200
Subject: [PATCH 200/281] fix: refs #7323 rollback

---
 src/pages/Worker/WorkerFilter.vue |  5 -----
 src/pages/Worker/WorkerList.vue   | 20 +-------------------
 src/pages/Worker/locale/en.yml    |  2 +-
 src/pages/Worker/locale/es.yml    |  2 +-
 4 files changed, 3 insertions(+), 26 deletions(-)

diff --git a/src/pages/Worker/WorkerFilter.vue b/src/pages/Worker/WorkerFilter.vue
index 61120f448..dfb5659fe 100644
--- a/src/pages/Worker/WorkerFilter.vue
+++ b/src/pages/Worker/WorkerFilter.vue
@@ -84,11 +84,6 @@ const getLocale = (label) => {
                     />
                 </QItemSection>
             </QItem>
-            <QItem>
-                <QItemSection>
-                    <VnInput :label="t('SSN')" v-model="params.SSN" is-outlined />
-                </QItemSection>
-            </QItem>
             <QItem>
                 <QItemSection>
                     <VnInput :label="t('Email')" v-model="params.email" is-outlined />
diff --git a/src/pages/Worker/WorkerList.vue b/src/pages/Worker/WorkerList.vue
index a5281b651..3ca0d0c24 100644
--- a/src/pages/Worker/WorkerList.vue
+++ b/src/pages/Worker/WorkerList.vue
@@ -40,7 +40,7 @@ const columns = computed(() => [
     {
         align: 'left',
         name: 'firstName',
-        label: t('tableColumns.name'),
+        label: t('tableColumns.firstName'),
         isTitle: true,
         columnFilter: {
             name: 'firstName',
@@ -78,24 +78,6 @@ const columns = computed(() => [
         },
         format: (row, dashIfEmpty) => dashIfEmpty(row.department),
     },
-    {
-        align: 'left',
-        name: 'fi',
-        label: t('tableColumns.fi'),
-        isTitle: true,
-        columnFilter: {
-            name: 'fi',
-        },
-    },
-    {
-        align: 'left',
-        name: 'SSN',
-        label: t('tableColumns.SSN'),
-        isTitle: true,
-        columnFilter: {
-            name: 'SSN',
-        },
-    },
     {
         align: 'left',
         name: 'email',
diff --git a/src/pages/Worker/locale/en.yml b/src/pages/Worker/locale/en.yml
index 7081e8fd0..865e86e7e 100644
--- a/src/pages/Worker/locale/en.yml
+++ b/src/pages/Worker/locale/en.yml
@@ -1,7 +1,7 @@
 passwordRequirements: 'The password must have at least { length } length characters, {nAlpha} alphabetic characters, {nUpper} capital letters, {nDigits} digits and {nPunct} symbols (Ex: $%&.)\n'
 tableColumns:
     id: ID
-    name: Name
+    firstName: First name
     lastName: Last Name
     userName: User Name
     department: Department
diff --git a/src/pages/Worker/locale/es.yml b/src/pages/Worker/locale/es.yml
index 61694dc83..b3c093ec5 100644
--- a/src/pages/Worker/locale/es.yml
+++ b/src/pages/Worker/locale/es.yml
@@ -6,7 +6,7 @@ External: Externo
 passwordRequirements: 'La contraseña debe tener al menos { length } caracteres de longitud, {nAlpha} caracteres alfabéticos, {nUpper} letras mayúsculas, {nDigits} dígitos y {nPunct} símbolos (Ej: $%&.)'
 tableColumns:
     id: ID
-    name: Nombre
+    firstName: Nombre
     lastName: Apellidos
     userName: Nombre de usuario
     department: Departamento

From c2b52473a12da9e856a3baa1889ba6702286c8fe Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 26 Sep 2024 10:04:16 +0200
Subject: [PATCH 201/281] fix: refs #7323 align tables

---
 src/pages/Monitor/MonitorOrders.vue | 56 +++++++++++++++--------------
 1 file changed, 29 insertions(+), 27 deletions(-)

diff --git a/src/pages/Monitor/MonitorOrders.vue b/src/pages/Monitor/MonitorOrders.vue
index 52d442d0a..853a6edc9 100644
--- a/src/pages/Monitor/MonitorOrders.vue
+++ b/src/pages/Monitor/MonitorOrders.vue
@@ -139,33 +139,35 @@ const openTab = (id) =>
         :disable-option="{ card: true }"
     >
         <template #top-left>
-            <QBtn
-                icon="refresh"
-                size="md"
-                color="primary"
-                dense
-                flat
-                @click="$refs.table.reload()"
-            >
-                <QTooltip>{{ $t('globals.refresh') }}</QTooltip>
-            </QBtn>
-            <QBtn
-                v-if="selectedRows.length"
-                icon="delete"
-                size="md"
-                dense
-                flat
-                color="primary"
-                @click="
-                    openConfirmationModal(
-                        $t('salesOrdersTable.deleteConfirmTitle'),
-                        $t('salesOrdersTable.deleteConfirmMessage'),
-                        removeOrders
-                    )
-                "
-            >
-                <QTooltip>{{ t('salesOrdersTable.delete') }}</QTooltip>
-            </QBtn>
+            <div class="q-mt-sm">
+                <QBtn
+                    icon="refresh"
+                    size="md"
+                    color="primary"
+                    dense
+                    flat
+                    @click="$refs.table.reload()"
+                >
+                    <QTooltip>{{ $t('globals.refresh') }}</QTooltip>
+                </QBtn>
+                <QBtn
+                    v-if="selectedRows.length"
+                    icon="delete"
+                    size="md"
+                    dense
+                    flat
+                    color="primary"
+                    @click="
+                        openConfirmationModal(
+                            $t('salesOrdersTable.deleteConfirmTitle'),
+                            $t('salesOrdersTable.deleteConfirmMessage'),
+                            removeOrders
+                        )
+                    "
+                >
+                    <QTooltip>{{ t('salesOrdersTable.delete') }}</QTooltip>
+                </QBtn>
+            </div>
         </template>
         <template #column-dateSend="{ row }">
             <QTd>

From c5766aa1b346f8a4011b5b84b93136137a1a9751 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 26 Sep 2024 12:38:03 +0200
Subject: [PATCH 202/281] chore: refs #7524 remove old filter

---
 src/pages/Customer/Defaulter/CustomerDefaulter.vue | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/pages/Customer/Defaulter/CustomerDefaulter.vue b/src/pages/Customer/Defaulter/CustomerDefaulter.vue
index 11f6362f8..7b9cb67f7 100644
--- a/src/pages/Customer/Defaulter/CustomerDefaulter.vue
+++ b/src/pages/Customer/Defaulter/CustomerDefaulter.vue
@@ -3,7 +3,6 @@ import { ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
 import { toCurrency, toDate, dateRange } from 'filters/index';
-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';
@@ -11,7 +10,6 @@ import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import CustomerDefaulterAddObservation from './CustomerDefaulterAddObservation.vue';
 import DepartmentDescriptorProxy from 'src/pages/Department/Card/DepartmentDescriptorProxy.vue';
-import RightMenu from 'src/components/common/RightMenu.vue';
 import VnTable from 'src/components/VnTable/VnTable.vue';
 
 const { t } = useI18n();
@@ -192,11 +190,6 @@ function exprBuilder(param, value) {
 </script>
 
 <template>
-    <RightMenu>
-        <template #right-panel>
-            <CustomerNotificationsFilter data-key="CustomerDefaulter" />
-        </template>
-    </RightMenu>
     <VnSubToolbar>
         <template #st-data>
             <CustomerBalanceDueTotal :amount="balanceDueTotal" />

From f00db79d476a366253731ca0817318328994d215 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Thu, 26 Sep 2024 14:14:27 +0200
Subject: [PATCH 203/281] fix(VnTable): header background-color

---
 src/components/VnTable/VnTable.vue | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 10b55f9f5..9dcbc5542 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -749,6 +749,10 @@ es:
     border-color: var(--vn-section-color);
 }
 
+.q-table__container > div:first-child {
+    background-color: var(--vn-page-color);
+}
+
 .grid-three {
     display: grid;
     grid-template-columns: repeat(auto-fit, minmax(400px, max-content));

From bbf3b6d4b799c256c68608d6015f3f906a9b5851 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 26 Sep 2024 12:29:03 +0000
Subject: [PATCH 204/281] fix: #6943 show nickname salesPerson

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

diff --git a/src/pages/Customer/Card/CustomerBasicData.vue b/src/pages/Customer/Card/CustomerBasicData.vue
index 79ae79ad9..d31669b43 100644
--- a/src/pages/Customer/Card/CustomerBasicData.vue
+++ b/src/pages/Customer/Card/CustomerBasicData.vue
@@ -18,6 +18,7 @@ const contactChannels = ref([]);
 const title = ref();
 const handleSalesModelValue = (val) => ({
     or: [
+        { id: val },
         { name: val },
         { nickname: { like: '%' + val + '%' } },
         { code: { like: `${val}%` } },

From 01b62adba95bb60a55a826126e173ccd2f1c7949 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 26 Sep 2024 14:30:19 +0200
Subject: [PATCH 205/281] fix: refs #7524 dynamic fetch

---
 .../Travel/Card/TravelThermographsForm.vue    | 23 +++++--------------
 1 file changed, 6 insertions(+), 17 deletions(-)

diff --git a/src/pages/Travel/Card/TravelThermographsForm.vue b/src/pages/Travel/Card/TravelThermographsForm.vue
index 1d3410903..3c7c98d4d 100644
--- a/src/pages/Travel/Card/TravelThermographsForm.vue
+++ b/src/pages/Travel/Card/TravelThermographsForm.vue
@@ -30,18 +30,9 @@ const router = useRouter();
 const state = useState();
 const { notify } = useNotify();
 
-const thermographFilter = {
-    fields: ['id', 'thermographFk'],
-    where: {
-        or: [{ travelFk: null }, { travelFk: route.params.id }],
-    },
-    order: 'thermographFk ASC',
-};
-
 const fetchTravelThermographsRef = ref(null);
 const allowedContentTypes = ref('');
 const user = state.getUser();
-const thermographsOptions = ref([]);
 const dmsTypesOptions = ref([]);
 const companiesOptions = ref([]);
 const warehousesOptions = ref([]);
@@ -172,13 +163,6 @@ const onThermographCreated = async (data) => {
         auto-load
         url="Temperatures"
     />
-    <FetchData
-        ref="fetchTravelThermographsRef"
-        url="TravelThermographs"
-        @on-fetch="(data) => (thermographsOptions = data)"
-        :filter="thermographFilter"
-        auto-load
-    />
     <QPage class="column items-center full-width">
         <QForm
             model="travel"
@@ -214,7 +198,12 @@ const onThermographCreated = async (data) => {
                     <VnSelectDialog
                         :label="t('travel.thermographs.thermograph')"
                         v-model="thermographForm.travelThermographFk"
-                        :options="thermographsOptions"
+                        url="TravelThermographs"
+                        :fields="['id', 'thermographFk']"
+                        :where="{
+                            or: [{ travelFk: null }, { travelFk: $route.params.id }],
+                        }"
+                        sort-by="thermographFk ASC"
                         option-label="thermographFk"
                         :disable="viewAction === 'edit'"
                         :tooltip="t('New thermograph')"

From 18ea23adf16afa52668a4d0750a0024bbe6f0b42 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 26 Sep 2024 15:03:22 +0200
Subject: [PATCH 206/281] refactor: refs #7323 pr request

---
 src/i18n/locale/en.yml                      | 1 +
 src/i18n/locale/es.yml                      | 2 ++
 src/pages/Monitor/MonitorOrders.vue         | 2 +-
 src/pages/Monitor/locale/en.yml             | 1 -
 src/pages/Monitor/locale/es.yml             | 1 -
 src/pages/Worker/Card/WorkerBalance.vue     | 2 +-
 src/pages/Worker/Card/WorkerTimeControl.vue | 7 +++----
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 05ce8dcdf..6134f8c9e 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -303,6 +303,7 @@ globals:
         email: Email
         SSN: SSN
         fi: FI
+    deleteConfirmTitle: Delete selected elements
 errors:
     statusUnauthorized: Access denied
     statusInternalServerError: An internal server error has ocurred
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 7e299f70a..db9e3b578 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -307,6 +307,8 @@ globals:
         email: Correo
         SSN: NSS
         fi: NIF
+    deleteConfirmTitle: Eliminar los elementos seleccionados
+
 errors:
     statusUnauthorized: Acceso denegado
     statusInternalServerError: Ha ocurrido un error interno del servidor
diff --git a/src/pages/Monitor/MonitorOrders.vue b/src/pages/Monitor/MonitorOrders.vue
index 853a6edc9..fac601735 100644
--- a/src/pages/Monitor/MonitorOrders.vue
+++ b/src/pages/Monitor/MonitorOrders.vue
@@ -159,7 +159,7 @@ const openTab = (id) =>
                     color="primary"
                     @click="
                         openConfirmationModal(
-                            $t('salesOrdersTable.deleteConfirmTitle'),
+                            $t('globals.deleteConfirmTitle'),
                             $t('salesOrdersTable.deleteConfirmMessage'),
                             removeOrders
                         )
diff --git a/src/pages/Monitor/locale/en.yml b/src/pages/Monitor/locale/en.yml
index 4cdd245aa..b8082f02a 100644
--- a/src/pages/Monitor/locale/en.yml
+++ b/src/pages/Monitor/locale/en.yml
@@ -15,7 +15,6 @@ salesOrdersTable:
     dateMake: Make date
     client: Client
     salesPerson: Salesperson
-    deleteConfirmTitle: Delete selected elements
     deleteConfirmMessage: All the selected elements will be deleted. Are you sure you want to continue?
     agency: Agency
     import: Import
diff --git a/src/pages/Monitor/locale/es.yml b/src/pages/Monitor/locale/es.yml
index 8087bb444..4ee5b90a9 100644
--- a/src/pages/Monitor/locale/es.yml
+++ b/src/pages/Monitor/locale/es.yml
@@ -15,7 +15,6 @@ salesOrdersTable:
     dateMake: Fecha de realización
     client: Cliente
     salesPerson: Comercial
-    deleteConfirmTitle: Eliminar los elementos seleccionados
     deleteConfirmMessage: Todos los elementos seleccionados serán eliminados. ¿Seguro que quieres continuar?
     agency: Agencia
     import: Importe
diff --git a/src/pages/Worker/Card/WorkerBalance.vue b/src/pages/Worker/Card/WorkerBalance.vue
index 88fc7c1df..c5367a281 100644
--- a/src/pages/Worker/Card/WorkerBalance.vue
+++ b/src/pages/Worker/Card/WorkerBalance.vue
@@ -82,7 +82,7 @@ const columns = computed(() => [
         :create="{
             urlCreate: 'workerIncomes',
             title: t('Create balance'),
-            onDataSaved: () => $refs.tableRef.reload(),
+            onDataSaved: () => tableRef.reload(),
             formInitialData: {
                 workerFk: entityId,
             },
diff --git a/src/pages/Worker/Card/WorkerTimeControl.vue b/src/pages/Worker/Card/WorkerTimeControl.vue
index c6ca9d74a..39fb536b6 100644
--- a/src/pages/Worker/Card/WorkerTimeControl.vue
+++ b/src/pages/Worker/Card/WorkerTimeControl.vue
@@ -329,16 +329,15 @@ const getMailStates = async (date) => {
     const url = `WorkerTimeControls/${route.params.id}/getMailStates`;
     const month = date.getMonth() + 1;
     const prevMonth = month == 1 ? 12 : month - 1;
-    let prevMonthStates = [];
-
     const params = {
         month,
         year: date.getFullYear(),
     };
 
     const curMonthStates = (await axios.get(url, { params })).data;
-    prevMonthStates = (await axios.get(url, { params: { ...params, month: prevMonth } }))
-        .data;
+    const prevMonthStates = (
+        await axios.get(url, { params: { ...params, month: prevMonth } })
+    ).data;
 
     workerTimeControlMails.value = curMonthStates.concat(prevMonthStates);
 };

From 7eb951ef13b1547f8f373c54868b2b407580c33c Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 26 Sep 2024 15:28:00 +0200
Subject: [PATCH 207/281] fix: refs #7323 use right locale

---
 src/i18n/locale/en.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 7127ab20c..62023886d 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -810,14 +810,14 @@ worker:
         bankEntity: Swift / BIC
     formation:
         tableVisibleColumns:
-            course: Curso
-            startDate: Fecha Inicio
-            endDate: Fecha Fin
-            center: Centro Formación
-            invoice: Factura
-            amount: Importe
-            remark: Bonficado
-            hasDiploma: Diploma
+            course: Course
+            startDate: Start date
+            endDate: End date
+            center: Training center
+            invoice: Invoice
+            amount: Amount
+            remark: Remark
+            hasDiploma: Has diploma
     medical:
         tableVisibleColumns:
             date: Date

From 353116a7a0a93e5c612344731c527f401a974aa8 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 26 Sep 2024 15:49:12 +0200
Subject: [PATCH 208/281] fix: split params

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

diff --git a/src/components/common/VnLog.vue b/src/components/common/VnLog.vue
index ab522cfde..8c71c0997 100644
--- a/src/components/common/VnLog.vue
+++ b/src/components/common/VnLog.vue
@@ -406,6 +406,7 @@ watch(
         :skeleton="false"
         auto-load
         @on-fetch="setLogTree"
+        search-url="logs"
     >
         <template #body>
             <div

From a2b7e8198202298613ea40ad592112da4af7c019 Mon Sep 17 00:00:00 2001
From: jgallego <jgallego@verdnatura.es>
Date: Thu, 26 Sep 2024 16:23:18 +0200
Subject: [PATCH 209/281] feat: warehouse

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

diff --git a/src/pages/Travel/Card/TravelThermographsForm.vue b/src/pages/Travel/Card/TravelThermographsForm.vue
index 1d3410903..42acf30b9 100644
--- a/src/pages/Travel/Card/TravelThermographsForm.vue
+++ b/src/pages/Travel/Card/TravelThermographsForm.vue
@@ -101,7 +101,7 @@ const setEditDefaultParams = async () => {
         thermographForm.value.thermographFk = data.thermographFk;
         thermographForm.value.state = data.result;
         thermographForm.value.reference = data.dms?.reference;
-        thermographForm.value.warehouseId = data.dms?.warehouseFk;
+        thermographForm.value.warehouseId = data.warehouseFk;
         thermographForm.value.companyId = data.dms?.companyFk;
         thermographForm.value.dmsTypeId = data.dms?.dmsTypeFk;
         thermographForm.value.description = data.dms?.description || '';

From d2067c633d911516c05ac652b2445f133070d69f Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 26 Sep 2024 23:38:22 +0200
Subject: [PATCH 210/281] feat: refs #7679 #7679 use country or province to
 retrieve cities

---
 src/components/CreateNewPostcodeForm.vue | 56 +++++++++++++++++++++---
 src/components/VnSelectProvince.vue      | 26 +++++++++--
 2 files changed, 74 insertions(+), 8 deletions(-)

diff --git a/src/components/CreateNewPostcodeForm.vue b/src/components/CreateNewPostcodeForm.vue
index 4c44d29e2..664016325 100644
--- a/src/components/CreateNewPostcodeForm.vue
+++ b/src/components/CreateNewPostcodeForm.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { reactive, ref } from 'vue';
+import { reactive, ref, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
 
 import FetchData from 'components/FetchData.vue';
@@ -22,9 +22,11 @@ const postcodeFormData = reactive({
     townFk: null,
 });
 
+const townsFetchDataRef = ref(null);
 const provincesFetchDataRef = ref(null);
 const countriesOptions = ref([]);
 const provincesOptions = ref([]);
+const townsOptions = ref([]);
 const town = ref({});
 
 function onDataSaved(formData) {
@@ -67,20 +69,63 @@ async function setProvince(id, data) {
 
     data.countryFk = newProvince.countryFk;
 }
+
+// Watchers to update filters based on country and province changes
+watch(
+    () => [postcodeFormData.countryFk],
+    async (newCountryFk) => {
+        if (newCountryFk) {
+            await provincesFetchDataRef.value.fetch({
+                where: {
+                    countryFk: newCountryFk[0],
+                },
+            });
+            await townsFetchDataRef.value.fetch({
+                where: {
+                    provinceFk: {
+                        inq: provincesOptions.value.map(({ id }) => id),
+                    },
+                },
+            });
+        }
+    }
+);
+
+watch(
+    () => postcodeFormData.provinceFk,
+    async (newProvinceFk) => {
+        if (newProvinceFk) {
+            await townsFetchDataRef.value.fetch({
+                where: { provinceFk: newProvinceFk[0] },
+            });
+        }
+    }
+);
+async function handleProvinces(data) {
+    provincesOptions.value = data;
+}
+async function handleTowns(data) {
+    townsOptions.value = data;
+}
+async function handleCountries(data) {
+    countriesOptions.value = data;
+}
 </script>
 
 <template>
     <FetchData
         ref="provincesFetchDataRef"
-        @on-fetch="(data) => (provincesOptions = data)"
+        @on-fetch="handleProvinces"
         auto-load
         url="Provinces/location"
     />
     <FetchData
-        @on-fetch="(data) => (countriesOptions = data)"
+        ref="townsFetchDataRef"
+        @on-fetch="handleTowns"
         auto-load
-        url="Countries"
+        url="Towns/location"
     />
+    <FetchData @on-fetch="handleCountries" auto-load url="Countries" />
     <FormModelPopup
         url-create="postcodes"
         model="postcode"
@@ -99,9 +144,9 @@ async function setProvince(id, data) {
                 />
                 <VnSelectDialog
                     :label="t('City')"
-                    url="Towns/location"
                     @update:model-value="(value) => setTown(value, data)"
                     v-model="data.townFk"
+                    :options="townsOptions"
                     option-label="name"
                     option-value="id"
                     :rules="validate('postcode.city')"
@@ -132,6 +177,7 @@ async function setProvince(id, data) {
             </VnRow>
             <VnRow>
                 <VnSelectProvince
+                    :country-fk="postcodeFormData.countryFk"
                     @update:model-value="(value) => setProvince(value, data)"
                     v-model="data.provinceFk"
                 />
diff --git a/src/components/VnSelectProvince.vue b/src/components/VnSelectProvince.vue
index 2f08db611..3f8388c69 100644
--- a/src/components/VnSelectProvince.vue
+++ b/src/components/VnSelectProvince.vue
@@ -10,7 +10,13 @@ import CreateNewProvinceForm from './CreateNewProvinceForm.vue';
 const emit = defineEmits(['onProvinceCreated']);
 const provinceFk = defineModel({ type: Number });
 watch(provinceFk, async () => await provincesFetchDataRef.value.fetch());
-
+const $props = defineProps({
+    countryFk: {
+        type: Number,
+        required: false,
+        default: null,
+    },
+});
 const { validate } = useValidator();
 const { t } = useI18n();
 
@@ -18,17 +24,31 @@ const provincesOptions = ref();
 const provincesFetchDataRef = ref();
 
 async function onProvinceCreated(_, data) {
-    await provincesFetchDataRef.value.fetch();
+    await provincesFetchDataRef.value.fetch({ where: { countryFk: $props.countryFk } });
     provinceFk.value = data.id;
     emit('onProvinceCreated', data);
 }
+watch(
+    () => $props.countryFk,
+    async (newProvinceFk) => {
+        if (newProvinceFk) {
+            // Assuming there's a townsFetchDataRef similar to provincesFetchDataRef
+            await provincesFetchDataRef.value.fetch({
+                where: { countryFk: newProvinceFk },
+            });
+        }
+    }
+);
+async function handleProvinces(data) {
+    provincesOptions.value = data;
+}
 </script>
 
 <template>
     <FetchData
         ref="provincesFetchDataRef"
         :filter="{ include: { relation: 'country' } }"
-        @on-fetch="(data) => (provincesOptions = data)"
+        @on-fetch="handleProvinces"
         auto-load
         url="Provinces"
     />

From 6b2e0df9c2b5a8fbbc77728eca630737ce62fdfb Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 26 Sep 2024 23:39:14 +0200
Subject: [PATCH 211/281] test: refs #7679 #7679 improve test

---
 .../vnComponent/vnLocation.spec.js            | 64 +++++++++++++++----
 1 file changed, 53 insertions(+), 11 deletions(-)

diff --git a/test/cypress/integration/vnComponent/vnLocation.spec.js b/test/cypress/integration/vnComponent/vnLocation.spec.js
index 1872d3591..88919e41c 100644
--- a/test/cypress/integration/vnComponent/vnLocation.spec.js
+++ b/test/cypress/integration/vnComponent/vnLocation.spec.js
@@ -3,25 +3,71 @@ describe('VnLocation', () => {
     const dialogInputs = '.q-dialog label input';
     const createLocationButton = '.q-form > .q-card > .vn-row:nth-child(6) .--add-icon';
     const inputLocation = '.q-form input[aria-label="Location"]';
+    const createForm = {
+        prefix: '.q-dialog__inner > .column > #formModel > .q-card',
+        sufix: ' .q-field__inner > .q-field__control',
+    };
+    describe('CreateFormDialog ', () => {
+        beforeEach(() => {
+            cy.viewport(1280, 720);
+            cy.login('developer');
+            cy.visit('/#/supplier/567/fiscal-data', { timeout: 7000 });
+            cy.waitForElement('.q-card');
+            cy.get(createLocationButton).click();
+        });
+        it('should filter provinces based on selected country', () => {
+            // Select a country
+            cy.selectOption(
+                `${createForm.prefix} > :nth-child(5) > .q-field:nth-child(5)> ${createForm.sufix}`,
+                'Ecuador'
+            );
+            // Verify that provinces are filtered
+            cy.get(
+                `${createForm.prefix} > :nth-child(5) > .q-field:nth-child(3)> ${createForm.sufix}`
+            ).should('have.length', 1);
+
+            // Verify that towns are filtered
+            cy.get(
+                `${createForm.prefix} > :nth-child(4) > .q-field:nth-child(3)> ${createForm.sufix}`
+            ).should('have.length', 1);
+        });
+
+        it('should filter towns based on selected province', () => {
+            // Select a country
+            cy.selectOption(
+                `${createForm.prefix} > :nth-child(5) > .q-field:nth-child(3)> ${createForm.sufix}`,
+                'Ecuador'
+            );
+            // Verify that provinces are filtered
+            cy.get(
+                `${createForm.prefix} > :nth-child(5) > .q-field:nth-child(3)> ${createForm.sufix}`
+            ).should('have.length', 1);
+
+            // Verify that towns are filtered
+            cy.get(
+                `${createForm.prefix} > :nth-child(4) > .q-field:nth-child(3)> ${createForm.sufix}`
+            ).should('have.length', 1);
+        });
+    });
     describe('Worker Create', () => {
         beforeEach(() => {
             cy.viewport(1280, 720);
             cy.login('developer');
             cy.visit('/#/worker/create', { timeout: 5000 });
             cy.waitForElement('.q-card');
+            cy.get(inputLocation).click();
         });
         it('Show all options', function () {
-            cy.get(inputLocation).click();
             cy.get(locationOptions).should('have.length.at.least', 5);
         });
         it('input filter location as "al"', function () {
-            cy.get(inputLocation).click();
+            // cy.get(inputLocation).click();
             cy.get(inputLocation).clear();
             cy.get(inputLocation).type('al');
             cy.get(locationOptions).should('have.length.at.least', 4);
         });
         it('input filter location as "ecuador"', function () {
-            cy.get(inputLocation).click();
+            // cy.get(inputLocation).click();
             cy.get(inputLocation).clear();
             cy.get(inputLocation).type('ecuador');
             cy.get(locationOptions).should('have.length.at.least', 1);
@@ -63,13 +109,11 @@ describe('VnLocation', () => {
             cy.get(dialogInputs).eq(0).clear();
             cy.get(dialogInputs).eq(0).type(postCode);
             cy.selectOption(
-                '.q-dialog__inner > .column > #formModel > .q-card > :nth-child(4) > .q-select > .q-field__inner > .q-field__control ',
+                `${createForm.prefix} > :nth-child(4) > .q-select > ${createForm.sufix}`,
                 province
             );
             cy.get('.q-mt-lg > .q-btn--standard').click();
-            cy.get('.q-dialog__inner > .column > #formModel > .q-card').should(
-                'not.exist'
-            );
+            cy.get(`${createForm.prefix}`).should('not.exist');
             checkVnLocation(postCode, province);
         });
         it('Create city', () => {
@@ -79,7 +123,7 @@ describe('VnLocation', () => {
             cy.get(dialogInputs).eq(0).type(postCode);
             // city create button
             cy.get(
-                '.q-dialog__inner > .column > #formModel > .q-card > :nth-child(4) > .q-select > .q-field__inner > .q-field__control > :nth-child(2) > .q-icon'
+                `${createForm.prefix} > :nth-child(4) > .q-select > ${createForm.sufix} > :nth-child(2) > .q-icon`
             ).click();
             cy.selectOption('#q-portal--dialog--2 .q-select', 'one');
             cy.get('#q-portal--dialog--2 .q-input').type(province);
@@ -89,9 +133,7 @@ describe('VnLocation', () => {
         });
 
         function checkVnLocation(postCode, province) {
-            cy.get('.q-dialog__inner > .column > #formModel > .q-card').should(
-                'not.exist'
-            );
+            cy.get(`${createForm.prefix}`).should('not.exist');
             cy.get('.q-form > .q-card > .vn-row:nth-child(6)')
                 .find('input')
                 .invoke('val')

From 6b0a0f71ce65368ee9784ae770e9c6fcdc4ca55d Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 27 Sep 2024 08:24:58 +0200
Subject: [PATCH 212/281] fix: fixed change state function

---
 src/pages/Ticket/Card/TicketSummary.vue | 64 ++++++++++++-------------
 1 file changed, 30 insertions(+), 34 deletions(-)

diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index 3851bf5d6..143ab9ad7 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -1,6 +1,6 @@
 <script setup>
 import { onMounted, ref, computed } from 'vue';
-import { useRoute, useRouter } from 'vue-router';
+import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import axios from 'axios';
 import { dashIfEmpty, toDate, toCurrency } from 'src/filters';
@@ -11,13 +11,15 @@ import InvoiceOutDescriptorProxy from 'pages/InvoiceOut/Card/InvoiceOutDescripto
 import VnLv from 'src/components/ui/VnLv.vue';
 import VnLinkPhone from 'src/components/ui/VnLinkPhone.vue';
 import { getUrl } from 'src/composables/getUrl';
+import useNotify from 'src/composables/useNotify.js';
+import { useArrayData } from 'composables/useArrayData';
 import VnUserLink from 'src/components/ui/VnUserLink.vue';
 import VnTitle from 'src/components/common/VnTitle.vue';
 import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 
 const route = useRoute();
-const router = useRouter();
-
+const { notify } = useNotify();
 const { t } = useI18n();
 
 const $props = defineProps({
@@ -36,6 +38,8 @@ const salesLines = ref(null);
 const editableStates = ref([]);
 const ticketUrl = ref();
 const grafanaUrl = 'https://grafana.verdnatura.es';
+const stateBtnDropdownRef = ref();
+const descriptorData = useArrayData('ticketData');
 
 onMounted(async () => {
     ticketUrl.value = (await getUrl('ticket/')) + entityId.value + '/';
@@ -68,15 +72,19 @@ function isEditable() {
 }
 
 async function changeState(value) {
-    if (!ticket.value.id) return;
-
-    const formData = {
-        ticketFk: ticket.value.id,
-        code: value,
-    };
-
-    await axios.post(`Tickets/state`, formData);
-    router.go(route.fullPath);
+    try {
+        stateBtnDropdownRef.value.hide();
+        const formData = {
+            ticketFk: entityId.value,
+            code: value,
+        };
+        await axios.post(`Tickets/state`, formData);
+        notify('globals.dataSaved', 'positive');
+        summaryRef.value?.fetch();
+        descriptorData.fetch({});
+    } catch (err) {
+        console.error('Error changing ticket state', err);
+    }
 }
 </script>
 
@@ -102,33 +110,21 @@ async function changeState(value) {
         </template>
         <template #header-right>
             <QBtnDropdown
-                side
-                top
+                ref="stateBtnDropdownRef"
                 color="black"
                 text-color="white"
                 :label="t('ticket.summary.changeState')"
                 :disable="!isEditable()"
             >
-                <QList>
-                    <QVirtualScroll
-                        style="max-height: 300px"
-                        :items="editableStates"
-                        separator
-                        v-slot="{ item, index }"
-                    >
-                        <QItem
-                            :key="index"
-                            dense
-                            clickable
-                            v-close-popup
-                            @click="changeState(item.code)"
-                        >
-                            <QItemSection>
-                                <QItemLabel>{{ item.name }}</QItemLabel>
-                            </QItemSection>
-                        </QItem>
-                    </QVirtualScroll>
-                </QList>
+                <VnSelect
+                    :options="editableStates"
+                    hide-selected
+                    option-label="name"
+                    option-value="code"
+                    hide-dropdown-icon
+                    focus-on-mount
+                    @update:model-value="changeState"
+                />
             </QBtnDropdown>
         </template>
         <template #body>

From 2990d32705557eb71b515042f22ba1efc932c4e6 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 27 Sep 2024 07:56:50 +0000
Subject: [PATCH 213/281] fix: grafana url

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

diff --git a/src/pages/Customer/Card/CustomerSummary.vue b/src/pages/Customer/Card/CustomerSummary.vue
index da50ba239..87a7f2c75 100644
--- a/src/pages/Customer/Card/CustomerSummary.vue
+++ b/src/pages/Customer/Card/CustomerSummary.vue
@@ -12,6 +12,7 @@ import VnTitle from 'src/components/common/VnTitle.vue';
 import VnRow from 'src/components/ui/VnRow.vue';
 const route = useRoute();
 const { t } = useI18n();
+const grafanaUrl = 'https://grafana.verdnatura.es';
 
 const $props = defineProps({
     id: {

From b541ce4e5608adf3b08f0fa8f15aaa7e77f43074 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 26 Sep 2024 15:49:12 +0200
Subject: [PATCH 214/281] fix: split params

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

diff --git a/src/components/common/VnLog.vue b/src/components/common/VnLog.vue
index ab522cfde..8c71c0997 100644
--- a/src/components/common/VnLog.vue
+++ b/src/components/common/VnLog.vue
@@ -406,6 +406,7 @@ watch(
         :skeleton="false"
         auto-load
         @on-fetch="setLogTree"
+        search-url="logs"
     >
         <template #body>
             <div

From e06d567e3c94f313490c740b90fb0c93ebe7fe7c Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 27 Sep 2024 10:35:39 +0200
Subject: [PATCH 215/281] test: refs #7679 #7679 remove comment

---
 src/components/VnSelectProvince.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/VnSelectProvince.vue b/src/components/VnSelectProvince.vue
index 3f8388c69..e6666330a 100644
--- a/src/components/VnSelectProvince.vue
+++ b/src/components/VnSelectProvince.vue
@@ -32,7 +32,6 @@ watch(
     () => $props.countryFk,
     async (newProvinceFk) => {
         if (newProvinceFk) {
-            // Assuming there's a townsFetchDataRef similar to provincesFetchDataRef
             await provincesFetchDataRef.value.fetch({
                 where: { countryFk: newProvinceFk },
             });

From 193670fdcf829cc9589261b426e5ebeea7dcd111 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Fri, 27 Sep 2024 12:39:30 +0200
Subject: [PATCH 216/281] fix: refs #7404 revert commit prevent production
 access

---
 src/router/modules/entry.js | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/src/router/modules/entry.js b/src/router/modules/entry.js
index 4750a4301..d66ea0e0c 100644
--- a/src/router/modules/entry.js
+++ b/src/router/modules/entry.js
@@ -58,15 +58,6 @@ export default {
                     },
                     component: () => import('src/pages/Entry/EntryLatestBuys.vue'),
                 },
-                {
-                    path: 'stock-Bought',
-                    name: 'EntryStockBought',
-                    meta: {
-                        title: 'reserves',
-                        icon: 'deployed_code_history',
-                    },
-                    component: () => import('src/pages/Entry/EntryStockBought.vue'),
-                },
             ],
         },
         {

From 336f2ba89e793a01765db588ae7bb5e55a82b604 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Fri, 27 Sep 2024 12:41:00 +0200
Subject: [PATCH 217/281] fix: refs #7404 remove from test

---
 src/pages/Entry/EntryStockBought.vue          | 293 ------------------
 src/pages/Entry/EntryStockBoughtDetail.vue    | 129 --------
 src/pages/Entry/EntryStockBoughtFilter.vue    |  63 ----
 .../integration/entry/stockBought.spec.js     |  39 ---
 4 files changed, 524 deletions(-)
 delete mode 100644 src/pages/Entry/EntryStockBought.vue
 delete mode 100644 src/pages/Entry/EntryStockBoughtDetail.vue
 delete mode 100644 src/pages/Entry/EntryStockBoughtFilter.vue
 delete mode 100644 test/cypress/integration/entry/stockBought.spec.js

diff --git a/src/pages/Entry/EntryStockBought.vue b/src/pages/Entry/EntryStockBought.vue
deleted file mode 100644
index 4750a8417..000000000
--- a/src/pages/Entry/EntryStockBought.vue
+++ /dev/null
@@ -1,293 +0,0 @@
-<script setup>
-import { ref } from 'vue';
-import { useI18n } from 'vue-i18n';
-import { useState } from 'src/composables/useState';
-import { useQuasar } from 'quasar';
-
-import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
-import FetchData from 'components/FetchData.vue';
-import FormModelPopup from 'components/FormModelPopup.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-import VnRow from 'components/ui/VnRow.vue';
-import RightMenu from 'src/components/common/RightMenu.vue';
-import EntryStockBoughtFilter from './EntryStockBoughtFilter.vue';
-import VnTable from 'components/VnTable/VnTable.vue';
-import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
-import EntryStockBoughtDetail from 'src/pages/Entry/EntryStockBoughtDetail.vue';
-
-const { t } = useI18n();
-const quasar = useQuasar();
-const state = useState();
-const user = state.getUser();
-const columns = [
-    {
-        align: 'left',
-        label: 'Id',
-        name: 'id',
-        isId: true,
-        columnFilter: false,
-        visible: false,
-    },
-    {
-        align: 'left',
-        name: 'workerFk',
-        label: t('Buyer'),
-        isTitle: true,
-        component: 'select',
-        cardVisible: true,
-        create: true,
-        attrs: {
-            url: 'Workers/activeWithInheritedRole',
-            fields: ['id', 'name'],
-            where: { role: 'buyer' },
-            optionFilter: 'firstName',
-            optionLabel: 'name',
-            optionValue: 'id',
-            useLike: false,
-        },
-    },
-    {
-        align: 'left',
-        label: t('Reserve'),
-        name: 'reserve',
-        columnFilter: false,
-        create: true,
-        component: 'number',
-        summation: true,
-    },
-    {
-        align: 'center',
-        label: t('Bought'),
-        name: 'bought',
-        summation: true,
-        cardVisible: true,
-        columnFilter: false,
-    },
-    {
-        align: 'left',
-        label: t('Date'),
-        name: 'dated',
-        component: 'date',
-        visible: false,
-        create: true,
-    },
-    {
-        align: 'left',
-        name: 'tableActions',
-        actions: [
-            {
-                title: t('More'),
-                icon: 'search',
-                isPrimary: true,
-                action: (row) => {
-                    quasar.dialog({
-                        component: EntryStockBoughtDetail,
-                        componentProps: {
-                            workerFk: row.workerFk,
-                            dated: userParams.value.dated,
-                        },
-                    });
-                },
-            },
-        ],
-    },
-];
-
-const fetchDataRef = ref();
-const travelDialogRef = ref(false);
-const tableRef = ref();
-const travel = ref(null);
-const userParams = ref({
-    dated: Date.vnNew(),
-});
-
-const filter = ref({
-    fields: ['id', 'm3', 'warehouseInFk'],
-    include: [
-        {
-            relation: 'warehouseIn',
-            scope: {
-                fields: ['code'],
-            },
-        },
-    ],
-    where: {
-        shipped: (userParams.value.dated
-            ? new Date(userParams.value.dated)
-            : Date.vnNew()
-        ).setHours(0, 0, 0, 0),
-        m3: { neq: null },
-    },
-});
-
-const setUserParams = async ({ dated }) => {
-    const shipped = (dated ? new Date(dated) : Date.vnNew()).setHours(0, 0, 0, 0);
-    filter.value.where.shipped = shipped;
-    fetchDataRef.value?.fetch();
-};
-
-function openDialog() {
-    travelDialogRef.value = true;
-}
-
-function setFooter(data) {
-    const footer = {
-        bought: 0,
-        reserve: 0,
-    };
-    data.forEach((row) => {
-        footer.bought += row?.bought;
-        footer.reserve += row?.reserve;
-    });
-    tableRef.value.footer = footer;
-}
-</script>
-<template>
-    <VnSubToolbar>
-        <template #st-data>
-            <FetchData
-                ref="fetchDataRef"
-                url="Travels"
-                auto-load
-                :filter="filter"
-                @on-fetch="
-                    (data) => {
-                        travel = data.find((data) => data.warehouseIn.code === 'VNH');
-                    }
-                "
-            />
-            <VnRow class="travel">
-                <div v-if="travel">
-                    <span style="color: var(--vn-label-color)">
-                        {{ t('Booked trucks') }}:
-                    </span>
-                    <span>
-                        {{ travel?.m3 }}
-                    </span>
-                    <QBtn
-                        v-if="travel?.m3"
-                        style="max-width: 20%"
-                        flat
-                        icon="edit"
-                        @click="openDialog()"
-                        :title="t('Edit travel')"
-                        color="primary"
-                    />
-                </div>
-            </VnRow>
-        </template>
-    </VnSubToolbar>
-    <QDialog v-model="travelDialogRef" :maximized="true" :class="['vn-row', 'wrap']">
-        <FormModelPopup
-            :url-update="`Travels/${travel?.id}`"
-            model="travel"
-            :title="t('Travel m3')"
-            :form-initial-data="{ id: travel?.id, m3: travel?.m3 }"
-            @on-data-saved="fetchDataRef.fetch()"
-        >
-            <template #form-inputs="{ data }">
-                <VnInput
-                    v-model="data.id"
-                    :label="t('id')"
-                    type="number"
-                    disable
-                    readonly
-                />
-                <VnInput v-model="data.m3" :label="t('m3')" type="number" />
-            </template>
-        </FormModelPopup>
-    </QDialog>
-    <RightMenu>
-        <template #right-panel>
-            <EntryStockBoughtFilter
-                data-key="StockBoughts"
-                @set-user-params="setUserParams"
-            />
-        </template>
-    </RightMenu>
-    <div class="table-container">
-        <QPage class="column items-center q-pa-md">
-            <VnTable
-                ref="tableRef"
-                data-key="StockBoughts"
-                url="StockBoughts/getStockBought"
-                save-url="StockBoughts/crud"
-                order="reserve DESC"
-                :right-search="false"
-                :is-editable="true"
-                @on-fetch="(data) => setFooter(data)"
-                :create="{
-                    urlCreate: 'StockBoughts',
-                    title: t('Reserve some space'),
-                    onDataSaved: () => tableRef.reload(),
-                    formInitialData: {
-                        workerFk: user.id,
-                        dated: Date.vnNow(),
-                    },
-                }"
-                :columns="columns"
-                :user-params="userParams"
-                :footer="true"
-                auto-load
-            >
-                <template #column-workerFk="{ row }">
-                    <span class="link" @click.stop>
-                        {{ row?.worker?.user?.name }}
-                        <WorkerDescriptorProxy :id="row?.workerFk" />
-                    </span>
-                </template>
-                <template #column-bought="{ row }">
-                    <span :class="{ 'text-negative': row.reserve < row.bought }">
-                        {{ row?.bought }}
-                    </span>
-                </template>
-                <template #column-footer-reserve>
-                    <span>
-                        {{ tableRef.footer.reserve }}
-                    </span>
-                </template>
-                <template #column-footer-bought>
-                    <span
-                        :class="{
-                            'text-negative':
-                                tableRef.footer.reserve < tableRef.footer.bought,
-                        }"
-                    >
-                        {{ tableRef.footer.bought }}
-                    </span>
-                </template>
-            </VnTable>
-        </QPage>
-    </div>
-</template>
-<style lang="scss" scoped>
-.travel {
-    margin-bottom: 0px;
-}
-.table-container {
-    display: flex;
-    justify-content: center;
-}
-.column {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    width: 40%;
-}
-.text-negative {
-    color: $negative !important;
-}
-</style>
-<i18n>
-    es:
-        Edit travel: Editar envío
-        Travel: Envíos
-        Booked trucks: Camiones reservados
-        Buyer: Comprador
-        Reserve: Reservado
-        Bought: Comprado
-        More: Más
-        Date: Fecha
-        Reserve some space: Reservar espacio
-        This buyer has already made a reservation for this date: Este comprador ya ha hecho una reserva para esta fecha
-</i18n>
diff --git a/src/pages/Entry/EntryStockBoughtDetail.vue b/src/pages/Entry/EntryStockBoughtDetail.vue
deleted file mode 100644
index 2c1a5a47e..000000000
--- a/src/pages/Entry/EntryStockBoughtDetail.vue
+++ /dev/null
@@ -1,129 +0,0 @@
-<script setup>
-import { ref } from 'vue';
-import { useI18n } from 'vue-i18n';
-
-import VnTable from 'components/VnTable/VnTable.vue';
-import EntryDescriptorProxy from 'src/pages/Entry/Card/EntryDescriptorProxy.vue';
-import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
-
-const { t } = useI18n();
-const tableRef = ref();
-const $props = defineProps({
-    workerFk: {
-        type: Number,
-        required: true,
-    },
-    dated: {
-        type: Date,
-        required: true,
-    },
-});
-const customUrl = `StockBoughts/getStockBoughtDetail?workerFk=${$props.workerFk}&date=${$props.dated}`;
-const columns = [
-    {
-        align: 'left',
-        label: t('Entry'),
-        name: 'entryFk',
-        isTitle: true,
-        isId: true,
-        columnFilter: false,
-    },
-    {
-        align: 'left',
-        name: 'itemFk',
-        label: t('Item'),
-        columnFilter: false,
-    },
-    {
-        align: 'left',
-        label: t('Name'),
-        name: 'itemName',
-        create: true,
-        columnClass: 'expand',
-        columnFilter: false,
-        cardVisible: true,
-    },
-    {
-        align: 'left',
-        name: 'volume',
-        label: t('Volume'),
-        columnFilter: false,
-        cardVisible: true,
-    },
-    {
-        align: 'left',
-        label: t('Packaging'),
-        name: 'packagingFk',
-        columnFilter: false,
-        cardVisible: true,
-    },
-    {
-        align: 'left',
-        label: 'Packing',
-        name: 'packing',
-        columnFilter: false,
-        cardVisible: true,
-    },
-];
-</script>
-<template>
-    <QDialog>
-        <div class="container">
-            <VnTable
-                ref="tableRef"
-                data-key="StockBoughtsDetail"
-                :url="customUrl"
-                order="itemName DESC"
-                :columns="columns"
-                :right-search="false"
-                :disable-infinite-scroll="true"
-                :limit="0"
-                auto-load
-            >
-                <template #top-left>
-                    <QBtn
-                        flat
-                        icon="Close"
-                        color="primary"
-                        class="bg-vn-section-color q-pa-xs"
-                        v-close-popup
-                    />
-                </template>
-                <template #column-entryFk="{ row }">
-                    <span class="link">
-                        {{ row?.entryFk }}
-                        <EntryDescriptorProxy :id="row.entryFk" />
-                    </span>
-                </template>
-                <template #column-itemName="{ row }">
-                    <span class="link">
-                        {{ row?.itemName }}
-                        <ItemDescriptorProxy :id="row.itemFk" />
-                    </span>
-                </template>
-            </VnTable>
-        </div>
-    </QDialog>
-</template>
-<style lang="css" scoped>
-.container {
-    max-width: 50vw;
-    overflow: auto;
-    justify-content: center;
-    align-items: center;
-    margin: auto;
-}
-</style>
-<i18n>
-    es:
-        Buyer: Comprador
-        Reserve: Reservado
-        Bought: Comprado
-        More: Más
-        Date: Fecha
-        Entry: Entrada
-        Item: Artículo
-        Name: Nombre
-        Volume: Volumen
-        Packaging: Embalage 
-</i18n>
diff --git a/src/pages/Entry/EntryStockBoughtFilter.vue b/src/pages/Entry/EntryStockBoughtFilter.vue
deleted file mode 100644
index 7694cfe6c..000000000
--- a/src/pages/Entry/EntryStockBoughtFilter.vue
+++ /dev/null
@@ -1,63 +0,0 @@
-<script setup>
-import { useI18n } from 'vue-i18n';
-import { onMounted } from 'vue';
-import { useStateStore } from 'stores/useStateStore';
-
-import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
-import VnInputDate from 'src/components/common/VnInputDate.vue';
-
-const { t } = useI18n();
-const props = defineProps({
-    dataKey: {
-        type: String,
-        required: true,
-    },
-});
-const stateStore = useStateStore();
-const emit = defineEmits(['set-user-params']);
-const setUserParams = (params) => {
-    emit('set-user-params', params);
-};
-onMounted(async () => {
-    stateStore.rightDrawer = true;
-});
-</script>
-
-<template>
-    <VnFilterPanel
-        :data-key="props.dataKey"
-        :search-button="true"
-        search-url="table"
-        @set-user-params="setUserParams"
-    >
-        <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 }">
-            <QItem class="q-my-sm">
-                <QItemSection>
-                    <VnInputDate
-                        id="date"
-                        v-model="params.dated"
-                        :label="t('Date')"
-                        is-outlined
-                    />
-                </QItemSection>
-            </QItem>
-        </template>
-    </VnFilterPanel>
-</template>
-<i18n>
-    en:
-        params:
-            dated: Date
-            workerFk: Worker
-    es:
-        Date: Fecha
-        params:
-            dated: Date
-            workerFk: Trabajador
-</i18n>
diff --git a/test/cypress/integration/entry/stockBought.spec.js b/test/cypress/integration/entry/stockBought.spec.js
deleted file mode 100644
index 66e06b79e..000000000
--- a/test/cypress/integration/entry/stockBought.spec.js
+++ /dev/null
@@ -1,39 +0,0 @@
-describe('EntryStockBought', () => {
-    beforeEach(() => {
-        cy.viewport(1920, 1080);
-        cy.login('buyer');
-        cy.visit(`/#/entry/stock-Bought`);
-    });
-    it('Should edit the reserved space', () => {
-        cy.get('.q-field__native.q-placeholder').should('have.value', '01/01/2001');
-        cy.get('input[name="reserve"]').type('10{enter}');
-        cy.get('button[title="Save"]').click();
-        cy.get('.q-notification__message').should('have.text', 'Data saved');
-    });
-    it('Should add a new reserved space for buyerBoss', () => {
-        cy.get('.q-page-sticky > div > .q-btn > .q-btn__content > .q-icon').click();
-        cy.get('input[aria-label="Reserve"]').type('1');
-        cy.get('input[aria-label="Date"]').eq(1).clear();
-        cy.get('input[aria-label="Date"]').eq(1).type('01-01');
-        cy.get('input[aria-label="Buyer"]').type('buyerboss{downarrow}{enter}');
-        cy.get('.q-notification__message').should('have.text', 'Data created');
-    });
-    it('Should check detail for the buyer', () => {
-        cy.get(':nth-child(1) > .sticky > .q-btn > .q-btn__content > .q-icon').click();
-        cy.get('tBody > tr').eq(1).its('length').should('eq', 1);
-    });
-    it('Should check detail for the buyerBoss and had no content', () => {
-        cy.get(':nth-child(2) > .sticky > .q-btn > .q-btn__content > .q-icon').click();
-        cy.get('.q-table__bottom.row.items-center.q-table__bottom--nodata').should(
-            'have.text',
-            'warningNo data available'
-        );
-    });
-    it('Should edit travel m3 and refresh', () => {
-        cy.get('.vn-row > div > .q-btn > .q-btn__content > .q-icon').click();
-        cy.get('input[aria-label="m3"]').clear();
-        cy.get('input[aria-label="m3"]').type('60');
-        cy.get('.q-mt-lg > .q-btn--standard > .q-btn__content > .block').click();
-        cy.get('.vn-row > div > :nth-child(2)').should('have.text', '60');
-    });
-});

From bec50d6eeda160de375cd1e1e10f21dc4b4fdff2 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 27 Sep 2024 19:54:01 +0200
Subject: [PATCH 218/281] perf: refs #7679 #7679 comments

---
 src/components/CreateNewPostcodeForm.vue | 1 -
 src/components/VnSelectProvince.vue      | 1 -
 2 files changed, 2 deletions(-)

diff --git a/src/components/CreateNewPostcodeForm.vue b/src/components/CreateNewPostcodeForm.vue
index 664016325..dc8027989 100644
--- a/src/components/CreateNewPostcodeForm.vue
+++ b/src/components/CreateNewPostcodeForm.vue
@@ -70,7 +70,6 @@ async function setProvince(id, data) {
     data.countryFk = newProvince.countryFk;
 }
 
-// Watchers to update filters based on country and province changes
 watch(
     () => [postcodeFormData.countryFk],
     async (newCountryFk) => {
diff --git a/src/components/VnSelectProvince.vue b/src/components/VnSelectProvince.vue
index e6666330a..d89827821 100644
--- a/src/components/VnSelectProvince.vue
+++ b/src/components/VnSelectProvince.vue
@@ -13,7 +13,6 @@ watch(provinceFk, async () => await provincesFetchDataRef.value.fetch());
 const $props = defineProps({
     countryFk: {
         type: Number,
-        required: false,
         default: null,
     },
 });

From 8356be1ec0567a8ef37121987ee503d1b8cdbfd0 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 27 Sep 2024 18:10:43 +0000
Subject: [PATCH 219/281] fix: onDataSaved VnTable

Habia un problema al usar this en entorno no local
---
 src/components/VnTable/VnTable.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 2c9526ec0..693bb785b 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -300,7 +300,7 @@ defineExpose({
 });
 
 function handleOnDataSaved(_, res) {
-    if (_.onDataSaved) _.onDataSaved(this);
+    if (_.onDataSaved) _.onDataSaved({ CrudModelRef: CrudModelRef.value });
     else $props.create.onDataSaved(_);
 }
 </script>

From cb0d3c5bca1319b995fcba4add6dd138372fb7ee Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Mon, 30 Sep 2024 09:46:00 +0200
Subject: [PATCH 220/281] fix: refs #7404 sticky footer and transparent header
 for vnTable

---
 src/components/LeftMenuItem.vue            |  1 -
 src/components/VnTable/VnTable.vue         | 44 ++++++++++------------
 src/pages/Entry/EntryStockBought.vue       | 22 +++++++----
 src/pages/Entry/EntryStockBoughtDetail.vue | 15 +++-----
 4 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/src/components/LeftMenuItem.vue b/src/components/LeftMenuItem.vue
index ab74c1de5..a3112b17f 100644
--- a/src/components/LeftMenuItem.vue
+++ b/src/components/LeftMenuItem.vue
@@ -44,7 +44,6 @@ const itemComputed = computed(() => {
         </QItemSection>
     </QItem>
 </template>
-
 <style lang="scss" scoped>
 .q-item {
     min-height: 5vh;
diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 572dbf144..6d27f7ced 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -73,7 +73,6 @@ const $props = defineProps({
         type: Boolean,
         default: false,
     },
-
     hasSubToolbar: {
         type: Boolean,
         default: null,
@@ -685,17 +684,15 @@ function handleOnDataSaved(_) {
                         </QCard>
                     </component>
                 </template>
-                <template #bottom-row="{ cols }" v-if="footer">
-                    <QTr v-if="rows.length" class="bg-header" style="height: 30px">
+                <template #bottom-row="{ cols }" v-if="$props.footer">
+                    <QTr v-if="rows.length" style="height: 30px">
                         <QTh
                             v-for="col of cols.filter((cols) => cols.visible ?? true)"
                             :key="col?.id"
                             class="text-center"
+                            :class="getColAlign(col)"
                         >
-                            <slot
-                                :name="`column-footer-${col.name}`"
-                                :class="getColAlign(col)"
-                            />
+                            <slot :name="`column-footer-${col.name}`" />
                         </QTh>
                     </QTr>
                 </template>
@@ -774,16 +771,6 @@ es:
     color: var(--vn-text-color);
 }
 
-.q-table--dark .q-table__bottom,
-.q-table--dark thead,
-.q-table--dark tr {
-    border-color: var(--vn-section-color);
-}
-
-.q-table__container > div:first-child {
-    background-color: var(--vn-page-color);
-}
-
 .grid-three {
     display: grid;
     grid-template-columns: repeat(auto-fit, minmax(400px, max-content));
@@ -857,6 +844,15 @@ es:
         background-color: var(--vn-section-color);
         z-index: 1;
     }
+    table tbody th {
+        position: relative;
+    }
+    tbody:nth-last-child(1) {
+        @extend .bg-header;
+        position: sticky;
+        z-index: 2;
+        bottom: 0;
+    }
 }
 
 .vn-label-value {
@@ -903,12 +899,12 @@ es:
     user-select: all;
 }
 
-.full-width-slot {
-    width: 100%;
-    display: flex;
-    text-align: center;
-    color: var(--vn-text-color);
-    margin-bottom: -1%;
-    background-color: var(--vn-header-color);
+.q-table__container.q-table--horizontal-separator.column.no-wrap.q-table__card.q-table__card--dark.q-dark.q-table--flat.q-table--dark.q-table--no-wrap.vnTable,
+.q-table__container.q-table--horizontal-separator.column.no-wrap.q-table__card.q-table--flat.q-table--no-wrap.vnTable {
+    background-color: transparent;
+}
+
+.q-table__middle.q-virtual-scroll.q-virtual-scroll--vertical.scroll {
+    background-color: var(--vn-section-color);
 }
 </style>
diff --git a/src/pages/Entry/EntryStockBought.vue b/src/pages/Entry/EntryStockBought.vue
index 4750a8417..b41973243 100644
--- a/src/pages/Entry/EntryStockBought.vue
+++ b/src/pages/Entry/EntryStockBought.vue
@@ -47,7 +47,7 @@ const columns = [
         },
     },
     {
-        align: 'left',
+        align: 'center',
         label: t('Reserve'),
         name: 'reserve',
         columnFilter: false,
@@ -141,6 +141,10 @@ function setFooter(data) {
     });
     tableRef.value.footer = footer;
 }
+
+function round(value) {
+    return Math.round(value * 100) / 100;
+}
 </script>
 <template>
     <VnSubToolbar>
@@ -152,7 +156,9 @@ function setFooter(data) {
                 :filter="filter"
                 @on-fetch="
                     (data) => {
-                        travel = data.find((data) => data.warehouseIn.code === 'VNH');
+                        travel = data.find(
+                            (data) => data.warehouseIn.code.toLowerCase() === 'vnh'
+                        );
                     }
                 "
             />
@@ -205,8 +211,9 @@ function setFooter(data) {
             />
         </template>
     </RightMenu>
+
     <div class="table-container">
-        <QPage class="column items-center q-pa-md">
+        <div class="column items-center">
             <VnTable
                 ref="tableRef"
                 data-key="StockBoughts"
@@ -228,6 +235,7 @@ function setFooter(data) {
                 :columns="columns"
                 :user-params="userParams"
                 :footer="true"
+                table-height="80vh"
                 auto-load
             >
                 <template #column-workerFk="{ row }">
@@ -243,7 +251,7 @@ function setFooter(data) {
                 </template>
                 <template #column-footer-reserve>
                     <span>
-                        {{ tableRef.footer.reserve }}
+                        {{ round(tableRef.footer.reserve) }}
                     </span>
                 </template>
                 <template #column-footer-bought>
@@ -253,11 +261,11 @@ function setFooter(data) {
                                 tableRef.footer.reserve < tableRef.footer.bought,
                         }"
                     >
-                        {{ tableRef.footer.bought }}
+                        {{ round(tableRef.footer.bought) }}
                     </span>
                 </template>
             </VnTable>
-        </QPage>
+        </div>
     </div>
 </template>
 <style lang="scss" scoped>
@@ -272,7 +280,7 @@ function setFooter(data) {
     display: flex;
     flex-direction: column;
     align-items: center;
-    width: 40%;
+    width: 45%;
 }
 .text-negative {
     color: $negative !important;
diff --git a/src/pages/Entry/EntryStockBoughtDetail.vue b/src/pages/Entry/EntryStockBoughtDetail.vue
index 2c1a5a47e..0fd775ee6 100644
--- a/src/pages/Entry/EntryStockBoughtDetail.vue
+++ b/src/pages/Entry/EntryStockBoughtDetail.vue
@@ -77,18 +77,10 @@ const columns = [
                 :columns="columns"
                 :right-search="false"
                 :disable-infinite-scroll="true"
+                :disable-option="{ card: true }"
                 :limit="0"
                 auto-load
             >
-                <template #top-left>
-                    <QBtn
-                        flat
-                        icon="Close"
-                        color="primary"
-                        class="bg-vn-section-color q-pa-xs"
-                        v-close-popup
-                    />
-                </template>
                 <template #column-entryFk="{ row }">
                     <span class="link">
                         {{ row?.entryFk }}
@@ -112,6 +104,11 @@ const columns = [
     justify-content: center;
     align-items: center;
     margin: auto;
+    background-color: var(--vn-section-color);
+    padding: 4px;
+}
+.container > div > div > .q-table__top.relative-position.row.items-center {
+    background-color: red !important;
 }
 </style>
 <i18n>

From 868e6a312f063e54f9cd567e1a6f3b2cc7c52dcc Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Mon, 30 Sep 2024 10:04:00 +0200
Subject: [PATCH 221/281] fix: refs #7404 class name

---
 src/components/VnTable/VnTable.vue   | 3 +--
 src/pages/Entry/EntryStockBought.vue | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 6d27f7ced..861a79432 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -899,8 +899,7 @@ es:
     user-select: all;
 }
 
-.q-table__container.q-table--horizontal-separator.column.no-wrap.q-table__card.q-table__card--dark.q-dark.q-table--flat.q-table--dark.q-table--no-wrap.vnTable,
-.q-table__container.q-table--horizontal-separator.column.no-wrap.q-table__card.q-table--flat.q-table--no-wrap.vnTable {
+.q-table__container {
     background-color: transparent;
 }
 
diff --git a/src/pages/Entry/EntryStockBought.vue b/src/pages/Entry/EntryStockBought.vue
index b41973243..9b6eca132 100644
--- a/src/pages/Entry/EntryStockBought.vue
+++ b/src/pages/Entry/EntryStockBought.vue
@@ -211,7 +211,6 @@ function round(value) {
             />
         </template>
     </RightMenu>
-
     <div class="table-container">
         <div class="column items-center">
             <VnTable

From c815177be934c99db36b592db69aca6c206fda0d Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Mon, 30 Sep 2024 10:13:39 +0200
Subject: [PATCH 222/281] fix: refs #7404 translate and width problem

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

diff --git a/src/pages/Entry/EntryStockBought.vue b/src/pages/Entry/EntryStockBought.vue
index 9b6eca132..0e8013586 100644
--- a/src/pages/Entry/EntryStockBought.vue
+++ b/src/pages/Entry/EntryStockBought.vue
@@ -76,7 +76,7 @@ const columns = [
         name: 'tableActions',
         actions: [
             {
-                title: t('More'),
+                title: t('View more details'),
                 icon: 'search',
                 isPrimary: true,
                 action: (row) => {
@@ -279,7 +279,7 @@ function round(value) {
     display: flex;
     flex-direction: column;
     align-items: center;
-    width: 45%;
+    width: 35%;
 }
 .text-negative {
     color: $negative !important;
@@ -293,8 +293,8 @@ function round(value) {
         Buyer: Comprador
         Reserve: Reservado
         Bought: Comprado
-        More: Más
         Date: Fecha
+        View more details: Ver más detalles
         Reserve some space: Reservar espacio
-        This buyer has already made a reservation for this date: Este comprador ya ha hecho una reserva para esta fecha
+        This buyer has already made a reservation for this date: Este comprador ya ha hecho una reserva para esta fecha 
 </i18n>

From 7fa0a5b28cbe5c2e7c177758158e8d610c88bd82 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Mon, 30 Sep 2024 10:47:02 +0200
Subject: [PATCH 223/281] fix: refs #7404 path name

---
 src/router/modules/entry.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/router/modules/entry.js b/src/router/modules/entry.js
index 4750a4301..76b4a6e23 100644
--- a/src/router/modules/entry.js
+++ b/src/router/modules/entry.js
@@ -59,7 +59,7 @@ export default {
                     component: () => import('src/pages/Entry/EntryLatestBuys.vue'),
                 },
                 {
-                    path: 'stock-Bought',
+                    path: 'stock-bought',
                     name: 'EntryStockBought',
                     meta: {
                         title: 'reserves',

From cf67865b0bf099570086314099b9a214a3e17ce5 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 30 Sep 2024 11:53:54 +0200
Subject: [PATCH 224/281] feat: refs #7404 updates

---
 src/components/common/VnInput.vue       | 39 +++++++++++++++++++++++++
 src/components/common/VnSelect.vue      | 17 +++++++++++
 src/components/ui/VnFilterPanel.vue     | 16 +++-------
 src/css/app.scss                        |  8 +++++
 src/pages/InvoiceOut/InvoiceOutList.vue |  5 +++-
 src/pages/Item/ItemFixedPrice.vue       |  7 ++++-
 6 files changed, 78 insertions(+), 14 deletions(-)

diff --git a/src/components/common/VnInput.vue b/src/components/common/VnInput.vue
index 1246eedcd..ce7918eda 100644
--- a/src/components/common/VnInput.vue
+++ b/src/components/common/VnInput.vue
@@ -130,4 +130,43 @@ const mixinRules = [
 .q-field__append {
     padding-inline: 0;
 }
+// .q-field--standard .q-field__control:after {
+//     padding: 0;
+// }
+// .q-field__control-container.col.relative-position.row.no-wrap.q-anchor--skip {
+//     display: flex;
+//     flex-direction: row;
+//     align-items: flex-end;
+// }
+
+.q-field__append.q-field__marginal.row.no-wrap.items-center.row {
+    height: 20px;
+}
+.q-field--outlined .q-field__append.q-field__marginal.row.no-wrap.items-center.row {
+    height: auto;
+}
+.q-field__control,
+.q-select--with-input {
+    /* color: var(--q-primary); */
+    // margin-bottom: 10px;
+    height: 23px;
+    /* max-width: 100%; */
+    /* outline: none; */
+}
+// .q-field--labeled .q-field__native,
+// .q-field--labeled .q-field__prefix,
+// .q-field--labeled .q-field__suffix {
+//     padding-bottom: 0;
+// }
+.q-field__native,
+.q-field__prefix,
+.q-field__suffix,
+.q-field__input {
+    padding: 0;
+}
+// .q-field__append.q-field__marginal.row.no-wrap.items-center.q-anchor--skip {
+//     display: flex;
+//     flex-direction: row;
+//     align-items: flex-end;
+// }
 </style>
diff --git a/src/components/common/VnSelect.vue b/src/components/common/VnSelect.vue
index aa629767d..bd505ed29 100644
--- a/src/components/common/VnSelect.vue
+++ b/src/components/common/VnSelect.vue
@@ -283,4 +283,21 @@ const getVal = (val) => ($props.useLike ? { like: `%${val}%` } : val);
 .q-field--outlined {
     max-width: 100%;
 }
+.q-field__inner {
+    .q-field__control {
+        min-height: auto !important;
+        .q-field__native.row {
+            min-height: auto !important;
+        }
+    }
+}
+//     &.q-field__control {
+//         min-height: auto;
+//         &.q-field__controler-container {
+//             .q-field__native {
+//                 min-height: revert;
+//             }
+//         }
+//     }
+// }
 </style>
diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue
index ef07b7bef..43d634ad9 100644
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@@ -3,7 +3,6 @@ import { onMounted, ref, computed, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useArrayData } from 'composables/useArrayData';
 import { useRoute } from 'vue-router';
-import { date } from 'quasar';
 import toDate from 'filters/toDate';
 import VnFilterPanelChip from 'components/ui/VnFilterPanelChip.vue';
 
@@ -59,7 +58,6 @@ const $props = defineProps({
 });
 
 defineExpose({ search, sanitizer });
-
 const emit = defineEmits([
     'update:modelValue',
     'refresh',
@@ -114,9 +112,9 @@ watch(
 );
 
 const isLoading = ref(false);
-async function search() {
+async function search(evt) {
     try {
-        if ($props.disableSubmitEvent) return;
+        if (evt && $props.disableSubmitEvent) return;
 
         store.filter.where = {};
         isLoading.value = true;
@@ -167,7 +165,7 @@ const tagsList = computed(() => {
     for (const key of Object.keys(userParams.value)) {
         const value = userParams.value[key];
         if (value == null || ($props.hiddenTags || []).includes(key)) continue;
-        tagList.push({ label: aliasField(key), value });
+        tagList.push({ label: key, value });
     }
     return tagList;
 });
@@ -187,7 +185,6 @@ async function remove(key) {
 }
 
 function formatValue(value) {
-    if (value instanceof Date) return date.formatDate(value, 'DD/MM/YYYY');
     if (typeof value === 'boolean') return value ? t('Yes') : t('No');
     if (isNaN(value) && !isNaN(Date.parse(value))) return toDate(value);
 
@@ -203,11 +200,6 @@ function sanitizer(params) {
     }
     return params;
 }
-
-function aliasField(field) {
-    const split = field.split('.');
-    return split[1] ?? split[0];
-}
 </script>
 
 <template>
@@ -219,7 +211,7 @@ function aliasField(field) {
         icon="search"
         @click="search()"
     ></QBtn>
-    <QForm @submit="search" id="filterPanelForm">
+    <QForm @submit="search" id="filterPanelForm" @keyup.enter="search()">
         <QList dense>
             <QItem class="q-mt-xs">
                 <QItemSection top>
diff --git a/src/css/app.scss b/src/css/app.scss
index 905934d4c..8115e44b8 100644
--- a/src/css/app.scss
+++ b/src/css/app.scss
@@ -288,3 +288,11 @@ input::-webkit-inner-spin-button {
         color: $info;
     }
 }
+.q-field__inner {
+    .q-field__control {
+        min-height: auto !important;
+        .q-field__native.row {
+            min-height: auto !important;
+        }
+    }
+}
diff --git a/src/pages/InvoiceOut/InvoiceOutList.vue b/src/pages/InvoiceOut/InvoiceOutList.vue
index 5157d957b..3dc565251 100644
--- a/src/pages/InvoiceOut/InvoiceOutList.vue
+++ b/src/pages/InvoiceOut/InvoiceOutList.vue
@@ -27,13 +27,16 @@ const { openReport } = usePrintService();
 
 const columns = computed(() => [
     {
-        align: 'left',
+        align: 'center',
         name: 'id',
         label: t('invoiceOutList.tableVisibleColumns.id'),
         chip: {
             condition: () => true,
         },
         isId: true,
+        columnFilter: {
+            name: 'search',
+        },
     },
     {
         align: 'left',
diff --git a/src/pages/Item/ItemFixedPrice.vue b/src/pages/Item/ItemFixedPrice.vue
index 2158065bd..7d4d6b896 100644
--- a/src/pages/Item/ItemFixedPrice.vue
+++ b/src/pages/Item/ItemFixedPrice.vue
@@ -514,7 +514,7 @@ function handleOnDataSave({ CrudModelRef }) {
             </template>
             <template #column-minPrice="props">
                 <QTd class="col">
-                    <div class="row">
+                    <div class="row" style="align-items: center">
                         <QCheckbox
                             :model-value="props.row.hasMinPrice"
                             @update:model-value="updateMinPrice($event, props)"
@@ -601,6 +601,11 @@ function handleOnDataSave({ CrudModelRef }) {
 .q-table td {
     padding-inline: 5px !important;
 }
+.q-table tr td {
+    font-size: 10pt;
+    border-top: none;
+    border-collapse: collapse;
+}
 .q-table tbody td {
     max-width: none;
     .q-td.col {

From b41026806fd434ecc73f2694d29232738258ac7e Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 30 Sep 2024 12:48:05 +0200
Subject: [PATCH 225/281] style: refs #7404 compress spaces

---
 src/components/common/VnInput.vue  | 22 ++++++++++++++++------
 src/components/common/VnSelect.vue |  3 +++
 src/components/ui/VnRow.vue        |  1 +
 src/css/app.scss                   |  3 +++
 4 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/src/components/common/VnInput.vue b/src/components/common/VnInput.vue
index ce7918eda..e518479b5 100644
--- a/src/components/common/VnInput.vue
+++ b/src/components/common/VnInput.vue
@@ -145,24 +145,34 @@ const mixinRules = [
 .q-field--outlined .q-field__append.q-field__marginal.row.no-wrap.items-center.row {
     height: auto;
 }
+.q-field__control {
+    height: unset;
+}
+.q-field__control.relative-position.row.no-wrap
+    > .q-field__control-container
+    > input.q-field__native
+    ~ div.q-field__label {
+    height: 41px;
+}
 .q-field__control,
 .q-select--with-input {
     /* color: var(--q-primary); */
     // margin-bottom: 10px;
-    height: 23px;
+    // height: 23px;
     /* max-width: 100%; */
     /* outline: none; */
 }
-// .q-field--labeled .q-field__native,
-// .q-field--labeled .q-field__prefix,
-// .q-field--labeled .q-field__suffix {
-//     padding-bottom: 0;
-// }
+.q-field--labeled .q-field__native,
+.q-field--labeled .q-field__prefix,
+.q-field--labeled .q-field__suffix {
+    padding-bottom: 0;
+}
 .q-field__native,
 .q-field__prefix,
 .q-field__suffix,
 .q-field__input {
     padding: 0;
+    min-height: 15px;
 }
 // .q-field__append.q-field__marginal.row.no-wrap.items-center.q-anchor--skip {
 //     display: flex;
diff --git a/src/components/common/VnSelect.vue b/src/components/common/VnSelect.vue
index bd505ed29..15d3a9524 100644
--- a/src/components/common/VnSelect.vue
+++ b/src/components/common/VnSelect.vue
@@ -286,6 +286,9 @@ const getVal = (val) => ($props.useLike ? { like: `%${val}%` } : val);
 .q-field__inner {
     .q-field__control {
         min-height: auto !important;
+
+        display: flex;
+        align-items: flex-end;
         .q-field__native.row {
             min-height: auto !important;
         }
diff --git a/src/components/ui/VnRow.vue b/src/components/ui/VnRow.vue
index 16bcfab7d..0df1fb7d4 100644
--- a/src/components/ui/VnRow.vue
+++ b/src/components/ui/VnRow.vue
@@ -9,6 +9,7 @@ defineProps({ wrap: { type: Boolean, default: false } });
 <style lang="scss" scoped>
 .vn-row {
     display: flex;
+    align-items: flex-end;
     > :deep(*) {
         flex: 1;
     }
diff --git a/src/css/app.scss b/src/css/app.scss
index 8115e44b8..c77af41f9 100644
--- a/src/css/app.scss
+++ b/src/css/app.scss
@@ -291,6 +291,9 @@ input::-webkit-inner-spin-button {
 .q-field__inner {
     .q-field__control {
         min-height: auto !important;
+        display: flex;
+        align-items: flex-end;
+        padding-bottom: 2px;
         .q-field__native.row {
             min-height: auto !important;
         }

From b3c36e555f4ecb81ae4022514c05b89ea2bd74ab Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 30 Sep 2024 12:50:23 +0200
Subject: [PATCH 226/281] style: refs #7404 compress spaces

---
 src/components/common/VnInput.vue  | 41 +++++++-----------------------
 src/components/common/VnSelect.vue |  9 -------
 2 files changed, 9 insertions(+), 41 deletions(-)

diff --git a/src/components/common/VnInput.vue b/src/components/common/VnInput.vue
index e518479b5..f389ca842 100644
--- a/src/components/common/VnInput.vue
+++ b/src/components/common/VnInput.vue
@@ -130,14 +130,6 @@ const mixinRules = [
 .q-field__append {
     padding-inline: 0;
 }
-// .q-field--standard .q-field__control:after {
-//     padding: 0;
-// }
-// .q-field__control-container.col.relative-position.row.no-wrap.q-anchor--skip {
-//     display: flex;
-//     flex-direction: row;
-//     align-items: flex-end;
-// }
 
 .q-field__append.q-field__marginal.row.no-wrap.items-center.row {
     height: 20px;
@@ -154,29 +146,14 @@ const mixinRules = [
     ~ div.q-field__label {
     height: 41px;
 }
-.q-field__control,
-.q-select--with-input {
-    /* color: var(--q-primary); */
-    // margin-bottom: 10px;
-    // height: 23px;
-    /* max-width: 100%; */
-    /* outline: none; */
+
+.q-field--labeled {
+    .q-field__native,
+    .q-field__prefix,
+    .q-field__suffix,
+    .q-field__input {
+        padding-bottom: 0;
+        min-height: 15px;
+    }
 }
-.q-field--labeled .q-field__native,
-.q-field--labeled .q-field__prefix,
-.q-field--labeled .q-field__suffix {
-    padding-bottom: 0;
-}
-.q-field__native,
-.q-field__prefix,
-.q-field__suffix,
-.q-field__input {
-    padding: 0;
-    min-height: 15px;
-}
-// .q-field__append.q-field__marginal.row.no-wrap.items-center.q-anchor--skip {
-//     display: flex;
-//     flex-direction: row;
-//     align-items: flex-end;
-// }
 </style>
diff --git a/src/components/common/VnSelect.vue b/src/components/common/VnSelect.vue
index 15d3a9524..84ab4b4b6 100644
--- a/src/components/common/VnSelect.vue
+++ b/src/components/common/VnSelect.vue
@@ -294,13 +294,4 @@ const getVal = (val) => ($props.useLike ? { like: `%${val}%` } : val);
         }
     }
 }
-//     &.q-field__control {
-//         min-height: auto;
-//         &.q-field__controler-container {
-//             .q-field__native {
-//                 min-height: revert;
-//             }
-//         }
-//     }
-// }
 </style>

From 76a77dcee9264bb4d9254fa4fdfaa46bac750f24 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Mon, 30 Sep 2024 14:35:10 +0200
Subject: [PATCH 227/281] fix: duplicate call

---
 src/pages/Ticket/Card/TicketSale.vue | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/src/pages/Ticket/Card/TicketSale.vue b/src/pages/Ticket/Card/TicketSale.vue
index d87f6c402..d5de60f16 100644
--- a/src/pages/Ticket/Card/TicketSale.vue
+++ b/src/pages/Ticket/Card/TicketSale.vue
@@ -53,7 +53,7 @@ const tableRef = ref([]);
 
 watch(
     () => route.params.id,
-    async () => await getSales()
+    () => tableRef.value.reload()
 );
 
 const columns = computed(() => [
@@ -161,15 +161,6 @@ const onSalesFetched = (salesData) => {
     for (let sale of salesData) sale.amount = getSaleTotal(sale);
 };
 
-const getSales = async () => {
-    try {
-        const { data } = await axios.get(`Tickets/${route.params.id}/getSales`);
-        onSalesFetched(data);
-    } catch (err) {
-        console.error('Error fetching sales', err);
-    }
-};
-
 const getSaleTotal = (sale) => {
     if (sale.quantity == null || sale.price == null) return null;
 
@@ -181,7 +172,7 @@ const getSaleTotal = (sale) => {
 
 const resetChanges = async () => {
     arrayData.fetch({ append: false });
-    getSales();
+    tableRef.value.reload();
 };
 
 const updateQuantity = async (sale) => {
@@ -434,7 +425,6 @@ const setTransferParams = async () => {
 onMounted(async () => {
     stateStore.rightDrawer = true;
     getConfig();
-    getSales();
     getItems();
 });
 
@@ -623,6 +613,7 @@ watch(
         :column-search="false"
         :disable-option="{ card: true }"
         auto-load
+        @on-fetch="onSalesFetched"
         :create="{
             onDataSaved: handleOnDataSave,
         }"

From 2302e22f1115a9b5d057e2a7e47b44d6b630968c Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 30 Sep 2024 15:00:05 +0200
Subject: [PATCH 228/281] fix: solve conflicts from master to test

---
 src/components/VnTable/VnTable.vue            |  4 +-
 src/components/common/VnLocation.vue          | 43 +++++++++++--
 src/i18n/locale/en.yml                        |  2 +-
 src/i18n/locale/es.yml                        |  2 +-
 .../Customer/Card/CustomerFiscalData.vue      |  1 +
 src/pages/Customer/Card/CustomerSummary.vue   |  1 +
 src/pages/Customer/CustomerList.vue           |  3 +-
 .../Customer/Defaulter/CustomerDefaulter.vue  |  7 --
 src/pages/Item/ItemFixedPrice.vue             | 20 +++---
 .../Supplier/Card/SupplierAddressesCreate.vue |  1 +
 src/pages/Ticket/Card/TicketSummary.vue       | 64 +++++++++----------
 src/pages/Worker/WorkerList.vue               |  1 +
 12 files changed, 86 insertions(+), 63 deletions(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 9dcbc5542..3ed741ac4 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -310,8 +310,8 @@ defineExpose({
     params,
 });
 
-function handleOnDataSaved(_) {
-    if (_.onDataSaved) _.onDataSaved(this);
+function handleOnDataSaved(_, res) {
+    if (_.onDataSaved) _.onDataSaved({ CrudModelRef: CrudModelRef.value });
     else $props.create.onDataSaved(_);
 }
 </script>
diff --git a/src/components/common/VnLocation.vue b/src/components/common/VnLocation.vue
index e5ed14a40..c1b921915 100644
--- a/src/components/common/VnLocation.vue
+++ b/src/components/common/VnLocation.vue
@@ -12,17 +12,48 @@ const props = defineProps({
         default: null,
     },
 });
+const formatLocation = (obj, properties) => {
+    const parts = properties.map((prop) => {
+        if (typeof prop === 'string') {
+            return obj[prop];
+        } else if (typeof prop === 'function') {
+            return prop(obj);
+        }
+        return null;
+    });
+
+    const filteredParts = parts.filter(
+        (part) => part !== null && part !== undefined && part !== ''
+    );
+
+    return filteredParts.join(', ');
+};
+
+const locationProperties = [
+    'postcode',
+    (obj) =>
+        obj.city
+            ? `${obj.city}${obj.province?.name ? `(${obj.province.name})` : ''}`
+            : null,
+    (obj) => obj.country?.name,
+];
+
 const modelValue = ref(
-    props.location
-        ? `${props.location?.postcode}, ${props.location?.city}(${props.location?.province?.name}), ${props.location?.country?.name}`
-        : null
+    props.location ? formatLocation(props.location, locationProperties) : null
 );
-function showLabel(data) {
-    return `${data.code}, ${data.town}(${data.province}), ${data.country}`;
-}
+
 const handleModelValue = (data) => {
     emit('update:model-value', data);
 };
+
+function showLabel(data) {
+    const dataProperties = [
+        'code',
+        (obj) => (obj.town ? `${obj.town}(${obj.province})` : null),
+        'country',
+    ];
+    return formatLocation(data, dataProperties);
+}
 </script>
 <template>
     <VnSelectDialog
diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 43fb69e6a..7eb3829fe 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -1076,7 +1076,7 @@ item:
         producer: Producer
         landed: Landed
     fixedPrice:
-        itemId: Item ID
+        itemFk: Item ID
         groupingPrice: Grouping price
         packingPrice: Packing price
         hasMinPrice: Has min price
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index b4e4ce86f..9d5cd53f3 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -1061,7 +1061,7 @@ item:
         producer: Productor
         landed: F. entrega
     fixedPrice:
-        itemId: ID Artículo
+        itemFk: ID Artículo
         groupingPrice: Precio grouping
         packingPrice: Precio packing
         hasMinPrice: Tiene precio mínimo
diff --git a/src/pages/Customer/Card/CustomerFiscalData.vue b/src/pages/Customer/Card/CustomerFiscalData.vue
index 300d275c0..1f5775715 100644
--- a/src/pages/Customer/Card/CustomerFiscalData.vue
+++ b/src/pages/Customer/Card/CustomerFiscalData.vue
@@ -93,6 +93,7 @@ function handleLocation(data, location) {
             <VnRow>
                 <VnLocation
                     :rules="validate('Worker.postcode')"
+                    :roles-allowed-to-create="['deliveryAssistant', 'administrative']"
                     :acls="[{ model: 'Town', props: '*', accessType: 'WRITE' }]"
                     :location="data"
                     @update:model-value="(location) => handleLocation(data, location)"
diff --git a/src/pages/Customer/Card/CustomerSummary.vue b/src/pages/Customer/Card/CustomerSummary.vue
index f049426e2..8b5f0f2c2 100644
--- a/src/pages/Customer/Card/CustomerSummary.vue
+++ b/src/pages/Customer/Card/CustomerSummary.vue
@@ -13,6 +13,7 @@ import VnTitle from 'src/components/common/VnTitle.vue';
 import VnRow from 'src/components/ui/VnRow.vue';
 const route = useRoute();
 const { t } = useI18n();
+const grafanaUrl = 'https://grafana.verdnatura.es';
 
 const $props = defineProps({
     id: {
diff --git a/src/pages/Customer/CustomerList.vue b/src/pages/Customer/CustomerList.vue
index 5e24a1c2d..63f5149e8 100644
--- a/src/pages/Customer/CustomerList.vue
+++ b/src/pages/Customer/CustomerList.vue
@@ -429,10 +429,9 @@ function handleLocation(data, location) {
                 :params="{
                     departmentCodes: ['VT', 'shopping'],
                 }"
-                option-label="nickname"
-                option-value="id"
                 :fields="['id', 'nickname']"
                 sort-by="nickname ASC"
+                :use-like="false"
                 emit-value
                 auto-load
             >
diff --git a/src/pages/Customer/Defaulter/CustomerDefaulter.vue b/src/pages/Customer/Defaulter/CustomerDefaulter.vue
index 11f6362f8..7b9cb67f7 100644
--- a/src/pages/Customer/Defaulter/CustomerDefaulter.vue
+++ b/src/pages/Customer/Defaulter/CustomerDefaulter.vue
@@ -3,7 +3,6 @@ import { ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
 import { toCurrency, toDate, dateRange } from 'filters/index';
-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';
@@ -11,7 +10,6 @@ import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import CustomerDefaulterAddObservation from './CustomerDefaulterAddObservation.vue';
 import DepartmentDescriptorProxy from 'src/pages/Department/Card/DepartmentDescriptorProxy.vue';
-import RightMenu from 'src/components/common/RightMenu.vue';
 import VnTable from 'src/components/VnTable/VnTable.vue';
 
 const { t } = useI18n();
@@ -192,11 +190,6 @@ function exprBuilder(param, value) {
 </script>
 
 <template>
-    <RightMenu>
-        <template #right-panel>
-            <CustomerNotificationsFilter data-key="CustomerDefaulter" />
-        </template>
-    </RightMenu>
     <VnSubToolbar>
         <template #st-data>
             <CustomerBalanceDueTotal :amount="balanceDueTotal" />
diff --git a/src/pages/Item/ItemFixedPrice.vue b/src/pages/Item/ItemFixedPrice.vue
index bd8c4b78c..fddf154a2 100644
--- a/src/pages/Item/ItemFixedPrice.vue
+++ b/src/pages/Item/ItemFixedPrice.vue
@@ -36,23 +36,23 @@ const user = state.getUser();
 const fixedPrices = ref([]);
 const warehousesOptions = ref([]);
 const rowsSelected = ref([]);
-
 const itemFixedPriceFilterRef = ref();
-
 const params = reactive({});
-const defaultColumnAttrs = {
-    align: 'left',
-    sortable: true,
-};
+
 onMounted(async () => {
     stateStore.rightDrawer = true;
     params.warehouseFk = user.value.warehouseFk;
 });
 onUnmounted(() => (stateStore.rightDrawer = false));
+
+const defaultColumnAttrs = {
+    align: 'left',
+    sortable: true,
+};
 const columns = computed(() => [
     {
-        label: t('item.fixedPrice.itemId'),
-        name: 'itemId',
+        label: t('item.fixedPrice.itemFk'),
+        name: 'itemFk',
         ...defaultColumnAttrs,
         isId: true,
         cardVisible: true,
@@ -426,7 +426,7 @@ function handleOnDataSave({ CrudModelRef }) {
             :default-save="false"
             data-key="ItemFixedPrices"
             url="FixedPrices/filter"
-            :order="['itemFk ASC']"
+            :order="['description DESC']"
             save-url="FixedPrices/crud"
             :user-params="{ warehouseFk: user.warehouseFk }"
             ref="tableRef"
@@ -460,7 +460,7 @@ function handleOnDataSave({ CrudModelRef }) {
                 <QCheckbox flat v-model="scope.selected" />
             </template>
 
-            <template #column-itemId="props">
+            <template #column-itemFk="props">
                 <VnSelect
                     style="max-width: 100px"
                     url="Items/withName"
diff --git a/src/pages/Supplier/Card/SupplierAddressesCreate.vue b/src/pages/Supplier/Card/SupplierAddressesCreate.vue
index 290373039..0feceb74a 100644
--- a/src/pages/Supplier/Card/SupplierAddressesCreate.vue
+++ b/src/pages/Supplier/Card/SupplierAddressesCreate.vue
@@ -84,6 +84,7 @@ function handleLocation(data, location) {
                 <VnRow>
                     <VnLocation
                         :rules="validate('Worker.postcode')"
+                        :roles-allowed-to-create="['deliveryAssistant']"
                         :acls="[{ model: 'Town', props: '*', accessType: 'WRITE' }]"
                         :location="
                             data.postalCode
diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index 6af782173..2e85be000 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -1,6 +1,6 @@
 <script setup>
 import { onMounted, ref, computed } from 'vue';
-import { useRoute, useRouter } from 'vue-router';
+import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import axios from 'axios';
 import { dashIfEmpty, toDate, toCurrency } from 'src/filters';
@@ -11,13 +11,15 @@ import InvoiceOutDescriptorProxy from 'pages/InvoiceOut/Card/InvoiceOutDescripto
 import VnLv from 'src/components/ui/VnLv.vue';
 import VnLinkPhone from 'src/components/ui/VnLinkPhone.vue';
 import { getUrl } from 'src/composables/getUrl';
+import useNotify from 'src/composables/useNotify.js';
+import { useArrayData } from 'composables/useArrayData';
 import VnUserLink from 'src/components/ui/VnUserLink.vue';
 import VnTitle from 'src/components/common/VnTitle.vue';
 import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 
 const route = useRoute();
-const router = useRouter();
-
+const { notify } = useNotify();
 const { t } = useI18n();
 
 const $props = defineProps({
@@ -35,6 +37,8 @@ const ticket = computed(() => summaryRef.value?.entity);
 const editableStates = ref([]);
 const ticketUrl = ref();
 const grafanaUrl = 'https://grafana.verdnatura.es';
+const stateBtnDropdownRef = ref();
+const descriptorData = useArrayData('ticketData');
 
 onMounted(async () => {
     ticketUrl.value = (await getUrl('ticket/')) + entityId.value + '/';
@@ -61,15 +65,19 @@ function isEditable() {
 }
 
 async function changeState(value) {
-    if (!ticket.value.id) return;
-
-    const formData = {
-        ticketFk: ticket.value.id,
-        code: value,
-    };
-
-    await axios.post(`Tickets/state`, formData);
-    router.go(route.fullPath);
+    try {
+        stateBtnDropdownRef.value.hide();
+        const formData = {
+            ticketFk: entityId.value,
+            code: value,
+        };
+        await axios.post(`Tickets/state`, formData);
+        notify('globals.dataSaved', 'positive');
+        summaryRef.value?.fetch();
+        descriptorData.fetch({});
+    } catch (err) {
+        console.error('Error changing ticket state', err);
+    }
 }
 </script>
 
@@ -94,33 +102,21 @@ async function changeState(value) {
         </template>
         <template #header-right>
             <QBtnDropdown
-                side
-                top
+                ref="stateBtnDropdownRef"
                 color="black"
                 text-color="white"
                 :label="t('ticket.summary.changeState')"
                 :disable="!isEditable()"
             >
-                <QList>
-                    <QVirtualScroll
-                        style="max-height: 300px"
-                        :items="editableStates"
-                        separator
-                        v-slot="{ item, index }"
-                    >
-                        <QItem
-                            :key="index"
-                            dense
-                            clickable
-                            v-close-popup
-                            @click="changeState(item.code)"
-                        >
-                            <QItemSection>
-                                <QItemLabel>{{ item.name }}</QItemLabel>
-                            </QItemSection>
-                        </QItem>
-                    </QVirtualScroll>
-                </QList>
+                <VnSelect
+                    :options="editableStates"
+                    hide-selected
+                    option-label="name"
+                    option-value="code"
+                    hide-dropdown-icon
+                    focus-on-mount
+                    @update:model-value="changeState"
+                />
             </QBtnDropdown>
         </template>
         <template #body="{ entity }">
diff --git a/src/pages/Worker/WorkerList.vue b/src/pages/Worker/WorkerList.vue
index 4c9964c0b..6b3b117b6 100644
--- a/src/pages/Worker/WorkerList.vue
+++ b/src/pages/Worker/WorkerList.vue
@@ -262,6 +262,7 @@ async function autofillBic(worker) {
                 </VnRow>
                 <VnRow>
                     <VnLocation
+                        :roles-allowed-to-create="['deliveryAssistant']"
                         :acls="[{ model: 'Town', props: '*', accessType: 'WRITE' }]"
                         :options="postcodesOptions"
                         @update:model-value="(location) => handleLocation(data, location)"

From 4d4554a6ca8dcca2eb4d3ba17754a3484081f843 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 30 Sep 2024 15:11:22 +0200
Subject: [PATCH 229/281] fix(lilium): #6898 SupplierFiscalData show fields

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

diff --git a/src/pages/Supplier/Card/SupplierFiscalData.vue b/src/pages/Supplier/Card/SupplierFiscalData.vue
index 396cf15a2..96c0b344e 100644
--- a/src/pages/Supplier/Card/SupplierFiscalData.vue
+++ b/src/pages/Supplier/Card/SupplierFiscalData.vue
@@ -52,7 +52,22 @@ function handleLocation(data, location) {
         :url-update="`Suppliers/${route.params.id}/updateFiscalData`"
         model="supplier"
         :filter="{
-            fields: ['id', 'name', 'city', 'postCode', 'countryFk', 'provinceFk'],
+            fields: [
+                'id',
+                'nif',
+                'city',
+                'name',
+                'account',
+                'postCode',
+                'countryFk',
+                'provinceFk',
+                'sageTaxTypeFk',
+                'sageWithholdingFk',
+                'sageTransactionTypeFk',
+                'supplierActivityFk',
+                'healthRegister',
+                'street',
+            ],
             include: [
                 {
                     relation: 'province',
@@ -72,6 +87,7 @@ function handleLocation(data, location) {
         :clear-store-on-unmount="false"
     >
         <template #form="{ data, validate }">
+            {{ data }}
             <VnRow>
                 <VnInput
                     v-model="data.name"

From 03450a86fbb679f4f6007684e001eab618520d67 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 30 Sep 2024 13:13:35 +0000
Subject: [PATCH 230/281] fix: SupplierFiscalData show data printing

---
 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 96c0b344e..169c4d796 100644
--- a/src/pages/Supplier/Card/SupplierFiscalData.vue
+++ b/src/pages/Supplier/Card/SupplierFiscalData.vue
@@ -87,7 +87,6 @@ function handleLocation(data, location) {
         :clear-store-on-unmount="false"
     >
         <template #form="{ data, validate }">
-            {{ data }}
             <VnRow>
                 <VnInput
                     v-model="data.name"

From e7a2d3aa85fb98a4abde729b70fd83a315151d94 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 30 Sep 2024 20:20:51 +0200
Subject: [PATCH 231/281] fix: refs #7354 ZonLocation filter

---
 src/pages/Zone/Card/ZoneLocationsTree.vue | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/pages/Zone/Card/ZoneLocationsTree.vue b/src/pages/Zone/Card/ZoneLocationsTree.vue
index cb1508ed6..6b3934df7 100644
--- a/src/pages/Zone/Card/ZoneLocationsTree.vue
+++ b/src/pages/Zone/Card/ZoneLocationsTree.vue
@@ -1,7 +1,7 @@
 <script setup>
 import { onMounted, ref, computed, watch, onUnmounted } from 'vue';
 import { useRoute } from 'vue-router';
-
+import VnInput from 'src/components/common/VnInput.vue';
 import { useState } from 'src/composables/useState';
 import axios from 'axios';
 import { useArrayData } from 'composables/useArrayData';
@@ -144,7 +144,8 @@ watch(storeData, async (val) => {
 });
 
 const reFetch = async () => {
-    await arrayData.fetch({ append: false });
+    const { data } = await arrayData.fetch({ append: false });
+    nodes.value = data;
 };
 
 onMounted(async () => {
@@ -182,6 +183,16 @@ onUnmounted(() => {
 </script>
 
 <template>
+    <VnInput
+        v-if="showSearchBar"
+        v-model="store.userParams.search"
+        :placeholder="$t('globals.search')"
+        @update:model-value="reFetch()"
+    >
+        <template #prepend>
+            <QBtn color="primary" icon="search" dense flat @click="reFetch()" />
+        </template>
+    </VnInput>
     <QTree
         ref="treeRef"
         :nodes="nodes"

From 41acf0e1e2e025e80a086018b04e4a5012fb4b69 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 1 Oct 2024 00:24:34 +0200
Subject: [PATCH 232/281] feat: #7679 show country provinces

---
 src/components/CreateNewCityForm.vue          | 40 ++++++++++++-------
 src/components/CreateNewPostcodeForm.vue      | 31 +++++++++++---
 src/components/CreateNewProvinceForm.vue      | 16 +++++++-
 src/components/VnSelectProvince.vue           | 40 +++++++++++--------
 .../vnComponent/vnLocation.spec.js            | 19 +++++++++
 5 files changed, 108 insertions(+), 38 deletions(-)

diff --git a/src/components/CreateNewCityForm.vue b/src/components/CreateNewCityForm.vue
index 9a7d8666c..85d13beb1 100644
--- a/src/components/CreateNewCityForm.vue
+++ b/src/components/CreateNewCityForm.vue
@@ -1,35 +1,42 @@
 <script setup>
-import { reactive, ref } from 'vue';
+import { onMounted, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 
-import FetchData from 'components/FetchData.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnSelectProvince from 'components/VnSelectProvince.vue';
 import VnInput from 'components/common/VnInput.vue';
 import FormModelPopup from './FormModelPopup.vue';
 
 const emit = defineEmits(['onDataSaved']);
-
+const $props = defineProps({
+    countryFk: {
+        type: Number,
+        default: null,
+    },
+    provinceSelected: {
+        type: Number,
+        default: null,
+    },
+    provinces: {
+        type: Array,
+        default: () => [],
+    },
+});
 const { t } = useI18n();
 
-const cityFormData = reactive({
+const cityFormData = ref({
     name: null,
     provinceFk: null,
 });
-
-const provincesOptions = ref([]);
-
+onMounted(() => {
+    cityFormData.value.provinceFk = $props.provinceSelected;
+});
 const onDataSaved = (...args) => {
     emit('onDataSaved', ...args);
 };
 </script>
 
 <template>
-    <FetchData
-        @on-fetch="(data) => (provincesOptions = data)"
-        auto-load
-        url="Provinces"
-    />
     <FormModelPopup
         :title="t('New city')"
         :subtitle="t('Please, ensure you put the correct data!')"
@@ -41,11 +48,16 @@ const onDataSaved = (...args) => {
         <template #form-inputs="{ data, validate }">
             <VnRow>
                 <VnInput
-                    :label="t('Name')"
+                    :label="t('Names')"
                     v-model="data.name"
                     :rules="validate('city.name')"
                 />
-                <VnSelectProvince v-model="data.provinceFk" />
+                <VnSelectProvince
+                    :province-selected="$props.provinceSelected"
+                    :country-fk="$props.countryFk"
+                    v-model="data.provinceFk"
+                    :provinces="$props.provinces"
+                />
             </VnRow>
         </template>
     </FormModelPopup>
diff --git a/src/components/CreateNewPostcodeForm.vue b/src/components/CreateNewPostcodeForm.vue
index dc8027989..396a7ebc8 100644
--- a/src/components/CreateNewPostcodeForm.vue
+++ b/src/components/CreateNewPostcodeForm.vue
@@ -63,17 +63,27 @@ function setTown(newTown, data) {
 }
 
 async function setProvince(id, data) {
-    await provincesFetchDataRef.value.fetch();
     const newProvince = provincesOptions.value.find((province) => province.id == id);
     if (!newProvince) return;
 
     data.countryFk = newProvince.countryFk;
 }
 
+async function onProvinceCreated(data) {
+    await provincesFetchDataRef.value.fetch({
+        where: { countryFk: postcodeFormData.countryFk },
+    });
+    postcodeFormData.provinceFk.value = data.id;
+}
+
 watch(
     () => [postcodeFormData.countryFk],
-    async (newCountryFk) => {
-        if (newCountryFk) {
+    async (newCountryFk, oldValueFk) => {
+        if (!!oldValueFk[0] && newCountryFk[0] !== oldValueFk[0]) {
+            postcodeFormData.provinceFk = null;
+            postcodeFormData.townFk = null;
+        }
+        if ((newCountryFk, newCountryFk !== postcodeFormData.countryFk)) {
             await provincesFetchDataRef.value.fetch({
                 where: {
                     countryFk: newCountryFk[0],
@@ -93,7 +103,7 @@ watch(
 watch(
     () => postcodeFormData.provinceFk,
     async (newProvinceFk) => {
-        if (newProvinceFk) {
+        if (newProvinceFk[0] && newProvinceFk[0] !== postcodeFormData.provinceFk) {
             await townsFetchDataRef.value.fetch({
                 where: { provinceFk: newProvinceFk[0] },
             });
@@ -121,6 +131,7 @@ async function handleCountries(data) {
     <FetchData
         ref="townsFetchDataRef"
         @on-fetch="handleTowns"
+        :limit="30"
         auto-load
         url="Towns/location"
     />
@@ -140,6 +151,7 @@ async function handleCountries(data) {
                     :label="t('Postcode')"
                     v-model="data.code"
                     :rules="validate('postcode.code')"
+                    clearable
                 />
                 <VnSelectDialog
                     :label="t('City')"
@@ -151,7 +163,7 @@ async function handleCountries(data) {
                     :rules="validate('postcode.city')"
                     :acls="[{ model: 'Town', props: '*', accessType: 'WRITE' }]"
                     :emit-value="false"
-                    clearable
+                    :clearable="true"
                 >
                     <template #option="{ itemProps, opt }">
                         <QItem v-bind="itemProps">
@@ -166,6 +178,9 @@ async function handleCountries(data) {
                     </template>
                     <template #form>
                         <CreateNewCityForm
+                            :country-fk="data.countryFk"
+                            :province-selected="data.provinceFk"
+                            :provinces="provincesOptions"
                             @on-data-saved="
                                 (_, requestResponse) =>
                                     onCityCreated(requestResponse, data)
@@ -176,9 +191,13 @@ async function handleCountries(data) {
             </VnRow>
             <VnRow>
                 <VnSelectProvince
-                    :country-fk="postcodeFormData.countryFk"
+                    :country-fk="data.countryFk"
+                    :province-selected="data.provinceFk"
                     @update:model-value="(value) => setProvince(value, data)"
                     v-model="data.provinceFk"
+                    :clearable="true"
+                    :provinces="provincesOptions"
+                    @on-province-created="onProvinceCreated"
                 />
                 <VnSelect
                     :label="t('Country')"
diff --git a/src/components/CreateNewProvinceForm.vue b/src/components/CreateNewProvinceForm.vue
index e32684a98..4c1d96930 100644
--- a/src/components/CreateNewProvinceForm.vue
+++ b/src/components/CreateNewProvinceForm.vue
@@ -16,7 +16,16 @@ const provinceFormData = reactive({
     name: null,
     autonomyFk: null,
 });
-
+const $props = defineProps({
+    countryFk: {
+        type: Number,
+        default: null,
+    },
+    provinces: {
+        type: Array,
+        default: () => [],
+    },
+});
 const autonomiesOptions = ref([]);
 
 const onDataSaved = (dataSaved, requestResponse) => {
@@ -31,6 +40,11 @@ const onDataSaved = (dataSaved, requestResponse) => {
     <FetchData
         @on-fetch="(data) => (autonomiesOptions = data)"
         auto-load
+        :filter="{
+            where: {
+                countryFk: $props.countryFk,
+            },
+        }"
         url="Autonomies/location"
     />
     <FormModelPopup
diff --git a/src/components/VnSelectProvince.vue b/src/components/VnSelectProvince.vue
index d89827821..9eef125cc 100644
--- a/src/components/VnSelectProvince.vue
+++ b/src/components/VnSelectProvince.vue
@@ -8,18 +8,27 @@ import FetchData from 'components/FetchData.vue';
 import CreateNewProvinceForm from './CreateNewProvinceForm.vue';
 
 const emit = defineEmits(['onProvinceCreated']);
-const provinceFk = defineModel({ type: Number });
-watch(provinceFk, async () => await provincesFetchDataRef.value.fetch());
 const $props = defineProps({
     countryFk: {
         type: Number,
         default: null,
     },
+    provinceSelected: {
+        type: Number,
+        default: null,
+    },
+    provinces: {
+        type: Array,
+        default: () => [],
+    },
 });
+const provinceFk = defineModel({ type: Number, default: null });
+
 const { validate } = useValidator();
 const { t } = useI18n();
 
-const provincesOptions = ref();
+const provincesOptions = ref($props.provinces);
+provinceFk.value = $props.provinceSelected;
 const provincesFetchDataRef = ref();
 
 async function onProvinceCreated(_, data) {
@@ -27,16 +36,6 @@ async function onProvinceCreated(_, data) {
     provinceFk.value = data.id;
     emit('onProvinceCreated', data);
 }
-watch(
-    () => $props.countryFk,
-    async (newProvinceFk) => {
-        if (newProvinceFk) {
-            await provincesFetchDataRef.value.fetch({
-                where: { countryFk: newProvinceFk },
-            });
-        }
-    }
-);
 async function handleProvinces(data) {
     provincesOptions.value = data;
 }
@@ -45,14 +44,18 @@ async function handleProvinces(data) {
 <template>
     <FetchData
         ref="provincesFetchDataRef"
-        :filter="{ include: { relation: 'country' } }"
+        :filter="{
+            include: { relation: 'country' },
+            where: {
+                countryFk: $props.countryFk,
+            },
+        }"
         @on-fetch="handleProvinces"
-        auto-load
         url="Provinces"
     />
     <VnSelectDialog
         :label="t('Province')"
-        :options="provincesOptions"
+        :options="$props.provinces"
         hide-selected
         v-model="provinceFk"
         :rules="validate && validate('postcode.provinceFk')"
@@ -67,7 +70,10 @@ async function handleProvinces(data) {
             </QItem>
         </template>
         <template #form>
-            <CreateNewProvinceForm @on-data-saved="onProvinceCreated" />
+            <CreateNewProvinceForm
+                :country-fk="$props.countryFk"
+                @on-data-saved="onProvinceCreated"
+            />
         </template>
     </VnSelectDialog>
 </template>
diff --git a/test/cypress/integration/vnComponent/vnLocation.spec.js b/test/cypress/integration/vnComponent/vnLocation.spec.js
index 88919e41c..78dc38899 100644
--- a/test/cypress/integration/vnComponent/vnLocation.spec.js
+++ b/test/cypress/integration/vnComponent/vnLocation.spec.js
@@ -48,6 +48,25 @@ describe('VnLocation', () => {
                 `${createForm.prefix} > :nth-child(4) > .q-field:nth-child(3)> ${createForm.sufix}`
             ).should('have.length', 1);
         });
+        it('should pass selected country', () => {
+            // Select a country
+            const country = 'Ecuador';
+            const province = 'Province five';
+            cy.selectOption(
+                `${createForm.prefix} > :nth-child(5) > .q-field:nth-child(5)> ${createForm.sufix}`,
+                country
+            );
+            cy.selectOption(
+                `${createForm.prefix} > :nth-child(4) > .q-select > ${createForm.sufix}`,
+                province
+            );
+            cy.get(
+                `${createForm.prefix} > :nth-child(4) > .q-select > ${createForm.sufix} > :nth-child(3) > .q-icon`
+            ).click();
+            cy.get(
+                `#q-portal--dialog--4 > .q-dialog > ${createForm.prefix} > .vn-row > .q-select > ${createForm.sufix} > :nth-child(1) input`
+            ).should('have.value', province);
+        });
     });
     describe('Worker Create', () => {
         beforeEach(() => {

From 10bada746348c41c252db683a5f03c7cfb491ac0 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Tue, 1 Oct 2024 06:52:19 +0200
Subject: [PATCH 233/281] fix: deleted useless button

---
 src/pages/Zone/Card/ZoneEvents.vue | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/src/pages/Zone/Card/ZoneEvents.vue b/src/pages/Zone/Card/ZoneEvents.vue
index 32a7db4c4..3452849bc 100644
--- a/src/pages/Zone/Card/ZoneEvents.vue
+++ b/src/pages/Zone/Card/ZoneEvents.vue
@@ -44,23 +44,6 @@ onUnmounted(() => (stateStore.rightDrawer = false));
 </script>
 
 <template>
-    <template v-if="stateStore.isHeaderMounted()">
-        <Teleport to="#actions-append">
-            <div class="row q-gutter-x-sm">
-                <QBtn
-                    flat
-                    @click="stateStore.toggleRightDrawer()"
-                    round
-                    dense
-                    icon="dock_to_left"
-                >
-                    <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">
             <ZoneEventsPanel

From 778e6299cea5f2c1bdb32749fd39068ce8e07bd4 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 1 Oct 2024 08:57:04 +0200
Subject: [PATCH 234/281] fix: solve conflicts from test to dev

---
 src/components/VnTable/VnTable.vue            | 14 ++++-
 src/components/common/VnLocation.vue          |  2 +
 src/components/common/VnLog.vue               |  1 +
 src/pages/Customer/Card/CustomerBasicData.vue |  1 +
 .../Customer/Card/CustomerFiscalData.vue      |  1 +
 src/pages/Customer/Card/CustomerSummary.vue   |  1 +
 src/pages/Customer/CustomerList.vue           |  3 +-
 .../Customer/Defaulter/CustomerDefaulter.vue  |  7 ---
 src/pages/Entry/EntryStockBoughtFilter.vue    | 63 -------------------
 .../Supplier/Card/SupplierAddressesCreate.vue |  1 +
 .../Supplier/Card/SupplierFiscalData.vue      |  1 +
 src/pages/Ticket/Card/TicketSummary.vue       | 34 ++++++----
 src/pages/Worker/WorkerList.vue               |  1 +
 src/router/modules/entry.js                   |  9 ---
 .../integration/entry/stockBought.spec.js     | 39 ------------
 15 files changed, 43 insertions(+), 135 deletions(-)
 delete mode 100644 src/pages/Entry/EntryStockBoughtFilter.vue
 delete mode 100644 test/cypress/integration/entry/stockBought.spec.js

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 861a79432..3bcd91b1f 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -317,8 +317,8 @@ defineExpose({
     params,
 });
 
-function handleOnDataSaved(_) {
-    if (_.onDataSaved) _.onDataSaved(this);
+function handleOnDataSaved(_, res) {
+    if (_.onDataSaved) _.onDataSaved({ CrudModelRef: CrudModelRef.value });
     else $props.create.onDataSaved(_);
 }
 </script>
@@ -771,6 +771,16 @@ es:
     color: var(--vn-text-color);
 }
 
+.q-table--dark .q-table__bottom,
+.q-table--dark thead,
+.q-table--dark tr {
+    border-color: var(--vn-section-color);
+}
+
+.q-table__container > div:first-child {
+    background-color: var(--vn-page-color);
+}
+
 .grid-three {
     display: grid;
     grid-template-columns: repeat(auto-fit, minmax(400px, max-content));
diff --git a/src/components/common/VnLocation.vue b/src/components/common/VnLocation.vue
index 633d32b85..ffbc7a656 100644
--- a/src/components/common/VnLocation.vue
+++ b/src/components/common/VnLocation.vue
@@ -37,9 +37,11 @@ const locationProperties = [
             : null,
     (obj) => obj.country?.name,
 ];
+
 const modelValue = ref(
     props.location ? formatLocation(props.location, locationProperties) : null
 );
+
 function showLabel(data) {
     const dataProperties = [
         'code',
diff --git a/src/components/common/VnLog.vue b/src/components/common/VnLog.vue
index ab522cfde..8c71c0997 100644
--- a/src/components/common/VnLog.vue
+++ b/src/components/common/VnLog.vue
@@ -406,6 +406,7 @@ watch(
         :skeleton="false"
         auto-load
         @on-fetch="setLogTree"
+        search-url="logs"
     >
         <template #body>
             <div
diff --git a/src/pages/Customer/Card/CustomerBasicData.vue b/src/pages/Customer/Card/CustomerBasicData.vue
index 79ae79ad9..d31669b43 100644
--- a/src/pages/Customer/Card/CustomerBasicData.vue
+++ b/src/pages/Customer/Card/CustomerBasicData.vue
@@ -18,6 +18,7 @@ const contactChannels = ref([]);
 const title = ref();
 const handleSalesModelValue = (val) => ({
     or: [
+        { id: val },
         { name: val },
         { nickname: { like: '%' + val + '%' } },
         { code: { like: `${val}%` } },
diff --git a/src/pages/Customer/Card/CustomerFiscalData.vue b/src/pages/Customer/Card/CustomerFiscalData.vue
index 300d275c0..1f5775715 100644
--- a/src/pages/Customer/Card/CustomerFiscalData.vue
+++ b/src/pages/Customer/Card/CustomerFiscalData.vue
@@ -93,6 +93,7 @@ function handleLocation(data, location) {
             <VnRow>
                 <VnLocation
                     :rules="validate('Worker.postcode')"
+                    :roles-allowed-to-create="['deliveryAssistant', 'administrative']"
                     :acls="[{ model: 'Town', props: '*', accessType: 'WRITE' }]"
                     :location="data"
                     @update:model-value="(location) => handleLocation(data, location)"
diff --git a/src/pages/Customer/Card/CustomerSummary.vue b/src/pages/Customer/Card/CustomerSummary.vue
index f049426e2..8b5f0f2c2 100644
--- a/src/pages/Customer/Card/CustomerSummary.vue
+++ b/src/pages/Customer/Card/CustomerSummary.vue
@@ -13,6 +13,7 @@ import VnTitle from 'src/components/common/VnTitle.vue';
 import VnRow from 'src/components/ui/VnRow.vue';
 const route = useRoute();
 const { t } = useI18n();
+const grafanaUrl = 'https://grafana.verdnatura.es';
 
 const $props = defineProps({
     id: {
diff --git a/src/pages/Customer/CustomerList.vue b/src/pages/Customer/CustomerList.vue
index 5e24a1c2d..63f5149e8 100644
--- a/src/pages/Customer/CustomerList.vue
+++ b/src/pages/Customer/CustomerList.vue
@@ -429,10 +429,9 @@ function handleLocation(data, location) {
                 :params="{
                     departmentCodes: ['VT', 'shopping'],
                 }"
-                option-label="nickname"
-                option-value="id"
                 :fields="['id', 'nickname']"
                 sort-by="nickname ASC"
+                :use-like="false"
                 emit-value
                 auto-load
             >
diff --git a/src/pages/Customer/Defaulter/CustomerDefaulter.vue b/src/pages/Customer/Defaulter/CustomerDefaulter.vue
index 11f6362f8..7b9cb67f7 100644
--- a/src/pages/Customer/Defaulter/CustomerDefaulter.vue
+++ b/src/pages/Customer/Defaulter/CustomerDefaulter.vue
@@ -3,7 +3,6 @@ import { ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
 import { toCurrency, toDate, dateRange } from 'filters/index';
-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';
@@ -11,7 +10,6 @@ import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import CustomerDefaulterAddObservation from './CustomerDefaulterAddObservation.vue';
 import DepartmentDescriptorProxy from 'src/pages/Department/Card/DepartmentDescriptorProxy.vue';
-import RightMenu from 'src/components/common/RightMenu.vue';
 import VnTable from 'src/components/VnTable/VnTable.vue';
 
 const { t } = useI18n();
@@ -192,11 +190,6 @@ function exprBuilder(param, value) {
 </script>
 
 <template>
-    <RightMenu>
-        <template #right-panel>
-            <CustomerNotificationsFilter data-key="CustomerDefaulter" />
-        </template>
-    </RightMenu>
     <VnSubToolbar>
         <template #st-data>
             <CustomerBalanceDueTotal :amount="balanceDueTotal" />
diff --git a/src/pages/Entry/EntryStockBoughtFilter.vue b/src/pages/Entry/EntryStockBoughtFilter.vue
deleted file mode 100644
index 7694cfe6c..000000000
--- a/src/pages/Entry/EntryStockBoughtFilter.vue
+++ /dev/null
@@ -1,63 +0,0 @@
-<script setup>
-import { useI18n } from 'vue-i18n';
-import { onMounted } from 'vue';
-import { useStateStore } from 'stores/useStateStore';
-
-import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
-import VnInputDate from 'src/components/common/VnInputDate.vue';
-
-const { t } = useI18n();
-const props = defineProps({
-    dataKey: {
-        type: String,
-        required: true,
-    },
-});
-const stateStore = useStateStore();
-const emit = defineEmits(['set-user-params']);
-const setUserParams = (params) => {
-    emit('set-user-params', params);
-};
-onMounted(async () => {
-    stateStore.rightDrawer = true;
-});
-</script>
-
-<template>
-    <VnFilterPanel
-        :data-key="props.dataKey"
-        :search-button="true"
-        search-url="table"
-        @set-user-params="setUserParams"
-    >
-        <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 }">
-            <QItem class="q-my-sm">
-                <QItemSection>
-                    <VnInputDate
-                        id="date"
-                        v-model="params.dated"
-                        :label="t('Date')"
-                        is-outlined
-                    />
-                </QItemSection>
-            </QItem>
-        </template>
-    </VnFilterPanel>
-</template>
-<i18n>
-    en:
-        params:
-            dated: Date
-            workerFk: Worker
-    es:
-        Date: Fecha
-        params:
-            dated: Date
-            workerFk: Trabajador
-</i18n>
diff --git a/src/pages/Supplier/Card/SupplierAddressesCreate.vue b/src/pages/Supplier/Card/SupplierAddressesCreate.vue
index 290373039..0feceb74a 100644
--- a/src/pages/Supplier/Card/SupplierAddressesCreate.vue
+++ b/src/pages/Supplier/Card/SupplierAddressesCreate.vue
@@ -84,6 +84,7 @@ function handleLocation(data, location) {
                 <VnRow>
                     <VnLocation
                         :rules="validate('Worker.postcode')"
+                        :roles-allowed-to-create="['deliveryAssistant']"
                         :acls="[{ model: 'Town', props: '*', accessType: 'WRITE' }]"
                         :location="
                             data.postalCode
diff --git a/src/pages/Supplier/Card/SupplierFiscalData.vue b/src/pages/Supplier/Card/SupplierFiscalData.vue
index 553fc0f94..396cf15a2 100644
--- a/src/pages/Supplier/Card/SupplierFiscalData.vue
+++ b/src/pages/Supplier/Card/SupplierFiscalData.vue
@@ -146,6 +146,7 @@ function handleLocation(data, location) {
             <VnRow>
                 <VnLocation
                     :rules="validate('Worker.postcode')"
+                    :roles-allowed-to-create="['deliveryAssistant', 'administrative']"
                     :acls="[{ model: 'Town', props: '*', accessType: 'WRITE' }]"
                     :location="{
                         postcode: data.postCode,
diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index b6a60122c..2ca0b5727 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -1,7 +1,7 @@
 <script setup>
 import RouteDescriptorProxy from 'pages/Route/Card/RouteDescriptorProxy.vue';
 import { onMounted, ref, computed } from 'vue';
-import { useRoute, useRouter } from 'vue-router';
+import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import axios from 'axios';
 import { dashIfEmpty, toDate, toCurrency } from 'src/filters';
@@ -12,6 +12,8 @@ import InvoiceOutDescriptorProxy from 'pages/InvoiceOut/Card/InvoiceOutDescripto
 import VnLv from 'src/components/ui/VnLv.vue';
 import VnLinkPhone from 'src/components/ui/VnLinkPhone.vue';
 import { getUrl } from 'src/composables/getUrl';
+import useNotify from 'src/composables/useNotify.js';
+import { useArrayData } from 'composables/useArrayData';
 import VnUserLink from 'src/components/ui/VnUserLink.vue';
 import VnTitle from 'src/components/common/VnTitle.vue';
 import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
@@ -19,8 +21,7 @@ import ZoneDescriptorProxy from 'src/pages/Zone/Card/ZoneDescriptorProxy.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 
 const route = useRoute();
-const router = useRouter();
-
+const { notify } = useNotify();
 const { t } = useI18n();
 
 const $props = defineProps({
@@ -38,6 +39,8 @@ const ticket = computed(() => summaryRef.value?.entity);
 const editableStates = ref([]);
 const ticketUrl = ref();
 const grafanaUrl = 'https://grafana.verdnatura.es';
+const stateBtnDropdownRef = ref();
+const descriptorData = useArrayData('ticketData');
 
 onMounted(async () => {
     ticketUrl.value = (await getUrl('ticket/')) + entityId.value + '/';
@@ -64,15 +67,19 @@ function isEditable() {
 }
 
 async function changeState(value) {
-    if (!ticket.value.id) return;
-
-    const formData = {
-        ticketFk: ticket.value.id,
-        code: value,
-    };
-
-    await axios.post(`Tickets/state`, formData);
-    router.go(route.fullPath);
+    try {
+        stateBtnDropdownRef.value.hide();
+        const formData = {
+            ticketFk: entityId.value,
+            code: value,
+        };
+        await axios.post(`Tickets/state`, formData);
+        notify('globals.dataSaved', 'positive');
+        summaryRef.value?.fetch();
+        descriptorData.fetch({});
+    } catch (err) {
+        console.error('Error changing ticket state', err);
+    }
 }
 
 function getNoteValue(description) {
@@ -125,6 +132,7 @@ function toTicketUrl(section) {
         </template>
         <template #header-right>
             <QBtnDropdown
+                ref="stateBtnDropdownRef"
                 color="black"
                 text-color="white"
                 :label="t('ticket.summary.changeState')"
@@ -137,7 +145,7 @@ function toTicketUrl(section) {
                     option-value="code"
                     hide-dropdown-icon
                     focus-on-mount
-                    @update:model-value="changeState(item.code)"
+                    @update:model-value="changeState"
                 />
             </QBtnDropdown>
         </template>
diff --git a/src/pages/Worker/WorkerList.vue b/src/pages/Worker/WorkerList.vue
index 4c9964c0b..6b3b117b6 100644
--- a/src/pages/Worker/WorkerList.vue
+++ b/src/pages/Worker/WorkerList.vue
@@ -262,6 +262,7 @@ async function autofillBic(worker) {
                 </VnRow>
                 <VnRow>
                     <VnLocation
+                        :roles-allowed-to-create="['deliveryAssistant']"
                         :acls="[{ model: 'Town', props: '*', accessType: 'WRITE' }]"
                         :options="postcodesOptions"
                         @update:model-value="(location) => handleLocation(data, location)"
diff --git a/src/router/modules/entry.js b/src/router/modules/entry.js
index 76b4a6e23..d66ea0e0c 100644
--- a/src/router/modules/entry.js
+++ b/src/router/modules/entry.js
@@ -58,15 +58,6 @@ export default {
                     },
                     component: () => import('src/pages/Entry/EntryLatestBuys.vue'),
                 },
-                {
-                    path: 'stock-bought',
-                    name: 'EntryStockBought',
-                    meta: {
-                        title: 'reserves',
-                        icon: 'deployed_code_history',
-                    },
-                    component: () => import('src/pages/Entry/EntryStockBought.vue'),
-                },
             ],
         },
         {
diff --git a/test/cypress/integration/entry/stockBought.spec.js b/test/cypress/integration/entry/stockBought.spec.js
deleted file mode 100644
index 66e06b79e..000000000
--- a/test/cypress/integration/entry/stockBought.spec.js
+++ /dev/null
@@ -1,39 +0,0 @@
-describe('EntryStockBought', () => {
-    beforeEach(() => {
-        cy.viewport(1920, 1080);
-        cy.login('buyer');
-        cy.visit(`/#/entry/stock-Bought`);
-    });
-    it('Should edit the reserved space', () => {
-        cy.get('.q-field__native.q-placeholder').should('have.value', '01/01/2001');
-        cy.get('input[name="reserve"]').type('10{enter}');
-        cy.get('button[title="Save"]').click();
-        cy.get('.q-notification__message').should('have.text', 'Data saved');
-    });
-    it('Should add a new reserved space for buyerBoss', () => {
-        cy.get('.q-page-sticky > div > .q-btn > .q-btn__content > .q-icon').click();
-        cy.get('input[aria-label="Reserve"]').type('1');
-        cy.get('input[aria-label="Date"]').eq(1).clear();
-        cy.get('input[aria-label="Date"]').eq(1).type('01-01');
-        cy.get('input[aria-label="Buyer"]').type('buyerboss{downarrow}{enter}');
-        cy.get('.q-notification__message').should('have.text', 'Data created');
-    });
-    it('Should check detail for the buyer', () => {
-        cy.get(':nth-child(1) > .sticky > .q-btn > .q-btn__content > .q-icon').click();
-        cy.get('tBody > tr').eq(1).its('length').should('eq', 1);
-    });
-    it('Should check detail for the buyerBoss and had no content', () => {
-        cy.get(':nth-child(2) > .sticky > .q-btn > .q-btn__content > .q-icon').click();
-        cy.get('.q-table__bottom.row.items-center.q-table__bottom--nodata').should(
-            'have.text',
-            'warningNo data available'
-        );
-    });
-    it('Should edit travel m3 and refresh', () => {
-        cy.get('.vn-row > div > .q-btn > .q-btn__content > .q-icon').click();
-        cy.get('input[aria-label="m3"]').clear();
-        cy.get('input[aria-label="m3"]').type('60');
-        cy.get('.q-mt-lg > .q-btn--standard > .q-btn__content > .block').click();
-        cy.get('.vn-row > div > :nth-child(2)').should('have.text', '60');
-    });
-});

From e9364f69d416edb211d23a613a4289e603887b31 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 1 Oct 2024 10:03:14 +0200
Subject: [PATCH 235/281] feat: #7679 show tooltips

---
 src/components/CreateNewPostcodeForm.vue | 2 ++
 src/components/VnSelectProvince.vue      | 2 ++
 src/components/common/VnLocation.vue     | 3 +++
 3 files changed, 7 insertions(+)

diff --git a/src/components/CreateNewPostcodeForm.vue b/src/components/CreateNewPostcodeForm.vue
index 396a7ebc8..2f0534b1e 100644
--- a/src/components/CreateNewPostcodeForm.vue
+++ b/src/components/CreateNewPostcodeForm.vue
@@ -156,6 +156,7 @@ async function handleCountries(data) {
                 <VnSelectDialog
                     :label="t('City')"
                     @update:model-value="(value) => setTown(value, data)"
+                    :tooltip="t('Create city')"
                     v-model="data.townFk"
                     :options="townsOptions"
                     option-label="name"
@@ -216,6 +217,7 @@ async function handleCountries(data) {
 <i18n>
 es:
     New postcode: Nuevo código postal
+    Create city: Crear población
     Please, ensure you put the correct data!: ¡Por favor, asegúrese de poner los datos correctos!
     City: Población
     Province: Provincia
diff --git a/src/components/VnSelectProvince.vue b/src/components/VnSelectProvince.vue
index 9eef125cc..606799e50 100644
--- a/src/components/VnSelectProvince.vue
+++ b/src/components/VnSelectProvince.vue
@@ -56,6 +56,7 @@ async function handleProvinces(data) {
     <VnSelectDialog
         :label="t('Province')"
         :options="$props.provinces"
+        :tooltip="t('Create province')"
         hide-selected
         v-model="provinceFk"
         :rules="validate && validate('postcode.provinceFk')"
@@ -80,4 +81,5 @@ async function handleProvinces(data) {
 <i18n>
     es:
         Province: Provincia
+        Create province: Crear provincia
 </i18n>
diff --git a/src/components/common/VnLocation.vue b/src/components/common/VnLocation.vue
index 633d32b85..31c4f2cd5 100644
--- a/src/components/common/VnLocation.vue
+++ b/src/components/common/VnLocation.vue
@@ -70,6 +70,7 @@ const handleModelValue = (data) => {
         v-bind="$attrs"
         clearable
         :emit-value="false"
+        :tooltip="t('Create new location')"
     >
         <template #form>
             <CreateNewPostcode
@@ -102,7 +103,9 @@ const handleModelValue = (data) => {
 <i18n>
 en:
     search_by_postalcode: Search by postalcode, town, province or country
+    Create new location: Create new location
 es:
     Location: Ubicación
+    Create new location: Crear nueva ubicación
     search_by_postalcode: Buscar por código postal, ciudad o país
 </i18n>

From d6efd21db63df0deb84c3d66b6da5177a40b6f71 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 1 Oct 2024 10:03:39 +0200
Subject: [PATCH 236/281] style: remove space between value and label

---
 src/components/common/VnInput.vue | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/components/common/VnInput.vue b/src/components/common/VnInput.vue
index f389ca842..d93ad7465 100644
--- a/src/components/common/VnInput.vue
+++ b/src/components/common/VnInput.vue
@@ -140,12 +140,6 @@ const mixinRules = [
 .q-field__control {
     height: unset;
 }
-.q-field__control.relative-position.row.no-wrap
-    > .q-field__control-container
-    > input.q-field__native
-    ~ div.q-field__label {
-    height: 41px;
-}
 
 .q-field--labeled {
     .q-field__native,

From 8fa82c818d9fa31492e59f5682295df4f7b2efe3 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 1 Oct 2024 10:04:56 +0200
Subject: [PATCH 237/281] fix: remove limit

---
 src/components/CreateNewPostcodeForm.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/CreateNewPostcodeForm.vue b/src/components/CreateNewPostcodeForm.vue
index 2f0534b1e..99cba5360 100644
--- a/src/components/CreateNewPostcodeForm.vue
+++ b/src/components/CreateNewPostcodeForm.vue
@@ -131,7 +131,6 @@ async function handleCountries(data) {
     <FetchData
         ref="townsFetchDataRef"
         @on-fetch="handleTowns"
-        :limit="30"
         auto-load
         url="Towns/location"
     />

From e64e6eefe3a17bf1e3d393140b401708dbeda69d Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Tue, 1 Oct 2024 10:35:31 +0200
Subject: [PATCH 238/281] refs #7355 add role

---
 src/components/ui/VnSearchbar.vue      |  1 +
 src/pages/Account/AccountList.vue      | 24 +++++++++++++++++++++---
 src/pages/Account/Card/AccountCard.vue |  3 +++
 3 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/src/components/ui/VnSearchbar.vue b/src/components/ui/VnSearchbar.vue
index a78403b5c..dc6d4751c 100644
--- a/src/components/ui/VnSearchbar.vue
+++ b/src/components/ui/VnSearchbar.vue
@@ -108,6 +108,7 @@ async function search() {
             ...Object.fromEntries(staticParams),
             search: searchText.value,
         },
+        ...{ filter: props.filter },
     };
 
     if (props.whereFilter) {
diff --git a/src/pages/Account/AccountList.vue b/src/pages/Account/AccountList.vue
index d698596b9..1beac0d0b 100644
--- a/src/pages/Account/AccountList.vue
+++ b/src/pages/Account/AccountList.vue
@@ -9,7 +9,9 @@ import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
 const tableRef = ref();
-
+const filter = {
+    include: { relation: 'role', scope: { fields: ['id', 'name'] } },
+};
 const columns = computed(() => [
     {
         align: 'left',
@@ -29,7 +31,22 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        name: 'username',
+        name: 'roleFk',
+        label: t('role'),
+        columnFilter: {
+            component: 'select',
+            name: 'roleFk',
+            attrs: {
+                url: 'VnRoles',
+                optionValue: 'id',
+                optionLabel: 'name',
+            },
+        },
+        format: ({ role }, dashIfEmpty) => dashIfEmpty(role?.name),
+    },
+    {
+        align: 'left',
+        name: 'nickname',
         label: t('Nickname'),
         isTitle: true,
         component: 'input',
@@ -104,12 +121,13 @@ const exprBuilder = (param, value) => {
         :expr-builder="exprBuilder"
         :label="t('account.search')"
         :info="t('account.searchInfo')"
+        :filter="filter"
     />
-
     <VnTable
         ref="tableRef"
         data-key="AccountUsers"
         url="VnUsers/preview"
+        :filter="filter"
         order="id DESC"
         :columns="columns"
         default-mode="table"
diff --git a/src/pages/Account/Card/AccountCard.vue b/src/pages/Account/Card/AccountCard.vue
index 67fa15898..5ba2415c4 100644
--- a/src/pages/Account/Card/AccountCard.vue
+++ b/src/pages/Account/Card/AccountCard.vue
@@ -11,6 +11,9 @@ const { t } = useI18n();
         data-key="Account"
         :descriptor="AccountDescriptor"
         search-data-key="AccountUsers"
+        :filter="{
+            include: { relation: 'role', scope: { fields: ['id', 'name'] } },
+        }"
         :searchbar-props="{
             url: 'VnUsers/preview',
             label: t('account.search'),

From de01dda2ed5b61ad30fcbf7ce972dfdee22a3007 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Tue, 1 Oct 2024 11:32:15 +0200
Subject: [PATCH 239/281] refactor: refs #7884 modified icon color

---
 src/pages/Entry/MyEntries.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/Entry/MyEntries.vue b/src/pages/Entry/MyEntries.vue
index b95c73847..07cedd69b 100644
--- a/src/pages/Entry/MyEntries.vue
+++ b/src/pages/Entry/MyEntries.vue
@@ -99,6 +99,7 @@ const columns = computed(() => [
             {
                 title: t('printLabels'),
                 icon: 'print',
+                isPrimary: true,
                 action: (row) => printBuys(row.id),
             },
         ],

From 696c9ca9b35ed4e9ea0311a8d8f60909161661e3 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 1 Oct 2024 11:40:29 +0200
Subject: [PATCH 240/281] fix: solve conflicts with stockBought

---
 src/pages/Entry/EntryStockBought.vue          | 300 ++++++++++++++++++
 src/pages/Entry/EntryStockBoughtDetail.vue    | 126 ++++++++
 src/pages/Entry/EntryStockBoughtFilter.vue    |  63 ++++
 src/router/modules/entry.js                   |   9 +
 .../integration/entry/stockBought.spec.js     |  39 +++
 5 files changed, 537 insertions(+)
 create mode 100644 src/pages/Entry/EntryStockBought.vue
 create mode 100644 src/pages/Entry/EntryStockBoughtDetail.vue
 create mode 100644 src/pages/Entry/EntryStockBoughtFilter.vue
 create mode 100644 test/cypress/integration/entry/stockBought.spec.js

diff --git a/src/pages/Entry/EntryStockBought.vue b/src/pages/Entry/EntryStockBought.vue
new file mode 100644
index 000000000..0e8013586
--- /dev/null
+++ b/src/pages/Entry/EntryStockBought.vue
@@ -0,0 +1,300 @@
+<script setup>
+import { ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useState } from 'src/composables/useState';
+import { useQuasar } from 'quasar';
+
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
+import FetchData from 'components/FetchData.vue';
+import FormModelPopup from 'components/FormModelPopup.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import RightMenu from 'src/components/common/RightMenu.vue';
+import EntryStockBoughtFilter from './EntryStockBoughtFilter.vue';
+import VnTable from 'components/VnTable/VnTable.vue';
+import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
+import EntryStockBoughtDetail from 'src/pages/Entry/EntryStockBoughtDetail.vue';
+
+const { t } = useI18n();
+const quasar = useQuasar();
+const state = useState();
+const user = state.getUser();
+const columns = [
+    {
+        align: 'left',
+        label: 'Id',
+        name: 'id',
+        isId: true,
+        columnFilter: false,
+        visible: false,
+    },
+    {
+        align: 'left',
+        name: 'workerFk',
+        label: t('Buyer'),
+        isTitle: true,
+        component: 'select',
+        cardVisible: true,
+        create: true,
+        attrs: {
+            url: 'Workers/activeWithInheritedRole',
+            fields: ['id', 'name'],
+            where: { role: 'buyer' },
+            optionFilter: 'firstName',
+            optionLabel: 'name',
+            optionValue: 'id',
+            useLike: false,
+        },
+    },
+    {
+        align: 'center',
+        label: t('Reserve'),
+        name: 'reserve',
+        columnFilter: false,
+        create: true,
+        component: 'number',
+        summation: true,
+    },
+    {
+        align: 'center',
+        label: t('Bought'),
+        name: 'bought',
+        summation: true,
+        cardVisible: true,
+        columnFilter: false,
+    },
+    {
+        align: 'left',
+        label: t('Date'),
+        name: 'dated',
+        component: 'date',
+        visible: false,
+        create: true,
+    },
+    {
+        align: 'left',
+        name: 'tableActions',
+        actions: [
+            {
+                title: t('View more details'),
+                icon: 'search',
+                isPrimary: true,
+                action: (row) => {
+                    quasar.dialog({
+                        component: EntryStockBoughtDetail,
+                        componentProps: {
+                            workerFk: row.workerFk,
+                            dated: userParams.value.dated,
+                        },
+                    });
+                },
+            },
+        ],
+    },
+];
+
+const fetchDataRef = ref();
+const travelDialogRef = ref(false);
+const tableRef = ref();
+const travel = ref(null);
+const userParams = ref({
+    dated: Date.vnNew(),
+});
+
+const filter = ref({
+    fields: ['id', 'm3', 'warehouseInFk'],
+    include: [
+        {
+            relation: 'warehouseIn',
+            scope: {
+                fields: ['code'],
+            },
+        },
+    ],
+    where: {
+        shipped: (userParams.value.dated
+            ? new Date(userParams.value.dated)
+            : Date.vnNew()
+        ).setHours(0, 0, 0, 0),
+        m3: { neq: null },
+    },
+});
+
+const setUserParams = async ({ dated }) => {
+    const shipped = (dated ? new Date(dated) : Date.vnNew()).setHours(0, 0, 0, 0);
+    filter.value.where.shipped = shipped;
+    fetchDataRef.value?.fetch();
+};
+
+function openDialog() {
+    travelDialogRef.value = true;
+}
+
+function setFooter(data) {
+    const footer = {
+        bought: 0,
+        reserve: 0,
+    };
+    data.forEach((row) => {
+        footer.bought += row?.bought;
+        footer.reserve += row?.reserve;
+    });
+    tableRef.value.footer = footer;
+}
+
+function round(value) {
+    return Math.round(value * 100) / 100;
+}
+</script>
+<template>
+    <VnSubToolbar>
+        <template #st-data>
+            <FetchData
+                ref="fetchDataRef"
+                url="Travels"
+                auto-load
+                :filter="filter"
+                @on-fetch="
+                    (data) => {
+                        travel = data.find(
+                            (data) => data.warehouseIn.code.toLowerCase() === 'vnh'
+                        );
+                    }
+                "
+            />
+            <VnRow class="travel">
+                <div v-if="travel">
+                    <span style="color: var(--vn-label-color)">
+                        {{ t('Booked trucks') }}:
+                    </span>
+                    <span>
+                        {{ travel?.m3 }}
+                    </span>
+                    <QBtn
+                        v-if="travel?.m3"
+                        style="max-width: 20%"
+                        flat
+                        icon="edit"
+                        @click="openDialog()"
+                        :title="t('Edit travel')"
+                        color="primary"
+                    />
+                </div>
+            </VnRow>
+        </template>
+    </VnSubToolbar>
+    <QDialog v-model="travelDialogRef" :maximized="true" :class="['vn-row', 'wrap']">
+        <FormModelPopup
+            :url-update="`Travels/${travel?.id}`"
+            model="travel"
+            :title="t('Travel m3')"
+            :form-initial-data="{ id: travel?.id, m3: travel?.m3 }"
+            @on-data-saved="fetchDataRef.fetch()"
+        >
+            <template #form-inputs="{ data }">
+                <VnInput
+                    v-model="data.id"
+                    :label="t('id')"
+                    type="number"
+                    disable
+                    readonly
+                />
+                <VnInput v-model="data.m3" :label="t('m3')" type="number" />
+            </template>
+        </FormModelPopup>
+    </QDialog>
+    <RightMenu>
+        <template #right-panel>
+            <EntryStockBoughtFilter
+                data-key="StockBoughts"
+                @set-user-params="setUserParams"
+            />
+        </template>
+    </RightMenu>
+    <div class="table-container">
+        <div class="column items-center">
+            <VnTable
+                ref="tableRef"
+                data-key="StockBoughts"
+                url="StockBoughts/getStockBought"
+                save-url="StockBoughts/crud"
+                order="reserve DESC"
+                :right-search="false"
+                :is-editable="true"
+                @on-fetch="(data) => setFooter(data)"
+                :create="{
+                    urlCreate: 'StockBoughts',
+                    title: t('Reserve some space'),
+                    onDataSaved: () => tableRef.reload(),
+                    formInitialData: {
+                        workerFk: user.id,
+                        dated: Date.vnNow(),
+                    },
+                }"
+                :columns="columns"
+                :user-params="userParams"
+                :footer="true"
+                table-height="80vh"
+                auto-load
+            >
+                <template #column-workerFk="{ row }">
+                    <span class="link" @click.stop>
+                        {{ row?.worker?.user?.name }}
+                        <WorkerDescriptorProxy :id="row?.workerFk" />
+                    </span>
+                </template>
+                <template #column-bought="{ row }">
+                    <span :class="{ 'text-negative': row.reserve < row.bought }">
+                        {{ row?.bought }}
+                    </span>
+                </template>
+                <template #column-footer-reserve>
+                    <span>
+                        {{ round(tableRef.footer.reserve) }}
+                    </span>
+                </template>
+                <template #column-footer-bought>
+                    <span
+                        :class="{
+                            'text-negative':
+                                tableRef.footer.reserve < tableRef.footer.bought,
+                        }"
+                    >
+                        {{ round(tableRef.footer.bought) }}
+                    </span>
+                </template>
+            </VnTable>
+        </div>
+    </div>
+</template>
+<style lang="scss" scoped>
+.travel {
+    margin-bottom: 0px;
+}
+.table-container {
+    display: flex;
+    justify-content: center;
+}
+.column {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    width: 35%;
+}
+.text-negative {
+    color: $negative !important;
+}
+</style>
+<i18n>
+    es:
+        Edit travel: Editar envío
+        Travel: Envíos
+        Booked trucks: Camiones reservados
+        Buyer: Comprador
+        Reserve: Reservado
+        Bought: Comprado
+        Date: Fecha
+        View more details: Ver más detalles
+        Reserve some space: Reservar espacio
+        This buyer has already made a reservation for this date: Este comprador ya ha hecho una reserva para esta fecha 
+</i18n>
diff --git a/src/pages/Entry/EntryStockBoughtDetail.vue b/src/pages/Entry/EntryStockBoughtDetail.vue
new file mode 100644
index 000000000..0fd775ee6
--- /dev/null
+++ b/src/pages/Entry/EntryStockBoughtDetail.vue
@@ -0,0 +1,126 @@
+<script setup>
+import { ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import VnTable from 'components/VnTable/VnTable.vue';
+import EntryDescriptorProxy from 'src/pages/Entry/Card/EntryDescriptorProxy.vue';
+import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
+
+const { t } = useI18n();
+const tableRef = ref();
+const $props = defineProps({
+    workerFk: {
+        type: Number,
+        required: true,
+    },
+    dated: {
+        type: Date,
+        required: true,
+    },
+});
+const customUrl = `StockBoughts/getStockBoughtDetail?workerFk=${$props.workerFk}&date=${$props.dated}`;
+const columns = [
+    {
+        align: 'left',
+        label: t('Entry'),
+        name: 'entryFk',
+        isTitle: true,
+        isId: true,
+        columnFilter: false,
+    },
+    {
+        align: 'left',
+        name: 'itemFk',
+        label: t('Item'),
+        columnFilter: false,
+    },
+    {
+        align: 'left',
+        label: t('Name'),
+        name: 'itemName',
+        create: true,
+        columnClass: 'expand',
+        columnFilter: false,
+        cardVisible: true,
+    },
+    {
+        align: 'left',
+        name: 'volume',
+        label: t('Volume'),
+        columnFilter: false,
+        cardVisible: true,
+    },
+    {
+        align: 'left',
+        label: t('Packaging'),
+        name: 'packagingFk',
+        columnFilter: false,
+        cardVisible: true,
+    },
+    {
+        align: 'left',
+        label: 'Packing',
+        name: 'packing',
+        columnFilter: false,
+        cardVisible: true,
+    },
+];
+</script>
+<template>
+    <QDialog>
+        <div class="container">
+            <VnTable
+                ref="tableRef"
+                data-key="StockBoughtsDetail"
+                :url="customUrl"
+                order="itemName DESC"
+                :columns="columns"
+                :right-search="false"
+                :disable-infinite-scroll="true"
+                :disable-option="{ card: true }"
+                :limit="0"
+                auto-load
+            >
+                <template #column-entryFk="{ row }">
+                    <span class="link">
+                        {{ row?.entryFk }}
+                        <EntryDescriptorProxy :id="row.entryFk" />
+                    </span>
+                </template>
+                <template #column-itemName="{ row }">
+                    <span class="link">
+                        {{ row?.itemName }}
+                        <ItemDescriptorProxy :id="row.itemFk" />
+                    </span>
+                </template>
+            </VnTable>
+        </div>
+    </QDialog>
+</template>
+<style lang="css" scoped>
+.container {
+    max-width: 50vw;
+    overflow: auto;
+    justify-content: center;
+    align-items: center;
+    margin: auto;
+    background-color: var(--vn-section-color);
+    padding: 4px;
+}
+.container > div > div > .q-table__top.relative-position.row.items-center {
+    background-color: red !important;
+}
+</style>
+<i18n>
+    es:
+        Buyer: Comprador
+        Reserve: Reservado
+        Bought: Comprado
+        More: Más
+        Date: Fecha
+        Entry: Entrada
+        Item: Artículo
+        Name: Nombre
+        Volume: Volumen
+        Packaging: Embalage 
+</i18n>
diff --git a/src/pages/Entry/EntryStockBoughtFilter.vue b/src/pages/Entry/EntryStockBoughtFilter.vue
new file mode 100644
index 000000000..7694cfe6c
--- /dev/null
+++ b/src/pages/Entry/EntryStockBoughtFilter.vue
@@ -0,0 +1,63 @@
+<script setup>
+import { useI18n } from 'vue-i18n';
+import { onMounted } from 'vue';
+import { useStateStore } from 'stores/useStateStore';
+
+import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
+import VnInputDate from 'src/components/common/VnInputDate.vue';
+
+const { t } = useI18n();
+const props = defineProps({
+    dataKey: {
+        type: String,
+        required: true,
+    },
+});
+const stateStore = useStateStore();
+const emit = defineEmits(['set-user-params']);
+const setUserParams = (params) => {
+    emit('set-user-params', params);
+};
+onMounted(async () => {
+    stateStore.rightDrawer = true;
+});
+</script>
+
+<template>
+    <VnFilterPanel
+        :data-key="props.dataKey"
+        :search-button="true"
+        search-url="table"
+        @set-user-params="setUserParams"
+    >
+        <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 }">
+            <QItem class="q-my-sm">
+                <QItemSection>
+                    <VnInputDate
+                        id="date"
+                        v-model="params.dated"
+                        :label="t('Date')"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
+        </template>
+    </VnFilterPanel>
+</template>
+<i18n>
+    en:
+        params:
+            dated: Date
+            workerFk: Worker
+    es:
+        Date: Fecha
+        params:
+            dated: Date
+            workerFk: Trabajador
+</i18n>
diff --git a/src/router/modules/entry.js b/src/router/modules/entry.js
index d66ea0e0c..4750a4301 100644
--- a/src/router/modules/entry.js
+++ b/src/router/modules/entry.js
@@ -58,6 +58,15 @@ export default {
                     },
                     component: () => import('src/pages/Entry/EntryLatestBuys.vue'),
                 },
+                {
+                    path: 'stock-Bought',
+                    name: 'EntryStockBought',
+                    meta: {
+                        title: 'reserves',
+                        icon: 'deployed_code_history',
+                    },
+                    component: () => import('src/pages/Entry/EntryStockBought.vue'),
+                },
             ],
         },
         {
diff --git a/test/cypress/integration/entry/stockBought.spec.js b/test/cypress/integration/entry/stockBought.spec.js
new file mode 100644
index 000000000..66e06b79e
--- /dev/null
+++ b/test/cypress/integration/entry/stockBought.spec.js
@@ -0,0 +1,39 @@
+describe('EntryStockBought', () => {
+    beforeEach(() => {
+        cy.viewport(1920, 1080);
+        cy.login('buyer');
+        cy.visit(`/#/entry/stock-Bought`);
+    });
+    it('Should edit the reserved space', () => {
+        cy.get('.q-field__native.q-placeholder').should('have.value', '01/01/2001');
+        cy.get('input[name="reserve"]').type('10{enter}');
+        cy.get('button[title="Save"]').click();
+        cy.get('.q-notification__message').should('have.text', 'Data saved');
+    });
+    it('Should add a new reserved space for buyerBoss', () => {
+        cy.get('.q-page-sticky > div > .q-btn > .q-btn__content > .q-icon').click();
+        cy.get('input[aria-label="Reserve"]').type('1');
+        cy.get('input[aria-label="Date"]').eq(1).clear();
+        cy.get('input[aria-label="Date"]').eq(1).type('01-01');
+        cy.get('input[aria-label="Buyer"]').type('buyerboss{downarrow}{enter}');
+        cy.get('.q-notification__message').should('have.text', 'Data created');
+    });
+    it('Should check detail for the buyer', () => {
+        cy.get(':nth-child(1) > .sticky > .q-btn > .q-btn__content > .q-icon').click();
+        cy.get('tBody > tr').eq(1).its('length').should('eq', 1);
+    });
+    it('Should check detail for the buyerBoss and had no content', () => {
+        cy.get(':nth-child(2) > .sticky > .q-btn > .q-btn__content > .q-icon').click();
+        cy.get('.q-table__bottom.row.items-center.q-table__bottom--nodata').should(
+            'have.text',
+            'warningNo data available'
+        );
+    });
+    it('Should edit travel m3 and refresh', () => {
+        cy.get('.vn-row > div > .q-btn > .q-btn__content > .q-icon').click();
+        cy.get('input[aria-label="m3"]').clear();
+        cy.get('input[aria-label="m3"]').type('60');
+        cy.get('.q-mt-lg > .q-btn--standard > .q-btn__content > .block').click();
+        cy.get('.vn-row > div > :nth-child(2)').should('have.text', '60');
+    });
+});

From 2e9a8d920551f645fb7644fa6910cec67666d8f3 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Tue, 1 Oct 2024 11:47:31 +0200
Subject: [PATCH 241/281] fix(WorkerList): add type email

---
 src/pages/Worker/WorkerList.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/Worker/WorkerList.vue b/src/pages/Worker/WorkerList.vue
index 6b3b117b6..f4ae20591 100644
--- a/src/pages/Worker/WorkerList.vue
+++ b/src/pages/Worker/WorkerList.vue
@@ -214,6 +214,7 @@ async function autofillBic(worker) {
                     <VnInput v-model="data.name" :label="t('worker.create.webUser')" />
                     <VnInput
                         v-model="data.email"
+                        type="email"
                         :label="t('worker.create.personalEmail')"
                     />
                 </VnRow>

From 7b63bb38f22e98f056cdef7cb8ccc1efbcb0099c Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Tue, 1 Oct 2024 12:34:39 +0200
Subject: [PATCH 242/281] fix: deleted code

---
 src/pages/Ticket/Card/TicketSale.vue | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/pages/Ticket/Card/TicketSale.vue b/src/pages/Ticket/Card/TicketSale.vue
index d5de60f16..6d3e6269d 100644
--- a/src/pages/Ticket/Card/TicketSale.vue
+++ b/src/pages/Ticket/Card/TicketSale.vue
@@ -425,7 +425,6 @@ const setTransferParams = async () => {
 onMounted(async () => {
     stateStore.rightDrawer = true;
     getConfig();
-    getItems();
 });
 
 onUnmounted(() => (stateStore.rightDrawer = false));
@@ -433,11 +432,6 @@ onUnmounted(() => (stateStore.rightDrawer = false));
 const items = ref([]);
 const newRow = ref({});
 
-async function getItems() {
-    const { data } = await axios.get(`Items/withName`);
-    items.value = data;
-}
-
 const updateItem = (row) => {
     const selectedItem = items.value.find((item) => item.id === row.itemFk);
     if (selectedItem) {

From 589c672ab20c9b4118e6924c3218d7b2cc16d445 Mon Sep 17 00:00:00 2001
From: jgallego <jgallego@verdnatura.es>
Date: Tue, 1 Oct 2024 13:28:49 +0200
Subject: [PATCH 243/281] fix: show degrees

---
 src/i18n/locale/en.yml                       |  4 ++--
 src/i18n/locale/es.yml                       |  4 ++--
 src/pages/Travel/Card/TravelSummary.vue      | 16 +++++++++++++++-
 src/pages/Travel/Card/TravelThermographs.vue |  4 ++--
 src/pages/Zone/locale/es.yml                 |  2 +-
 5 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index af0ba0996..d018dc207 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -289,8 +289,8 @@ globals:
     createInvoiceIn: Create invoice in
     myAccount: My account
     noOne: No one
-    maxTemperature: Maximum Temperature
-    minTemperature: Minimum Temperatura
+    maxTemperature: Máx
+    minTemperature: Mín
     params:
         clientFk: Client id
         salesPersonFk: Sales person
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index f56cd6761..7eece7d78 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -293,8 +293,8 @@ globals:
     createInvoiceIn: Crear factura recibida
     myAccount: Mi cuenta
     noOne: Nadie
-    maxTemperature: Temperatura máxima
-    minTemperature: Temperatura mínima
+    maxTemperature: Máx
+    minTemperature: Mín
     params:
         clientFk: Id cliente
         salesPersonFk: Comercial
diff --git a/src/pages/Travel/Card/TravelSummary.vue b/src/pages/Travel/Card/TravelSummary.vue
index 829eb3a17..4be198493 100644
--- a/src/pages/Travel/Card/TravelSummary.vue
+++ b/src/pages/Travel/Card/TravelSummary.vue
@@ -121,6 +121,20 @@ const thermographsTableColumns = computed(() => {
             name: 'temperatureFk',
             align: 'left',
         },
+        {
+            label: t('globals.maxTemperature'),
+            field: 'maxTemperature',
+            name: 'maxTemperature',
+            align: 'left',
+            format: (val) => (val ? `${val}°` : ''),
+        },
+        {
+            label: t('globals.minTemperature'),
+            field: 'minTemperature',
+            name: 'minTemperature',
+            align: 'left',
+            format: (val) => (val ? `${val}°` : ''),
+        },
         {
             label: t('travel.thermographs.state'),
             field: 'result',
@@ -133,7 +147,7 @@ const thermographsTableColumns = computed(() => {
             name: 'destination',
             align: 'left',
             format: (val) =>
-                warehouses.value.find((warehouse) => warehouse.id === val).name,
+                warehouses.value.find((warehouse) => warehouse.id === val)?.name,
         },
         {
             label: t('travel.thermographs.created'),
diff --git a/src/pages/Travel/Card/TravelThermographs.vue b/src/pages/Travel/Card/TravelThermographs.vue
index 38b9125b1..e308243e3 100644
--- a/src/pages/Travel/Card/TravelThermographs.vue
+++ b/src/pages/Travel/Card/TravelThermographs.vue
@@ -52,12 +52,14 @@ const TableColumns = computed(() => {
             field: 'maxTemperature',
             name: 'maxTemperature',
             align: 'left',
+            format: (val) => (val ? `${val}°` : ''),
         },
         {
             label: t('globals.minTemperature'),
             field: 'minTemperature',
             name: 'minTemperature',
             align: 'left',
+            format: (val) => (val ? `${val}°` : ''),
         },
         {
             label: t('travel.thermographs.state'),
@@ -219,6 +221,4 @@ es:
     Thermograph removed: Termógrafo eliminado
     Are you sure you want to remove the thermograph?: ¿Seguro que quieres quitar el termógrafo?
     No results: Sin resultados
-    Max Temperature: Temperatura máxima
-    Min Temperature: Temperatura mínima
 </i18n>
diff --git a/src/pages/Zone/locale/es.yml b/src/pages/Zone/locale/es.yml
index dd919a0c5..7ecfb580d 100644
--- a/src/pages/Zone/locale/es.yml
+++ b/src/pages/Zone/locale/es.yml
@@ -87,7 +87,7 @@ eventsPanel:
     travelingDays: Días de viaje
     price: Precio
     bonus: Bonificación
-    m3Max: Meidida máxima
+    m3Max: Medida máxima
     everyday: Todos los días
     delete: Eliminar
     deleteTitle: Este elemento será eliminado

From 4399a91e9934ab27bf28f5dd5dce28f9a865e1d5 Mon Sep 17 00:00:00 2001
From: jgallego <jgallego@verdnatura.es>
Date: Tue, 1 Oct 2024 13:29:45 +0200
Subject: [PATCH 244/281] fix: misSpelling

---
 src/i18n/locale/en.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index d018dc207..3df52f4a7 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -289,8 +289,8 @@ globals:
     createInvoiceIn: Create invoice in
     myAccount: My account
     noOne: No one
-    maxTemperature: Máx
-    minTemperature: Mín
+    maxTemperature: Max
+    minTemperature: Min
     params:
         clientFk: Client id
         salesPersonFk: Sales person

From d69336c82ac2f131568077b27a349a4c58e6ba8e Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Tue, 1 Oct 2024 14:15:18 +0200
Subject: [PATCH 245/281] refs #7366 make travelFilter, travelList

---
 src/pages/Travel/TravelFilter.vue | 157 ++++++++++++++++++++++++++++++
 src/pages/Travel/TravelList.vue   |  10 +-
 2 files changed, 166 insertions(+), 1 deletion(-)
 create mode 100644 src/pages/Travel/TravelFilter.vue

diff --git a/src/pages/Travel/TravelFilter.vue b/src/pages/Travel/TravelFilter.vue
new file mode 100644
index 000000000..96298853f
--- /dev/null
+++ b/src/pages/Travel/TravelFilter.vue
@@ -0,0 +1,157 @@
+<script setup>
+import { ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import FetchData from 'components/FetchData.vue';
+import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
+import VnSelect from 'components/common/VnSelect.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import VnInputDate from 'components/common/VnInputDate.vue';
+import VnInputTime from 'src/components/common/VnInputTime.vue';
+
+const { t } = useI18n();
+const props = defineProps({
+    dataKey: {
+        type: String,
+        required: true,
+    },
+});
+
+const states = ref([]);
+
+defineExpose({ states });
+</script>
+
+<template>
+    <FetchData url="warehouses" @on-fetch="(data) => (states = data)" auto-load />
+    <VnFilterPanel :data-key="props.dataKey" :search-button="true" search-url="table">
+        <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, searchFn }">
+            <div class="q-pa-sm q-gutter-y-sm">
+                <VnInput
+                    :label="t('travel.Id')"
+                    v-model="params.id"
+                    lazy-rules
+                    is-outlined
+                >
+                    <template #prepend> <QIcon name="badge" size="xs" /></template>
+                </VnInput>
+                <VnInput
+                    :label="t('travel.ref')"
+                    v-model="params.ref"
+                    lazy-rules
+                    is-outlined
+                />
+                <VnSelect
+                    :label="t('travel.agency')"
+                    v-model="params.agencyModeFk"
+                    @update:model-value="searchFn()"
+                    url="agencyModes"
+                    :use-like="false"
+                    option-value="id"
+                    option-label="name"
+                    option-filter="name"
+                    dense
+                    outlined
+                    rounded
+                />
+                <VnSelect
+                    :label="t('travel.warehouseInFk')"
+                    v-model="params.warehouseInFk"
+                    @update:model-value="searchFn()"
+                    url="warehouses"
+                    :use-like="false"
+                    option-value="id"
+                    option-label="name"
+                    option-filter="name"
+                    dense
+                    outlined
+                    rounded
+                />
+                <VnInputDate
+                    :label="t('travel.shipped')"
+                    v-model="params.shipped"
+                    @update:model-value="searchFn()"
+                    dense
+                    outlined
+                    rounded
+                />
+                <VnInputTime
+                    v-model="params.shipmentHour"
+                    @update:model-value="searchFn()"
+                    :label="t('travel.shipmentHour')"
+                    outlined
+                    rounded
+                    dense
+                />
+                <VnSelect
+                    :label="t('travel.warehouseOut')"
+                    v-model="params.warehouseOut"
+                    @update:model-value="searchFn()"
+                    url="warehouses"
+                    :use-like="false"
+                    option-value="id"
+                    option-label="name"
+                    option-filter="name"
+                    dense
+                    outlined
+                    rounded
+                />
+                <VnInputDate
+                    :label="t('travel.landed')"
+                    v-model="params.landed"
+                    @update:model-value="searchFn()"
+                    dense
+                    outlined
+                    rounded
+                />
+                <VnInputTime
+                    v-model="params.landingHour"
+                    @update:model-value="searchFn()"
+                    :label="t('travel.landingHour')"
+                    outlined
+                    rounded
+                    dense
+                />
+                <VnInput
+                    :label="t('travel.totalEntries')"
+                    v-model="params.totalEntries"
+                    lazy-rules
+                    is-outlined
+                />
+            </div>
+        </template>
+    </VnFilterPanel>
+</template>
+
+<i18n>
+en:
+    travel:
+        Id: Contains
+        ref: Reference
+        agency: Agency
+        warehouseInFk: W. In
+        shipped: Shipped
+        shipmentHour: Shipment Hour
+        warehouseOut: W. Out
+        landed: Landed
+        landingHour: Landing Hour
+        totalEntries: Σ
+es:
+    travel:
+        Id: Id
+        ref: Referencia
+        agency: Agencia
+        warehouseInFk: Alm.Salida
+        shipped: F.Envío
+        shipmentHour: Hora de envío
+        warehouseOut: Alm.Entrada
+        landed: F.Entrega
+        landingHour: Hora de entrega
+        totalEntries: Σ
+</i18n>
diff --git a/src/pages/Travel/TravelList.vue b/src/pages/Travel/TravelList.vue
index e56f5d2ff..05d2e5eda 100644
--- a/src/pages/Travel/TravelList.vue
+++ b/src/pages/Travel/TravelList.vue
@@ -9,6 +9,8 @@ import TravelSummary from './Card/TravelSummary.vue';
 import VnSearchbar from 'components/ui/VnSearchbar.vue';
 import { toDate } from 'src/filters';
 import { getDateQBadgeColor } from 'src/composables/getDateQBadgeColor.js';
+import RightMenu from 'src/components/common/RightMenu.vue';
+import TravelFilter from './TravelFilter.vue';
 
 const { viewSummary } = useSummaryDialog();
 const router = useRouter();
@@ -24,6 +26,7 @@ const $props = defineProps({
 });
 const entityId = computed(() => $props.id || route.params.id);
 
+const travelFilterRef = ref();
 onMounted(async () => {
     stateStore.rightDrawer = true;
 });
@@ -201,6 +204,11 @@ const columns = computed(() => [
         :label="t('Search travel')"
         data-key="TravelList"
     />
+    <RightMenu>
+        <template #right-panel>
+            <TravelFilter data-key="TravelList" ref="travelFilterRef" />
+        </template>
+    </RightMenu>
     <VnTable
         ref="tableRef"
         data-key="TravelList"
@@ -213,6 +221,7 @@ const columns = computed(() => [
                 editorFk: entityId,
             },
         }"
+        :right-search="false"
         :user-params="{ daysOnward: 7 }"
         order="landed DESC"
         :columns="columns"
@@ -220,7 +229,6 @@ const columns = computed(() => [
         redirect="travel"
         :is-editable="false"
         :use-model="true"
-        chip-locale="travel.travelList.tableVisibleColumns"
     >
         <template #column-shipped="{ row }">
             <QBadge

From 2ca99a51ae7f6e2b2c8c898a53174af12bda3968 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 1 Oct 2024 15:12:22 +0200
Subject: [PATCH 246/281] fix: refs #7356 transfer ticket method

---
 src/pages/Ticket/Card/TicketDescriptorMenu.vue  | 9 +++++----
 src/pages/Ticket/Card/TicketSaleMoreActions.vue | 6 +++---
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/pages/Ticket/Card/TicketDescriptorMenu.vue b/src/pages/Ticket/Card/TicketDescriptorMenu.vue
index 12e03551b..73104fe27 100644
--- a/src/pages/Ticket/Card/TicketDescriptorMenu.vue
+++ b/src/pages/Ticket/Card/TicketDescriptorMenu.vue
@@ -277,13 +277,14 @@ async function createRefund(withWarehouse) {
     const params = {
         ticketsIds: [parseInt(ticketId)],
         withWarehouse: withWarehouse,
+        negative: true,
     };
-    const { data } = await axios.post(`Tickets/refund`, params);
+    const { data } = await axios.post(`Tickets/cloneAll`, params);
 
     if (data) {
-        const refundTicket = data;
-
-        push({ name: 'TicketSale', params: { id: refundTicket[0].id } });
+        const [refundTicket] = data;
+        notify(t('refundTicketCreated', { ticketId: refundTicket.id }), 'positive');
+        push({ name: 'TicketSale', params: { id: refundTicket.id } });
     }
 }
 
diff --git a/src/pages/Ticket/Card/TicketSaleMoreActions.vue b/src/pages/Ticket/Card/TicketSaleMoreActions.vue
index 94db67be2..2ec519d2d 100644
--- a/src/pages/Ticket/Card/TicketSaleMoreActions.vue
+++ b/src/pages/Ticket/Card/TicketSaleMoreActions.vue
@@ -44,7 +44,7 @@ const props = defineProps({
     },
 });
 
-const router = useRouter();
+const { push } = useRouter();
 const { t } = useI18n();
 const { dialog } = useQuasar();
 const { notify } = useNotify();
@@ -142,7 +142,7 @@ const onCreateClaimAccepted = async () => {
     try {
         const params = { ticketId: ticket.value.id, sales: props.sales };
         const { data } = await axios.post(`Claims/createFromSales`, params);
-        router.push({ name: 'ClaimBasicData', params: { id: data.id } });
+        push({ name: 'ClaimBasicData', params: { id: data.id } });
     } catch (error) {
         console.error('Error creating claim: ', error);
     }
@@ -169,7 +169,7 @@ const createRefund = async (withWarehouse) => {
         const { data } = await axios.post('Tickets/cloneAll', params);
         const [refundTicket] = data;
         notify(t('refundTicketCreated', { ticketId: refundTicket.id }), 'positive');
-        router.push({ name: 'TicketSale', params: { id: refundTicket.id } });
+        push({ name: 'TicketSale', params: { id: refundTicket.id } });
     } catch (error) {
         console.error(error);
     }

From c0fd5a1c218c61f4c4b10cadc42fc5192fdc5316 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Tue, 1 Oct 2024 16:12:18 +0200
Subject: [PATCH 247/281] fix: refs #7404 fix style

---
 src/components/VnTable/VnTable.vue | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 3bcd91b1f..53db777df 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -771,16 +771,6 @@ es:
     color: var(--vn-text-color);
 }
 
-.q-table--dark .q-table__bottom,
-.q-table--dark thead,
-.q-table--dark tr {
-    border-color: var(--vn-section-color);
-}
-
-.q-table__container > div:first-child {
-    background-color: var(--vn-page-color);
-}
-
 .grid-three {
     display: grid;
     grid-template-columns: repeat(auto-fit, minmax(400px, max-content));

From 6b38bdf868d857a97677381c62216c1b88ccd872 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 1 Oct 2024 19:26:03 +0000
Subject: [PATCH 248/281] style: improve ZoneLocationTree height

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

diff --git a/src/pages/Zone/Card/ZoneEventExclusionForm.vue b/src/pages/Zone/Card/ZoneEventExclusionForm.vue
index 0ba2e640a..215c12f46 100644
--- a/src/pages/Zone/Card/ZoneEventExclusionForm.vue
+++ b/src/pages/Zone/Card/ZoneEventExclusionForm.vue
@@ -154,7 +154,7 @@ onMounted(() => {
             </div>
             <div
                 v-if="excludeType === 'specificLocations'"
-                style="min-height: 60vh; overflow-y: scroll"
+                style="max-height: 60vh; overflow-y: scroll"
             >
                 <ZoneLocationsTree
                     :root-label="t('eventsExclusionForm.rootTreeLabel')"

From c2c4acfc30646a9ea4a6485ce1eb4c3b4a319104 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 2 Oct 2024 09:42:38 +0200
Subject: [PATCH 249/281] refs #6899 fix filters, date from to socialName

---
 .../InvoiceOut/InvoiceOutNegativeBases.vue    | 27 ++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue b/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue
index 774b42478..1ea19033c 100644
--- a/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue
+++ b/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue
@@ -9,6 +9,7 @@ import { useArrayData } from 'src/composables/useArrayData';
 import CustomerDescriptorProxy from '../Customer/Card/CustomerDescriptorProxy.vue';
 import TicketDescriptorProxy from '../Ticket/Card/TicketDescriptorProxy.vue';
 import WorkerDescriptorProxy from '../Worker/Card/WorkerDescriptorProxy.vue';
+import VnInputDate from 'components/common/VnInputDate.vue';
 
 const { t } = useI18n();
 const tableRef = ref();
@@ -64,7 +65,8 @@ const columns = computed(() => [
         cardVisible: true,
         attrs: {
             url: 'Clients',
-            fields: ['id', 'name'],
+            optionLabel: 'socialName',
+            optionValue: 'socialName',
         },
         columnField: {
             component: null,
@@ -192,10 +194,33 @@ const downloadCSV = async () => {
                 <WorkerDescriptorProxy :id="row.comercialId" />
             </span>
         </template>
+        <template #moreFilterPanel="{ params }">
+            <VnInputDate
+                :label="t('params.from')"
+                v-model="params.from"
+                class="q-px-xs q-pr-lg"
+                filled
+                dense
+            />
+            <VnInputDate
+                :label="t('params.to')"
+                v-model="params.to"
+                class="q-px-xs q-pr-lg"
+                filled
+                dense
+            />
+        </template>
     </VnTable>
 </template>
 
 <i18n>
 es:
     Download as CSV: Descargar como CSV
+    params:
+        from: Desde
+        to: Hasta
+en:
+    params:
+        from: From
+        to: To
 </i18n>

From 7db166974f675a46f0bedf7dd6589e1a7e73c20c Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Wed, 2 Oct 2024 10:34:50 +0200
Subject: [PATCH 250/281] feat: refs #7884 use VnTable prop for chip label
 filters and modified translations

---
 src/components/ui/VnFilterPanel.vue |  4 +---
 src/pages/Entry/MyEntries.vue       | 29 +++++++++++++++++------------
 src/pages/Entry/locale/en.yml       | 18 ++++++++++++------
 src/pages/Entry/locale/es.yml       | 19 ++++++++++++-------
 4 files changed, 42 insertions(+), 28 deletions(-)

diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue
index 7e4785441..e39a841c3 100644
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@@ -250,7 +250,7 @@ function sanitizer(params) {
                     >
                         <slot name="tags" :tag="chip" :format-fn="formatValue">
                             <div class="q-gutter-x-xs">
-                                <strong>{{ t(`${chip.label}`) }}:</strong>
+                                <strong>{{ chip.label }}:</strong>
                                 <span>"{{ formatValue(chip.value) }}"</span>
                             </div>
                         </slot>
@@ -295,6 +295,4 @@ es:
     Search: Buscar
     Yes: Si
     No: No
-    daysOnward: Días Adelante
-    daysAgo: Días Atrás
 </i18n>
diff --git a/src/pages/Entry/MyEntries.vue b/src/pages/Entry/MyEntries.vue
index 07cedd69b..2c37c2c42 100644
--- a/src/pages/Entry/MyEntries.vue
+++ b/src/pages/Entry/MyEntries.vue
@@ -18,18 +18,18 @@ const columns = computed(() => [
     {
         align: 'left',
         name: 'id',
-        label: t('customer.extendedList.tableVisibleColumns.id'),
+        label: t('myEntries.id'),
         columnFilter: false,
         isTitle: true,
     },
     {
         visible: false,
         align: 'right',
-        label: t('shipped'),
+        label: t('myEntries.shipped'),
         name: 'shipped',
         columnFilter: {
             name: 'fromShipped',
-            label: t('fromShipped'),
+            label: t('myEntries.fromShipped'),
             component: 'date',
         },
         format: ({ shipped }) => toDate(shipped),
@@ -37,11 +37,11 @@ const columns = computed(() => [
     {
         visible: false,
         align: 'left',
-        label: t('shipped'),
+        label: t('myEntries.shipped'),
         name: 'shipped',
         columnFilter: {
             name: 'toShipped',
-            label: t('toShipped'),
+            label: t('myEntries.toShipped'),
             component: 'date',
         },
         format: ({ shipped }) => toDate(shipped),
@@ -49,14 +49,14 @@ const columns = computed(() => [
     },
     {
         align: 'right',
-        label: t('shipped'),
+        label: t('myEntries.shipped'),
         name: 'shipped',
         columnFilter: false,
         format: ({ shipped }) => toDate(shipped),
     },
     {
         align: 'right',
-        label: t('landed'),
+        label: t('myEntries.landed'),
         name: 'landed',
         columnFilter: false,
         format: ({ landed }) => toDate(landed),
@@ -64,31 +64,35 @@ const columns = computed(() => [
 
     {
         align: 'right',
-        label: t('globals.wareHouseIn'),
+        label: t('myEntries.wareHouseIn'),
         name: 'warehouseInFk',
-        format: (row) => row.warehouseInName,
+        format: (row) => {
+            row.warehouseInName;
+        },
         cardVisible: true,
         columnFilter: {
+            name: 'warehouseInFk',
+            label: t('myEntries.warehouseInFk'),
             component: 'select',
             attrs: {
                 url: 'warehouses',
                 fields: ['id', 'name'],
                 optionLabel: 'name',
                 optionValue: 'id',
+                alias: 't',
             },
-            alias: 't',
             inWhere: true,
         },
     },
     {
         align: 'left',
-        label: t('globals.daysOnward'),
+        label: t('myEntries.daysOnward'),
         name: 'daysOnward',
         visible: false,
     },
     {
         align: 'left',
-        label: t('globals.daysAgo'),
+        label: t('myEntries.daysAgo'),
         name: 'daysAgo',
         visible: false,
     },
@@ -130,6 +134,7 @@ const printBuys = (rowId) => {
         default-mode="card"
         order="shipped DESC"
         auto-load
+        chip-locale="myEntries"
     />
 </template>
 
diff --git a/src/pages/Entry/locale/en.yml b/src/pages/Entry/locale/en.yml
index a9faa814b..b4d7c33bc 100644
--- a/src/pages/Entry/locale/en.yml
+++ b/src/pages/Entry/locale/en.yml
@@ -6,9 +6,15 @@ entryFilter:
     filter:
         search: General search
         reference: Reference
-landed: Landed
-shipped: Shipped
-fromShipped: Shipped(from)
-toShipped: Shipped(to)
-printLabels: Print stickers
-viewLabel: View sticker
+myEntries:
+    id: ID
+    landed: Landed
+    shipped: Shipped
+    fromShipped: Shipped(from)
+    toShipped: Shipped(to)
+    printLabels: Print stickers
+    viewLabel: View sticker
+    wareHouseIn: Warehouse in
+    warehouseInFk: Warehouse in
+    daysOnward: Days onward
+    daysAgo: Days ago
diff --git a/src/pages/Entry/locale/es.yml b/src/pages/Entry/locale/es.yml
index eb1e3f88a..2dfd601b1 100644
--- a/src/pages/Entry/locale/es.yml
+++ b/src/pages/Entry/locale/es.yml
@@ -9,10 +9,15 @@ entryFilter:
     filter:
         search: Búsqueda general
         reference: Referencia
-
-landed: F. llegada
-shipped: F. salida
-fromShipped: F. salida(desde)
-toShipped: F. salida(hasta)
-printLabels: Imprimir etiquetas
-viewLabel: Ver etiqueta
+myEntries:
+    id: ID
+    landed: F. llegada
+    shipped: F. salida
+    fromShipped: F. salida(desde)
+    toShipped: F. salida(hasta)
+    printLabels: Imprimir etiquetas
+    viewLabel: Ver etiqueta
+    wareHouseIn: Alm. entrada
+    warehouseInFk: Alm. entrada
+    daysOnward: Días adelante
+    daysAgo: Días atras

From 98df741f1b1bd2761960e0ce60c1578b8a714d67 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Wed, 2 Oct 2024 10:43:54 +0200
Subject: [PATCH 251/281] fix: refs #7884 deleted useless translations

---
 src/components/ui/VnFilterPanel.vue | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue
index e39a841c3..43d634ad9 100644
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@@ -284,9 +284,6 @@ function sanitizer(params) {
 </style>
 
 <i18n>
-en:
-    daysOnward: Days onward
-    daysAgo: Days ago
 es:
     No filters applied: No se han aplicado filtros
     Applied filters: Filtros aplicados

From 8de5602564d6c46a85e9c10bd2bc6c627d7cb461 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Wed, 2 Oct 2024 15:31:09 +0200
Subject: [PATCH 252/281] chore: refs #8062 add changelog

---
 CHANGELOG.md | 180 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 180 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f1d10b26e..88abb9ae0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,183 @@
+# Version 24.40 - 2024-10-02
+
+### Added 🆕
+
+-   chore: refs #4074 admit several acls by:jorgep
+-   chore: refs #4074 drop workerCreate by:jorgep
+-   chore: refs #4074 fix tests by:jorgep
+-   chore: refs #4074 wip replace useRole for useAcl by:jorgep
+-   chore: refs #7155 remove console.log by:alexm
+-   chore: refs #7155 typo by:alexm
+-   chore: refs #7663 add test by:jorgep
+-   chore: refs #7663 create test wip by:jorgep
+-   chore: refs #7663 drop useless code (origin/7663-setWeight) by:jorgep
+-   chore: refs #7828 fix e2e by:jorgep
+-   feat(AccountBasicData): add twoFactorFk by:alexm
+-   feat: add max rule by:Javier Segarra
+-   feat: add shortcut add event in some subSections by:Javier Segarra
+-   feat: add shortcut more buttons (origin/add_shortcut_add_subSections) by:Javier Segarra
+-   feat: add tooltip CustomerNewCustomAgent by:Javier Segarra
+-   feat: apply color when today by:Javier Segarra
+-   feat: change label because its more natural by:Javier Segarra
+-   feat: change order by:Javier Segarra
+-   feat: change QBadge color by:Javier Segarra
+-   feat: change url CustomerList by:Javier Segarra
+-   feat: copy customer countryFk by:Javier Segarra
+-   feat: create VnSelectEnum and add in AccountBasicData and ClaimBasicData by:alexm
+-   feat: CustomerBalance by:Javier Segarra
+-   feat: CustomerConsumptionFilter by:Javier Segarra
+-   feat: customer consumption (origin/7830-customerDesplegables, 7830-customerDesplegables) by:alexm
+-   feat: CustomerCreateTicket by:Javier Segarra
+-   feat: CustomerCredit section by:Javier Segarra
+-   feat: CustomerGreuges by:Javier Segarra
+-   feat: CustomerSample to VnTable by:Javier Segarra
+-   feat: global handler (origin/fix_global_handler, fix_global_handler) by:alexm
+-   feat: goToSupplier by:Javier Segarra
+-   feat: handle newValue by:Javier Segarra
+-   feat: handle same multiple CP by:Javier Segarra
+-   feat: hide menus on small view (origin/hideMenu) by:jorgep
+-   feat: minor changes by:Javier Segarra
+-   feat: orderCreateDialog by:Javier Segarra
+-   feat: refs #4074 drop useless code by:jorgep
+-   feat: refs #4074 useAcl in vnSelectDialog by:jorgep
+-   feat: refs #6346 new wagon type section by:Jon
+-   feat: refs #7404 add m3 and fix detail by:pablone
+-   feat: refs #7404 add some style to the form and reorganize fields by:pablone
+-   feat: refs #7404 add travel m3 to reserves form by:pablone
+-   feat: refs #7404 style dynamic text color by:pablone
+-   feat: refs #7404 travel m3 form by:pablone
+-   feat: refs #7500 added VnImg to show files by:Jon
+-   feat: refs #7663 add setWeight menu opt (wip) by:jorgep
+-   feat: refs #7663 fine tunning by:jorgep
+-   feat: refs #7828 create axios instance which no manage errors (origin/7828-makeCorrectCalls) by:jorgep
+-   feat: refs #7828 useAcl & cherry pick mail data worker by:jorgep
+-   feat: remove cli warnings by:Javier Segarra
+-   feat: show preparation field by:Javier Segarra
+-   feat: stateGroupedFilter by:Javier Segarra
+-   feat: translations fixed by:jgallego
+-   feat(TravelList): add daysOnward by:alexm
+-   feat: travel m3 by:pablone
+-   feat: use disableInifiniteScroll property by:Javier Segarra
+-   feat: VnImg draggable by:Javier Segarra
+-   feat: vnLocation changes by:Javier Segarra
+-   feat: vnSelect exprBuilder by:Javier Segarra
+-   fix: refs #7404 remove some style by:pablone
+-   fix: refs #7404 style non center pop up (origin/7404-fixFront) by:pablone
+-   fix: refs #7404 translates and some minor style fixes by:pablone
+-   fix: styles by:Javier Segarra
+-   perf: improve style by:Javier Segarra
+
+### Changed 📦
+
+-   perf: CustomerBalance by:Javier Segarra
+-   perf: CustomerBasicData by:Javier Segarra
+-   perf: CustomerBasicData.salesPersonFk by:Javier Segarra
+-   perf: CustomerSummary by:Javier Segarra
+-   perf: customerSummaryTable by:Javier Segarra
+-   perf: disable card option by:Javier Segarra
+-   perf: i18n by:Javier Segarra
+-   perf: improve by:Javier Segarra
+-   perf: improve style by:Javier Segarra
+-   perf: imrpove exprBuilder by:Javier Segarra
+-   perf: minor comments by:Javier Segarra
+-   perf: refs #6346 previous changes by:Jon
+-   perf: sendEmail customerConsumption by:Javier Segarra
+-   perf: solve reload CardSummary component by:Javier Segarra
+-   perf: update CustommerDescriptor by:Javier Segarra
+-   refactor: refs #4074 accept array by:jorgep
+-   refactor: refs #4074 rollback by:jorgep
+-   refactor: refs #4074 use acl & drop useless roles by:jorgep
+-   refactor: refs #4074 useAcl in navigationStore & router by:jorgep
+-   refactor: refs #4074 use fn (origin/4074-useAcls) by:jorgep
+-   refactor: refs #4074 use VnTitle by:jorgep
+-   refactor: refs #6346 deleted front error checking by:Jon
+-   refactor: refs #6346 requested changes by:Jon
+-   refactor: refs #6346 wagons to VnTable by:Jon
+-   refactor: refs #7500 deleted useless code by:Jon
+-   refactor: refs #7500 refactor vnimg when storage is dms by:Jon
+-   refactor: refs #7828 wip by:jorgep
+
+### Fixed 🛠️
+
+-   chore: refs #4074 fix tests by:jorgep
+-   chore: refs #7828 fix e2e by:jorgep
+-   feat: refs #7404 add m3 and fix detail by:pablone
+-   feat: translations fixed by:jgallego
+-   fix: #5938 grouped filter by:Javier Segarra
+-   fix: #6943 fix customerSummaryTable by:Javier Segarra
+-   fix: #6943 show nickname salesPerson by:Javier Segarra
+-   fix: address-create i18n by:Javier Segarra
+-   fix: comments (origin/6943_fix_customer_module, 6943_fix_customer_module) by:Javier Segarra
+-   fix: CusomerSummary to Address by:Javier Segarra
+-   fix: CustomerAddress mobile by:Javier Segarra
+-   fix: CustomerBillingData by:Javier Segarra
+-   fix: Customerconsumption by:Javier Segarra
+-   fix: customer credit opinion by:alexm
+-   fix: CustomerCreditOpinion workerDescriptor by:Javier Segarra
+-   fix: CustomerDescriptorAccount by:Javier Segarra
+-   fix: CustomerDescriptor.bussinessTypeFk by:Javier Segarra
+-   fix: CustomerFilter by:Javier Segarra
+-   fix: CustomerGreuges by:Javier Segarra
+-   fix: CustomerMandates by:Javier Segarra
+-   fix: Customer module find salesPersons out of first get by:Javier Segarra
+-   fix: CustomerRecovery transalate label by:Javier Segarra
+-   fix: CustomerSamples by:Javier Segarra
+-   fix: customerSummaryToTicketList button by:Javier Segarra
+-   fix: CustomerWebPayment by:Javier Segarra
+-   fix: CustommerSummaryTable Proxy by:Javier Segarra
+-   fix: deleted code by:Jon
+-   fix: duplicate code by:alexm
+-   fix: emit:updateModelValue by:Javier Segarra
+-   fix: fixed wagon tests by:Jon
+-   fix: fix wagon list reload by:Jon
+-   fix: i18n en preparation label by:Javier Segarra
+-   fix: infiniteScroll by:Javier Segarra
+-   fix: isFullMovable checkbox by:Javier Segarra
+-   fix: merge conflicts by:Javier Segarra
+-   fix: merge in dev by:alexm
+-   fix: missing code by:Jon
+-   fix: Options VnSelect properties by:Javier Segarra
+-   fix: refs #4074 await to watch by:jorgep
+-   fix: refs #4074 drop wrong acl by:jorgep
+-   fix: refs #4074 workerCard data-key by:jorgep
+-   fix: refs #6346 fix list and create by:pablone
+-   fix: refs #6943 prevent null (origin/6943-warmfix-preventNull) by:jorgep
+-   fix: refs #7155 remove userParams in watcher (7155-travel_daysOnward) by:alexm
+-   fix: refs #7155 use chip-locale (origin/7155-travel_daysOnward_2, 7155-travel_daysOnward_2) by:alexm
+-   fix: refs #7404 remove console.log by:pablone
+-   fix: refs #7404 remove from test by:pablone
+-   fix: refs #7404 remove some style by:pablone
+-   fix: refs #7404 revert commit prevent production access by:pablone
+-   fix: refs #7404 style non center pop up (origin/7404-fixFront) by:pablone
+-   fix: refs #7404 translates and some minor style fixes by:pablone
+-   fix: refs #7500 fixed e2e test by:Jon
+-   fix: refs #7500 fixed showing images wrongly by:Jon
+-   fix: refs #7830 customer credit by:pablone
+-   fix: refs #7830 remove console.log by:pablone
+-   fix: remove console.log by:pablone
+-   fix: remove FetchData by:Javier Segarra
+-   fix: remove FIXME (origin/6943_fix_customerSummaryTable) by:Javier Segarra
+-   fix: remove print variable by:Javier Segarra
+-   fix: remove promise execution by:Javier Segarra
+-   fix: reset VnTable scroll properties by:Javier Segarra
+-   fix: rule by:Javier Segarra
+-   fix: solve conflicts from master to test by:Javier Segarra
+-   fix: split params (origin/warmfix-addSearchUrl) by:jorgep
+-   fix: state cell by:Javier Segarra
+-   fix: stop call back event hasMoreData by:Javier Segarra
+-   fix: styles by:Javier Segarra
+-   fix: SupplierFiscalData VnLocation (origin/fix_supplierFD_location) by:Javier Segarra
+-   fix: VnLocation test by:Javier Segarra
+-   fix(VnTable): header background-color by:alexm
+-   fix(VnTable): sanitizer value is defined by:carlossa
+-   fix: wagon reload (origin/FixWagonRedirect) by:Jon
+-   fix: workerDms filter workerFk by:alexm
+-   fix(WorkerList): add type email by:alexm
+-   Merge remote-tracking branch 'origin/7830-customerDesplegables' into 6943_fix_customerSummaryTable by:Javier Segarra
+-   refs #7155 scopeDays fix (origin/7155-scopeDays) by:carlossa
+-   revert: vnUSerLink change by:Javier Segarra
+-   test: fix test (7677_vnLocation_perf) by:Javier Segarra
+
 # Version 24.38 - 2024-09-17
 
 ### Added 🆕

From 5e59ecdb43952893a4b98e473e80095df305b733 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Wed, 2 Oct 2024 17:14:51 +0200
Subject: [PATCH 253/281] fix: refs #7404 with on stockBought mobile version

---
 src/pages/Entry/EntryStockBought.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/Entry/EntryStockBought.vue b/src/pages/Entry/EntryStockBought.vue
index 0e8013586..0b31dde17 100644
--- a/src/pages/Entry/EntryStockBought.vue
+++ b/src/pages/Entry/EntryStockBought.vue
@@ -279,7 +279,6 @@ function round(value) {
     display: flex;
     flex-direction: column;
     align-items: center;
-    width: 35%;
 }
 .text-negative {
     color: $negative !important;

From b08a5e63e982f3150664a4a257783219de52f7d0 Mon Sep 17 00:00:00 2001
From: jgallego <jgallego@verdnatura.es>
Date: Thu, 3 Oct 2024 08:29:26 +0200
Subject: [PATCH 254/281] fix: inheritWarehouse

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

diff --git a/src/components/RefundInvoiceForm.vue b/src/components/RefundInvoiceForm.vue
index c21c892dd..9d9f0cff1 100644
--- a/src/components/RefundInvoiceForm.vue
+++ b/src/components/RefundInvoiceForm.vue
@@ -24,9 +24,9 @@ const { notify } = useNotify();
 
 const rectificativeTypeOptions = ref([]);
 const siiTypeInvoiceOutsOptions = ref([]);
-const inheritWarehouse = ref(true);
 const invoiceParams = reactive({
     id: $props.invoiceOutData?.id,
+    inheritWarehouse: true,
 });
 const invoiceCorrectionTypesOptions = ref([]);
 
@@ -138,7 +138,7 @@ const refund = async () => {
                     <div>
                         <QCheckbox
                             :label="t('Inherit warehouse')"
-                            v-model="inheritWarehouse"
+                            v-model="invoiceParams.inheritWarehouse"
                         />
                         <QIcon name="info" class="cursor-info q-ml-sm" size="sm">
                             <QTooltip>{{ t('Inherit warehouse tooltip') }}</QTooltip>

From 641a25097d874069ece59949e24e32ede213b0fb Mon Sep 17 00:00:00 2001
From: jgallego <jgallego@verdnatura.es>
Date: Thu, 3 Oct 2024 08:30:19 +0200
Subject: [PATCH 255/281] fix: refundInvoice

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

diff --git a/src/components/RefundInvoiceForm.vue b/src/components/RefundInvoiceForm.vue
index c21c892dd..9d9f0cff1 100644
--- a/src/components/RefundInvoiceForm.vue
+++ b/src/components/RefundInvoiceForm.vue
@@ -24,9 +24,9 @@ const { notify } = useNotify();
 
 const rectificativeTypeOptions = ref([]);
 const siiTypeInvoiceOutsOptions = ref([]);
-const inheritWarehouse = ref(true);
 const invoiceParams = reactive({
     id: $props.invoiceOutData?.id,
+    inheritWarehouse: true,
 });
 const invoiceCorrectionTypesOptions = ref([]);
 
@@ -138,7 +138,7 @@ const refund = async () => {
                     <div>
                         <QCheckbox
                             :label="t('Inherit warehouse')"
-                            v-model="inheritWarehouse"
+                            v-model="invoiceParams.inheritWarehouse"
                         />
                         <QIcon name="info" class="cursor-info q-ml-sm" size="sm">
                             <QTooltip>{{ t('Inherit warehouse tooltip') }}</QTooltip>

From df64814c57da5fdc7331df94cec28be2004bf83e Mon Sep 17 00:00:00 2001
From: jgallego <jgallego@verdnatura.es>
Date: Thu, 3 Oct 2024 08:31:13 +0200
Subject: [PATCH 256/281] fix: hotfix refund invoice

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

diff --git a/src/components/RefundInvoiceForm.vue b/src/components/RefundInvoiceForm.vue
index c21c892dd..9d9f0cff1 100644
--- a/src/components/RefundInvoiceForm.vue
+++ b/src/components/RefundInvoiceForm.vue
@@ -24,9 +24,9 @@ const { notify } = useNotify();
 
 const rectificativeTypeOptions = ref([]);
 const siiTypeInvoiceOutsOptions = ref([]);
-const inheritWarehouse = ref(true);
 const invoiceParams = reactive({
     id: $props.invoiceOutData?.id,
+    inheritWarehouse: true,
 });
 const invoiceCorrectionTypesOptions = ref([]);
 
@@ -138,7 +138,7 @@ const refund = async () => {
                     <div>
                         <QCheckbox
                             :label="t('Inherit warehouse')"
-                            v-model="inheritWarehouse"
+                            v-model="invoiceParams.inheritWarehouse"
                         />
                         <QIcon name="info" class="cursor-info q-ml-sm" size="sm">
                             <QTooltip>{{ t('Inherit warehouse tooltip') }}</QTooltip>

From 05a1d0e8fbb0a70d8630e72cf6c5952c3ecd3327 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Thu, 3 Oct 2024 10:52:16 +0200
Subject: [PATCH 257/281] fix: refs #7129 translates from globals to module
 locals

---
 src/i18n/locale/en.yml        | 30 +-----------------------------
 src/i18n/locale/es.yml        | 15 ---------------
 src/pages/Route/locale/en.yml | 14 ++++++++++++++
 src/pages/Route/locale/es.yml | 14 ++++++++++++++
 4 files changed, 29 insertions(+), 44 deletions(-)

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 20a612a82..4c559dfdf 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -870,35 +870,7 @@ wagon:
         minHeightBetweenTrays: 'The minimum height between trays is '
         maxWagonHeight: 'The maximum height of the wagon is '
         uncompleteTrays: There are incomplete trays
-route:
-    pageTitles:
-        agency: Agency List
-        routes: Routes
-        cmrsList: CMRs list
-        RouteList: List
-        routeCreate: New route
-        basicData: Basic Data
-        summary: Summary
-        RouteRoadmap: Roadmaps
-        RouteRoadmapCreate: Create roadmap
-        tickets: Tickets
-        log: Log
-        autonomous: Autonomous
-        RouteExtendedList: Router
-    cmr:
-        list:
-            results: results
-            cmrFk: CMR id
-            hasCmrDms: Attached in gestdoc
-            'true': 'Yes'
-            'false': 'No'
-            ticketFk: Ticketd id
-            routeFk: Route id
-            country: Country
-            clientFk: Client id
-            shipped: Preparation date
-            viewCmr: View CMR
-            downloadCmrs: Download CMRs
+
 supplier:
     list:
         payMethod: Pay method
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index ae0274415..7cb17aad3 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -868,21 +868,6 @@ wagon:
         minHeightBetweenTrays: 'La distancia mínima entre bandejas es '
         maxWagonHeight: 'La altura máxima del vagón es '
         uncompleteTrays: Hay bandejas sin completar
-route:
-    cmr:
-        list:
-            results: resultados
-            cmrFk: Id CMR
-            hasCmrDms: Gestdoc
-            'true': Sí
-            'false': 'No'
-            ticketFk: Id ticket
-            routeFk: Id ruta
-            country: País
-            clientFk: Id cliente
-            shipped: Fecha preparación
-            viewCmr: Ver CMR
-            downloadCmrs: Descargar CMRs
 supplier:
     list:
         payMethod: Método de pago
diff --git a/src/pages/Route/locale/en.yml b/src/pages/Route/locale/en.yml
index 617d704d2..d113fda67 100644
--- a/src/pages/Route/locale/en.yml
+++ b/src/pages/Route/locale/en.yml
@@ -23,3 +23,17 @@ route:
     Summary: Summary
     Route is closed: Route is closed
     Route is not served: Route is not served
+    cmr:
+        list:
+            results: results
+            cmrFk: CMR id
+            hasCmrDms: Attached in gestdoc
+            'true': 'Yes'
+            'false': 'No'
+            ticketFk: Ticketd id
+            routeFk: Route id
+            country: Country
+            clientFk: Client id
+            shipped: Preparation date
+            viewCmr: View CMR
+            downloadCmrs: Download CMRs
diff --git a/src/pages/Route/locale/es.yml b/src/pages/Route/locale/es.yml
index ed96ad915..a6ba4f370 100644
--- a/src/pages/Route/locale/es.yml
+++ b/src/pages/Route/locale/es.yml
@@ -23,3 +23,17 @@ route:
     Summary: Resumen
     Route is closed: La ruta está cerrada
     Route is not served: La ruta no está servida
+    cmr:
+        list:
+            results: resultados
+            cmrFk: Id CMR
+            hasCmrDms: Gestdoc
+            'true': Sí
+            'false': 'No'
+            ticketFk: Id ticket
+            routeFk: Id ruta
+            country: País
+            clientFk: Id cliente
+            shipped: Fecha preparación
+            viewCmr: Ver CMR
+            downloadCmrs: Descargar CMRs

From c04dad38f12a36aa22d85a7c8e459cbbf01bf495 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Thu, 3 Oct 2024 15:02:14 +0200
Subject: [PATCH 258/281] feat: refs #7404 change travel name and remove buyer
 filter

---
 src/pages/Entry/EntryStockBought.vue | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/pages/Entry/EntryStockBought.vue b/src/pages/Entry/EntryStockBought.vue
index 0b31dde17..2b5ec53f5 100644
--- a/src/pages/Entry/EntryStockBought.vue
+++ b/src/pages/Entry/EntryStockBought.vue
@@ -45,6 +45,7 @@ const columns = [
             optionValue: 'id',
             useLike: false,
         },
+        columnFilter: false,
     },
     {
         align: 'center',
@@ -157,7 +158,7 @@ function round(value) {
                 @on-fetch="
                     (data) => {
                         travel = data.find(
-                            (data) => data.warehouseIn.code.toLowerCase() === 'vnh'
+                            (data) => data.warehouseIn?.code.toLowerCase() === 'vnh'
                         );
                     }
                 "
@@ -165,7 +166,7 @@ function round(value) {
             <VnRow class="travel">
                 <div v-if="travel">
                     <span style="color: var(--vn-label-color)">
-                        {{ t('Booked trucks') }}:
+                        {{ t('Purchase Spaces') }}:
                     </span>
                     <span>
                         {{ travel?.m3 }}
@@ -236,6 +237,7 @@ function round(value) {
                 :footer="true"
                 table-height="80vh"
                 auto-load
+                :column-search="false"
             >
                 <template #column-workerFk="{ row }">
                     <span class="link" @click.stop>
@@ -288,7 +290,7 @@ function round(value) {
     es:
         Edit travel: Editar envío
         Travel: Envíos
-        Booked trucks: Camiones reservados
+        Purchase Spaces: Espacios de compra
         Buyer: Comprador
         Reserve: Reservado
         Bought: Comprado

From c64fe8c044cbb0b01a41792da03f0d5d9829eb4b Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 3 Oct 2024 17:04:56 +0200
Subject: [PATCH 259/281] chore: refs #7207 refactor locale

---
 src/pages/InvoiceIn/Card/InvoiceInSummary.vue | 5 +----
 src/pages/InvoiceIn/InvoiceInFilter.vue       | 2 +-
 src/pages/InvoiceIn/InvoiceInList.vue         | 2 +-
 src/pages/InvoiceIn/locale/en.yml             | 3 +--
 src/pages/InvoiceIn/locale/es.yml             | 3 +--
 5 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/pages/InvoiceIn/Card/InvoiceInSummary.vue b/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
index bf2e7db48..801a04342 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
@@ -274,10 +274,7 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
                     :label="t('invoiceIn.summary.company')"
                     :value="entity.company?.code"
                 />
-                <VnLv
-                    :label="t('invoiceIn.summary.booked')"
-                    :value="invoiceIn?.isBooked"
-                />
+                <VnLv :label="t('invoiceIn.isBooked')" :value="invoiceIn?.isBooked" />
             </QCard>
             <QCard class="vn-one">
                 <QCardSection class="q-pa-none">
diff --git a/src/pages/InvoiceIn/InvoiceInFilter.vue b/src/pages/InvoiceIn/InvoiceInFilter.vue
index b19e047fa..d1c0856b5 100644
--- a/src/pages/InvoiceIn/InvoiceInFilter.vue
+++ b/src/pages/InvoiceIn/InvoiceInFilter.vue
@@ -116,7 +116,7 @@ const activities = ref([]);
             <QItem>
                 <QItemSection>
                     <QCheckbox
-                        :label="t('params.isBooked')"
+                        :label="t('invoiceIn.isBooked')"
                         v-model="params.isBooked"
                         @update:model-value="searchFn()"
                         toggle-indeterminate
diff --git a/src/pages/InvoiceIn/InvoiceInList.vue b/src/pages/InvoiceIn/InvoiceInList.vue
index 0cad09378..265f95b0e 100644
--- a/src/pages/InvoiceIn/InvoiceInList.vue
+++ b/src/pages/InvoiceIn/InvoiceInList.vue
@@ -65,7 +65,7 @@ const cols = computed(() => [
     {
         align: 'left',
         name: 'isBooked',
-        label: t('invoiceIn.list.isBooked'),
+        label: t('invoiceIn.isBooked'),
         columnFilter: false,
     },
     {
diff --git a/src/pages/InvoiceIn/locale/en.yml b/src/pages/InvoiceIn/locale/en.yml
index 824fd6e12..b09340c81 100644
--- a/src/pages/InvoiceIn/locale/en.yml
+++ b/src/pages/InvoiceIn/locale/en.yml
@@ -1,5 +1,6 @@
 invoiceIn:
     serial: Serial
+    isBooked: Is booked
     list:
         ref: Reference
         supplier: Supplier
@@ -7,7 +8,6 @@ invoiceIn:
         serial: Serial
         file: File
         issued: Issued
-        isBooked: Is booked
         awb: AWB
         amount: Amount
     card:
@@ -31,7 +31,6 @@ invoiceIn:
         sage: Sage withholding
         vat: Undeductible VAT
         company: Company
-        booked: Booked
         expense: Expense
         taxableBase: Taxable base
         rate: Rate
diff --git a/src/pages/InvoiceIn/locale/es.yml b/src/pages/InvoiceIn/locale/es.yml
index 2d3b137f4..31d41fc97 100644
--- a/src/pages/InvoiceIn/locale/es.yml
+++ b/src/pages/InvoiceIn/locale/es.yml
@@ -1,5 +1,6 @@
 invoiceIn:
     serial: Serie
+    isBooked: Contabilizada
     list:
         ref: Referencia
         supplier: Proveedor
@@ -7,7 +8,6 @@ invoiceIn:
         shortIssued: F. emisión
         file: Fichero
         issued: Fecha emisión
-        isBooked: Contabilizada
         awb: AWB
         amount: Importe
     card:
@@ -31,7 +31,6 @@ invoiceIn:
         sage: Retención sage
         vat: Iva no deducible
         company: Empresa
-        booked: Contabilizada
         expense: Gasto
         taxableBase: Base imp.
         rate: Tasa

From 530ed4b716b55aa2ddb5365baddadc5694f2281f Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Fri, 4 Oct 2024 08:48:36 +0200
Subject: [PATCH 260/281] refs #7355 fix searchbar

---
 src/pages/Account/AccountList.vue      | 25 +++++++++----------------
 src/pages/Account/Card/AccountCard.vue |  2 +-
 2 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/src/pages/Account/AccountList.vue b/src/pages/Account/AccountList.vue
index d698596b9..d1240f7a6 100644
--- a/src/pages/Account/AccountList.vue
+++ b/src/pages/Account/AccountList.vue
@@ -5,7 +5,8 @@ import VnTable from 'components/VnTable/VnTable.vue';
 import VnSearchbar from 'components/ui/VnSearchbar.vue';
 import AccountSummary from './Card/AccountSummary.vue';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
-
+import AccountFilter from './AccountFilter.vue';
+import RightMenu from 'src/components/common/RightMenu.vue';
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
 const tableRef = ref();
@@ -18,14 +19,6 @@ const columns = computed(() => [
         isId: true,
         field: 'id',
         cardVisible: true,
-        columnFilter: {
-            component: 'select',
-            name: 'search',
-            attrs: {
-                url: 'VnUsers/preview',
-                fields: ['id', 'name'],
-            },
-        },
     },
     {
         align: 'left',
@@ -36,9 +29,6 @@ const columns = computed(() => [
         columnField: {
             component: null,
         },
-        columnFilter: {
-            inWhere: true,
-        },
         cardVisible: true,
         create: true,
     },
@@ -50,9 +40,6 @@ const columns = computed(() => [
         columnField: {
             component: null,
         },
-        columnFilter: {
-            inWhere: true,
-        },
         cardVisible: true,
         create: true,
     },
@@ -105,7 +92,11 @@ const exprBuilder = (param, value) => {
         :label="t('account.search')"
         :info="t('account.searchInfo')"
     />
-
+    <RightMenu>
+        <template #right-panel>
+            <AccountFilter data-key="AccountUsers" />
+        </template>
+    </RightMenu>
     <VnTable
         ref="tableRef"
         data-key="AccountUsers"
@@ -115,6 +106,8 @@ const exprBuilder = (param, value) => {
         default-mode="table"
         redirect="account"
         :use-model="true"
+        :right-search="false"
+        auto-load
     />
 </template>
 
diff --git a/src/pages/Account/Card/AccountCard.vue b/src/pages/Account/Card/AccountCard.vue
index 67fa15898..119a7fd07 100644
--- a/src/pages/Account/Card/AccountCard.vue
+++ b/src/pages/Account/Card/AccountCard.vue
@@ -10,7 +10,7 @@ const { t } = useI18n();
     <VnCard
         data-key="Account"
         :descriptor="AccountDescriptor"
-        search-data-key="AccountUsers"
+        search-data-key="AccountList"
         :searchbar-props="{
             url: 'VnUsers/preview',
             label: t('account.search'),

From 7874db16475955b92f1b8bbe4efd2bf5caa684d6 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 4 Oct 2024 09:58:23 +0200
Subject: [PATCH 261/281] fix: zone delivery postcodes filter and order catalog
 type filter

---
 src/pages/Order/Card/OrderCatalogFilter.vue | 1 +
 src/pages/Zone/ZoneDeliveryPanel.vue        | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/pages/Order/Card/OrderCatalogFilter.vue b/src/pages/Order/Card/OrderCatalogFilter.vue
index 354c44747..6de43e86a 100644
--- a/src/pages/Order/Card/OrderCatalogFilter.vue
+++ b/src/pages/Order/Card/OrderCatalogFilter.vue
@@ -247,6 +247,7 @@ function addOrder(value, field, params) {
                         rounded
                         emit-value
                         use-input
+                        sort-by="name ASC"
                         :disable="!selectedCategoryFk"
                         @update:model-value="
                             (value) => {
diff --git a/src/pages/Zone/ZoneDeliveryPanel.vue b/src/pages/Zone/ZoneDeliveryPanel.vue
index d6c96b935..088811b01 100644
--- a/src/pages/Zone/ZoneDeliveryPanel.vue
+++ b/src/pages/Zone/ZoneDeliveryPanel.vue
@@ -94,7 +94,7 @@ watch(
                 url="Postcodes/location"
                 :fields="['geoFk', 'code', 'townFk', 'countryFk']"
                 sort-by="code, townFk"
-                option-value="geoFk"
+                option-value="code"
                 option-label="code"
                 option-filter="code"
                 hide-selected

From 67c2e284ba52d4d5df4338d50b05385bf65916c7 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 4 Oct 2024 11:45:10 +0200
Subject: [PATCH 262/281] feat: refs #7702 ask old pass

---
 src/components/common/VnChangePassword.vue    | 26 ++++++++++-------
 src/i18n/locale/en.yml                        |  1 +
 src/i18n/locale/es.yml                        |  1 +
 .../Account/Card/AccountDescriptorMenu.vue    | 28 ++++++++++++++++++-
 src/pages/Customer/Card/CustomerWebAccess.vue |  3 +-
 src/pages/Worker/Card/WorkerDescriptor.vue    |  3 +-
 6 files changed, 47 insertions(+), 15 deletions(-)

diff --git a/src/components/common/VnChangePassword.vue b/src/components/common/VnChangePassword.vue
index 18f538fc3..79784f3c5 100644
--- a/src/components/common/VnChangePassword.vue
+++ b/src/components/common/VnChangePassword.vue
@@ -6,7 +6,10 @@ import VnInput from './VnInput.vue';
 import FetchData from '../FetchData.vue';
 import useNotify from 'src/composables/useNotify';
 
-const props = defineProps({ submitFn: { type: Function, default: () => {} } });
+const props = defineProps({
+    submitFn: { type: Function, default: () => {} },
+    askOldPass: { type: Boolean, default: false },
+});
 const emit = defineEmits(['onSubmit']);
 const { t } = useI18n();
 const { notify } = useNotify();
@@ -18,8 +21,7 @@ const requirements = ref([]);
 const isLoading = ref(false);
 
 const validate = async () => {
-    const { newPassword, repeatPassword } = passwords.value;
-    console.log('Validating passwords:', newPassword, repeatPassword);
+    const { newPassword, repeatPassword, oldPassword } = passwords.value;
 
     if (!newPassword) {
         notify(t('You must enter a new password'), 'negative');
@@ -29,17 +31,14 @@ const validate = async () => {
         notify(t("Passwords don't match"), 'negative');
         return;
     }
+
     try {
         isLoading.value = true;
-        console.log('Calling submitFn with:', newPassword);
-
-        await props.submitFn(newPassword);
+        await props.submitFn(newPassword, oldPassword);
         emit('onSubmit');
     } catch (e) {
-        console.error('submitFn failed:', e);
         notify('errors.writeRequest', 'negative');
     } finally {
-        console.log('Entering finally block');
         changePassDialog.value.hide();
         isLoading.value = false;
     }
@@ -58,7 +57,7 @@ defineExpose({ show: () => changePassDialog.value.show() });
             <QCardSection>
                 <slot name="header">
                     <VnRow class="items-center" style="flex-direction: row">
-                        <span class="text-h6" v-text="t('Change password')" />
+                        <span class="text-h6" v-text="t('globals.changePass')" />
                         <QIcon
                             class="cursor-pointer"
                             name="close"
@@ -71,6 +70,14 @@ defineExpose({ show: () => changePassDialog.value.show() });
             </QCardSection>
             <QForm ref="form">
                 <QCardSection>
+                    <VnInput
+                        v-if="props.askOldPass"
+                        :label="t('Old password')"
+                        v-model="passwords.oldPassword"
+                        type="password"
+                        :required="true"
+                        autofocus
+                    />
                     <VnInput
                         :label="t('New password')"
                         v-model="passwords.newPassword"
@@ -122,7 +129,6 @@ defineExpose({ show: () => changePassDialog.value.show() });
 
 <i18n>
 es:
-    Change password: Cambiar contraseña
     New password: Nueva contraseña
     Repeat password: Repetir contraseña
     You must enter a new password: Debes introducir la nueva contraseña
diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 4c559dfdf..b76c147cd 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -300,6 +300,7 @@ globals:
         from: From
         To: To
         stateFk: State
+    changePass: Change password
 errors:
     statusUnauthorized: Access denied
     statusInternalServerError: An internal server error has ocurred
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 7cb17aad3..d0d5bdc0d 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -304,6 +304,7 @@ globals:
         from: Desde
         To: Hasta
         stateFk: Estado
+    changePass: Cambiar contraseña
 errors:
     statusUnauthorized: Acceso denegado
     statusInternalServerError: Ha ocurrido un error interno del servidor
diff --git a/src/pages/Account/Card/AccountDescriptorMenu.vue b/src/pages/Account/Card/AccountDescriptorMenu.vue
index 0e35d25f3..6f1d2ca1f 100644
--- a/src/pages/Account/Card/AccountDescriptorMenu.vue
+++ b/src/pages/Account/Card/AccountDescriptorMenu.vue
@@ -4,9 +4,12 @@ import { computed, ref, toRefs } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useVnConfirm } from 'composables/useVnConfirm';
 import { useRoute } from 'vue-router';
+import { useAcl } from 'src/composables/useAcl';
 import { useArrayData } from 'src/composables/useArrayData';
 import VnConfirm from 'src/components/ui/VnConfirm.vue';
+import VnChangePassword from 'src/components/common/VnChangePassword.vue';
 import useNotify from 'src/composables/useNotify.js';
+
 const $props = defineProps({
     hasAccount: {
         type: Boolean,
@@ -62,6 +65,19 @@ async function sync() {
 }
 </script>
 <template>
+    <VnChangePassword
+        ref="changePassRef"
+        :ask-old-pass="true"
+        :submit-fn="
+            async (newPassword, oldPassword) => {
+                await axios.patch(`Accounts/change-password`, {
+                    userId: entityId,
+                    newPassword,
+                    oldPassword,
+                });
+            }
+        "
+    />
     <VnConfirm
         v-model="showSyncDialog"
         :message="t('account.card.actions.sync.message')"
@@ -92,6 +108,17 @@ async function sync() {
             />
         </template>
     </VnConfirm>
+    <QItem
+        v-if="
+            entityId == account.id &&
+            useAcl().hasAny([{ model: 'Account', props: '*', accessType: 'WRITE' }])
+        "
+        v-ripple
+        clickable
+        @click="$refs.changePassRef.show()"
+    >
+        <QItemSection>{{ t('globals.changePass') }}</QItemSection>
+    </QItem>
     <QItem
         v-if="account.hasAccount"
         v-ripple
@@ -138,6 +165,5 @@ async function sync() {
     <QItem v-ripple clickable @click="showSyncDialog = true">
         <QItemSection>{{ t('account.card.actions.sync.name') }}</QItemSection>
     </QItem>
-
     <QSeparator />
 </template>
diff --git a/src/pages/Customer/Card/CustomerWebAccess.vue b/src/pages/Customer/Card/CustomerWebAccess.vue
index ba906a144..1db32c752 100644
--- a/src/pages/Customer/Card/CustomerWebAccess.vue
+++ b/src/pages/Customer/Card/CustomerWebAccess.vue
@@ -56,7 +56,7 @@ async function hasCustomerRole() {
         </template>
         <template #moreActions>
             <QBtn
-                :label="t('Change password')"
+                :label="t('globals.changePass')"
                 color="primary"
                 icon="edit"
                 :disable="!canChangePassword"
@@ -81,5 +81,4 @@ es:
     User: Usuario
     Recovery email: Correo de recuperacion
     This email is used for user to regain access their account: Este correo electrónico se usa para que el usuario recupere el acceso a su cuenta
-    Change password: Cambiar contraseña
 </i18n>
diff --git a/src/pages/Worker/Card/WorkerDescriptor.vue b/src/pages/Worker/Card/WorkerDescriptor.vue
index 6a70e46f5..1cb42bbfb 100644
--- a/src/pages/Worker/Card/WorkerDescriptor.vue
+++ b/src/pages/Worker/Card/WorkerDescriptor.vue
@@ -88,7 +88,7 @@ const handlePhotoUpdated = (evt = false) => {
                 @click="$refs.changePassRef.show"
             >
                 <QItemSection>
-                    {{ t('Change password') }}
+                    {{ t('globals.changePass') }}
                 </QItemSection>
             </QItem>
         </template>
@@ -209,5 +209,4 @@ const handlePhotoUpdated = (evt = false) => {
 es:
     Click to allow the user to be disabled: Marcar para deshabilitar
     Click to exclude the user from getting disabled: Marcar para no deshabilitar
-    Change password: Cambiar contraseña
 </i18n>

From ae8e4ba4b975b1c6381fabec08de18cbc190f978 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 4 Oct 2024 11:54:40 +0200
Subject: [PATCH 263/281] chore: refs #7702 fix tests

---
 .../common/VnChangePassword.spec.js           | 21 ++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/test/vitest/__tests__/components/common/VnChangePassword.spec.js b/test/vitest/__tests__/components/common/VnChangePassword.spec.js
index e7a3bdcf7..f5a967bb5 100644
--- a/test/vitest/__tests__/components/common/VnChangePassword.spec.js
+++ b/test/vitest/__tests__/components/common/VnChangePassword.spec.js
@@ -50,10 +50,21 @@ describe('VnSmsDialog', () => {
         );
     });
 
-    it('should call submitFn and emit onSubmit when passwords match', async () => {
-        vm.passwords.newPassword = 'password';
-        vm.passwords.repeatPassword = 'password';
-        await vm.validate();
-        expect(vm.props.submitFn).toHaveBeenCalledWith('password');
+    describe('if passwords match', () => {
+        it('should call submitFn and emit password', async () => {
+            vm.passwords.newPassword = 'password';
+            vm.passwords.repeatPassword = 'password';
+            await vm.validate();
+            expect(vm.props.submitFn).toHaveBeenCalledWith('password', undefined);
+        });
+
+        it('should call submitFn and emit password and old password', async () => {
+            vm.passwords.newPassword = 'password';
+            vm.passwords.repeatPassword = 'password';
+            vm.passwords.oldPassword = 'oldPassword';
+
+            await vm.validate();
+            expect(vm.props.submitFn).toHaveBeenCalledWith('password', 'oldPassword');
+        });
     });
 });

From 195747b5a0e938f3fe89779a4775ddeb79e22f72 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 4 Oct 2024 12:34:37 +0200
Subject: [PATCH 264/281] feat: added click and transfer tickets and deleted
 useless code

---
 src/pages/Ticket/Card/TicketTransfer.vue     | 38 ++++++--------------
 src/pages/Ticket/Card/TicketTransferForm.vue |  7 ++--
 2 files changed, 14 insertions(+), 31 deletions(-)

diff --git a/src/pages/Ticket/Card/TicketTransfer.vue b/src/pages/Ticket/Card/TicketTransfer.vue
index 1944b80f4..e1a011a84 100644
--- a/src/pages/Ticket/Card/TicketTransfer.vue
+++ b/src/pages/Ticket/Card/TicketTransfer.vue
@@ -1,13 +1,11 @@
 <script setup>
 import { ref, computed, onMounted } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { useRouter } from 'vue-router';
 
 import VnInput from 'src/components/common/VnInput.vue';
 import TicketTransferForm from './TicketTransferForm.vue';
 
 import { toDateFormat } from 'src/filters/date.js';
-import axios from 'axios';
 
 const $props = defineProps({
     mana: {
@@ -28,13 +26,10 @@ const $props = defineProps({
     },
 });
 
-const emit = defineEmits(['refreshData']);
-
-const router = useRouter();
 const { t } = useI18n();
 const QPopupProxyRef = ref(null);
-
-const _transfer = ref(null);
+const transferFormRef = ref(null);
+const _transfer = ref();
 
 const transferLinesColumns = computed(() => [
     {
@@ -85,19 +80,11 @@ const destinationTicketColumns = computed(() => [
     },
 ]);
 
-const transferSales = async (ticketId) => {
-    const params = {
-        ticketId: ticketId,
-        sales: $props.transfer.sales,
-    };
-
-    const { data } = await axios.post(
-        `tickets/${$props.ticket.id}/transferSales`,
-        params
-    );
-
-    if (data && data.id === $props.ticket.id) emit('refreshData');
-    else router.push({ name: 'TicketSale', params: { id: data.id } });
+const handleRowClick = (row) => {
+    const ticketId = row.id;
+    if (transferFormRef.value) {
+        transferFormRef.value.transferSales(ticketId);
+    }
 };
 
 onMounted(() => (_transfer.value = $props.transfer));
@@ -105,9 +92,8 @@ onMounted(() => (_transfer.value = $props.transfer));
 
 <template>
     <QPopupProxy ref="QPopupProxyRef">
-        <QCard class="q-px-md" style="display: flex">
+        <QCard class="q-px-md" style="display: flex; width: 80vw">
             <QTable
-                v-if="transfer.sales"
                 :rows="transfer.sales"
                 :columns="transferLinesColumns"
                 :title="t('Sales to transfer')"
@@ -121,9 +107,6 @@ onMounted(() => (_transfer.value = $props.transfer));
                         <VnInput
                             v-model.number="row.quantity"
                             :clearable="false"
-                            @keyup.enter="changeQuantity(row)"
-                            @blur="changeQuantity(row)"
-                            @focus="edit.oldQuantity = row.quantity"
                             style="max-width: 60px"
                         />
                     </QTd>
@@ -137,6 +120,7 @@ onMounted(() => (_transfer.value = $props.transfer));
                 :title="t('Destination ticket')"
                 row-key="id"
                 class="full-width q-mt-md"
+                @row-click="(_, row) => handleRowClick(row)"
             >
                 <template #body-cell-address="{ row }">
                     <QTd @click.stop>
@@ -158,10 +142,10 @@ onMounted(() => (_transfer.value = $props.transfer));
                 </template>
 
                 <template #no-data>
-                    <TicketTransferForm v-bind="$props" />
+                    <TicketTransferForm ref="transferFormRef" v-bind="$props" />
                 </template>
                 <template #bottom>
-                    <TicketTransferForm v-bind="$props" />
+                    <TicketTransferForm ref="transferFormRef" v-bind="$props" />
                 </template>
             </QTable>
         </QCard>
diff --git a/src/pages/Ticket/Card/TicketTransferForm.vue b/src/pages/Ticket/Card/TicketTransferForm.vue
index 9507429e6..d07a9d2e7 100644
--- a/src/pages/Ticket/Card/TicketTransferForm.vue
+++ b/src/pages/Ticket/Card/TicketTransferForm.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, onMounted } from 'vue';
+import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
 
@@ -31,7 +31,7 @@ const emit = defineEmits(['refreshData']);
 const router = useRouter();
 const { t } = useI18n();
 
-const _transfer = ref(null);
+const _transfer = ref($props.transfer);
 
 const transferSales = async (ticketId) => {
     const params = {
@@ -48,11 +48,10 @@ const transferSales = async (ticketId) => {
     else router.push({ name: 'TicketSale', params: { id: data.id } });
 };
 
-onMounted(() => (_transfer.value = $props.transfer));
+defineExpose({ transferSales });
 </script>
 
 <template>
-    {{ _transfer }}
     <QForm class="q-mt-lg full-width">
         <VnInput
             v-model.number="_transfer.ticketId"

From 7dc019cfbbc24bd51f0e426bb96867f3c35d71d2 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Fri, 4 Oct 2024 13:13:57 +0200
Subject: [PATCH 265/281] fix: refs #4988 selector on e2e

---
 src/pages/Route/Agency/Card/AgencyWorkcenter.vue | 13 +++++++------
 .../route/agency/agencyWorkCenter.spec.js        | 16 +++++++---------
 test/cypress/integration/route/routeList.spec.js |  2 +-
 3 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/src/pages/Route/Agency/Card/AgencyWorkcenter.vue b/src/pages/Route/Agency/Card/AgencyWorkcenter.vue
index 1f3cab5d0..86fb94e0a 100644
--- a/src/pages/Route/Agency/Card/AgencyWorkcenter.vue
+++ b/src/pages/Route/Agency/Card/AgencyWorkcenter.vue
@@ -46,13 +46,13 @@ async function deleteWorCenter(id) {
 }
 </script>
 <template>
+    <FetchData
+        url="workCenters"
+        sort-by="name"
+        @on-fetch="(data) => (warehouses = data)"
+        auto-load
+    />
     <div class="centerCard">
-        <FetchData
-            url="workCenters"
-            sort-by="name"
-            @on-fetch="(data) => (warehouses = data)"
-            auto-load
-        />
         <VnPaginate
             ref="paginate"
             data-key="AgencyWorkCenters"
@@ -108,6 +108,7 @@ async function deleteWorCenter(id) {
                                 use-input
                                 input-debounce="0"
                                 :is-clearable="false"
+                                id="pingadera"
                             />
                         </VnRow>
                     </template>
diff --git a/test/cypress/integration/route/agency/agencyWorkCenter.spec.js b/test/cypress/integration/route/agency/agencyWorkCenter.spec.js
index 6d33dbc39..353c5805b 100644
--- a/test/cypress/integration/route/agency/agencyWorkCenter.spec.js
+++ b/test/cypress/integration/route/agency/agencyWorkCenter.spec.js
@@ -4,12 +4,12 @@ describe('AgencyWorkCenter', () => {
         cy.login('developer');
         cy.visit(`/#/agency/11/workCenter`);
     });
+    const createButton = '.q-page-sticky > div > .q-btn > .q-btn__content > .q-icon';
+    const workCenterCombobox = 'input[role="combobox"]';
 
     it('assign workCenter', () => {
-        cy.get('.q-page-sticky > div > .q-btn > .q-btn__content > .q-icon').click();
-        cy.get(
-            '.vn-row > .q-field > .q-field__inner > .q-field__control > .q-field__control-container'
-        ).type('workCenterOne{enter}');
+        cy.get(createButton).click();
+        cy.get(workCenterCombobox).type('workCenterOne{enter}');
         cy.get('.q-notification__message').should('have.text', 'Data created');
     });
 
@@ -22,12 +22,10 @@ describe('AgencyWorkCenter', () => {
     });
 
     it('error on duplicate workCenter', () => {
-        cy.get('.q-page-sticky > div > .q-btn > .q-btn__content > .q-icon').click();
-        cy.get(
-            '.vn-row > .q-field > .q-field__inner > .q-field__control > .q-field__control-container'
-        ).type('workCenterOne{enter}');
+        cy.get(createButton).click();
+        cy.get(workCenterCombobox).type('workCenterOne{enter}');
         cy.get('.q-notification__message').should('have.text', 'Data created');
-        cy.get('.q-page-sticky > div > .q-btn > .q-btn__content > .q-icon').click();
+        cy.get(createButton).click();
         cy.get(
             '.vn-row > .q-field > .q-field__inner > .q-field__control > .q-field__control-container'
         ).type('workCenterOne{enter}');
diff --git a/test/cypress/integration/route/routeList.spec.js b/test/cypress/integration/route/routeList.spec.js
index c9d7147c2..8020d3ea9 100644
--- a/test/cypress/integration/route/routeList.spec.js
+++ b/test/cypress/integration/route/routeList.spec.js
@@ -2,7 +2,7 @@ describe('Route', () => {
     beforeEach(() => {
         cy.viewport(1920, 1080);
         cy.login('developer');
-        cy.visit(`/#/route/list`);
+        cy.visit(`/#/route/extended-list`);
     });
     const getVnSelect =
         '> :nth-child(1) > .column > .q-field > .q-field__inner > .q-field__control > .q-field__control-container';

From 1869e3315ae64a865d5f133ae4152fb6d9475045 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Fri, 4 Oct 2024 13:14:14 +0200
Subject: [PATCH 266/281] fix: refs #4988 remove id

---
 src/pages/Route/Agency/Card/AgencyWorkcenter.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/Route/Agency/Card/AgencyWorkcenter.vue b/src/pages/Route/Agency/Card/AgencyWorkcenter.vue
index 86fb94e0a..7103ea9ce 100644
--- a/src/pages/Route/Agency/Card/AgencyWorkcenter.vue
+++ b/src/pages/Route/Agency/Card/AgencyWorkcenter.vue
@@ -108,7 +108,6 @@ async function deleteWorCenter(id) {
                                 use-input
                                 input-debounce="0"
                                 :is-clearable="false"
-                                id="pingadera"
                             />
                         </VnRow>
                     </template>

From 3a21f6aadb5d3aa50fdff0d85d1c2e81532f5f87 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 4 Oct 2024 14:22:00 +0200
Subject: [PATCH 267/281] fix: order catalog

---
 src/pages/Order/Card/OrderCatalog.vue         |  1 +
 .../Order/Card/OrderCatalogItemDialog.vue     | 21 +++++++++++++++++--
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/pages/Order/Card/OrderCatalog.vue b/src/pages/Order/Card/OrderCatalog.vue
index 68bf9511f..b13e8661d 100644
--- a/src/pages/Order/Card/OrderCatalog.vue
+++ b/src/pages/Order/Card/OrderCatalog.vue
@@ -130,4 +130,5 @@ function extractValueTags(items) {
 <i18n>
 es:
     You can search items by name or id: Puedes buscar items por nombre o id
+    Search items: Buscar items
 </i18n>
diff --git a/src/pages/Order/Card/OrderCatalogItemDialog.vue b/src/pages/Order/Card/OrderCatalogItemDialog.vue
index 46a50c021..09a25fcb8 100644
--- a/src/pages/Order/Card/OrderCatalogItemDialog.vue
+++ b/src/pages/Order/Card/OrderCatalogItemDialog.vue
@@ -20,8 +20,10 @@ const props = defineProps({
 
 const fields = ref((props.prices || []).map((item) => ({ ...item, quantity: 0 })));
 const descriptorData = useArrayData('orderData');
-
+const isLoading = ref(false);
 const addToOrder = async () => {
+    if (isLoading.value) return;
+    isLoading.value = true;
     const items = (fields.value || []).filter((item) => Number(item.quantity) > 0);
     await axios.post('/OrderRows/addToOrder', {
         items,
@@ -30,6 +32,10 @@ const addToOrder = async () => {
     notify(t('globals.dataSaved'), 'positive');
     emit('added');
     descriptorData.fetch({});
+    isLoading.value = false;
+};
+const canAddToOrder = () => {
+    return (fields.value || []).some((item) => Number(item.quantity) > 0);
 };
 </script>
 
@@ -68,7 +74,11 @@ const addToOrder = async () => {
                 </tbody>
             </QMarkupTable>
             <div class="flex justify-center q-mt-lg">
-                <QBtn color="primary" type="submit">
+                <QBtn
+                    color="primary"
+                    type="submit"
+                    :disable="!isLoading && !canAddToOrder()"
+                >
                     {{ t('globals.add') }}
                 </QBtn>
             </div>
@@ -81,3 +91,10 @@ const addToOrder = async () => {
     width: 200px;
 }
 </style>
+
+<i18n>
+es:
+    noAmount: La cantidad no puede ser 0
+en:
+    noAmount: Amount can not be 0
+</i18n>

From aee23c75e86dae184798c64f8642e84e59993c32 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 4 Oct 2024 14:31:39 +0200
Subject: [PATCH 268/281] fix: order module

---
 src/pages/Order/Card/OrderCatalog.vue         |  1 +
 src/pages/Order/Card/OrderCatalogFilter.vue   |  1 +
 .../Order/Card/OrderCatalogItemDialog.vue     | 21 +++++++++++++++++--
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/pages/Order/Card/OrderCatalog.vue b/src/pages/Order/Card/OrderCatalog.vue
index 68bf9511f..b13e8661d 100644
--- a/src/pages/Order/Card/OrderCatalog.vue
+++ b/src/pages/Order/Card/OrderCatalog.vue
@@ -130,4 +130,5 @@ function extractValueTags(items) {
 <i18n>
 es:
     You can search items by name or id: Puedes buscar items por nombre o id
+    Search items: Buscar items
 </i18n>
diff --git a/src/pages/Order/Card/OrderCatalogFilter.vue b/src/pages/Order/Card/OrderCatalogFilter.vue
index 354c44747..6de43e86a 100644
--- a/src/pages/Order/Card/OrderCatalogFilter.vue
+++ b/src/pages/Order/Card/OrderCatalogFilter.vue
@@ -247,6 +247,7 @@ function addOrder(value, field, params) {
                         rounded
                         emit-value
                         use-input
+                        sort-by="name ASC"
                         :disable="!selectedCategoryFk"
                         @update:model-value="
                             (value) => {
diff --git a/src/pages/Order/Card/OrderCatalogItemDialog.vue b/src/pages/Order/Card/OrderCatalogItemDialog.vue
index 46a50c021..09a25fcb8 100644
--- a/src/pages/Order/Card/OrderCatalogItemDialog.vue
+++ b/src/pages/Order/Card/OrderCatalogItemDialog.vue
@@ -20,8 +20,10 @@ const props = defineProps({
 
 const fields = ref((props.prices || []).map((item) => ({ ...item, quantity: 0 })));
 const descriptorData = useArrayData('orderData');
-
+const isLoading = ref(false);
 const addToOrder = async () => {
+    if (isLoading.value) return;
+    isLoading.value = true;
     const items = (fields.value || []).filter((item) => Number(item.quantity) > 0);
     await axios.post('/OrderRows/addToOrder', {
         items,
@@ -30,6 +32,10 @@ const addToOrder = async () => {
     notify(t('globals.dataSaved'), 'positive');
     emit('added');
     descriptorData.fetch({});
+    isLoading.value = false;
+};
+const canAddToOrder = () => {
+    return (fields.value || []).some((item) => Number(item.quantity) > 0);
 };
 </script>
 
@@ -68,7 +74,11 @@ const addToOrder = async () => {
                 </tbody>
             </QMarkupTable>
             <div class="flex justify-center q-mt-lg">
-                <QBtn color="primary" type="submit">
+                <QBtn
+                    color="primary"
+                    type="submit"
+                    :disable="!isLoading && !canAddToOrder()"
+                >
                     {{ t('globals.add') }}
                 </QBtn>
             </div>
@@ -81,3 +91,10 @@ const addToOrder = async () => {
     width: 200px;
 }
 </style>
+
+<i18n>
+es:
+    noAmount: La cantidad no puede ser 0
+en:
+    noAmount: Amount can not be 0
+</i18n>

From c3c252834280561e6814cfb2e392516736fd95a0 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Sat, 5 Oct 2024 00:31:32 +0200
Subject: [PATCH 269/281] feat: #7356 improve NotesSummary

---
 src/pages/Ticket/Card/TicketSummary.vue | 37 +++++++++++++++----------
 1 file changed, 22 insertions(+), 15 deletions(-)

diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index 2e85be000..8f359f649 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -17,6 +17,7 @@ import VnUserLink from 'src/components/ui/VnUserLink.vue';
 import VnTitle from 'src/components/common/VnTitle.vue';
 import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
+import { QVirtualScroll } from 'quasar';
 
 const route = useRoute();
 const { notify } = useNotify();
@@ -229,22 +230,28 @@ async function changeState(value) {
                     :url="ticketUrl + 'observation'"
                     :text="t('ticket.pageTitles.notes')"
                 />
-                <VnLv
-                    v-for="note in entity.notes"
-                    :key="note.id"
-                    :label="note.observationType.description"
-                    :value="note.description"
+                <QVirtualScroll
+                    :items="entity.notes"
+                    v-slot="{ item, index }"
+                    style="max-height: 300px"
+                    separator
+                >
+                    <QItem
+                        :key="index"
+                        class="vn-label-value"
+                        style="
+                            display: inline-block;
+                            padding: unset;
+                            min-height: max-content;
+                        "
+                    >
+                        <span class="label" style="margin-right: 4px">
+                            {{ item.observationType.description }}:</span
+                        >
+
+                        <span>{{ item.description }}</span>
+                    </QItem></QVirtualScroll
                 >
-                    <template #value>
-                        <QInput
-                            v-model="note.description"
-                            filled
-                            type="textarea"
-                            class="notes"
-                            readonly
-                        />
-                    </template>
-                </VnLv>
             </QCard>
             <QCard class="vn-one">
                 <VnTitle :text="t('ticket.summary.summaryAmount')" />

From 04b2a4d9cec12c2d5e7a572e01a699114501b119 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Sat, 5 Oct 2024 00:31:41 +0200
Subject: [PATCH 270/281] perf: clean warnings

---
 src/components/VnTable/VnTable.vue                     | 2 +-
 src/components/common/VnSelectDialog.vue               | 2 +-
 src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue | 3 ---
 src/pages/Order/Card/OrderCreateDialog.vue             | 4 +---
 src/pages/Ticket/Card/TicketSummary.vue                | 1 -
 5 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 3ed741ac4..f18892a31 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -310,7 +310,7 @@ defineExpose({
     params,
 });
 
-function handleOnDataSaved(_, res) {
+function handleOnDataSaved(_) {
     if (_.onDataSaved) _.onDataSaved({ CrudModelRef: CrudModelRef.value });
     else $props.create.onDataSaved(_);
 }
diff --git a/src/components/common/VnSelectDialog.vue b/src/components/common/VnSelectDialog.vue
index 17f893255..350aa9272 100644
--- a/src/components/common/VnSelectDialog.vue
+++ b/src/components/common/VnSelectDialog.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, computed } from 'vue';
+import { computed } from 'vue';
 import { useRole } from 'src/composables/useRole';
 import { useAcl } from 'src/composables/useAcl';
 
diff --git a/src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue b/src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue
index 08b21fb4a..70d38cb93 100644
--- a/src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue
+++ b/src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue
@@ -9,7 +9,6 @@ import RefundInvoiceForm from 'src/components/RefundInvoiceForm.vue';
 import SendEmailDialog from 'components/common/SendEmailDialog.vue';
 
 import useNotify from 'src/composables/useNotify';
-import { useSession } from 'src/composables/useSession';
 import { usePrintService } from 'composables/usePrintService';
 import { useVnConfirm } from 'composables/useVnConfirm';
 import { getUrl } from 'src/composables/getUrl';
@@ -30,8 +29,6 @@ const $props = defineProps({
 
 const { notify } = useNotify();
 const router = useRouter();
-const session = useSession();
-const token = session.getToken();
 const { t } = useI18n();
 const { openReport, sendEmail } = usePrintService();
 const { openConfirmationModal } = useVnConfirm();
diff --git a/src/pages/Order/Card/OrderCreateDialog.vue b/src/pages/Order/Card/OrderCreateDialog.vue
index 9d5c9281e..27b0171f2 100644
--- a/src/pages/Order/Card/OrderCreateDialog.vue
+++ b/src/pages/Order/Card/OrderCreateDialog.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { useRoute, useRouter } from 'vue-router';
+import { useRouter } from 'vue-router';
 import { onMounted, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import axios from 'axios';
@@ -13,12 +13,10 @@ import { reactive } from 'vue';
 import FetchData from 'components/FetchData.vue';
 
 const { t } = useI18n();
-const route = useRoute();
 const state = useState();
 const ORDER_MODEL = 'order';
 
 const router = useRouter();
-const clientList = ref([]);
 const agencyList = ref([]);
 const addressList = ref([]);
 defineEmits(['confirm', ...useDialogPluginComponent.emits]);
diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index 8f359f649..1f2a7ca79 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -17,7 +17,6 @@ import VnUserLink from 'src/components/ui/VnUserLink.vue';
 import VnTitle from 'src/components/common/VnTitle.vue';
 import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
-import { QVirtualScroll } from 'quasar';
 
 const route = useRoute();
 const { notify } = useNotify();

From 34a40dd87c9c24d71f90e94d892678fca5fe4259 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Mon, 7 Oct 2024 08:24:53 +0200
Subject: [PATCH 271/281] fix(VnPaginate): use default value

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

diff --git a/src/components/ui/VnPaginate.vue b/src/components/ui/VnPaginate.vue
index c6f57b479..80c607214 100644
--- a/src/components/ui/VnPaginate.vue
+++ b/src/components/ui/VnPaginate.vue
@@ -56,7 +56,7 @@ const props = defineProps({
     },
     offset: {
         type: Number,
-        default: 0,
+        default: undefined,
     },
     skeleton: {
         type: Boolean,

From ef5ae0f723bad7d0037093e94232eb6032e3d244 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Mon, 7 Oct 2024 09:16:07 +0200
Subject: [PATCH 272/281] refactor(ticketNotes): translations

---
 src/pages/Ticket/Card/TicketNotes.vue   | 10 ++++++--
 src/pages/Ticket/Card/TicketSummary.vue | 31 ++++---------------------
 src/pages/Ticket/locale/en.yml          | 10 ++++++++
 src/pages/Ticket/locale/es.yml          | 14 ++++++++++-
 4 files changed, 36 insertions(+), 29 deletions(-)

diff --git a/src/pages/Ticket/Card/TicketNotes.vue b/src/pages/Ticket/Card/TicketNotes.vue
index ea06cd9f6..b5302d15f 100644
--- a/src/pages/Ticket/Card/TicketNotes.vue
+++ b/src/pages/Ticket/Card/TicketNotes.vue
@@ -49,7 +49,13 @@ async function handleSave() {
 
 <template>
     <FetchData
-        @on-fetch="(data) => (observationTypes = data)"
+        @on-fetch="
+            (data) =>
+                (observationTypes = data.map((type) => {
+                    type.label = t(`ticketNotes.observationTypes.${type.description}`);
+                    return type;
+                }))
+        "
         auto-load
         url="ObservationTypes"
     />
@@ -76,7 +82,7 @@ async function handleSave() {
                             :label="t('ticketNotes.observationType')"
                             :options="observationTypes"
                             hide-selected
-                            option-label="description"
+                            option-label="label"
                             option-value="id"
                             v-model="row.observationTypeFk"
                             :disable="!!row.id"
diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index bd3353d75..af96c2724 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -269,7 +269,11 @@ function toTicketUrl(section) {
                         "
                     >
                         <span class="label" style="margin-right: 4px">
-                            ({{ t(item.observationType.description) }}):
+                            ({{
+                                t(
+                                    `ticketNotes.observationTypes.${item.observationType.description}`
+                                )
+                            }}):
                         </span>
 
                         <span>{{ item.description }}</span>
@@ -603,28 +607,3 @@ function toTicketUrl(section) {
     color: $primary-light;
 }
 </style>
-
-<i18n>
-en:
-    ItemPicker: Item Picker
-    Packager: Packager
-    Delivery: Delivery
-    SalesPerson: Sales Person
-    Administrative: Administrative
-    Weight: Weight
-    InvoiceOut: Invoice Out
-    DropOff: Drop Off
-    Sustitución: Sustitution
-es:
-    ItemPicker: Items
-    Packager: Encajador
-    Delivery: Envío
-    SalesPerson: Comercial
-    Administrative: Administrativa
-    Weight: Peso
-    InvoiceOut: Facturas
-    DropOff: Despacho
-    Sustitución: Sustitución
-    Accepted: Aceptado
-    Denied: Denegado
-</i18n>
diff --git a/src/pages/Ticket/locale/en.yml b/src/pages/Ticket/locale/en.yml
index 58367e3a2..829ea7a91 100644
--- a/src/pages/Ticket/locale/en.yml
+++ b/src/pages/Ticket/locale/en.yml
@@ -14,6 +14,16 @@ ticketNotes:
     description: Description
     removeNote: Remove note
     addNote: Add note
+    observationTypes:
+        ItemPicker: Item picker
+        Packager: Packager
+        Delivery: Delivery
+        SalesPerson: Sales person
+        Administrative: Administrative
+        Weight: Weight
+        InvoiceOut: Invoice Out
+        DropOff: Drop Off
+        Sustitución: Sustitution
 ticketSale:
     id: Id
     visible: Visible
diff --git a/src/pages/Ticket/locale/es.yml b/src/pages/Ticket/locale/es.yml
index 1acaf154b..b372e48ef 100644
--- a/src/pages/Ticket/locale/es.yml
+++ b/src/pages/Ticket/locale/es.yml
@@ -29,6 +29,18 @@ ticketNotes:
     description: Descripción
     removeNote: Quitar nota
     addNote: Añadir nota
+    observationTypes:
+        ItemPicker: Sacador
+        Packager: Encajador
+        Delivery: Envío
+        SalesPerson: Comercial
+        Administrative: Administrativa
+        Weight: Peso
+        InvoiceOut: Facturas
+        DropOff: Despacho
+        Sustitución: Sustitución
+        Accepted: Aceptado
+        Denied: Denegado
 purchaseRequest:
     Id: Id
     description: Descripción
@@ -86,7 +98,7 @@ weeklyTickets:
     search: Buscar por tickets programados
     searchInfo: Buscar tickets programados por el identificador o el identificador del cliente
 advanceTickets:
-    preparation: Preparación    
+    preparation: Preparación
     origin: Origen
     destination: Destinatario
     originAgency: 'Agencia origen: {agency}'

From 5d65d3e20cfbe5f96e42978a17f9b9e7d4df2883 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Mon, 7 Oct 2024 09:48:57 +0200
Subject: [PATCH 273/281] refs #6898 hotfix agency

---
 src/pages/Supplier/Card/SupplierAgencyTermCreate.vue | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/pages/Supplier/Card/SupplierAgencyTermCreate.vue b/src/pages/Supplier/Card/SupplierAgencyTermCreate.vue
index a87ea502b..515d157e5 100644
--- a/src/pages/Supplier/Card/SupplierAgencyTermCreate.vue
+++ b/src/pages/Supplier/Card/SupplierAgencyTermCreate.vue
@@ -15,12 +15,12 @@ const route = useRoute();
 const agenciesOptions = ref(null);
 const newAgencyTermForm = reactive({
     agencyFk: null,
-    minimumM3: null,
-    packagePrice: null,
-    kmPrice: null,
-    m3Price: null,
-    routePrice: null,
-    minimumKm: null,
+    minimumM3: 0,
+    packagePrice: 0,
+    kmPrice: 0,
+    m3Price: 0,
+    routePrice: 0,
+    minimumKm: 0,
     supplierFk: route.params.id,
 });
 

From 4f3e7e26309aced2bd4a98f1bffd13b5a05bc65b Mon Sep 17 00:00:00 2001
From: guillermo <guillermo@verdnatura.es>
Date: Mon, 7 Oct 2024 10:03:05 +0200
Subject: [PATCH 274/281] feat: refs #7893 Added waste recalc section

---
 src/i18n/locale/en.yml               |  6 +++
 src/i18n/locale/es.yml               |  6 +++
 src/pages/Entry/EntryWasteRecalc.vue | 76 ++++++++++++++++++++++++++++
 src/router/modules/entry.js          | 17 ++++++-
 4 files changed, 104 insertions(+), 1 deletion(-)
 create mode 100644 src/pages/Entry/EntryWasteRecalc.vue

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 20a612a82..68214129f 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -105,6 +105,7 @@ globals:
     campaign: Campaign
     weight: Weight
     error: Ups! Something went wrong
+    recalc: Recalculate
     pageTitles:
         logIn: Login
         addressEdit: Update address
@@ -275,6 +276,7 @@ globals:
         serial: Serial
         medical: Mutual
         RouteExtendedList: Router
+        wasteRecalc: Waste recaclulate
     supplier: Supplier
     created: Created
     worker: Worker
@@ -465,6 +467,10 @@ entry:
             landing: Landing
             isExcludedFromAvailable: Es inventory
             isRaid: Raid
+    wasteRecalc:
+        dateRequired: The date fields are required
+        dateIncoherent: The "from" date cannot be later than the "to" date
+        recalcOk: The wastes were successfully recalculated
 ticket:
     pageTitles:
         tickets: Tickets
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index ae0274415..7e1671fbf 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -107,6 +107,7 @@ globals:
     campaign: Campaña
     weight: Peso
     error: ¡Ups! Algo salió mal
+    recalc: Recalcular
     pageTitles:
         logIn: Inicio de sesión
         addressEdit: Modificar consignatario
@@ -279,6 +280,7 @@ globals:
         clientsActionsMonitor: Clientes y acciones
         serial: Facturas por serie
         medical: Mutua
+        wasteRecalc: Recalcular mermas
     supplier: Proveedor
     created: Fecha creación
     worker: Trabajador
@@ -467,6 +469,10 @@ entry:
             landing: Llegada
             isExcludedFromAvailable: Es inventario
             isRaid: Redada
+    wasteRecalc:
+        dateRequired: Los campos de tipo fecha son obligatorios
+        dateIncoherent: La fecha "desde" no puede ser superior a la fecha "hasta"
+        recalcOk: Se han recalculado las mermas correctamente
 ticket:
     pageTitles:
         tickets: Tickets
diff --git a/src/pages/Entry/EntryWasteRecalc.vue b/src/pages/Entry/EntryWasteRecalc.vue
new file mode 100644
index 000000000..2fb9c3abf
--- /dev/null
+++ b/src/pages/Entry/EntryWasteRecalc.vue
@@ -0,0 +1,76 @@
+<script setup>
+import { ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import VnInputDate from 'components/common/VnInputDate.vue';
+import useNotify from 'src/composables/useNotify.js';
+import axios from 'axios';
+
+const { t } = useI18n();
+
+const isLoading = ref(false);
+const dateFrom = ref();
+const dateTo = ref();
+const recalc = async () => {
+    const { notify } = useNotify();
+    if (!dateFrom.value || !dateTo.value) {
+        notify('entry.wasteRecalc.dateRequired', 'negative');
+        return;
+    }
+
+    const from = new Date(dateFrom.value);
+    const to = new Date(dateTo.value);
+
+    if (from > to) {
+        notify('entry.wasteRecalc.dateIncoherent', 'negative');
+        return;
+    }
+
+    const params = {
+        schema: 'bs',
+        params: [from, to],
+    };
+
+    try {
+        isLoading.value = true;
+        await axios.post('Applications/waste_addSales/execute-proc', params);
+        notify('entry.wasteRecalc.recalcOk', 'positive');
+    } catch (err) {
+        console.error('Error in execution:', err);
+        notify('entry.wasteRecalc.recalcOk', 'negative');
+    } finally {
+        isLoading.value = false;
+    }
+};
+</script>
+
+<template>
+    <div class="q-pa-lg row justify-center">
+        <QCard class="bg-light" style="width: 300px">
+            <QCardSection>
+                <VnInputDate
+                    class="q-mb-lg"
+                    v-model="dateFrom"
+                    :label="t('globals.from')"
+                    rounded
+                    dense
+                />
+                <VnInputDate
+                    class="q-mb-lg"
+                    v-model="dateTo"
+                    :label="t('globals.to')"
+                    rounded
+                    dense
+                />
+                <QBtn
+                    color="primary"
+                    text-color="white"
+                    :label="t('globals.recalc')"
+                    icon="Calculate"
+                    :loading="isLoading"
+                    :disable="isLoading"
+                    @click="recalc()"
+                />
+            </QCardSection>
+        </QCard>
+    </div>
+</template>
diff --git a/src/router/modules/entry.js b/src/router/modules/entry.js
index 4750a4301..3add239df 100644
--- a/src/router/modules/entry.js
+++ b/src/router/modules/entry.js
@@ -12,7 +12,13 @@ export default {
     component: RouterView,
     redirect: { name: 'EntryMain' },
     menus: {
-        main: ['EntryList', 'MyEntries', 'EntryLatestBuys', 'EntryStockBought'],
+        main: [
+            'EntryList',
+            'MyEntries',
+            'EntryLatestBuys',
+            'EntryStockBought',
+            'EntryWasteRecalc',
+        ],
         card: ['EntryBasicData', 'EntryBuys', 'EntryNotes', 'EntryDms', 'EntryLog'],
     },
     children: [
@@ -67,6 +73,15 @@ export default {
                     },
                     component: () => import('src/pages/Entry/EntryStockBought.vue'),
                 },
+                {
+                    path: 'waste-recalc',
+                    name: 'EntryWasteRecalc',
+                    meta: {
+                        title: 'wasteRecalc',
+                        icon: 'compost',
+                    },
+                    component: () => import('src/pages/Entry/EntryWasteRecalc.vue'),
+                },
             ],
         },
         {

From 178fa8cd21328a688a7697f2c3c38a7408ed2775 Mon Sep 17 00:00:00 2001
From: guillermo <guillermo@verdnatura.es>
Date: Mon, 7 Oct 2024 11:31:16 +0200
Subject: [PATCH 275/281] feat: refs #7893 Requested changes

---
 src/pages/Entry/EntryWasteRecalc.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/Entry/EntryWasteRecalc.vue b/src/pages/Entry/EntryWasteRecalc.vue
index 2fb9c3abf..1dbf8cdf0 100644
--- a/src/pages/Entry/EntryWasteRecalc.vue
+++ b/src/pages/Entry/EntryWasteRecalc.vue
@@ -65,7 +65,6 @@ const recalc = async () => {
                     color="primary"
                     text-color="white"
                     :label="t('globals.recalc')"
-                    icon="Calculate"
                     :loading="isLoading"
                     :disable="isLoading"
                     @click="recalc()"

From e396cd0cac48bf8bf5761d575758489e69a93102 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Mon, 7 Oct 2024 12:16:32 +0200
Subject: [PATCH 276/281] hotfix: routePrice null

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

diff --git a/src/pages/Supplier/Card/SupplierAgencyTermCreate.vue b/src/pages/Supplier/Card/SupplierAgencyTermCreate.vue
index 515d157e5..038eaa356 100644
--- a/src/pages/Supplier/Card/SupplierAgencyTermCreate.vue
+++ b/src/pages/Supplier/Card/SupplierAgencyTermCreate.vue
@@ -19,7 +19,7 @@ const newAgencyTermForm = reactive({
     packagePrice: 0,
     kmPrice: 0,
     m3Price: 0,
-    routePrice: 0,
+    routePrice: null,
     minimumKm: 0,
     supplierFk: route.params.id,
 });

From 0ed9fdd55da1c3939848129bc0c7b72daa3660b8 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 7 Oct 2024 13:02:40 +0200
Subject: [PATCH 277/281] fix: refs VnImg zoom resolution missing property

---
 src/components/ui/CatalogItem.vue    | 2 +-
 src/pages/Item/ItemList.vue          | 3 +--
 src/pages/Order/Card/OrderLines.vue  | 6 +++++-
 src/pages/Ticket/Card/TicketSale.vue | 2 +-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/components/ui/CatalogItem.vue b/src/components/ui/CatalogItem.vue
index 545bfbbb4..7dca19770 100644
--- a/src/components/ui/CatalogItem.vue
+++ b/src/components/ui/CatalogItem.vue
@@ -31,7 +31,7 @@ const dialog = ref(null);
     <div class="container order-catalog-item overflow-hidden">
         <QCard class="card shadow-6">
             <div class="img-wrapper">
-                <VnImg :id="item.id" class="image" />
+                <VnImg :id="item.id" class="image" zoom-resolution="1600x900" />
                 <div v-if="item.hex && isCatalog" class="item-color-container">
                     <div
                         class="item-color"
diff --git a/src/pages/Item/ItemList.vue b/src/pages/Item/ItemList.vue
index e3fcceb3a..ae4c9531c 100644
--- a/src/pages/Item/ItemList.vue
+++ b/src/pages/Item/ItemList.vue
@@ -491,9 +491,8 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                         <QTd>
                             <VnImg
                                 size="50x50"
+                                zoom-resolution="1600x900"
                                 :id="row.id"
-                                height="50px"
-                                width="50px"
                                 class="image"
                             />
                         </QTd>
diff --git a/src/pages/Order/Card/OrderLines.vue b/src/pages/Order/Card/OrderLines.vue
index 17a157797..0223aa9c6 100644
--- a/src/pages/Order/Card/OrderLines.vue
+++ b/src/pages/Order/Card/OrderLines.vue
@@ -278,7 +278,11 @@ watch(
     >
         <template #column-image="{ row }">
             <div class="image-wrapper">
-                <VnImg :id="parseInt(row?.item?.image)" class="rounded" />
+                <VnImg
+                    :id="parseInt(row?.item?.image)"
+                    class="rounded"
+                    zoom-resolution="1600x900"
+                />
             </div>
         </template>
         <template #column-id="{ row }">
diff --git a/src/pages/Ticket/Card/TicketSale.vue b/src/pages/Ticket/Card/TicketSale.vue
index f86863f05..f179257f7 100644
--- a/src/pages/Ticket/Card/TicketSale.vue
+++ b/src/pages/Ticket/Card/TicketSale.vue
@@ -591,7 +591,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
         <template #body-cell-picture="{ row }">
             <QTd>
                 <div class="image-wrapper">
-                    <VnImg :id="row.itemFk" class="rounded" />
+                    <VnImg :id="row.itemFk" class="rounded" zoom-resolution="1600x900" />
                 </div>
             </QTd>
         </template>

From 50eed83d05dabadd46fe0f07948564d9ef953ea2 Mon Sep 17 00:00:00 2001
From: guillermo <guillermo@verdnatura.es>
Date: Mon, 7 Oct 2024 13:50:19 +0200
Subject: [PATCH 278/281] feat: refs #7893 Requested changes

---
 src/i18n/locale/en.yml               |  4 ---
 src/i18n/locale/es.yml               |  4 ---
 src/pages/Entry/EntryWasteRecalc.vue | 45 +++++++++++++---------------
 src/pages/Entry/locale/en.yml        |  2 ++
 src/pages/Entry/locale/es.yml        |  2 ++
 5 files changed, 25 insertions(+), 32 deletions(-)

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index c6a597dea..b73395df2 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -474,10 +474,6 @@ entry:
             landing: Landing
             isExcludedFromAvailable: Es inventory
             isRaid: Raid
-    wasteRecalc:
-        dateRequired: The date fields are required
-        dateIncoherent: The "from" date cannot be later than the "to" date
-        recalcOk: The wastes were successfully recalculated
 ticket:
     pageTitles:
         tickets: Tickets
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 78a67aceb..2552c9549 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -476,10 +476,6 @@ entry:
             landing: Llegada
             isExcludedFromAvailable: Es inventario
             isRaid: Redada
-    wasteRecalc:
-        dateRequired: Los campos de tipo fecha son obligatorios
-        dateIncoherent: La fecha "desde" no puede ser superior a la fecha "hasta"
-        recalcOk: Se han recalculado las mermas correctamente
 ticket:
     pageTitles:
         tickets: Tickets
diff --git a/src/pages/Entry/EntryWasteRecalc.vue b/src/pages/Entry/EntryWasteRecalc.vue
index 1dbf8cdf0..cd823beb4 100644
--- a/src/pages/Entry/EntryWasteRecalc.vue
+++ b/src/pages/Entry/EntryWasteRecalc.vue
@@ -1,42 +1,37 @@
 <script setup>
-import { ref } from 'vue';
-import { useI18n } from 'vue-i18n';
+import { ref, computed, watch } from 'vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
 import useNotify from 'src/composables/useNotify.js';
 import axios from 'axios';
 
-const { t } = useI18n();
-
 const isLoading = ref(false);
 const dateFrom = ref();
 const dateTo = ref();
+
+const optionsTo = computed(() => (date) => {
+    if (!dateFrom.value) return true;
+    return new Date(date) >= new Date(dateFrom.value);
+});
+
+watch(dateFrom, (newDateFrom) => {
+    if (dateTo.value && new Date(dateTo.value) < new Date(newDateFrom))
+        dateTo.value = newDateFrom;
+});
+
 const recalc = async () => {
     const { notify } = useNotify();
-    if (!dateFrom.value || !dateTo.value) {
-        notify('entry.wasteRecalc.dateRequired', 'negative');
-        return;
-    }
-
-    const from = new Date(dateFrom.value);
-    const to = new Date(dateTo.value);
-
-    if (from > to) {
-        notify('entry.wasteRecalc.dateIncoherent', 'negative');
-        return;
-    }
 
     const params = {
         schema: 'bs',
-        params: [from, to],
+        params: [new Date(dateFrom.value), new Date(dateTo.value)],
     };
 
     try {
         isLoading.value = true;
         await axios.post('Applications/waste_addSales/execute-proc', params);
-        notify('entry.wasteRecalc.recalcOk', 'positive');
+        notify('wasteRecalc.recalcOk', 'positive');
     } catch (err) {
-        console.error('Error in execution:', err);
-        notify('entry.wasteRecalc.recalcOk', 'negative');
+        console.error(err);
     } finally {
         isLoading.value = false;
     }
@@ -50,23 +45,25 @@ const recalc = async () => {
                 <VnInputDate
                     class="q-mb-lg"
                     v-model="dateFrom"
-                    :label="t('globals.from')"
+                    :label="$t('globals.from')"
                     rounded
                     dense
                 />
                 <VnInputDate
                     class="q-mb-lg"
                     v-model="dateTo"
-                    :label="t('globals.to')"
+                    :options="optionsTo"
+                    :label="$t('globals.to')"
+                    :disable="!dateFrom"
                     rounded
                     dense
                 />
                 <QBtn
                     color="primary"
                     text-color="white"
-                    :label="t('globals.recalc')"
+                    :label="$t('globals.recalc')"
                     :loading="isLoading"
-                    :disable="isLoading"
+                    :disable="isLoading || !(dateFrom && dateTo)"
                     @click="recalc()"
                 />
             </QCardSection>
diff --git a/src/pages/Entry/locale/en.yml b/src/pages/Entry/locale/en.yml
index b4d7c33bc..f9dbd0589 100644
--- a/src/pages/Entry/locale/en.yml
+++ b/src/pages/Entry/locale/en.yml
@@ -18,3 +18,5 @@ myEntries:
     warehouseInFk: Warehouse in
     daysOnward: Days onward
     daysAgo: Days ago
+wasteRecalc:
+    recalcOk: The wastes were successfully recalculated
diff --git a/src/pages/Entry/locale/es.yml b/src/pages/Entry/locale/es.yml
index 2dfd601b1..feeea1fc9 100644
--- a/src/pages/Entry/locale/es.yml
+++ b/src/pages/Entry/locale/es.yml
@@ -21,3 +21,5 @@ myEntries:
     warehouseInFk: Alm. entrada
     daysOnward: Días adelante
     daysAgo: Días atras
+wasteRecalc:
+    recalcOk: Se han recalculado las mermas correctamente

From 56fff55f71bc97c59d1300144adcfee69f3241cf Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Tue, 8 Oct 2024 09:26:00 +0200
Subject: [PATCH 279/281] fix: unnecessary property

---
 src/pages/Item/Card/ItemTags.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/Item/Card/ItemTags.vue b/src/pages/Item/Card/ItemTags.vue
index 1b5eb28f0..6f31d0cf8 100644
--- a/src/pages/Item/Card/ItemTags.vue
+++ b/src/pages/Item/Card/ItemTags.vue
@@ -171,7 +171,6 @@ const insertTag = (rows) => {
                             <QBtn
                                 @click="insertTag(rows)"
                                 class="cursor-pointer"
-                                :disable="!validRow"
                                 color="primary"
                                 flat
                                 icon="add"

From 3dfb836f8ea024242cf844190f3f58fd0ded5704 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 10 Oct 2024 13:56:11 +0200
Subject: [PATCH 280/281] revert: rollback compress spacestyle

---
 src/components/common/VnInput.vue  | 20 --------------------
 src/components/common/VnSelect.vue | 11 -----------
 src/components/ui/VnRow.vue        |  1 -
 src/css/app.scss                   | 11 -----------
 4 files changed, 43 deletions(-)

diff --git a/src/components/common/VnInput.vue b/src/components/common/VnInput.vue
index d93ad7465..1246eedcd 100644
--- a/src/components/common/VnInput.vue
+++ b/src/components/common/VnInput.vue
@@ -130,24 +130,4 @@ const mixinRules = [
 .q-field__append {
     padding-inline: 0;
 }
-
-.q-field__append.q-field__marginal.row.no-wrap.items-center.row {
-    height: 20px;
-}
-.q-field--outlined .q-field__append.q-field__marginal.row.no-wrap.items-center.row {
-    height: auto;
-}
-.q-field__control {
-    height: unset;
-}
-
-.q-field--labeled {
-    .q-field__native,
-    .q-field__prefix,
-    .q-field__suffix,
-    .q-field__input {
-        padding-bottom: 0;
-        min-height: 15px;
-    }
-}
 </style>
diff --git a/src/components/common/VnSelect.vue b/src/components/common/VnSelect.vue
index 84ab4b4b6..aa629767d 100644
--- a/src/components/common/VnSelect.vue
+++ b/src/components/common/VnSelect.vue
@@ -283,15 +283,4 @@ const getVal = (val) => ($props.useLike ? { like: `%${val}%` } : val);
 .q-field--outlined {
     max-width: 100%;
 }
-.q-field__inner {
-    .q-field__control {
-        min-height: auto !important;
-
-        display: flex;
-        align-items: flex-end;
-        .q-field__native.row {
-            min-height: auto !important;
-        }
-    }
-}
 </style>
diff --git a/src/components/ui/VnRow.vue b/src/components/ui/VnRow.vue
index 0df1fb7d4..16bcfab7d 100644
--- a/src/components/ui/VnRow.vue
+++ b/src/components/ui/VnRow.vue
@@ -9,7 +9,6 @@ defineProps({ wrap: { type: Boolean, default: false } });
 <style lang="scss" scoped>
 .vn-row {
     display: flex;
-    align-items: flex-end;
     > :deep(*) {
         flex: 1;
     }
diff --git a/src/css/app.scss b/src/css/app.scss
index c77af41f9..905934d4c 100644
--- a/src/css/app.scss
+++ b/src/css/app.scss
@@ -288,14 +288,3 @@ input::-webkit-inner-spin-button {
         color: $info;
     }
 }
-.q-field__inner {
-    .q-field__control {
-        min-height: auto !important;
-        display: flex;
-        align-items: flex-end;
-        padding-bottom: 2px;
-        .q-field__native.row {
-            min-height: auto !important;
-        }
-    }
-}

From 2ff99d3faa63e2cd2ae7e41dec0dbfed7335715e Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 10 Oct 2024 13:56:14 +0200
Subject: [PATCH 281/281] feat: define as global dense value

---
 src/boot/defaults/qInput.js  | 4 ++++
 src/boot/defaults/qSelect.js | 4 ++++
 src/boot/quasar.defaults.js  | 2 ++
 3 files changed, 10 insertions(+)
 create mode 100644 src/boot/defaults/qInput.js
 create mode 100644 src/boot/defaults/qSelect.js

diff --git a/src/boot/defaults/qInput.js b/src/boot/defaults/qInput.js
new file mode 100644
index 000000000..299b98718
--- /dev/null
+++ b/src/boot/defaults/qInput.js
@@ -0,0 +1,4 @@
+import { QInput } from 'quasar';
+import setDefault from './setDefault';
+
+setDefault(QInput, 'dense', true);
diff --git a/src/boot/defaults/qSelect.js b/src/boot/defaults/qSelect.js
new file mode 100644
index 000000000..be0ba048a
--- /dev/null
+++ b/src/boot/defaults/qSelect.js
@@ -0,0 +1,4 @@
+import { QSelect } from 'quasar';
+import setDefault from './setDefault';
+
+setDefault(QSelect, 'dense', true);
diff --git a/src/boot/quasar.defaults.js b/src/boot/quasar.defaults.js
index c792100d7..9638e2057 100644
--- a/src/boot/quasar.defaults.js
+++ b/src/boot/quasar.defaults.js
@@ -1 +1,3 @@
 export * from './defaults/qTable';
+export * from './defaults/qInput';
+export * from './defaults/qSelect';