diff --git a/src/components/CrudModel.vue b/src/components/CrudModel.vue
index 6303f48ae..a37a2b2a9 100644
--- a/src/components/CrudModel.vue
+++ b/src/components/CrudModel.vue
@@ -332,6 +332,7 @@ watch(formUrl, async () => {
                 :disable="!selected?.length"
                 :title="t('globals.remove')"
                 v-if="$props.defaultRemove"
+                data-cy="crudModelDefaultRemoveBtn"
             />
             <QBtn
                 :label="tMobile('globals.reset')"
diff --git a/src/components/TicketProblems.vue b/src/components/TicketProblems.vue
index c15e31d80..73178b12e 100644
--- a/src/components/TicketProblems.vue
+++ b/src/components/TicketProblems.vue
@@ -1,12 +1,22 @@
 <script setup>
 import { toCurrency } from 'src/filters';
+import { getValueFromPath } from 'src/composables/getValueFromPath';
 
-defineProps({ row: { type: Object, required: true } });
+const { row, visibleProblems = null } = defineProps({
+    row: { type: Object, required: true },
+    visibleProblems: { type: Array },
+});
+
+function showProblem(problem) {
+    const val = getValueFromPath(row, problem);
+    if (!visibleProblems) return val;
+    return !!(visibleProblems?.includes(problem) && val);
+}
 </script>
 <template>
     <span class="q-gutter-x-xs">
         <router-link
-            v-if="row.claim?.claimFk"
+            v-if="showProblem('claim.claimFk')"
             :to="{ name: 'ClaimBasicData', params: { id: row.claim?.claimFk } }"
             class="link"
         >
@@ -18,7 +28,7 @@ defineProps({ row: { type: Object, required: true } });
             </QIcon>
         </router-link>
         <QIcon
-            v-if="row?.isDeleted"
+            v-if="showProblem('isDeleted')"
             color="primary"
             name="vn:deletedTicket"
             size="xs"
@@ -29,7 +39,7 @@ defineProps({ row: { type: Object, required: true } });
             </QTooltip>
         </QIcon>
         <QIcon
-            v-if="row?.hasRisk"
+            v-if="showProblem('hasRisk')"
             name="vn:risk"
             :color="row.hasHighRisk ? 'negative' : 'primary'"
             size="xs"
@@ -40,51 +50,76 @@ defineProps({ row: { type: Object, required: true } });
             </QTooltip>
         </QIcon>
         <QIcon
-            v-if="row?.hasComponentLack"
+            v-if="showProblem('hasComponentLack')"
             name="vn:components"
             color="primary"
             size="xs"
         >
             <QTooltip>{{ $t('salesTicketsTable.componentLack') }}</QTooltip>
         </QIcon>
-        <QIcon v-if="row?.hasItemDelay" color="primary" size="xs" name="vn:hasItemDelay">
+        <QIcon
+            v-if="showProblem('hasItemDelay')"
+            color="primary"
+            size="xs"
+            name="vn:hasItemDelay"
+        >
             <QTooltip>
                 {{ $t('ticket.summary.hasItemDelay') }}
             </QTooltip>
         </QIcon>
-        <QIcon v-if="row?.hasItemLost" color="primary" size="xs" name="vn:hasItemLost">
+        <QIcon
+            v-if="showProblem('hasItemLost')"
+            color="primary"
+            size="xs"
+            name="vn:hasItemLost"
+        >
             <QTooltip>
                 {{ $t('salesTicketsTable.hasItemLost') }}
             </QTooltip>
         </QIcon>
         <QIcon
-            v-if="row?.hasItemShortage"
+            v-if="showProblem('hasItemShortage')"
             name="vn:unavailable"
             color="primary"
             size="xs"
         >
             <QTooltip>{{ $t('salesTicketsTable.notVisible') }}</QTooltip>
         </QIcon>
-        <QIcon v-if="row?.hasRounding" color="primary" name="sync_problem" size="xs">
+        <QIcon
+            v-if="showProblem('hasRounding')"
+            color="primary"
+            name="sync_problem"
+            size="xs"
+        >
             <QTooltip>
                 {{ $t('ticketList.rounding') }}
             </QTooltip>
         </QIcon>
         <QIcon
-            v-if="row?.hasTicketRequest"
+            v-if="showProblem('hasTicketRequest')"
             name="vn:buyrequest"
             color="primary"
             size="xs"
         >
             <QTooltip>{{ $t('salesTicketsTable.purchaseRequest') }}</QTooltip>
         </QIcon>
-        <QIcon v-if="row?.isTaxDataChecked" name="vn:no036" color="primary" size="xs">
+        <QIcon
+            v-if="showProblem('isTaxDataChecked')"
+            name="vn:no036"
+            color="primary"
+            size="xs"
+        >
             <QTooltip>{{ $t('salesTicketsTable.noVerifiedData') }}</QTooltip>
         </QIcon>
-        <QIcon v-if="row?.isFreezed" name="vn:frozen" color="primary" size="xs">
+        <QIcon v-if="showProblem('isFreezed')" name="vn:frozen" color="primary" size="xs">
             <QTooltip>{{ $t('salesTicketsTable.clientFrozen') }}</QTooltip>
         </QIcon>
-        <QIcon v-if="row?.isTooLittle" name="vn:isTooLittle" color="primary" size="xs">
+        <QIcon
+            v-if="showProblem('isTooLittle')"
+            name="vn:isTooLittle"
+            color="primary"
+            size="xs"
+        >
             <QTooltip>{{ $t('salesTicketsTable.tooLittle') }}</QTooltip>
         </QIcon>
     </span>
diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index b8494a875..29a9200f0 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -229,6 +229,7 @@ watch(
 
 defineExpose({
     create: createForm,
+    showForm,
     reload,
     redirect: redirectFn,
     selected,
diff --git a/src/components/__tests__/EditTableCellValueForm.spec.js b/src/components/__tests__/EditTableCellValueForm.spec.js
deleted file mode 100644
index acba27519..000000000
--- a/src/components/__tests__/EditTableCellValueForm.spec.js
+++ /dev/null
@@ -1,57 +0,0 @@
-import { createWrapper } from 'app/test/vitest/helper';
-import { default as axios } from 'axios';
-import EditForm from 'components/EditTableCellValueForm.vue';
-import { vi, afterEach, beforeAll, describe, expect, it } from 'vitest';
-
-const fieldA = 'fieldA';
-const fieldB = 'fieldB';
-
-describe('EditForm', () => {
-    let vm;
-    const mockRows = [
-        { id: 1, itemFk: 101 },
-        { id: 2, itemFk: 102 },
-    ];
-    const mockFieldsOptions = [
-        { label: 'Field A', field: fieldA, component: 'input', attrs: {} },
-        { label: 'Field B', field: fieldB, component: 'date', attrs: {} },
-    ];
-    const editUrl = '/api/edit';
-
-    beforeAll(() => {
-        vi.spyOn(axios, 'post').mockResolvedValue({ status: 200 });
-        vm = createWrapper(EditForm, {
-            props: {
-                rows: mockRows,
-                fieldsOptions: mockFieldsOptions,
-                editUrl,
-            },
-        }).vm;
-    });
-
-    afterEach(() => {
-        vi.clearAllMocks();
-    });
-
-    describe('onSubmit()', () => {
-        it('should call axios.post with the correct parameters in the payload', async () => {
-            const selectedField = { field: fieldA, component: 'input', attrs: {} };
-            const newValue = 'Test Value';
-
-            vm.selectedField = selectedField;
-            vm.newValue = newValue;
-
-            await vm.onSubmit();
-
-            const payload = axios.post.mock.calls[0][1];
-
-            expect(axios.post).toHaveBeenCalledWith(editUrl, expect.any(Object));
-            expect(payload.field).toEqual(fieldA);
-            expect(payload.newValue).toEqual(newValue);
-
-            expect(payload.lines).toEqual(expect.arrayContaining(mockRows));
-
-            expect(vm.isLoading).toEqual(false);
-        });
-    });
-});
diff --git a/src/components/__tests__/UserPanel.spec.js b/src/components/__tests__/UserPanel.spec.js
index 9e449745a..b6da8b058 100644
--- a/src/components/__tests__/UserPanel.spec.js
+++ b/src/components/__tests__/UserPanel.spec.js
@@ -1,65 +1,63 @@
-import { vi, describe, expect, it, beforeEach, afterEach } from 'vitest';
+import { vi, describe, expect, it, beforeEach, beforeAll, afterEach } from 'vitest';
 import { createWrapper } from 'app/test/vitest/helper';
 import UserPanel from 'src/components/UserPanel.vue';
 import axios from 'axios';
 import { useState } from 'src/composables/useState';
 
-vi.mock('src/utils/quasarLang', () => ({
-  default: vi.fn(),
-}));
-
 describe('UserPanel', () => {
-  let wrapper;
-  let vm;
-  let state;
+    let wrapper;
+    let vm;
+    let state;
 
-  beforeEach(() => {
-    wrapper = createWrapper(UserPanel, {});
-    state = useState();
-    state.setUser({
-      id: 115,
-      name: 'itmanagement',
-      nickname: 'itManagementNick',
-      lang: 'en',
-      darkMode: false,
-      companyFk: 442,
-      warehouseFk: 1,
+    beforeEach(() => {
+        wrapper = createWrapper(UserPanel, {});
+        state = useState();
+        state.setUser({
+            id: 115,
+            name: 'itmanagement',
+            nickname: 'itManagementNick',
+            lang: 'en',
+            darkMode: false,
+            companyFk: 442,
+            warehouseFk: 1,
+        });
+        wrapper = wrapper.wrapper;
+        vm = wrapper.vm;
     });
-    wrapper = wrapper.wrapper;
-    vm = wrapper.vm;
-  });
 
-  afterEach(() => {
-    vi.clearAllMocks();
-  });
+    afterEach(() => {
+        vi.clearAllMocks();
+    });
 
-  it('should fetch warehouses data on mounted', async () => {
-    const fetchData = wrapper.findComponent({ name: 'FetchData' });
-    expect(fetchData.props('url')).toBe('Warehouses');
-    expect(fetchData.props('autoLoad')).toBe(true);
-  });
+    it('should fetch warehouses data on mounted', async () => {
+        const fetchData = wrapper.findComponent({ name: 'FetchData' });
+        expect(fetchData.props('url')).toBe('Warehouses');
+        expect(fetchData.props('autoLoad')).toBe(true);
+    });
 
-  it('should toggle dark mode correctly and update preferences', async () => {
-    await vm.saveDarkMode(true);
-    expect(axios.patch).toHaveBeenCalledWith('/UserConfigs/115', { darkMode: true });
-    expect(vm.user.darkMode).toBe(true);
-    await vm.updatePreferences();
-    expect(vm.darkMode).toBe(true);
-  });
+    it('should toggle dark mode correctly and update preferences', async () => {
+        await vm.saveDarkMode(true);
+        expect(axios.patch).toHaveBeenCalledWith('/UserConfigs/115', { darkMode: true });
+        expect(vm.user.darkMode).toBe(true);
+        vm.updatePreferences();
+        expect(vm.darkMode).toBe(true);
+    });
 
-  it('should change user language and update preferences', async () => {
-    const userLanguage = 'es';
-    await vm.saveLanguage(userLanguage);
-    expect(axios.patch).toHaveBeenCalledWith('/VnUsers/115', { lang: userLanguage });
-    expect(vm.user.lang).toBe(userLanguage);
-    await vm.updatePreferences();
-    expect(vm.locale).toBe(userLanguage);
-  });
+    it('should change user language and update preferences', async () => {
+        const userLanguage = 'es';
+        await vm.saveLanguage(userLanguage);
+        expect(axios.patch).toHaveBeenCalledWith('/VnUsers/115', { lang: userLanguage });
+        expect(vm.user.lang).toBe(userLanguage);
+        vm.updatePreferences();
+        expect(vm.locale).toBe(userLanguage);
+    });
 
-  it('should update user data', async () => {
-    const key = 'name';
-    const value = 'itboss';
-    await vm.saveUserData(key, value);
-    expect(axios.post).toHaveBeenCalledWith('UserConfigs/setUserConfig', { [key]: value });
-  });
-});
\ No newline at end of file
+    it('should update user data', async () => {
+        const key = 'name';
+        const value = 'itboss';
+        await vm.saveUserData(key, value);
+        expect(axios.post).toHaveBeenCalledWith('UserConfigs/setUserConfig', {
+            [key]: value,
+        });
+    });
+});
diff --git a/src/components/common/VnColor.vue b/src/components/common/VnColor.vue
index 8a5a787b0..dccbc7102 100644
--- a/src/components/common/VnColor.vue
+++ b/src/components/common/VnColor.vue
@@ -1,4 +1,6 @@
 <script setup>
+import { computed } from 'vue';
+
 const $props = defineProps({
     colors: {
         type: String,
@@ -6,9 +8,9 @@ const $props = defineProps({
     },
 });
 
-const colorArray = JSON.parse($props.colors)?.value;
+const colorArray = computed(() => JSON.parse($props.colors)?.value);
 const maxHeight = 30;
-const colorHeight = maxHeight / colorArray?.length;
+const colorHeight = maxHeight / colorArray.value?.length;
 </script>
 <template>
     <div v-if="colors" class="color-div" :style="{ height: `${maxHeight}px` }">
diff --git a/src/components/common/VnInputBic.vue b/src/components/common/VnInputBic.vue
new file mode 100644
index 000000000..b29644912
--- /dev/null
+++ b/src/components/common/VnInputBic.vue
@@ -0,0 +1,44 @@
+<script setup>
+import { useI18n } from 'vue-i18n';
+import axios from 'axios';
+
+import VnInput from 'src/components/common/VnInput.vue';
+
+const { t } = useI18n();
+const model = defineModel({ type: [Number, String] });
+const emit = defineEmits(['updateBic']);
+
+const getIbanCountry = (bank) => {
+    return bank.substr(0, 2);
+};
+
+const autofillBic = async (iban) => {
+    if (!iban) return;
+
+    const bankEntityId = parseInt(iban.substr(4, 4));
+    const ibanCountry = getIbanCountry(iban);
+
+    if (ibanCountry != 'ES') return;
+
+    const filter = { where: { id: bankEntityId } };
+    const params = { filter: JSON.stringify(filter) };
+
+    const { data } = await axios.get(`BankEntities`, { params });
+
+    emit('updateBic', data[0]?.id);
+};
+</script>
+<template>
+    <VnInput
+        :label="t('IBAN')"
+        clearable
+        v-model="model"
+        @update:model-value="autofillBic($event)"
+    >
+        <template #append>
+            <QIcon name="info" class="cursor-info">
+                <QTooltip>{{ t('components.iban_tooltip') }}</QTooltip>
+            </QIcon>
+        </template>
+    </VnInput>
+</template>
diff --git a/src/components/common/VnLog.vue b/src/components/common/VnLog.vue
index e2f18866a..7020c8489 100644
--- a/src/components/common/VnLog.vue
+++ b/src/components/common/VnLog.vue
@@ -68,7 +68,6 @@ const filter = {
             },
         },
     ],
-    where: { and: [{ originFk: route.params.id }] },
 };
 
 const paginate = ref();
@@ -267,13 +266,6 @@ onMounted(() => {
 onUnmounted(() => {
     stateStore.rightDrawer = false;
 });
-
-watch(
-    () => router.currentRoute.value.params.id,
-    () => {
-        applyFilter();
-    },
-);
 </script>
 <template>
     <VnPaginate
@@ -281,6 +273,7 @@ watch(
         :data-key
         :url="dataKey + 's'"
         :user-filter="filter"
+        :filter="{ where: { and: [{ originFk: route.params.id }] } }"
         :skeleton="false"
         auto-load
         @on-fetch="setLogTree"
diff --git a/src/components/common/VnLogFilter.vue b/src/components/common/VnLogFilter.vue
index c7be68e9e..606da0182 100644
--- a/src/components/common/VnLogFilter.vue
+++ b/src/components/common/VnLogFilter.vue
@@ -39,7 +39,7 @@ const checkboxOptions = ref([
     { name: 'select', label: 'Accesses', selected: false },
 ]);
 const columns = computed(() => [
-    { name: 'changedModelValue' },
+    { name: 'changedModelValue', orderBy: 'id' },
     { name: 'changedModel' },
     { name: 'userType', orderBy: false },
     { name: 'userFk' },
diff --git a/src/components/ui/VnDescriptor.vue b/src/components/ui/VnDescriptor.vue
index 994233eb0..69fd5af6b 100644
--- a/src/components/ui/VnDescriptor.vue
+++ b/src/components/ui/VnDescriptor.vue
@@ -6,6 +6,7 @@ import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import { useRoute, useRouter } from 'vue-router';
 import { useClipboard } from 'src/composables/useClipboard';
 import VnMoreOptions from './VnMoreOptions.vue';
+import { getValueFromPath } from 'src/composables/getValueFromPath';
 
 const entity = defineModel({ type: Object, default: null });
 const $props = defineProps({
@@ -56,18 +57,6 @@ const routeName = computed(() => {
     return `${routeName}Summary`;
 });
 
-function getValueFromPath(path) {
-    if (!path) return;
-    const keys = path.toString().split('.');
-    let current = entity.value;
-
-    for (const key of keys) {
-        if (current[key] === undefined) return undefined;
-        else current = current[key];
-    }
-    return current;
-}
-
 function copyIdText(id) {
     copyText(id, {
         component: {
@@ -170,10 +159,10 @@ const toModule = computed(() => {
                         <div class="title">
                             <span
                                 v-if="title"
-                                :title="getValueFromPath(title)"
+                                :title="getValueFromPath(entity, title)"
                                 :data-cy="`${$attrs['data-cy'] ?? 'vnDescriptor'}_title`"
                             >
-                                {{ getValueFromPath(title) ?? title }}
+                                {{ getValueFromPath(entity, title) ?? title }}
                             </span>
                             <slot v-else name="description" :entity="entity">
                                 <span
@@ -189,7 +178,7 @@ const toModule = computed(() => {
                             class="subtitle"
                             :data-cy="`${$attrs['data-cy'] ?? 'vnDescriptor'}_subtitle`"
                         >
-                            #{{ getValueFromPath(subtitle) ?? entity.id }}
+                            #{{ getValueFromPath(entity, subtitle) ?? entity.id }}
                         </QItemLabel>
                         <QBtn
                             round
diff --git a/src/components/ui/VnLv.vue b/src/components/ui/VnLv.vue
index aa7342742..4c5a429f4 100644
--- a/src/components/ui/VnLv.vue
+++ b/src/components/ui/VnLv.vue
@@ -6,6 +6,7 @@ import { computed } from 'vue';
 
 const $props = defineProps({
     label: { type: String, default: null },
+    tooltip: { type: String, default: null },
     value: {
         type: [String, Boolean, Number],
         default: null,
@@ -40,7 +41,10 @@ const val = computed(() => $props.value);
         <template v-else>
             <div v-if="label || $slots.label" class="label">
                 <slot name="label">
-                    <span style="color: var(--vn-label-color)">{{ label }}</span>
+                    <QTooltip v-if="tooltip">{{ tooltip }}</QTooltip>
+                    <span style="color: var(--vn-label-color)">
+                        {{ label }}
+                    </span>
                 </slot>
             </div>
             <div class="value" v-if="value || $slots.value">
diff --git a/src/components/ui/VnUsesMana.vue b/src/components/ui/VnUsesMana.vue
deleted file mode 100644
index cb066b235..000000000
--- a/src/components/ui/VnUsesMana.vue
+++ /dev/null
@@ -1,60 +0,0 @@
-<script setup>
-import { ref } from 'vue';
-import { useI18n } from 'vue-i18n';
-
-const { t } = useI18n();
-const props = defineProps({
-    usesMana: {
-        type: Boolean,
-        required: true,
-    },
-    manaCode: {
-        type: String,
-        required: true,
-    },
-    manaVal: {
-        type: String,
-        default: 'mana',
-    },
-    manaLabel: {
-        type: String,
-        default: 'Promotion mana',
-    },
-    manaClaimVal: {
-        type: String,
-        default: 'manaClaim',
-    },
-    claimLabel: {
-        type: String,
-        default: 'Claim mana',
-    },
-});
-
-const manaCode = ref(props.manaCode);
-</script>
-
-<template>
-    <div class="column q-gutter-y-sm q-mt-sm">
-        <QRadio
-            v-model="manaCode"
-            dense
-            :val="manaVal"
-            :label="t(manaLabel)"
-            :dark="true"
-            class="q-mb-sm"
-        />
-        <QRadio
-            v-model="manaCode"
-            dense
-            :val="manaClaimVal"
-            :label="t(claimLabel)"
-            :dark="true"
-            class="q-mb-sm"
-        />
-    </div>
-</template>
-<i18n>
-    es:
-        Promotion mana: Maná promoción
-        Claim mana: Maná reclamación
-</i18n>
diff --git a/src/composables/getValueFromPath.js b/src/composables/getValueFromPath.js
new file mode 100644
index 000000000..2c94379cc
--- /dev/null
+++ b/src/composables/getValueFromPath.js
@@ -0,0 +1,11 @@
+export function getValueFromPath(root, path) {
+    if (!root || !path) return;
+    const keys = path.toString().split('.');
+    let current = root;
+
+    for (const key of keys) {
+        if (current[key] === undefined) return undefined;
+        else current = current[key];
+    }
+    return current;
+}
\ No newline at end of file
diff --git a/src/composables/updateMinPriceBeforeSave.js b/src/composables/updateMinPriceBeforeSave.js
new file mode 100644
index 000000000..d2895eeff
--- /dev/null
+++ b/src/composables/updateMinPriceBeforeSave.js
@@ -0,0 +1,51 @@
+import axios from 'axios';
+
+export async function beforeSave(data, getChanges, modelOrigin) {
+    try {
+        const changes = data.updates;
+        if (!changes) return data;
+        const patchPromises = [];
+
+        for (const change of changes) {
+            let patchData = {};
+
+            if ('hasMinPrice' in change.data) {
+                patchData.hasMinPrice = change.data?.hasMinPrice;
+                delete change.data.hasMinPrice;
+            }
+            if ('minPrice' in change.data) {
+                patchData.minPrice = change.data?.minPrice;
+                delete change.data.minPrice;
+            }
+
+            if (Object.keys(patchData).length > 0) {
+                const promise = axios
+                    .get(`${modelOrigin}/findOne`, {
+                        params: {
+                            filter: {
+                                fields: ['itemFk'],
+                                where: { id: change.where.id },
+                            },
+                        },
+                    })
+                    .then((row) => {
+                        return axios.patch(`Items/${row.data.itemFk}`, patchData);
+                    })
+                    .catch((error) => {
+                        console.error('Error processing change: ', change, error);
+                    });
+
+                patchPromises.push(promise);
+            }
+        }
+
+        await Promise.all(patchPromises);
+
+        data.updates = changes.filter((change) => Object.keys(change.data).length > 0);
+
+        return data;
+    } catch (error) {
+        console.error('Error in beforeSave:', error);
+        throw error;
+    }
+}
diff --git a/src/css/quasar.variables.scss b/src/css/quasar.variables.scss
index 45d18af7e..c443c5826 100644
--- a/src/css/quasar.variables.scss
+++ b/src/css/quasar.variables.scss
@@ -18,6 +18,7 @@ $positive: #c8e484;
 $negative: #fb5252;
 $info: #84d0e2;
 $warning: #f4b974;
+$neutral: #b0b0b0;
 // Pendiente de cuadrar con la base de datos
 $success: $positive;
 $alert: $negative;
@@ -51,3 +52,6 @@ $width-xl: 1600px;
 .bg-alert {
     background-color: $negative;
 }
+.bg-neutral {
+    background-color: $neutral;
+}
diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 83993eb08..b471642ab 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -871,6 +871,11 @@ components:
         active: Is active
         floramondo: Is floramondo
         showBadDates: Show future items
+        name: Nombre
+        rate2: Grouping price
+        rate3: Packing price
+        minPrice: Min. Price
+        itemFk: Item id
     userPanel:
         copyToken: Token copied to clipboard
         settings: Settings
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 6c94de63c..d35cb785e 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -955,6 +955,11 @@ components:
         to: Hasta
         floramondo: Floramondo
         showBadDates: Ver items a futuro
+        name: Nombre
+        rate2: Precio grouping
+        rate3: Precio packing
+        minPrice: Precio mínimo
+        itemFk: Id item
     userPanel:
         copyToken: Token copiado al portapapeles
         settings: Configuración
diff --git a/src/pages/Claim/Card/ClaimDescriptor.vue b/src/pages/Claim/Card/ClaimDescriptor.vue
index 76ede81ed..3728a18c0 100644
--- a/src/pages/Claim/Card/ClaimDescriptor.vue
+++ b/src/pages/Claim/Card/ClaimDescriptor.vue
@@ -28,14 +28,8 @@ const entityId = computed(() => {
     return $props.id || route.params.id;
 });
 
-const STATE_COLOR = {
-    pending: 'warning',
-    incomplete: 'info',
-    resolved: 'positive',
-    canceled: 'negative',
-};
-function stateColor(code) {
-    return STATE_COLOR[code];
+function stateColor(entity) {
+    return entity?.claimState?.classColor;
 }
 
 onMounted(async () => {
@@ -57,9 +51,8 @@ onMounted(async () => {
             <VnLv v-if="entity.claimState" :label="t('claim.state')">
                 <template #value>
                     <QBadge
-                        :color="stateColor(entity.claimState.code)"
-                        text-color="black"
-                        dense
+                        :color="stateColor(entity)"
+                        style="color: var(--vn-black-text-color)"
                     >
                         {{ entity.claimState.description }}
                     </QBadge>
diff --git a/src/pages/Claim/Card/ClaimLines.vue b/src/pages/Claim/Card/ClaimLines.vue
index 7c948bb2f..4331b026d 100644
--- a/src/pages/Claim/Card/ClaimLines.vue
+++ b/src/pages/Claim/Card/ClaimLines.vue
@@ -123,8 +123,8 @@ async function fetchMana() {
 
 async function updateDiscount({ saleFk, discount, canceller }) {
     const body = { salesIds: [saleFk], newDiscount: discount };
-    const claimId = claim.value.ticketFk;
-    const query = `Tickets/${claimId}/updateDiscount`;
+    const ticketFk = claim.value.ticketFk;
+    const query = `Tickets/${ticketFk}/updateDiscount`;
 
     await axios.post(query, body, {
         signal: canceller.signal,
diff --git a/src/pages/Claim/Card/ClaimSummary.vue b/src/pages/Claim/Card/ClaimSummary.vue
index 67d57004f..51975cc2e 100644
--- a/src/pages/Claim/Card/ClaimSummary.vue
+++ b/src/pages/Claim/Card/ClaimSummary.vue
@@ -108,15 +108,9 @@ const markerLabels = [
     { value: 5, label: t('claim.person') },
 ];
 
-const STATE_COLOR = {
-    pending: 'warning',
-    incomplete: 'info',
-    resolved: 'positive',
-    canceled: 'negative',
-};
-
 function stateColor(code) {
-    return STATE_COLOR[code];
+    const claimState = claimStates.value.find((state) => state.code === code);
+    return claimState?.classColor;
 }
 
 const developmentColumns = ref([
@@ -188,7 +182,7 @@ function claimUrl(section) {
 <template>
     <FetchData
         url="ClaimStates"
-        :filter="{ fields: ['id', 'description'] }"
+        :filter="{ fields: ['id', 'description', 'code', 'classColor'] }"
         @on-fetch="(data) => (claimStates = data)"
         auto-load
     />
@@ -346,17 +340,18 @@ function claimUrl(section) {
                     <template #body="props">
                         <QTr :props="props">
                             <QTd v-for="col in props.cols" :key="col.name" :props="props">
-                                <span v-if="col.name != 'description'">{{
-                                    t(col.value)
-                                }}</span>
-                                <span class="link" v-if="col.name === 'description'">{{
-                                    t(col.value)
-                                }}</span>
-                                <ItemDescriptorProxy
-                                    v-if="col.name == 'description'"
-                                    :id="props.row.sale.itemFk"
-                                    :sale-fk="props.row.saleFk"
-                                ></ItemDescriptorProxy>
+                                <template v-if="col.name === 'description'">
+                                    <span class="link">{{
+                                        dashIfEmpty(col.field(props.row))
+                                    }}</span>
+                                    <ItemDescriptorProxy
+                                        :id="props.row.sale.itemFk"
+                                        :sale-fk="props.row.saleFk"
+                                    />
+                                </template>
+                                <template v-else>
+                                    {{ dashIfEmpty(col.field(props.row)) }}
+                                </template>
                             </QTd>
                         </QTr>
                     </template>
diff --git a/src/pages/Claim/ClaimList.vue b/src/pages/Claim/ClaimList.vue
index e0d9928f9..d6a77bafe 100644
--- a/src/pages/Claim/ClaimList.vue
+++ b/src/pages/Claim/ClaimList.vue
@@ -101,7 +101,10 @@ const columns = computed(() => [
         name: 'stateCode',
         chip: {
             condition: () => true,
-            color: ({ stateCode }) => STATE_COLOR[stateCode] ?? 'bg-grey',
+            color: ({ stateCode }) => {
+                const state = states.value?.find(({ code }) => code === stateCode);
+                return `bg-${state.classColor}`;
+            },
         },
         columnFilter: {
             name: 'claimStateFk',
@@ -131,12 +134,6 @@ const columns = computed(() => [
         ],
     },
 ]);
-
-const STATE_COLOR = {
-    pending: 'bg-warning',
-    loses: 'bg-negative',
-    resolved: 'bg-positive',
-};
 </script>
 
 <template>
diff --git a/src/pages/Customer/Card/CustomerBalance.vue b/src/pages/Customer/Card/CustomerBalance.vue
index 4855fadc0..13c337ab0 100644
--- a/src/pages/Customer/Card/CustomerBalance.vue
+++ b/src/pages/Customer/Card/CustomerBalance.vue
@@ -131,6 +131,7 @@ const columns = computed(() => [
         name: 'isConciliate',
         label: t('Conciliated'),
         cardVisible: true,
+        component: 'checkbox',
     },
     {
         align: 'left',
diff --git a/src/pages/Customer/Card/CustomerBillingData.vue b/src/pages/Customer/Card/CustomerBillingData.vue
index cc894d01e..e4b6f8365 100644
--- a/src/pages/Customer/Card/CustomerBillingData.vue
+++ b/src/pages/Customer/Card/CustomerBillingData.vue
@@ -9,6 +9,7 @@ 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 CreateBankEntityForm from 'src/components/CreateBankEntityForm.vue';
+import VnInputBic from 'src/components/common/VnInputBic.vue';
 
 const { t } = useI18n();
 const route = useRoute();
@@ -17,7 +18,7 @@ const bankEntitiesRef = ref(null);
 
 const filter = {
     fields: ['id', 'bic', 'name'],
-    order: 'bic ASC'
+    order: 'bic ASC',
 };
 
 const getBankEntities = (data, formData) => {
@@ -43,13 +44,11 @@ const getBankEntities = (data, formData) => {
             </VnRow>
 
             <VnRow>
-                <VnInput :label="t('IBAN')" clearable v-model="data.iban">
-                    <template #append>
-                        <QIcon name="info" class="cursor-info">
-                            <QTooltip>{{ t('components.iban_tooltip') }}</QTooltip>
-                        </QIcon>
-                    </template>
-                </VnInput>
+                <VnInputBic
+                    :label="t('IBAN')"
+                    v-model="data.iban"
+                    @update-bic="(bankEntityFk) => (data.bankEntityFk = bankEntityFk)"
+                />
                 <VnSelectDialog
                     :label="t('Swift / BIC')"
                     ref="bankEntitiesRef"
diff --git a/src/pages/Customer/Card/CustomerConsumption.vue b/src/pages/Customer/Card/CustomerConsumption.vue
index f3949bb32..db7236a3d 100644
--- a/src/pages/Customer/Card/CustomerConsumption.vue
+++ b/src/pages/Customer/Card/CustomerConsumption.vue
@@ -18,7 +18,7 @@ import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
 import VnSelect from 'components/common/VnSelect.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
 
-const arrayData = useArrayData('Client');
+const arrayData = useArrayData('Customer');
 const { t } = useI18n();
 const route = useRoute();
 const campaignList = ref();
@@ -260,7 +260,7 @@ const updateDateParams = (value, params) => {
                     :label="t('globals.campaign')"
                     :filled="true"
                     class="q-px-sm q-pt-none fit"
-                    :option-label="(opt) => t(opt.code)"
+                    :option-label="(opt) => t(opt.code ?? '')"
                     :fields="['id', 'code', 'dated', 'scopeDays']"
                     @update:model-value="(data) => updateDateParams(data, params)"
                     dense
diff --git a/src/pages/Customer/Card/CustomerSamples.vue b/src/pages/Customer/Card/CustomerSamples.vue
index 12fbfe6b2..f9a91fac4 100644
--- a/src/pages/Customer/Card/CustomerSamples.vue
+++ b/src/pages/Customer/Card/CustomerSamples.vue
@@ -32,7 +32,7 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        format: (row) => row.type.description,
+        format: (row) => row?.type?.description,
         label: t('Description'),
         name: 'description',
     },
diff --git a/src/pages/Customer/Card/CustomerSummary.vue b/src/pages/Customer/Card/CustomerSummary.vue
index 9d30f0c6d..f19bb26ab 100644
--- a/src/pages/Customer/Card/CustomerSummary.vue
+++ b/src/pages/Customer/Card/CustomerSummary.vue
@@ -185,7 +185,7 @@ const sumRisk = ({ clientRisks }) => {
                 />
                 <VnLv
                     :label="t('customer.summary.payMethod')"
-                    :value="entity.payMethod.name"
+                    :value="entity.payMethod?.name"
                 />
                 <VnLv :label="t('customer.summary.bankAccount')" :value="entity.iban" />
                 <VnLv :label="t('customer.summary.dueDay')" :value="entity.dueDay" />
@@ -208,7 +208,8 @@ const sumRisk = ({ clientRisks }) => {
                     :text="t('customer.summary.consignee')"
                 />
                 <VnLv
-                    :label="t('customer.summary.addressName')"
+                    :tooltip="t('customer.summary.addressName')"
+                    :label="t('customer.summary.addressNameAbbr')"
                     :value="entity.defaultAddress.nickname"
                 />
                 <VnLv
@@ -252,7 +253,8 @@ const sumRisk = ({ clientRisks }) => {
                 />
                 <VnLv
                     v-if="entity.claimsRatio"
-                    :label="t('customer.summary.priceIncreasingRate')"
+                    :tooltip="t('customer.summary.priceIncreasingRate')"
+                    :label="t('customer.summary.priceIncreasingRateAbbr')"
                     :value="toPercentage(priceIncreasingRate)"
                 />
                 <VnLv
@@ -261,7 +263,8 @@ const sumRisk = ({ clientRisks }) => {
                 />
                 <VnLv
                     v-if="entity.claimsRatio"
-                    :label="t('customer.summary.claimRate')"
+                    :label="t('customer.summary.claimRateAbbr')"
+                    :tooltip="t('customer.summary.claimRate')"
                     :value="toPercentage(claimRate)"
                 />
             </QCard>
@@ -318,8 +321,9 @@ const sumRisk = ({ clientRisks }) => {
                 />
 
                 <VnLv
-                    :label="t('customer.summary.recommendCredit')"
-                    :value="entity.recommendedCredit"
+                    :label="t('customer.summary.recommendCreditAbbr')"
+                    :tooltip="t('customer.summary.recommendCredit')"
+                    :value="toCurrency(entity.recommendedCredit)"
                 />
             </QCard>
             <QCard class="vn-max">
diff --git a/src/pages/Customer/CustomerList.vue b/src/pages/Customer/CustomerList.vue
index b721a6ad9..f5e7485a2 100644
--- a/src/pages/Customer/CustomerList.vue
+++ b/src/pages/Customer/CustomerList.vue
@@ -111,14 +111,11 @@ const columns = computed(() => [
             component: 'number',
         },
         columnField: {
-            component: null,
-            after: {
-                component: markRaw(VnLinkPhone),
-                attrs: ({ model }) => {
-                    return {
-                        'phone-number': model,
-                    };
-                },
+            component: markRaw(VnLinkPhone),
+            attrs: ({ model }) => {
+                return {
+                    'phone-number': model,
+                };
             },
         },
     },
diff --git a/src/pages/Customer/locale/en.yml b/src/pages/Customer/locale/en.yml
index 6724a5a7b..fca3354e6 100644
--- a/src/pages/Customer/locale/en.yml
+++ b/src/pages/Customer/locale/en.yml
@@ -42,14 +42,17 @@ customer:
         hasCoreVnl: Has core VNL
         hasB2BVnl: Has B2B VNL
         addressName: Address name
+        addressNameAbbr: A. Name
         addressCity: City
         username: Username
         webAccess: Web access
         totalGreuge: Total greuge
         mana: Mana
         priceIncreasingRate: Price increasing rate
+        priceIncreasingRateAbbr: Price inc. rate
         averageInvoiced: Average invoiced
         claimRate: Claming rate
+        claimRateAbbr: Claim. rate
         payMethodFk: Billing data
         risk: Risk
         maximumRisk: Solunion's maximum risk
@@ -68,6 +71,7 @@ customer:
         descriptorInfo: Invoices minus payments plus orders not yet
         rating: Rating
         recommendCredit: Recommended credit
+        recommendCreditAbbr: Rec. credit
         goToLines: Go to lines
     basicData:
         socialName: Fiscal name
diff --git a/src/pages/Customer/locale/es.yml b/src/pages/Customer/locale/es.yml
index 4a266e07a..9b0009b36 100644
--- a/src/pages/Customer/locale/es.yml
+++ b/src/pages/Customer/locale/es.yml
@@ -42,14 +42,17 @@ customer:
         hasCoreVnl: Recibido core VNL
         hasB2BVnl: Recibido B2B VNL
         addressName: Nombre de la dirección
+        addressNameAbbr: N. Dirección
         addressCity: Ciudad
         username: Usuario
         webAccess: Acceso web
         totalGreuge: Greuge total
         mana: Maná
         priceIncreasingRate: Ratio de incremento de precio
+        priceIncreasingRateAbbr: R. Inc. Precio
         averageInvoiced: Facturación media
         claimRate: Ratio de reclamaciones
+        claimRateAbbr: R. Reclamaciones
         maximumRisk: Riesgo máximo asumido por Solunion
         payMethodFk: Forma de pago
         risk: Riesgo
@@ -68,6 +71,7 @@ customer:
         descriptorInfo: Facturas menos recibos mas pedidos sin facturar
         rating: Clasificación
         recommendCredit: Crédito recomendado
+        recommendCreditAbbr: Cr. Recomendado
         goToLines: Ir a líneas
     basicData:
         socialName: Nombre fiscal
diff --git a/src/pages/Entry/Card/EntryBuys.vue b/src/pages/Entry/Card/EntryBuys.vue
index baa4d96b7..b4c71ff2a 100644
--- a/src/pages/Entry/Card/EntryBuys.vue
+++ b/src/pages/Entry/Card/EntryBuys.vue
@@ -19,6 +19,7 @@ import { checkEntryLock } from 'src/composables/checkEntryLock';
 import VnRow from 'src/components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnInputNumber from 'src/components/common/VnInputNumber.vue';
+import { beforeSave } from 'src/composables/updateMinPriceBeforeSave';
 
 const $props = defineProps({
     id: {
@@ -415,56 +416,6 @@ function getAmountStyle(row) {
     return { color: 'var(--vn-label-color)' };
 }
 
-async function beforeSave(data, getChanges) {
-    try {
-        const changes = data.updates;
-        if (!changes) return data;
-        const patchPromises = [];
-
-        for (const change of changes) {
-            let patchData = {};
-
-            if ('hasMinPrice' in change.data) {
-                patchData.hasMinPrice = change.data?.hasMinPrice;
-                delete change.data.hasMinPrice;
-            }
-            if ('minPrice' in change.data) {
-                patchData.minPrice = change.data?.minPrice;
-                delete change.data.minPrice;
-            }
-
-            if (Object.keys(patchData).length > 0) {
-                const promise = axios
-                    .get('Buys/findOne', {
-                        params: {
-                            filter: {
-                                fields: ['itemFk'],
-                                where: { id: change.where.id },
-                            },
-                        },
-                    })
-                    .then((buy) => {
-                        return axios.patch(`Items/${buy.data.itemFk}`, patchData);
-                    })
-                    .catch((error) => {
-                        console.error('Error processing change: ', change, error);
-                    });
-
-                patchPromises.push(promise);
-            }
-        }
-
-        await Promise.all(patchPromises);
-
-        data.updates = changes.filter((change) => Object.keys(change.data).length > 0);
-
-        return data;
-    } catch (error) {
-        console.error('Error in beforeSave:', error);
-        throw error;
-    }
-}
-
 function invertQuantitySign(rows, sign) {
     for (const row of rows) {
         if (sign > 0) row.quantity = Math.abs(row.quantity);
@@ -697,7 +648,7 @@ onMounted(() => {
         :right-search="false"
         :row-click="false"
         :columns="columns"
-        :beforeSaveFn="beforeSave"
+        :beforeSaveFn="(data, getChanges) => beforeSave(data, getChanges, 'Buys')"
         class="buyList"
         :table-height="$props.tableHeight ?? '84vh'"
         auto-load
diff --git a/src/pages/Item/ItemFixedPrice.vue b/src/pages/Item/ItemFixedPrice.vue
index fdfa1d3d1..eb156ce9f 100644
--- a/src/pages/Item/ItemFixedPrice.vue
+++ b/src/pages/Item/ItemFixedPrice.vue
@@ -1,574 +1,386 @@
 <script setup>
-import { onMounted, ref, onUnmounted, nextTick, computed } from 'vue';
+import { onMounted, ref, onUnmounted, computed, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
-import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
-import FetchedTags from 'components/ui/FetchedTags.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
-import VnInputDate from 'src/components/common/VnInputDate.vue';
-import EditTableCellValueForm from 'src/components/EditTableCellValueForm.vue';
-import ItemFixedPriceFilter from './ItemFixedPriceFilter.vue';
-import { useQuasar } from 'quasar';
-import ItemDescriptorProxy from './Card/ItemDescriptorProxy.vue';
-import { tMobile } from 'src/composables/tMobile';
-import VnConfirm from 'components/ui/VnConfirm.vue';
-import FetchData from 'src/components/FetchData.vue';
 import { useStateStore } from 'stores/useStateStore';
-import { toDate } from 'src/filters';
-import { useVnConfirm } from 'composables/useVnConfirm';
 import { useState } from 'src/composables/useState';
-import useNotify from 'src/composables/useNotify.js';
-import axios from 'axios';
-import { isLower, isBigger } from 'src/filters/date.js';
+
+import { beforeSave } from 'src/composables/updateMinPriceBeforeSave';
+
+import FetchedTags from 'components/ui/FetchedTags.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
+import EditFixedPriceForm from 'src/pages/Item/components/EditFixedPriceForm.vue';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import RightMenu from 'src/components/common/RightMenu.vue';
 import VnTable from 'src/components/VnTable/VnTable.vue';
-import { QCheckbox } from 'quasar';
+import VnColor from 'src/components/common/VnColor.vue';
+
+import { toDate } from 'src/filters';
+import { isLower, isBigger } from 'src/filters/date.js';
+import ItemFixedPriceFilter from './ItemFixedPriceFilter.vue';
+import ItemDescriptorProxy from './Card/ItemDescriptorProxy.vue';
+import { toCurrency } from 'src/filters';
 
-const quasar = useQuasar();
 const stateStore = useStateStore();
 const { t } = useI18n();
-const { openConfirmationModal } = useVnConfirm();
-const state = useState();
-const { notify } = useNotify();
 const tableRef = ref();
-const editTableCellDialogRef = ref(null);
-const user = state.getUser();
-const fixedPrices = ref([]);
-const warehousesOptions = ref([]);
-const hasSelectedRows = computed(() => rowsSelected.value.length > 0);
-const rowsSelected = ref([]);
-const itemFixedPriceFilterRef = ref();
-
+const editFixedPriceForm = ref(null);
+const selectedRows = ref([]);
+const hasSelectedRows = computed(() => selectedRows.value.length > 0);
+const isToClone = ref(false);
+const dateColor = 'var(--vn-label-text-color)';
+const state = useState();
+const user = state.getUser().fn();
+const warehouse = computed(() => user.warehouseFk);
 onMounted(async () => {
     stateStore.rightDrawer = true;
 });
 onUnmounted(() => (stateStore.rightDrawer = false));
 
-const defaultColumnAttrs = {
-    align: 'left',
-    sortable: true,
-};
 const columns = computed(() => [
     {
-        label: t('item.fixedPrice.itemFk'),
         name: 'itemFk',
-        ...defaultColumnAttrs,
-        isId: true,
-        columnField: {
-            component: 'input',
-            type: 'number',
-        },
-        columnClass: 'shrink',
-    },
-    {
-        label: t('globals.name'),
-        name: 'name',
-        ...defaultColumnAttrs,
-        create: true,
+        label: t('item.fixedPrice.itemFk'),
+        labelAbbreviation: 'Id',
+        toolTip: t('item.fixedPrice.itemFk'),
+        component: 'input',
         columnFilter: {
-            component: 'select',
             attrs: {
+                component: 'select',
                 url: 'Items',
                 fields: ['id', 'name', 'subName'],
                 optionLabel: 'name',
-                optionValue: 'name',
+                optionValue: 'id',
                 uppercase: false,
             },
+            inWhere: true,
         },
+        width: '55px',
+        isEditable: false,
+    },
+    {
+        labelAbbreviation: '',
+        name: 'hex',
+        columnSearch: false,
+        isEditable: false,
+        width: '9px',
+        component: 'select',
+        attrs: {
+            url: 'Inks',
+            fields: ['id', 'name'],
+        },
+    },
+    {
+        align: 'left',
+        label: t('globals.name'),
+        name: 'name',
+        create: true,
+        component: 'input',
+        isEditable: false,
     },
     {
         label: t('item.fixedPrice.groupingPrice'),
+        labelAbbreviation: 'P. Group',
+        toolTip: t('item.fixedPrice.groupingPrice'),
         name: 'rate2',
-        ...defaultColumnAttrs,
-        component: 'input',
-        type: 'number',
+        component: 'number',
+        create: true,
+        createOrder: 3,
+        createAttrs: {
+            required: true,
+        },
+        width: '50px',
+        format: (row) => toCurrency(row.rate2),
     },
     {
         label: t('item.fixedPrice.packingPrice'),
+        labelAbbreviation: 'P. Pack',
+        toolTip: t('item.fixedPrice.packingPrice'),
         name: 'rate3',
-        ...defaultColumnAttrs,
-        component: 'input',
-        type: 'number',
+        component: 'number',
+        create: true,
+        createOrder: 4,
+        createAttrs: {
+            required: true,
+        },
+        width: '50px',
+        format: (row) => toCurrency(row.rate3),
+    },
+    {
+        name: 'hasMinPrice',
+        label: t('item.fixedPrice.hasMinPrice'),
+        labelAbbreviation: t('item.fixedPrice.MP'),
+        toolTip: t('item.fixedPrice.hasMinPrice'),
+        label: t('item.fixedPrice.hasMinPrice'),
+        component: 'checkbox',
+        attrs: {
+            toggleIndeterminate: false,
+        },
+        width: '50px',
     },
-
     {
         label: t('item.fixedPrice.minPrice'),
+        labelAbbreviation: 'Min.P',
+        toolTip: t('item.fixedPrice.minPrice'),
         name: 'minPrice',
-        ...defaultColumnAttrs,
-        component: 'input',
-        type: 'number',
+        component: 'number',
+        width: '50px',
+        style: (row) => {
+            if (!row?.hasMinPrice) return { color: 'var(--vn-label-color)' };
+        },
+        format: (row) => toCurrency(row.minPrice),
     },
     {
         label: t('item.fixedPrice.started'),
-        field: 'started',
         name: 'started',
-        format: ({ started }) => toDate(started),
-        ...defaultColumnAttrs,
-        columnField: {
-            component: 'date',
-            class: 'shrink',
-        },
+        component: 'date',
         columnFilter: {
             component: 'date',
         },
-        columnClass: 'expand',
+        createAttrs: {
+            required: true,
+        },
+        create: true,
+        createOrder: 5,
+        width: '65px',
     },
     {
         label: t('item.fixedPrice.ended'),
         name: 'ended',
-        ...defaultColumnAttrs,
-        columnField: {
-            component: 'date',
-            class: 'shrink',
-        },
+        component: 'date',
         columnFilter: {
             component: 'date',
         },
-        columnClass: 'expand',
-        format: (row) => toDate(row.ended),
+        createAttrs: {
+            required: true,
+        },
+        create: true,
+        createOrder: 6,
+        width: '65px',
     },
-
     {
+        align: 'center',
         label: t('globals.warehouse'),
         name: 'warehouseFk',
-        ...defaultColumnAttrs,
-        columnClass: 'shrink',
         component: 'select',
-        options: warehousesOptions,
-        columnFilter: {
-            name: 'warehouseFk',
-            inWhere: true,
-            component: 'select',
-            attrs: {
-                options: warehousesOptions,
-                'option-label': 'name',
-                'option-value': 'id',
-            },
+        attrs: {
+            url: 'Warehouses',
+            fields: ['id', 'name'],
+            optionLabel: 'name',
+            optionValue: 'id',
         },
+        create: true,
+        format: (row, dashIfEmpty) => dashIfEmpty(row.warehouseName),
+        width: '80px',
     },
     {
         align: 'right',
         name: 'tableActions',
         actions: [
             {
-                title: t('delete'),
-                icon: 'delete',
-                action: (row) => confirmRemove(row),
+                title: t('globals.clone'),
+                icon: 'vn:clone',
+                action: (row) => openCloneFixedPriceForm(row),
                 isPrimary: true,
             },
         ],
     },
 ]);
 
-const editTableFieldsOptions = [
-    {
-        field: 'rate2',
-        label: t('item.fixedPrice.groupingPrice'),
-        component: 'input',
-        attrs: {
-            type: 'number',
-        },
-    },
-    {
-        field: 'rate3',
-        label: t('item.fixedPrice.packingPrice'),
-        component: 'input',
-        attrs: {
-            type: 'number',
-        },
-    },
-    {
-        field: 'minPrice',
-        label: t('item.fixedPrice.minPrice'),
-        component: 'input',
-        attrs: {
-            type: 'number',
-        },
-    },
-    {
-        field: 'started',
-        label: t('item.fixedPrice.started'),
-        component: 'date',
-    },
-    {
-        field: 'ended',
-        label: t('item.fixedPrice.ended'),
-        component: 'date',
-    },
-    {
-        field: 'warehouseFk',
-        label: t('globals.warehouse'),
-        component: 'select',
-        attrs: {
-            options: [],
-            'option-label': 'name',
-            'option-value': 'id',
-        },
-    },
-];
-const getRowUpdateInputEvents = (props, resetMinPrice, inputType = 'text') => {
-    return inputType === 'text'
-        ? {
-              'keyup.enter': () => upsertPrice(props, resetMinPrice),
-              blur: () => upsertPrice(props, resetMinPrice),
-          }
-        : { 'update:modelValue': () => upsertPrice(props, resetMinPrice) };
+const openEditFixedPriceForm = () => {
+    editFixedPriceForm.value.show();
 };
 
-const updateMinPrice = async (value, props) => {
-    props.row.hasMinPrice = value;
-    await upsertPrice({
-        row: props.row,
-        col: { field: 'hasMinPrice' },
-        rowIndex: props.rowIndex,
-    });
+const openCloneFixedPriceForm = (row) => {
+    tableRef.value.showForm = true;
+    isToClone.value = true;
+    tableRef.value.create.title = t('Clone fixed price');
+    tableRef.value.create.formInitialData = (({
+        itemFk,
+        rate2,
+        rate3,
+        started,
+        ended,
+        warehouseFk,
+    }) => ({
+        itemFk,
+        rate2,
+        rate3,
+        started,
+        ended,
+        warehouseFk,
+    }))(JSON.parse(JSON.stringify(row)));
 };
 
-const validations = ({ row }) => {
-    const requiredFields = [
-        'itemFk',
-        'started',
-        'ended',
-        'rate2',
-        'rate3',
-        'warehouseFk',
-    ];
-    const isValid = requiredFields.every(
-        (field) => row[field] !== null && row[field] !== undefined
-    );
-    return isValid;
-};
-const upsertPrice = async (props, resetMinPrice = false) => {
-    const isValid = validations({ ...props });
-    if (!isValid) {
-        return;
-    }
-    const { row } = props;
-    const changes = tableRef.value.CrudModelRef.getChanges();
-    if (changes?.updates?.length > 0) {
-        if (resetMinPrice) row.hasMinPrice = 0;
-    }
-    if (!changes.updates && !changes.creates) return;
-    const data = await upsertFixedPrice(row);
-    Object.assign(tableRef.value.CrudModelRef.formData[props.rowIndex], data);
-    notify(t('globals.dataSaved'), 'positive');
-    tableRef.value.reload();
-};
-
-async function upsertFixedPrice(row) {
-    const { data } = await axios.patch('FixedPrices/upsertFixedPrice', row);
-    data.hasMinPrice = data.hasMinPrice ? 1 : 0;
-    return data;
-}
-
-function checkLastVisibleRow() {
-    let lastVisibleRow = null;
-
-    getTableRows().forEach((row, index) => {
-        const rect = row.getBoundingClientRect();
-        if (rect.top >= 0 && rect.bottom <= window.innerHeight) {
-            lastVisibleRow = index;
-        }
-    });
-
-    return lastVisibleRow;
-}
-
-const addRow = (original = null) => {
-    let copy = null;
-    const today = Date.vnNew();
-    const millisecsInDay = 86400000;
-    const daysInWeek = 7;
-    const nextWeek = new Date(today.getTime() + daysInWeek * millisecsInDay);
-
-    copy = {
-        id: 0,
-        started: today,
-        ended: nextWeek,
-        hasMinPrice: 0,
-        $index: 0,
-    };
-    return { original, copy };
-};
-
-const getTableRows = () =>
-    document.getElementsByClassName('q-table')[0].querySelectorAll('tr.cursor-pointer');
-
-function highlightNewRow({ $index: index }) {
-    const row = getTableRows()[index];
-    if (row) {
-        row.classList.add('highlight');
-        setTimeout(() => {
-            row.classList.remove('highlight');
-        }, 3000);
-    }
-}
-const openEditTableCellDialog = () => {
-    editTableCellDialogRef.value.show();
-};
-
-const onEditCellDataSaved = async () => {
-    rowsSelected.value = [];
-    tableRef.value.reload();
-};
-
-const removeFuturePrice = async () => {
-    rowsSelected.value.forEach(({ id }) => {
-        const rowIndex = fixedPrices.value.findIndex(({ id }) => id === id);
-        removePrice(id, rowIndex);
-    });
-};
-
-function confirmRemove(item, isFuture) {
-    const promise = async () =>
-        isFuture ? removeFuturePrice(item.id) : removePrice(item.id);
-    quasar.dialog({
-        component: VnConfirm,
-        componentProps: {
-            title: t('globals.rowWillBeRemoved'),
-            message: t('globals.confirmDeletion'),
-            promise,
-        },
-    });
-}
-
-const removePrice = async (id) => {
-    await axios.delete(`FixedPrices/${id}`);
-    notify(t('globals.dataSaved'), 'positive');
-    tableRef.value.reload({});
-};
 const dateStyle = (date) =>
     date
         ? {
-              'bg-color': 'warning',
-              'is-outlined': true,
+              color: 'var(--vn-black-text-color)',
           }
-        : {};
+        : { color: dateColor, 'background-color': 'transparent' };
 
-function handleOnDataSave({ CrudModelRef }) {
-    const { original, copy } = addRow(CrudModelRef.formData[checkLastVisibleRow()]);
-    if (original) {
-        CrudModelRef.formData.splice(original?.$index ?? 0, 0, copy);
-    } else {
-        CrudModelRef.insert(copy);
+const onDataSaved = () => {
+    tableRef.value.CrudModelRef.saveChanges();
+    selectedRows.value = [];
+};
+
+onMounted(() => {
+    if (tableRef.value) {
+        tableRef.value.showForm = false;
     }
-    nextTick(() => {
-        highlightNewRow(original ?? { $index: 0 });
-    });
-}
+});
+
+watch(
+    () => tableRef.value?.showForm,
+    (newVal) => {
+        if (!newVal) {
+            tableRef.value.create.title = '';
+            tableRef.value.create.formInitialData = { warehouseFk: warehouse };
+            if (tableRef.value) {
+                isToClone.value = false;
+                tableRef.value.create.title = t('Create fixed price');
+            }
+        }
+    },
+);
 </script>
 
 <template>
-    <FetchData
-        @on-fetch="(data) => (warehousesOptions = data)"
-        auto-load
-        url="Warehouses"
-        :filter="{ fields: ['id', 'name'], order: 'name ASC' }"
-    />
     <RightMenu>
         <template #right-panel>
-            <ItemFixedPriceFilter
-                data-key="ItemFixedPrices"
-                ref="itemFixedPriceFilterRef"
-            />
+            <ItemFixedPriceFilter data-key="ItemFixedPrices" />
         </template>
     </RightMenu>
-    <VnSubToolbar>
-        <template #st-actions>
+    <VnSubToolbar />
+    <Teleport to="#st-data" v-if="stateStore?.isSubToolbarShown()">
+        <QBtnGroup push style="column-gap: 10px">
             <QBtn
                 :disable="!hasSelectedRows"
-                @click="openEditTableCellDialog()"
+                @click="openEditFixedPriceForm()"
                 color="primary"
                 icon="edit"
+                flat
+                :label="t('globals.edit')"
+                data-cy="FixedPriceToolbarEditBtn"
             >
                 <QTooltip>
                     {{ t('Edit fixed price(s)') }}
                 </QTooltip>
             </QBtn>
-            <QBtn
-                :disable="!hasSelectedRows"
-                :label="tMobile('globals.remove')"
-                color="primary"
-                icon="delete"
-                flat
-                @click="(row) => confirmRemove(row, true)"
-                :title="t('globals.remove')"
-            />
-        </template>
-    </VnSubToolbar>
+        </QBtnGroup>
+    </Teleport>
     <VnTable
-        :default-remove="false"
-        :default-reset="false"
-        :default-save="false"
+        ref="tableRef"
         data-key="ItemFixedPrices"
         url="FixedPrices/filter"
-        :order="['name DESC', 'itemFk DESC']"
+        :order="'name DESC'"
         save-url="FixedPrices/crud"
-        ref="tableRef"
-        dense
-        :filter="{
-            where: {
-                warehouseFk: user.warehouseFk,
-            },
-        }"
         :columns="columns"
-        default-mode="table"
-        auto-load
         :is-editable="true"
         :right-search="false"
         :table="{
             'row-key': 'id',
             selection: 'multiple',
         }"
-        v-model:selected="rowsSelected"
-        :create-as-dialog="false"
+        v-model:selected="selectedRows"
         :create="{
-            onDataSaved: handleOnDataSave,
+            urlCreate: 'FixedPrices',
+            title: t('Create fixed price'),
+            formInitialData: { warehouseFk: warehouse },
+            onDataSaved: () => tableRef.reload(),
+            showSaveAndContinueBtn: true,
         }"
         :disable-option="{ card: true }"
-        :has-sub-toolbar="false"
+        auto-load
+        :beforeSaveFn="(data, getChanges) => beforeSave(data, getChanges, 'FixedPrices')"
     >
-        <template #header-selection="scope">
-            <QCheckbox v-model="scope.selected" />
+        <template #column-hex="{ row }">
+            <VnColor :colors="row?.hexJson" style="height: 100%; min-width: 2000px" />
         </template>
-        <template #body-selection="scope">
-            {{ scope }}
-            <QCheckbox flat v-model="scope.selected" />
+        <template #column-name="{ row }">
+            <span class="link">
+                {{ row.name }}
+                <ItemDescriptorProxy :id="row.itemFk" />
+            </span>
+            <span class="subName">{{ row.subName }}</span>
+            <FetchedTags :item="row" :columns="6" />
         </template>
-
-        <template #column-itemFk="props">
+        <template #column-started="{ row }">
+            <div class="editable-text q-pb-xxs">
+                <QBadge class="badge" :style="dateStyle(isLower(row?.ended))">
+                    {{ toDate(row?.started) }}
+                </QBadge>
+            </div>
+        </template>
+        <template #column-ended="{ row }">
+            <div class="editable-text q-pb-xxs">
+                <QBadge class="badge" :style="dateStyle(isBigger(row?.ended))">
+                    {{ toDate(row?.ended) }}
+                </QBadge>
+            </div>
+        </template>
+        <template #column-create-name="{ data }">
             <VnSelect
-                style="max-width: 100px"
-                url="Items/withName"
-                hide-selected
-                option-label="id"
+                url="Items/search"
+                v-model="data.itemFk"
+                :label="t('item.fixedPrice.itemName')"
+                :fields="['id', 'name']"
+                :filter-options="['id', 'name']"
+                option-label="name"
                 option-value="id"
-                v-model="props.row.itemFk"
-                v-on="getRowUpdateInputEvents(props, true, 'select')"
+                :required="true"
+                sort-by="name ASC"
+                data-cy="FixedPriceCreateNameSelect"
             >
                 <template #option="scope">
                     <QItem v-bind="scope.itemProps">
                         <QItemSection>
-                            <QItemLabel> #{{ scope.opt?.id }} </QItemLabel>
-                            <QItemLabel caption>{{ scope.opt?.name }}</QItemLabel>
+                            <QItemLabel>
+                                {{ scope.opt.name }}
+                            </QItemLabel>
+                            <QItemLabel caption> #{{ scope.opt.id }} </QItemLabel>
                         </QItemSection>
                     </QItem>
                 </template>
             </VnSelect>
         </template>
-        <template #column-name="{ row }">
-            <span class="link">
-                {{ row.name }}
-            </span>
-            <span class="subName">{{ row.subName }}</span>
-            <ItemDescriptorProxy :id="row.itemFk" />
-            <FetchedTags :item="row" :columns="3" />
-        </template>
-        <template #column-rate2="props">
-            <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">
-            <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="align-items: center">
-                    <QCheckbox
-                        :model-value="props.row.hasMinPrice"
-                        @update:model-value="updateMinPrice($event, props)"
-                        :false-value="0"
-                        :true-value="1"
-                        :toggle-indeterminate="false"
-                    />
-                    <VnInput
-                        class="col"
-                        type="currency"
-                        mask="###.##"
-                        :disable="props.row.hasMinPrice === 0"
-                        v-model.number="props.row.minPrice"
-                        v-on="getRowUpdateInputEvents(props)"
-                    >
-                        <template #append>€</template>
-                    </VnInput>
-                </div>
-            </QTd>
-        </template>
-        <template #column-started="props">
-            <VnInputDate
-                class="vnInputDate"
-                :show-event="true"
-                v-model="props.row.started"
-                v-on="getRowUpdateInputEvents(props, false, 'date')"
-                v-bind="dateStyle(isBigger(props.row.started))"
-            />
-        </template>
-        <template #column-ended="props">
-            <VnInputDate
-                class="vnInputDate"
-                :show-event="true"
-                v-model="props.row.ended"
-                v-on="getRowUpdateInputEvents(props, false, 'date')"
-                v-bind="dateStyle(isLower(props.row.ended))"
-            />
-        </template>
-        <template #column-warehouseFk="props">
-            <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
-                name="delete"
-                size="sm"
-                class="cursor-pointer fill-icon-on-hover"
-                color="primary"
-                @click.stop="
-                    openConfirmationModal(
-                        t('globals.rowWillBeRemoved'),
-                        t('Do you want to clone this item?'),
-                        () => removePrice(row.id, rowIndex)
-                    )
-                "
+        <template #column-create-warehouseFk="{ data }">
+            <VnSelect
+                :label="t('globals.warehouse')"
+                url="Warehouses"
+                v-model="data.warehouseFk"
+                :fields="['id', 'name']"
+                option-label="name"
+                option-value="id"
+                hide-selected
+                :required="true"
+                sort-by="name ASC"
+                data-cy="FixedPriceCreateWarehouseSelect"
             >
-                <QTooltip class="text-no-wrap">
-                    {{ t('globals.delete') }}
-                </QTooltip>
-            </QIcon>
+                <template #option="scope">
+                    <QItem v-bind="scope.itemProps">
+                        <QItemSection>
+                            <QItemLabel>
+                                {{ scope.opt.name }}
+                            </QItemLabel>
+                            <QItemLabel caption> #{{ scope.opt.id }} </QItemLabel>
+                        </QItemSection>
+                    </QItem>
+                </template>
+            </VnSelect>
         </template>
     </VnTable>
-
-    <QDialog ref="editTableCellDialogRef">
-        <EditTableCellValueForm
+    <QDialog ref="editFixedPriceForm">
+        <EditFixedPriceForm
             edit-url="FixedPrices/editFixedPrice"
-            :rows="rowsSelected"
-            :fields-options="editTableFieldsOptions"
-            @on-data-saved="onEditCellDataSaved()"
+            :rows="selectedRows"
+            :fields-options="
+                columns.filter(
+                    ({ isEditable, component, name }) =>
+                        isEditable !== false && component && name !== 'itemFk',
+                )
+            "
+            :beforeSave="beforeSave"
+            @on-data-saved="onDataSaved"
         />
     </QDialog>
 </template>
@@ -623,8 +435,17 @@ tbody tr.highlight .q-td {
     color: var(--vn-label-color);
 }
 </style>
+
+<style lang="scss" scoped>
+.badge {
+    background-color: $warning;
+}
+</style>
+
 <i18n>
 es:
     Add fixed price: Añadir precio fijado
     Edit fixed price(s): Editar precio(s) fijado(s)
+    Create fixed price: Crear precio fijado
+    Clone fixed price: Clonar precio fijado
 </i18n>
diff --git a/src/pages/Item/ItemFixedPriceFilter.vue b/src/pages/Item/ItemFixedPriceFilter.vue
index d68b966c6..9c11a2e69 100644
--- a/src/pages/Item/ItemFixedPriceFilter.vue
+++ b/src/pages/Item/ItemFixedPriceFilter.vue
@@ -29,6 +29,7 @@ const props = defineProps({
                         dense
                         filled
                         use-input
+                        :use-like="false"
                         @update:model-value="searchFn()"
                         sort-by="nickname ASC"
                     />
@@ -50,21 +51,19 @@ const props = defineProps({
                     />
                 </QItemSection>
             </QItem>
-            <QItem class="q-my-md">
+            <QItem>
                 <QItemSection>
                     <VnInputDate
-                        :label="t('params.started')"
                         v-model="params.started"
+                        :label="t('params.started')"
                         filled
                         @update:model-value="searchFn()"
                     />
                 </QItemSection>
-            </QItem>
-            <QItem class="q-my-md">
                 <QItemSection>
                     <VnInputDate
-                        :label="t('params.ended')"
                         v-model="params.ended"
+                        :label="t('params.ended')"
                         filled
                         @update:model-value="searchFn()"
                     />
diff --git a/src/components/EditTableCellValueForm.vue b/src/pages/Item/components/EditFixedPriceForm.vue
similarity index 81%
rename from src/components/EditTableCellValueForm.vue
rename to src/pages/Item/components/EditFixedPriceForm.vue
index 172866191..9c6a63893 100644
--- a/src/components/EditTableCellValueForm.vue
+++ b/src/pages/Item/components/EditFixedPriceForm.vue
@@ -8,11 +8,6 @@ import VnInputDate from 'src/components/common/VnInputDate.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import { QCheckbox } from 'quasar';
 
-import axios from 'axios';
-import useNotify from 'src/composables/useNotify.js';
-
-const emit = defineEmits(['onDataSaved']);
-
 const $props = defineProps({
     rows: {
         type: Array,
@@ -26,10 +21,14 @@ const $props = defineProps({
         type: String,
         default: '',
     },
+    beforeSave: {
+        type: Function,
+        default: () => {},
+    },
 });
 
 const { t } = useI18n();
-const { notify } = useNotify();
+const emit = defineEmits(['onDataSaved']);
 
 const inputs = {
     input: markRaw(VnInput),
@@ -44,24 +43,13 @@ const selectedField = ref(null);
 const closeButton = ref(null);
 const isLoading = ref(false);
 
-const onDataSaved = () => {
-    notify('globals.dataSaved', 'positive');
-    emit('onDataSaved');
-    closeForm();
-};
-
 const onSubmit = async () => {
     isLoading.value = true;
-    const rowsToEdit = $props.rows.map((row) => ({ id: row.id, itemFk: row.itemFk }));
-    const payload = {
-        field: selectedField.value.field,
-        newValue: newValue.value,
-        lines: rowsToEdit,
-    };
-
-    await axios.post($props.editUrl, payload);
-    onDataSaved();
-    isLoading.value = false;
+    $props.rows.forEach((row) => {
+        row[selectedField.value.name] = newValue.value;
+    });
+    emit('onDataSaved', $props.rows);
+    closeForm();
 };
 
 const closeForm = () => {
@@ -78,21 +66,24 @@ const closeForm = () => {
             <span class="title">{{ t('Edit') }}</span>
             <span class="countLines">{{ ` ${rows.length} ` }}</span>
             <span class="title">{{ t('buy(s)') }}</span>
-            <VnRow>
+            <VnRow class="q-mt-md">
                 <VnSelect
+                    class="editOption"
                     :label="t('Field to edit')"
                     :options="fieldsOptions"
                     hide-selected
                     option-label="label"
                     v-model="selectedField"
-                    data-cy="field-to-edit"
+                    data-cy="EditFixedPriceSelectOption"
+                    @update:model-value="newValue = null"
+                    :class="{ 'is-select': selectedField?.component === 'select' }"
                 />
                 <component
                     :is="inputs[selectedField?.component || 'input']"
                     v-bind="selectedField?.attrs || {}"
                     v-model="newValue"
                     :label="t('Value')"
-                    data-cy="value-to-edit"
+                    data-cy="EditFixedPriceValueOption"
                     style="width: 200px"
                 />
             </VnRow>
@@ -140,6 +131,15 @@ const closeForm = () => {
 }
 </style>
 
+<style lang="scss">
+.editOption .q-field__inner .q-field__control {
+    padding: 0 !important;
+}
+.editOption.is-select .q-field__inner .q-field__control {
+    padding: 0 !important;
+}
+</style>
+
 <i18n>
 es:
     Edit: Editar
diff --git a/src/pages/Item/components/__tests__/EditFixedPriceForm.spec.js b/src/pages/Item/components/__tests__/EditFixedPriceForm.spec.js
new file mode 100644
index 000000000..6ac8f372d
--- /dev/null
+++ b/src/pages/Item/components/__tests__/EditFixedPriceForm.spec.js
@@ -0,0 +1,46 @@
+import { describe, it, expect, beforeEach, vi, afterEach } from 'vitest';
+import { createWrapper } from 'app/test/vitest/helper';
+import EditFixedPriceForm from 'src/pages/Item/components/EditFixedPriceForm.vue';
+
+describe('EditFixedPriceForm.vue', () => {
+    let wrapper;
+    let vm;
+
+    const mockRows = [
+        { id: 1, itemFk: 101 },
+        { id: 2, itemFk: 102 },
+    ];
+
+    const mockFieldsOptions = [
+        {
+            name: 'price',
+            label: 'Price',
+            component: 'input',
+            attrs: { type: 'number' },
+        },
+    ];
+
+    beforeEach(() => {
+        wrapper = createWrapper(EditFixedPriceForm, {
+            props: {
+                rows: JSON.parse(JSON.stringify(mockRows)),
+                fieldsOptions: mockFieldsOptions,
+            },
+        });
+        wrapper = wrapper.wrapper;
+        vm = wrapper.vm;
+    });
+
+    afterEach(() => {
+        vi.clearAllMocks();
+    });
+
+    it('should emit "onDataSaved" with updated rows on submit', async () => {
+        vm.selectedField = mockFieldsOptions[0];
+        vm.newValue = 199.99;
+
+        await vm.onSubmit();
+
+        expect(wrapper.emitted('onDataSaved')).toBeTruthy();
+    });
+});
diff --git a/src/pages/Item/locale/en.yml b/src/pages/Item/locale/en.yml
index ff8df26d4..017f6b11f 100644
--- a/src/pages/Item/locale/en.yml
+++ b/src/pages/Item/locale/en.yml
@@ -167,6 +167,8 @@ item:
         started: Started
         ended: Ended
         warehouse: Warehouse
+        MP: MP
+        itemName: Item
     create:
         name: Name
         tag: Tag
diff --git a/src/pages/Item/locale/es.yml b/src/pages/Item/locale/es.yml
index 7b768d0cb..a06695fe9 100644
--- a/src/pages/Item/locale/es.yml
+++ b/src/pages/Item/locale/es.yml
@@ -173,6 +173,8 @@ item:
         started: Inicio
         ended: Fin
         warehouse: Almacén
+        MP: PM
+        itemName: Nombre
     create:
         name: Nombre
         tag: Etiqueta
diff --git a/src/pages/Order/Card/OrderLines.vue b/src/pages/Order/Card/OrderLines.vue
index 1b864de6f..231efbcd9 100644
--- a/src/pages/Order/Card/OrderLines.vue
+++ b/src/pages/Order/Card/OrderLines.vue
@@ -295,13 +295,11 @@ watch(
         :user-filter="lineFilter"
     >
         <template #column-image="{ row }">
-            <div class="image-wrapper">
-                <VnImg
-                    :id="parseInt(row?.item?.image)"
-                    class="rounded"
-                    zoom-resolution="1600x900"
-                />
-            </div>
+            <VnImg
+                :id="parseInt(row?.item?.image)"
+                class="rounded"
+                zoom-resolution="1600x900"
+            />
         </template>
         <template #column-id="{ row }">
             <span class="link" @click.stop>
@@ -361,12 +359,6 @@ watch(
     }
 }
 
-.image-wrapper {
-    height: 50px;
-    width: 50px;
-    margin-left: 30%;
-}
-
 .header {
     color: $primary;
     font-weight: bold;
diff --git a/src/pages/Route/RouteTickets.vue b/src/pages/Route/RouteTickets.vue
index 5e28bb689..1b9545905 100644
--- a/src/pages/Route/RouteTickets.vue
+++ b/src/pages/Route/RouteTickets.vue
@@ -141,7 +141,7 @@ const setOrderedPriority = async () => {
 };
 
 const sortRoutes = async () => {
-    await axios.patch(`Routes/${route.params?.id}/guessPriority/`);
+    await axios.patch(`Routes/${route.params?.id}/optimizePriority`);
     refreshKey.value++;
 };
 
diff --git a/src/pages/Ticket/Card/TicketDescriptor.vue b/src/pages/Ticket/Card/TicketDescriptor.vue
index 96920231c..c6c6e6c6b 100644
--- a/src/pages/Ticket/Card/TicketDescriptor.vue
+++ b/src/pages/Ticket/Card/TicketDescriptor.vue
@@ -46,7 +46,7 @@ async function getClaims() {
     originalTicket.value = data[0]?.originalTicketFk;
 }
 async function getProblems() {
-    const { data } = await axios.get(`Tickets/${entityId.value}/getTicketProblems`);
+    const { data } = await axios.get(`Tickets/getTicketProblems`, {params: { ids: [entityId.value] }});
     if (!data) return;
     problems.value = data[0];
 }
diff --git a/src/pages/Ticket/Card/TicketEditMana.vue b/src/pages/Ticket/Card/TicketEditMana.vue
index 266c82ccd..f8a72caf3 100644
--- a/src/pages/Ticket/Card/TicketEditMana.vue
+++ b/src/pages/Ticket/Card/TicketEditMana.vue
@@ -4,7 +4,6 @@ import { useI18n } from 'vue-i18n';
 import { computed, ref } from 'vue';
 import { useRoute } from 'vue-router';
 import { toCurrency } from 'src/filters';
-import VnUsesMana from 'components/ui/VnUsesMana.vue';
 
 const $props = defineProps({
     newPrice: {
@@ -15,23 +14,36 @@ const $props = defineProps({
         type: Object,
         default: null,
     },
+    componentId: {
+        type: Number,
+        default: null,
+    },
 });
 
+const emit = defineEmits(['save', 'cancel', 'update:componentId']);
+
 const route = useRoute();
 const mana = ref(null);
-const usesMana = ref(false);
-
-const emit = defineEmits(['save', 'cancel']);
+const usesMana = ref([]);
 
 const { t } = useI18n();
 const QPopupProxyRef = ref(null);
-const manaCode = ref($props.manaCode);
+
+const componentId = computed({
+    get: () => $props.componentId,
+    set: (val) => emit('update:componentId', val),
+});
 
 const save = (sale = $props.sale) => {
     emit('save', sale);
     QPopupProxyRef.value.hide();
 };
 
+const cancel = () => {
+    emit('cancel');
+    QPopupProxyRef.value.hide();
+};
+
 const getMana = async () => {
     const { data } = await axios.get(`Tickets/${route.params.id}/getDepartmentMana`);
     mana.value = data;
@@ -39,15 +51,12 @@ const getMana = async () => {
 };
 
 const getUsesMana = async () => {
-    const { data } = await axios.get('Sales/usesMana');
+    const { data } = await axios.get('Sales/getComponents');
     usesMana.value = data;
 };
 
-const cancel = () => {
-    emit('cancel');
-    QPopupProxyRef.value.hide();
-};
 const hasMana = computed(() => typeof mana.value === 'number');
+
 defineExpose({ save });
 </script>
 
@@ -59,17 +68,29 @@ defineExpose({ save });
     >
         <div class="container">
             <div class="header">Mana: {{ toCurrency(mana) }}</div>
-            <QSpinner v-if="!hasMana" color="primary" size="md" />
+
+            <QSpinner v-if="!usesMana.length" color="primary" />
+
             <div class="q-pa-md" v-else>
                 <slot :popup="QPopupProxyRef" />
-                <div v-if="usesMana" class="column q-gutter-y-sm q-mt-sm">
-                    <VnUsesMana :mana-code="manaCode" />
+
+                <div v-if="usesMana.length" class="column q-gutter-y-sm q-mt-sm">
+                    <QRadio
+                        v-for="(item, index) in usesMana"
+                        :key="index"
+                        v-model="componentId"
+                        :val="item.id"
+                        :label="item.name"
+                        dense
+                        :dark="true"
+                        class="q-mb-sm"
+                        :data-cy="`componentOption-${item.id}`"
+                    />
                 </div>
+
                 <div v-if="newPrice" class="column items-center q-mt-lg">
                     <span class="text-primary">{{ t('New price') }}</span>
-                    <span class="text-subtitle1">
-                        {{ toCurrency($props.newPrice) }}
-                    </span>
+                    <span class="text-subtitle1">{{ toCurrency(newPrice) }}</span>
                 </div>
             </div>
 
@@ -77,7 +98,6 @@ defineExpose({ save });
                 <QBtn
                     color="primary"
                     class="no-border-radius"
-                    dense
                     style="width: 50%"
                     @click="cancel()"
                 >
@@ -86,7 +106,6 @@ defineExpose({ save });
                 <QBtn
                     color="primary"
                     class="no-border-radius"
-                    dense
                     style="width: 50%"
                     @click="save()"
                     data-cy="saveManaBtn"
@@ -116,8 +135,3 @@ defineExpose({ save });
     min-width: 230px;
 }
 </style>
-
-<i18n>
-es:
-    New price: Nuevo precio
-</i18n>
diff --git a/src/pages/Ticket/Card/TicketNotes.vue b/src/pages/Ticket/Card/TicketNotes.vue
index feb88bf84..a3e25d63e 100644
--- a/src/pages/Ticket/Card/TicketNotes.vue
+++ b/src/pages/Ticket/Card/TicketNotes.vue
@@ -38,7 +38,9 @@ function handleDelete(row) {
     ticketNotesCrudRef.value.remove([row]);
 }
 
-async function handleSave() {
+async function handleSave(e) {
+    if (e.shiftKey && e.key === 'Enter') return;
+    e.preventDefault();
     if (!isSaving.value) {
         isSaving.value = true;
         await ticketNotesCrudRef.value?.saveChanges();
@@ -70,7 +72,7 @@ async function handleSave() {
                     <div
                         v-for="(row, index) in rows"
                         :key="index"
-                        class="q-mb-md row items-center q-gutter-x-md"
+                        class="q-mb-md row q-gutter-x-md"
                     >
                         <VnSelect
                             :label="t('ticketNotes.observationType')"
@@ -86,7 +88,8 @@ async function handleSave() {
                             :label="t('basicData.description')"
                             v-model="row.description"
                             class="col"
-                            @keyup.enter="handleSave"
+                            @keydown.enter.stop="handleSave"
+                            autogrow
                             data-cy="ticketNotesDescription"
                         />
                         <QIcon
diff --git a/src/pages/Ticket/Card/TicketSale.vue b/src/pages/Ticket/Card/TicketSale.vue
index e721e2d1c..421085142 100644
--- a/src/pages/Ticket/Card/TicketSale.vue
+++ b/src/pages/Ticket/Card/TicketSale.vue
@@ -45,7 +45,7 @@ const isTicketEditable = ref(false);
 const sales = ref([]);
 const editableStatesOptions = ref([]);
 const selectedSales = ref([]);
-const manaCode = ref('mana');
+const componentId = ref(null);
 const ticketState = computed(() => store.data?.ticketState?.state?.code);
 const transfer = ref({
     lastActiveTickets: [],
@@ -187,7 +187,7 @@ const getRowUpdateInputEvents = (sale) => {
 };
 
 const resetChanges = async () => {
-    arrayData.fetch({ append: false });
+    await arrayData.fetch({ append: false });
     tableRef.value.CrudModelRef.hasChanges = false;
     await tableRef.value.reload();
 
@@ -308,14 +308,15 @@ const changePrice = async (sale) => {
     if (newPrice != null && newPrice != sale.price) {
         if (await isSalePrepared(sale)) {
             await confirmUpdate(() => updatePrice(sale, newPrice));
-        } else updatePrice(sale, newPrice);
+        } else await updatePrice(sale, newPrice);
     }
 };
 const updatePrice = async (sale, newPrice) => {
     try {
-        await axios.post(`Sales/${sale.id}/updatePrice`, { newPrice });
-        sale.price = newPrice;
-        edit.value = { ...DEFAULT_EDIT };
+        await axios.post(`Sales/${sale.id}/updatePrice`, {
+            newPrice: newPrice,
+            componentId: componentId.value,
+        });
         notify('globals.dataSaved', 'positive');
         resetChanges();
     } catch (e) {
@@ -327,28 +328,31 @@ const changeDiscount = async (sale) => {
     const newDiscount = edit.value.discount;
     if (newDiscount != null && newDiscount != sale.discount) {
         if (await isSalePrepared(sale))
-            await confirmUpdate(() => updateDiscount([sale], newDiscount));
-        else await updateDiscount([sale], newDiscount);
+            await confirmUpdate(() =>
+                updateDiscount([sale], newDiscount, componentId.value),
+            );
+        else await updateDiscount([sale], newDiscount, componentId.value);
     }
 };
 
-const updateDiscounts = async (sales, newDiscount) => {
+const updateDiscounts = async (sales, newDiscount, componentId) => {
     const salesTracking = await fetchSalesTracking();
 
     const someSaleIsPrepared = salesTracking.some((sale) =>
         matchSale(salesTracking, sale),
     );
-    if (someSaleIsPrepared) await confirmUpdate(() => updateDiscount(sales, newDiscount));
-    else updateDiscount(sales, newDiscount);
+    if (someSaleIsPrepared)
+        await confirmUpdate(() => updateDiscount(sales, newDiscount, componentId));
+    else updateDiscount(sales, newDiscount, componentId);
 };
 
-const updateDiscount = async (sales, newDiscount = 0) => {
+const updateDiscount = async (sales, newDiscount, componentId) => {
     try {
         const salesIds = sales.map(({ id }) => id);
         const params = {
             salesIds,
-            newDiscount,
-            manaCode: manaCode.value,
+            newDiscount: newDiscount ?? 0,
+            componentId,
         };
         await axios.post(`Tickets/${route.params.id}/updateDiscount`, params);
         notify('globals.dataSaved', 'positive');
@@ -821,10 +825,11 @@ watch(
                     ref="editPriceProxyRef"
                     :sale="row"
                     :new-price="getNewPrice"
+                    v-model:component-id="componentId"
                     @save="changePrice"
                 >
                     <VnInput
-                        @keyup.enter.stop="() => editManaProxyRef.save(row)"
+                        @keyup.enter.stop="() => editPriceProxyRef.save(row)"
                         v-model.number="edit.price"
                         :label="t('basicData.price')"
                         type="number"
@@ -843,7 +848,7 @@ watch(
                     ref="editManaProxyRef"
                     :sale="row"
                     :new-price="getNewPrice"
-                    :mana-code="manaCode"
+                    v-model:component-id="componentId"
                     @save="changeDiscount"
                 >
                     <VnInput
diff --git a/src/pages/Ticket/Card/TicketSaleMoreActions.vue b/src/pages/Ticket/Card/TicketSaleMoreActions.vue
index 37441b44f..e4736e7a7 100644
--- a/src/pages/Ticket/Card/TicketSaleMoreActions.vue
+++ b/src/pages/Ticket/Card/TicketSaleMoreActions.vue
@@ -47,6 +47,7 @@ const { notify } = useNotify();
 const acl = useAcl();
 const btnDropdownRef = ref(null);
 const editManaProxyRef = ref(null);
+const componentId = ref(null);
 const { openConfirmationModal } = useVnConfirm();
 
 const newDiscount = ref(null);
@@ -112,7 +113,7 @@ const changeMultipleDiscount = () => {
     });
 
     if (newDiscount.value != null && hasChanges)
-        emit('updateDiscounts', props.sales, newDiscount.value);
+        emit('updateDiscounts', props.sales, newDiscount.value, componentId.value);
     btnDropdownRef.value.hide();
 };
 
@@ -206,6 +207,7 @@ const createRefund = async (withWarehouse) => {
                     ref="editManaProxyRef"
                     :sale="row"
                     @save="changeMultipleDiscount"
+                    v-model:component-id="componentId"
                 >
                     <VnInput
                         autofocus
diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index 119b867ed..7e14b3f72 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -241,6 +241,7 @@ onMounted(async () => {
                             :value="`${entity.address?.nickname} #${entity.address?.id}`"
                         />
                         <VnLv
+                            class="white-space-normal"
                             :label="t('ticket.summary.consigneeStreet')"
                             :value="formattedAddress"
                         />
@@ -524,4 +525,7 @@ onMounted(async () => {
 .grafana {
     color: $primary-light;
 }
+.white-space-normal :deep(.value span) {
+    white-space: normal;
+}
 </style>
diff --git a/src/pages/Ticket/TicketAdvance.vue b/src/pages/Ticket/TicketAdvance.vue
index bf3593acd..ea6c76781 100644
--- a/src/pages/Ticket/TicketAdvance.vue
+++ b/src/pages/Ticket/TicketAdvance.vue
@@ -14,6 +14,8 @@ 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';
+import { QTable } from 'quasar';
+import TicketProblems from 'src/components/TicketProblems.vue';
 
 const state = useState();
 const { t } = useI18n();
@@ -27,6 +29,16 @@ const selectedTickets = ref([]);
 const vnTableRef = ref({});
 const originElRef = ref(null);
 const destinationElRef = ref(null);
+const actions = {
+    advance: {
+        title: t('advanceTickets.advanceTickets'),
+        cb: moveTicketsAdvance,
+    },
+    advanceWithoutNegative: {
+        title: t('advanceTickets.advanceTicketsWithoutNegatives'),
+        cb: splitTickets,
+    },
+};
 let today = Date.vnNew().toISOString();
 const tomorrow = new Date(today);
 tomorrow.setDate(tomorrow.getDate() + 1);
@@ -78,6 +90,15 @@ const ticketColumns = computed(() => [
         headerClass: 'horizontal-separator',
         hidden: true,
     },
+    {
+        label: t('globals.agency'),
+        name: 'agency',
+        field: 'agency',
+        align: 'left',
+        sortable: true,
+        headerClass: 'horizontal-separator',
+        columnFilter: false,
+    },
     {
         label: t('advanceTickets.preparation'),
         name: 'preparation',
@@ -85,7 +106,6 @@ const ticketColumns = computed(() => [
         align: 'left',
         sortable: true,
         headerClass: 'horizontal-separator',
-        columnFilter: false,
     },
     {
         align: 'left',
@@ -110,10 +130,17 @@ const ticketColumns = computed(() => [
     },
     {
         align: 'left',
-        label: t('advanceTickets.futureId'),
-        name: 'futureId',
+        label: '',
+        name: 'problems',
         headerClass: 'vertical-separator horizontal-separator',
         columnClass: 'vertical-separator',
+        hidden: true,
+    },
+    {
+        align: 'left',
+        label: t('advanceTickets.futureId'),
+        name: 'futureId',
+        headerClass: 'horizontal-separator',
     },
     {
         align: 'left',
@@ -242,7 +269,7 @@ const requestComponentUpdate = async (ticket, isWithoutNegatives) => {
     return { query, params };
 };
 
-const moveTicketsAdvance = async () => {
+async function moveTicketsAdvance() {
     let ticketsToMove = [];
     for (const ticket of selectedTickets.value) {
         if (!ticket.id) {
@@ -267,7 +294,7 @@ const moveTicketsAdvance = async () => {
     vnTableRef.value.reload();
     selectedTickets.value = [];
     if (ticketsToMove.length) notify(t('advanceTickets.moveTicketSuccess'), 'positive');
-};
+}
 
 const progressLength = ref(0);
 const progressPercentage = computed(() => {
@@ -290,7 +317,7 @@ const progressAdd = () => {
     }
 };
 
-const splitTickets = async () => {
+async function splitTickets() {
     try {
         showProgressDialog.value = true;
         for (const ticket of selectedTickets.value) {
@@ -310,7 +337,7 @@ const splitTickets = async () => {
     } finally {
         vnTableRef.value.reload();
     }
-};
+}
 
 const resetProgressData = () => {
     if (cancelProgress.value) cancelProgress.value = false;
@@ -326,6 +353,32 @@ const handleCloseProgressDialog = () => {
 
 const handleCancelProgress = () => (cancelProgress.value = true);
 
+const confirmAction = (action) => {
+    openConfirmationModal(actions[action].title, false, actions[action].cb, null, {
+        component: QTable,
+        props: {
+            columns: [
+                {
+                    align: 'left',
+                    label: t('advanceTickets.destination'),
+                    name: 'id',
+                    field: (row) => row.id,
+                },
+                {
+                    align: 'left',
+                    label: t('advanceTickets.origin'),
+                    name: 'futureId',
+                    field: (row) => row.futureId,
+                },
+            ],
+            rows: selectedTickets.value,
+            class: 'full-width',
+            dense: true,
+            flat: true,
+        },
+    });
+};
+
 watch(
     () => vnTableRef.value.tableRef?.$el,
     ($el) => {
@@ -399,15 +452,7 @@ watch(
                 color="primary"
                 class="q-mr-sm"
                 :disable="!selectedTickets.length"
-                @click.stop="
-                    openConfirmationModal(
-                        t('advanceTickets.advanceTicketTitle'),
-                        t(`advanceTickets.advanceTitleSubtitle`, {
-                            selectedTickets: selectedTickets.length,
-                        }),
-                        moveTicketsAdvance,
-                    )
-                "
+                @click.stop="confirmAction('advance')"
             >
                 <QTooltip>
                     {{ t('advanceTickets.advanceTickets') }}
@@ -417,15 +462,7 @@ watch(
                 icon="alt_route"
                 color="primary"
                 :disable="!selectedTickets.length"
-                @click.stop="
-                    openConfirmationModal(
-                        t('advanceTickets.advanceWithoutNegativeTitle'),
-                        t(`advanceTickets.advanceWithoutNegativeSubtitle`, {
-                            selectedTickets: selectedTickets.length,
-                        }),
-                        splitTickets,
-                    )
-                "
+                @click.stop="confirmAction('advanceWithoutNegative')"
             >
                 <QTooltip>
                     {{ t('advanceTickets.advanceTicketsWithoutNegatives') }}
@@ -454,9 +491,9 @@ watch(
             }"
             v-model:selected="selectedTickets"
             :pagination="{ rowsPerPage: 0 }"
-            :no-data-label="t('globals.noResults')"
+            :no-data-label="$t('globals.noResults')"
             :right-search="false"
-            :order="['futureTotalWithVat ASC']"            
+            :order="['futureTotalWithVat ASC']"
             auto-load
             :disable-option="{ card: true }"
         >
@@ -522,6 +559,9 @@ watch(
                     {{ toCurrency(row.totalWithVat || 0) }}
                 </QBadge>
             </template>
+            <template #column-problems="{ row }">
+                <TicketProblems :row="row.problems" :visible-problems="['hasRisk']" />
+            </template>
             <template #column-futureId="{ row }">
                 <QBtn flat class="link" dense>
                     {{ row.futureId }}
diff --git a/src/pages/Ticket/TicketAdvanceFilter.vue b/src/pages/Ticket/TicketAdvanceFilter.vue
index f065eaf2e..a88d06300 100644
--- a/src/pages/Ticket/TicketAdvanceFilter.vue
+++ b/src/pages/Ticket/TicketAdvanceFilter.vue
@@ -10,7 +10,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';
-
+import VnCheckbox from 'src/components/common/VnCheckbox.vue';
 const { t, te } = useI18n();
 const props = defineProps({
     dataKey: {
@@ -122,18 +122,20 @@ onMounted(async () => await getItemPackingTypes());
                 <QItemSection>
                     <VnInputNumber
                         v-model="params.scopeDays"
-                        :label="t('Days onward')"
+                        :label="t('globals.daysOnward')"
                         filled
+                        :step="0"
                     />
                 </QItemSection>
             </QItem>
             <QItem>
                 <QItemSection>
-                    <QCheckbox
+                    <VnCheckbox
                         :label="t('params.isFullMovable')"
                         v-model="params.isFullMovable"
                         toggle-indeterminate
                         @update:model-value="searchFn()"
+                        dense
                     />
                 </QItemSection>
             </QItem>
@@ -166,11 +168,12 @@ onMounted(async () => await getItemPackingTypes());
             </QItem>
             <QItem>
                 <QItemSection>
-                    <QCheckbox
+                    <VnCheckbox
                         toggle-indeterminate
-                        label="only with destination"
+                        :label="t('params.onlyWithDestination')"
                         v-model="params.onlyWithDestination"
                         @update:model-value="searchFn()"
+                        dense
                     />
                 </QItemSection>
             </QItem>
@@ -194,8 +197,8 @@ es:
     Vertical: Vertical
     iptInfo: Encajado
     params:
-        dateFuture: fecha origen
-        dateToAdvance: Fecha destino
+        dateFuture: F. origen
+        dateToAdvance: F. destino
         futureIpt: IPT Origen
         ipt: IPT destino
         isFullMovable: 100% movible
diff --git a/src/pages/Ticket/TicketFilter.vue b/src/pages/Ticket/TicketFilter.vue
index d84d1c082..43311007d 100644
--- a/src/pages/Ticket/TicketFilter.vue
+++ b/src/pages/Ticket/TicketFilter.vue
@@ -273,6 +273,7 @@ en:
         orderFk: Order
         from: From
         shipped: Shipped
+        shippedDate: Shipped date
         to: To
         stateFk: State
         groupedStates: Grouped State
@@ -300,6 +301,7 @@ es:
         orderFk: Pedido
         from: Desde
         shipped: F. envío
+        shippedDate: F. envío
         to: Hasta
         stateFk: Estado
         groupedStates: Estado agrupado
diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index 634b8e50a..3612cb24a 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -113,13 +113,13 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        name: 'shippedDate',
+        name: 'shipped',
         cardVisible: true,
         label: t('ticketList.shipped'),
         columnFilter: {
             component: 'date',
         },
-        format: ({ shippedDate }) => toDate(shippedDate),
+        format: ({ shipped }) => toDate(shipped),
     },
     {
         align: 'left',
@@ -477,7 +477,7 @@ function setReference(data) {
         prefix="card"
         :array-data-props="{
             url: 'Tickets/filter',
-            order: ['shippedDate DESC', 'shippedHour ASC', 'zoneLanding ASC', 'id'],
+            order: ['shipped DESC', 'shippedHour ASC', 'zoneLanding ASC', 'id'],
             exprBuilder,
         }"
     >
@@ -515,10 +515,10 @@ function setReference(data) {
                         <DepartmentDescriptorProxy :id="row.departmentFk" />
                     </span>
                 </template>
-                <template #column-shippedDate="{ row }">
+                <template #column-shipped="{ row }">
                     <span v-if="getDateColor(row.shipped)">
                         <QChip :class="getDateColor(row.shipped)" dense square>
-                            {{ toDate(row.shippedDate) }}
+                            {{ toDate(row.shipped) }}
                         </QChip>
                     </span>
                 </template>
diff --git a/src/pages/Worker/WorkerList.vue b/src/pages/Worker/WorkerList.vue
index cb722a139..613ac2d66 100644
--- a/src/pages/Worker/WorkerList.vue
+++ b/src/pages/Worker/WorkerList.vue
@@ -18,6 +18,8 @@ import { useState } from 'src/composables/useState';
 import axios from 'axios';
 import VnSelectWorker from 'src/components/common/VnSelectWorker.vue';
 import VnSection from 'src/components/common/VnSection.vue';
+import VnInputBic from 'src/components/common/VnInputBic.vue';
+
 const { t } = useI18n();
 const tableRef = ref();
 const { viewSummary } = useSummaryDialog();
@@ -161,16 +163,6 @@ function generateCodeUser(worker) {
 
     if (!worker.companyFk) worker.companyFk = user.companyFk;
 }
-
-async function autofillBic(worker) {
-    if (!worker || !worker.iban) return;
-
-    let bankEntityId = parseInt(worker.iban.substr(4, 4));
-    let filter = { where: { id: bankEntityId } };
-
-    const { data } = await axios.get(`BankEntities`, { params: { filter } });
-    worker.bankEntityFk = data?.[0]?.id ?? undefined;
-}
 </script>
 <template>
     <FetchData
@@ -331,20 +323,14 @@ async function autofillBic(worker) {
                                     (val) => !val && delete data.payMethodFk
                                 "
                             />
-                            <VnInput
+                            <VnInputBic
+                                :label="t('IBAN')"
                                 v-model="data.iban"
-                                :label="t('worker.create.iban')"
                                 :disable="data.isFreelance"
-                                @update:model-value="autofillBic(data)"
-                            >
-                                <template #append>
-                                    <QIcon name="info" class="cursor-info">
-                                        <QTooltip>{{
-                                            t('components.iban_tooltip')
-                                        }}</QTooltip>
-                                    </QIcon>
-                                </template>
-                            </VnInput>
+                                @update-bic="
+                                    (bankEntityFk) => (data.bankEntityFk = bankEntityFk)
+                                "
+                            />
                         </VnRow>
                         <VnRow>
                             <VnSelectDialog
@@ -362,7 +348,6 @@ async function autofillBic(worker) {
                                     },
                                 ]"
                                 :disable="data.isFreelance"
-                                @update:model-value="autofillBic(data)"
                                 :filter-options="['bic', 'name']"
                             >
                                 <template #form>
diff --git a/src/router/modules/ticket.js b/src/router/modules/ticket.js
index 57767a87a..6101cbaab 100644
--- a/src/router/modules/ticket.js
+++ b/src/router/modules/ticket.js
@@ -113,7 +113,7 @@ const ticketCard = {
             name: 'TicketExpedition',
             meta: {
                 title: 'expedition',
-                icon: 'vn:package',
+                icon: 'view_in_ar',
             },
             component: () => import('src/pages/Ticket/Card/TicketExpedition.vue'),
         },
@@ -168,7 +168,7 @@ const ticketCard = {
             name: 'TicketBoxing',
             meta: {
                 title: 'boxing',
-                icon: 'view_in_ar',
+                icon: 'videocam',
             },
             component: () => import('src/pages/Ticket/Card/TicketBoxing.vue'),
         },
diff --git a/test/cypress/integration/claim/claimAction.spec.js b/test/cypress/integration/claim/claimAction.spec.js
index 8f406ad2f..6e916451c 100644
--- a/test/cypress/integration/claim/claimAction.spec.js
+++ b/test/cypress/integration/claim/claimAction.spec.js
@@ -6,7 +6,6 @@ describe.skip('ClaimAction', () => {
     const destinationRow = '.q-item__section > .q-field';
 
     beforeEach(() => {
-        cy.viewport(1920, 1080);
         cy.login('developer');
         cy.visit(`/#/claim/${claimId}/action`);
     });
diff --git a/test/cypress/integration/claim/claimDevelopment.spec.js b/test/cypress/integration/claim/claimDevelopment.spec.js
index 097d870df..1fb77fe20 100755
--- a/test/cypress/integration/claim/claimDevelopment.spec.js
+++ b/test/cypress/integration/claim/claimDevelopment.spec.js
@@ -7,7 +7,6 @@ describe.skip('ClaimDevelopment', () => {
     const newReason = 'Calor';
 
     beforeEach(() => {
-        cy.viewport(1920, 1080);
         cy.login('developer');
         cy.visit(`/#/claim/${claimId}/development`);
         cy.waitForElement('tbody');
diff --git a/test/cypress/integration/entry/entryCard/entryBasicData.spec.js b/test/cypress/integration/entry/entryCard/entryBasicData.spec.js
index ba689b8c7..de8bc6bc9 100644
--- a/test/cypress/integration/entry/entryCard/entryBasicData.spec.js
+++ b/test/cypress/integration/entry/entryCard/entryBasicData.spec.js
@@ -2,7 +2,6 @@ import '../commands.js';
 
 describe('EntryBasicData', () => {
     beforeEach(() => {
-        cy.viewport(1920, 1080);
         cy.login('buyer');
         cy.visit(`/#/entry/list`);
     });
diff --git a/test/cypress/integration/entry/entryCard/entryDescriptor.spec.js b/test/cypress/integration/entry/entryCard/entryDescriptor.spec.js
index 8185866db..d6f2b2543 100644
--- a/test/cypress/integration/entry/entryCard/entryDescriptor.spec.js
+++ b/test/cypress/integration/entry/entryCard/entryDescriptor.spec.js
@@ -1,7 +1,6 @@
 import '../commands.js';
 describe('EntryDescriptor', () => {
     beforeEach(() => {
-        cy.viewport(1920, 1080);
         cy.login('buyer');
         cy.visit(`/#/entry/list`);
     });
diff --git a/test/cypress/integration/entry/entryCard/entryDms.spec.js b/test/cypress/integration/entry/entryCard/entryDms.spec.js
index f3f0ef20b..640b70907 100644
--- a/test/cypress/integration/entry/entryCard/entryDms.spec.js
+++ b/test/cypress/integration/entry/entryCard/entryDms.spec.js
@@ -1,7 +1,6 @@
 import '../commands.js';
 describe('EntryDms', () => {
     beforeEach(() => {
-        cy.viewport(1920, 1080);
         cy.login('buyer');
         cy.visit(`/#/entry/list`);
     });
diff --git a/test/cypress/integration/entry/entryCard/entryLock.spec.js b/test/cypress/integration/entry/entryCard/entryLock.spec.js
index 6ba4392ae..957c67cc6 100644
--- a/test/cypress/integration/entry/entryCard/entryLock.spec.js
+++ b/test/cypress/integration/entry/entryCard/entryLock.spec.js
@@ -1,7 +1,6 @@
 import '../commands.js';
 describe('EntryLock', () => {
     beforeEach(() => {
-        cy.viewport(1920, 1080);
         cy.login('buyer');
         cy.visit(`/#/entry/list`);
     });
diff --git a/test/cypress/integration/entry/entryCard/entryNotes.spec.js b/test/cypress/integration/entry/entryCard/entryNotes.spec.js
index 544ac23b0..80c9fd38d 100644
--- a/test/cypress/integration/entry/entryCard/entryNotes.spec.js
+++ b/test/cypress/integration/entry/entryCard/entryNotes.spec.js
@@ -2,7 +2,6 @@ import '../commands.js';
 
 describe('EntryNotes', () => {
     beforeEach(() => {
-        cy.viewport(1920, 1080);
         cy.login('buyer');
         cy.visit(`/#/entry/list`);
     });
diff --git a/test/cypress/integration/entry/entryList.spec.js b/test/cypress/integration/entry/entryList.spec.js
index bad47615f..fc76f6d87 100644
--- a/test/cypress/integration/entry/entryList.spec.js
+++ b/test/cypress/integration/entry/entryList.spec.js
@@ -2,7 +2,6 @@ import './commands';
 
 describe('EntryList', () => {
     beforeEach(() => {
-        cy.viewport(1920, 1080);
         cy.login('buyer');
         cy.visit(`/#/entry/list`);
     });
diff --git a/test/cypress/integration/entry/entryStockBought.spec.js b/test/cypress/integration/entry/entryStockBought.spec.js
index 3fad44d91..60019c9f4 100644
--- a/test/cypress/integration/entry/entryStockBought.spec.js
+++ b/test/cypress/integration/entry/entryStockBought.spec.js
@@ -1,6 +1,5 @@
 describe('EntryStockBought', () => {
     beforeEach(() => {
-        cy.viewport(1920, 1080);
         cy.login('buyer');
         cy.visit(`/#/entry/stock-Bought`);
     });
diff --git a/test/cypress/integration/entry/entrySupplier.spec.js b/test/cypress/integration/entry/entrySupplier.spec.js
index 83deecea5..df90d00d7 100644
--- a/test/cypress/integration/entry/entrySupplier.spec.js
+++ b/test/cypress/integration/entry/entrySupplier.spec.js
@@ -1,6 +1,5 @@
 describe('EntrySupplier when is supplier', () => {
     beforeEach(() => {
-        cy.viewport(1920, 1080);
         cy.login('supplier');
         cy.visit(`/#/entry/my`, {
             onBeforeLoad(win) {
diff --git a/test/cypress/integration/entry/entryWasteRecalc.spec.js b/test/cypress/integration/entry/entryWasteRecalc.spec.js
index 1b358676c..bd50e9c19 100644
--- a/test/cypress/integration/entry/entryWasteRecalc.spec.js
+++ b/test/cypress/integration/entry/entryWasteRecalc.spec.js
@@ -1,7 +1,6 @@
 import './commands';
 describe('EntryDms', () => {
     beforeEach(() => {
-        cy.viewport(1920, 1080);
         cy.login('buyerBoss');
         cy.visit(`/#/entry/waste-recalc`);
     });
diff --git a/test/cypress/integration/invoiceOut/invoiceOutMakeInvoice.spec.js b/test/cypress/integration/invoiceOut/invoiceOutMakeInvoice.spec.js
index e93326f1d..d58eb4a1f 100644
--- a/test/cypress/integration/invoiceOut/invoiceOutMakeInvoice.spec.js
+++ b/test/cypress/integration/invoiceOut/invoiceOutMakeInvoice.spec.js
@@ -1,7 +1,6 @@
 /// <reference types="cypress" />
 describe.skip('InvoiceOut manual invoice', () => {
     beforeEach(() => {
-        cy.viewport(1920, 1080);
         cy.login('developer');
         cy.visit(`/#/ticket/list`);
         cy.get('#searchbar input').type('{enter}');
diff --git a/test/cypress/integration/invoiceOut/invoiceOutNegativeBases.spec.js b/test/cypress/integration/invoiceOut/invoiceOutNegativeBases.spec.js
index 9c6eef2ed..89f71e940 100644
--- a/test/cypress/integration/invoiceOut/invoiceOutNegativeBases.spec.js
+++ b/test/cypress/integration/invoiceOut/invoiceOutNegativeBases.spec.js
@@ -4,7 +4,6 @@ describe('InvoiceOut negative bases', () => {
         `:nth-child(1) > [data-col-field="${opt}"] > .no-padding > .link`;
 
     beforeEach(() => {
-        cy.viewport(1920, 1080);
         cy.login('developer');
         cy.visit(`/#/invoice-out/negative-bases`);
     });
diff --git a/test/cypress/integration/invoiceOut/invvoiceOutGlobal.spec.js b/test/cypress/integration/invoiceOut/invvoiceOutGlobal.spec.js
index 06e132b39..0170970a5 100644
--- a/test/cypress/integration/invoiceOut/invvoiceOutGlobal.spec.js
+++ b/test/cypress/integration/invoiceOut/invvoiceOutGlobal.spec.js
@@ -1,7 +1,6 @@
 /// <reference types="cypress" />
 describe('InvoiceOut global invoicing', () => {
     beforeEach(() => {
-        cy.viewport(1920, 1080);
         cy.login('administrative');
         cy.visit(`/#/invoice-out/global-invoicing`);
     });
@@ -17,7 +16,7 @@ describe('InvoiceOut global invoicing', () => {
         cy.dataCy('InvoiceOutGlobalPrinterSelect').type('printer1');
         cy.get('.q-menu .q-item').contains('printer1').click();
         cy.get(
-            '[label="Invoice date"] > .q-field > .q-field__inner > .q-field__control'
+            '[label="Invoice date"] > .q-field > .q-field__inner > .q-field__control',
         ).click();
         cy.get(':nth-child(5) > div > .q-btn > .q-btn__content > .block').click();
         cy.get('.q-date__years-content > :nth-child(2) > .q-btn').click();
diff --git a/test/cypress/integration/item/ItemFixedPrice.spec.js b/test/cypress/integration/item/ItemFixedPrice.spec.js
index 404e8e365..41230f570 100644
--- a/test/cypress/integration/item/ItemFixedPrice.spec.js
+++ b/test/cypress/integration/item/ItemFixedPrice.spec.js
@@ -1,9 +1,14 @@
 /// <reference types="cypress" />
-function goTo(n = 1) {
-    return `.q-virtual-scroll__content > :nth-child(${n})`;
-}
-const firstRow = goTo();
 describe('Handle Items FixedPrice', () => {
+    const grouping = 'Grouping price';
+    const saveEditBtn = '.q-mt-lg > .q-btn--standard';
+    const createForm = {
+        'Grouping price': { val: '5' },
+        'Packing price': { val: '5' },
+        Started: { val: '01-01-2001', type: 'date' },
+        Ended: { val: '15-01-2001', type: 'date' },
+    };
+
     beforeEach(() => {
         cy.viewport(1280, 720);
         cy.login('developer');
@@ -13,50 +18,57 @@ describe('Handle Items FixedPrice', () => {
             '.q-header > .q-toolbar > :nth-child(1) > .q-btn__content > .q-icon',
         ).click();
     });
-    it.skip('filter', function () {
+
+    it('filter by category', () => {
         cy.get('.category-filter > :nth-child(1) > .q-btn__content > .q-icon').click();
-        cy.selectOption('.list > :nth-child(2)', 'Alstroemeria');
-        cy.get('.q-gutter-x-sm > .q-btn > .q-btn__content > .q-icon').click();
-
-        cy.addBtnClick();
-        cy.selectOption(`${firstRow} > :nth-child(2)`, '#13');
-        cy.get(`${firstRow} > :nth-child(4)`).find('input').type(1);
-        cy.get(`${firstRow} > :nth-child(5)`).find('input').type('2');
-        cy.selectOption(`${firstRow} > :nth-child(9)`, 'Warehouse One');
-        cy.get('.q-notification__message').should('have.text', 'Data saved');
-        /* ==== End Cypress Studio ==== */
-    });
-    it.skip('Create and delete ', function () {
-        cy.get('.q-gutter-x-sm > .q-btn > .q-btn__content > .q-icon').click();
-        cy.addBtnClick();
-        cy.selectOption(`${firstRow} > :nth-child(2)`, '#11');
-        cy.get(`${firstRow} > :nth-child(4)`).type('1');
-        cy.get(`${firstRow} > :nth-child(5)`).type('2');
-        cy.selectOption(`${firstRow} > :nth-child(9)`, 'Warehouse One');
-        cy.get('.q-notification__message').should('have.text', 'Data saved');
-        cy.get('.q-gutter-x-sm > .q-btn > .q-btn__content > .q-icon').click();
-        cy.get(`${firstRow} > .text-right > .q-btn > .q-btn__content > .q-icon`).click();
-        cy.get(
-            '.q-card__actions > .q-btn--unelevated > .q-btn__content > .block',
-        ).click();
-        cy.get('.q-notification__message').should('have.text', 'Data saved');
+        cy.get('.q-table__middle').should('be.visible').should('have.length', 1);
     });
 
-    it.skip('Massive edit', function () {
-        cy.get(' .bg-header > :nth-child(1) > .q-checkbox > .q-checkbox__inner ').click();
-        cy.get('#subToolbar > .q-btn--standard').click();
-        cy.selectOption("[data-cy='field-to-edit']", 'Min price');
-        cy.dataCy('value-to-edit').find('input').type('1');
-        cy.get('.countLines').should('have.text', ' 1 ');
-        cy.get('.q-mt-lg > .q-btn--standard').click();
-        cy.get('.q-notification__message').should('have.text', 'Data saved');
+    it('should create a new fixed price, then delete it', () => {
+        cy.dataCy('vnTableCreateBtn').click();
+        cy.dataCy('FixedPriceCreateNameSelect').type('Melee weapon combat fist 15cm');
+        cy.get('.q-menu .q-item').contains('Melee weapon combat fist 15cm').click();
+        cy.dataCy('FixedPriceCreateWarehouseSelect').type('Warehouse One');
+        cy.get('.q-menu .q-item').contains('Warehouse One').click();
+        cy.get('.q-menu').then(($menu) => {
+            if ($menu.is(':visible')) {
+                cy.dataCy('FixedPriceCreateWarehouseSelect').as('focusedElement').focus();
+                cy.dataCy('FixedPriceCreateWarehouseSelect').blur();
+            }
+        });
+        cy.fillInForm(createForm);
+        cy.dataCy('FormModelPopup_save').click();
+        cy.checkNotification('Data created');
+        cy.get('[data-col-field="name"]').each(($el) => {
+            cy.wrap($el)
+                .invoke('text')
+                .then((text) => {
+                    if (text.includes('Melee weapon combat fist 15cm')) {
+                        cy.wrap($el).parent().find('.q-checkbox').click();
+                        cy.get('[data-cy="crudModelDefaultRemoveBtn"]').click();
+                        cy.dataCy('VnConfirm_confirm').click().click();
+                        cy.checkNotification('Data saved');
+                    }
+                });
+        });
     });
-    it.skip('Massive remove', function () {
-        cy.get(' .bg-header > :nth-child(1) > .q-checkbox > .q-checkbox__inner ').click();
-        cy.get('#subToolbar > .q-btn--flat').click();
-        cy.get(
-            '.q-card__actions > .q-btn--unelevated > .q-btn__content > .block',
-        ).click();
-        cy.get('.q-notification__message').should('have.text', 'Data saved');
+
+    it('should edit all items', () => {
+        cy.get('.bg-header > :nth-child(1) > .q-checkbox > .q-checkbox__inner').click();
+        cy.dataCy('FixedPriceToolbarEditBtn').should('not.be.disabled');
+        cy.dataCy('FixedPriceToolbarEditBtn').click();
+        cy.dataCy('EditFixedPriceSelectOption').type(grouping);
+        cy.get('.q-menu .q-item').contains(grouping).click();
+        cy.dataCy('EditFixedPriceValueOption').type('5');
+        cy.get(saveEditBtn).click();
+        cy.checkNotification('Data saved');
+    });
+
+    it('should remove all items', () => {
+        cy.get('.bg-header > :nth-child(1) > .q-checkbox > .q-checkbox__inner').click();
+        cy.dataCy('crudModelDefaultRemoveBtn').should('not.be.disabled');
+        cy.dataCy('crudModelDefaultRemoveBtn').click();
+        cy.dataCy('VnConfirm_confirm').click();
+        cy.checkNotification('Data saved');
     });
 });
diff --git a/test/cypress/integration/item/itemBarcodes.spec.js b/test/cypress/integration/item/itemBarcodes.spec.js
index 1f6698f9c..746cfa0f1 100644
--- a/test/cypress/integration/item/itemBarcodes.spec.js
+++ b/test/cypress/integration/item/itemBarcodes.spec.js
@@ -1,7 +1,6 @@
 /// <reference types="cypress" />
 describe('ItemBarcodes', () => {
     beforeEach(() => {
-        cy.viewport(1920, 1080);
         cy.login('developer');
         cy.visit(`/#/item/1/barcode`);
     });
diff --git a/test/cypress/integration/item/itemBotanical.spec.js b/test/cypress/integration/item/itemBotanical.spec.js
index 6105ef179..420181b0d 100644
--- a/test/cypress/integration/item/itemBotanical.spec.js
+++ b/test/cypress/integration/item/itemBotanical.spec.js
@@ -1,7 +1,6 @@
 /// <reference types="cypress" />
 describe('Item botanical', () => {
     beforeEach(() => {
-        cy.viewport(1920, 1080);
         cy.login('developer');
         cy.visit(`/#/item/1/botanical`);
     });
diff --git a/test/cypress/integration/item/itemList.spec.js b/test/cypress/integration/item/itemList.spec.js
index 10e388580..bd8108344 100644
--- a/test/cypress/integration/item/itemList.spec.js
+++ b/test/cypress/integration/item/itemList.spec.js
@@ -2,7 +2,6 @@
 
 describe.skip('Item list', () => {
     beforeEach(() => {
-        cy.viewport(1920, 1080);
         cy.login('developer');
         cy.visit(`/#/item/list`);
         cy.typeSearchbar('{enter}');
diff --git a/test/cypress/integration/item/itemSummary.spec.js b/test/cypress/integration/item/itemSummary.spec.js
index 8d67c8e3c..65b4c8629 100644
--- a/test/cypress/integration/item/itemSummary.spec.js
+++ b/test/cypress/integration/item/itemSummary.spec.js
@@ -1,7 +1,6 @@
 /// <reference types="cypress" />
 describe('Item summary', () => {
     beforeEach(() => {
-        cy.viewport(1920, 1080);
         cy.login('developer');
         cy.visit(`/#/item/1/summary`);
     });
diff --git a/test/cypress/integration/item/itemTag.spec.js b/test/cypress/integration/item/itemTag.spec.js
index 425eaffe6..65d339151 100644
--- a/test/cypress/integration/item/itemTag.spec.js
+++ b/test/cypress/integration/item/itemTag.spec.js
@@ -1,6 +1,5 @@
 describe('Item tag', () => {
     beforeEach(() => {
-        cy.viewport(1920, 1080);
         cy.login('developer');
         cy.visit(`/#/item/1/tags`);
         cy.get('.q-page').should('be.visible');
diff --git a/test/cypress/integration/item/itemTax.spec.js b/test/cypress/integration/item/itemTax.spec.js
index 6ff147135..971e3a732 100644
--- a/test/cypress/integration/item/itemTax.spec.js
+++ b/test/cypress/integration/item/itemTax.spec.js
@@ -1,7 +1,6 @@
 /// <reference types="cypress" />
 describe('Item tax', () => {
     beforeEach(() => {
-        cy.viewport(1920, 1080);
         cy.login('developer');
         cy.visit(`/#/item/1/tax`);
     });
diff --git a/test/cypress/integration/item/itemType.spec.js b/test/cypress/integration/item/itemType.spec.js
index 466a49708..180a12a0f 100644
--- a/test/cypress/integration/item/itemType.spec.js
+++ b/test/cypress/integration/item/itemType.spec.js
@@ -6,7 +6,6 @@ describe('Item type', () => {
     const type = 'Flower';
 
     beforeEach(() => {
-        cy.viewport(1920, 1080);
         cy.login('developer');
         cy.visit(`/#/item/item-type`);
     });
diff --git a/test/cypress/integration/order/orderList.spec.js b/test/cypress/integration/order/orderList.spec.js
index ee011ea05..b77ef8fca 100644
--- a/test/cypress/integration/order/orderList.spec.js
+++ b/test/cypress/integration/order/orderList.spec.js
@@ -6,7 +6,6 @@ describe('OrderList', () => {
 
     beforeEach(() => {
         cy.login('developer');
-        cy.viewport(1920, 1080);
         cy.visit('/#/order/list');
     });
 
diff --git a/test/cypress/integration/route/agency/agencyModes.spec.js b/test/cypress/integration/route/agency/agencyModes.spec.js
index 3f5784997..edf7f8819 100644
--- a/test/cypress/integration/route/agency/agencyModes.spec.js
+++ b/test/cypress/integration/route/agency/agencyModes.spec.js
@@ -2,7 +2,6 @@ describe('Agency modes', () => {
     const name = 'inhouse pickup';
 
     beforeEach(() => {
-        cy.viewport(1920, 1080);
         cy.login('developer');
         cy.visit(`/#/route/agency/1/modes`);
     });
diff --git a/test/cypress/integration/route/agency/agencyWorkCenter.spec.js b/test/cypress/integration/route/agency/agencyWorkCenter.spec.js
index 79dcd6f70..d73ba1491 100644
--- a/test/cypress/integration/route/agency/agencyWorkCenter.spec.js
+++ b/test/cypress/integration/route/agency/agencyWorkCenter.spec.js
@@ -13,7 +13,6 @@ describe('AgencyWorkCenter', () => {
     };
 
     beforeEach(() => {
-        cy.viewport(1920, 1080);
         cy.login('developer');
         cy.visit(`/#/route/agency/11/workCenter`);
     });
diff --git a/test/cypress/integration/route/cmr/cmrList.spec.js b/test/cypress/integration/route/cmr/cmrList.spec.js
index d33508e3a..a25a0c10a 100644
--- a/test/cypress/integration/route/cmr/cmrList.spec.js
+++ b/test/cypress/integration/route/cmr/cmrList.spec.js
@@ -24,7 +24,6 @@ describe('Cmr list', () => {
     };
 
     beforeEach(() => {
-        cy.viewport(1920, 1080);
         cy.login('developer');
         cy.visit('/#/route/cmr');
         cy.typeSearchbar('{enter}');
diff --git a/test/cypress/integration/route/roadMap/roadmapList.spec.js b/test/cypress/integration/route/roadMap/roadmapList.spec.js
index 35c0c2b02..bacf130a7 100644
--- a/test/cypress/integration/route/roadMap/roadmapList.spec.js
+++ b/test/cypress/integration/route/roadMap/roadmapList.spec.js
@@ -27,7 +27,6 @@ describe('RoadMap', () => {
     const summaryUrl = '/summary';
 
     beforeEach(() => {
-        cy.viewport(1920, 1080);
         cy.login('developer');
         cy.visit(`/#/route/roadmap`);
         cy.typeSearchbar('{enter}');
diff --git a/test/cypress/integration/route/routeAutonomous.spec.js b/test/cypress/integration/route/routeAutonomous.spec.js
index d77584c04..6aaa2a85e 100644
--- a/test/cypress/integration/route/routeAutonomous.spec.js
+++ b/test/cypress/integration/route/routeAutonomous.spec.js
@@ -32,7 +32,6 @@ describe.skip('RouteAutonomous', () => {
     const dataSaved = 'Data saved';
 
     beforeEach(() => {
-        cy.viewport(1920, 1080);
         cy.login('developer');
         cy.visit(`/#/route/agency-term`);
         cy.typeSearchbar('{enter}');
diff --git a/test/cypress/integration/route/routeExtendedList.spec.js b/test/cypress/integration/route/routeExtendedList.spec.js
index 97735ca4b..83ecac122 100644
--- a/test/cypress/integration/route/routeExtendedList.spec.js
+++ b/test/cypress/integration/route/routeExtendedList.spec.js
@@ -75,7 +75,6 @@ describe.skip('Route extended list', () => {
     }
 
     beforeEach(() => {
-        cy.viewport(1920, 1080);
         cy.login('developer');
         cy.visit(url);
         cy.typeSearchbar('{enter}');
diff --git a/test/cypress/integration/route/routeList.spec.js b/test/cypress/integration/route/routeList.spec.js
index f08c267a4..309f8d023 100644
--- a/test/cypress/integration/route/routeList.spec.js
+++ b/test/cypress/integration/route/routeList.spec.js
@@ -26,8 +26,8 @@ describe('Route', () => {
     const summaryUrl = '/summary';
 
     beforeEach(() => {
-        cy.viewport(1920, 1080);
         cy.login('developer');
+        cy.viewport(1920, 1080);
         cy.visit(`/#/route/list`);
         cy.typeSearchbar('{enter}');
     });
diff --git a/test/cypress/integration/route/vehicle/vehicleDescriptor.spec.js b/test/cypress/integration/route/vehicle/vehicleDescriptor.spec.js
index 3e9c816c4..39332b2e0 100644
--- a/test/cypress/integration/route/vehicle/vehicleDescriptor.spec.js
+++ b/test/cypress/integration/route/vehicle/vehicleDescriptor.spec.js
@@ -1,6 +1,5 @@
 describe('Vehicle', () => {
     beforeEach(() => {
-        cy.viewport(1920, 1080);
         cy.login('deliveryAssistant');
         cy.visit(`/#/route/vehicle/7/summary`);
     });
diff --git a/test/cypress/integration/route/vehicle/vehicleList.spec.js b/test/cypress/integration/route/vehicle/vehicleList.spec.js
index 2b3c9cdbc..c30f87c6d 100644
--- a/test/cypress/integration/route/vehicle/vehicleList.spec.js
+++ b/test/cypress/integration/route/vehicle/vehicleList.spec.js
@@ -21,7 +21,6 @@ describe('Vehicle list', () => {
     const summaryUrl = '/summary';
 
     beforeEach(() => {
-        cy.viewport(1920, 1080);
         cy.login('developer');
         cy.visit(`/#/route/vehicle/list`);
         cy.typeSearchbar('{enter}');
diff --git a/test/cypress/integration/route/vehicle/vehicleNotes.spec.js b/test/cypress/integration/route/vehicle/vehicleNotes.spec.js
index cd92cc4af..17b870305 100644
--- a/test/cypress/integration/route/vehicle/vehicleNotes.spec.js
+++ b/test/cypress/integration/route/vehicle/vehicleNotes.spec.js
@@ -10,7 +10,6 @@ describe('Vehicle Notes', () => {
     const newNoteText = 'probando';
 
     beforeEach(() => {
-        cy.viewport(1920, 1080);
         cy.login('developer');
         cy.visit(`/#/route/vehicle/1/notes`);
     });
diff --git a/test/cypress/integration/shelving/parking/parkingList.spec.js b/test/cypress/integration/shelving/parking/parkingList.spec.js
index 7372da164..44b5fd9bc 100644
--- a/test/cypress/integration/shelving/parking/parkingList.spec.js
+++ b/test/cypress/integration/shelving/parking/parkingList.spec.js
@@ -5,7 +5,6 @@ describe('ParkingList', () => {
     const summaryHeader = '.header-link';
 
     beforeEach(() => {
-        cy.viewport(1920, 1080);
         cy.login('developer');
         cy.visit(`/#/shelving/parking/list`);
     });
diff --git a/test/cypress/integration/shelving/shelvingBasicData.spec.js b/test/cypress/integration/shelving/shelvingBasicData.spec.js
index d7b0dc692..e9ff7f696 100644
--- a/test/cypress/integration/shelving/shelvingBasicData.spec.js
+++ b/test/cypress/integration/shelving/shelvingBasicData.spec.js
@@ -3,7 +3,6 @@ describe('ShelvingList', () => {
     const parking =
         '.q-card > :nth-child(1) > .q-select > .q-field__inner > .q-field__control > .q-field__control-container';
     beforeEach(() => {
-        cy.viewport(1920, 1080);
         cy.login('developer');
         cy.visit(`/#/shelving/1/basic-data`);
     });
diff --git a/test/cypress/integration/shelving/shelvingList.spec.js b/test/cypress/integration/shelving/shelvingList.spec.js
index 20b72e419..7a878141a 100644
--- a/test/cypress/integration/shelving/shelvingList.spec.js
+++ b/test/cypress/integration/shelving/shelvingList.spec.js
@@ -1,7 +1,6 @@
 /// <reference types="cypress" />
 describe('ShelvingList', () => {
     beforeEach(() => {
-        cy.viewport(1920, 1080);
         cy.login('developer');
         cy.visit(`/#/shelving/list`);
     });
diff --git a/test/cypress/integration/supplier/SupplierBalance.spec.js b/test/cypress/integration/supplier/SupplierBalance.spec.js
index e4a3ee65c..575624283 100644
--- a/test/cypress/integration/supplier/SupplierBalance.spec.js
+++ b/test/cypress/integration/supplier/SupplierBalance.spec.js
@@ -1,6 +1,5 @@
 describe('Supplier Balance', () => {
     beforeEach(() => {
-        cy.viewport(1920, 1080);
         cy.login('developer');
         cy.visit(`/#/supplier/1/balance`);
     });
diff --git a/test/cypress/integration/ticket/ticketDescriptor.spec.js b/test/cypress/integration/ticket/ticketDescriptor.spec.js
index b5c95c463..6c3ad704e 100644
--- a/test/cypress/integration/ticket/ticketDescriptor.spec.js
+++ b/test/cypress/integration/ticket/ticketDescriptor.spec.js
@@ -9,7 +9,6 @@ describe('Ticket descriptor', () => {
     const weightValue = '[data-cy="vnLvWeight"]';
     beforeEach(() => {
         cy.login('developer');
-        cy.viewport(1920, 1080);
     });
 
     it('should clone the ticket without warehouse', () => {
diff --git a/test/cypress/integration/ticket/ticketExpedition.spec.js b/test/cypress/integration/ticket/ticketExpedition.spec.js
index 95ec330dc..c6b633de8 100644
--- a/test/cypress/integration/ticket/ticketExpedition.spec.js
+++ b/test/cypress/integration/ticket/ticketExpedition.spec.js
@@ -5,7 +5,6 @@ describe('Ticket expedtion', () => {
 
     beforeEach(() => {
         cy.login('developer');
-        cy.viewport(1920, 1080);
     });
 
     it('should change the state', () => {
diff --git a/test/cypress/integration/ticket/ticketFilter.spec.js b/test/cypress/integration/ticket/ticketFilter.spec.js
index 2e5a3f3ce..60ad7f287 100644
--- a/test/cypress/integration/ticket/ticketFilter.spec.js
+++ b/test/cypress/integration/ticket/ticketFilter.spec.js
@@ -2,7 +2,6 @@
 describe('TicketFilter', () => {
     beforeEach(() => {
         cy.login('developer');
-        cy.viewport(1920, 1080);
         cy.visit('/#/ticket/list');
     });
 
diff --git a/test/cypress/integration/ticket/ticketList.spec.js b/test/cypress/integration/ticket/ticketList.spec.js
index e18025319..302707601 100644
--- a/test/cypress/integration/ticket/ticketList.spec.js
+++ b/test/cypress/integration/ticket/ticketList.spec.js
@@ -2,7 +2,6 @@
 describe('TicketList', () => {
     beforeEach(() => {
         cy.login('developer');
-        cy.viewport(1920, 1080);
         cy.visit('/#/ticket/list', false);
     });
 
diff --git a/test/cypress/integration/ticket/ticketNotes.spec.js b/test/cypress/integration/ticket/ticketNotes.spec.js
index df1ff9137..f1bd48f61 100644
--- a/test/cypress/integration/ticket/ticketNotes.spec.js
+++ b/test/cypress/integration/ticket/ticketNotes.spec.js
@@ -2,7 +2,6 @@
 describe('TicketNotes', () => {
     beforeEach(() => {
         cy.login('developer');
-        cy.viewport(1920, 1080);
         cy.visit('/#/ticket/31/observation');
     });
 
diff --git a/test/cypress/integration/ticket/ticketRequest.spec.js b/test/cypress/integration/ticket/ticketRequest.spec.js
index 3b237826e..dc408c3a1 100644
--- a/test/cypress/integration/ticket/ticketRequest.spec.js
+++ b/test/cypress/integration/ticket/ticketRequest.spec.js
@@ -2,7 +2,6 @@
 describe('TicketRequest', () => {
     beforeEach(() => {
         cy.login('developer');
-        cy.viewport(1920, 1080);
         cy.visit('/#/ticket/31/request');
     });
 
diff --git a/test/cypress/integration/ticket/ticketSale.spec.js b/test/cypress/integration/ticket/ticketSale.spec.js
index f433f0d11..97b1135c6 100644
--- a/test/cypress/integration/ticket/ticketSale.spec.js
+++ b/test/cypress/integration/ticket/ticketSale.spec.js
@@ -4,7 +4,7 @@ const firstRow = 'tbody > :nth-child(1)';
 describe('TicketSale', () => {
     describe('#23', () => {
         beforeEach(() => {
-            cy.login('salesBoss');
+            cy.login('claimManager');
             cy.viewport(1920, 1080);
             cy.visit('/#/ticket/23/sale');
         });
@@ -15,6 +15,8 @@ describe('TicketSale', () => {
             cy.get('[data-col-field="price"]').find('.q-btn').click();
             cy.waitForElement('[data-cy="ticketEditManaProxy"]');
             cy.dataCy('ticketEditManaProxy').should('exist');
+            cy.get('[data-cy="componentOption-37"]').click();
+
             cy.waitForElement('[data-cy="Price_input"]');
             cy.dataCy('Price_input').clear().type(price);
             cy.intercept('POST', /\/api\/Sales\/\d+\/updatePrice/).as('updatePrice');
@@ -33,6 +35,7 @@ describe('TicketSale', () => {
             cy.get('[data-col-field="discount"]').find('.q-btn').click();
             cy.waitForElement('[data-cy="ticketEditManaProxy"]');
             cy.dataCy('ticketEditManaProxy').should('exist');
+            cy.get('[data-cy="componentOption-37"]').click();
             cy.waitForElement('[data-cy="Disc_input"]');
             cy.dataCy('Disc_input').clear().type(discount);
             cy.intercept('POST', /\/api\/Tickets\/\d+\/updateDiscount/).as(
@@ -83,8 +86,7 @@ describe('TicketSale', () => {
     });
     describe('#24 add claim', () => {
         beforeEach(() => {
-            cy.login('developer');
-            cy.viewport(1920, 1080);
+            cy.login('salesPerson');
             cy.visit('/#/ticket/24/sale');
         });
 
@@ -102,8 +104,7 @@ describe('TicketSale', () => {
     });
     describe('#31 free ticket', () => {
         beforeEach(() => {
-            cy.login('developer');
-            cy.viewport(1920, 1080);
+            cy.login('claimManager');
             cy.visit('/#/ticket/31/sale');
         });
 
@@ -139,14 +140,15 @@ describe('TicketSale', () => {
             cy.dataCy('ticketSaleMoreActionsDropdown').should('be.disabled');
         });
 
-        it.only('should update discount when "Update discount" is clicked', () => {
+        it('should update discount when "Update discount" is clicked', () => {
             const discount = Number((Math.random() * 99 + 1).toFixed(2));
 
             selectFirstRow();
             cy.dataCy('ticketSaleMoreActionsDropdown').click();
             cy.waitForElement('[data-cy="updateDiscountItem"]');
-            cy.dataCy('updateDiscountItem').should('exist');
             cy.dataCy('updateDiscountItem').click();
+            cy.waitForElement('[data-cy="componentOption-37"]');
+            cy.get('[data-cy="componentOption-37"]').click();
             cy.waitForElement('[data-cy="ticketSaleDiscountInput"]');
             cy.dataCy('ticketSaleDiscountInput').find('input').focus();
             cy.intercept('POST', /\/api\/Tickets\/\d+\/updateDiscount/).as(
@@ -191,8 +193,7 @@ describe('TicketSale', () => {
     });
     describe('#32 transfer', () => {
         beforeEach(() => {
-            cy.login('developer');
-            cy.viewport(1920, 1080);
+            cy.login('salesPerson');
             cy.visit('/#/ticket/32/sale');
         });
         it('transfer sale to a new ticket', () => {
diff --git a/test/cypress/integration/vnComponent/VnBreadcrumbs.spec.js b/test/cypress/integration/vnComponent/VnBreadcrumbs.spec.js
index 8e37d8c9c..347dae7df 100644
--- a/test/cypress/integration/vnComponent/VnBreadcrumbs.spec.js
+++ b/test/cypress/integration/vnComponent/VnBreadcrumbs.spec.js
@@ -2,7 +2,6 @@
 describe('VnBreadcrumbs', () => {
     const lastBreadcrumb = '.q-breadcrumbs--last > .q-breadcrumbs__el';
     beforeEach(() => {
-        cy.viewport(1920, 1080);
         cy.login('developer');
         cy.visit('/');
     });
diff --git a/test/cypress/integration/wagon/wagonType/wagonTypeCreate.spec.js b/test/cypress/integration/wagon/wagonType/wagonTypeCreate.spec.js
index 915927a6d..3b5d05c6f 100644
--- a/test/cypress/integration/wagon/wagonType/wagonTypeCreate.spec.js
+++ b/test/cypress/integration/wagon/wagonType/wagonTypeCreate.spec.js
@@ -1,6 +1,5 @@
 describe('WagonTypeCreate', () => {
     beforeEach(() => {
-        cy.viewport(1920, 1080);
         cy.login('developer');
         cy.visit('/#/wagon/type/list');
         cy.waitForElement('.q-page', 6000);
diff --git a/test/cypress/integration/wagon/wagonType/wagonTypeEdit.spec.js b/test/cypress/integration/wagon/wagonType/wagonTypeEdit.spec.js
index 36dd83411..d82f9a10d 100644
--- a/test/cypress/integration/wagon/wagonType/wagonTypeEdit.spec.js
+++ b/test/cypress/integration/wagon/wagonType/wagonTypeEdit.spec.js
@@ -2,7 +2,6 @@ describe('WagonTypeEdit', () => {
     const trayColorRow =
         '.q-select > .q-field__inner > .q-field__control > .q-field__control-container';
     beforeEach(() => {
-        cy.viewport(1920, 1080);
         cy.login('developer');
         cy.visit('/#/wagon/type/1/edit');
     });
diff --git a/test/cypress/integration/worker/workerPit.spec.js b/test/cypress/integration/worker/workerPit.spec.js
index 04f232648..cee4560dc 100644
--- a/test/cypress/integration/worker/workerPit.spec.js
+++ b/test/cypress/integration/worker/workerPit.spec.js
@@ -4,7 +4,6 @@ describe('WorkerPit', () => {
     const savePIT = '#st-actions > .q-btn-group > .q-btn--standard';
 
     beforeEach(() => {
-        cy.viewport(1920, 1080);
         cy.login('developer');
         cy.visit(`/#/worker/1107/pit`);
     });
diff --git a/test/cypress/integration/zone/zoneDeliveryDays.spec.js b/test/cypress/integration/zone/zoneDeliveryDays.spec.js
index a89def12d..6d19edb77 100644
--- a/test/cypress/integration/zone/zoneDeliveryDays.spec.js
+++ b/test/cypress/integration/zone/zoneDeliveryDays.spec.js
@@ -4,7 +4,6 @@ describe('ZoneDeliveryDays', () => {
     const submitForm = '.q-form > .q-btn > .q-btn__content';
     beforeEach(() => {
         cy.login('developer');
-        cy.viewport(1920, 1080);
         cy.visit(`/#/zone/delivery-days`);
     });
 
diff --git a/test/cypress/integration/zone/zoneUpcomingDeliveries.spec.js b/test/cypress/integration/zone/zoneUpcomingDeliveries.spec.js
index 576b2ea70..1c28e732c 100644
--- a/test/cypress/integration/zone/zoneUpcomingDeliveries.spec.js
+++ b/test/cypress/integration/zone/zoneUpcomingDeliveries.spec.js
@@ -4,7 +4,6 @@ describe('ZoneUpcomingDeliveries', () => {
 
     beforeEach(() => {
         cy.login('developer');
-        cy.viewport(1920, 1080);
         cy.visit(`/#/zone/upcoming-deliveries`);
     });