diff --git a/CHANGELOG.md b/CHANGELOG.md
index 778d046388..119f702f7a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,100 @@
+# Version 24.24 - 2024-06-11
+
+### Added 🆕
+
+-   feat: 6942 hashtag in key : value summary by:jgallego
+-   feat: #6957: Rename FetchedTags instance tag by:Javier Segarra
+-   feat: refactor template by:Javier Segarra
+-   feat: refs #6600 Add option to add comment for photo motivation by:jorgep
+-   feat: refs #6942 test e2e tobook & toUnbook by:jorgep
+-   feat: refs #6942 to book summary button & reactive value by:jorgep
+-   feat: refs #6942 to unbook by:jorgep
+-   feat: refs #6942 url update by:jorgep
+-   feat: refs #6942 use correct currency in InvoiceIn components by:jorgep
+-   feat: refs #6942 vat rate total by:jorgep
+-   feat: refs #7494 new icons (7494-icons) by:alexm
+-   feat: refs #7494 new icons by:alexm
+-   feat: refs #7542 drop space by:jorgep
+-   feat: refs #7542 empty by:jorgep
+-   fix: refs #6942 changes and new features by:jorgep
+-   fix: style by:Javier Segarra
+-   style: color transparent when is fetive by:Javier Segarra
+-   style: fix color when is empty by:Javier Segarra
+-   style: reset poc style (6957_refactorFetechedTags) by:Javier Segarra
+-   style: reset poc style by:Javier Segarra
+-   style updates by:Javier Segarra
+
+### Changed 📦
+
+-   feat: refactor template by:Javier Segarra
+-   perf: 6957 add color as new shared variable by:Javier Segarra
+-   perf: 6957 change fetchedTags color by:Javier Segarra
+-   perf: remove local tree variable by:Javier Segarra
+-   refactor: add flat by:alexm
+-   refactor: refs #6600 replace QInput to VnInput by:jorgep
+-   refactor: refs #6652 improved defaulter section by:Jon
+-   refactor: refs #6942 Fix getTotalAmount function to correctly calculate the total amount in InvoiceInDueDay.vue by:jorgep
+-   refactor: refs #6942 new summary layout by:jorgep
+-   refactor: refs #6942 store key & actions by:jorgep
+-   refactor: refs #6942 summary by:jorgep
+-   refactor: refs #6942 use router hook by:jorgep
+-   refactor: refs #6942 WIP summary layout by:jorgep
+
+### Fixed 🛠️
+
+-   fix: 9-12 by:Javier Segarra
+-   fix: defaulter icon by:alexm
+-   fix: refs #5186 validation by:jorgep
+-   fix: refs #6095 add reFfk null on search by:pablone
+-   fix: refs #6942 cardDescriptor use store if its popup or different source data by:jorgep
+-   fix: refs #6942 changes and new features by:jorgep
+-   fix: refs #6942 drop comments by:jorgep
+-   fix: refs #6942 drop console by:jorgep
+-   fix: refs #6942 drop console.log by:jorgep
+-   fix: refs #6942 e2e test (origin/6942-warmfix-fixFormModel) by:jorgep
+-   fix: refs #6942 e2e tests by:jorgep
+-   fix: refs #6942 e2e tests by:jorgep
+-   fix: refs #6942 fix emit on data saved by:jorgep
+-   fix: refs #6942 fix emit on reset by:jorgep
+-   fix: refs #6942 fix vncard by:jorgep
+-   fix: refs #6942 formModel & CardDescriptor by:jorgep
+-   fix: refs #6942 formModel watch changes & invoiceInCreate by:jorgep
+-   fix: refs #6942 import by:jorgep
+-   fix: refs #6942 reloading by:jorgep
+-   fix: refs #6942 rollback by:jorgep
+-   fix: refs #6942 selectable expense by:jorgep
+-   fix: refs #6942 skip e2e tests by:jorgep
+-   fix: refs #6942 table bottom highlight & drop isBooked field by:jorgep
+-   fix: refs #6942 tests e2e by:jorgep
+-   fix: refs #6942 tests & summary table spacing by:jorgep
+-   fix: refs #6942 unit tests by:jorgep
+-   fix: refs #6942 vnLocation by:jorgep
+-   fix: refs #6942 wip: formModel by:jorgep
+-   fix: refs #7542 use right panel by:jorgep
+-   fix: searchbar redirect by:alexm
+-   fix: style by:Javier Segarra
+-   fix: WorkerCalendarItem by:Javier Segarra
+-   mini fix by:wbuezas
+-   refs #6111 clean code fix changes by:carlossa
+-   refs #6111 fix merge, fix column by:carlossa
+-   refs #6111 fix qtable, actions, scroll by:carlossa
+-   refs #6111 fix routeList by:carlossa
+-   refs #6111 fix sticky by:carlossa
+-   refs #6111 fix trad remove logs by:carlossa
+-   refs #6111 fix visibleColumns by:carlossa
+-   refs #6111 routeList fix by:carlossa
+-   refs #6332 fix calendar by:carlossa
+-   refs #6332 fix colors by:carlossa
+-   refs #6332 fix festive by:carlossa
+-   refs #6820 fix BasicData Tickets by:carlossa
+-   refs #6820 fix error front by:carlossa
+-   refs #6820 fix traduction by:carlossa
+-   refs #7391 fix textarea by:carlossa
+-   refs #7396 fix summary by:carlossa
+-   Search childs fix by:wbuezas
+-   small fix by:wbuezas
+-   style: fix color when is empty by:Javier Segarra
+
 # Changelog
 
 All notable changes to this project will be documented in this file.
diff --git a/Jenkinsfile b/Jenkinsfile
index 7cad5ef41c..1766e3aea7 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -94,7 +94,7 @@ pipeline {
                 sh 'quasar build'
                 script {
                     def packageJson = readJSON file: 'package.json'
-                    env.VERSION = packageJson.version
+                    env.VERSION = "${packageJson.version}-build${env.BUILD_ID}"
                 }
                 dockerBuild()
             }
@@ -106,7 +106,7 @@ pipeline {
             steps {
                 script {
                     def packageJson = readJSON file: 'package.json'
-                    env.VERSION = packageJson.version
+                    env.VERSION = "${packageJson.version}-build${env.BUILD_ID}"
                 }
                 withKubeConfig([
                     serverUrl: "$KUBERNETES_API",
diff --git a/changelog.sh b/changelog.sh
new file mode 100644
index 0000000000..8cd7b4716d
--- /dev/null
+++ b/changelog.sh
@@ -0,0 +1,34 @@
+features_types=(chore feat style)
+changes_types=(refactor perf)
+fix_types=(fix revert)
+file="CHANGELOG.md"
+file_tmp="temp_log.txt"
+file_current_tmp="temp_current_log.txt"
+
+setType(){
+    echo "### $1" >> $file_tmp
+    arr=("$@")
+    echo "" > $file_current_tmp
+    for i in "${arr[@]}"
+    do
+        git log --grep="$i" --oneline --no-merges --format="- %s %d by:%an" master..test >> $file_current_tmp
+    done
+    # remove duplicates
+    sort -o $file_current_tmp -u $file_current_tmp
+    cat $file_current_tmp >> $file_tmp
+    echo "" >> $file_tmp
+    # remove tmp current file
+    [ -e $file_current_tmp ] && rm $file_current_tmp
+}
+
+echo "# Version XX.XX - XXXX-XX-XX" >> $file_tmp
+echo "" >> $file_tmp
+
+setType "Added 🆕" "${features_types[@]}"
+setType "Changed 📦" "${changes_types[@]}"
+setType "Fixed 🛠️" "${fix_types[@]}"
+
+cat $file >> $file_tmp
+mv $file_tmp $file
+
+
diff --git a/src/components/CrudModel.vue b/src/components/CrudModel.vue
index 8d09352880..c26a9c4a52 100644
--- a/src/components/CrudModel.vue
+++ b/src/components/CrudModel.vue
@@ -67,6 +67,10 @@ const $props = defineProps({
         default: '',
         description: 'It is used for redirect on click "save and continue"',
     },
+    hasSubtoolbar: {
+        type: Boolean,
+        default: true,
+    },
 });
 
 const isLoading = ref(false);
@@ -310,7 +314,7 @@ watch(formUrl, async () => {
         </template>
     </VnPaginate>
     <SkeletonTable v-if="!formData" :columns="$attrs.columns?.length" />
-    <Teleport to="#st-actions" v-if="stateStore?.isSubToolbarShown()">
+    <Teleport to="#st-actions" v-if="stateStore?.isSubToolbarShown() && hasSubtoolbar">
         <QBtnGroup push style="column-gap: 10px">
             <slot name="moreBeforeActions" />
             <QBtn
diff --git a/src/components/FormModel.vue b/src/components/FormModel.vue
index 3777081437..426d99b9a9 100644
--- a/src/components/FormModel.vue
+++ b/src/components/FormModel.vue
@@ -12,6 +12,7 @@ import SkeletonForm from 'components/ui/SkeletonForm.vue';
 import VnConfirm from './ui/VnConfirm.vue';
 import { tMobile } from 'src/composables/tMobile';
 import { useArrayData } from 'src/composables/useArrayData';
+import { useRoute } from 'vue-router';
 
 const { push } = useRouter();
 const quasar = useQuasar();
@@ -20,6 +21,7 @@ const stateStore = useStateStore();
 const { t } = useI18n();
 const { validate } = useValidator();
 const { notify } = useNotify();
+const route = useRoute();
 
 const $props = defineProps({
     url: {
@@ -28,7 +30,7 @@ const $props = defineProps({
     },
     model: {
         type: String,
-        default: '',
+        default: null,
     },
     filter: {
         type: Object,
@@ -82,17 +84,18 @@ const $props = defineProps({
         description: 'It is used for redirect on click "save and continue"',
     },
 });
-
 const emit = defineEmits(['onFetch', 'onDataSaved']);
-
+const modelValue = computed(
+    () => $props.model ?? `formModel_${route?.meta?.title ?? route.name}`
+);
 const componentIsRendered = ref(false);
-const arrayData = useArrayData($props.model);
+const arrayData = useArrayData(modelValue);
 const isLoading = ref(false);
 // Si elegimos observar los cambios del form significa que inicialmente las actions estaran deshabilitadas
 const isResetting = ref(false);
 const hasChanges = ref(!$props.observeFormChanges);
 const originalData = ref({});
-const formData = computed(() => state.get($props.model));
+const formData = computed(() => state.get(modelValue));
 const formUrl = computed(() => $props.url);
 const defaultButtons = computed(() => ({
     save: {
@@ -114,7 +117,7 @@ onMounted(async () => {
     nextTick(() => (componentIsRendered.value = true));
 
     // Podemos enviarle al form la estructura de data inicial sin necesidad de fetchearla
-    state.set($props.model, $props.formInitialData);
+    state.set(modelValue, $props.formInitialData);
 
     if ($props.autoLoad && !$props.formInitialData && $props.url) await fetch();
     else if (arrayData.store.data) updateAndEmit('onFetch', arrayData.store.data);
@@ -161,8 +164,8 @@ onBeforeRouteLeave((to, from, next) => {
 
 onUnmounted(() => {
     // Restauramos los datos originales en el store si se realizaron cambios en el formulario pero no se guardaron, evitando modificaciones erróneas.
-    if (hasChanges.value) return state.set($props.model, originalData.value);
-    if ($props.clearStoreOnUnmount) state.unset($props.model);
+    if (hasChanges.value) return state.set(modelValue, originalData.value);
+    if ($props.clearStoreOnUnmount) state.unset(modelValue);
 });
 
 async function fetch() {
@@ -174,7 +177,7 @@ async function fetch() {
 
         updateAndEmit('onFetch', data);
     } catch (e) {
-        state.set($props.model, {});
+        state.set(modelValue, {});
         originalData.value = {};
     }
 }
@@ -235,11 +238,11 @@ function filter(value, update, filterOptions) {
 }
 
 function updateAndEmit(evt, val, res) {
-    state.set($props.model, val);
+    state.set(modelValue, val);
     originalData.value = val && JSON.parse(JSON.stringify(val));
     if (!$props.url) arrayData.store.data = val;
 
-    emit(evt, state.get($props.model), res);
+    emit(evt, state.get(modelValue), res);
 }
 
 defineExpose({ save, isLoading, hasChanges });
diff --git a/src/components/VnTable/VnColumn.vue b/src/components/VnTable/VnColumn.vue
index 9f8614fe58..6a52e0158e 100644
--- a/src/components/VnTable/VnColumn.vue
+++ b/src/components/VnTable/VnColumn.vue
@@ -134,26 +134,28 @@ const col = computed(() => {
 const components = computed(() => $props.components ?? defaultComponents);
 </script>
 <template>
-    <VnComponent
-        v-if="col.before"
-        :prop="col.before"
-        :components="components"
-        :value="model"
-        v-model="model"
-    />
-    <VnComponent
-        v-if="col.component"
-        :prop="col"
-        :components="components"
-        :value="model"
-        v-model="model"
-    />
-    <span :title="value" v-else>{{ value }}</span>
-    <VnComponent
-        v-if="col.after"
-        :prop="col.after"
-        :components="components"
-        :value="model"
-        v-model="model"
-    />
+    <div class="row no-wrap fit">
+        <VnComponent
+            v-if="col.before"
+            :prop="col.before"
+            :components="components"
+            :value="model"
+            v-model="model"
+        />
+        <VnComponent
+            v-if="col.component"
+            :prop="col"
+            :components="components"
+            :value="model"
+            v-model="model"
+        />
+        <span :title="value" v-else>{{ value }}</span>
+        <VnComponent
+            v-if="col.after"
+            :prop="col.after"
+            :components="components"
+            :value="model"
+            v-model="model"
+        />
+    </div>
 </template>
diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 72d0869112..262f85f962 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -53,7 +53,7 @@ const $props = defineProps({
     },
     isEditable: {
         type: Boolean,
-        default: null,
+        default: false,
     },
     useModel: {
         type: Boolean,
@@ -83,7 +83,6 @@ const tableModes = [
         icon: 'grid_view',
         title: t('grid view'),
         value: 'card',
-        disable: () => console.log('called'),
     },
 ];
 
@@ -212,223 +211,245 @@ defineExpose({
             </VnFilterPanel>
         </QScrollArea>
     </QDrawer>
-    <CrudModel
-        v-bind="$attrs"
-        class="q-px-md"
-        :limit="20"
-        ref="CrudModelRef"
-        :search-url="searchUrl"
-        :disable-infinite-scroll="mode == 'table'"
-        @save-changes="reload"
-    >
-        <template #body="{ rows }">
-            <QTable
-                class="vnTable"
-                :columns="splittedColumns.columns"
-                :rows="rows"
-                row-key="id"
-                selection="multiple"
-                v-model:selected="selected"
-                :grid="mode != 'table'"
-                table-header-class="bg-header"
-                card-container-class="grid-three"
-                flat
-                :style="mode == 'table' && 'max-height: 92vh'"
-                virtual-scroll
-                @virtual-scroll="
-                    (event) =>
-                        event.index > rows.length - 2 &&
-                        CrudModelRef.vnPaginateRef.paginate()
-                "
-                @row-click="(_, row) => rowClickFunction(row)"
-            >
-                <template #top-left>
-                    <slot name="top-left"></slot>
-                </template>
-                <template #top-right>
-                    <!-- <QBtn
+    <!-- class in div to fix warn-->
+    <div class="q-px-md">
+        <CrudModel
+            v-bind="$attrs"
+            :limit="20"
+            ref="CrudModelRef"
+            :search-url="searchUrl"
+            :disable-infinite-scroll="mode == 'table'"
+            @save-changes="reload"
+            :has-subtoolbar="isEditable"
+        >
+            <template #body="{ rows }">
+                <QTable
+                    v-bind="$attrs"
+                    class="vnTable"
+                    :columns="splittedColumns.columns"
+                    :rows="rows"
+                    v-model:selected="selected"
+                    :grid="mode != 'table'"
+                    table-header-class="bg-header"
+                    card-container-class="grid-three"
+                    flat
+                    :style="mode == 'table' && 'max-height: 90vh'"
+                    virtual-scroll
+                    @virtual-scroll="
+                        (event) =>
+                            event.index > rows.length - 2 &&
+                            CrudModelRef.vnPaginateRef.paginate()
+                    "
+                    @row-click="(_, row) => rowClickFunction(row)"
+                >
+                    <template #top-left>
+                        <slot name="top-left"></slot>
+                    </template>
+                    <template #top-right>
+                        <!-- <QBtn
                         icon="visibility"
                         title="asd"
                         class="bg-vn-section-color q-mr-md"
                         dense
                         v-if="mode == 'table'"
                     /> -->
-                    <QBtnToggle
-                        v-model="mode"
-                        toggle-color="primary"
-                        class="bg-vn-section-color"
-                        dense
-                        :options="tableModes"
-                    />
-                    <QBtn
-                        icon="filter_alt"
-                        title="asd"
-                        class="bg-vn-section-color q-ml-md"
-                        dense
-                        @click="stateStore.toggleRightDrawer()"
-                    />
-                </template>
-                <template #header-cell="{ col }">
-                    <QTh auto-width style="min-width: 100px" v-if="$props.columnSearch">
-                        <VnTableFilter
-                            :column="col"
-                            :show-title="true"
-                            :data-key="$attrs['data-key']"
-                            v-model="params[columnName(col)]"
-                            :search-url="searchUrl"
+                        <QBtnToggle
+                            v-model="mode"
+                            toggle-color="primary"
+                            class="bg-vn-section-color"
+                            dense
+                            :options="tableModes"
                         />
-                    </QTh>
-                </template>
-                <template #header-cell-tableActions>
-                    <QTh auto-width class="sticky" />
-                </template>
-                <template #body-cell-tableStatus="{ col, row }">
-                    <QTd auto-width :class="`text-${col.align ?? 'left'}`">
-                        <VnTableChip :columns="splittedColumns.columnChips" :row="row">
-                            <template #afterChip>
-                                <slot name="afterChip" :row="row"></slot>
-                            </template>
-                        </VnTableChip>
-                    </QTd>
-                </template>
-                <template #body-cell="{ col, row }">
-                    <!-- Columns -->
-                    <QTd
-                        auto-width
-                        class="no-margin q-px-xs"
-                        :class="`text-${col.align ?? 'left'}`"
-                    >
-                        <VnTableColumn
-                            :column="col"
-                            :row="row"
-                            :is-editable="false"
-                            v-model="row[col.name]"
-                            component-prop="columnField"
-                        />
-                    </QTd>
-                </template>
-                <template #body-cell-tableActions="{ col, row }">
-                    <QTd
-                        auto-width
-                        :class="`text-${col.align ?? 'left'}`"
-                        class="sticky no-padding"
-                        @click="stopEventPropagation($event)"
-                    >
                         <QBtn
-                            v-for="(btn, index) of col.actions"
-                            :key="index"
-                            :title="btn.title"
-                            :icon="btn.icon"
-                            class="q-px-sm"
-                            flat
-                            :class="
-                                btn.isPrimary ? 'text-primary-light' : 'color-vn-text '
-                            "
-                            @click="btn.action(row)"
+                            icon="filter_alt"
+                            title="asd"
+                            class="bg-vn-section-color q-ml-md"
+                            dense
+                            @click="stateStore.toggleRightDrawer()"
                         />
-                    </QTd>
-                </template>
-                <template #item="{ row, colsMap }">
-                    <component
-                        :is="$props.redirect ? 'router-link' : 'span'"
-                        :to="`/${$props.redirect}/` + row.id"
-                    >
-                        <QCard
-                            bordered
-                            flat
-                            class="row no-wrap justify-between cursor-pointer"
-                            @click="
-                                (_, row) => {
-                                    $props.rowClick && $props.rowClick(row);
-                                }
-                            "
+                    </template>
+                    <template #header-cell="{ col }">
+                        <QTh
+                            auto-width
+                            style="min-width: 100px"
+                            v-if="$props.columnSearch"
                         >
-                            <QCardSection
-                                vertical
-                                class="no-margin no-padding"
-                                :class="colsMap.tableActions ? 'w-80' : 'fit'"
+                            <VnTableFilter
+                                :column="col"
+                                :show-title="true"
+                                :data-key="$attrs['data-key']"
+                                v-model="params[columnName(col)]"
+                                :search-url="searchUrl"
+                            />
+                        </QTh>
+                    </template>
+                    <template #header-cell-tableActions>
+                        <QTh auto-width class="sticky" />
+                    </template>
+                    <template #body-cell-tableStatus="{ col, row }">
+                        <QTd auto-width :class="`text-${col.align ?? 'left'}`">
+                            <VnTableChip
+                                :columns="splittedColumns.columnChips"
+                                :row="row"
+                            >
+                                <template #afterChip>
+                                    <slot name="afterChip" :row="row"></slot>
+                                </template>
+                            </VnTableChip>
+                        </QTd>
+                    </template>
+                    <template #body-cell="{ col, row }">
+                        <!-- Columns -->
+                        <QTd
+                            auto-width
+                            class="no-margin q-px-xs"
+                            :class="`text-${col.align ?? 'left'}`"
+                        >
+                            <VnTableColumn
+                                :column="col"
+                                :row="row"
+                                :is-editable="false"
+                                v-model="row[col.name]"
+                                component-prop="columnField"
+                            />
+                        </QTd>
+                    </template>
+                    <template #body-cell-tableActions="{ col, row }">
+                        <QTd
+                            auto-width
+                            :class="`text-${col.align ?? 'left'}`"
+                            class="sticky no-padding"
+                            @click="stopEventPropagation($event)"
+                        >
+                            <QBtn
+                                v-for="(btn, index) of col.actions"
+                                :key="index"
+                                :title="btn.title"
+                                :icon="btn.icon"
+                                class="q-px-sm"
+                                flat
+                                :class="
+                                    btn.isPrimary
+                                        ? 'text-primary-light'
+                                        : 'color-vn-text '
+                                "
+                                @click="btn.action(row)"
+                            />
+                        </QTd>
+                    </template>
+                    <template #item="{ row, colsMap }">
+                        <component
+                            :is="$props.redirect ? 'router-link' : 'span'"
+                            :to="`/${$props.redirect}/` + row.id"
+                        >
+                            <QCard
+                                bordered
+                                flat
+                                class="row no-wrap justify-between cursor-pointer"
+                                @click="
+                                    (_, row) => {
+                                        $props.rowClick && $props.rowClick(row);
+                                    }
+                                "
                             >
-                                <!-- Chips -->
                                 <QCardSection
-                                    v-if="splittedColumns.chips.length"
-                                    class="no-margin q-px-xs q-py-none"
+                                    vertical
+                                    class="no-margin no-padding"
+                                    :class="colsMap.tableActions ? 'w-80' : 'fit'"
                                 >
-                                    <VnTableChip
-                                        :columns="splittedColumns.chips"
-                                        :row="row"
+                                    <!-- Chips -->
+                                    <QCardSection
+                                        v-if="splittedColumns.chips.length"
+                                        class="no-margin q-px-xs q-py-none"
                                     >
-                                        <template #afterChip>
-                                            <slot name="afterChip" :row="row"></slot>
-                                        </template>
-                                    </VnTableChip>
-                                </QCardSection>
-                                <!-- Title -->
-                                <QCardSection
-                                    v-if="splittedColumns.title"
-                                    class="q-pl-sm q-py-none text-primary-light text-bold text-h6 cardEllipsis"
-                                >
-                                    <span
-                                        :title="row[splittedColumns.title.name]"
-                                        @click="stopEventPropagation($event)"
-                                        class="cursor-text"
-                                    >
-                                        {{ row[splittedColumns.title.name] }}
-                                    </span>
-                                </QCardSection>
-                                <!-- Fields -->
-                                <QCardSection
-                                    class="q-pl-sm q-pr-lg q-py-xs"
-                                    :class="$props.cardClass"
-                                >
-                                    <div
-                                        v-for="col of splittedColumns.visible"
-                                        :key="col.name"
-                                        class="fields"
-                                    >
-                                        <VnLv :label="col.label && `${col.label}:`">
-                                            <template #value>
-                                                <span
-                                                    @click="stopEventPropagation($event)"
-                                                >
-                                                    <VnTableColumn
-                                                        :column="col"
-                                                        :row
-                                                        component-prop="columnField"
-                                                    />
-                                                </span>
+                                        <VnTableChip
+                                            :columns="splittedColumns.chips"
+                                            :row="row"
+                                        >
+                                            <template #afterChip>
+                                                <slot name="afterChip" :row="row"></slot>
                                             </template>
-                                        </VnLv>
-                                    </div>
+                                        </VnTableChip>
+                                    </QCardSection>
+                                    <!-- Title -->
+                                    <QCardSection
+                                        v-if="splittedColumns.title"
+                                        class="q-pl-sm q-py-none text-primary-light text-bold text-h6 cardEllipsis"
+                                    >
+                                        <span
+                                            :title="row[splittedColumns.title.name]"
+                                            @click="stopEventPropagation($event)"
+                                            class="cursor-text"
+                                        >
+                                            {{ row[splittedColumns.title.name] }}
+                                        </span>
+                                    </QCardSection>
+                                    <!-- Fields -->
+                                    <QCardSection
+                                        class="q-pl-sm q-pr-lg q-py-xs"
+                                        :class="$props.cardClass"
+                                    >
+                                        <div
+                                            v-for="col of splittedColumns.visible"
+                                            :key="col.name"
+                                            class="fields"
+                                        >
+                                            <VnLv
+                                                :label="
+                                                    !col.component &&
+                                                    col.label &&
+                                                    `${col.label}:`
+                                                "
+                                            >
+                                                <template #value>
+                                                    <span
+                                                        @click="
+                                                            stopEventPropagation($event)
+                                                        "
+                                                    >
+                                                        <VnTableColumn
+                                                            :column="col"
+                                                            :row="row"
+                                                            :is-editable="false"
+                                                            v-model="row[col.name]"
+                                                            component-prop="columnField"
+                                                            :show-label="true"
+                                                        />
+                                                    </span>
+                                                </template>
+                                            </VnLv>
+                                        </div>
+                                    </QCardSection>
                                 </QCardSection>
-                            </QCardSection>
-                            <!-- Actions -->
-                            <QCardSection
-                                v-if="colsMap.tableActions"
-                                class="column flex-center w-10 no-margin q-pa-xs q-gutter-y-xs"
-                                @click="stopEventPropagation($event)"
-                            >
-                                <QBtn
-                                    v-for="(btn, index) of splittedColumns.actions
-                                        .actions"
-                                    :key="index"
-                                    :title="btn.title"
-                                    :icon="btn.icon"
-                                    class="q-pa-xs"
-                                    flat
-                                    :class="
-                                        btn.isPrimary
-                                            ? 'text-primary-light'
-                                            : 'color-vn-text '
-                                    "
-                                    @click="btn.action(row)"
-                                />
-                            </QCardSection>
-                        </QCard>
-                    </component>
-                </template>
-            </QTable>
-        </template>
-    </CrudModel>
+                                <!-- Actions -->
+                                <QCardSection
+                                    v-if="colsMap.tableActions"
+                                    class="column flex-center w-10 no-margin q-pa-xs q-gutter-y-xs"
+                                    @click="stopEventPropagation($event)"
+                                >
+                                    <QBtn
+                                        v-for="(btn, index) of splittedColumns.actions
+                                            .actions"
+                                        :key="index"
+                                        :title="btn.title"
+                                        :icon="btn.icon"
+                                        class="q-pa-xs"
+                                        flat
+                                        :class="
+                                            btn.isPrimary
+                                                ? 'text-primary-light'
+                                                : 'color-vn-text '
+                                        "
+                                        @click="btn.action(row)"
+                                    />
+                                </QCardSection>
+                            </QCard>
+                        </component>
+                    </template>
+                </QTable>
+            </template>
+        </CrudModel>
+    </div>
     <QPageSticky v-if="create" :offset="[20, 20]" style="z-index: 2">
         <QBtn @click="showForm = !showForm" color="primary" fab icon="add" />
         <QTooltip>
@@ -437,7 +458,7 @@ defineExpose({
     </QPageSticky>
     <QDialog v-model="showForm" transition-show="scale" transition-hide="scale">
         <FormModelPopup
-            v-bind="{ ...$attrs, ...create }"
+            v-bind="create"
             :model="$attrs['data-key'] + 'Create'"
             @on-data-saved="(_, res) => create.onDataSaved(res)"
         >
@@ -450,6 +471,7 @@ defineExpose({
                         :row="{}"
                         default="input"
                         v-model="data[column.name]"
+                        :show-label="true"
                     />
                     <slot name="more-create-dialog" :data="data" />
                 </div>
@@ -458,11 +480,11 @@ defineExpose({
     </QDialog>
 </template>
 <i18n>
-    en:
-        status: Status
-    es:
-        status: Estados
-    </i18n>
+en:
+    status: Status
+es:
+    status: Estados
+</i18n>
 
 <style lang="scss">
 .bg-chip-secondary {
diff --git a/src/components/common/VnComponent.vue b/src/components/common/VnComponent.vue
index f9848ffc3c..56b43a4dbc 100644
--- a/src/components/common/VnComponent.vue
+++ b/src/components/common/VnComponent.vue
@@ -1,14 +1,3 @@
-<template>
-    <span v-for="toComponent of componentArray" :key="toComponent.name">
-        <component
-            v-if="toComponent?.component"
-            :is="mix(toComponent).component"
-            v-bind="mix(toComponent).attrs"
-            v-on="mix(toComponent).event ?? {}"
-            v-model="model"
-        />
-    </span>
-</template>
 <script setup>
 import { computed, defineModel } from 'vue';
 
@@ -53,3 +42,19 @@ function toValueAttrs(attrs) {
     return typeof attrs == 'function' ? attrs($props.value) : attrs;
 }
 </script>
+<template>
+    <span
+        v-for="toComponent of componentArray"
+        :key="toComponent.name"
+        class="column flex-center fit"
+    >
+        <component
+            v-if="toComponent?.component"
+            :is="mix(toComponent).component"
+            v-bind="mix(toComponent).attrs"
+            v-on="mix(toComponent).event ?? {}"
+            v-model="model"
+            class="fit"
+        />
+    </span>
+</template>
diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue
index 3e892cb411..218e286002 100644
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@@ -147,7 +147,7 @@ const tagsList = computed(() => {
     const tagList = [];
     for (const key of Object.keys(params.value)) {
         const value = params.value[key];
-        if (!value || ($props.hiddenTags || []).includes(key)) continue;
+        if (value == null || ($props.hiddenTags || []).includes(key)) continue;
         tagList.push({ label: key, value });
     }
     return tagList;
@@ -161,21 +161,14 @@ const customTags = computed(() =>
 );
 
 async function remove(key) {
-    delete params.value[key];
-    delete params.value.filter?.where?.[key];
     params.value[key] = undefined;
-    await arrayData.applyFilter({ params: params.value });
+    search();
     emit('remove', key);
 }
 
 function formatValue(value) {
-    if (typeof value === 'boolean') {
-        return value ? t('Yes') : t('No');
-    }
-
-    if (isNaN(value) && !isNaN(Date.parse(value))) {
-        return toDate(value);
-    }
+    if (typeof value === 'boolean') return value ? t('Yes') : t('No');
+    if (isNaN(value) && !isNaN(Date.parse(value))) return toDate(value);
 
     return `"${value}"`;
 }
@@ -236,7 +229,7 @@ function formatValue(value) {
                         <slot name="tags" :tag="chip" :format-fn="formatValue">
                             <div class="q-gutter-x-xs">
                                 <strong>{{ chip.label }}:</strong>
-                                <span>"{{ chip.value }}"</span>
+                                <span>"{{ formatValue(chip.value) }}"</span>
                             </div>
                         </slot>
                     </VnFilterPanelChip>
diff --git a/src/components/ui/VnPaginate.vue b/src/components/ui/VnPaginate.vue
index a06eb8988c..9af69fdbb0 100644
--- a/src/components/ui/VnPaginate.vue
+++ b/src/components/ui/VnPaginate.vue
@@ -74,6 +74,7 @@ const props = defineProps({
 
 const emit = defineEmits(['onFetch', 'onPaginate', 'onChange']);
 const isLoading = ref(false);
+const mounted = ref(false);
 const pagination = ref({
     sortBy: props.order,
     rowsPerPage: props.limit,
@@ -94,8 +95,9 @@ const arrayData = useArrayData(props.dataKey, {
 });
 const store = arrayData.store;
 
-onMounted(() => {
-    if (props.autoLoad) fetch();
+onMounted(async () => {
+    if (props.autoLoad) await fetch();
+    mounted.value = true;
 });
 
 watch(
@@ -160,7 +162,7 @@ function endPagination() {
     emit('onPaginate');
 }
 async function onLoad(index, done) {
-    if (!store.data) return done();
+    if (!store.data || !mounted.value) return done();
 
     if (store.data.length === 0 || !props.url) return done(false);
 
diff --git a/src/composables/useArrayData.js b/src/composables/useArrayData.js
index 3b50b60ad6..f97ade7bfd 100644
--- a/src/composables/useArrayData.js
+++ b/src/composables/useArrayData.js
@@ -1,4 +1,4 @@
-import { onMounted, ref, computed, onUnmounted } from 'vue';
+import { onMounted, ref, computed } from 'vue';
 import { useRouter, useRoute } from 'vue-router';
 import axios from 'axios';
 import { useArrayDataStore } from 'stores/useArrayDataStore';
@@ -221,6 +221,7 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
                 const pushUrl = { path: to };
                 if (to.endsWith('/list') || to.endsWith('/'))
                     pushUrl.query = newUrl.query;
+                destroy();
                 return router.push(pushUrl);
             }
         }
diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 966aac2339..ce76ce99a6 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -396,6 +396,7 @@ entry:
         type: Type
         color: Color
         id: ID
+        printedStickers: Printed stickers
     notes:
         observationType: Observation type
     descriptor:
@@ -582,6 +583,9 @@ claim:
         created: Created
         state: State
         pickup: Pick up
+        null: No
+        agency: Agency
+        delivery: Delivery
     photo:
         fileDescription: 'Claim id {claimId} from client {clientName} id {clientId}'
         noData: 'There are no images/videos, click here or drag and drop the file'
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 3749904b3e..2c62d0abf4 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -394,6 +394,7 @@ entry:
         type: Tipo
         color: Color
         id: ID
+        printedStickers: Etiquetas impresas
     notes:
         observationType: Tipo de observación
     descriptor:
diff --git a/src/pages/Customer/CustomerList.vue b/src/pages/Customer/CustomerList.vue
index 8677a77ca7..7eb3cefd01 100644
--- a/src/pages/Customer/CustomerList.vue
+++ b/src/pages/Customer/CustomerList.vue
@@ -1,94 +1,433 @@
 <script setup>
+import { ref, computed, markRaw } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
-import VnPaginate from 'src/components/ui/VnPaginate.vue';
-import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
-import CustomerFilter from './CustomerFilter.vue';
-import VnLv from 'src/components/ui/VnLv.vue';
-import CardList from 'src/components/ui/CardList.vue';
-import VnLinkPhone from 'src/components/ui/VnLinkPhone.vue';
-import { useSummaryDialog } from 'src/composables/useSummaryDialog';
+import VnTable from 'components/VnTable/VnTable.vue';
+import VnLocation from 'src/components/common/VnLocation.vue';
 import CustomerSummary from './Card/CustomerSummary.vue';
-import RightMenu from 'src/components/common/RightMenu.vue';
+import { useSummaryDialog } from 'src/composables/useSummaryDialog';
+
+import VnLinkPhone from 'src/components/ui/VnLinkPhone.vue';
+
+import { toDate } from 'src/filters';
 
-const router = useRouter();
 const { t } = useI18n();
+const router = useRouter();
+
+const postcodesOptions = ref([]);
+const tableRef = ref();
+
+const columns = computed(() => [
+    {
+        align: 'left',
+        name: 'id',
+        label: t('customer.extendedList.tableVisibleColumns.id'),
+        chip: {
+            condition: () => true,
+        },
+        isId: true,
+        columnFilter: {
+            component: 'select',
+            name: 'search',
+            attrs: {
+                url: 'Clients',
+                fields: ['id', 'name'],
+            },
+        },
+    },
+    {
+        align: 'left',
+        label: t('customer.extendedList.tableVisibleColumns.name'),
+        name: 'name',
+        isTitle: true,
+        create: true,
+    },
+    {
+        align: 'left',
+        name: 'socialName',
+        label: t('customer.extendedList.tableVisibleColumns.socialName'),
+        isTitle: true,
+        create: true,
+    },
+    {
+        align: 'left',
+        label: t('customer.extendedList.tableVisibleColumns.fi'),
+        name: 'fi',
+        create: true,
+    },
+    {
+        align: 'left',
+        label: t('customer.extendedList.tableVisibleColumns.salesPersonFk'),
+        name: 'salesPersonFk',
+        component: 'select',
+        attrs: {
+            url: 'Workers/activeWithInheritedRole',
+            fields: ['id', 'name'],
+            where: { role: 'salesPerson' },
+        },
+        create: true,
+        columnField: {
+            component: null,
+        },
+        format: (row, dashIfEmpty) => dashIfEmpty(row.salesPerson),
+    },
+    {
+        align: 'left',
+        label: t('customer.extendedList.tableVisibleColumns.credit'),
+        name: 'credit',
+        component: 'number',
+        columnFilter: {
+            inWhere: true,
+        },
+    },
+    {
+        align: 'left',
+        label: t('customer.extendedList.tableVisibleColumns.creditInsurance'),
+        name: 'creditInsurance',
+        component: 'number',
+        columnFilter: {
+            inWhere: true,
+        },
+    },
+    {
+        align: 'left',
+        label: t('customer.extendedList.tableVisibleColumns.phone'),
+        name: 'phone',
+        cardVisible: true,
+        columnFilter: {
+            component: 'number',
+        },
+        columnField: {
+            component: null,
+            after: {
+                component: markRaw(VnLinkPhone),
+                attrs: (prop) => {
+                    return {
+                        'phone-number': prop,
+                    };
+                },
+            },
+        },
+    },
+    {
+        align: 'left',
+        label: t('customer.extendedList.tableVisibleColumns.mobile'),
+        name: 'mobile',
+        cardVisible: true,
+        columnFilter: {
+            component: 'number',
+            inWhere: true,
+        },
+    },
+    {
+        align: 'left',
+        label: t('customer.extendedList.tableVisibleColumns.street'),
+        name: 'street',
+        create: true,
+        columnFilter: {
+            inWhere: true,
+        },
+    },
+    {
+        align: 'left',
+        label: t('customer.extendedList.tableVisibleColumns.countryFk'),
+        name: 'countryFk',
+        columnFilter: {
+            component: 'select',
+            inWhere: true,
+            alias: 'c',
+            attrs: {
+                url: 'Countries',
+            },
+        },
+        format: (row, dashIfEmpty) => dashIfEmpty(row.country),
+    },
+    {
+        align: 'left',
+        label: t('customer.extendedList.tableVisibleColumns.provinceFk'),
+        name: 'provinceFk',
+        component: 'select',
+        attrs: {
+            url: 'Provinces',
+        },
+        columnField: {
+            component: null,
+        },
+        format: (row, dashIfEmpty) => dashIfEmpty(row.province),
+    },
+    {
+        align: 'left',
+        label: t('customer.extendedList.tableVisibleColumns.city'),
+        name: 'city',
+    },
+    {
+        align: 'left',
+        label: t('customer.extendedList.tableVisibleColumns.postcode'),
+        name: 'postcode',
+    },
+    {
+        align: 'left',
+        label: t('customer.extendedList.tableVisibleColumns.email'),
+        name: 'email',
+        cardVisible: true,
+    },
+    {
+        align: 'left',
+        label: t('customer.extendedList.tableVisibleColumns.created'),
+        name: 'created',
+        format: ({ created }) => toDate(created),
+        component: 'date',
+        columnFilter: {
+            alias: 'c',
+            inWhere: true,
+        },
+    },
+    {
+        align: 'left',
+        label: t('customer.extendedList.tableVisibleColumns.businessTypeFk'),
+        name: 'businessTypeFk',
+        create: true,
+        component: 'select',
+        attrs: {
+            url: 'BusinessTypes',
+            optionLabel: 'description',
+            optionValue: 'code',
+        },
+        columnField: {
+            component: null,
+        },
+        format: (row, dashIfEmpty) => dashIfEmpty(row.businessType),
+    },
+    {
+        align: 'left',
+        label: t('customer.extendedList.tableVisibleColumns.payMethodFk'),
+        name: 'payMethodFk',
+        columnFilter: {
+            component: 'select',
+            attrs: {
+                url: 'PayMethods',
+            },
+            inWhere: true,
+        },
+        format: (row, dashIfEmpty) => dashIfEmpty(row.payMethod),
+    },
+    {
+        align: 'left',
+        label: t('customer.extendedList.tableVisibleColumns.sageTaxTypeFk'),
+        name: 'sageTaxTypeFk',
+        columnFilter: {
+            component: 'select',
+            attrs: {
+                optionLabel: 'vat',
+                url: 'SageTaxTypes',
+            },
+            alias: 'sti',
+            inWhere: true,
+        },
+        format: (row, dashIfEmpty) => dashIfEmpty(row.sageTaxType),
+    },
+    {
+        align: 'left',
+        label: t('customer.extendedList.tableVisibleColumns.sageTransactionTypeFk'),
+        name: 'sageTransactionTypeFk',
+        columnFilter: {
+            component: 'select',
+            attrs: {
+                optionLabel: 'transaction',
+                url: 'SageTransactionTypes',
+            },
+            alias: 'stt',
+            inWhere: true,
+        },
+        format: (row, dashIfEmpty) => dashIfEmpty(row.sageTransactionType),
+    },
+    {
+        align: 'left',
+        label: t('customer.extendedList.tableVisibleColumns.isActive'),
+        name: 'isActive',
+        chip: {
+            color: null,
+            condition: (value) => !value,
+            icon: 'vn:disabled',
+        },
+        columnFilter: {
+            inWhere: true,
+        },
+    },
+    {
+        align: 'left',
+        label: t('customer.extendedList.tableVisibleColumns.isVies'),
+        name: 'isVies',
+        columnFilter: {
+            inWhere: true,
+        },
+    },
+    {
+        align: 'left',
+        label: t('customer.extendedList.tableVisibleColumns.isTaxDataChecked'),
+        name: 'isTaxDataChecked',
+        columnFilter: {
+            inWhere: true,
+        },
+    },
+    {
+        align: 'left',
+        label: t('customer.extendedList.tableVisibleColumns.isEqualizated'),
+        name: 'isEqualizated',
+        create: true,
+        columnFilter: {
+            inWhere: true,
+        },
+    },
+    {
+        align: 'left',
+        label: t('customer.extendedList.tableVisibleColumns.isFreezed'),
+        name: 'isFreezed',
+        chip: {
+            color: null,
+            condition: (value) => value,
+            icon: 'vn:frozen',
+        },
+        columnFilter: {
+            inWhere: true,
+        },
+    },
+    {
+        align: 'left',
+        label: t('customer.extendedList.tableVisibleColumns.hasToInvoice'),
+        name: 'hasToInvoice',
+        columnFilter: {
+            inWhere: true,
+        },
+    },
+    {
+        align: 'left',
+        label: t('customer.extendedList.tableVisibleColumns.hasToInvoiceByAddress'),
+        name: 'hasToInvoiceByAddress',
+        columnFilter: {
+            inWhere: true,
+        },
+    },
+    {
+        align: 'left',
+        label: t('customer.extendedList.tableVisibleColumns.isToBeMailed'),
+        name: 'isToBeMailed',
+        columnFilter: {
+            inWhere: true,
+        },
+    },
+    {
+        align: 'left',
+        label: t('customer.extendedList.tableVisibleColumns.hasLcr'),
+        name: 'hasLcr',
+        columnFilter: {
+            inWhere: true,
+        },
+    },
+    {
+        align: 'left',
+        label: t('customer.extendedList.tableVisibleColumns.hasCoreVnl'),
+        name: 'hasCoreVnl',
+        columnFilter: {
+            inWhere: true,
+        },
+    },
+    {
+        align: 'left',
+        label: t('customer.extendedList.tableVisibleColumns.hasSepaVnl'),
+        name: 'hasSepaVnl',
+        columnFilter: {
+            inWhere: true,
+        },
+    },
+    {
+        align: 'right',
+        label: '',
+        name: 'tableActions',
+        actions: [
+            {
+                title: t('Client ticket list'),
+                icon: 'vn:ticket',
+                action: redirectToCreateView,
+                isPrimary: true,
+            },
+            {
+                title: t('Client ticket list'),
+                icon: 'preview',
+                action: (row) => viewSummary(row.id, CustomerSummary),
+            },
+        ],
+    },
+]);
+
 const { viewSummary } = useSummaryDialog();
-
-function navigate(id) {
-    router.push({ path: `/customer/${id}` });
-}
-
-const redirectToCreateView = () => {
-    router.push({ name: 'CustomerCreate' });
+const redirectToCreateView = (row) => {
+    router.push({
+        name: 'TicketList',
+        query: {
+            params: JSON.stringify({
+                clientFk: row.id,
+            }),
+        },
+    });
 };
+
+function handleLocation(data, location) {
+    const { town, code, provinceFk, countryFk } = location ?? {};
+    data.postcode = code;
+    data.city = town;
+    data.provinceFk = provinceFk;
+    data.countryFk = countryFk;
+}
 </script>
 
 <template>
-    <VnSearchbar
-        :info="t('You can search by customer id or name')"
-        :label="t('Search customer')"
-        data-key="CustomerList"
-    />
-    <RightMenu>
-        <template #right-panel>
-            <CustomerFilter data-key="CustomerList" />
-        </template>
-    </RightMenu>
-    <QPage class="column items-center q-pa-md">
-        <div class="vn-card-list">
-            <VnPaginate
-                auto-load
-                data-key="CustomerList"
-                order="id DESC"
-                url="/Clients/filter"
-            >
-                <template #body="{ rows }">
-                    <CardList
-                        :id="row.id"
-                        :key="row.id"
-                        :title="row.name"
-                        @click="navigate(row.id)"
-                        v-for="row of rows"
-                    >
-                        <template #list-items>
-                            <VnLv :label="t('customer.list.email')" :value="row.email" />
-                            <VnLv :value="row.phone">
-                                <template #label>
-                                    {{ t('customer.list.phone') }}
-                                    <VnLinkPhone :phone-number="row.phone" />
-                                </template>
-                            </VnLv>
-                        </template>
-                        <template #actions>
-                            <QBtn
-                                :label="t('components.smartCard.openCard')"
-                                @click.stop="navigate(row.id)"
-                                outline
-                            />
-                            <QBtn
-                                :label="t('components.smartCard.openSummary')"
-                                @click.stop="viewSummary(row.id, CustomerSummary)"
-                                color="primary"
-                                style="margin-top: 15px"
-                            />
-                        </template>
-                    </CardList>
+    <VnTable
+        ref="tableRef"
+        data-key="CustomerExtendedList"
+        url="Clients/extendedListFilter"
+        :create="{
+            urlCreate: 'Clients/createWithUser',
+            title: 'Create client',
+            onDataSaved: ({ id }) => tableRef.redirect(id),
+            formInitialData: {
+                active: true,
+                isEqualizated: false,
+            },
+        }"
+        order="id DESC"
+        :columns="columns"
+        default-mode="table"
+        redirect="customer"
+        auto-load
+    >
+        <template #more-create-dialog="{ data }">
+            <VnLocation
+                :roles-allowed-to-create="['deliveryAssistant']"
+                :options="postcodesOptions"
+                v-model="data.location"
+                @update:model-value="(location) => handleLocation(data, location)"
+            />
+            <QInput v-model="data.userName" :label="t('Web user')" />
+            <QInput :label="t('Email')" clearable type="email" v-model="data.email">
+                <template #append>
+                    <QIcon name="info" class="cursor-info">
+                        <QTooltip max-width="400px">{{
+                            t('customer.basicData.youCanSaveMultipleEmails')
+                        }}</QTooltip>
+                    </QIcon>
                 </template>
-            </VnPaginate>
-        </div>
-        <QPageSticky :offset="[20, 20]">
-            <QBtn @click="redirectToCreateView()" color="primary" fab icon="add" />
-            <QTooltip>
-                {{ t('New client') }}
-            </QTooltip>
-        </QPageSticky>
-    </QPage>
+            </QInput>
+        </template>
+    </VnTable>
 </template>
-
 <i18n>
 es:
-    Search customer: Buscar cliente
-    You can search by customer id or name: Puedes buscar por id o nombre del cliente
-    New client: Nuevo cliente
+    Web user: Usuario Web
 </i18n>
+<style lang="scss" scoped>
+.col-content {
+    border-radius: 4px;
+    padding: 6px;
+}
+</style>
diff --git a/src/pages/Customer/ExtendedList/CustomerExtendedList.vue b/src/pages/Customer/ExtendedList/CustomerExtendedList.vue
deleted file mode 100644
index a54673a66d..0000000000
--- a/src/pages/Customer/ExtendedList/CustomerExtendedList.vue
+++ /dev/null
@@ -1,428 +0,0 @@
-<script setup>
-import { ref, computed, markRaw } from 'vue';
-import { useI18n } from 'vue-i18n';
-import { useRouter } from 'vue-router';
-import VnTable from 'components/VnTable/VnTable.vue';
-import VnLocation from 'src/components/common/VnLocation.vue';
-import CustomerSummary from '../Card/CustomerSummary.vue';
-import { useSummaryDialog } from 'src/composables/useSummaryDialog';
-
-import VnLinkPhone from 'src/components/ui/VnLinkPhone.vue';
-
-import { toDate } from 'src/filters';
-
-const { t } = useI18n();
-const router = useRouter();
-
-const postcodesOptions = ref([]);
-const tableRef = ref();
-
-const columns = computed(() => [
-    {
-        align: 'left',
-        name: 'id',
-        label: t('customer.extendedList.tableVisibleColumns.id'),
-        chip: {
-            condition: () => true,
-        },
-        isId: true,
-        columnFilter: {
-            component: 'select',
-            name: 'search',
-            attrs: {
-                url: 'Clients',
-                fields: ['id', 'name'],
-            },
-        },
-    },
-    {
-        align: 'left',
-        label: t('customer.extendedList.tableVisibleColumns.name'),
-        name: 'name',
-        isTitle: true,
-        create: true,
-    },
-    {
-        align: 'left',
-        name: 'socialName',
-        label: t('customer.extendedList.tableVisibleColumns.socialName'),
-        isTitle: true,
-        create: true,
-    },
-    {
-        align: 'left',
-        label: t('customer.extendedList.tableVisibleColumns.fi'),
-        name: 'fi',
-        create: true,
-    },
-    {
-        align: 'left',
-        label: t('customer.extendedList.tableVisibleColumns.salesPersonFk'),
-        name: 'salesPersonFk',
-        component: 'select',
-        attrs: {
-            url: 'Workers/activeWithInheritedRole',
-            fields: ['id', 'name'],
-            where: { role: 'salesPerson' },
-        },
-        create: true,
-        columnField: {
-            component: null,
-        },
-        format: (row, dashIfEmpty) => dashIfEmpty(row.salesPerson),
-    },
-    {
-        align: 'left',
-        label: t('customer.extendedList.tableVisibleColumns.credit'),
-        name: 'credit',
-        component: 'number',
-        columnFilter: {
-            inWhere: true,
-        },
-    },
-    {
-        align: 'left',
-        label: t('customer.extendedList.tableVisibleColumns.creditInsurance'),
-        name: 'creditInsurance',
-        component: 'number',
-        columnFilter: {
-            inWhere: true,
-        },
-    },
-    {
-        align: 'left',
-        label: t('customer.extendedList.tableVisibleColumns.phone'),
-        name: 'phone',
-        cardVisible: true,
-        after: {
-            component: markRaw(VnLinkPhone),
-            props: (prop) => ({
-                'phone-number': prop.phone,
-            }),
-        },
-        component: 'number',
-        columnField: {
-            component: null,
-        },
-    },
-    {
-        align: 'left',
-        label: t('customer.extendedList.tableVisibleColumns.mobile'),
-        name: 'mobile',
-        cardVisible: true,
-        columnFilter: {
-            component: 'number',
-            inWhere: true,
-        },
-    },
-    {
-        align: 'left',
-        label: t('customer.extendedList.tableVisibleColumns.street'),
-        name: 'street',
-        create: true,
-        columnFilter: {
-            inWhere: true,
-        },
-    },
-    {
-        align: 'left',
-        label: t('customer.extendedList.tableVisibleColumns.countryFk'),
-        name: 'countryFk',
-        columnFilter: {
-            component: 'select',
-            inWhere: true,
-            alias: 'c',
-            attrs: {
-                url: 'Countries',
-            },
-        },
-        format: (row, dashIfEmpty) => dashIfEmpty(row.country),
-    },
-    {
-        align: 'left',
-        label: t('customer.extendedList.tableVisibleColumns.provinceFk'),
-        name: 'provinceFk',
-        component: 'select',
-        attrs: {
-            url: 'Provinces',
-        },
-        columnField: {
-            component: null,
-        },
-        format: (row, dashIfEmpty) => dashIfEmpty(row.province),
-    },
-    {
-        align: 'left',
-        label: t('customer.extendedList.tableVisibleColumns.city'),
-        name: 'city',
-    },
-    {
-        align: 'left',
-        label: t('customer.extendedList.tableVisibleColumns.postcode'),
-        name: 'postcode',
-    },
-    {
-        align: 'left',
-        label: t('customer.extendedList.tableVisibleColumns.email'),
-        name: 'email',
-        cardVisible: true,
-    },
-    {
-        align: 'left',
-        label: t('customer.extendedList.tableVisibleColumns.created'),
-        name: 'created',
-        format: ({ created }) => toDate(created),
-        component: 'date',
-        columnFilter: {
-            alias: 'c',
-            inWhere: true,
-        },
-    },
-    {
-        align: 'left',
-        label: t('customer.extendedList.tableVisibleColumns.businessTypeFk'),
-        name: 'businessTypeFk',
-        create: true,
-        component: 'select',
-        attrs: {
-            url: 'BusinessTypes',
-            optionLabel: 'description',
-            optionValue: 'code',
-        },
-        columnField: {
-            component: null,
-        },
-        format: (row, dashIfEmpty) => dashIfEmpty(row.businessType),
-    },
-    {
-        align: 'left',
-        label: t('customer.extendedList.tableVisibleColumns.payMethodFk'),
-        name: 'payMethodFk',
-        columnFilter: {
-            component: 'select',
-            attrs: {
-                url: 'PayMethods',
-            },
-            inWhere: true,
-        },
-        format: (row, dashIfEmpty) => dashIfEmpty(row.payMethod),
-    },
-    {
-        align: 'left',
-        label: t('customer.extendedList.tableVisibleColumns.sageTaxTypeFk'),
-        name: 'sageTaxTypeFk',
-        columnFilter: {
-            component: 'select',
-            attrs: {
-                optionLabel: 'vat',
-                url: 'SageTaxTypes',
-            },
-            alias: 'sti',
-            inWhere: true,
-        },
-        format: (row, dashIfEmpty) => dashIfEmpty(row.sageTaxType),
-    },
-    {
-        align: 'left',
-        label: t('customer.extendedList.tableVisibleColumns.sageTransactionTypeFk'),
-        name: 'sageTransactionTypeFk',
-        columnFilter: {
-            component: 'select',
-            attrs: {
-                optionLabel: 'transaction',
-                url: 'SageTransactionTypes',
-            },
-            alias: 'stt',
-            inWhere: true,
-        },
-        format: (row, dashIfEmpty) => dashIfEmpty(row.sageTransactionType),
-    },
-    {
-        align: 'left',
-        label: t('customer.extendedList.tableVisibleColumns.isActive'),
-        name: 'isActive',
-        chip: {
-            color: null,
-            condition: (value) => !value,
-            icon: 'vn:disabled',
-        },
-        columnFilter: {
-            inWhere: true,
-        },
-    },
-    {
-        align: 'left',
-        label: t('customer.extendedList.tableVisibleColumns.isVies'),
-        name: 'isVies',
-        columnFilter: {
-            inWhere: true,
-        },
-    },
-    {
-        align: 'left',
-        label: t('customer.extendedList.tableVisibleColumns.isTaxDataChecked'),
-        name: 'isTaxDataChecked',
-        columnFilter: {
-            inWhere: true,
-        },
-    },
-    {
-        align: 'left',
-        label: t('customer.extendedList.tableVisibleColumns.isEqualizated'),
-        name: 'isEqualizated',
-        created: true,
-        columnFilter: {
-            inWhere: true,
-        },
-    },
-    {
-        align: 'left',
-        label: t('customer.extendedList.tableVisibleColumns.isFreezed'),
-        name: 'isFreezed',
-        chip: {
-            color: null,
-            condition: (value) => value,
-            icon: 'vn:frozen',
-        },
-        columnFilter: {
-            inWhere: true,
-        },
-    },
-    {
-        align: 'left',
-        label: t('customer.extendedList.tableVisibleColumns.hasToInvoice'),
-        name: 'hasToInvoice',
-        columnFilter: {
-            inWhere: true,
-        },
-    },
-    {
-        align: 'left',
-        label: t('customer.extendedList.tableVisibleColumns.hasToInvoiceByAddress'),
-        name: 'hasToInvoiceByAddress',
-        columnFilter: {
-            inWhere: true,
-        },
-    },
-    {
-        align: 'left',
-        label: t('customer.extendedList.tableVisibleColumns.isToBeMailed'),
-        name: 'isToBeMailed',
-        columnFilter: {
-            inWhere: true,
-        },
-    },
-    {
-        align: 'left',
-        label: t('customer.extendedList.tableVisibleColumns.hasLcr'),
-        name: 'hasLcr',
-        columnFilter: {
-            inWhere: true,
-        },
-    },
-    {
-        align: 'left',
-        label: t('customer.extendedList.tableVisibleColumns.hasCoreVnl'),
-        name: 'hasCoreVnl',
-        columnFilter: {
-            inWhere: true,
-        },
-    },
-    {
-        align: 'left',
-        label: t('customer.extendedList.tableVisibleColumns.hasSepaVnl'),
-        name: 'hasSepaVnl',
-        columnFilter: {
-            inWhere: true,
-        },
-    },
-    {
-        align: 'right',
-        label: '',
-        name: 'tableActions',
-        actions: [
-            {
-                title: t('Client ticket list'),
-                icon: 'vn:ticket',
-                action: redirectToCreateView,
-                isPrimary: true,
-            },
-            {
-                title: t('Client ticket list'),
-                icon: 'preview',
-                action: (row) => viewSummary(row.id, CustomerSummary),
-            },
-        ],
-    },
-]);
-
-const { viewSummary } = useSummaryDialog();
-const redirectToCreateView = (row) => {
-    router.push({
-        name: 'TicketList',
-        query: {
-            params: JSON.stringify({
-                clientFk: row.id,
-            }),
-        },
-    });
-};
-
-function handleLocation(data, location) {
-    const { town, code, provinceFk, countryFk } = location ?? {};
-    data.postcode = code;
-    data.city = town;
-    data.provinceFk = provinceFk;
-    data.countryFk = countryFk;
-}
-</script>
-
-<template>
-    <VnTable
-        ref="tableRef"
-        data-key="CustomerExtendedList"
-        url="Clients/extendedListFilter"
-        url-create="Clients/createWithUser"
-        :create="{
-            urlCreate: 'Clients/createWithUser',
-            title: 'Create client',
-            onDataSaved: ({ id }) => tableRef.redirect(id),
-            formInitialData: {
-                active: true,
-                isEqualizated: false,
-            },
-        }"
-        order="id DESC"
-        :columns="columns"
-        default-mode="table"
-        redirect="customer"
-        auto-load
-    >
-        <template #more-create-dialog="{ data }">
-            <QInput :label="t('Email')" clearable type="email" v-model="data.email">
-                <template #append>
-                    <QIcon name="info" class="cursor-info">
-                        <QTooltip max-width="400px">{{
-                            t('customer.basicData.youCanSaveMultipleEmails')
-                        }}</QTooltip>
-                    </QIcon>
-                </template>
-            </QInput>
-            <QInput v-model="data.userName" :label="t('Web user')" />
-            <VnLocation
-                :roles-allowed-to-create="['deliveryAssistant']"
-                :options="postcodesOptions"
-                v-model="data.location"
-                @update:model-value="(location) => handleLocation(data, location)"
-            >
-            </VnLocation>
-        </template>
-    </VnTable>
-</template>
-
-<style lang="scss" scoped>
-.col-content {
-    border-radius: 4px;
-    padding: 6px;
-}
-</style>
diff --git a/src/pages/Entry/Card/EntryBuys.vue b/src/pages/Entry/Card/EntryBuys.vue
index a378266aa8..b08c40810e 100644
--- a/src/pages/Entry/Card/EntryBuys.vue
+++ b/src/pages/Entry/Card/EntryBuys.vue
@@ -82,6 +82,16 @@ const tableColumnComponents = computed(() => ({
         },
         event: getInputEvents,
     },
+    printedStickers: {
+        component: VnInput,
+        props: {
+            type: 'number',
+            min: 0,
+            class: 'input-number',
+            dense: true,
+        },
+        event: getInputEvents,
+    },
     weight: {
         component: VnInput,
         props: {
@@ -147,7 +157,7 @@ const entriesTableColumns = computed(() => {
     return [
         {
             label: t('entry.summary.item'),
-            field: 'id',
+            field: 'itemFk',
             name: 'item',
             align: 'left',
         },
@@ -169,6 +179,12 @@ const entriesTableColumns = computed(() => {
             name: 'stickers',
             align: 'left',
         },
+        {
+            label: t('entry.buys.printedStickers'),
+            field: 'printedStickers',
+            name: 'printedStickers',
+            align: 'left',
+        },
         {
             label: t('entry.summary.weight'),
             field: 'weight',
@@ -216,7 +232,6 @@ const entriesTableColumns = computed(() => {
 });
 
 const copyOriginalRowsData = (rows) => {
-    // el objetivo de esto es guardar los valores iniciales de todas las rows para evitar guardar cambios si la data no cambió al disparar los eventos
     originalRowDataCopy.value = JSON.parse(JSON.stringify(rows));
 };
 
@@ -386,19 +401,16 @@ const lockIconType = (groupingMode, mode) => {
                                 </template>
                                 <ItemDescriptorProxy
                                     v-if="col.name === 'item'"
-                                    :id="props.row.id"
+                                    :id="props.row.item.id"
                                 />
                             </component>
                         </QTd>
                     </QTr>
-                    <QTr no-hover>
+                    <QTr no-hover class="full-width infoRow" style="column-span: all">
                         <QTd />
-                        <QTd>
+                        <QTd cols>
                             <span>{{ props.row.item.itemType.code }}</span>
                         </QTd>
-                        <QTd>
-                            <span>{{ props.row.item.id }}</span>
-                        </QTd>
                         <QTd>
                             <span>{{ props.row.item.size }}</span>
                         </QTd>
@@ -413,10 +425,6 @@ const lockIconType = (groupingMode, mode) => {
                             <FetchedTags :item="props.row.item" :max-length="5" />
                         </QTd>
                     </QTr>
-                    <!-- Esta última row es utilizada para agregar un espaciado y así marcar una diferencia visual entre los diferentes buys -->
-                    <QTr v-if="props.rowIndex !== rows.length - 1" class="separation-row">
-                        <QTd colspan="12" class="vn-table-separation-row" />
-                    </QTr>
                 </template>
                 <template #item="props">
                     <div class="q-pa-xs col-xs-12 col-sm-6 grid-style-transition">
@@ -466,11 +474,13 @@ const lockIconType = (groupingMode, mode) => {
 </template>
 
 <style lang="scss" scoped>
-.separation-row {
-    background-color: var(--vn-section-color) !important;
+.q-table--horizontal-separator tbody tr:nth-child(odd) > td {
+    border-bottom-width: 0px;
+    border-top-width: 2px;
+    border-color: var(--vn-text-color);
 }
-.grid-style-transition {
-    transition: transform 0.28s, background-color 0.28s;
+.infoRow > td {
+    color: var(--vn-label-color);
 }
 </style>
 
diff --git a/src/pages/Worker/CreateDepartmentChild.vue b/src/pages/Worker/CreateDepartmentChild.vue
index 1f1b1335b2..bde2b480a4 100644
--- a/src/pages/Worker/CreateDepartmentChild.vue
+++ b/src/pages/Worker/CreateDepartmentChild.vue
@@ -40,6 +40,7 @@ onMounted(() => {
 
 <template>
     <FormModel
+        model="createDepartmentChild"
         :form-initial-data="departmentChildData"
         :observe-form-changes="false"
         :default-actions="false"
diff --git a/src/pages/Worker/WorkerDepartmentTree.vue b/src/pages/Worker/WorkerDepartmentTree.vue
index 34340b019b..392539c860 100644
--- a/src/pages/Worker/WorkerDepartmentTree.vue
+++ b/src/pages/Worker/WorkerDepartmentTree.vue
@@ -6,12 +6,11 @@ import { useQuasar } from 'quasar';
 import DepartmentDescriptorProxy from 'src/pages/Department/Card/DepartmentDescriptorProxy.vue';
 import CreateDepartmentChild from './CreateDepartmentChild.vue';
 import axios from 'axios';
-import useNotify from 'src/composables/useNotify.js';
 import { useRouter } from 'vue-router';
+import VnConfirm from 'src/components/ui/VnConfirm.vue';
 
 const quasar = useQuasar();
 const { t } = useI18n();
-const { notify } = useNotify();
 const state = useState();
 const router = useRouter();
 
@@ -62,25 +61,28 @@ const removeNode = (node) => {
     const { id, parentFk } = node;
     quasar
         .dialog({
-            title: t('Are you sure you want to delete it?'),
-            message: t('Delete department'),
-            ok: {
-                push: true,
-                color: 'primary',
+            component: VnConfirm,
+            componentProps: {
+                title: t('Are you sure you want to delete it?'),
+                message: t('Delete department'),
+                promise: () => remove(id),
             },
-            cancel: true,
         })
-        .onOk(async () => {
-            try {
-                await axios.post(`/Departments/${id}/removeChild`, id);
-                notify(t('department.departmentRemoved'), 'positive');
-                await fetchNodeLeaves(parentFk);
-            } catch (err) {
-                console.error('Error removing department');
-            }
-        });
+        .onOk(async () => await fetchNodeLeaves(parentFk));
 };
 
+async function remove(id) {
+    try {
+        await axios.post(`/Departments/${id}/removeChild`, { id });
+        quasar.notify({
+            message: t('department.departmentRemoved'),
+            type: 'positive',
+        });
+    } catch (err) {
+        console.error('Error removing department');
+    }
+}
+
 const showCreateNodeForm = (nodeId) => {
     showCreateNodeFormVal.value = true;
     creationNodeSelectedId.value = nodeId;
diff --git a/src/router/modules/customer.js b/src/router/modules/customer.js
index 092d606396..3aece0dfee 100644
--- a/src/router/modules/customer.js
+++ b/src/router/modules/customer.js
@@ -14,7 +14,6 @@ export default {
         main: [
             'CustomerList',
             'CustomerPayments',
-            'CustomerExtendedList',
             'CustomerNotifications',
             'CustomerDefaulter',
         ],
@@ -70,18 +69,6 @@ export default {
                     component: () =>
                         import('src/pages/Customer/Payments/CustomerPayments.vue'),
                 },
-                {
-                    path: 'extendedList',
-                    name: 'CustomerExtendedList',
-                    meta: {
-                        title: 'extendedList',
-                        icon: 'vn:client',
-                    },
-                    component: () =>
-                        import(
-                            'src/pages/Customer/ExtendedList/CustomerExtendedList.vue'
-                        ),
-                },
                 {
                     path: 'notifications',
                     name: 'CustomerNotifications',