Merge branch 'dev' into 7553_FixTicketExpedition

2024-09-24 08:36:57 +00:00 · 2024-09-24 08:36:57 +00:00 · 21f7613f21
parent f34e81038e 2d90a75fa0
commit 21f7613f21
24 changed files with 277 additions and 201 deletions
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@ -428,7 +428,7 @@ function handleOnDataSaved(_) {
                    <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()"
                    />
@ -515,8 +515,12 @@ function handleOnDataSaved(_) {
                            :key="index"
                            :title="btn.title"
                            :icon="btn.icon"
-                            class="q-px-sm text-primary-light"
+                            class="q-pa-xs"
                            flat
+                            dense
+                            :class="
+                                btn.isPrimary ? 'text-primary-light' : 'color-vn-text '
+                            "
                            :style="`visibility: ${
                                (btn.show && btn.show(row)) ?? true ? 'visible' : 'hidden'
                            }`"
@ -670,18 +674,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>
@ -766,10 +762,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));
@ -798,10 +790,16 @@ es:
    }
 }

-.q-table th {
-    padding: 0;
-}
+.q-table {
+    th {
+        padding: 0;
+    }

+    &__top {
+        padding: 12px 0px;
+        top: 0;
+    }
+}
 .vnTable {
    thead tr th {
        position: sticky;
--- 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">
--- 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);
--- 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;
 }
--- 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;
 }
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@ -908,6 +908,7 @@ supplier:
            account: Account
            payMethod: Pay Method
            payDay: Pay Day
+            country: Country
    summary:
        responsible: Responsible
        notes: Notes
--- 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
@ -892,6 +893,7 @@ supplier:
            account: Cuenta
            payMethod: Método de pago
            payDay: Dia de pago
+            country: País
    summary:
        responsible: Responsable
        notes: Notas
--- 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
--- a/src/pages/Customer/CustomerList.vue
+++ b/src/pages/Customer/CustomerList.vue
@ -429,6 +429,8 @@ function handleLocation(data, location) {
                :params="{
                    departmentCodes: ['VT', 'shopping'],
                }"
+                option-label="nickname"
+                option-value="id"
                :fields="['id', 'nickname']"
                sort-by="nickname ASC"
                emit-value
--- 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
                                    >
--- 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',
--- 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>
--- a/src/pages/Entry/EntryStockBought.vue
+++ b/src/pages/Entry/EntryStockBought.vue
@ -54,10 +54,9 @@ const columns = [
        create: true,
        component: 'number',
        summation: true,
-        cardVisible: true,
    },
    {
-        align: 'left',
+        align: 'center',
        label: t('Bought'),
        name: 'bought',
        summation: true,
@ -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 }) => {
@ -128,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>
@ -139,7 +152,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 +162,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 +179,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 +205,80 @@ 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"
+                @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="css" scoped>
+<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>
-    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
--- 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,29 +41,33 @@ 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>
 <template>
-    <QDialog :maximized="true">
+    <QDialog>
        <div class="container">
            <VnTable
                ref="tableRef"
@ -73,18 +77,26 @@ 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" @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,11 +105,10 @@ const columns = [
        </div>
    </QDialog>
 </template>
-<style lang="css">
-.q-dialog__inner {
+<style lang="css" scoped>
+.container {
    max-width: 50vw;
    overflow: auto;
-    display: flex;
    justify-content: center;
    align-items: center;
    margin: auto;
@ -110,4 +121,9 @@ const columns = [
        Bought: Comprado
        More: Más
        Date: Fecha
+        Entry: Entrada
+        Item: Artículo
+        Name: Nombre
+        Volume: Volumen
+        Packaging: Embalage 
 </i18n>
--- a/src/pages/Monitor/MonitorClients.vue
+++ b/src/pages/Monitor/MonitorClients.vue
@ -139,7 +139,11 @@ const columns = computed(() => [
    </VnTable>
 </template>
 <style lang="scss" scoped>
-.full-width .vn-row > * {
-    flex: 0.4;
+.full-width .vn-row {
+    margin-bottom: 0;
+    flex-direction: row;
+    > * {
+        max-width: 125px;
+    }
 }
 </style>
--- 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)"
--- 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',
-
        columnFilter: false,
        attrs: {
            dense: true,
@ -65,7 +64,6 @@ const columns = computed(() => [
        name: 'id',
        field: 'id',
        align: 'left',
-
        columnFilter: {
            component: 'number',
            name: 'id',
@ -108,9 +106,7 @@ const columns = computed(() => [
    {
        label: t('salesTicketsTable.date'),
        name: 'shippedDate',
-        style: { 'max-width': '100px' },
        align: 'left',
-
        columnFilter: {
            component: 'date',
            name: 'shippedDate',
@ -164,7 +160,6 @@ const columns = computed(() => [
        label: t('salesTicketsTable.state'),
        name: 'state',
        align: 'left',
-        style: { 'max-width': '100px' },
        columnFilter: {
            component: 'select',
            name: 'stateFk',
@ -193,7 +188,6 @@ const columns = computed(() => [
        label: t('salesTicketsTable.zone'),
        name: 'zoneFk',
        align: 'left',
-
        columnFilter: {
            component: 'select',
            name: 'zoneFk',
@ -210,8 +204,6 @@ const columns = computed(() => [
        name: 'totalWithVat',
        field: 'totalWithVat',
        align: 'left',
-        style: { 'max-width': '75px' },
-
        columnFilter: {
            component: 'number',
            name: 'totalWithVat',
@ -370,7 +362,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 +416,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 +463,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>
--- 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>

--- 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([]);
@ -168,24 +158,15 @@ const updateThermograph = async () => {
 };

 const onThermographCreated = async (data) => {
-    await fetchTravelThermographsRef.value.fetch();
-    thermographForm.thermographId = data.thermographId;
+    thermographForm.thermographId = data.id;
 };
 </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 +220,20 @@ 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.id)
+                                "
                            />
                        </template>
                    </VnSelectDialog>
@ -323,7 +309,6 @@ const onThermographCreated = async (data) => {
        </QForm>
    </QPage>
 </template>
-
 <i18n>
 es:
    Select files: Selecciona ficheros
--- 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³: Medida máxima tumbado
 </i18n>
--- 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();
--- 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,22 @@ 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(
+            '[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('.actions > .q-btn--standard').click();
+        cy.get(
+            '[to="/null/2"] > .q-card > .column > [title="Remove"] > .q-btn__content > .q-icon'
+        ).click();
    });
 });
--- 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();
    });
 });
--- 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}');
+    });
 });