diff --git a/cypress.config.js b/cypress.config.js
index 1924144f6..7e30b38a4 100644
--- a/cypress.config.js
+++ b/cypress.config.js
@@ -38,5 +38,7 @@ export default defineConfig({
         },
         viewportWidth: 1280,
         viewportHeight: 720,
+        defaultCommandTimeout: 10000,
     },
+    defaultCommandTimeout: 10000,
 });
diff --git a/quasar.config.js b/quasar.config.js
index 6d545c026..b83c70bad 100644
--- a/quasar.config.js
+++ b/quasar.config.js
@@ -29,7 +29,16 @@ export default configure(function (/* ctx */) {
         // app boot file (/src/boot)
         // --> boot files are part of "main.js"
         // https://v2.quasar.dev/quasar-cli/boot-files
-        boot: ['i18n', 'axios', 'vnDate', 'validations', 'quasar', 'quasar.defaults'],
+        boot: [
+            'i18n',
+            'axios',
+            'vnDate',
+            'validations',
+            'quasar',
+            'quasar.defaults',
+            'global-components',
+        ],
+        importStrategy: 'auto',
 
         // https://v2.quasar.dev/quasar-cli-vite/quasar-config-js#css
         css: ['app.scss'],
diff --git a/src/boot/global-components.js b/src/boot/global-components.js
new file mode 100644
index 000000000..f83a0975b
--- /dev/null
+++ b/src/boot/global-components.js
@@ -0,0 +1,13 @@
+// src/boot/vn-components.js
+import { defineAsyncComponent } from 'vue';
+
+const components = import.meta.glob('src/components/**/*.vue');
+export default ({ app }) => {
+    for (const path in components) {
+        const componentName = path
+            .split('/')
+            .pop()
+            .replace(/\.\w+$/, '');
+        app.component(componentName, defineAsyncComponent(components[path]));
+    }
+};
diff --git a/src/pages/Account/AccountAccounts.vue b/src/pages/Account/AccountAccounts.vue
index d75f6359f..1aa2d999e 100644
--- a/src/pages/Account/AccountAccounts.vue
+++ b/src/pages/Account/AccountAccounts.vue
@@ -1,9 +1,6 @@
 <script setup>
 import { useI18n } from 'vue-i18n';
 import FormModel from 'components/FormModel.vue';
-import VnRow from 'components/ui/VnRow.vue';
-import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
-import VnInput from 'src/components/common/VnInput.vue';
 import axios from 'axios';
 import useNotify from 'src/composables/useNotify.js';
 
diff --git a/src/pages/Account/AccountAcls.vue b/src/pages/Account/AccountAcls.vue
index 6d3571661..cebece2a4 100644
--- a/src/pages/Account/AccountAcls.vue
+++ b/src/pages/Account/AccountAcls.vue
@@ -4,12 +4,8 @@ import { ref, computed } from 'vue';
 import axios from 'axios';
 import useNotify from 'src/composables/useNotify.js';
 import { useQuasar } from 'quasar';
-
-import VnTable from 'components/VnTable/VnTable.vue';
-import VnConfirm from 'components/ui/VnConfirm.vue';
 import FetchData from 'src/components/FetchData.vue';
 import { useValidator } from 'src/composables/useValidator';
-import VnSection from 'src/components/common/VnSection.vue';
 
 defineProps({
     id: {
diff --git a/src/pages/Account/AccountAliasList.vue b/src/pages/Account/AccountAliasList.vue
index 19682286c..ddc551486 100644
--- a/src/pages/Account/AccountAliasList.vue
+++ b/src/pages/Account/AccountAliasList.vue
@@ -1,10 +1,7 @@
 <script setup>
 import { useI18n } from 'vue-i18n';
 import { ref, computed } from 'vue';
-import VnTable from 'components/VnTable/VnTable.vue';
-import VnSection from 'src/components/common/VnSection.vue';
 import exprBuilder from './Alias/AliasExprBuilder';
-
 const tableRef = ref();
 const { t } = useI18n();
 const dataKey = 'AccountAliasList';
diff --git a/src/pages/Account/AccountConnections.vue b/src/pages/Account/AccountConnections.vue
index a0568acc4..078f31e21 100644
--- a/src/pages/Account/AccountConnections.vue
+++ b/src/pages/Account/AccountConnections.vue
@@ -2,9 +2,7 @@
 import { ref } from 'vue';
 import { useRouter } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-import VnPaginate from 'components/ui/VnPaginate.vue';
 import CardList from 'src/components/ui/CardList.vue';
-import VnLv from 'src/components/ui/VnLv.vue';
 import { toDateTimeFormat } from 'src/filters/date.js';
 import axios from 'axios';
 import useNotify from 'src/composables/useNotify.js';
@@ -80,7 +78,7 @@ const killSession = async ({ userId, created }) => {
                                     openConfirmationModal(
                                         t('Session will be killed'),
                                         t('Are you sure you want to continue?'),
-                                        () => killSession(row)
+                                        () => killSession(row),
                                     )
                                 "
                                 outline
diff --git a/src/pages/Account/AccountCreate.vue b/src/pages/Account/AccountCreate.vue
index b925ff06a..3fb26472e 100644
--- a/src/pages/Account/AccountCreate.vue
+++ b/src/pages/Account/AccountCreate.vue
@@ -3,10 +3,7 @@ import { reactive, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
 import FormModelPopup from 'components/FormModelPopup.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
 import FetchData from 'components/FetchData.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-import VnInputPassword from 'src/components/common/VnInputPassword.vue';
 
 const { t } = useI18n();
 const router = useRouter();
diff --git a/src/pages/Account/AccountFilter.vue b/src/pages/Account/AccountFilter.vue
index 50c3ee1ac..23702be54 100644
--- a/src/pages/Account/AccountFilter.vue
+++ b/src/pages/Account/AccountFilter.vue
@@ -2,9 +2,6 @@
 import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import FetchData from 'components/FetchData.vue';
-import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
-import VnSelect from 'components/common/VnSelect.vue';
-import VnInput from 'src/components/common/VnInput.vue';
 
 const { t } = useI18n();
 const props = defineProps({
diff --git a/src/pages/Account/AccountLdap.vue b/src/pages/Account/AccountLdap.vue
index 4710f961b..dc9a4c6e8 100644
--- a/src/pages/Account/AccountLdap.vue
+++ b/src/pages/Account/AccountLdap.vue
@@ -2,13 +2,9 @@
 import { ref, onMounted, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import FormModel from 'components/FormModel.vue';
-import VnRow from 'components/ui/VnRow.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import { useArrayData } from 'src/composables/useArrayData';
 import useNotify from 'src/composables/useNotify.js';
 import axios from 'axios';
-import VnInputPassword from 'src/components/common/VnInputPassword.vue';
 
 const { t } = useI18n();
 const { notify } = useNotify();
diff --git a/src/pages/Account/AccountList.vue b/src/pages/Account/AccountList.vue
index 976af1d19..786b694f0 100644
--- a/src/pages/Account/AccountList.vue
+++ b/src/pages/Account/AccountList.vue
@@ -1,15 +1,11 @@
 <script setup>
 import { useI18n } from 'vue-i18n';
 import { computed, ref } from 'vue';
-import VnTable from 'components/VnTable/VnTable.vue';
 import AccountSummary from './Card/AccountSummary.vue';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
+import FetchData from 'src/components/FetchData.vue';
 import exprBuilder from './AccountExprBuilder.js';
 import filter from './Card/AccountFilter.js';
-import VnSection from 'src/components/common/VnSection.vue';
-import FetchData from 'src/components/FetchData.vue';
-import VnInputPassword from 'src/components/common/VnInputPassword.vue';
-
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
 const tableRef = ref();
diff --git a/src/pages/Account/AccountSamba.vue b/src/pages/Account/AccountSamba.vue
index 7b36de85f..463112cb1 100644
--- a/src/pages/Account/AccountSamba.vue
+++ b/src/pages/Account/AccountSamba.vue
@@ -2,14 +2,9 @@
 import { ref, onMounted, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import FormModel from 'components/FormModel.vue';
-import VnRow from 'components/ui/VnRow.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import { useArrayData } from 'src/composables/useArrayData';
 import useNotify from 'src/composables/useNotify.js';
 import axios from 'axios';
-import VnInputPassword from 'src/components/common/VnInputPassword.vue';
-
 const { t } = useI18n();
 const { notify } = useNotify();
 const arrayData = useArrayData('AccountSamba');
diff --git a/src/pages/Account/Acls/AclFilter.vue b/src/pages/Account/Acls/AclFilter.vue
index 8035f92b8..3b97e313f 100644
--- a/src/pages/Account/Acls/AclFilter.vue
+++ b/src/pages/Account/Acls/AclFilter.vue
@@ -1,12 +1,7 @@
 <script setup>
 import { ref, onBeforeMount } from 'vue';
 import { useI18n } from 'vue-i18n';
-
 import FetchData from 'components/FetchData.vue';
-import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
-import VnSelect from 'components/common/VnSelect.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-
 import { useValidator } from 'src/composables/useValidator';
 
 const props = defineProps({
diff --git a/src/pages/Account/Acls/AclFormView.vue b/src/pages/Account/Acls/AclFormView.vue
index f39bba888..d21e2b869 100644
--- a/src/pages/Account/Acls/AclFormView.vue
+++ b/src/pages/Account/Acls/AclFormView.vue
@@ -1,11 +1,7 @@
 <script setup>
 import { useI18n } from 'vue-i18n';
 import { ref, onBeforeMount, onMounted } from 'vue';
-
-import VnSelect from 'src/components/common/VnSelect.vue';
-import VnInput from 'src/components/common/VnInput.vue';
 import FormModelPopup from 'components/FormModelPopup.vue';
-
 import { useValidator } from 'src/composables/useValidator';
 import { useArrayData } from 'src/composables/useArrayData';
 
diff --git a/src/pages/Account/Alias/AliasCreateForm.vue b/src/pages/Account/Alias/AliasCreateForm.vue
index e401b6d54..3e2231041 100644
--- a/src/pages/Account/Alias/AliasCreateForm.vue
+++ b/src/pages/Account/Alias/AliasCreateForm.vue
@@ -1,11 +1,7 @@
 <script setup>
 import { useRouter } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-
 import FormModelPopup from 'components/FormModelPopup.vue';
-import VnRow from 'components/ui/VnRow.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-
 import { useArrayData } from 'src/composables/useArrayData';
 
 const router = useRouter();
diff --git a/src/pages/Account/Alias/Card/AliasBasicData.vue b/src/pages/Account/Alias/Card/AliasBasicData.vue
index c78dfb4df..a776a37d0 100644
--- a/src/pages/Account/Alias/Card/AliasBasicData.vue
+++ b/src/pages/Account/Alias/Card/AliasBasicData.vue
@@ -1,9 +1,6 @@
 <script setup>
 import { useI18n } from 'vue-i18n';
-
 import FormModel from 'components/FormModel.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-
 const { t } = useI18n();
 </script>
 
diff --git a/src/pages/Account/Alias/Card/AliasDescriptor.vue b/src/pages/Account/Alias/Card/AliasDescriptor.vue
index a5793407e..e278bcab7 100644
--- a/src/pages/Account/Alias/Card/AliasDescriptor.vue
+++ b/src/pages/Account/Alias/Card/AliasDescriptor.vue
@@ -3,10 +3,8 @@ import { ref, computed } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
-
 import CardDescriptor from 'components/ui/CardDescriptor.vue';
-import VnLv from 'src/components/ui/VnLv.vue';
-
+import useCardDescription from 'src/composables/useCardDescription';
 import axios from 'axios';
 import useNotify from 'src/composables/useNotify.js';
 
diff --git a/src/pages/Account/Alias/Card/AliasSummary.vue b/src/pages/Account/Alias/Card/AliasSummary.vue
index b4b9abd25..19c4c149e 100644
--- a/src/pages/Account/Alias/Card/AliasSummary.vue
+++ b/src/pages/Account/Alias/Card/AliasSummary.vue
@@ -2,10 +2,8 @@
 import { computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-
 import CardSummary from 'components/ui/CardSummary.vue';
-import VnLv from 'src/components/ui/VnLv.vue';
-
+import { useArrayData } from 'src/composables/useArrayData';
 const route = useRoute();
 const { t } = useI18n();
 
diff --git a/src/pages/Account/Alias/Card/AliasUsers.vue b/src/pages/Account/Alias/Card/AliasUsers.vue
index 6a2f6df90..71b9429ea 100644
--- a/src/pages/Account/Alias/Card/AliasUsers.vue
+++ b/src/pages/Account/Alias/Card/AliasUsers.vue
@@ -2,9 +2,6 @@
 import { useRoute } from 'vue-router';
 import { computed, ref, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
-
-import VnPaginate from 'components/ui/VnPaginate.vue';
-
 import { useVnConfirm } from 'composables/useVnConfirm';
 import { useArrayData } from 'composables/useArrayData';
 import useNotify from 'src/composables/useNotify.js';
@@ -57,7 +54,7 @@ watch(
         store.url = urlPath.value;
         store.filter = filter;
         fetchAliases();
-    }
+    },
 );
 
 const fetchAliases = () => paginateRef.value.fetch();
@@ -91,7 +88,7 @@ const fetchAliases = () => paginateRef.value.fetch();
                                             openConfirmationModal(
                                                 t('User will be removed from alias'),
                                                 t('Are you sure you want to continue?'),
-                                                () => deleteAlias(row)
+                                                () => deleteAlias(row),
                                             )
                                         "
                                     >
diff --git a/src/pages/Account/Card/AccountBasicData.vue b/src/pages/Account/Card/AccountBasicData.vue
index 393f9eb80..57adef589 100644
--- a/src/pages/Account/Card/AccountBasicData.vue
+++ b/src/pages/Account/Card/AccountBasicData.vue
@@ -1,8 +1,23 @@
 <script setup>
-import VnSelect from 'src/components/common/VnSelect.vue';
-import VnSelectEnum from 'src/components/common/VnSelectEnum.vue';
+import { useRoute } from 'vue-router';
+import { useI18n } from 'vue-i18n';
 import FormModel from 'components/FormModel.vue';
-import VnInput from 'src/components/common/VnInput.vue';
+import { ref, watch } from 'vue';
+
+const route = useRoute();
+const { t } = useI18n();
+const formModelRef = ref(null);
+
+const accountFilter = {
+    where: { id: route.params.id },
+    fields: ['id', 'email', 'nickname', 'name', 'accountStateFk', 'packages', 'pickup'],
+    include: [],
+};
+
+watch(
+    () => route.params.id,
+    () => formModelRef.value.reset(),
+);
 </script>
 <template>
     <FormModel :url-update="`VnUsers/${$route.params.id}/update-user`" model="Account">
diff --git a/src/pages/Account/Card/AccountDescriptor.vue b/src/pages/Account/Card/AccountDescriptor.vue
index 728d2ced3..92c3da3a0 100644
--- a/src/pages/Account/Card/AccountDescriptor.vue
+++ b/src/pages/Account/Card/AccountDescriptor.vue
@@ -2,10 +2,8 @@
 import { ref, computed, onMounted } from 'vue';
 import { useRoute } from 'vue-router';
 import CardDescriptor from 'components/ui/CardDescriptor.vue';
-import VnLv from 'src/components/ui/VnLv.vue';
+import useCardDescription from 'src/composables/useCardDescription';
 import AccountDescriptorMenu from './AccountDescriptorMenu.vue';
-import VnImg from 'src/components/ui/VnImg.vue';
-import filter from './AccountFilter.js';
 import useHasAccount from 'src/composables/useHasAccount.js';
 
 const $props = defineProps({ id: { type: Number, default: null } });
diff --git a/src/pages/Account/Card/AccountDescriptorMenu.vue b/src/pages/Account/Card/AccountDescriptorMenu.vue
index 3b40f4224..60bca9039 100644
--- a/src/pages/Account/Card/AccountDescriptorMenu.vue
+++ b/src/pages/Account/Card/AccountDescriptorMenu.vue
@@ -7,9 +7,6 @@ import { useRoute } from 'vue-router';
 import { useAcl } from 'src/composables/useAcl';
 import { useArrayData } from 'src/composables/useArrayData';
 import { useState } from 'src/composables/useState';
-import VnConfirm from 'src/components/ui/VnConfirm.vue';
-import VnInputPassword from 'src/components/common/VnInputPassword.vue';
-import VnChangePassword from 'src/components/common/VnChangePassword.vue';
 import { useQuasar } from 'quasar';
 import { useRouter } from 'vue-router';
 import VnCheckbox from 'src/components/common/VnCheckbox.vue';
diff --git a/src/pages/Account/Card/AccountMailAlias.vue b/src/pages/Account/Card/AccountMailAlias.vue
index 7a060cff1..017e8e17b 100644
--- a/src/pages/Account/Card/AccountMailAlias.vue
+++ b/src/pages/Account/Card/AccountMailAlias.vue
@@ -2,10 +2,7 @@
 import { computed, ref, watch, onMounted, nextTick } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
-
-import VnPaginate from 'components/ui/VnPaginate.vue';
 import AccountMailAliasCreateForm from './AccountMailAliasCreateForm.vue';
-
 import { useVnConfirm } from 'composables/useVnConfirm';
 import { useArrayData } from 'composables/useArrayData';
 import useNotify from 'src/composables/useNotify.js';
diff --git a/src/pages/Account/Card/AccountMailAliasCreateForm.vue b/src/pages/Account/Card/AccountMailAliasCreateForm.vue
index f0f69dcba..d4c8d7182 100644
--- a/src/pages/Account/Card/AccountMailAliasCreateForm.vue
+++ b/src/pages/Account/Card/AccountMailAliasCreateForm.vue
@@ -2,14 +2,9 @@
 import { reactive, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
-
-import VnSelect from 'src/components/common/VnSelect.vue';
 import FetchData from 'components/FetchData.vue';
-import VnRow from 'components/ui/VnRow.vue';
 import FormPopup from 'components/FormPopup.vue';
-
 const emit = defineEmits(['onSubmitCreateAlias']);
-
 const { t } = useI18n();
 const route = useRoute();
 
diff --git a/src/pages/Account/Card/AccountMailForwarding.vue b/src/pages/Account/Card/AccountMailForwarding.vue
index 0e5ae3122..80bc9883d 100644
--- a/src/pages/Account/Card/AccountMailForwarding.vue
+++ b/src/pages/Account/Card/AccountMailForwarding.vue
@@ -2,10 +2,6 @@
 import { ref, onMounted, watch, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
-
-import VnInput from 'src/components/common/VnInput.vue';
-import VnRow from 'components/ui/VnRow.vue';
-
 import axios from 'axios';
 import { useStateStore } from 'stores/useStateStore';
 import useNotify from 'src/composables/useNotify.js';
@@ -28,7 +24,7 @@ const loading = ref(false);
 const hasDataChanged = computed(
     () =>
         formData.value.forwardTo !== initialData.value.forwardTo ||
-        initialData.value.hasData !== hasData.value
+        initialData.value.hasData !== hasData.value,
 );
 
 const fetchMailForwards = async () => {
@@ -77,7 +73,7 @@ const setInitialData = async () => {
 
 watch(
     () => route.params.id,
-    () => setInitialData()
+    () => setInitialData(),
 );
 
 onMounted(async () => await setInitialData());
diff --git a/src/pages/Account/Card/AccountPrivileges.vue b/src/pages/Account/Card/AccountPrivileges.vue
index fea57105b..18a31ab4c 100644
--- a/src/pages/Account/Card/AccountPrivileges.vue
+++ b/src/pages/Account/Card/AccountPrivileges.vue
@@ -2,11 +2,8 @@
 import { ref, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
-
 import FetchData from 'components/FetchData.vue';
 import FormModel from 'components/FormModel.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
-
 const { t } = useI18n();
 const route = useRoute();
 
@@ -14,7 +11,7 @@ const rolesOptions = ref([]);
 const formModelRef = ref();
 watch(
     () => route.params.id,
-    () => formModelRef.value.reset()
+    () => formModelRef.value.reset(),
 );
 </script>
 <template>
diff --git a/src/pages/Account/Card/AccountSummary.vue b/src/pages/Account/Card/AccountSummary.vue
index f7a16e8c3..bda256068 100644
--- a/src/pages/Account/Card/AccountSummary.vue
+++ b/src/pages/Account/Card/AccountSummary.vue
@@ -1,6 +1,7 @@
 <script setup>
 import { computed } from 'vue';
 import { useRoute } from 'vue-router';
+import { useI18n } from 'vue-i18n';
 import CardSummary from 'components/ui/CardSummary.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import filter from './AccountFilter.js';
diff --git a/src/pages/Account/InheritedRoles.vue b/src/pages/Account/InheritedRoles.vue
index 2ae857c9b..da386b484 100644
--- a/src/pages/Account/InheritedRoles.vue
+++ b/src/pages/Account/InheritedRoles.vue
@@ -1,7 +1,6 @@
 <script setup>
 import { useRoute, useRouter } from 'vue-router';
 import { computed, ref, watch } from 'vue';
-import VnPaginate from 'components/ui/VnPaginate.vue';
 import { useArrayData } from 'composables/useArrayData';
 
 const props = defineProps({
@@ -44,7 +43,7 @@ watch(
         store.filter = filter.value;
         store.limit = 0;
         fetchSubRoles();
-    }
+    },
 );
 
 const fetchSubRoles = () => paginateRef.value.fetch();
diff --git a/src/pages/Account/Role/AccountRoles.vue b/src/pages/Account/Role/AccountRoles.vue
index 02f5400c6..c11bcef1c 100644
--- a/src/pages/Account/Role/AccountRoles.vue
+++ b/src/pages/Account/Role/AccountRoles.vue
@@ -1,7 +1,6 @@
 <script setup>
 import { useI18n } from 'vue-i18n';
 import { computed, ref } from 'vue';
-import VnTable from 'components/VnTable/VnTable.vue';
 import { useRoute } from 'vue-router';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import RoleSummary from './Card/RoleSummary.vue';
diff --git a/src/pages/Account/Role/AccountRolesFilter.vue b/src/pages/Account/Role/AccountRolesFilter.vue
index cbe7a70c8..6e5b57ae8 100644
--- a/src/pages/Account/Role/AccountRolesFilter.vue
+++ b/src/pages/Account/Role/AccountRolesFilter.vue
@@ -1,7 +1,5 @@
 <script setup>
 import { useI18n } from 'vue-i18n';
-import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
-import VnInput from 'src/components/common/VnInput.vue';
 
 const { t } = useI18n();
 const props = defineProps({
diff --git a/src/pages/Account/Role/Card/InheritedRoles.vue b/src/pages/Account/Role/Card/InheritedRoles.vue
index 95a9eb12a..7e8dde34b 100644
--- a/src/pages/Account/Role/Card/InheritedRoles.vue
+++ b/src/pages/Account/Role/Card/InheritedRoles.vue
@@ -1,9 +1,6 @@
 <script setup>
 import { useRoute, useRouter } from 'vue-router';
 import { computed, ref, watch } from 'vue';
-
-import VnPaginate from 'components/ui/VnPaginate.vue';
-
 import { useArrayData } from 'composables/useArrayData';
 
 const route = useRoute();
@@ -43,7 +40,7 @@ watch(
         store.url = urlPath.value;
         store.filter = filter.value;
         fetchSubRoles();
-    }
+    },
 );
 
 const fetchSubRoles = () => paginateRef.value.fetch();
diff --git a/src/pages/Account/Role/Card/RoleBasicData.vue b/src/pages/Account/Role/Card/RoleBasicData.vue
index de70b0fb6..5bef5c961 100644
--- a/src/pages/Account/Role/Card/RoleBasicData.vue
+++ b/src/pages/Account/Role/Card/RoleBasicData.vue
@@ -1,7 +1,7 @@
 <script setup>
 import FormModel from 'components/FormModel.vue';
-import VnRow from 'components/ui/VnRow.vue';
-import VnInput from 'src/components/common/VnInput.vue';
+const route = useRoute();
+const { t } = useI18n();
 </script>
 <template>
     <FormModel model="Role" auto-load>
diff --git a/src/pages/Account/Role/Card/RoleDescriptor.vue b/src/pages/Account/Role/Card/RoleDescriptor.vue
index dfcc8efc8..63172f261 100644
--- a/src/pages/Account/Role/Card/RoleDescriptor.vue
+++ b/src/pages/Account/Role/Card/RoleDescriptor.vue
@@ -3,7 +3,7 @@ import { computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import CardDescriptor from 'components/ui/CardDescriptor.vue';
-import VnLv from 'src/components/ui/VnLv.vue';
+import useCardDescription from 'src/composables/useCardDescription';
 import axios from 'axios';
 import useNotify from 'src/composables/useNotify.js';
 const $props = defineProps({
diff --git a/src/pages/Account/Role/Card/RoleForm.vue b/src/pages/Account/Role/Card/RoleForm.vue
index 09a098085..596100028 100644
--- a/src/pages/Account/Role/Card/RoleForm.vue
+++ b/src/pages/Account/Role/Card/RoleForm.vue
@@ -2,8 +2,6 @@
 import { useRouter } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import FormModelPopup from 'components/FormModelPopup.vue';
-import VnRow from 'components/ui/VnRow.vue';
-import VnInput from 'src/components/common/VnInput.vue';
 
 const router = useRouter();
 const { t } = useI18n();
diff --git a/src/pages/Account/Role/Card/RoleSummary.vue b/src/pages/Account/Role/Card/RoleSummary.vue
index 410f90b17..a9c63a748 100644
--- a/src/pages/Account/Role/Card/RoleSummary.vue
+++ b/src/pages/Account/Role/Card/RoleSummary.vue
@@ -3,7 +3,7 @@ import { computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import CardSummary from 'components/ui/CardSummary.vue';
-import VnLv from 'src/components/ui/VnLv.vue';
+import { useArrayData } from 'src/composables/useArrayData';
 
 const route = useRoute();
 const { t } = useI18n();
diff --git a/src/pages/Account/Role/Card/SubRoleCreateForm.vue b/src/pages/Account/Role/Card/SubRoleCreateForm.vue
index 8f8214a63..5f0984286 100644
--- a/src/pages/Account/Role/Card/SubRoleCreateForm.vue
+++ b/src/pages/Account/Role/Card/SubRoleCreateForm.vue
@@ -2,9 +2,7 @@
 import { reactive, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
-import VnSelect from 'src/components/common/VnSelect.vue';
 import FetchData from 'components/FetchData.vue';
-import VnRow from 'components/ui/VnRow.vue';
 import FormPopup from 'components/FormPopup.vue';
 
 const emit = defineEmits(['onSubmitCreateSubrole']);
diff --git a/src/pages/Account/Role/Card/SubRoles.vue b/src/pages/Account/Role/Card/SubRoles.vue
index 99cf5e8f0..7b5306a14 100644
--- a/src/pages/Account/Role/Card/SubRoles.vue
+++ b/src/pages/Account/Role/Card/SubRoles.vue
@@ -2,7 +2,6 @@
 import { useRoute, useRouter } from 'vue-router';
 import { computed, ref, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
-import VnPaginate from 'components/ui/VnPaginate.vue';
 import SubRoleCreateForm from './SubRoleCreateForm.vue';
 import { useVnConfirm } from 'composables/useVnConfirm';
 import { useArrayData } from 'composables/useArrayData';
diff --git a/src/pages/Claim/Card/ClaimAction.vue b/src/pages/Claim/Card/ClaimAction.vue
index 8ac7c224f..22328ce5f 100644
--- a/src/pages/Claim/Card/ClaimAction.vue
+++ b/src/pages/Claim/Card/ClaimAction.vue
@@ -8,7 +8,6 @@ import { toDate, toPercentage, toCurrency } from 'filters/index';
 import { tMobile } from 'src/composables/tMobile';
 import CrudModel from 'src/components/CrudModel.vue';
 import FetchData from 'src/components/FetchData.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
 import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
 import TicketDescriptorProxy from 'src/pages/Ticket/Card/TicketDescriptorProxy.vue';
 import { useArrayData } from 'composables/useArrayData';
diff --git a/src/pages/Claim/Card/ClaimBasicData.vue b/src/pages/Claim/Card/ClaimBasicData.vue
index 67034da1a..bf875909d 100644
--- a/src/pages/Claim/Card/ClaimBasicData.vue
+++ b/src/pages/Claim/Card/ClaimBasicData.vue
@@ -2,15 +2,8 @@
 import { ref } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-import VnSelect from 'src/components/common/VnSelect.vue';
-import VnSelectEnum from 'src/components/common/VnSelectEnum.vue';
 import FetchData from 'components/FetchData.vue';
 import FormModel from 'components/FormModel.vue';
-import VnRow from 'components/ui/VnRow.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-import VnInputDate from 'components/common/VnInputDate.vue';
-
-import VnAvatar from 'src/components/ui/VnAvatar.vue';
 
 const route = useRoute();
 const { t } = useI18n();
diff --git a/src/pages/Claim/Card/ClaimCard.vue b/src/pages/Claim/Card/ClaimCard.vue
index 05f3b53a8..d6c324bb9 100644
--- a/src/pages/Claim/Card/ClaimCard.vue
+++ b/src/pages/Claim/Card/ClaimCard.vue
@@ -1,5 +1,4 @@
 <script setup>
-import VnCardBeta from 'components/common/VnCardBeta.vue';
 import ClaimDescriptor from './ClaimDescriptor.vue';
 import filter from './ClaimFilter.js';
 </script>
diff --git a/src/pages/Claim/Card/ClaimDescriptor.vue b/src/pages/Claim/Card/ClaimDescriptor.vue
index 3749b0c7c..84a710570 100644
--- a/src/pages/Claim/Card/ClaimDescriptor.vue
+++ b/src/pages/Claim/Card/ClaimDescriptor.vue
@@ -6,8 +6,7 @@ import { toDateHourMinSec, toPercentage } from 'src/filters';
 import TicketDescriptorProxy from 'pages/Ticket/Card/TicketDescriptorProxy.vue';
 import ClaimDescriptorMenu from 'pages/Claim/Card/ClaimDescriptorMenu.vue';
 import CardDescriptor from 'components/ui/CardDescriptor.vue';
-import VnLv from 'src/components/ui/VnLv.vue';
-import VnUserLink from 'src/components/ui/VnUserLink.vue';
+import useCardDescription from 'src/composables/useCardDescription';
 import { getUrl } from 'src/composables/getUrl';
 import ZoneDescriptorProxy from 'src/pages/Zone/Card/ZoneDescriptorProxy.vue';
 import filter from './ClaimFilter.js';
diff --git a/src/pages/Claim/Card/ClaimDescriptorMenu.vue b/src/pages/Claim/Card/ClaimDescriptorMenu.vue
index d87091887..be20c8225 100644
--- a/src/pages/Claim/Card/ClaimDescriptorMenu.vue
+++ b/src/pages/Claim/Card/ClaimDescriptorMenu.vue
@@ -6,7 +6,6 @@ import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
 import { usePrintService } from 'composables/usePrintService';
 import SendEmailDialog from 'components/common/SendEmailDialog.vue';
-import VnConfirm from 'components/ui/VnConfirm.vue';
 
 const $props = defineProps({
     claim: {
diff --git a/src/pages/Claim/Card/ClaimDevelopment.vue b/src/pages/Claim/Card/ClaimDevelopment.vue
index d17c6b4e6..e60060b93 100644
--- a/src/pages/Claim/Card/ClaimDevelopment.vue
+++ b/src/pages/Claim/Card/ClaimDevelopment.vue
@@ -4,9 +4,7 @@ import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 import CrudModel from 'components/CrudModel.vue';
 import FetchData from 'components/FetchData.vue';
-import VnSelect from 'components/common/VnSelect.vue';
 import { tMobile } from 'composables/tMobile';
-import VnSelectWorker from 'src/components/common/VnSelectWorker.vue';
 
 const route = useRoute();
 
diff --git a/src/pages/Claim/Card/ClaimLines.vue b/src/pages/Claim/Card/ClaimLines.vue
index 27d614049..6c4d26778 100644
--- a/src/pages/Claim/Card/ClaimLines.vue
+++ b/src/pages/Claim/Card/ClaimLines.vue
@@ -9,7 +9,6 @@ import { useArrayData } from 'composables/useArrayData';
 import { toDate, toCurrency, toPercentage } from 'filters/index';
 import CrudModel from 'components/CrudModel.vue';
 import FetchData from 'components/FetchData.vue';
-import VnDiscount from 'components/common/vnDiscount.vue';
 import ClaimLinesImport from './ClaimLinesImport.vue';
 import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
 
diff --git a/src/pages/Claim/Card/ClaimLog.vue b/src/pages/Claim/Card/ClaimLog.vue
index 6cf941688..b0e075af3 100644
--- a/src/pages/Claim/Card/ClaimLog.vue
+++ b/src/pages/Claim/Card/ClaimLog.vue
@@ -1,6 +1,4 @@
-<script setup>
-import VnLog from 'src/components/common/VnLog.vue';
-</script>
+<script setup></script>
 <template>
     <VnLog model="Claim"></VnLog>
 </template>
diff --git a/src/pages/Claim/Card/ClaimNotes.vue b/src/pages/Claim/Card/ClaimNotes.vue
index cc6e33779..52eb05ad0 100644
--- a/src/pages/Claim/Card/ClaimNotes.vue
+++ b/src/pages/Claim/Card/ClaimNotes.vue
@@ -2,7 +2,6 @@
 import { computed, useAttrs } from 'vue';
 import { useRoute } from 'vue-router';
 import { useState } from 'src/composables/useState';
-import VnNotes from 'src/components/ui/VnNotes.vue';
 
 const route = useRoute();
 const state = useState();
diff --git a/src/pages/Claim/Card/ClaimPhoto.vue b/src/pages/Claim/Card/ClaimPhoto.vue
index fb2f818c1..3d643fdae 100644
--- a/src/pages/Claim/Card/ClaimPhoto.vue
+++ b/src/pages/Claim/Card/ClaimPhoto.vue
@@ -5,7 +5,6 @@ import { useQuasar } from 'quasar';
 import { useRouter } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { useSession } from 'composables/useSession';
-import VnConfirm from 'components/ui/VnConfirm.vue';
 import FetchData from 'components/FetchData.vue';
 
 const router = useRouter();
diff --git a/src/pages/Claim/Card/ClaimSummary.vue b/src/pages/Claim/Card/ClaimSummary.vue
index 66fb151e5..7d418b813 100644
--- a/src/pages/Claim/Card/ClaimSummary.vue
+++ b/src/pages/Claim/Card/ClaimSummary.vue
@@ -7,9 +7,6 @@ import { toDate, toCurrency } from 'src/filters';
 import dashIfEmpty from 'src/filters/dashIfEmpty';
 import { useSession } from 'src/composables/useSession';
 
-import VnLv from 'src/components/ui/VnLv.vue';
-import VnUserLink from 'src/components/ui/VnUserLink.vue';
-import VnTitle from 'src/components/common/VnTitle.vue';
 import FetchData from 'components/FetchData.vue';
 import CardSummary from 'components/ui/CardSummary.vue';
 
diff --git a/src/pages/Claim/Card/ClaimSummaryAction.vue b/src/pages/Claim/Card/ClaimSummaryAction.vue
index d875126cb..d746d88f1 100644
--- a/src/pages/Claim/Card/ClaimSummaryAction.vue
+++ b/src/pages/Claim/Card/ClaimSummaryAction.vue
@@ -1,7 +1,6 @@
 <script setup>
 import { useI18n } from 'vue-i18n';
 import { toDate, toPercentage } from 'filters/index';
-import VnTable from 'src/components/VnTable/VnTable.vue';
 import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
 import TicketDescriptorProxy from 'src/pages/Ticket/Card/TicketDescriptorProxy.vue';
 
diff --git a/src/pages/Claim/ClaimFilter.vue b/src/pages/Claim/ClaimFilter.vue
index b4dd4ee1b..52fa4992f 100644
--- a/src/pages/Claim/ClaimFilter.vue
+++ b/src/pages/Claim/ClaimFilter.vue
@@ -3,10 +3,6 @@ import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 
 import FetchData from 'components/FetchData.vue';
-import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
-import VnSelect from 'components/common/VnSelect.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-import VnInputDate from 'components/common/VnInputDate.vue';
 
 const { t } = useI18n();
 const props = defineProps({
diff --git a/src/pages/Claim/ClaimList.vue b/src/pages/Claim/ClaimList.vue
index c05583314..64a9adb85 100644
--- a/src/pages/Claim/ClaimList.vue
+++ b/src/pages/Claim/ClaimList.vue
@@ -4,12 +4,9 @@ import { useI18n } from 'vue-i18n';
 import { toDate } from 'filters/index';
 import ClaimFilter from './ClaimFilter.vue';
 import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
-import VnUserLink from 'src/components/ui/VnUserLink.vue';
 import ClaimSummary from './Card/ClaimSummary.vue';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
-import VnTable from 'src/components/VnTable/VnTable.vue';
 import ZoneDescriptorProxy from '../Zone/Card/ZoneDescriptorProxy.vue';
-import VnSection from 'src/components/common/VnSection.vue';
 
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
diff --git a/src/pages/Customer/Card/CustomerBalance.vue b/src/pages/Customer/Card/CustomerBalance.vue
index 11db92eab..b80db0cd1 100644
--- a/src/pages/Customer/Card/CustomerBalance.vue
+++ b/src/pages/Customer/Card/CustomerBalance.vue
@@ -12,12 +12,6 @@ import { useState } from 'composables/useState';
 import { useStateStore } from 'stores/useStateStore';
 import { usePrintService } from 'composables/usePrintService';
 import { useVnConfirm } from 'composables/useVnConfirm';
-
-import VnTable from 'components/VnTable/VnTable.vue';
-import VnInput from 'components/common/VnInput.vue';
-import VnSubToolbar from 'components/ui/VnSubToolbar.vue';
-import VnFilter from 'components/VnTable/VnFilter.vue';
-
 import CustomerNewPayment from 'src/pages/Customer/components/CustomerNewPayment.vue';
 import InvoiceOutDescriptorProxy from 'src/pages/InvoiceOut/Card/InvoiceOutDescriptorProxy.vue';
 
diff --git a/src/pages/Customer/Card/CustomerBasicData.vue b/src/pages/Customer/Card/CustomerBasicData.vue
index 36ec4763e..4eee05943 100644
--- a/src/pages/Customer/Card/CustomerBasicData.vue
+++ b/src/pages/Customer/Card/CustomerBasicData.vue
@@ -5,10 +5,6 @@ import { useI18n } from 'vue-i18n';
 
 import FetchData from 'components/FetchData.vue';
 import FormModel from 'components/FormModel.vue';
-import VnRow from 'components/ui/VnRow.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
-import VnSelectWorker from 'src/components/common/VnSelectWorker.vue';
 import { getDifferences, getUpdatedValues } from 'src/filters';
 
 const route = useRoute();
@@ -37,7 +33,7 @@ const exprBuilder = (param, value) => {
 function onBeforeSave(formData, originalData) {
     return getUpdatedValues(
         Object.keys(getDifferences(formData, originalData)),
-        formData
+        formData,
     );
 }
 </script>
@@ -160,7 +156,7 @@ function onBeforeSave(formData, originalData) {
                         <QIcon name="info" class="cursor-pointer">
                             <QTooltip>{{
                                 t(
-                                    'In case of a company succession, specify the grantor company'
+                                    'In case of a company succession, specify the grantor company',
                                 )
                             }}</QTooltip>
                         </QIcon>
diff --git a/src/pages/Customer/Card/CustomerBillingData.vue b/src/pages/Customer/Card/CustomerBillingData.vue
index cfea8b070..f99bfcd01 100644
--- a/src/pages/Customer/Card/CustomerBillingData.vue
+++ b/src/pages/Customer/Card/CustomerBillingData.vue
@@ -4,10 +4,6 @@ import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 
 import FormModel from 'components/FormModel.vue';
-import VnRow from 'components/ui/VnRow.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
-import VnSelectDialog from 'src/components/common/VnSelectDialog.vue';
 import CreateBankEntityForm from 'src/components/CreateBankEntityForm.vue';
 
 const { t } = useI18n();
diff --git a/src/pages/Customer/Card/CustomerCard.vue b/src/pages/Customer/Card/CustomerCard.vue
index 75fcb98fa..c6ca44f7b 100644
--- a/src/pages/Customer/Card/CustomerCard.vue
+++ b/src/pages/Customer/Card/CustomerCard.vue
@@ -1,5 +1,4 @@
 <script setup>
-import VnCardBeta from 'components/common/VnCardBeta.vue';
 import CustomerDescriptor from './CustomerDescriptor.vue';
 </script>
 
diff --git a/src/pages/Customer/Card/CustomerConsumption.vue b/src/pages/Customer/Card/CustomerConsumption.vue
index 38582384d..97e61bdc1 100644
--- a/src/pages/Customer/Card/CustomerConsumption.vue
+++ b/src/pages/Customer/Card/CustomerConsumption.vue
@@ -4,8 +4,6 @@ import axios from 'axios';
 import { useI18n } from 'vue-i18n';
 import { dateRange, toDate } from 'src/filters/index';
 import { useRoute } from 'vue-router';
-
-import VnTable from 'components/VnTable/VnTable.vue';
 import FetchedTags from 'components/ui/FetchedTags.vue';
 import { useArrayData } from 'src/composables/useArrayData';
 import { usePrintService } from 'src/composables/usePrintService';
@@ -15,8 +13,6 @@ const { openConfirmationModal } = useVnConfirm();
 const { openReport, sendEmail } = usePrintService();
 import TicketDescriptorProxy from 'src/pages/Ticket/Card/TicketDescriptorProxy.vue';
 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 { t } = useI18n();
diff --git a/src/pages/Customer/Card/CustomerContacts.vue b/src/pages/Customer/Card/CustomerContacts.vue
index d03f71244..d2d7fe883 100644
--- a/src/pages/Customer/Card/CustomerContacts.vue
+++ b/src/pages/Customer/Card/CustomerContacts.vue
@@ -2,11 +2,7 @@
 import { ref } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-
 import CrudModel from 'components/CrudModel.vue';
-import VnRow from 'components/ui/VnRow.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-
 const route = useRoute();
 const { t } = useI18n();
 
diff --git a/src/pages/Customer/Card/CustomerCreditContracts.vue b/src/pages/Customer/Card/CustomerCreditContracts.vue
index a49faeb8d..b2010c44a 100644
--- a/src/pages/Customer/Card/CustomerCreditContracts.vue
+++ b/src/pages/Customer/Card/CustomerCreditContracts.vue
@@ -2,10 +2,7 @@
 import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute, useRouter } from 'vue-router';
-
 import { useQuasar } from 'quasar';
-
-import VnPaginate from 'src/components/ui/VnPaginate.vue';
 import ModalCloseContract from 'src/pages/Customer/components/ModalCloseContract.vue';
 import { toDate } from 'src/filters';
 
diff --git a/src/pages/Customer/Card/CustomerCreditOpinion.vue b/src/pages/Customer/Card/CustomerCreditOpinion.vue
index 51d069744..688d98294 100644
--- a/src/pages/Customer/Card/CustomerCreditOpinion.vue
+++ b/src/pages/Customer/Card/CustomerCreditOpinion.vue
@@ -2,9 +2,7 @@
 import { computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
-
 import { toCurrency, toDateHourMin } from 'src/filters';
-import VnTable from 'src/components/VnTable/VnTable.vue';
 
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
 
diff --git a/src/pages/Customer/Card/CustomerCredits.vue b/src/pages/Customer/Card/CustomerCredits.vue
index d6e4be89e..0d05efcb0 100644
--- a/src/pages/Customer/Card/CustomerCredits.vue
+++ b/src/pages/Customer/Card/CustomerCredits.vue
@@ -3,8 +3,6 @@ import { computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 import { toCurrency, toDateHourMin } from 'src/filters';
-import VnTable from 'components/VnTable/VnTable.vue';
-import VnUserLink from 'src/components/ui/VnUserLink.vue';
 
 const { t } = useI18n();
 const route = useRoute();
diff --git a/src/pages/Customer/Card/CustomerDescriptor.vue b/src/pages/Customer/Card/CustomerDescriptor.vue
index a646ad299..b8d009764 100644
--- a/src/pages/Customer/Card/CustomerDescriptor.vue
+++ b/src/pages/Customer/Card/CustomerDescriptor.vue
@@ -2,14 +2,9 @@
 import { onMounted, ref, computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-
 import { dashIfEmpty, toCurrency, toDate } from 'src/filters';
-
 import useCardDescription from 'src/composables/useCardDescription';
-
 import CardDescriptor from 'components/ui/CardDescriptor.vue';
-import VnLv from 'src/components/ui/VnLv.vue';
-import VnUserLink from 'src/components/ui/VnUserLink.vue';
 import CustomerDescriptorMenu from './CustomerDescriptorMenu.vue';
 import { useState } from 'src/composables/useState';
 const state = useState();
diff --git a/src/pages/Customer/Card/CustomerDescriptorMenu.vue b/src/pages/Customer/Card/CustomerDescriptorMenu.vue
index fb78eab69..12d82242a 100644
--- a/src/pages/Customer/Card/CustomerDescriptorMenu.vue
+++ b/src/pages/Customer/Card/CustomerDescriptorMenu.vue
@@ -1,12 +1,9 @@
 <script setup>
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
-
 import axios from 'axios';
 import { useQuasar } from 'quasar';
-
 import useNotify from 'src/composables/useNotify';
-import VnSmsDialog from 'src/components/common/VnSmsDialog.vue';
 import useOpenURL from 'src/composables/useOpenURL';
 
 const $props = defineProps({
diff --git a/src/pages/Customer/Card/CustomerFiscalData.vue b/src/pages/Customer/Card/CustomerFiscalData.vue
index bd887acb7..e1d6f4082 100644
--- a/src/pages/Customer/Card/CustomerFiscalData.vue
+++ b/src/pages/Customer/Card/CustomerFiscalData.vue
@@ -5,11 +5,6 @@ import { useRoute } from 'vue-router';
 
 import FetchData from 'components/FetchData.vue';
 import FormModel from 'components/FormModel.vue';
-import VnRow from 'components/ui/VnRow.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
-import VnLocation from 'src/components/common/VnLocation.vue';
-import VnCheckbox from 'src/components/common/VnCheckbox.vue';
 
 const { t } = useI18n();
 const route = useRoute();
@@ -114,7 +109,7 @@ function handleLocation(data, location) {
                 <VnCheckbox
                     v-model="data.isVies"
                     :label="t('globals.isVies')"
-                    :info="t('whenActivatingIt')"    
+                    :info="t('whenActivatingIt')"
                 />
             </VnRow>
 
@@ -127,7 +122,7 @@ function handleLocation(data, location) {
             </VnRow>
 
             <VnRow>
-                <VnCheckbox                    
+                <VnCheckbox
                     v-model="data.isEqualizated"
                     :label="t('Is equalizated')"
                     :info="t('inOrderToInvoice')"
diff --git a/src/pages/Customer/Card/CustomerGreuges.vue b/src/pages/Customer/Card/CustomerGreuges.vue
index 47a589aaa..a8aea2e57 100644
--- a/src/pages/Customer/Card/CustomerGreuges.vue
+++ b/src/pages/Customer/Card/CustomerGreuges.vue
@@ -4,7 +4,6 @@ import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 import { toCurrency } from 'src/filters';
 import { toDateTimeFormat } from 'src/filters/date';
-import VnTable from 'components/VnTable/VnTable.vue';
 import FetchData from 'components/FetchData.vue';
 const entityId = computed(() => route.params.id);
 const { t } = useI18n();
diff --git a/src/pages/Customer/Card/CustomerLog.vue b/src/pages/Customer/Card/CustomerLog.vue
index cdf1394b1..0e2282511 100644
--- a/src/pages/Customer/Card/CustomerLog.vue
+++ b/src/pages/Customer/Card/CustomerLog.vue
@@ -1,6 +1,4 @@
-<script setup>
-import VnLog from 'src/components/common/VnLog.vue';
-</script>
+<script setup></script>
 <template>
     <VnLog model="Client" />
 </template>
diff --git a/src/pages/Customer/Card/CustomerMandates.vue b/src/pages/Customer/Card/CustomerMandates.vue
index 66cb44bc2..f6645a173 100644
--- a/src/pages/Customer/Card/CustomerMandates.vue
+++ b/src/pages/Customer/Card/CustomerMandates.vue
@@ -2,10 +2,7 @@
 import { computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
-
 import { toDateTimeFormat } from 'src/filters/date';
-
-import VnTable from 'src/components/VnTable/VnTable.vue';
 import { dashIfEmpty } from 'src/filters';
 
 const { t } = useI18n();
diff --git a/src/pages/Customer/Card/CustomerNotes.vue b/src/pages/Customer/Card/CustomerNotes.vue
index 189b59904..75d9ac46c 100644
--- a/src/pages/Customer/Card/CustomerNotes.vue
+++ b/src/pages/Customer/Card/CustomerNotes.vue
@@ -1,7 +1,6 @@
 <script setup>
 import { computed } from 'vue';
 import { useRoute } from 'vue-router';
-import VnNotes from 'src/components/ui/VnNotes.vue';
 
 const route = useRoute();
 
diff --git a/src/pages/Customer/Card/CustomerRecoveries.vue b/src/pages/Customer/Card/CustomerRecoveries.vue
index 3a8cffff8..7d5d9216f 100644
--- a/src/pages/Customer/Card/CustomerRecoveries.vue
+++ b/src/pages/Customer/Card/CustomerRecoveries.vue
@@ -5,8 +5,6 @@ import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 import { toCurrency, toDate } from 'src/filters';
 
-import VnTable from 'components/VnTable/VnTable.vue';
-
 const { t } = useI18n();
 const route = useRoute();
 const tableRef = ref();
diff --git a/src/pages/Customer/Card/CustomerSamples.vue b/src/pages/Customer/Card/CustomerSamples.vue
index 19a7f8759..353b8cb2a 100644
--- a/src/pages/Customer/Card/CustomerSamples.vue
+++ b/src/pages/Customer/Card/CustomerSamples.vue
@@ -7,7 +7,6 @@ import { QBtn, useQuasar } from 'quasar';
 
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
 import { toDateTimeFormat } from 'src/filters/date';
-import VnTable from 'src/components/VnTable/VnTable.vue';
 import { dashIfEmpty } from 'src/filters';
 import CustomerSamplesCreate from '../components/CustomerSamplesCreate.vue';
 
diff --git a/src/pages/Customer/Card/CustomerSms.vue b/src/pages/Customer/Card/CustomerSms.vue
index 0ad1f8168..0a65e8224 100644
--- a/src/pages/Customer/Card/CustomerSms.vue
+++ b/src/pages/Customer/Card/CustomerSms.vue
@@ -1,7 +1,6 @@
 <script setup>
 import { computed } from 'vue';
 import { useRoute } from 'vue-router';
-import VnSms from 'src/components/ui/VnSms.vue';
 
 const route = useRoute();
 const where = computed(() => {
diff --git a/src/pages/Customer/Card/CustomerSummary.vue b/src/pages/Customer/Card/CustomerSummary.vue
index d2eb125d7..1b5e0b0c5 100644
--- a/src/pages/Customer/Card/CustomerSummary.vue
+++ b/src/pages/Customer/Card/CustomerSummary.vue
@@ -2,16 +2,9 @@
 import { computed, ref } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-import VnUserLink from 'src/components/ui/VnUserLink.vue';
-
 import { toCurrency, toPercentage, toDate, dashOrCurrency } from 'src/filters';
 import CardSummary from 'components/ui/CardSummary.vue';
-import VnLv from 'src/components/ui/VnLv.vue';
-import VnLinkPhone from 'src/components/ui/VnLinkPhone.vue';
-import VnLinkMail from 'src/components/ui/VnLinkMail.vue';
 import CustomerSummaryTable from 'src/pages/Customer/components/CustomerSummaryTable.vue';
-import VnTitle from 'src/components/common/VnTitle.vue';
-import VnRow from 'src/components/ui/VnRow.vue';
 import CustomerDescriptorMenu from './CustomerDescriptorMenu.vue';
 const route = useRoute();
 const { t } = useI18n();
diff --git a/src/pages/Customer/Card/CustomerUnpaid.vue b/src/pages/Customer/Card/CustomerUnpaid.vue
index f76e35821..a16ff59a9 100644
--- a/src/pages/Customer/Card/CustomerUnpaid.vue
+++ b/src/pages/Customer/Card/CustomerUnpaid.vue
@@ -2,11 +2,8 @@
 import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
-import VnInputDate from 'components/common/VnInputDate.vue';
 import FormModel from 'components/FormModel.vue';
 import FetchData from 'components/FetchData.vue';
-import VnInputNumber from 'src/components/common/VnInputNumber.vue';
-import VnRow from 'components/ui/VnRow.vue';
 const formModelRef = ref(false);
 
 const { t } = useI18n();
@@ -50,8 +47,11 @@ const filterClientFindOne = {
         >
             <template #form="{ data }">
                 <VnRow>
-                    <QCheckbox :label="t('Unpaid client')" v-model="data.unpaid"
-                    data-cy="UnpaidCheckBox" />
+                    <QCheckbox
+                        :label="t('Unpaid client')"
+                        v-model="data.unpaid"
+                        data-cy="UnpaidCheckBox"
+                    />
                 </VnRow>
 
                 <VnRow class="row q-gutter-md q-mb-md" v-show="data.unpaid">
diff --git a/src/pages/Customer/Card/CustomerWebAccess.vue b/src/pages/Customer/Card/CustomerWebAccess.vue
index 809f10918..d30ab4d0f 100644
--- a/src/pages/Customer/Card/CustomerWebAccess.vue
+++ b/src/pages/Customer/Card/CustomerWebAccess.vue
@@ -3,7 +3,6 @@ import { computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 import axios from 'axios';
-import VnInput from 'src/components/common/VnInput.vue';
 import FormModel from 'components/FormModel.vue';
 import VnChangePassword from 'src/components/common/VnChangePassword.vue';
 
diff --git a/src/pages/Customer/CustomerCreate.vue b/src/pages/Customer/CustomerCreate.vue
index 79da63283..469f67904 100644
--- a/src/pages/Customer/CustomerCreate.vue
+++ b/src/pages/Customer/CustomerCreate.vue
@@ -1,13 +1,8 @@
 <script setup>
 import { reactive, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
-
 import FetchData from 'components/FetchData.vue';
 import FormModel from 'components/FormModel.vue';
-import VnRow from 'components/ui/VnRow.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
-import VnLocation from 'src/components/common/VnLocation.vue';
-import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 
 const { t } = useI18n();
 
diff --git a/src/pages/Customer/CustomerFilter.vue b/src/pages/Customer/CustomerFilter.vue
index eae97d1be..c5e9b737e 100644
--- a/src/pages/Customer/CustomerFilter.vue
+++ b/src/pages/Customer/CustomerFilter.vue
@@ -1,10 +1,5 @@
-
 <script setup>
 import { useI18n } from 'vue-i18n';
-import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
-import VnSelect from 'components/common/VnSelect.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-import VnSelectWorker from 'src/components/common/VnSelectWorker.vue';
 
 const { t } = useI18n();
 defineProps({
diff --git a/src/pages/Customer/CustomerList.vue b/src/pages/Customer/CustomerList.vue
index 3c638b612..263ebe129 100644
--- a/src/pages/Customer/CustomerList.vue
+++ b/src/pages/Customer/CustomerList.vue
@@ -7,11 +7,7 @@ import { toDate } from 'src/filters';
 
 import CustomerSummary from './Card/CustomerSummary.vue';
 import CustomerFilter from './CustomerFilter.vue';
-import VnTable from 'components/VnTable/VnTable.vue';
-import VnLocation from 'src/components/common/VnLocation.vue';
 import VnLinkPhone from 'src/components/ui/VnLinkPhone.vue';
-import VnSelectWorker from 'src/components/common/VnSelectWorker.vue';
-import VnSection from 'src/components/common/VnSection.vue';
 
 const { t } = useI18n();
 const router = useRouter();
diff --git a/src/pages/Customer/Defaulter/CustomerDefaulter.vue b/src/pages/Customer/Defaulter/CustomerDefaulter.vue
index eca2ad596..c771c7ad4 100644
--- a/src/pages/Customer/Defaulter/CustomerDefaulter.vue
+++ b/src/pages/Customer/Defaulter/CustomerDefaulter.vue
@@ -6,11 +6,8 @@ import { toCurrency, toDate, dateRange } from 'filters/index';
 import CustomerBalanceDueTotal from './CustomerBalanceDueTotal.vue';
 import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
-import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
-import VnInput from 'src/components/common/VnInput.vue';
 import CustomerDefaulterAddObservation from './CustomerDefaulterAddObservation.vue';
 import DepartmentDescriptorProxy from 'src/pages/Department/Card/DepartmentDescriptorProxy.vue';
-import VnTable from 'src/components/VnTable/VnTable.vue';
 import { useArrayData } from 'src/composables/useArrayData';
 
 const { t } = useI18n();
diff --git a/src/pages/Customer/Defaulter/CustomerDefaulterAddObservation.vue b/src/pages/Customer/Defaulter/CustomerDefaulterAddObservation.vue
index 27dfe48e6..d49388b50 100644
--- a/src/pages/Customer/Defaulter/CustomerDefaulterAddObservation.vue
+++ b/src/pages/Customer/Defaulter/CustomerDefaulterAddObservation.vue
@@ -1,14 +1,10 @@
 <script setup>
 import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
-
 import axios from 'axios';
 import { useDialogPluginComponent } from 'quasar';
-
 import useNotify from 'src/composables/useNotify';
 
-import VnRow from 'components/ui/VnRow.vue';
-
 const $props = defineProps({
     clients: {
         type: Array,
diff --git a/src/pages/Customer/Defaulter/CustomerDefaulterFilter.vue b/src/pages/Customer/Defaulter/CustomerDefaulterFilter.vue
index ce86c6435..5f0be6157 100644
--- a/src/pages/Customer/Defaulter/CustomerDefaulterFilter.vue
+++ b/src/pages/Customer/Defaulter/CustomerDefaulterFilter.vue
@@ -2,10 +2,6 @@
 import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import FetchData from 'components/FetchData.vue';
-import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-import VnInputDate from 'src/components/common/VnInputDate.vue';
-import VnSelect from 'components/common/VnSelect.vue';
 
 const { t } = useI18n();
 const props = defineProps({
diff --git a/src/pages/Customer/Notifications/CustomerNotifications.vue b/src/pages/Customer/Notifications/CustomerNotifications.vue
index ce18739b4..5973c6e72 100644
--- a/src/pages/Customer/Notifications/CustomerNotifications.vue
+++ b/src/pages/Customer/Notifications/CustomerNotifications.vue
@@ -2,9 +2,7 @@
 import { ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import CustomerDescriptorProxy from '../Card/CustomerDescriptorProxy.vue';
-import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import CustomerNotificationsCampaignConsumption from './CustomerNotificationsCampaignConsumption.vue';
-import VnTable from 'src/components/VnTable/VnTable.vue';
 
 const { t } = useI18n();
 const dataKey = 'CustomerNotifications';
diff --git a/src/pages/Customer/Notifications/CustomerNotificationsCampaignConsumption.vue b/src/pages/Customer/Notifications/CustomerNotificationsCampaignConsumption.vue
index 6952379ca..75af05331 100644
--- a/src/pages/Customer/Notifications/CustomerNotificationsCampaignConsumption.vue
+++ b/src/pages/Customer/Notifications/CustomerNotificationsCampaignConsumption.vue
@@ -4,9 +4,6 @@ import { useI18n } from 'vue-i18n';
 import axios from 'axios';
 import useNotify from 'src/composables/useNotify';
 import { useValidator } from 'src/composables/useValidator';
-import VnRow from 'components/ui/VnRow.vue';
-import VnSelect from 'components/common/VnSelect.vue';
-import VnInputDate from 'components/common/VnInputDate.vue';
 import FetchData from 'src/components/FetchData.vue';
 import { watch } from 'vue';
 import { onMounted } from 'vue';
diff --git a/src/pages/Customer/Payments/CustomerPayments.vue b/src/pages/Customer/Payments/CustomerPayments.vue
index 25dfcc58a..d72822e8d 100644
--- a/src/pages/Customer/Payments/CustomerPayments.vue
+++ b/src/pages/Customer/Payments/CustomerPayments.vue
@@ -4,9 +4,6 @@ import { computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
 import { toDate, toCurrency } from 'filters/index';
-
-import VnTable from 'src/components/VnTable/VnTable.vue';
-import VnConfirm from 'components/ui/VnConfirm.vue';
 import CustomerDescriptorProxy from '../Card/CustomerDescriptorProxy.vue';
 import CustomerPaymentsFilter from './CustomerPaymentsFilter.vue';
 import RightMenu from 'src/components/common/RightMenu.vue';
diff --git a/src/pages/Customer/Payments/CustomerPaymentsFilter.vue b/src/pages/Customer/Payments/CustomerPaymentsFilter.vue
index 8982cba5a..c6b31c97b 100644
--- a/src/pages/Customer/Payments/CustomerPaymentsFilter.vue
+++ b/src/pages/Customer/Payments/CustomerPaymentsFilter.vue
@@ -1,10 +1,5 @@
 <script setup>
 import { useI18n } from 'vue-i18n';
-import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-import VnInputDate from 'components/common/VnInputDate.vue';
-import VnInputNumber from 'src/components/common/VnInputNumber.vue';
-
 const { t } = useI18n();
 const props = defineProps({
     dataKey: {
diff --git a/src/pages/Customer/components/CustomerAddressCreate.vue b/src/pages/Customer/components/CustomerAddressCreate.vue
index 32b4078db..37203ca8f 100644
--- a/src/pages/Customer/components/CustomerAddressCreate.vue
+++ b/src/pages/Customer/components/CustomerAddressCreate.vue
@@ -3,16 +3,9 @@ import { reactive, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute, useRouter } from 'vue-router';
 
-import VnLocation from 'src/components/common/VnLocation.vue';
 import FetchData from 'components/FetchData.vue';
 import FormModel from 'components/FormModel.vue';
-import VnRow from 'components/ui/VnRow.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
-import VnSelectDialog from 'src/components/common/VnSelectDialog.vue';
 import CustomerNewCustomsAgent from 'src/pages/Customer/components/CustomerNewCustomsAgent.vue';
-import VnInputNumber from 'src/components/common/VnInputNumber.vue';
-
 const { t } = useI18n();
 const route = useRoute();
 const router = useRouter();
diff --git a/src/pages/Customer/components/CustomerAddressEdit.vue b/src/pages/Customer/components/CustomerAddressEdit.vue
index 5b36650f7..a425538ac 100644
--- a/src/pages/Customer/components/CustomerAddressEdit.vue
+++ b/src/pages/Customer/components/CustomerAddressEdit.vue
@@ -4,17 +4,9 @@ import { useI18n } from 'vue-i18n';
 import { useRoute, useRouter } from 'vue-router';
 import { useQuasar } from 'quasar';
 import axios from 'axios';
-import VnLocation from 'src/components/common/VnLocation.vue';
 import FetchData from 'components/FetchData.vue';
 import FormModel from 'components/FormModel.vue';
-import VnRow from 'components/ui/VnRow.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
-import VnSelectDialog from 'src/components/common/VnSelectDialog.vue';
 import CustomerNewCustomsAgent from 'src/pages/Customer/components/CustomerNewCustomsAgent.vue';
-import VnInputNumber from 'src/components/common/VnInputNumber.vue';
-import VnConfirm from 'components/ui/VnConfirm.vue';
-
 const { t } = useI18n();
 const route = useRoute();
 const router = useRouter();
diff --git a/src/pages/Customer/components/CustomerCreditContractsCreate.vue b/src/pages/Customer/components/CustomerCreditContractsCreate.vue
index c25e59e1a..f17f7a4ae 100644
--- a/src/pages/Customer/components/CustomerCreditContractsCreate.vue
+++ b/src/pages/Customer/components/CustomerCreditContractsCreate.vue
@@ -2,11 +2,7 @@
 import { reactive, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute, useRouter } from 'vue-router';
-
 import FormModel from 'components/FormModel.vue';
-import VnRow from 'components/ui/VnRow.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-import VnInputDate from 'src/components/common/VnInputDate.vue';
 
 const { t } = useI18n();
 const route = useRoute();
diff --git a/src/pages/Customer/components/CustomerCreditContractsInsurance.vue b/src/pages/Customer/components/CustomerCreditContractsInsurance.vue
index 70f7cf046..c8b9fbb72 100644
--- a/src/pages/Customer/components/CustomerCreditContractsInsurance.vue
+++ b/src/pages/Customer/components/CustomerCreditContractsInsurance.vue
@@ -2,11 +2,8 @@
 import { computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
-
 import { toCurrency, toDate } from 'src/filters';
 
-import VnTable from 'src/components/VnTable/VnTable.vue';
-
 const { t } = useI18n();
 const route = useRoute();
 
diff --git a/src/pages/Customer/components/CustomerFileManagementCreate.vue b/src/pages/Customer/components/CustomerFileManagementCreate.vue
index f33a47bcc..b3b9d68f9 100644
--- a/src/pages/Customer/components/CustomerFileManagementCreate.vue
+++ b/src/pages/Customer/components/CustomerFileManagementCreate.vue
@@ -2,17 +2,11 @@
 import { onBeforeMount, ref, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute, useRouter } from 'vue-router';
-
 import axios from 'axios';
-
 import { useState } from 'src/composables/useState';
 import { useValidator } from 'src/composables/useValidator';
 import useNotify from 'src/composables/useNotify';
-
 import FetchData from 'components/FetchData.vue';
-import VnRow from 'components/ui/VnRow.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
-import VnInput from 'src/components/common/VnInput.vue';
 
 const { notify } = useNotify();
 const { t } = useI18n();
@@ -224,7 +218,7 @@ const toCustomerFileManagement = () => {
                                     <QTooltip max-width="30rem">
                                         {{
                                             `${t(
-                                                'Allowed content types'
+                                                'Allowed content types',
                                             )}: ${allowedContentTypes.join(', ')}`
                                         }}
                                     </QTooltip>
diff --git a/src/pages/Customer/components/CustomerFileManagementEdit.vue b/src/pages/Customer/components/CustomerFileManagementEdit.vue
index 107f41330..433bf9a5e 100644
--- a/src/pages/Customer/components/CustomerFileManagementEdit.vue
+++ b/src/pages/Customer/components/CustomerFileManagementEdit.vue
@@ -2,16 +2,10 @@
 import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute, useRouter } from 'vue-router';
-
 import axios from 'axios';
-
 import { useValidator } from 'src/composables/useValidator';
 import useNotify from 'src/composables/useNotify';
-
 import FetchData from 'components/FetchData.vue';
-import VnRow from 'components/ui/VnRow.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
-import VnInput from 'src/components/common/VnInput.vue';
 
 const { notify } = useNotify();
 const { t } = useI18n();
@@ -200,7 +194,7 @@ const toCustomerFileManagement = () => {
                                     <QTooltip max-width="30rem">
                                         {{
                                             `${t(
-                                                'Allowed content types'
+                                                'Allowed content types',
                                             )}: ${allowedContentTypes.join(', ')}`
                                         }}
                                     </QTooltip>
diff --git a/src/pages/Customer/components/CustomerNewCustomsAgent.vue b/src/pages/Customer/components/CustomerNewCustomsAgent.vue
index ec9806334..21dce59b9 100644
--- a/src/pages/Customer/components/CustomerNewCustomsAgent.vue
+++ b/src/pages/Customer/components/CustomerNewCustomsAgent.vue
@@ -1,8 +1,5 @@
 <script setup>
 import { useI18n } from 'vue-i18n';
-
-import VnRow from 'components/ui/VnRow.vue';
-import VnInput from 'src/components/common/VnInput.vue';
 import FormModelPopup from 'src/components/FormModelPopup.vue';
 
 const emit = defineEmits(['onDataSaved']);
diff --git a/src/pages/Customer/components/CustomerNewPayment.vue b/src/pages/Customer/components/CustomerNewPayment.vue
index c2c38b55a..c8062fcdd 100644
--- a/src/pages/Customer/components/CustomerNewPayment.vue
+++ b/src/pages/Customer/components/CustomerNewPayment.vue
@@ -5,16 +5,10 @@ import { useRoute } from 'vue-router';
 import axios from 'axios';
 import { getClientRisk } from '../composables/getClientRisk';
 import { useDialogPluginComponent } from 'quasar';
-
 import { usePrintService } from 'composables/usePrintService';
 import useNotify from 'src/composables/useNotify.js';
 import FetchData from 'components/FetchData.vue';
 import FormModel from 'components/FormModel.vue';
-import VnRow from 'components/ui/VnRow.vue';
-import VnInputDate from 'components/common/VnInputDate.vue';
-import VnInputNumber from 'components/common/VnInputNumber.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
-import VnInput from 'src/components/common/VnInput.vue';
 
 const { t } = useI18n();
 const route = useRoute();
@@ -84,7 +78,7 @@ function setPaymentType(accounting) {
     viewReceipt.value = isCash.value;
     if (accountingType.value.daysInFuture)
         initialData.payed.setDate(
-            initialData.payed.getDate() + accountingType.value.daysInFuture
+            initialData.payed.getDate() + accountingType.value.daysInFuture,
         );
     maxAmount.value = accountingType.value && accountingType.value.maxAmount;
 
diff --git a/src/pages/Customer/components/CustomerRecoverieCreate.vue b/src/pages/Customer/components/CustomerRecoverieCreate.vue
index 593b9c5b3..f0c5db718 100644
--- a/src/pages/Customer/components/CustomerRecoverieCreate.vue
+++ b/src/pages/Customer/components/CustomerRecoverieCreate.vue
@@ -2,11 +2,7 @@
 import { onMounted, reactive } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute, useRouter } from 'vue-router';
-
 import FormModel from 'components/FormModel.vue';
-import VnRow from 'components/ui/VnRow.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-import VnInputDate from 'components/common/VnInputDate.vue';
 
 const { t } = useI18n();
 const route = useRoute();
diff --git a/src/pages/Customer/components/CustomerSamplesCreate.vue b/src/pages/Customer/components/CustomerSamplesCreate.vue
index 8d241441d..a083700f2 100644
--- a/src/pages/Customer/components/CustomerSamplesCreate.vue
+++ b/src/pages/Customer/components/CustomerSamplesCreate.vue
@@ -2,20 +2,13 @@
 import { computed, onBeforeMount, reactive, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute, useRouter } from 'vue-router';
-
 import axios from 'axios';
 import { usePrintService } from 'composables/usePrintService';
 import { useDialogPluginComponent, useQuasar } from 'quasar';
-
 import { useState } from 'src/composables/useState';
 import { useValidator } from 'src/composables/useValidator';
 import useNotify from 'src/composables/useNotify';
-
 import FetchData from 'components/FetchData.vue';
-import VnRow from 'components/ui/VnRow.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-import VnInputDate from 'src/components/common/VnInputDate.vue';
 import CustomerSamplesPreview from 'src/pages/Customer/components/CustomerSamplesPreview.vue';
 import FormPopup from 'src/components/FormPopup.vue';
 
diff --git a/src/pages/Customer/components/CustomerSummaryTable.vue b/src/pages/Customer/components/CustomerSummaryTable.vue
index bb6f4442b..b44871320 100644
--- a/src/pages/Customer/components/CustomerSummaryTable.vue
+++ b/src/pages/Customer/components/CustomerSummaryTable.vue
@@ -2,18 +2,13 @@
 import { computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute, useRouter } from 'vue-router';
-
 import { date } from 'quasar';
 import { toDateFormat } from 'src/filters/date.js';
-
 import { dashIfEmpty, toCurrency } from 'src/filters';
-
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import TicketSummary from 'src/pages/Ticket/Card/TicketSummary.vue';
-
 import InvoiceOutDescriptorProxy from 'pages/InvoiceOut/Card/InvoiceOutDescriptorProxy.vue';
 import RouteDescriptorProxy from 'src/pages/Route/Card/RouteDescriptorProxy.vue';
-import VnTable from 'src/components/VnTable/VnTable.vue';
 import CustomerDescriptorProxy from '../Card/CustomerDescriptorProxy.vue';
 
 const { t } = useI18n();
diff --git a/src/pages/Entry/Card/EntryBasicData.vue b/src/pages/Entry/Card/EntryBasicData.vue
index 689eea686..23c17bd44 100644
--- a/src/pages/Entry/Card/EntryBasicData.vue
+++ b/src/pages/Entry/Card/EntryBasicData.vue
@@ -5,14 +5,8 @@ import { useI18n } from 'vue-i18n';
 import { useRole } from 'src/composables/useRole';
 import FetchData from 'components/FetchData.vue';
 import FormModel from 'components/FormModel.vue';
-import VnRow from 'components/ui/VnRow.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
-import VnSelectDialog from 'src/components/common/VnSelectDialog.vue';
 import FilterTravelForm from 'src/components/FilterTravelForm.vue';
-import VnInputNumber from 'src/components/common/VnInputNumber.vue';
 import { toDate } from 'src/filters';
-import VnSelectSupplier from 'src/components/common/VnSelectSupplier.vue';
 
 const route = useRoute();
 const { t } = useI18n();
diff --git a/src/pages/Entry/Card/EntryBuys.vue b/src/pages/Entry/Card/EntryBuys.vue
index 6194ce5b8..8428bf23b 100644
--- a/src/pages/Entry/Card/EntryBuys.vue
+++ b/src/pages/Entry/Card/EntryBuys.vue
@@ -3,14 +3,8 @@ import { ref, computed } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { QBtn } from 'quasar';
-
-import VnPaginate from 'src/components/ui/VnPaginate.vue';
-import VnSelect from 'components/common/VnSelect.vue';
-import VnInput from 'src/components/common/VnInput.vue';
 import FetchedTags from 'components/ui/FetchedTags.vue';
-import VnConfirm from 'components/ui/VnConfirm.vue';
 import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
-import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 
 import { useQuasar } from 'quasar';
 import { toCurrency } from 'src/filters';
@@ -250,7 +244,7 @@ const openRemoveDialog = async () => {
                 message: t(
                     `Are you sure you want to delete this buy${
                         rowsSelected.value.length > 1 ? 's' : ''
-                    }?`
+                    }?`,
                 ),
                 data: rowsSelected.value,
             },
@@ -258,7 +252,7 @@ const openRemoveDialog = async () => {
         .onOk(async () => {
             await deleteBuys();
             const notifyMessage = t(
-                `Buy${rowsSelected.value.length > 1 ? 's' : ''} deleted`
+                `Buy${rowsSelected.value.length > 1 ? 's' : ''} deleted`,
             );
             notify(notifyMessage, 'positive');
         });
@@ -344,7 +338,7 @@ const lockIconType = (groupingMode, mode) => {
                                 v-on="
                                     tableColumnComponents[col.name].event(
                                         col.field,
-                                        props
+                                        props,
                                     )
                                 "
                             >
@@ -369,7 +363,7 @@ const lockIconType = (groupingMode, mode) => {
                                             'font-variation-settings': `'FILL' ${
                                                 lockIconType(
                                                     props.row.groupingMode,
-                                                    col.name
+                                                    col.name,
                                                 ) === 'lock'
                                                     ? 1
                                                     : 0
@@ -425,7 +419,7 @@ const lockIconType = (groupingMode, mode) => {
                                         v-on="
                                             tableColumnComponents[col.name].event(
                                                 col.field,
-                                                props
+                                                props,
                                             )
                                         "
                                         class="full-width"
diff --git a/src/pages/Entry/Card/EntryBuysImport.vue b/src/pages/Entry/Card/EntryBuysImport.vue
index 726fec07d..ed61ce9a9 100644
--- a/src/pages/Entry/Card/EntryBuysImport.vue
+++ b/src/pages/Entry/Card/EntryBuysImport.vue
@@ -2,12 +2,7 @@
 import { ref, computed } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-
-import VnInput from 'src/components/common/VnInput.vue';
-import VnRow from 'components/ui/VnRow.vue';
 import FetchData from 'components/FetchData.vue';
-import VnSelect from 'components/common/VnSelect.vue';
-import VnSelectDialog from 'src/components/common/VnSelectDialog.vue';
 import FilterItemForm from 'src/components/FilterItemForm.vue';
 
 import { useStateStore } from 'stores/useStateStore';
@@ -126,7 +121,7 @@ const fetchBuys = async (buys) => {
     const params = { buys };
     const { data } = await axios.post(
         `Entries/${route.params.id}/importBuysPreview`,
-        params
+        params,
     );
     importData.value.buys = data;
 };
diff --git a/src/pages/Entry/Card/EntryCard.vue b/src/pages/Entry/Card/EntryCard.vue
index be82289f4..15320c395 100644
--- a/src/pages/Entry/Card/EntryCard.vue
+++ b/src/pages/Entry/Card/EntryCard.vue
@@ -1,5 +1,4 @@
 <script setup>
-import VnCardBeta from 'components/common/VnCardBeta.vue';
 import EntryDescriptor from './EntryDescriptor.vue';
 import filter from './EntryFilter.js';
 </script>
diff --git a/src/pages/Entry/Card/EntryDescriptor.vue b/src/pages/Entry/Card/EntryDescriptor.vue
index 19d13e51a..01adfb700 100644
--- a/src/pages/Entry/Card/EntryDescriptor.vue
+++ b/src/pages/Entry/Card/EntryDescriptor.vue
@@ -3,7 +3,6 @@ import { ref, computed, onMounted } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import CardDescriptor from 'components/ui/CardDescriptor.vue';
-import VnLv from 'src/components/ui/VnLv.vue';
 import { toDate } from 'src/filters';
 import { getUrl } from 'src/composables/getUrl';
 import EntryDescriptorMenu from './EntryDescriptorMenu.vue';
diff --git a/src/pages/Entry/Card/EntryDescriptorMenu.vue b/src/pages/Entry/Card/EntryDescriptorMenu.vue
index dc759c7a8..b3a6858de 100644
--- a/src/pages/Entry/Card/EntryDescriptorMenu.vue
+++ b/src/pages/Entry/Card/EntryDescriptorMenu.vue
@@ -5,7 +5,6 @@ import { useQuasar } from 'quasar';
 import axios from 'axios';
 import { usePrintService } from 'composables/usePrintService';
 import useNotify from 'src/composables/useNotify.js';
-import VnConfirm from 'src/components/ui/VnConfirm.vue';
 
 const { openReport } = usePrintService();
 
diff --git a/src/pages/Entry/Card/EntryDms.vue b/src/pages/Entry/Card/EntryDms.vue
index bab1ea6c2..d911d3342 100644
--- a/src/pages/Entry/Card/EntryDms.vue
+++ b/src/pages/Entry/Card/EntryDms.vue
@@ -1,6 +1,4 @@
-<script setup>
-import VnDmsList from 'src/components/common/VnDmsList.vue';
-</script>
+<script setup></script>
 <template>
     <VnDmsList
         model="EntryDms"
diff --git a/src/pages/Entry/Card/EntryLog.vue b/src/pages/Entry/Card/EntryLog.vue
index 930f7dd40..ecfb78212 100644
--- a/src/pages/Entry/Card/EntryLog.vue
+++ b/src/pages/Entry/Card/EntryLog.vue
@@ -1,6 +1,4 @@
-<script setup>
-import VnLog from 'src/components/common/VnLog.vue';
-</script>
+<script setup></script>
 <template>
     <VnLog model="Entry" url="/EntryLogs"></VnLog>
 </template>
diff --git a/src/pages/Entry/Card/EntryNotes.vue b/src/pages/Entry/Card/EntryNotes.vue
index 459c3b069..eab228838 100644
--- a/src/pages/Entry/Card/EntryNotes.vue
+++ b/src/pages/Entry/Card/EntryNotes.vue
@@ -2,11 +2,8 @@
 import { ref, computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-
 import FetchData from 'components/FetchData.vue';
 import CrudModel from 'components/CrudModel.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
 
 const { params } = useRoute();
 const { t } = useI18n();
diff --git a/src/pages/Entry/Card/EntrySummary.vue b/src/pages/Entry/Card/EntrySummary.vue
index 8c46fb6e6..533d24c66 100644
--- a/src/pages/Entry/Card/EntrySummary.vue
+++ b/src/pages/Entry/Card/EntrySummary.vue
@@ -2,19 +2,13 @@
 import { onMounted, ref, computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-
 import CardSummary from 'components/ui/CardSummary.vue';
-import VnLv from 'src/components/ui/VnLv.vue';
 import TravelDescriptorProxy from 'src/pages/Travel/Card/TravelDescriptorProxy.vue';
-
 import { toDate, toCurrency, toCelsius } from 'src/filters';
 import { getUrl } from 'src/composables/getUrl';
 import axios from 'axios';
 import FetchedTags from 'src/components/ui/FetchedTags.vue';
-import VnToSummary from 'src/components/ui/VnToSummary.vue';
 import EntryDescriptorMenu from './EntryDescriptorMenu.vue';
-import VnRow from 'src/components/ui/VnRow.vue';
-import VnTitle from 'src/components/common/VnTitle.vue';
 
 const route = useRoute();
 const { t } = useI18n();
diff --git a/src/pages/Entry/EntryBuysTableDialog.vue b/src/pages/Entry/EntryBuysTableDialog.vue
index 86a9b018f..a7394ced9 100644
--- a/src/pages/Entry/EntryBuysTableDialog.vue
+++ b/src/pages/Entry/EntryBuysTableDialog.vue
@@ -4,7 +4,6 @@ import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { QBtn } from 'quasar';
 
-import VnPaginate from 'src/components/ui/VnPaginate.vue';
 import { usePrintService } from 'composables/usePrintService';
 
 const { openReport } = usePrintService();
@@ -147,7 +146,7 @@ function downloadCSV(rows) {
                                         v-if="props.row.stickers > 0"
                                         @click="
                                             openReport(
-                                                `Entries/${props.row.id}/buy-label-supplier`
+                                                `Entries/${props.row.id}/buy-label-supplier`,
                                             )
                                         "
                                         unelevated
diff --git a/src/pages/Entry/EntryCreate.vue b/src/pages/Entry/EntryCreate.vue
index 358f7631c..085aaf925 100644
--- a/src/pages/Entry/EntryCreate.vue
+++ b/src/pages/Entry/EntryCreate.vue
@@ -4,16 +4,10 @@ import { useI18n } from 'vue-i18n';
 import { useRoute, useRouter } from 'vue-router';
 
 import FormModel from 'components/FormModel.vue';
-import VnRow from 'components/ui/VnRow.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
 import FetchData from 'components/FetchData.vue';
-import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
-import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
-
 import { useStateStore } from 'stores/useStateStore';
 import { useState } from 'src/composables/useState';
 import { toDate } from 'src/filters';
-import VnSelectSupplier from 'src/components/common/VnSelectSupplier.vue';
 
 const state = useState();
 const { t } = useI18n();
diff --git a/src/pages/Entry/EntryFilter.vue b/src/pages/Entry/EntryFilter.vue
index 0f632c0ef..f7ce78fcf 100644
--- a/src/pages/Entry/EntryFilter.vue
+++ b/src/pages/Entry/EntryFilter.vue
@@ -1,13 +1,7 @@
 <script setup>
 import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
-
-import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
-import VnInput from 'src/components/common/VnInput.vue';
 import FetchData from 'components/FetchData.vue';
-import VnInputDate from 'src/components/common/VnInputDate.vue';
-import VnSelectSupplier from 'src/components/common/VnSelectSupplier.vue';
 
 const { t } = useI18n();
 const props = defineProps({
diff --git a/src/pages/Entry/EntryLatestBuys.vue b/src/pages/Entry/EntryLatestBuys.vue
index 73fdcbbbf..1e0671bbf 100644
--- a/src/pages/Entry/EntryLatestBuys.vue
+++ b/src/pages/Entry/EntryLatestBuys.vue
@@ -3,12 +3,8 @@ import { onMounted, onUnmounted, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useStateStore } from 'stores/useStateStore';
 import { toDate } from 'src/filters';
-
-import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import RightMenu from 'src/components/common/RightMenu.vue';
 import EntryLatestBuysFilter from './EntryLatestBuysFilter.vue';
-import VnTable from 'components/VnTable/VnTable.vue';
-import VnImg from 'src/components/ui/VnImg.vue';
 
 const stateStore = useStateStore();
 const { t } = useI18n();
diff --git a/src/pages/Entry/EntryLatestBuysFilter.vue b/src/pages/Entry/EntryLatestBuysFilter.vue
index 235f29dfb..8965f1c62 100644
--- a/src/pages/Entry/EntryLatestBuysFilter.vue
+++ b/src/pages/Entry/EntryLatestBuysFilter.vue
@@ -1,13 +1,7 @@
 <script setup>
 import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
-
 import FetchData from 'components/FetchData.vue';
-import VnInputDate from 'src/components/common/VnInputDate.vue';
-import VnInput from 'components/common/VnInput.vue';
-import VnSelect from 'components/common/VnSelect.vue';
-import ItemsFilterPanel from 'src/components/ItemsFilterPanel.vue';
-import VnSelectSupplier from 'src/components/common/VnSelectSupplier.vue';
 
 const { t } = useI18n();
 
diff --git a/src/pages/Entry/EntryList.vue b/src/pages/Entry/EntryList.vue
index 3172c6d0e..87f5381bf 100644
--- a/src/pages/Entry/EntryList.vue
+++ b/src/pages/Entry/EntryList.vue
@@ -2,13 +2,11 @@
 import { ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import EntryFilter from './EntryFilter.vue';
-import VnTable from 'components/VnTable/VnTable.vue';
 import { toCelsius, toDate } from 'src/filters';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import EntrySummary from './Card/EntrySummary.vue';
 import SupplierDescriptorProxy from 'src/pages/Supplier/Card/SupplierDescriptorProxy.vue';
 import TravelDescriptorProxy from 'src/pages/Travel/Card/TravelDescriptorProxy.vue';
-import VnSection from 'src/components/common/VnSection.vue';
 
 const { t } = useI18n();
 const tableRef = ref();
diff --git a/src/pages/Entry/EntryStockBought.vue b/src/pages/Entry/EntryStockBought.vue
index fa0bdc12e..3eb761803 100644
--- a/src/pages/Entry/EntryStockBought.vue
+++ b/src/pages/Entry/EntryStockBought.vue
@@ -3,15 +3,10 @@ import { ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useState } from 'src/composables/useState';
 import { useQuasar } from 'quasar';
-
-import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import FetchData from 'components/FetchData.vue';
 import FormModelPopup from 'components/FormModelPopup.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-import VnRow from 'components/ui/VnRow.vue';
 import RightMenu from 'src/components/common/RightMenu.vue';
 import EntryStockBoughtFilter from './EntryStockBoughtFilter.vue';
-import VnTable from 'components/VnTable/VnTable.vue';
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
 import EntryStockBoughtDetail from 'src/pages/Entry/EntryStockBoughtDetail.vue';
 
@@ -158,7 +153,7 @@ function round(value) {
                 @on-fetch="
                     (data) => {
                         travel = data.find(
-                            (data) => data.warehouseIn?.code.toLowerCase() === 'vnh'
+                            (data) => data.warehouseIn?.code.toLowerCase() === 'vnh',
                         );
                     }
                 "
diff --git a/src/pages/Entry/EntryStockBoughtDetail.vue b/src/pages/Entry/EntryStockBoughtDetail.vue
index 812171825..851a36e47 100644
--- a/src/pages/Entry/EntryStockBoughtDetail.vue
+++ b/src/pages/Entry/EntryStockBoughtDetail.vue
@@ -1,8 +1,6 @@
 <script setup>
 import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
-
-import VnTable from 'components/VnTable/VnTable.vue';
 import EntryDescriptorProxy from 'src/pages/Entry/Card/EntryDescriptorProxy.vue';
 import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
 
@@ -122,5 +120,5 @@ const columns = [
         Item: Artículo
         Name: Nombre
         Volume: Volumen
-        Packaging: Embalage 
+        Packaging: Embalage
 </i18n>
diff --git a/src/pages/Entry/EntryStockBoughtFilter.vue b/src/pages/Entry/EntryStockBoughtFilter.vue
index 136881f17..fd1a2d20d 100644
--- a/src/pages/Entry/EntryStockBoughtFilter.vue
+++ b/src/pages/Entry/EntryStockBoughtFilter.vue
@@ -3,9 +3,6 @@ import { useI18n } from 'vue-i18n';
 import { onMounted } from 'vue';
 import { useStateStore } from 'stores/useStateStore';
 
-import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
-import VnInputDate from 'src/components/common/VnInputDate.vue';
-
 const { t } = useI18n();
 const props = defineProps({
     dataKey: {
diff --git a/src/pages/Entry/EntryWasteRecalc.vue b/src/pages/Entry/EntryWasteRecalc.vue
index 6ae200ed7..17763b065 100644
--- a/src/pages/Entry/EntryWasteRecalc.vue
+++ b/src/pages/Entry/EntryWasteRecalc.vue
@@ -1,6 +1,5 @@
 <script setup>
 import { ref, computed, watch } from 'vue';
-import VnInputDate from 'components/common/VnInputDate.vue';
 import useNotify from 'src/composables/useNotify.js';
 import axios from 'axios';
 
diff --git a/src/pages/Entry/MyEntries.vue b/src/pages/Entry/MyEntries.vue
index 3f7566ae0..219cc041d 100644
--- a/src/pages/Entry/MyEntries.vue
+++ b/src/pages/Entry/MyEntries.vue
@@ -1,11 +1,9 @@
 <script setup>
 import { computed } from 'vue';
 import { useI18n } from 'vue-i18n';
-import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 import { toDate } from 'src/filters/index';
 import { useQuasar } from 'quasar';
 import EntryBuysTableDialog from './EntryBuysTableDialog.vue';
-import VnTable from 'components/VnTable/VnTable.vue';
 
 const { t } = useI18n();
 const quasar = useQuasar();
diff --git a/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue b/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue
index 905ddebb2..8378c722c 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue
@@ -5,16 +5,10 @@ import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
 import { downloadFile } from 'src/composables/downloadFile';
 import FormModel from 'components/FormModel.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
 import FetchData from 'src/components/FetchData.vue';
-import VnRow from 'components/ui/VnRow.vue';
-import VnInputDate from 'src/components/common/VnInputDate.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-import VnDms from 'src/components/common/VnDms.vue';
-import VnConfirm from 'src/components/ui/VnConfirm.vue';
 import axios from 'axios';
+import VnConfirm from 'src/components/ui/VnConfirm.vue';
 import VnSelectSupplier from 'src/components/common/VnSelectSupplier.vue';
-
 const { t } = useI18n();
 
 const route = useRoute();
@@ -22,7 +16,6 @@ const quasar = useQuasar();
 const editDownloadDisabled = ref(false);
 const userConfig = ref(null);
 const invoiceId = computed(() => +route.params.id);
-
 const expenses = ref([]);
 const currencies = ref([]);
 const currenciesRef = ref();
diff --git a/src/pages/InvoiceIn/Card/InvoiceInCard.vue b/src/pages/InvoiceIn/Card/InvoiceInCard.vue
index 34cc26437..bf20c8247 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInCard.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInCard.vue
@@ -1,5 +1,4 @@
 <script setup>
-import VnCardBeta from 'components/common/VnCardBeta.vue';
 import InvoiceInDescriptor from './InvoiceInDescriptor.vue';
 import { onBeforeRouteUpdate } from 'vue-router';
 import { setRectificative } from '../composables/setRectificative';
diff --git a/src/pages/InvoiceIn/Card/InvoiceInCorrective.vue b/src/pages/InvoiceIn/Card/InvoiceInCorrective.vue
index 1d0a8d078..914d7f7b8 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInCorrective.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInCorrective.vue
@@ -5,7 +5,6 @@ import { useI18n } from 'vue-i18n';
 import { useArrayData } from 'src/composables/useArrayData';
 import CrudModel from 'src/components/CrudModel.vue';
 import FetchData from 'src/components/FetchData.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
 
 const route = useRoute();
 const { t } = useI18n();
diff --git a/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue b/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
index acd55c0fa..5162d9915 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
@@ -4,8 +4,8 @@ import { useRouter, onBeforeRouteUpdate } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import axios from 'axios';
 import { toCurrency, toDate } from 'src/filters';
-import VnLv from 'src/components/ui/VnLv.vue';
 import CardDescriptor from 'components/ui/CardDescriptor.vue';
+import VnLv from 'src/components/ui/VnLv.vue';
 import SupplierDescriptorProxy from 'src/pages/Supplier/Card/SupplierDescriptorProxy.vue';
 import filter from './InvoiceInFilter.js';
 import InvoiceInDescriptorMenu from './InvoiceInDescriptorMenu.vue';
diff --git a/src/pages/InvoiceIn/Card/InvoiceInDescriptorMenu.vue b/src/pages/InvoiceIn/Card/InvoiceInDescriptorMenu.vue
index 8b039ec27..d0f2785eb 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInDescriptorMenu.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInDescriptorMenu.vue
@@ -9,11 +9,10 @@ import { downloadFile } from 'src/composables/downloadFile';
 import { useArrayData } from 'src/composables/useArrayData';
 import { usePrintService } from 'composables/usePrintService';
 import { useCapitalize } from 'src/composables/useCapitalize';
-import VnConfirm from 'src/components/ui/VnConfirm.vue';
 import SendEmailDialog from 'components/common/SendEmailDialog.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
 import InvoiceInToBook from '../InvoiceInToBook.vue';
 import FetchData from 'src/components/FetchData.vue';
+import VnConfirm from 'src/components/ui/VnConfirm.vue';
 
 const { hasAny } = useAcl();
 const { t } = useI18n();
diff --git a/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue b/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue
index 1cad40e0b..aad1ab181 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue
@@ -8,10 +8,7 @@ import { useArrayData } from 'src/composables/useArrayData';
 import { getTotal } from 'src/composables/getTotal';
 import CrudModel from 'src/components/CrudModel.vue';
 import FetchData from 'src/components/FetchData.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
 import useNotify from 'src/composables/useNotify.js';
-import VnInputDate from 'src/components/common/VnInputDate.vue';
-import VnInputNumber from 'src/components/common/VnInputNumber.vue';
 import { toCurrency } from 'filters/index';
 
 const route = useRoute();
diff --git a/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue b/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue
index 6f8642313..7f07cb6d1 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue
@@ -5,8 +5,6 @@ import { useI18n } from 'vue-i18n';
 import { getTotal } from 'src/composables/getTotal';
 import CrudModel from 'src/components/CrudModel.vue';
 import FetchData from 'src/components/FetchData.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
-import VnInputNumber from 'src/components/common/VnInputNumber.vue';
 
 const { t } = useI18n();
 
diff --git a/src/pages/InvoiceIn/Card/InvoiceInLog.vue b/src/pages/InvoiceIn/Card/InvoiceInLog.vue
index e48211546..214253aff 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInLog.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInLog.vue
@@ -1,6 +1,4 @@
-<script setup>
-import VnLog from 'src/components/common/VnLog.vue';
-</script>
+<script setup></script>
 <template>
     <VnLog model="InvoiceIn" />
 </template>
diff --git a/src/pages/InvoiceIn/Card/InvoiceInSummary.vue b/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
index d358601d3..f4cecb01f 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
@@ -6,10 +6,8 @@ import { toCurrency, toDate } from 'src/filters';
 import { useArrayData } from 'src/composables/useArrayData';
 import { getUrl } from 'src/composables/getUrl';
 import CardSummary from 'components/ui/CardSummary.vue';
-import VnLv from 'src/components/ui/VnLv.vue';
 import SupplierDescriptorProxy from 'src/pages/Supplier/Card/SupplierDescriptorProxy.vue';
 import InvoiceIntoBook from '../InvoiceInToBook.vue';
-import VnTitle from 'src/components/common/VnTitle.vue';
 import InvoiceInDescriptorMenu from './InvoiceInDescriptorMenu.vue';
 
 const props = defineProps({ id: { type: [Number, String], default: 0 } });
diff --git a/src/pages/InvoiceIn/Card/InvoiceInVat.vue b/src/pages/InvoiceIn/Card/InvoiceInVat.vue
index e77453bc0..eb72dbf59 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInVat.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInVat.vue
@@ -6,10 +6,7 @@ import { useArrayData } from 'src/composables/useArrayData';
 import { getTotal } from 'src/composables/getTotal';
 import { toCurrency } from 'src/filters';
 import FetchData from 'src/components/FetchData.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
 import CrudModel from 'src/components/CrudModel.vue';
-import VnInputNumber from 'src/components/common/VnInputNumber.vue';
-import VnSelectDialog from 'src/components/common/VnSelectDialog.vue';
 import CreateNewExpenseForm from 'src/components/CreateNewExpenseForm.vue';
 import { getExchange } from 'src/composables/getExchange';
 import { useAccountShortToStandard } from 'src/composables/useAccountShortToStandard';
diff --git a/src/pages/InvoiceIn/InvoiceInCreate.vue b/src/pages/InvoiceIn/InvoiceInCreate.vue
index f6939169f..71d34b91e 100644
--- a/src/pages/InvoiceIn/InvoiceInCreate.vue
+++ b/src/pages/InvoiceIn/InvoiceInCreate.vue
@@ -3,16 +3,9 @@ import { reactive, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute, useRouter } from 'vue-router';
 import FormModel from 'components/FormModel.vue';
-import VnRow from 'components/ui/VnRow.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
 import FetchData from 'components/FetchData.vue';
-import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
-import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 import { useStateStore } from 'stores/useStateStore';
 import { useState } from 'src/composables/useState';
-import VnInputDate from 'src/components/common/VnInputDate.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-import VnSelectSupplier from 'src/components/common/VnSelectSupplier.vue';
 
 const state = useState();
 const { t } = useI18n();
diff --git a/src/pages/InvoiceIn/InvoiceInFilter.vue b/src/pages/InvoiceIn/InvoiceInFilter.vue
index e010a1edb..b2bb103ff 100644
--- a/src/pages/InvoiceIn/InvoiceInFilter.vue
+++ b/src/pages/InvoiceIn/InvoiceInFilter.vue
@@ -1,12 +1,6 @@
 <script setup>
-import VnSelect from 'components/common/VnSelect.vue';
-import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-import VnInputDate from 'components/common/VnInputDate.vue';
-import VnInputNumber from 'src/components/common/VnInputNumber.vue';
 import { dateRange } from 'src/filters';
 import { date } from 'quasar';
-import VnSelectSupplier from 'src/components/common/VnSelectSupplier.vue';
 
 defineProps({ dataKey: { type: String, required: true } });
 const dateFormat = 'YYYY-MM-DDTHH:mm:ss.SSSZ';
diff --git a/src/pages/InvoiceIn/InvoiceInList.vue b/src/pages/InvoiceIn/InvoiceInList.vue
index bcfd4471f..d89901595 100644
--- a/src/pages/InvoiceIn/InvoiceInList.vue
+++ b/src/pages/InvoiceIn/InvoiceInList.vue
@@ -8,13 +8,7 @@ import InvoiceInFilter from './InvoiceInFilter.vue';
 import InvoiceInSummary from './Card/InvoiceInSummary.vue';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import SupplierDescriptorProxy from 'src/pages/Supplier/Card/SupplierDescriptorProxy.vue';
-import VnTable from 'src/components/VnTable/VnTable.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-import VnInputDate from 'src/components/common/VnInputDate.vue';
 import FetchData from 'src/components/FetchData.vue';
-import VnSection from 'src/components/common/VnSection.vue';
-import VnSelectSupplier from 'src/components/common/VnSelectSupplier.vue';
 
 const user = useState().getUser();
 const { viewSummary } = useSummaryDialog();
diff --git a/src/pages/InvoiceIn/InvoiceInToBook.vue b/src/pages/InvoiceIn/InvoiceInToBook.vue
index 5bdbe197b..ddb8e61d0 100644
--- a/src/pages/InvoiceIn/InvoiceInToBook.vue
+++ b/src/pages/InvoiceIn/InvoiceInToBook.vue
@@ -2,7 +2,6 @@
 import axios from 'axios';
 import { useQuasar } from 'quasar';
 import { useI18n } from 'vue-i18n';
-import VnConfirm from 'src/components/ui/VnConfirm.vue';
 import { useArrayData } from 'src/composables/useArrayData';
 import qs from 'qs';
 const { notify, dialog } = useQuasar();
diff --git a/src/pages/InvoiceIn/Serial/InvoiceInSerial.vue b/src/pages/InvoiceIn/Serial/InvoiceInSerial.vue
index a8fb3b0c8..7459846d8 100644
--- a/src/pages/InvoiceIn/Serial/InvoiceInSerial.vue
+++ b/src/pages/InvoiceIn/Serial/InvoiceInSerial.vue
@@ -3,7 +3,6 @@ import { ref, computed, onBeforeMount } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import axios from 'axios';
-import VnTable from 'src/components/VnTable/VnTable.vue';
 import RightMenu from 'src/components/common/RightMenu.vue';
 import InvoiceInSerialFilter from './InvoiceInSerialFilter.vue';
 
diff --git a/src/pages/InvoiceIn/Serial/InvoiceInSerialFilter.vue b/src/pages/InvoiceIn/Serial/InvoiceInSerialFilter.vue
index 19ed73e50..f481bcddd 100644
--- a/src/pages/InvoiceIn/Serial/InvoiceInSerialFilter.vue
+++ b/src/pages/InvoiceIn/Serial/InvoiceInSerialFilter.vue
@@ -1,8 +1,5 @@
 <script setup>
 import { useI18n } from 'vue-i18n';
-import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-import VnInputNumber from 'src/components/common/VnInputNumber.vue';
 defineProps({ dataKey: { type: String, required: true } });
 
 const { t } = useI18n();
diff --git a/src/pages/InvoiceOut/Card/InvoiceOutCard.vue b/src/pages/InvoiceOut/Card/InvoiceOutCard.vue
index a50c9d247..30599fc2e 100644
--- a/src/pages/InvoiceOut/Card/InvoiceOutCard.vue
+++ b/src/pages/InvoiceOut/Card/InvoiceOutCard.vue
@@ -1,6 +1,5 @@
 <script setup>
 import InvoiceOutDescriptor from './InvoiceOutDescriptor.vue';
-import VnCardBeta from 'components/common/VnCardBeta.vue';
 import filter from './InvoiceOutFilter.js';
 </script>
 <template>
diff --git a/src/pages/InvoiceOut/Card/InvoiceOutDescriptor.vue b/src/pages/InvoiceOut/Card/InvoiceOutDescriptor.vue
index de614e9fc..ec899615a 100644
--- a/src/pages/InvoiceOut/Card/InvoiceOutDescriptor.vue
+++ b/src/pages/InvoiceOut/Card/InvoiceOutDescriptor.vue
@@ -2,12 +2,10 @@
 import { ref, computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-
 import CardDescriptor from 'components/ui/CardDescriptor.vue';
 import CustomerDescriptorProxy from 'pages/Customer/Card/CustomerDescriptorProxy.vue';
-import VnLv from 'src/components/ui/VnLv.vue';
 import InvoiceOutDescriptorMenu from './InvoiceOutDescriptorMenu.vue';
-
+import useCardDescription from 'src/composables/useCardDescription';
 import { toCurrency, toDate } from 'src/filters';
 import filter from './InvoiceOutFilter.js';
 
diff --git a/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue b/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue
index 3ceb447dd..b306f62b8 100644
--- a/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue
+++ b/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue
@@ -5,11 +5,9 @@ import { useI18n } from 'vue-i18n';
 import axios from 'axios';
 import { toCurrency, toDate, toPercentage } from 'src/filters';
 import CardSummary from 'components/ui/CardSummary.vue';
-import VnLv from 'src/components/ui/VnLv.vue';
 import { getUrl } from 'src/composables/getUrl';
 import TicketDescriptorProxy from 'src/pages/Ticket/Card/TicketDescriptorProxy.vue';
 import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
-import VnTitle from 'src/components/common/VnTitle.vue';
 import InvoiceOutDescriptorMenu from './InvoiceOutDescriptorMenu.vue';
 
 onMounted(async () => {
diff --git a/src/pages/InvoiceOut/InvoiceOutFilter.vue b/src/pages/InvoiceOut/InvoiceOutFilter.vue
index cdc9f037a..4a8f6ae4c 100644
--- a/src/pages/InvoiceOut/InvoiceOutFilter.vue
+++ b/src/pages/InvoiceOut/InvoiceOutFilter.vue
@@ -1,12 +1,7 @@
 <script setup>
 import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
-
 import FetchData from 'components/FetchData.vue';
-import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-import VnInputDate from 'components/common/VnInputDate.vue';
-import VnInputNumber from 'src/components/common/VnInputNumber.vue';
 
 const { t } = useI18n();
 const props = defineProps({
diff --git a/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue b/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue
index 392256473..9959f4b3b 100644
--- a/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue
+++ b/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue
@@ -2,11 +2,7 @@
 import { onMounted, ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { storeToRefs } from 'pinia';
-
 import FetchData from 'components/FetchData.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
-import VnInputDate from 'components/common/VnInputDate.vue';
-
 import { useInvoiceOutGlobalStore } from 'src/stores/invoiceOutGlobal.js';
 
 const { t } = useI18n();
@@ -26,7 +22,7 @@ const serialTypesOptions = ref([]);
 
 const handleInvoiceOutSerialsFetch = (data) => {
     serialTypesOptions.value = Array.from(
-        new Set(data.map((item) => item.type).filter((type) => type))
+        new Set(data.map((item) => item.type).filter((type) => type)),
     );
 };
 
diff --git a/src/pages/InvoiceOut/InvoiceOutList.vue b/src/pages/InvoiceOut/InvoiceOutList.vue
index c7d7ba9f4..59a0a6684 100644
--- a/src/pages/InvoiceOut/InvoiceOutList.vue
+++ b/src/pages/InvoiceOut/InvoiceOutList.vue
@@ -1,23 +1,14 @@
 <script setup>
 import { ref, computed, watchEffect } from 'vue';
 import { useI18n } from 'vue-i18n';
-import VnSelect from 'src/components/common/VnSelect.vue';
-import VnInputDate from 'src/components/common/VnInputDate.vue';
-import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import { usePrintService } from 'src/composables/usePrintService';
-import VnTable from 'src/components/VnTable/VnTable.vue';
 import InvoiceOutSummary from './Card/InvoiceOutSummary.vue';
 import { toCurrency, toDate } from 'src/filters/index';
 import { QBtn } from 'quasar';
 import axios from 'axios';
 import InvoiceOutFilter from './InvoiceOutFilter.vue';
-import VnRow from 'src/components/ui/VnRow.vue';
-import VnRadio from 'src/components/common/VnRadio.vue';
-import VnInput from 'src/components/common/VnInput.vue';
 import CustomerDescriptorProxy from '../Customer/Card/CustomerDescriptorProxy.vue';
-import VnSection from 'src/components/common/VnSection.vue';
-
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
 const tableRef = ref();
diff --git a/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue b/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue
index 135eb9aca..5b7beea46 100644
--- a/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue
+++ b/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue
@@ -1,15 +1,12 @@
 <script setup>
 import { computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
-import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import { toCurrency } from 'src/filters';
-import VnTable from 'src/components/VnTable/VnTable.vue';
 import { useInvoiceOutGlobalStore } from 'src/stores/invoiceOutGlobal.js';
 import { useArrayData } from 'src/composables/useArrayData';
 import CustomerDescriptorProxy from '../Customer/Card/CustomerDescriptorProxy.vue';
 import TicketDescriptorProxy from '../Ticket/Card/TicketDescriptorProxy.vue';
 import WorkerDescriptorProxy from '../Worker/Card/WorkerDescriptorProxy.vue';
-import VnInputDate from 'components/common/VnInputDate.vue';
 
 const { t } = useI18n();
 const tableRef = ref();
@@ -142,7 +139,7 @@ const downloadCSV = async () => {
     await invoiceOutGlobalStore.getNegativeBasesCsv(
         userParams.from,
         userParams.to,
-        filterParams
+        filterParams,
     );
 };
 </script>
diff --git a/src/pages/InvoiceOut/InvoiceOutNegativeBasesFilter.vue b/src/pages/InvoiceOut/InvoiceOutNegativeBasesFilter.vue
index 6ceec61e4..25ab22b42 100644
--- a/src/pages/InvoiceOut/InvoiceOutNegativeBasesFilter.vue
+++ b/src/pages/InvoiceOut/InvoiceOutNegativeBasesFilter.vue
@@ -1,11 +1,5 @@
 <script setup>
 import { useI18n } from 'vue-i18n';
-
-import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-import VnInputDate from 'components/common/VnInputDate.vue';
-import VnInputNumber from 'src/components/common/VnInputNumber.vue';
-
 const { t } = useI18n();
 const props = defineProps({
     dataKey: {
diff --git a/src/pages/Item/Card/CreateGenusForm.vue b/src/pages/Item/Card/CreateGenusForm.vue
index 66f5130d4..feb768068 100644
--- a/src/pages/Item/Card/CreateGenusForm.vue
+++ b/src/pages/Item/Card/CreateGenusForm.vue
@@ -1,9 +1,6 @@
 <script setup>
 import { reactive, ref, onMounted, nextTick } from 'vue';
 import { useI18n } from 'vue-i18n';
-import VnInput from 'src/components/common/VnInput.vue';
-
-import VnRow from 'components/ui/VnRow.vue';
 import FormModelPopup from 'components/FormModelPopup.vue';
 
 const { t } = useI18n();
diff --git a/src/pages/Item/Card/CreateIntrastatForm.vue b/src/pages/Item/Card/CreateIntrastatForm.vue
index 443615d7e..eed4ce63c 100644
--- a/src/pages/Item/Card/CreateIntrastatForm.vue
+++ b/src/pages/Item/Card/CreateIntrastatForm.vue
@@ -2,9 +2,6 @@
 import { reactive, ref, onMounted, nextTick } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
-
-import VnInput from 'src/components/common/VnInput.vue';
-import VnRow from 'components/ui/VnRow.vue';
 import FormModelPopup from 'components/FormModelPopup.vue';
 
 const { t } = useI18n();
diff --git a/src/pages/Item/Card/CreateSpecieForm.vue b/src/pages/Item/Card/CreateSpecieForm.vue
index 120544fd9..b5e42627f 100644
--- a/src/pages/Item/Card/CreateSpecieForm.vue
+++ b/src/pages/Item/Card/CreateSpecieForm.vue
@@ -1,9 +1,6 @@
 <script setup>
 import { reactive, ref, onMounted, nextTick } from 'vue';
 import { useI18n } from 'vue-i18n';
-import VnInput from 'src/components/common/VnInput.vue';
-
-import VnRow from 'components/ui/VnRow.vue';
 import FormModelPopup from 'components/FormModelPopup.vue';
 
 const { t } = useI18n();
diff --git a/src/pages/Item/Card/ItemBarcode.vue b/src/pages/Item/Card/ItemBarcode.vue
index 590b524cd..6a0ac18bb 100644
--- a/src/pages/Item/Card/ItemBarcode.vue
+++ b/src/pages/Item/Card/ItemBarcode.vue
@@ -3,9 +3,7 @@ import { ref, nextTick } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import axios from 'axios';
-
 import CrudModel from 'src/components/CrudModel.vue';
-import VnInput from 'src/components/common/VnInput.vue';
 import useNotify from 'src/composables/useNotify.js';
 
 const route = useRoute();
diff --git a/src/pages/Item/Card/ItemBasicData.vue b/src/pages/Item/Card/ItemBasicData.vue
index df7e71684..9d059671f 100644
--- a/src/pages/Item/Card/ItemBasicData.vue
+++ b/src/pages/Item/Card/ItemBasicData.vue
@@ -2,13 +2,8 @@
 import { ref } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-
 import FetchData from 'components/FetchData.vue';
 import FormModel from 'components/FormModel.vue';
-import VnRow from 'components/ui/VnRow.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
-import VnSelectDialog from 'src/components/common/VnSelectDialog.vue';
 import FilterItemForm from 'src/components/FilterItemForm.vue';
 import CreateIntrastatForm from './CreateIntrastatForm.vue';
 import VnCheckbox from 'src/components/common/VnCheckbox.vue';
diff --git a/src/pages/Item/Card/ItemBotanical.vue b/src/pages/Item/Card/ItemBotanical.vue
index 4894d94fc..d17f11f25 100644
--- a/src/pages/Item/Card/ItemBotanical.vue
+++ b/src/pages/Item/Card/ItemBotanical.vue
@@ -5,8 +5,6 @@ import { useI18n } from 'vue-i18n';
 
 import FetchData from 'components/FetchData.vue';
 import FormModel from 'components/FormModel.vue';
-import VnRow from 'components/ui/VnRow.vue';
-import VnSelectDialog from 'src/components/common/VnSelectDialog.vue';
 import CreateGenusForm from './CreateGenusForm.vue';
 import CreateSpecieForm from './CreateSpecieForm.vue';
 
diff --git a/src/pages/Item/Card/ItemCard.vue b/src/pages/Item/Card/ItemCard.vue
index 610b77a02..597acf10a 100644
--- a/src/pages/Item/Card/ItemCard.vue
+++ b/src/pages/Item/Card/ItemCard.vue
@@ -1,5 +1,4 @@
 <script setup>
-import VnCardBeta from 'components/common/VnCardBeta.vue';
 import ItemDescriptor from './ItemDescriptor.vue';
 </script>
 <template>
diff --git a/src/pages/Item/Card/ItemDescriptor.vue b/src/pages/Item/Card/ItemDescriptor.vue
index 7e7057a90..5c5a639b1 100644
--- a/src/pages/Item/Card/ItemDescriptor.vue
+++ b/src/pages/Item/Card/ItemDescriptor.vue
@@ -2,9 +2,7 @@
 import { computed, ref, onMounted } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-
 import CardDescriptor from 'src/components/ui/CardDescriptor.vue';
-import VnLv from 'src/components/ui/VnLv.vue';
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
 import ItemDescriptorImage from 'src/pages/Item/Card/ItemDescriptorImage.vue';
 import axios from 'axios';
diff --git a/src/pages/Item/Card/ItemDescriptorImage.vue b/src/pages/Item/Card/ItemDescriptorImage.vue
index a887964e9..15edec3a0 100644
--- a/src/pages/Item/Card/ItemDescriptorImage.vue
+++ b/src/pages/Item/Card/ItemDescriptorImage.vue
@@ -1,9 +1,7 @@
 <script setup>
 import { ref, onMounted } from 'vue';
 import { useI18n } from 'vue-i18n';
-
 import EditPictureForm from 'components/EditPictureForm.vue';
-import VnImg from 'src/components/ui/VnImg.vue';
 import axios from 'axios';
 
 const $props = defineProps({
diff --git a/src/pages/Item/Card/ItemDiary.vue b/src/pages/Item/Card/ItemDiary.vue
index 4b6775183..b5c1ed9c2 100644
--- a/src/pages/Item/Card/ItemDiary.vue
+++ b/src/pages/Item/Card/ItemDiary.vue
@@ -9,16 +9,12 @@ import OrderDescriptorProxy from 'src/pages/Order/Card/OrderDescriptorProxy.vue'
 import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
 import SupplierDescriptorProxy from 'src/pages/Supplier/Card/SupplierDescriptorProxy.vue';
 import FetchData from 'components/FetchData.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
-import VnInputDate from 'src/components/common/VnInputDate.vue';
-
 import { toDateFormat } from 'src/filters/date.js';
 import { dashIfEmpty } from 'src/filters';
 import { date } from 'quasar';
 import { useState } from 'src/composables/useState';
 import { useArrayData } from 'src/composables/useArrayData';
 import axios from 'axios';
-import VnSubToolbar from 'components/ui/VnSubToolbar.vue';
 
 const { t } = useI18n();
 const route = useRoute();
@@ -313,8 +309,8 @@ async function updateWarehouse(warehouseFk) {
                             row.lineFk == row.lastPreparedLineFk
                                 ? 'black'
                                 : row.balance < 0
-                                ? 'negative'
-                                : ''
+                                  ? 'negative'
+                                  : ''
                         "
                         dense
                         style="font-size: 14px"
diff --git a/src/pages/Item/Card/ItemLastEntries.vue b/src/pages/Item/Card/ItemLastEntries.vue
index 7d8890c2b..1bdd95b88 100644
--- a/src/pages/Item/Card/ItemLastEntries.vue
+++ b/src/pages/Item/Card/ItemLastEntries.vue
@@ -4,12 +4,9 @@ import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 import { dateRange } from 'src/filters';
 import EntryDescriptorProxy from 'src/pages/Entry/Card/EntryDescriptorProxy.vue';
-import VnInputDate from 'src/components/common/VnInputDate.vue';
-import VnDateBadge from 'src/components/common/VnDateBadge.vue';
 import { dashIfEmpty } from 'src/filters';
 import { toCurrency } from 'filters/index';
 import { useArrayData } from 'composables/useArrayData';
-import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import SupplierDescriptorProxy from 'src/pages/Supplier/Card/SupplierDescriptorProxy.vue';
 
 const { t } = useI18n();
diff --git a/src/pages/Item/Card/ItemLog.vue b/src/pages/Item/Card/ItemLog.vue
index 4da8063c5..1fab8a8a5 100644
--- a/src/pages/Item/Card/ItemLog.vue
+++ b/src/pages/Item/Card/ItemLog.vue
@@ -1,6 +1,4 @@
-<script setup>
-import VnLog from 'src/components/common/VnLog.vue';
-</script>
+<script setup></script>
 
 <template>
     <VnLog model="Item" url="/ItemLogs"></VnLog>
diff --git a/src/pages/Item/Card/ItemShelving.vue b/src/pages/Item/Card/ItemShelving.vue
index 7ad60c9e0..09f0beb20 100644
--- a/src/pages/Item/Card/ItemShelving.vue
+++ b/src/pages/Item/Card/ItemShelving.vue
@@ -9,7 +9,6 @@ import useNotify from 'src/composables/useNotify.js';
 import { useVnConfirm } from 'composables/useVnConfirm';
 import axios from 'axios';
 import { useStateStore } from 'stores/useStateStore';
-import VnTable from 'src/components/VnTable/VnTable.vue';
 
 const stateStore = useStateStore();
 
@@ -113,7 +112,7 @@ const columns = computed(() => [
 ]);
 
 const totalLabels = computed(() =>
-    rows.value.reduce((acc, row) => acc + row.stock / row.packing, 0).toFixed(2)
+    rows.value.reduce((acc, row) => acc + row.stock / row.packing, 0).toFixed(2),
 );
 
 const removeLines = async () => {
@@ -157,7 +156,7 @@ watchEffect(selectedRows);
                     openConfirmationModal(
                         t('shelvings.removeConfirmTitle'),
                         t('shelvings.removeConfirmSubtitle'),
-                        removeLines
+                        removeLines,
                     )
                 "
             >
diff --git a/src/pages/Item/Card/ItemSummary.vue b/src/pages/Item/Card/ItemSummary.vue
index bc828bbf6..d19b1e5ee 100644
--- a/src/pages/Item/Card/ItemSummary.vue
+++ b/src/pages/Item/Card/ItemSummary.vue
@@ -2,12 +2,9 @@
 import { computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-
 import CardSummary from 'components/ui/CardSummary.vue';
-import VnLv from 'src/components/ui/VnLv.vue';
 import ItemDescriptorImage from 'src/pages/Item/Card/ItemDescriptorImage.vue';
 import VnUserLink from 'src/components/ui/VnUserLink.vue';
-import VnTitle from 'src/components/common/VnTitle.vue';
 import ItemDescriptorMenu from './ItemDescriptorMenu.vue';
 
 const $props = defineProps({
diff --git a/src/pages/Item/Card/ItemTags.vue b/src/pages/Item/Card/ItemTags.vue
index ed23ab5a6..3b6464253 100644
--- a/src/pages/Item/Card/ItemTags.vue
+++ b/src/pages/Item/Card/ItemTags.vue
@@ -4,10 +4,7 @@ import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 
 import CrudModel from 'components/CrudModel.vue';
-import VnRow from 'components/ui/VnRow.vue';
-import VnInput from 'src/components/common/VnInput.vue';
 import FetchData from 'components/FetchData.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
 import axios from 'axios';
 
 const route = useRoute();
diff --git a/src/pages/Item/Card/ItemTax.vue b/src/pages/Item/Card/ItemTax.vue
index 8060481f0..8c307916b 100644
--- a/src/pages/Item/Card/ItemTax.vue
+++ b/src/pages/Item/Card/ItemTax.vue
@@ -2,13 +2,8 @@
 import { ref } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-
 import FetchData from 'components/FetchData.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-import VnRow from 'components/ui/VnRow.vue';
 import CrudModel from 'components/CrudModel.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
-
 import axios from 'axios';
 import useNotify from 'src/composables/useNotify.js';
 
diff --git a/src/pages/Item/ItemCreate.vue b/src/pages/Item/ItemCreate.vue
index d69153820..2d66499c5 100644
--- a/src/pages/Item/ItemCreate.vue
+++ b/src/pages/Item/ItemCreate.vue
@@ -2,14 +2,8 @@
 import { reactive, ref, onBeforeMount } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
-
 import FetchData from 'components/FetchData.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
 import FormModel from 'components/FormModel.vue';
-import VnRow from 'components/ui/VnRow.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
-
 import axios from 'axios';
 
 const { t } = useI18n();
diff --git a/src/pages/Item/ItemFixedPrice.vue b/src/pages/Item/ItemFixedPrice.vue
index fdfa1d3d1..0dde4f67b 100644
--- a/src/pages/Item/ItemFixedPrice.vue
+++ b/src/pages/Item/ItemFixedPrice.vue
@@ -1,17 +1,12 @@
 <script setup>
 import { onMounted, ref, onUnmounted, nextTick, computed } 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';
@@ -21,7 +16,6 @@ import useNotify from 'src/composables/useNotify.js';
 import axios from 'axios';
 import { isLower, isBigger } from 'src/filters/date.js';
 import RightMenu from 'src/components/common/RightMenu.vue';
-import VnTable from 'src/components/VnTable/VnTable.vue';
 import { QCheckbox } from 'quasar';
 
 const quasar = useQuasar();
@@ -234,7 +228,7 @@ const validations = ({ row }) => {
         'warehouseFk',
     ];
     const isValid = requiredFields.every(
-        (field) => row[field] !== null && row[field] !== undefined
+        (field) => row[field] !== null && row[field] !== undefined,
     );
     return isValid;
 };
@@ -552,7 +546,7 @@ function handleOnDataSave({ CrudModelRef }) {
                     openConfirmationModal(
                         t('globals.rowWillBeRemoved'),
                         t('Do you want to clone this item?'),
-                        () => removePrice(row.id, rowIndex)
+                        () => removePrice(row.id, rowIndex),
                     )
                 "
             >
diff --git a/src/pages/Item/ItemFixedPriceFilter.vue b/src/pages/Item/ItemFixedPriceFilter.vue
index 531c7e09e..94fdd0f95 100644
--- a/src/pages/Item/ItemFixedPriceFilter.vue
+++ b/src/pages/Item/ItemFixedPriceFilter.vue
@@ -1,10 +1,7 @@
 <script setup>
 import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
-
 import FetchData from 'components/FetchData.vue';
-import VnInputDate from 'src/components/common/VnInputDate.vue';
-import VnSelect from 'components/common/VnSelect.vue';
 import ItemsFilterPanel from 'src/components/ItemsFilterPanel.vue';
 
 const { t } = useI18n();
diff --git a/src/pages/Item/ItemList.vue b/src/pages/Item/ItemList.vue
index 8057eb7ad..a6cf15df3 100644
--- a/src/pages/Item/ItemList.vue
+++ b/src/pages/Item/ItemList.vue
@@ -2,8 +2,6 @@
 import { ref, computed, onBeforeMount } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
-import VnImg from 'src/components/ui/VnImg.vue';
-import VnTable from 'components/VnTable/VnTable.vue';
 import { toDate } from 'src/filters';
 import FetchedTags from 'src/components/ui/FetchedTags.vue';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
@@ -13,10 +11,7 @@ import ItemDescriptorProxy from './Card/ItemDescriptorProxy.vue';
 import ItemTypeDescriptorProxy from './ItemType/Card/ItemTypeDescriptorProxy.vue';
 import { cloneItem } from 'src/pages/Item/composables/cloneItem';
 import ItemListFilter from './ItemListFilter.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
 import axios from 'axios';
-import VnSection from 'src/components/common/VnSection.vue';
 
 const entityId = computed(() => route.params.id);
 const { openCloneDialog } = cloneItem();
diff --git a/src/pages/Item/ItemListFilter.vue b/src/pages/Item/ItemListFilter.vue
index 22e948e06..971ad51f0 100644
--- a/src/pages/Item/ItemListFilter.vue
+++ b/src/pages/Item/ItemListFilter.vue
@@ -2,17 +2,11 @@
 import { ref, onMounted } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useStateStore } from 'stores/useStateStore';
-
 import FetchData from 'components/FetchData.vue';
-import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
-import VnInput from 'src/components/common/VnInput.vue';
 import { QCheckbox } from 'quasar';
-
 import { useArrayData } from 'composables/useArrayData';
 import { useValidator } from 'src/composables/useValidator';
 import axios from 'axios';
-import VnSelectSupplier from 'src/components/common/VnSelectSupplier.vue';
 
 const { t } = useI18n();
 
diff --git a/src/pages/Item/ItemRequest.vue b/src/pages/Item/ItemRequest.vue
index 76e4b8083..6b153900c 100644
--- a/src/pages/Item/ItemRequest.vue
+++ b/src/pages/Item/ItemRequest.vue
@@ -9,9 +9,6 @@ import useNotify from 'src/composables/useNotify.js';
 import axios from 'axios';
 import ItemRequestDenyForm from './ItemRequestDenyForm.vue';
 import { toDate } from 'src/filters';
-import VnTable from 'components/VnTable/VnTable.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-import VnInputNumber from 'src/components/common/VnInputNumber.vue';
 import ItemRequestFilter from './ItemRequestFilter.vue';
 import RightMenu from 'src/components/common/RightMenu.vue';
 
diff --git a/src/pages/Item/ItemRequestDenyForm.vue b/src/pages/Item/ItemRequestDenyForm.vue
index c9a4cbe9c..7f095de77 100644
--- a/src/pages/Item/ItemRequestDenyForm.vue
+++ b/src/pages/Item/ItemRequestDenyForm.vue
@@ -1,9 +1,6 @@
 <script setup>
 import { reactive, ref, onMounted, nextTick } from 'vue';
 import { useI18n } from 'vue-i18n';
-import VnInput from 'src/components/common/VnInput.vue';
-
-import VnRow from 'components/ui/VnRow.vue';
 import FormModelPopup from 'src/components/FormModelPopup.vue';
 
 defineProps({
diff --git a/src/pages/Item/ItemRequestFilter.vue b/src/pages/Item/ItemRequestFilter.vue
index af48f7f5c..3d2591059 100644
--- a/src/pages/Item/ItemRequestFilter.vue
+++ b/src/pages/Item/ItemRequestFilter.vue
@@ -2,13 +2,8 @@
 import { onMounted, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { dateRange } from 'src/filters';
-import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
-import VnInput from 'src/components/common/VnInput.vue';
 import FetchData from 'components/FetchData.vue';
 import { useArrayData } from 'src/composables/useArrayData';
-import VnSelectWorker from 'src/components/common/VnSelectWorker.vue';
-
 const { t } = useI18n();
 const props = defineProps({
     dataKey: {
@@ -52,7 +47,7 @@ onMounted(async () => {
                 name: key,
                 value,
                 selectedField: { name: key, label: t(`params.${key}`) },
-            })
+            }),
         );
     }
     exprBuilder('state', arrayData.store?.userParams?.state);
diff --git a/src/pages/Item/ItemType/Card/ItemTypeBasicData.vue b/src/pages/Item/ItemType/Card/ItemTypeBasicData.vue
index 475dffd8b..ed01a50d2 100644
--- a/src/pages/Item/ItemType/Card/ItemTypeBasicData.vue
+++ b/src/pages/Item/ItemType/Card/ItemTypeBasicData.vue
@@ -2,14 +2,8 @@
 import { ref } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-
 import FetchData from 'components/FetchData.vue';
 import FormModel from 'components/FormModel.vue';
-import VnRow from 'components/ui/VnRow.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
-import VnAvatar from 'src/components/ui/VnAvatar.vue';
-
 const route = useRoute();
 const { t } = useI18n();
 
diff --git a/src/pages/Item/ItemType/Card/ItemTypeCard.vue b/src/pages/Item/ItemType/Card/ItemTypeCard.vue
index 84e810de5..ae40ff1d9 100644
--- a/src/pages/Item/ItemType/Card/ItemTypeCard.vue
+++ b/src/pages/Item/ItemType/Card/ItemTypeCard.vue
@@ -1,5 +1,4 @@
 <script setup>
-import VnCardBeta from 'components/common/VnCardBeta.vue';
 import ItemTypeDescriptor from 'src/pages/Item/ItemType/Card/ItemTypeDescriptor.vue';
 import filter from './ItemTypeFilter.js';
 </script>
diff --git a/src/pages/Item/ItemType/Card/ItemTypeDescriptor.vue b/src/pages/Item/ItemType/Card/ItemTypeDescriptor.vue
index 0f71ad1f1..0afe39e46 100644
--- a/src/pages/Item/ItemType/Card/ItemTypeDescriptor.vue
+++ b/src/pages/Item/ItemType/Card/ItemTypeDescriptor.vue
@@ -1,9 +1,8 @@
 <script setup>
 import { computed } from 'vue';
 import { useRoute } from 'vue-router';
-
+import { useI18n } from 'vue-i18n';
 import CardDescriptor from 'components/ui/CardDescriptor.vue';
-import VnLv from 'src/components/ui/VnLv.vue';
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
 import filter from './ItemTypeFilter.js';
 
diff --git a/src/pages/Item/ItemType/Card/ItemTypeLog.vue b/src/pages/Item/ItemType/Card/ItemTypeLog.vue
index b3f7a6597..4030f75a9 100644
--- a/src/pages/Item/ItemType/Card/ItemTypeLog.vue
+++ b/src/pages/Item/ItemType/Card/ItemTypeLog.vue
@@ -1,6 +1,4 @@
-<script setup>
-import VnLog from 'src/components/common/VnLog.vue';
-</script>
+<script setup></script>
 
 <template>
     <VnLog model="ItemType" url="/ItemTypeLogs"></VnLog>
diff --git a/src/pages/Item/ItemType/Card/ItemTypeSummary.vue b/src/pages/Item/ItemType/Card/ItemTypeSummary.vue
index 3b63c4b63..cc6727484 100644
--- a/src/pages/Item/ItemType/Card/ItemTypeSummary.vue
+++ b/src/pages/Item/ItemType/Card/ItemTypeSummary.vue
@@ -5,8 +5,6 @@ import { useI18n } from 'vue-i18n';
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
 import filter from './ItemTypeFilter.js';
 import CardSummary from 'components/ui/CardSummary.vue';
-import VnLv from 'src/components/ui/VnLv.vue';
-import VnToSummary from 'src/components/ui/VnToSummary.vue';
 
 onUpdated(() => summaryRef.value.fetch());
 
diff --git a/src/pages/Item/ItemTypeList.vue b/src/pages/Item/ItemTypeList.vue
index d4030e1d8..69fe1a116 100644
--- a/src/pages/Item/ItemTypeList.vue
+++ b/src/pages/Item/ItemTypeList.vue
@@ -1,13 +1,8 @@
 <script setup>
 import { useI18n } from 'vue-i18n';
 import { ref, computed } from 'vue';
-import VnTable from 'components/VnTable/VnTable.vue';
 import FetchData from 'components/FetchData.vue';
 import WorkerDescriptorProxy from '../Worker/Card/WorkerDescriptorProxy.vue';
-import VnSection from 'src/components/common/VnSection.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-import VnSelectWorker from 'src/components/common/VnSelectWorker.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
 
 const { t } = useI18n();
 const tableRef = ref();
diff --git a/src/pages/Monitor/MonitorClients.vue b/src/pages/Monitor/MonitorClients.vue
index c1958cdcb..0ebac2356 100644
--- a/src/pages/Monitor/MonitorClients.vue
+++ b/src/pages/Monitor/MonitorClients.vue
@@ -4,9 +4,6 @@ import { useI18n } from 'vue-i18n';
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
 import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
 import { toDateFormat } from 'src/filters/date.js';
-import VnTable from 'src/components/VnTable/VnTable.vue';
-import VnInputDate from 'src/components/common/VnInputDate.vue';
-import VnRow from 'src/components/ui/VnRow.vue';
 import { dateRange } from 'src/filters';
 const { t } = useI18n();
 
diff --git a/src/pages/Monitor/MonitorClientsActions.vue b/src/pages/Monitor/MonitorClientsActions.vue
index 821773bbf..c69be8f54 100644
--- a/src/pages/Monitor/MonitorClientsActions.vue
+++ b/src/pages/Monitor/MonitorClientsActions.vue
@@ -1,7 +1,6 @@
 <script setup>
 import SalesClientTable from './MonitorClients.vue';
 import SalesOrdersTable from './MonitorOrders.vue';
-import VnRow from 'src/components/ui/VnRow.vue';
 </script>
 <template>
     <VnRow
diff --git a/src/pages/Monitor/MonitorOrders.vue b/src/pages/Monitor/MonitorOrders.vue
index 4efab56fb..13f95a8db 100644
--- a/src/pages/Monitor/MonitorOrders.vue
+++ b/src/pages/Monitor/MonitorOrders.vue
@@ -3,8 +3,6 @@ import { ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
 import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
-import VnTable from 'components/VnTable/VnTable.vue';
-
 import { toDateFormat, toDateTimeFormat } from 'src/filters/date.js';
 import { toCurrency } from 'src/filters';
 import { useVnConfirm } from 'composables/useVnConfirm';
@@ -157,7 +155,7 @@ const openTab = (id) =>
                         openConfirmationModal(
                             $t('globals.deleteConfirmTitle'),
                             $t('salesOrdersTable.deleteConfirmMessage'),
-                            removeOrders
+                            removeOrders,
                         )
                     "
                 >
diff --git a/src/pages/Monitor/Ticket/MonitorTicketFilter.vue b/src/pages/Monitor/Ticket/MonitorTicketFilter.vue
index 48710d696..64eaa33dc 100644
--- a/src/pages/Monitor/Ticket/MonitorTicketFilter.vue
+++ b/src/pages/Monitor/Ticket/MonitorTicketFilter.vue
@@ -1,16 +1,8 @@
 <script setup>
 import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
-
-import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
-import VnFilterPanelChip from 'src/components/ui/VnFilterPanelChip.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-import VnInputNumber from 'src/components/common/VnInputNumber.vue';
 import FetchData from 'src/components/FetchData.vue';
 import { dateRange } from 'src/filters';
-import VnSelectWorker from 'src/components/common/VnSelectWorker.vue';
-
 defineProps({ dataKey: { type: String, required: true } });
 const { t, te } = useI18n();
 const warehouses = ref();
diff --git a/src/pages/Monitor/Ticket/MonitorTicketSearchbar.vue b/src/pages/Monitor/Ticket/MonitorTicketSearchbar.vue
index f1c347588..16ec3ed7d 100644
--- a/src/pages/Monitor/Ticket/MonitorTicketSearchbar.vue
+++ b/src/pages/Monitor/Ticket/MonitorTicketSearchbar.vue
@@ -1,6 +1,4 @@
-<script setup>
-import VnSearchbar from 'components/ui/VnSearchbar.vue';
-</script>
+<script setup></script>
 <template>
     <VnSearchbar
         data-key="saleMonitorTickets"
diff --git a/src/pages/Monitor/Ticket/MonitorTickets.vue b/src/pages/Monitor/Ticket/MonitorTickets.vue
index 3b5dccb56..924c2527d 100644
--- a/src/pages/Monitor/Ticket/MonitorTickets.vue
+++ b/src/pages/Monitor/Ticket/MonitorTickets.vue
@@ -8,14 +8,12 @@ import TicketDescriptorProxy from 'src/pages/Ticket/Card/TicketDescriptorProxy.v
 import InvoiceOutDescriptorProxy from 'src/pages/InvoiceOut/Card/InvoiceOutDescriptorProxy.vue';
 import ZoneDescriptorProxy from 'src/pages/Zone/Card/ZoneDescriptorProxy.vue';
 import TicketSummary from 'src/pages/Ticket/Card/TicketSummary.vue';
-import VnTable from 'components/VnTable/VnTable.vue';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import { toCurrency, dateRange, dashIfEmpty } from 'src/filters';
 import RightMenu from 'src/components/common/RightMenu.vue';
 import MonitorTicketSearchbar from './MonitorTicketSearchbar.vue';
 import MonitorTicketFilter from './MonitorTicketFilter.vue';
 import TicketProblems from 'src/components/TicketProblems.vue';
-import VnDateBadge from 'src/components/common/VnDateBadge.vue';
 import { useStateStore } from 'src/stores/useStateStore';
 
 const DEFAULT_AUTO_REFRESH = 2 * 60 * 1000;
diff --git a/src/pages/Route/Agency/AgencyList.vue b/src/pages/Route/Agency/AgencyList.vue
index 4322b9bc8..b4e88eee1 100644
--- a/src/pages/Route/Agency/AgencyList.vue
+++ b/src/pages/Route/Agency/AgencyList.vue
@@ -2,8 +2,6 @@
 import { computed } from 'vue';
 import { useRouter } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-import VnTable from 'components/VnTable/VnTable.vue';
-import VnSection from 'src/components/common/VnSection.vue';
 
 const { t } = useI18n();
 const router = useRouter();
diff --git a/src/pages/Route/Agency/Card/AgencyBasicData.vue b/src/pages/Route/Agency/Card/AgencyBasicData.vue
index 4270b136c..b932a7242 100644
--- a/src/pages/Route/Agency/Card/AgencyBasicData.vue
+++ b/src/pages/Route/Agency/Card/AgencyBasicData.vue
@@ -2,12 +2,8 @@
 import { ref } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-
 import FormModel from 'components/FormModel.vue';
 import FetchData from 'src/components/FetchData.vue';
-import VnRow from 'components/ui/VnRow.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
 
 const { t } = useI18n();
 const route = useRoute();
diff --git a/src/pages/Route/Agency/Card/AgencyCard.vue b/src/pages/Route/Agency/Card/AgencyCard.vue
index 7dc31f8ba..33f1a2257 100644
--- a/src/pages/Route/Agency/Card/AgencyCard.vue
+++ b/src/pages/Route/Agency/Card/AgencyCard.vue
@@ -1,6 +1,5 @@
 <script setup>
 import AgencyDescriptor from 'pages/Route/Agency/Card/AgencyDescriptor.vue';
-import VnCardBeta from 'src/components/common/VnCardBeta.vue';
 </script>
 <template>
     <VnCardBeta data-key="Agency" url="Agencies" :descriptor="AgencyDescriptor" />
diff --git a/src/pages/Route/Agency/Card/AgencyDescriptor.vue b/src/pages/Route/Agency/Card/AgencyDescriptor.vue
index b9772037c..a53ec0b95 100644
--- a/src/pages/Route/Agency/Card/AgencyDescriptor.vue
+++ b/src/pages/Route/Agency/Card/AgencyDescriptor.vue
@@ -4,7 +4,6 @@ import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 import { useArrayData } from 'src/composables/useArrayData';
 import CardDescriptor from 'components/ui/CardDescriptor.vue';
-import VnLv from 'components/ui/VnLv.vue';
 
 const props = defineProps({
     id: {
diff --git a/src/pages/Route/Agency/Card/AgencyModes.vue b/src/pages/Route/Agency/Card/AgencyModes.vue
index 13f6011e4..18f5f6975 100644
--- a/src/pages/Route/Agency/Card/AgencyModes.vue
+++ b/src/pages/Route/Agency/Card/AgencyModes.vue
@@ -3,8 +3,6 @@ import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 
 import CardList from 'src/components/ui/CardList.vue';
-import VnPaginate from 'src/components/ui/VnPaginate.vue';
-import VnLv from 'src/components/ui/VnLv.vue';
 
 const { t } = useI18n();
 const route = useRoute();
diff --git a/src/pages/Route/Agency/Card/AgencySummary.vue b/src/pages/Route/Agency/Card/AgencySummary.vue
index 71a6d1066..9d92beb14 100644
--- a/src/pages/Route/Agency/Card/AgencySummary.vue
+++ b/src/pages/Route/Agency/Card/AgencySummary.vue
@@ -4,8 +4,6 @@ import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 
 import CardSummary from 'components/ui/CardSummary.vue';
-import VnLv from 'components/ui/VnLv.vue';
-import VnTitle from 'src/components/common/VnTitle.vue';
 
 const $props = defineProps({ id: { type: Number, default: 0 } });
 const { t } = useI18n();
diff --git a/src/pages/Route/Agency/Card/AgencyWorkcenter.vue b/src/pages/Route/Agency/Card/AgencyWorkcenter.vue
index 9a9213868..db7a2de45 100644
--- a/src/pages/Route/Agency/Card/AgencyWorkcenter.vue
+++ b/src/pages/Route/Agency/Card/AgencyWorkcenter.vue
@@ -8,12 +8,6 @@ import { useI18n } from 'vue-i18n';
 import FetchData from 'src/components/FetchData.vue';
 import FormModelPopup from 'src/components/FormModelPopup.vue';
 
-import VnPaginate from 'src/components/ui/VnPaginate.vue';
-import VnLv from 'src/components/ui/VnLv.vue';
-import VnRow from 'components/ui/VnRow.vue';
-
-import VnSelect from 'src/components/common/VnSelect.vue';
-
 const { t } = useI18n();
 const route = useRoute();
 const paginate = ref();
diff --git a/src/pages/Route/Card/RouteAutonomousFilter.vue b/src/pages/Route/Card/RouteAutonomousFilter.vue
index 37745594c..4c1345de5 100644
--- a/src/pages/Route/Card/RouteAutonomousFilter.vue
+++ b/src/pages/Route/Card/RouteAutonomousFilter.vue
@@ -2,11 +2,6 @@
 import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import FetchData from 'components/FetchData.vue';
-import VnFilterPanel from 'components/ui/VnFilterPanel.vue';
-import VnSelect from 'components/common/VnSelect.vue';
-import VnInputDate from 'components/common/VnInputDate.vue';
-import VnInput from 'components/common/VnInput.vue';
-import VnSelectSupplier from 'src/components/common/VnSelectSupplier.vue';
 
 const { t } = useI18n();
 const props = defineProps({
diff --git a/src/pages/Route/Card/RouteCard.vue b/src/pages/Route/Card/RouteCard.vue
index c178dc6bf..fa5320a94 100644
--- a/src/pages/Route/Card/RouteCard.vue
+++ b/src/pages/Route/Card/RouteCard.vue
@@ -1,7 +1,7 @@
 <script setup>
 import RouteDescriptor from 'pages/Route/Card/RouteDescriptor.vue';
-import VnCardBeta from 'src/components/common/VnCardBeta.vue';
 import filter from './RouteFilter.js';
+
 </script>
 <template>
     <VnCardBeta
diff --git a/src/pages/Route/Card/RouteDescriptor.vue b/src/pages/Route/Card/RouteDescriptor.vue
index a8c6cc18b..2ce106fcf 100644
--- a/src/pages/Route/Card/RouteDescriptor.vue
+++ b/src/pages/Route/Card/RouteDescriptor.vue
@@ -2,7 +2,7 @@
 import { computed } from 'vue';
 import { useRoute } from 'vue-router';
 import CardDescriptor from 'components/ui/CardDescriptor.vue';
-import VnLv from 'components/ui/VnLv.vue';
+import useCardDescription from 'composables/useCardDescription';
 import { dashIfEmpty, toDate } from 'src/filters';
 import RouteDescriptorMenu from 'pages/Route/Card/RouteDescriptorMenu.vue';
 import filter from './RouteFilter.js';
diff --git a/src/pages/Route/Card/RouteDescriptorMenu.vue b/src/pages/Route/Card/RouteDescriptorMenu.vue
index d1a70c868..5052a634c 100644
--- a/src/pages/Route/Card/RouteDescriptorMenu.vue
+++ b/src/pages/Route/Card/RouteDescriptorMenu.vue
@@ -4,7 +4,6 @@ import { useQuasar } from 'quasar';
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
 import { useSession } from 'src/composables/useSession';
-import VnConfirm from 'components/ui/VnConfirm.vue';
 
 const props = defineProps({
     route: {
@@ -23,7 +22,7 @@ async function openRouteReport() {
     const token = getTokenMultimedia();
     window.open(
         `${url}/api/Routes/${routeId}/driver-route-pdf?access_token=${token}`,
-        '_blank'
+        '_blank',
     );
 }
 
diff --git a/src/pages/Route/Card/RouteFilter.vue b/src/pages/Route/Card/RouteFilter.vue
index 21858102b..d1f1b76fb 100644
--- a/src/pages/Route/Card/RouteFilter.vue
+++ b/src/pages/Route/Card/RouteFilter.vue
@@ -1,10 +1,5 @@
 <script setup>
 import { useI18n } from 'vue-i18n';
-import VnFilterPanel from 'components/ui/VnFilterPanel.vue';
-import VnSelect from 'components/common/VnSelect.vue';
-import VnInputDate from 'components/common/VnInputDate.vue';
-import VnInput from 'components/common/VnInput.vue';
-import VnSelectWorker from 'src/components/common/VnSelectWorker.vue';
 
 const { t } = useI18n();
 const props = defineProps({
diff --git a/src/pages/Route/Card/RouteForm.vue b/src/pages/Route/Card/RouteForm.vue
index 30ac54896..cf307620d 100644
--- a/src/pages/Route/Card/RouteForm.vue
+++ b/src/pages/Route/Card/RouteForm.vue
@@ -2,17 +2,11 @@
 import { useI18n } from 'vue-i18n';
 import { ref } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
-import VnRow from 'components/ui/VnRow.vue';
 import FetchData from 'components/FetchData.vue';
 import FormModel from 'components/FormModel.vue';
-import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
-import VnSelect from 'components/common/VnSelect.vue';
-import VnInputDate from 'components/common/VnInputDate.vue';
-import VnInput from 'components/common/VnInput.vue';
 import axios from 'axios';
-import VnInputTime from 'components/common/VnInputTime.vue';
 import filter from './RouteFilter.js';
-import VnSelectWorker from 'src/components/common/VnSelectWorker.vue';
+
 
 const { t } = useI18n();
 const route = useRoute();
diff --git a/src/pages/Route/Card/RouteSearchbar.vue b/src/pages/Route/Card/RouteSearchbar.vue
index a8e11cef6..6fbca9b7d 100644
--- a/src/pages/Route/Card/RouteSearchbar.vue
+++ b/src/pages/Route/Card/RouteSearchbar.vue
@@ -1,5 +1,4 @@
 <script setup>
-import VnSearchbar from 'components/ui/VnSearchbar.vue';
 import { useI18n } from 'vue-i18n';
 const { t } = useI18n();
 </script>
diff --git a/src/pages/Route/Card/RouteSummary.vue b/src/pages/Route/Card/RouteSummary.vue
index 3051972b2..089c5a1d6 100644
--- a/src/pages/Route/Card/RouteSummary.vue
+++ b/src/pages/Route/Card/RouteSummary.vue
@@ -10,8 +10,6 @@ import CardSummary from 'components/ui/CardSummary.vue';
 import WorkerDescriptorProxy from 'pages/Worker/Card/WorkerDescriptorProxy.vue';
 import CustomerDescriptorProxy from 'pages/Customer/Card/CustomerDescriptorProxy.vue';
 import TicketDescriptorProxy from 'pages/Ticket/Card/TicketDescriptorProxy.vue';
-import VnLv from 'components/ui/VnLv.vue';
-import VnTitle from 'src/components/common/VnTitle.vue';
 import RouteDescriptorMenu from './RouteDescriptorMenu.vue';
 
 const $props = defineProps({
@@ -168,7 +166,7 @@ const ticketColumns = ref([
                     <VnLv
                         :label="t('route.summary.volume')"
                         :value="`${dashIfEmpty(entity?.route?.m3)} / ${dashIfEmpty(
-                            entity?.route?.vehicle?.m3
+                            entity?.route?.vehicle?.m3,
                         )} m³`"
                     />
                     <VnLv
diff --git a/src/pages/Route/Cmr/CmrList.vue b/src/pages/Route/Cmr/CmrList.vue
index b3eaf3b48..4e7d5dbd8 100644
--- a/src/pages/Route/Cmr/CmrList.vue
+++ b/src/pages/Route/Cmr/CmrList.vue
@@ -10,9 +10,6 @@ import axios from 'axios';
 import TicketDescriptorProxy from 'pages/Ticket/Card/TicketDescriptorProxy.vue';
 import CustomerDescriptorProxy from 'pages/Customer/Card/CustomerDescriptorProxy.vue';
 
-import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
-import VnTable from 'components/VnTable/VnTable.vue';
-
 const { t } = useI18n();
 const { getTokenMultimedia } = useSession();
 const token = getTokenMultimedia();
diff --git a/src/pages/Route/Roadmap/RoadmapAddStopForm.vue b/src/pages/Route/Roadmap/RoadmapAddStopForm.vue
index 6cc21fd4d..0e9b804d7 100644
--- a/src/pages/Route/Roadmap/RoadmapAddStopForm.vue
+++ b/src/pages/Route/Roadmap/RoadmapAddStopForm.vue
@@ -2,10 +2,6 @@
 import { computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import FetchData from 'components/FetchData.vue';
-import VnSelect from 'components/common/VnSelect.vue';
-import VnInputDate from 'components/common/VnInputDate.vue';
-import VnInputTime from 'components/common/VnInputTime.vue';
-import VnInput from 'components/common/VnInput.vue';
 
 const props = defineProps({
     formData: {
diff --git a/src/pages/Route/Roadmap/RoadmapBasicData.vue b/src/pages/Route/Roadmap/RoadmapBasicData.vue
index 5f8ba3bf5..7ee93b5f8 100644
--- a/src/pages/Route/Roadmap/RoadmapBasicData.vue
+++ b/src/pages/Route/Roadmap/RoadmapBasicData.vue
@@ -1,12 +1,7 @@
 <script setup>
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
-import VnRow from 'components/ui/VnRow.vue';
 import FormModel from 'components/FormModel.vue';
-import VnInputDate from 'components/common/VnInputDate.vue';
-import VnInput from 'components/common/VnInput.vue';
-import VnInputTime from 'components/common/VnInputTime.vue';
-import VnSelectSupplier from 'src/components/common/VnSelectSupplier.vue';
 
 const { t } = useI18n();
 const router = useRouter();
diff --git a/src/pages/Route/Roadmap/RoadmapCard.vue b/src/pages/Route/Roadmap/RoadmapCard.vue
index 48ba516a1..229f169a7 100644
--- a/src/pages/Route/Roadmap/RoadmapCard.vue
+++ b/src/pages/Route/Roadmap/RoadmapCard.vue
@@ -1,5 +1,4 @@
 <script setup>
-import VnCardBeta from 'components/common/VnCardBeta.vue';
 import RoadmapDescriptor from 'pages/Route/Roadmap/RoadmapDescriptor.vue';
 </script>
 <template>
diff --git a/src/pages/Route/Roadmap/RoadmapDescriptor.vue b/src/pages/Route/Roadmap/RoadmapDescriptor.vue
index 1f1e6d6ff..beadfdd7c 100644
--- a/src/pages/Route/Roadmap/RoadmapDescriptor.vue
+++ b/src/pages/Route/Roadmap/RoadmapDescriptor.vue
@@ -3,7 +3,7 @@ import { computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import CardDescriptor from 'components/ui/CardDescriptor.vue';
-import VnLv from 'components/ui/VnLv.vue';
+import useCardDescription from 'composables/useCardDescription';
 import { dashIfEmpty, toDateHourMin } from 'src/filters';
 import SupplierDescriptorProxy from 'pages/Supplier/Card/SupplierDescriptorProxy.vue';
 import RoadmapDescriptorMenu from 'pages/Route/Roadmap/RoadmapDescriptorMenu.vue';
diff --git a/src/pages/Route/Roadmap/RoadmapDescriptorMenu.vue b/src/pages/Route/Roadmap/RoadmapDescriptorMenu.vue
index 2c0099f28..eb709d254 100644
--- a/src/pages/Route/Roadmap/RoadmapDescriptorMenu.vue
+++ b/src/pages/Route/Roadmap/RoadmapDescriptorMenu.vue
@@ -3,7 +3,6 @@ import axios from 'axios';
 import { useQuasar } from 'quasar';
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
-import VnConfirm from 'components/ui/VnConfirm.vue';
 
 const props = defineProps({
     route: {
diff --git a/src/pages/Route/Roadmap/RoadmapFilter.vue b/src/pages/Route/Roadmap/RoadmapFilter.vue
index 0d51a88bb..080280d51 100644
--- a/src/pages/Route/Roadmap/RoadmapFilter.vue
+++ b/src/pages/Route/Roadmap/RoadmapFilter.vue
@@ -2,10 +2,6 @@
 import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import FetchData from 'components/FetchData.vue';
-import VnFilterPanel from 'components/ui/VnFilterPanel.vue';
-import VnInputDate from 'components/common/VnInputDate.vue';
-import VnInput from 'components/common/VnInput.vue';
-import VnSelectSupplier from 'src/components/common/VnSelectSupplier.vue';
 
 const { t } = useI18n();
 const props = defineProps({
diff --git a/src/pages/Route/Roadmap/RoadmapSummary.vue b/src/pages/Route/Roadmap/RoadmapSummary.vue
index 0c1c2b903..9c2e42998 100644
--- a/src/pages/Route/Roadmap/RoadmapSummary.vue
+++ b/src/pages/Route/Roadmap/RoadmapSummary.vue
@@ -5,11 +5,8 @@ import { useI18n } from 'vue-i18n';
 import { QIcon } from 'quasar';
 import { dashIfEmpty, toDateHourMin } from 'src/filters';
 import { useStateStore } from 'stores/useStateStore';
-import VnLv from 'components/ui/VnLv.vue';
-import VnTitle from 'src/components/common/VnTitle.vue';
 import CardSummary from 'components/ui/CardSummary.vue';
 import SupplierDescriptorProxy from 'pages/Supplier/Card/SupplierDescriptorProxy.vue';
-import VnLinkPhone from 'components/ui/VnLinkPhone.vue';
 import RoadmapDescriptorMenu from './RoadmapDescriptorMenu.vue';
 
 const $props = defineProps({
diff --git a/src/pages/Route/RouteAutonomous.vue b/src/pages/Route/RouteAutonomous.vue
index 23c920a57..8086ab06c 100644
--- a/src/pages/Route/RouteAutonomous.vue
+++ b/src/pages/Route/RouteAutonomous.vue
@@ -13,10 +13,6 @@ import RouteSummary from 'pages/Route/Card/RouteSummary.vue';
 import RouteDescriptorProxy from 'pages/Route/Card/RouteDescriptorProxy.vue';
 import InvoiceInDescriptorProxy from 'pages/InvoiceIn/Card/InvoiceInDescriptorProxy.vue';
 import SupplierDescriptorProxy from 'pages/Supplier/Card/SupplierDescriptorProxy.vue';
-import VnSearchbar from 'components/ui/VnSearchbar.vue';
-import VnDms from 'components/common/VnDms.vue';
-import VnTable from 'components/VnTable/VnTable.vue';
-import VnLv from 'components/ui/VnLv.vue';
 
 const { viewSummary } = useSummaryDialog();
 const { notify } = useNotify();
diff --git a/src/pages/Route/RouteExtendedList.vue b/src/pages/Route/RouteExtendedList.vue
index 03d081fc8..3db73cefd 100644
--- a/src/pages/Route/RouteExtendedList.vue
+++ b/src/pages/Route/RouteExtendedList.vue
@@ -13,9 +13,6 @@ import RouteListTicketsDialog from 'pages/Route/Card/RouteListTicketsDialog.vue'
 import RouteSummary from 'pages/Route/Card/RouteSummary.vue';
 import RightMenu from 'src/components/common/RightMenu.vue';
 import RouteFilter from 'pages/Route/Card/RouteFilter.vue';
-import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
-import VnInputDate from 'components/common/VnInputDate.vue';
-import VnTable from 'components/VnTable/VnTable.vue';
 
 const { openReport } = usePrintService();
 const { t } = useI18n();
diff --git a/src/pages/Route/RouteList.vue b/src/pages/Route/RouteList.vue
index bc3227f6c..ff199b5c6 100644
--- a/src/pages/Route/RouteList.vue
+++ b/src/pages/Route/RouteList.vue
@@ -5,9 +5,7 @@ import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import { toHour } from 'src/filters';
 import RouteSummary from 'pages/Route/Card/RouteSummary.vue';
 import RouteFilter from 'pages/Route/Card/RouteFilter.vue';
-import VnTable from 'components/VnTable/VnTable.vue';
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
-import VnSection from 'src/components/common/VnSection.vue';
 
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
diff --git a/src/pages/Route/RouteLog.vue b/src/pages/Route/RouteLog.vue
index 25fb28014..38440f911 100644
--- a/src/pages/Route/RouteLog.vue
+++ b/src/pages/Route/RouteLog.vue
@@ -1,6 +1,4 @@
-<script setup>
-import VnLog from 'src/components/common/VnLog.vue';
-</script>
+<script setup></script>
 <template>
     <VnLog model="Route" url="/RouteLogs"></VnLog>
 </template>
diff --git a/src/pages/Route/RouteRoadmap.vue b/src/pages/Route/RouteRoadmap.vue
index 23b1b1d5b..da9e90f50 100644
--- a/src/pages/Route/RouteRoadmap.vue
+++ b/src/pages/Route/RouteRoadmap.vue
@@ -7,15 +7,7 @@ import { useQuasar } from 'quasar';
 import { useSummaryDialog } from 'composables/useSummaryDialog';
 import toCurrency from 'filters/toCurrency';
 import axios from 'axios';
-
-import VnSearchbar from 'components/ui/VnSearchbar.vue';
-import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
-import VnTable from 'components/VnTable/VnTable.vue';
 import RoadmapSummary from 'pages/Route/Roadmap/RoadmapSummary.vue';
-import VnConfirm from 'components/ui/VnConfirm.vue';
-import VnInputDate from 'components/common/VnInputDate.vue';
-import VnInputTime from 'src/components/common/VnInputTime.vue';
-import VnSection from 'src/components/common/VnSection.vue';
 import RoadmapFilter from './Roadmap/RoadmapFilter.vue';
 
 const { viewSummary } = useSummaryDialog();
diff --git a/src/pages/Route/RouteTickets.vue b/src/pages/Route/RouteTickets.vue
index adc7dfdaa..b6edba30f 100644
--- a/src/pages/Route/RouteTickets.vue
+++ b/src/pages/Route/RouteTickets.vue
@@ -1,17 +1,13 @@
 <script setup>
-import VnPaginate from 'components/ui/VnPaginate.vue';
 import { useI18n } from 'vue-i18n';
 import { computed, ref } from 'vue';
 import { dashIfEmpty } from 'src/filters';
-import VnInputDate from 'components/common/VnInputDate.vue';
-import VnInput from 'components/common/VnInput.vue';
 import axios from 'axios';
 import { QIcon, useQuasar } from 'quasar';
 import RouteListTicketsDialog from 'pages/Route/Card/RouteListTicketsDialog.vue';
 import TicketDescriptorProxy from 'pages/Ticket/Card/TicketDescriptorProxy.vue';
 import CustomerDescriptorProxy from 'pages/Customer/Card/CustomerDescriptorProxy.vue';
 import { useRoute } from 'vue-router';
-import VnConfirm from 'components/ui/VnConfirm.vue';
 import FetchData from 'components/FetchData.vue';
 import { openBuscaman } from 'src/utils/buscaman';
 import SendSmsDialog from 'components/common/SendSmsDialog.vue';
diff --git a/src/pages/Shelving/Card/ShelvingCard.vue b/src/pages/Shelving/Card/ShelvingCard.vue
index 9e0ac8ad2..d9824a02a 100644
--- a/src/pages/Shelving/Card/ShelvingCard.vue
+++ b/src/pages/Shelving/Card/ShelvingCard.vue
@@ -1,5 +1,4 @@
 <script setup>
-import VnCardBeta from 'components/common/VnCardBeta.vue';
 import ShelvingDescriptor from 'pages/Shelving/Card/ShelvingDescriptor.vue';
 import filter from './ShelvingFilter.js';
 </script>
diff --git a/src/pages/Shelving/Card/ShelvingDescriptor.vue b/src/pages/Shelving/Card/ShelvingDescriptor.vue
index 9d491e36e..db306ff2d 100644
--- a/src/pages/Shelving/Card/ShelvingDescriptor.vue
+++ b/src/pages/Shelving/Card/ShelvingDescriptor.vue
@@ -3,7 +3,7 @@ import { computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import CardDescriptor from 'components/ui/CardDescriptor.vue';
-import VnLv from 'components/ui/VnLv.vue';
+import useCardDescription from 'composables/useCardDescription';
 import ShelvingDescriptorMenu from 'pages/Shelving/Card/ShelvingDescriptorMenu.vue';
 import VnUserLink from 'src/components/ui/VnUserLink.vue';
 import filter from './ShelvingFilter.js';
diff --git a/src/pages/Shelving/Card/ShelvingDescriptorMenu.vue b/src/pages/Shelving/Card/ShelvingDescriptorMenu.vue
index 447737e9c..a1ff26bcb 100644
--- a/src/pages/Shelving/Card/ShelvingDescriptorMenu.vue
+++ b/src/pages/Shelving/Card/ShelvingDescriptorMenu.vue
@@ -3,7 +3,6 @@ import axios from 'axios';
 import { useQuasar } from 'quasar';
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
-import VnConfirm from 'components/ui/VnConfirm.vue';
 import { useRoute } from 'vue-router';
 
 const $props = defineProps({
diff --git a/src/pages/Shelving/Card/ShelvingFilter.vue b/src/pages/Shelving/Card/ShelvingFilter.vue
index 56cf4f58c..5f1caab6a 100644
--- a/src/pages/Shelving/Card/ShelvingFilter.vue
+++ b/src/pages/Shelving/Card/ShelvingFilter.vue
@@ -1,8 +1,5 @@
 <script setup>
 import { useI18n } from 'vue-i18n';
-import VnFilterPanel from 'components/ui/VnFilterPanel.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
-
 const { t } = useI18n();
 const props = defineProps({
     dataKey: {
diff --git a/src/pages/Shelving/Card/ShelvingForm.vue b/src/pages/Shelving/Card/ShelvingForm.vue
index 078058342..162014807 100644
--- a/src/pages/Shelving/Card/ShelvingForm.vue
+++ b/src/pages/Shelving/Card/ShelvingForm.vue
@@ -1,13 +1,10 @@
 <script setup>
 import { computed } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
-import VnRow from 'components/ui/VnRow.vue';
 import FormModel from 'components/FormModel.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
 import filter from './ShelvingFilter.js';
 
+const { t } = useI18n();
 const route = useRoute();
 const router = useRouter();
 const entityId = computed(() => route.params.id ?? null);
diff --git a/src/pages/Shelving/Card/ShelvingLog.vue b/src/pages/Shelving/Card/ShelvingLog.vue
index 8f355d2ca..871b8c05d 100644
--- a/src/pages/Shelving/Card/ShelvingLog.vue
+++ b/src/pages/Shelving/Card/ShelvingLog.vue
@@ -1,6 +1,4 @@
-<script setup>
-import VnLog from 'src/components/common/VnLog.vue';
-</script>
+<script setup></script>
 <template>
     <VnLog model="Shelving" url="/ShelvingLogs"></VnLog>
 </template>
diff --git a/src/pages/Shelving/Card/ShelvingSearchbar.vue b/src/pages/Shelving/Card/ShelvingSearchbar.vue
index 741b11663..54a3dd1c0 100644
--- a/src/pages/Shelving/Card/ShelvingSearchbar.vue
+++ b/src/pages/Shelving/Card/ShelvingSearchbar.vue
@@ -1,5 +1,6 @@
 <script setup>
-import VnSearchbar from 'components/ui/VnSearchbar.vue';
+import {useI18n} from "vue-i18n";
+const { t } = useI18n();
 import exprBuilder from '../ShelvingExprBuilder.js';
 </script>
 
diff --git a/src/pages/Shelving/ShelvingList.vue b/src/pages/Shelving/ShelvingList.vue
index 4e0c21100..00c207180 100644
--- a/src/pages/Shelving/ShelvingList.vue
+++ b/src/pages/Shelving/ShelvingList.vue
@@ -1,12 +1,10 @@
 <script setup>
-import VnPaginate from 'components/ui/VnPaginate.vue';
+import { useI18n } from 'vue-i18n';
 import CardList from 'components/ui/CardList.vue';
-import VnLv from 'components/ui/VnLv.vue';
 import { useRouter } from 'vue-router';
 import ShelvingFilter from 'pages/Shelving/Card/ShelvingFilter.vue';
 import ShelvingSummary from 'pages/Shelving/Card/ShelvingSummary.vue';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
-import VnSection from 'src/components/common/VnSection.vue';
 import exprBuilder from './ShelvingExprBuilder.js';
 
 const router = useRouter();
diff --git a/src/pages/Supplier/Card/SupplierAccounts.vue b/src/pages/Supplier/Card/SupplierAccounts.vue
index 365eb67a1..8688c1ba5 100644
--- a/src/pages/Supplier/Card/SupplierAccounts.vue
+++ b/src/pages/Supplier/Card/SupplierAccounts.vue
@@ -2,14 +2,9 @@
 import { ref } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-
 import FetchData from 'components/FetchData.vue';
 import CrudModel from 'components/CrudModel.vue';
-import VnRow from 'components/ui/VnRow.vue';
-import VnInput from 'src/components/common/VnInput.vue';
 import CreateBankEntityForm from 'src/components/CreateBankEntityForm.vue';
-import VnSelectDialog from 'src/components/common/VnSelectDialog.vue';
-
 import axios from 'axios';
 import useNotify from 'src/composables/useNotify.js';
 import { useQuasar } from 'quasar';
diff --git a/src/pages/Supplier/Card/SupplierAddresses.vue b/src/pages/Supplier/Card/SupplierAddresses.vue
index c4c0ab7be..b8e21665e 100644
--- a/src/pages/Supplier/Card/SupplierAddresses.vue
+++ b/src/pages/Supplier/Card/SupplierAddresses.vue
@@ -1,10 +1,7 @@
 <script setup>
 import { useI18n } from 'vue-i18n';
 import { useRouter, useRoute } from 'vue-router';
-
-import VnPaginate from 'src/components/ui/VnPaginate.vue';
 import CardList from 'src/components/ui/CardList.vue';
-import VnLv from 'src/components/ui/VnLv.vue';
 
 const router = useRouter();
 const route = useRoute();
diff --git a/src/pages/Supplier/Card/SupplierAddressesCreate.vue b/src/pages/Supplier/Card/SupplierAddressesCreate.vue
index 7a078f03b..e3b2e1b19 100644
--- a/src/pages/Supplier/Card/SupplierAddressesCreate.vue
+++ b/src/pages/Supplier/Card/SupplierAddressesCreate.vue
@@ -3,9 +3,6 @@ import { useI18n } from 'vue-i18n';
 import { reactive, ref, onMounted, onBeforeMount } from 'vue';
 import { useRouter, useRoute } from 'vue-router';
 import FormModel from 'components/FormModel.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-import VnRow from 'components/ui/VnRow.vue';
-import VnLocation from 'src/components/common/VnLocation.vue';
 
 const { t } = useI18n();
 const route = useRoute();
diff --git a/src/pages/Supplier/Card/SupplierAgencyTerm.vue b/src/pages/Supplier/Card/SupplierAgencyTerm.vue
index ab21f1f76..fc55fc397 100644
--- a/src/pages/Supplier/Card/SupplierAgencyTerm.vue
+++ b/src/pages/Supplier/Card/SupplierAgencyTerm.vue
@@ -2,10 +2,8 @@
 import { ref } from 'vue';
 import { useRouter, useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-
 import FetchData from 'components/FetchData.vue';
 import CrudModel from 'components/CrudModel.vue';
-import VnRow from 'components/ui/VnRow.vue';
 
 const route = useRoute();
 const router = useRouter();
diff --git a/src/pages/Supplier/Card/SupplierAgencyTermCreate.vue b/src/pages/Supplier/Card/SupplierAgencyTermCreate.vue
index 038eaa356..d9a1cb51e 100644
--- a/src/pages/Supplier/Card/SupplierAgencyTermCreate.vue
+++ b/src/pages/Supplier/Card/SupplierAgencyTermCreate.vue
@@ -2,12 +2,8 @@
 import { useI18n } from 'vue-i18n';
 import { reactive, ref } from 'vue';
 import { useRouter, useRoute } from 'vue-router';
-
 import FetchData from 'components/FetchData.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
 import FormModel from 'components/FormModel.vue';
-import VnRow from 'components/ui/VnRow.vue';
-
 const { t } = useI18n();
 const router = useRouter();
 const route = useRoute();
diff --git a/src/pages/Supplier/Card/SupplierBalance.vue b/src/pages/Supplier/Card/SupplierBalance.vue
index 87eac2abf..371b5034d 100644
--- a/src/pages/Supplier/Card/SupplierBalance.vue
+++ b/src/pages/Supplier/Card/SupplierBalance.vue
@@ -6,9 +6,6 @@ import tableFooter from 'src/components/VnTable/filters/tableFooter';
 import { dashIfEmpty, toCurrency, toDateHourMin } from 'src/filters';
 import { useState } from 'src/composables/useState';
 import { useStateStore } from 'src/stores/useStateStore';
-
-import VnTable from 'src/components/VnTable/VnTable.vue';
-
 import InvoiceInDescriptorProxy from 'src/pages/InvoiceIn/Card/InvoiceInDescriptorProxy.vue';
 import SupplierBalanceFilter from './SupplierBalanceFilter.vue';
 import { onMounted } from 'vue';
diff --git a/src/pages/Supplier/Card/SupplierBalanceFilter.vue b/src/pages/Supplier/Card/SupplierBalanceFilter.vue
index c4b63d9c8..eadb9ef90 100644
--- a/src/pages/Supplier/Card/SupplierBalanceFilter.vue
+++ b/src/pages/Supplier/Card/SupplierBalanceFilter.vue
@@ -1,9 +1,5 @@
 <script setup>
 import { useI18n } from 'vue-i18n';
-import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
-import VnInputDate from 'src/components/common/VnInputDate.vue';
-
 const { t } = useI18n();
 defineProps({
     dataKey: {
diff --git a/src/pages/Supplier/Card/SupplierBasicData.vue b/src/pages/Supplier/Card/SupplierBasicData.vue
index 631700a4a..50421adc7 100644
--- a/src/pages/Supplier/Card/SupplierBasicData.vue
+++ b/src/pages/Supplier/Card/SupplierBasicData.vue
@@ -2,10 +2,6 @@
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import FormModel from 'components/FormModel.vue';
-import VnRow from 'components/ui/VnRow.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
-import VnSelectWorker from 'src/components/common/VnSelectWorker.vue';
 import { useArrayData } from 'src/composables/useArrayData';
 
 const route = useRoute();
diff --git a/src/pages/Supplier/Card/SupplierBillingData.vue b/src/pages/Supplier/Card/SupplierBillingData.vue
index 05c9858d9..dbf409d43 100644
--- a/src/pages/Supplier/Card/SupplierBillingData.vue
+++ b/src/pages/Supplier/Card/SupplierBillingData.vue
@@ -2,11 +2,8 @@
 import { ref } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-
 import FetchData from 'components/FetchData.vue';
 import FormModel from 'components/FormModel.vue';
-import VnRow from 'components/ui/VnRow.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
 
 const route = useRoute();
 const { t } = useI18n();
diff --git a/src/pages/Supplier/Card/SupplierConsumptionFilter.vue b/src/pages/Supplier/Card/SupplierConsumptionFilter.vue
index 390f7d9ff..41531b735 100644
--- a/src/pages/Supplier/Card/SupplierConsumptionFilter.vue
+++ b/src/pages/Supplier/Card/SupplierConsumptionFilter.vue
@@ -1,10 +1,5 @@
 <script setup>
 import { useI18n } from 'vue-i18n';
-import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-import VnInputDate from 'src/components/common/VnInputDate.vue';
-
 const { t } = useI18n();
 defineProps({
     dataKey: {
diff --git a/src/pages/Supplier/Card/SupplierContacts.vue b/src/pages/Supplier/Card/SupplierContacts.vue
index f96d92ab1..49e0dc284 100644
--- a/src/pages/Supplier/Card/SupplierContacts.vue
+++ b/src/pages/Supplier/Card/SupplierContacts.vue
@@ -2,10 +2,7 @@
 import { ref, nextTick } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-
 import CrudModel from 'components/CrudModel.vue';
-import VnRow from 'components/ui/VnRow.vue';
-import VnInput from 'src/components/common/VnInput.vue';
 
 const route = useRoute();
 const { t } = useI18n();
diff --git a/src/pages/Supplier/Card/SupplierDescriptor.vue b/src/pages/Supplier/Card/SupplierDescriptor.vue
index 6a6feb9ef..be3484111 100644
--- a/src/pages/Supplier/Card/SupplierDescriptor.vue
+++ b/src/pages/Supplier/Card/SupplierDescriptor.vue
@@ -2,10 +2,7 @@
 import { ref, computed, onMounted } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-
 import CardDescriptor from 'components/ui/CardDescriptor.vue';
-import VnLv from 'src/components/ui/VnLv.vue';
-
 import { toDateString } from 'src/filters';
 import { getUrl } from 'src/composables/getUrl';
 import filter from './SupplierFilter.js';
diff --git a/src/pages/Supplier/Card/SupplierDms.vue b/src/pages/Supplier/Card/SupplierDms.vue
index 2848f858d..9881a58e6 100644
--- a/src/pages/Supplier/Card/SupplierDms.vue
+++ b/src/pages/Supplier/Card/SupplierDms.vue
@@ -1,6 +1,4 @@
-<script setup>
-import VnDmsList from 'src/components/common/VnDmsList.vue';
-</script>
+<script setup></script>
 <template>
     <VnDmsList
         model="SupplierDms"
diff --git a/src/pages/Supplier/Card/SupplierFiscalData.vue b/src/pages/Supplier/Card/SupplierFiscalData.vue
index ecee5b76b..079eba953 100644
--- a/src/pages/Supplier/Card/SupplierFiscalData.vue
+++ b/src/pages/Supplier/Card/SupplierFiscalData.vue
@@ -2,15 +2,8 @@
 import { ref } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-
 import FetchData from 'components/FetchData.vue';
 import FormModel from 'components/FormModel.vue';
-import VnRow from 'components/ui/VnRow.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
-import VnLocation from 'src/components/common/VnLocation.vue';
-import VnAccountNumber from 'src/components/common/VnAccountNumber.vue';
-import VnCheckbox from 'src/components/common/VnCheckbox.vue';
 
 const route = useRoute();
 const { t } = useI18n();
@@ -185,8 +178,8 @@ function handleLocation(data, location) {
                     />
                     <VnCheckbox
                         v-model="data.isVies"
-                        :label="t('globals.isVies')" 
-                        :info="t('whenActivatingIt')" 
+                        :label="t('globals.isVies')"
+                        :info="t('whenActivatingIt')"
                     />
                 </div>
             </VnRow>
diff --git a/src/pages/Supplier/Card/SupplierLog.vue b/src/pages/Supplier/Card/SupplierLog.vue
index 86ee15fce..252fff148 100644
--- a/src/pages/Supplier/Card/SupplierLog.vue
+++ b/src/pages/Supplier/Card/SupplierLog.vue
@@ -1,6 +1,4 @@
-<script setup>
-import VnLog from 'src/components/common/VnLog.vue';
-</script>
+<script setup></script>
 <template>
     <VnLog model="Supplier" url="/SupplierLogs"></VnLog>
 </template>
diff --git a/src/pages/Supplier/Card/SupplierSummary.vue b/src/pages/Supplier/Card/SupplierSummary.vue
index b658ca5fb..6d8166530 100644
--- a/src/pages/Supplier/Card/SupplierSummary.vue
+++ b/src/pages/Supplier/Card/SupplierSummary.vue
@@ -3,10 +3,7 @@ import { ref, computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import CardSummary from 'components/ui/CardSummary.vue';
-import VnLv from 'src/components/ui/VnLv.vue';
 import { dashIfEmpty } from 'src/filters';
-import VnUserLink from 'src/components/ui/VnUserLink.vue';
-import VnTitle from 'src/components/common/VnTitle.vue';
 
 const route = useRoute();
 const { t } = useI18n();
@@ -76,7 +73,7 @@ const getUrl = (section) => `#/supplier/${entityId.value}/${section}`;
                             {{
                                 dashIfEmpty(
                                     supplier.companySize &&
-                                        t('globals.' + supplier.companySize)
+                                        t('globals.' + supplier.companySize),
                                 )
                             }}
                         </span>
diff --git a/src/pages/Supplier/SupplierCreate.vue b/src/pages/Supplier/SupplierCreate.vue
index 9024f4804..35f7d922e 100644
--- a/src/pages/Supplier/SupplierCreate.vue
+++ b/src/pages/Supplier/SupplierCreate.vue
@@ -2,13 +2,7 @@
 import { reactive } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
-
-import VnSearchbar from 'components/ui/VnSearchbar.vue';
 import FormModel from 'components/FormModel.vue';
-import VnRow from 'components/ui/VnRow.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
-
 import { useStateStore } from 'stores/useStateStore';
 
 const router = useRouter();
diff --git a/src/pages/Supplier/SupplierList.vue b/src/pages/Supplier/SupplierList.vue
index 600790745..866e20465 100644
--- a/src/pages/Supplier/SupplierList.vue
+++ b/src/pages/Supplier/SupplierList.vue
@@ -1,6 +1,8 @@
 <script setup>
 import { computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
+import RightMenu from 'src/components/common/RightMenu.vue';
+import SupplierListFilter from './SupplierListFilter.vue';
 import VnTable from 'components/VnTable/VnTable.vue';
 import VnSection from 'src/components/common/VnSection.vue';
 import VnInput from 'src/components/common/VnInput.vue';
@@ -106,61 +108,36 @@ const columns = computed(() => [
 ]);
 </script>
 <template>
-    <FetchData
-        url="Provinces"
-        :filter="{ fields: ['id', 'name'], order: 'name ASC' }"
-        @on-fetch="(data) => (provincesOptions = data)"
-        auto-load
-    />
-    <VnSection
-        :data-key="dataKey"
-        :columns="columns"
-        prefix="supplier"
-        :array-data-props="{
-            url: 'Suppliers/filter',
-            order: 'id ASC',
+    <VnSearchbar data-key="SuppliersList" :limit="20" :label="t('Search suppliers')" />
+    <RightMenu>
+        <template #right-panel>
+            <SupplierListFilter data-key="SuppliersList" />
+        </template>
+    </RightMenu>
+    <VnTable
+        ref="tableRef"
+        data-key="SuppliersList"
+        url="Suppliers/filter"
+        redirect="supplier"
+        :create="{
+            urlCreate: 'Suppliers/newSupplier',
+            title: t('Create Supplier'),
+            onDataSaved: ({ id }) => tableRef.redirect(id),
+            formInitialData: {},
+            mapper: (data) => {
+                data.name = data.socialName;
+
+                return data;
+            },
         }"
+        :right-search="false"
+        order="id ASC"
+        :columns="columns"
     >
-        <template #body>
-            <VnTable
-                ref="tableRef"
-                :data-key="dataKey"
-                :create="{
-                    urlCreate: 'Suppliers/newSupplier',
-                    title: t('Create Supplier'),
-                    onDataSaved: ({ id }) => tableRef.redirect(id),
-                    formInitialData: {},
-                    mapper: (data) => {
-                        data.name = data.socialName;
-                        delete data.socialName;
-                        return data;
-                    },
-                }"
-                :columns="columns"
-                redirect="supplier"
-                :right-search="false"
-            >
-                <template #more-create-dialog="{ data }">
-                    <VnInput
-                        :label="t('globals.name')"
-                        v-model="data.socialName"
-                        :uppercase="true"
-                    />
-                </template>
-            </VnTable>
-        </template>
-        <template #moreFilterPanel="{ params, searchFn }">
-            <VnSelect
-                :label="t('globals.params.provinceFk')"
-                v-model="params.provinceFk"
-                @update:model-value="searchFn()"
-                :options="provincesOptions"
-                filled
-                dense
-                class="q-px-sm q-pr-lg"
-            />
-        </template>
-    </VnSection>
+        <template #more-create-dialog="{ data }">
+            <VnInput :label="t('globals.name')" v-model="data.socialName" :uppercase="true" />
+            </template>
+    </VnTable>
 </template>
 
 <i18n>
diff --git a/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue b/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
index cf4481537..1ab2428b3 100644
--- a/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
+++ b/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
@@ -2,14 +2,7 @@
 import { ref, computed, onMounted } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
-
 import FetchData from 'components/FetchData.vue';
-import VnRow from 'components/ui/VnRow.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-import VnInputDate from 'src/components/common/VnInputDate.vue';
-import VnInputTime from 'components/common/VnInputTime.vue';
-
 import axios from 'axios';
 import useNotify from 'src/composables/useNotify.js';
 import { useAcl } from 'src/composables/useAcl';
diff --git a/src/pages/Ticket/Card/ExpeditionNewTicket.vue b/src/pages/Ticket/Card/ExpeditionNewTicket.vue
index 6ecadfe6d..33527f787 100644
--- a/src/pages/Ticket/Card/ExpeditionNewTicket.vue
+++ b/src/pages/Ticket/Card/ExpeditionNewTicket.vue
@@ -2,12 +2,7 @@
 import { reactive } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
-
-import VnInput from 'src/components/common/VnInput.vue';
-import VnRow from 'components/ui/VnRow.vue';
 import FormModelPopup from 'components/FormModelPopup.vue';
-import VnInputDate from 'src/components/common/VnInputDate.vue';
-
 import axios from 'axios';
 import useNotify from 'src/composables/useNotify.js';
 
diff --git a/src/pages/Ticket/Card/TicketCard.vue b/src/pages/Ticket/Card/TicketCard.vue
index e22d5799a..9ee831eb3 100644
--- a/src/pages/Ticket/Card/TicketCard.vue
+++ b/src/pages/Ticket/Card/TicketCard.vue
@@ -1,5 +1,4 @@
 <script setup>
-import VnCardBeta from 'components/common/VnCardBeta.vue';
 import TicketDescriptor from './TicketDescriptor.vue';
 import filter from './TicketFilter.js';
 </script>
diff --git a/src/pages/Ticket/Card/TicketComponents.vue b/src/pages/Ticket/Card/TicketComponents.vue
index 5936ffc28..381c88940 100644
--- a/src/pages/Ticket/Card/TicketComponents.vue
+++ b/src/pages/Ticket/Card/TicketComponents.vue
@@ -2,18 +2,14 @@
 import { ref, computed, watch, nextTick } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
-
 import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
 import FetchedTags from 'components/ui/FetchedTags.vue';
 import FetchData from 'components/FetchData.vue';
 import ZoneDescriptorProxy from 'src/pages/Zone/Card/ZoneDescriptorProxy.vue';
-import VnImg from 'src/components/ui/VnImg.vue';
-
 import { dashIfEmpty } from 'src/filters';
 import { useArrayData } from 'composables/useArrayData';
 import { toCurrency } from 'filters/index';
 import axios from 'axios';
-import VnTable from 'src/components/VnTable/VnTable.vue';
 import RightMenu from 'src/components/common/RightMenu.vue';
 
 const route = useRoute();
@@ -38,7 +34,7 @@ watch(
         if (ticketData.value?.zone && ticketData.value?.zone?.isVolumetric)
             getTicketVolume();
     },
-    { immediate: true }
+    { immediate: true },
 );
 
 const salesFilter = computed(() => ({
diff --git a/src/pages/Ticket/Card/TicketCreateRequest.vue b/src/pages/Ticket/Card/TicketCreateRequest.vue
index b1e5d903b..7841de7da 100644
--- a/src/pages/Ticket/Card/TicketCreateRequest.vue
+++ b/src/pages/Ticket/Card/TicketCreateRequest.vue
@@ -2,11 +2,7 @@
 import { ref } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-
 import FormModelPopup from 'components/FormModelPopup.vue';
-import VnRow from 'components/ui/VnRow.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
 import FetchData from 'components/FetchData.vue';
 
 const emit = defineEmits(['onRequestCreated']);
diff --git a/src/pages/Ticket/Card/TicketCreateServiceType.vue b/src/pages/Ticket/Card/TicketCreateServiceType.vue
index 2f5857e86..10733fb1a 100644
--- a/src/pages/Ticket/Card/TicketCreateServiceType.vue
+++ b/src/pages/Ticket/Card/TicketCreateServiceType.vue
@@ -1,9 +1,6 @@
 <script setup>
 import { reactive, ref, onMounted, nextTick } from 'vue';
 import { useI18n } from 'vue-i18n';
-import VnInput from 'src/components/common/VnInput.vue';
-
-import VnRow from 'components/ui/VnRow.vue';
 import FormModelPopup from 'components/FormModelPopup.vue';
 
 const { t } = useI18n();
diff --git a/src/pages/Ticket/Card/TicketCreateTracking.vue b/src/pages/Ticket/Card/TicketCreateTracking.vue
index 5c1e916f2..69d55bf6d 100644
--- a/src/pages/Ticket/Card/TicketCreateTracking.vue
+++ b/src/pages/Ticket/Card/TicketCreateTracking.vue
@@ -2,14 +2,9 @@
 import { ref } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-
 import FormModelPopup from 'components/FormModelPopup.vue';
-import VnRow from 'components/ui/VnRow.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
 import FetchData from 'components/FetchData.vue';
-
 import { useState } from 'src/composables/useState';
-import VnSelectWorker from 'src/components/common/VnSelectWorker.vue';
 
 const emit = defineEmits(['onRequestCreated']);
 
diff --git a/src/pages/Ticket/Card/TicketDescriptor.vue b/src/pages/Ticket/Card/TicketDescriptor.vue
index 762db19bf..260bd51d5 100644
--- a/src/pages/Ticket/Card/TicketDescriptor.vue
+++ b/src/pages/Ticket/Card/TicketDescriptor.vue
@@ -5,12 +5,12 @@ import { useI18n } from 'vue-i18n';
 import CustomerDescriptorProxy from 'pages/Customer/Card/CustomerDescriptorProxy.vue';
 import CardDescriptor from 'components/ui/CardDescriptor.vue';
 import TicketDescriptorMenu from './TicketDescriptorMenu.vue';
-import VnLv from 'src/components/ui/VnLv.vue';
-import VnUserLink from 'src/components/ui/VnUserLink.vue';
+import useCardDescription from 'src/composables/useCardDescription';
 import { toDateTimeFormat } from 'src/filters/date';
 import filter from './TicketFilter.js';
 import FetchData from 'src/components/FetchData.vue';
 import TicketProblems from 'src/components/TicketProblems.vue';
+import VnUserLink from 'src/components/ui/VnUserLink.vue';
 
 const $props = defineProps({
     id: {
diff --git a/src/pages/Ticket/Card/TicketDescriptorMenu.vue b/src/pages/Ticket/Card/TicketDescriptorMenu.vue
index 63e45c8ab..022ebf6a3 100644
--- a/src/pages/Ticket/Card/TicketDescriptorMenu.vue
+++ b/src/pages/Ticket/Card/TicketDescriptorMenu.vue
@@ -6,18 +6,14 @@ import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
 import { usePrintService } from 'composables/usePrintService';
 import SendEmailDialog from 'components/common/SendEmailDialog.vue';
-import VnConfirm from 'components/ui/VnConfirm.vue';
-import VnSmsDialog from 'components/common/VnSmsDialog.vue';
 import toDate from 'filters/toDate';
 import FormPopup from 'components/FormPopup.vue';
-import VnSelect from 'components/common/VnSelect.vue';
 import FetchData from 'components/FetchData.vue';
-import VnInputTime from 'src/components/common/VnInputTime.vue';
 import { useAcl } from 'src/composables/useAcl';
-import VnInputNumber from 'src/components/common/VnInputNumber.vue';
 import { useArrayData } from 'src/composables/useArrayData';
 import { getAddresses } from 'src/pages/Customer/composables/getAddresses';
 import { getClient } from 'src/pages/Customer/composables/getClient';
+import VnConfirm from 'components/ui/VnConfirm.vue';
 
 const props = defineProps({
     ticket: {
@@ -32,7 +28,7 @@ onMounted(() => {
 
 watch(
     () => props.ticket,
-    () => restoreTicket
+    () => restoreTicket,
 );
 
 const { push, currentRoute } = useRouter();
@@ -58,7 +54,7 @@ const hasDocuwareFile = ref();
 const quasar = useQuasar();
 const canRestoreTicket = ref(false);
 
-const onClientSelected = async(clientId) =>{
+const onClientSelected = async (clientId) => {
     client.value = clientId;
     await fetchClient();
     await fetchAddresses();
@@ -66,10 +62,10 @@ const onClientSelected = async(clientId) =>{
 
 const onAddressSelected = (addressId) => {
     address.value = addressId;
-}
+};
 
 const fetchClient = async () => {
-    const response = await getClient(client.value)
+    const response = await getClient(client.value);
     if (!response) return;
     const [retrievedClient] = response.data;
     selectedClient.value = retrievedClient;
@@ -151,7 +147,7 @@ function openDeliveryNote(type = 'deliveryNote', documentType = 'pdf') {
             recipientId: ticket.value.clientFk,
             type: type,
         },
-        '_blank'
+        '_blank',
     );
 }
 
@@ -297,8 +293,8 @@ async function transferClient() {
         clientFk: client.value,
         addressFk: address.value,
     };
-    
-    await axios.patch( `Tickets/${ticketId.value}/transferClient`, params );
+
+    await axios.patch(`Tickets/${ticketId.value}/transferClient`, params);
     window.location.reload();
 }
 
@@ -339,7 +335,7 @@ async function changeShippedHour(time) {
 
     const { data } = await axios.post(
         `Tickets/${ticketId.value}/updateEditableTicket`,
-        params
+        params,
     );
 
     if (data) window.location.reload();
@@ -500,7 +496,7 @@ async function ticketToRestore() {
                         </QItem>
                     </template>
                 </VnSelect>
-                <VnSelect 
+                <VnSelect
                     :disable="!client"
                     :options="addressesOptions"
                     :fields="['id', 'nickname']"
@@ -815,7 +811,7 @@ async function ticketToRestore() {
 en:
     addTurn: Add turn
     invoiceIds: "Invoices have been generated with the following ids: {invoiceIds}"
- 
+
 es:
     Show Delivery Note...: Ver albarán...
     Send Delivery Note...: Enviar albarán...
diff --git a/src/pages/Ticket/Card/TicketDms.vue b/src/pages/Ticket/Card/TicketDms.vue
index cd998620f..9b1887cb1 100644
--- a/src/pages/Ticket/Card/TicketDms.vue
+++ b/src/pages/Ticket/Card/TicketDms.vue
@@ -1,8 +1,6 @@
 <script setup>
 import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
-
-import VnDmsList from 'src/components/common/VnDmsList.vue';
 import TicketDmsImportForm from 'src/pages/Ticket/Card/TicketDmsImportForm.vue';
 
 const { t } = useI18n();
diff --git a/src/pages/Ticket/Card/TicketDmsImportForm.vue b/src/pages/Ticket/Card/TicketDmsImportForm.vue
index 4b6b9c6cd..c29c59618 100644
--- a/src/pages/Ticket/Card/TicketDmsImportForm.vue
+++ b/src/pages/Ticket/Card/TicketDmsImportForm.vue
@@ -2,9 +2,6 @@
 import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
-
-import VnSelect from 'src/components/common/VnSelect.vue';
-import VnRow from 'components/ui/VnRow.vue';
 import FormModelPopup from 'components/FormModelPopup.vue';
 import FetchData from 'components/FetchData.vue';
 
diff --git a/src/pages/Ticket/Card/TicketEditMana.vue b/src/pages/Ticket/Card/TicketEditMana.vue
index 693875712..297d49343 100644
--- a/src/pages/Ticket/Card/TicketEditMana.vue
+++ b/src/pages/Ticket/Card/TicketEditMana.vue
@@ -2,7 +2,6 @@
 import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { toCurrency } from 'src/filters';
-import VnUsesMana from 'components/ui/VnUsesMana.vue';
 
 const $props = defineProps({
     mana: {
diff --git a/src/pages/Ticket/Card/TicketExpedition.vue b/src/pages/Ticket/Card/TicketExpedition.vue
index f8084ff2f..9e3afeb65 100644
--- a/src/pages/Ticket/Card/TicketExpedition.vue
+++ b/src/pages/Ticket/Card/TicketExpedition.vue
@@ -2,20 +2,15 @@
 import { onMounted, ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
-
 import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
-import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import ExpeditionNewTicket from './ExpeditionNewTicket.vue';
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
-
 import { useStateStore } from 'stores/useStateStore';
 import { useArrayData } from 'composables/useArrayData';
 import { useVnConfirm } from 'composables/useVnConfirm';
 import useNotify from 'src/composables/useNotify.js';
 import { toDateTimeFormat } from 'src/filters/date';
 import axios from 'axios';
-import VnTable from 'src/components/VnTable/VnTable.vue';
-import VnBtnSelect from 'src/components/common/VnBtnSelect.vue';
 import FetchData from 'src/components/FetchData.vue';
 import useOpenURL from 'src/composables/useOpenURL';
 
@@ -201,7 +196,7 @@ const getExpeditionState = async (expedition) => {
 
 const openGrafana = (expeditionFk) => {
     useOpenURL(
-        `https://grafana.verdnatura.es/d/de1njb6p5answd/control-de-expediciones?orgId=1&var-expeditionFk=${expeditionFk}`
+        `https://grafana.verdnatura.es/d/de1njb6p5answd/control-de-expediciones?orgId=1&var-expeditionFk=${expeditionFk}`,
     );
 };
 
@@ -287,7 +282,7 @@ onMounted(async () => {
                         openConfirmationModal(
                             '',
                             t('expedition.removeExpeditionSubtitle'),
-                            deleteExpedition
+                            deleteExpedition,
                         )
                     "
                 >
diff --git a/src/pages/Ticket/Card/TicketNotes.vue b/src/pages/Ticket/Card/TicketNotes.vue
index feb88bf84..d6aacb202 100644
--- a/src/pages/Ticket/Card/TicketNotes.vue
+++ b/src/pages/Ticket/Card/TicketNotes.vue
@@ -2,11 +2,7 @@
 import { ref, watch, computed, reactive } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-
 import CrudModel from 'components/CrudModel.vue';
-import VnRow from 'components/ui/VnRow.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
 import FetchData from 'components/FetchData.vue';
 
 import { useArrayData } from 'src/composables/useArrayData';
diff --git a/src/pages/Ticket/Card/TicketPackage.vue b/src/pages/Ticket/Card/TicketPackage.vue
index 8bfb73682..c511e9cbe 100644
--- a/src/pages/Ticket/Card/TicketPackage.vue
+++ b/src/pages/Ticket/Card/TicketPackage.vue
@@ -2,15 +2,9 @@
 import { ref, watch, computed, reactive } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-
 import CrudModel from 'components/CrudModel.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
 import FetchData from 'components/FetchData.vue';
-import VnInputDate from 'src/components/common/VnInputDate.vue';
-
 import { useArrayData } from 'src/composables/useArrayData';
-import VnRow from 'src/components/ui/VnRow.vue';
 
 const route = useRoute();
 const { t } = useI18n();
diff --git a/src/pages/Ticket/Card/TicketPurchaseRequest.vue b/src/pages/Ticket/Card/TicketPurchaseRequest.vue
index 4e77c7277..a2ae557ab 100644
--- a/src/pages/Ticket/Card/TicketPurchaseRequest.vue
+++ b/src/pages/Ticket/Card/TicketPurchaseRequest.vue
@@ -8,9 +8,6 @@ import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.v
 import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
 import { dashIfEmpty } from 'src/filters';
 import { toDateFormat } from 'src/filters/date.js';
-import VnTable from 'src/components/VnTable/VnTable.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
 import FetchData from 'src/components/FetchData.vue';
 import { useVnConfirm } from 'composables/useVnConfirm';
 import useNotify from 'src/composables/useNotify.js';
@@ -30,7 +27,7 @@ watch(
     async (val) => {
         crudModelFilter.where.ticketFk = val;
         tableRef.value.reload();
-    }
+    },
 );
 
 const crudModelFilter = reactive({
@@ -149,9 +146,9 @@ const columns = computed(() => [
                     openConfirmationModal(
                         t('You are going to delete this ticket purchase request'),
                         t(
-                            'This ticket will be removed from ticket purchase requests! Continue anyway?'
+                            'This ticket will be removed from ticket purchase requests! Continue anyway?',
                         ),
-                        () => removeLine(row.id)
+                        () => removeLine(row.id),
                     ),
             },
         ],
diff --git a/src/pages/Ticket/Card/TicketSaleMoreActions.vue b/src/pages/Ticket/Card/TicketSaleMoreActions.vue
index 4cc96e9e2..7233b5a57 100644
--- a/src/pages/Ticket/Card/TicketSaleMoreActions.vue
+++ b/src/pages/Ticket/Card/TicketSaleMoreActions.vue
@@ -6,7 +6,6 @@ import { useRouter } from 'vue-router';
 
 import VnSmsDialog from 'components/common/VnSmsDialog.vue';
 import TicketEditManaProxy from './TicketEditMana.vue';
-import VnInput from 'src/components/common/VnInput.vue';
 
 import useNotify from 'src/composables/useNotify.js';
 import axios from 'axios';
@@ -131,13 +130,13 @@ const createClaim = () => {
         openConfirmationModal(
             t('Claim out of time'),
             t('Do you want to continue?'),
-            onCreateClaimAccepted
+            onCreateClaimAccepted,
         );
     else
         openConfirmationModal(
             t('Do you want to create a claim?'),
             false,
-            onCreateClaimAccepted
+            onCreateClaimAccepted,
         );
 };
 
diff --git a/src/pages/Ticket/Card/TicketSaleTracking.vue b/src/pages/Ticket/Card/TicketSaleTracking.vue
index 7a33df795..47df93429 100644
--- a/src/pages/Ticket/Card/TicketSaleTracking.vue
+++ b/src/pages/Ticket/Card/TicketSaleTracking.vue
@@ -2,11 +2,8 @@
 import { ref, computed, nextTick, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
-
 import FetchData from 'components/FetchData.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 ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
 
@@ -31,7 +28,7 @@ const oldQuantity = ref(null);
 
 watch(
     () => route.params.id,
-    async () => nextTick(async () => await saleTrackingFetchDataRef.value.fetch())
+    async () => nextTick(async () => await saleTrackingFetchDataRef.value.fetch()),
 );
 
 const columns = computed(() => [
@@ -212,7 +209,7 @@ const updateShelving = async (sale) => {
 
     const { data: patchResponseData } = await axios.patch(
         `ItemShelvings/${sale.itemShelvingFk}`,
-        params
+        params,
     );
     const filter = {
         fields: ['parkingFk'],
diff --git a/src/pages/Ticket/Card/TicketService.vue b/src/pages/Ticket/Card/TicketService.vue
index 6ce69a6aa..0c721da99 100644
--- a/src/pages/Ticket/Card/TicketService.vue
+++ b/src/pages/Ticket/Card/TicketService.vue
@@ -2,13 +2,9 @@
 import { ref, watch, computed, onMounted } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-
 import CrudModel from 'components/CrudModel.vue';
-import VnSelectDialog from 'src/components/common/VnSelectDialog.vue';
 import FetchData from 'components/FetchData.vue';
 import TicketCreateServiceType from './TicketCreateServiceType.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-
 import { useArrayData } from 'src/composables/useArrayData';
 import useNotify from 'src/composables/useNotify.js';
 import axios from 'axios';
diff --git a/src/pages/Ticket/Card/TicketSms.vue b/src/pages/Ticket/Card/TicketSms.vue
index ff7de6611..89d38a8ea 100644
--- a/src/pages/Ticket/Card/TicketSms.vue
+++ b/src/pages/Ticket/Card/TicketSms.vue
@@ -1,7 +1,5 @@
 <script setup>
 import { useRoute } from 'vue-router';
-import VnSms from 'src/components/ui/VnSms.vue';
-
 const route = useRoute();
 const id = route.params.id;
 
diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index 5df08b881..218801f5a 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -8,17 +8,11 @@ import { dashIfEmpty, toDate, toCurrency } from 'src/filters';
 import CardSummary from 'components/ui/CardSummary.vue';
 import FetchedTags from 'components/ui/FetchedTags.vue';
 import InvoiceOutDescriptorProxy from 'pages/InvoiceOut/Card/InvoiceOutDescriptorProxy.vue';
-import VnLv from 'src/components/ui/VnLv.vue';
-import VnLinkPhone from 'src/components/ui/VnLinkPhone.vue';
 import { getUrl } from 'src/composables/getUrl';
 import useNotify from 'src/composables/useNotify.js';
 import { useArrayData } from 'composables/useArrayData';
-import VnUserLink from 'src/components/ui/VnUserLink.vue';
-import VnTitle from 'src/components/common/VnTitle.vue';
 import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
 import ZoneDescriptorProxy from 'src/pages/Zone/Card/ZoneDescriptorProxy.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
-import VnToSummary from 'src/components/ui/VnToSummary.vue';
 import TicketDescriptorMenu from './TicketDescriptorMenu.vue';
 import TicketProblems from 'src/components/TicketProblems.vue';
 
diff --git a/src/pages/Ticket/Card/TicketTracking.vue b/src/pages/Ticket/Card/TicketTracking.vue
index acf464fb1..b6b4f7c83 100644
--- a/src/pages/Ticket/Card/TicketTracking.vue
+++ b/src/pages/Ticket/Card/TicketTracking.vue
@@ -5,8 +5,6 @@ import { useRoute } from 'vue-router';
 
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
 import TicketCreateTracking from './TicketCreateTracking.vue';
-import VnPaginate from 'components/ui/VnPaginate.vue';
-
 import { toDateTimeFormat } from 'src/filters/date.js';
 
 const route = useRoute();
diff --git a/src/pages/Ticket/Card/TicketTransfer.vue b/src/pages/Ticket/Card/TicketTransfer.vue
index 005d74a0e..2be642158 100644
--- a/src/pages/Ticket/Card/TicketTransfer.vue
+++ b/src/pages/Ticket/Card/TicketTransfer.vue
@@ -1,10 +1,7 @@
 <script setup>
 import { ref, computed, onMounted } from 'vue';
 import { useI18n } from 'vue-i18n';
-
-import VnInput from 'src/components/common/VnInput.vue';
 import TicketTransferForm from './TicketTransferForm.vue';
-
 import { toDateFormat } from 'src/filters/date.js';
 
 const $props = defineProps({
diff --git a/src/pages/Ticket/Card/TicketTransferForm.vue b/src/pages/Ticket/Card/TicketTransferForm.vue
index ece3a3b97..a240d425d 100644
--- a/src/pages/Ticket/Card/TicketTransferForm.vue
+++ b/src/pages/Ticket/Card/TicketTransferForm.vue
@@ -2,9 +2,6 @@
 import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
-
-import VnInput from 'src/components/common/VnInput.vue';
-
 import axios from 'axios';
 
 const $props = defineProps({
@@ -41,7 +38,7 @@ const transferSales = async (ticketId) => {
 
     const { data } = await axios.post(
         `tickets/${$props.ticket.id}/transferSales`,
-        params
+        params,
     );
 
     if (data && data.id === $props.ticket.id) emit('refreshData');
diff --git a/src/pages/Ticket/Card/TicketVolume.vue b/src/pages/Ticket/Card/TicketVolume.vue
index 71b16f878..5778a229d 100644
--- a/src/pages/Ticket/Card/TicketVolume.vue
+++ b/src/pages/Ticket/Card/TicketVolume.vue
@@ -2,15 +2,12 @@
 import { ref, computed, onMounted, watch, nextTick } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
-
 import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
 import FetchedTags from 'components/ui/FetchedTags.vue';
 import FetchData from 'components/FetchData.vue';
-
 import { useStateStore } from 'stores/useStateStore';
 import { dashIfEmpty } from 'src/filters';
 import axios from 'axios';
-import VnTable from 'src/components/VnTable/VnTable.vue';
 import RightMenu from 'src/components/common/RightMenu.vue';
 
 const route = useRoute();
diff --git a/src/pages/Ticket/TicketAdvance.vue b/src/pages/Ticket/TicketAdvance.vue
index 05bd14075..d3eb4744d 100644
--- a/src/pages/Ticket/TicketAdvance.vue
+++ b/src/pages/Ticket/TicketAdvance.vue
@@ -3,8 +3,6 @@ import { ref, computed, reactive, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
 import FetchData from 'components/FetchData.vue';
 import TicketDescriptorProxy from 'src/pages/Ticket/Card/TicketDescriptorProxy.vue';
-import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
-import VnProgress from 'src/components/common/VnProgressModal.vue';
 import RightMenu from 'src/components/common/RightMenu.vue';
 import TicketAdvanceFilter from './TicketAdvanceFilter.vue';
 import { dashIfEmpty, toCurrency } from 'src/filters';
@@ -13,7 +11,6 @@ import useNotify from 'src/composables/useNotify.js';
 import { useState } from 'src/composables/useState';
 import { toDateFormat } from 'src/filters/date.js';
 import axios from 'axios';
-import VnTable from 'src/components/VnTable/VnTable.vue';
 
 const state = useState();
 const { t } = useI18n();
@@ -285,7 +282,7 @@ const progressAdd = () => {
             t('advanceTickets.moveTicketSuccess', {
                 ticketsNumber: progressLength.value - splitErrors.value.length,
             }),
-            'positive'
+            'positive',
         );
     }
 };
@@ -345,16 +342,16 @@ watch(
         originElRef.value.setAttribute('colspan', '9');
 
         destinationElRef.value.textContent = `${t(
-            'advanceTickets.destination'
+            'advanceTickets.destination',
         )} ${toDateFormat(vnTableRef.value.params.dateToAdvance)}`;
         originElRef.value.textContent = `${t('advanceTickets.origin')} ${toDateFormat(
-            vnTableRef.value.params.dateFuture
+            vnTableRef.value.params.dateFuture,
         )}`;
 
         newRow.append(destinationElRef.value, originElRef.value);
         head.insertBefore(newRow, firstRow);
     },
-    { once: true, inmmediate: true }
+    { once: true, inmmediate: true },
 );
 
 watch(
@@ -362,14 +359,14 @@ watch(
     () => {
         if (originElRef.value && destinationElRef.value) {
             destinationElRef.value.textContent = `${t(
-                'advanceTickets.destination'
+                'advanceTickets.destination',
             )} ${toDateFormat(vnTableRef.value.params.dateToAdvance)}`;
             originElRef.value.textContent = `${t('advanceTickets.origin')} ${toDateFormat(
-                vnTableRef.value.params.dateFuture
+                vnTableRef.value.params.dateFuture,
             )}`;
         }
     },
-    { deep: true }
+    { deep: true },
 );
 </script>
 <template>
@@ -405,7 +402,7 @@ watch(
                         t(`advanceTickets.advanceTitleSubtitle`, {
                             selectedTickets: selectedTickets.length,
                         }),
-                        moveTicketsAdvance
+                        moveTicketsAdvance,
                     )
                 "
             >
@@ -423,7 +420,7 @@ watch(
                         t(`advanceTickets.advanceWithoutNegativeSubtitle`, {
                             selectedTickets: selectedTickets.length,
                         }),
-                        splitTickets
+                        splitTickets,
                     )
                 "
             >
diff --git a/src/pages/Ticket/TicketAdvanceFilter.vue b/src/pages/Ticket/TicketAdvanceFilter.vue
index 6d5c7726e..e0e8f91b2 100644
--- a/src/pages/Ticket/TicketAdvanceFilter.vue
+++ b/src/pages/Ticket/TicketAdvanceFilter.vue
@@ -3,13 +3,8 @@ import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 
 import FetchData from 'components/FetchData.vue';
-import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
-import VnSelect from 'components/common/VnSelect.vue';
-import VnInputDate from 'src/components/common/VnInputDate.vue';
-
 import axios from 'axios';
 import { onMounted } from 'vue';
-import VnInputNumber from 'src/components/common/VnInputNumber.vue';
 
 const { t, te } = useI18n();
 const props = defineProps({
diff --git a/src/pages/Ticket/TicketCreate.vue b/src/pages/Ticket/TicketCreate.vue
index 96d200547..95780067b 100644
--- a/src/pages/Ticket/TicketCreate.vue
+++ b/src/pages/Ticket/TicketCreate.vue
@@ -5,10 +5,6 @@ import { useI18n } from 'vue-i18n';
 
 import FormModel from 'components/FormModel.vue';
 import FetchData from 'components/FetchData.vue';
-import VnRow from 'components/ui/VnRow.vue';
-import VnSelect from 'components/common/VnSelect.vue';
-import VnInputDate from 'components/common/VnInputDate.vue';
-import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import { getClient } from 'src/pages/Customer/composables/getClient';
 import { getAddresses } from 'src/pages/Customer/composables/getAddresses';
 import { getAgencies } from 'src/pages/Route/Agency/composables/getAgencies';
@@ -67,14 +63,12 @@ const onClientSelected = async (formData) => {
 
 const fetchAvailableAgencies = async (formData) => {
     resetAgenciesSelector(formData);
-    const response= await getAgencies(formData, selectedClient.value);
+    const response = await getAgencies(formData, selectedClient.value);
     if (!response) return;
-    
-    const { options, agency } =  response
-    if(options)
-        agenciesOptions.value = options;
-    if(agency)
-        formData.agencyModeId = agency;
+
+    const { options, agency } = response;
+    if (options) agenciesOptions.value = options;
+    if (agency) formData.agencyModeId = agency;
 };
 
 const redirectToTicketList = (_, { id }) => {
diff --git a/src/pages/Ticket/TicketCreateDialog.vue b/src/pages/Ticket/TicketCreateDialog.vue
index 2245c5c81..0ee70e80d 100644
--- a/src/pages/Ticket/TicketCreateDialog.vue
+++ b/src/pages/Ticket/TicketCreateDialog.vue
@@ -3,12 +3,8 @@ import { useRoute, useRouter } from 'vue-router';
 import { onBeforeMount, reactive, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useDialogPluginComponent } from 'quasar';
-
 import FormModelPopup from 'components/FormModelPopup.vue';
 import FetchData from 'components/FetchData.vue';
-import VnRow from 'components/ui/VnRow.vue';
-import VnSelect from 'components/common/VnSelect.vue';
-import VnInputDate from 'components/common/VnInputDate.vue';
 import { getClient } from 'src/pages/Customer/composables/getClient';
 import { getAddresses } from 'src/pages/Customer/composables/getAddresses';
 import { getAgencies } from 'src/pages/Route/Agency/composables/getAgencies';
@@ -40,7 +36,7 @@ onBeforeMount(async () => {
 
 function resetAgenciesSelector(formData) {
     agenciesOptions.value = [];
-    if(formData) formData.agencyModeId = null;
+    if (formData) formData.agencyModeId = null;
 }
 
 const fetchClient = async (formData) => {
@@ -67,14 +63,12 @@ const onClientSelected = async (formData) => {
 
 const fetchAvailableAgencies = async (formData) => {
     resetAgenciesSelector(formData);
-    const response= await getAgencies(formData, selectedClient.value);
+    const response = await getAgencies(formData, selectedClient.value);
     if (!response) return;
-        
-    const { options, agency } =  response
-    if(options)
-        agenciesOptions.value = options;
-    if(agency)
-        formData.agencyModeId = agency;
+
+    const { options, agency } = response;
+    if (options) agenciesOptions.value = options;
+    if (agency) formData.agencyModeId = agency;
 };
 
 const redirectToTicketList = (_, { id }) => {
diff --git a/src/pages/Ticket/TicketFilter.vue b/src/pages/Ticket/TicketFilter.vue
index 4b50892b0..d5d877498 100644
--- a/src/pages/Ticket/TicketFilter.vue
+++ b/src/pages/Ticket/TicketFilter.vue
@@ -1,13 +1,7 @@
 <script setup>
 import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
-
 import FetchData from 'components/FetchData.vue';
-import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-import VnInputDate from 'components/common/VnInputDate.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
-import VnSelectWorker from 'src/components/common/VnSelectWorker.vue';
 
 const { t } = useI18n();
 const props = defineProps({
diff --git a/src/pages/Ticket/TicketFuture.vue b/src/pages/Ticket/TicketFuture.vue
index e8e2dd775..e69f1a714 100644
--- a/src/pages/Ticket/TicketFuture.vue
+++ b/src/pages/Ticket/TicketFuture.vue
@@ -1,16 +1,10 @@
 <script setup>
 import { onMounted, ref, computed, reactive } from 'vue';
 import { useI18n } from 'vue-i18n';
-
 import FetchData from 'components/FetchData.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
 import TicketDescriptorProxy from 'src/pages/Ticket/Card/TicketDescriptorProxy.vue';
-import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
-import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 import RightMenu from 'src/components/common/RightMenu.vue';
 import TicketFutureFilter from './TicketFutureFilter.vue';
-
 import { dashIfEmpty, toCurrency } from 'src/filters';
 import { useVnConfirm } from 'composables/useVnConfirm';
 import { useArrayData } from 'composables/useArrayData';
@@ -293,7 +287,7 @@ onMounted(async () => {
                         t(`futureTickets.moveTicketDialogSubtitle`, {
                             selectedTickets: selectedTickets.length,
                         }),
-                        moveTicketsFuture
+                        moveTicketsFuture,
                     )
                 "
             >
diff --git a/src/pages/Ticket/TicketFutureFilter.vue b/src/pages/Ticket/TicketFutureFilter.vue
index d28b0af71..a8c0b83ab 100644
--- a/src/pages/Ticket/TicketFutureFilter.vue
+++ b/src/pages/Ticket/TicketFutureFilter.vue
@@ -1,13 +1,7 @@
 <script setup>
 import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
-
 import FetchData from 'components/FetchData.vue';
-import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
-import VnSelect from 'components/common/VnSelect.vue';
-import VnInputDate from 'src/components/common/VnInputDate.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-
 import axios from 'axios';
 import { onMounted } from 'vue';
 
diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index 8df19c0d9..3c934707b 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -9,19 +9,13 @@ import { toDate, toCurrency, dashIfEmpty } from 'src/filters/index';
 import useNotify from 'src/composables/useNotify';
 import TicketSummary from './Card/TicketSummary.vue';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
-import VnTable from 'src/components/VnTable/VnTable.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
-import VnInputDate from 'src/components/common/VnInputDate.vue';
-import VnRow from 'src/components/ui/VnRow.vue';
 import TicketFilter from './TicketFilter.vue';
-import VnInput from 'src/components/common/VnInput.vue';
 import FetchData from 'src/components/FetchData.vue';
 import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
 import ZoneDescriptorProxy from 'src/pages/Zone/Card/ZoneDescriptorProxy.vue';
 import { toTimeFormat } from 'src/filters/date';
 import InvoiceOutDescriptorProxy from 'src/pages/InvoiceOut/Card/InvoiceOutDescriptorProxy.vue';
 import TicketProblems from 'src/components/TicketProblems.vue';
-import VnSection from 'src/components/common/VnSection.vue';
 import { getClient } from 'src/pages/Customer/composables/getClient';
 import { getAddresses } from 'src/pages/Customer/composables/getAddresses';
 import { getAgencies } from 'src/pages/Route/Agency/composables/getAgencies';
@@ -232,7 +226,7 @@ const columns = computed(() => [
 
 function resetAgenciesSelector(formData) {
     agenciesOptions.value = [];
-    if(formData) formData.agencyModeId = null;
+    if (formData) formData.agencyModeId = null;
 }
 
 function redirectToLines(id) {
@@ -240,7 +234,7 @@ function redirectToLines(id) {
     window.open(url, '_blank');
 }
 
-const onClientSelected = async (formData) => {    
+const onClientSelected = async (formData) => {
     resetAgenciesSelector(formData);
     await fetchClient(formData);
     await fetchAddresses(formData);
@@ -248,14 +242,12 @@ const onClientSelected = async (formData) => {
 
 const fetchAvailableAgencies = async (formData) => {
     resetAgenciesSelector(formData);
-    const response= await getAgencies(formData, selectedClient.value);
+    const response = await getAgencies(formData, selectedClient.value);
     if (!response) return;
-    
-    const { options, agency } =  response
-    if(options)
-        agenciesOptions.value = options;
-    if(agency)
-        formData.agencyModeId = agency;
+
+    const { options, agency } = response;
+    if (options) agenciesOptions.value = options;
+    if (agency) formData.agencyModeId = agency;
 };
 
 const fetchClient = async (formData) => {
@@ -330,7 +322,7 @@ function openBalanceDialog(ticket) {
     const description = ref([]);
     const firstTicketClientId = checkedTickets[0].clientFk;
     const isSameClient = checkedTickets.every(
-        (ticket) => ticket.clientFk === firstTicketClientId
+        (ticket) => ticket.clientFk === firstTicketClientId,
     );
 
     if (!isSameClient) {
@@ -369,7 +361,7 @@ async function onSubmit() {
             description: dialogData.value.value.description,
             clientFk: dialogData.value.value.clientFk,
             email: email[0].email,
-        }
+        },
     );
 
     if (data) notify('globals.dataSaved', 'positive');
@@ -388,32 +380,32 @@ function setReference(data) {
     switch (data) {
         case 1:
             newDescription = `${t(
-                'ticketList.creditCard'
+                'ticketList.creditCard',
             )}, ${dialogData.value.value.description.replace(
                 /^(Credit Card, |Cash, |Transfers, )/,
-                ''
+                '',
             )}`;
             break;
         case 2:
             newDescription = `${t(
-                'ticketList.cash'
+                'ticketList.cash',
             )}, ${dialogData.value.value.description.replace(
                 /^(Credit Card, |Cash, |Transfers, )/,
-                ''
+                '',
             )}`;
             break;
         case 3:
             newDescription = `${newDescription.replace(
                 /^(Credit Card, |Cash, |Transfers, )/,
-                ''
+                '',
             )}`;
             break;
         case 4:
             newDescription = `${t(
-                'ticketList.transfers'
+                'ticketList.transfers',
             )}, ${dialogData.value.value.description.replace(
                 /^(Credit Card, |Cash, |Transfers, )/,
-                ''
+                '',
             )}`;
             break;
         case 3317:
diff --git a/src/pages/Ticket/TicketWeekly.vue b/src/pages/Ticket/TicketWeekly.vue
index 0e18fe028..6a005f889 100644
--- a/src/pages/Ticket/TicketWeekly.vue
+++ b/src/pages/Ticket/TicketWeekly.vue
@@ -1,18 +1,14 @@
 <script setup>
 import { onMounted, ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
-import VnSelect from 'src/components/common/VnSelect.vue';
-import VnSelectCache from 'src/components/common/VnSelectCache.vue';
 import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
 import TicketDescriptorProxy from 'src/pages/Ticket/Card/TicketDescriptorProxy.vue';
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
-import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 import { useStateStore } from 'stores/useStateStore';
 import { useVnConfirm } from 'composables/useVnConfirm';
 import { useArrayData } from 'composables/useArrayData';
 import useNotify from 'src/composables/useNotify.js';
 import axios from 'axios';
-import VnTable from 'src/components/VnTable/VnTable.vue';
 
 const stateStore = useStateStore();
 const { t } = useI18n();
@@ -142,9 +138,9 @@ const columns = computed(() => [
                     openConfirmationModal(
                         t('You are going to delete this weekly ticket'),
                         t(
-                            'This ticket will be removed from weekly tickets! Continue anyway?'
+                            'This ticket will be removed from weekly tickets! Continue anyway?',
                         ),
-                        () => deleteWeekly(row.ticketFk)
+                        () => deleteWeekly(row.ticketFk),
                     ),
                 isPrimary: true,
             },
diff --git a/src/pages/Travel/Card/TravelBasicData.vue b/src/pages/Travel/Card/TravelBasicData.vue
index 4b9aa28ed..9379c3092 100644
--- a/src/pages/Travel/Card/TravelBasicData.vue
+++ b/src/pages/Travel/Card/TravelBasicData.vue
@@ -2,13 +2,8 @@
 import { ref } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-
 import FetchData from 'components/FetchData.vue';
 import FormModel from 'components/FormModel.vue';
-import VnRow from 'components/ui/VnRow.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
-import VnInputDate from 'components/common/VnInputDate.vue';
 
 const route = useRoute();
 const { t } = useI18n();
diff --git a/src/pages/Travel/Card/TravelCard.vue b/src/pages/Travel/Card/TravelCard.vue
index cb09eafd6..74ee73e17 100644
--- a/src/pages/Travel/Card/TravelCard.vue
+++ b/src/pages/Travel/Card/TravelCard.vue
@@ -1,5 +1,36 @@
 <script setup>
 import TravelDescriptor from './TravelDescriptor.vue';
+
+const userFilter = {
+    fields: [
+        'id',
+        'ref',
+        'shipped',
+        'landed',
+        'totalEntries',
+        'warehouseInFk',
+        'warehouseOutFk',
+        'cargoSupplierFk',
+        'agencyModeFk',
+        'isRaid',
+        'isDelivered',
+        'isReceived',
+    ],
+    include: [
+        {
+            relation: 'warehouseIn',
+            scope: {
+                fields: ['name'],
+            },
+        },
+        {
+            relation: 'warehouseOut',
+            scope: {
+                fields: ['name'],
+            },
+        },
+    ],
+};
 import VnCardBeta from 'src/components/common/VnCardBeta.vue';
 import filter from './TravelFilter.js';
 </script>
diff --git a/src/pages/Travel/Card/TravelDescriptor.vue b/src/pages/Travel/Card/TravelDescriptor.vue
index 72acf91b8..ccaf510f0 100644
--- a/src/pages/Travel/Card/TravelDescriptor.vue
+++ b/src/pages/Travel/Card/TravelDescriptor.vue
@@ -4,7 +4,6 @@ import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 
 import CardDescriptor from 'components/ui/CardDescriptor.vue';
-import VnLv from 'src/components/ui/VnLv.vue';
 import useCardDescription from 'src/composables/useCardDescription';
 import TravelDescriptorMenuItems from './TravelDescriptorMenuItems.vue';
 import filter from './TravelFilter.js';
diff --git a/src/pages/Travel/Card/TravelDescriptorMenuItems.vue b/src/pages/Travel/Card/TravelDescriptorMenuItems.vue
index 14d824b86..1d5768a33 100644
--- a/src/pages/Travel/Card/TravelDescriptorMenuItems.vue
+++ b/src/pages/Travel/Card/TravelDescriptorMenuItems.vue
@@ -3,9 +3,6 @@ import { computed } from 'vue';
 import { useQuasar } from 'quasar';
 import { useRouter } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-
-import VnConfirm from 'components/ui/VnConfirm.vue';
-
 import axios from 'axios';
 import useNotify from 'src/composables/useNotify.js';
 import { useAcl } from 'src/composables/useAcl';
diff --git a/src/pages/Travel/Card/TravelLog.vue b/src/pages/Travel/Card/TravelLog.vue
index a1f774769..420597bca 100644
--- a/src/pages/Travel/Card/TravelLog.vue
+++ b/src/pages/Travel/Card/TravelLog.vue
@@ -1,6 +1,4 @@
-<script setup>
-import VnLog from 'src/components/common/VnLog.vue';
-</script>
+<script setup></script>
 <template>
     <VnLog model="Travel" url="/TravelLogs"></VnLog>
 </template>
diff --git a/src/pages/Travel/Card/TravelSummary.vue b/src/pages/Travel/Card/TravelSummary.vue
index 16d42f104..0d98baabf 100644
--- a/src/pages/Travel/Card/TravelSummary.vue
+++ b/src/pages/Travel/Card/TravelSummary.vue
@@ -2,13 +2,9 @@
 import { ref, computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-
 import CardSummary from 'components/ui/CardSummary.vue';
-import VnLv from 'src/components/ui/VnLv.vue';
-import VnTitle from 'src/components/common/VnTitle.vue';
 import EntryDescriptorProxy from 'src/pages/Entry/Card/EntryDescriptorProxy.vue';
 import FetchData from 'src/components/FetchData.vue';
-import VnRow from 'components/ui/VnRow.vue';
 import { toDate, toCurrency, toCelsius } from 'src/filters';
 import axios from 'axios';
 import TravelDescriptorMenuItems from './TravelDescriptorMenuItems.vue';
diff --git a/src/pages/Travel/Card/TravelThermographs.vue b/src/pages/Travel/Card/TravelThermographs.vue
index 2376bd6d2..a1f6eae3e 100644
--- a/src/pages/Travel/Card/TravelThermographs.vue
+++ b/src/pages/Travel/Card/TravelThermographs.vue
@@ -3,11 +3,7 @@ import { computed, ref } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
-
-import VnPaginate from 'src/components/ui/VnPaginate.vue';
-import VnConfirm from 'components/ui/VnConfirm.vue';
 import FetchData from 'src/components/FetchData.vue';
-
 import axios from 'axios';
 import useNotify from 'src/composables/useNotify.js';
 import { toDate, toCelsius } from 'src/filters';
diff --git a/src/pages/Travel/Card/TravelThermographsForm.vue b/src/pages/Travel/Card/TravelThermographsForm.vue
index 7aec32972..40669a60c 100644
--- a/src/pages/Travel/Card/TravelThermographsForm.vue
+++ b/src/pages/Travel/Card/TravelThermographsForm.vue
@@ -2,19 +2,12 @@
 import { useI18n } from 'vue-i18n';
 import { ref, onBeforeMount } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
-
 import FetchData from 'components/FetchData.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
-import VnSelectDialog from 'components/common/VnSelectDialog.vue';
-import VnRow from 'components/ui/VnRow.vue';
-import VnInput from 'src/components/common/VnInput.vue';
 import CreateThermographForm from 'src/components/CreateThermographForm.vue';
-
 import { useState } from 'src/composables/useState';
 import { useStateStore } from 'stores/useStateStore';
 import axios from 'axios';
 import useNotify from 'src/composables/useNotify.js';
-import VnInputNumber from 'src/components/common/VnInputNumber.vue';
 
 const props = defineProps({
     viewAction: {
diff --git a/src/pages/Travel/ExtraCommunity.vue b/src/pages/Travel/ExtraCommunity.vue
index dee9d923a..4d31d3200 100644
--- a/src/pages/Travel/ExtraCommunity.vue
+++ b/src/pages/Travel/ExtraCommunity.vue
@@ -5,19 +5,14 @@ import { useI18n } from 'vue-i18n';
 
 import SupplierDescriptorProxy from 'src/pages/Supplier/Card/SupplierDescriptorProxy.vue';
 import TravelDescriptorProxy from 'src/pages/Travel/Card/TravelDescriptorProxy.vue';
-import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 import ExtraCommunityFilter from './ExtraCommunityFilter.vue';
-import VnInput from 'src/components/common/VnInput.vue';
 import EntryDescriptorProxy from '../Entry/Card/EntryDescriptorProxy.vue';
-
 import { useStateStore } from 'stores/useStateStore';
 import { useArrayData } from 'composables/useArrayData';
 import { toDate, toCurrency } from 'src/filters';
 import { usePrintService } from 'composables/usePrintService';
-import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import axios from 'axios';
 import RightMenu from 'src/components/common/RightMenu.vue';
-import VnPopup from 'src/components/common/VnPopup.vue';
 
 const stateStore = useStateStore();
 const { t } = useI18n();
@@ -171,7 +166,7 @@ const columns = computed(() => [
                     ? value.reduce((sum, entry) => {
                           return sum + (entry.invoiceAmount || 0);
                       }, 0)
-                    : 0
+                    : 0,
             ),
     },
     {
@@ -284,7 +279,7 @@ watch(
         if (!arrayData.store.data) return;
         onStoreDataChange();
     },
-    { deep: true, immediate: true }
+    { deep: true, immediate: true },
 );
 
 const openReportPdf = () => {
@@ -521,7 +516,7 @@ const getColor = (percentage) => {
                                     ? tableColumnComponents[col.name].event(
                                           rows[props.rowIndex][col.field],
                                           col.field,
-                                          props.rowIndex
+                                          props.rowIndex,
                                       )
                                     : {}
                             "
@@ -546,7 +541,7 @@ const getColor = (percentage) => {
                                     },
                                     {
                                         link: ['id', 'cargoSupplierNickname'].includes(
-                                            col.name
+                                            col.name,
                                         ),
                                     },
                                 ]"
diff --git a/src/pages/Travel/ExtraCommunityFilter.vue b/src/pages/Travel/ExtraCommunityFilter.vue
index b22574632..155d50cfc 100644
--- a/src/pages/Travel/ExtraCommunityFilter.vue
+++ b/src/pages/Travel/ExtraCommunityFilter.vue
@@ -1,14 +1,8 @@
 <script setup>
 import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
-
 import FetchData from 'components/FetchData.vue';
-import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-import VnInputDate from 'components/common/VnInputDate.vue';
 import axios from 'axios';
-import VnSelectSupplier from 'src/components/common/VnSelectSupplier.vue';
 
 const { t } = useI18n();
 const props = defineProps({
diff --git a/src/pages/Travel/TravelCreate.vue b/src/pages/Travel/TravelCreate.vue
index 72c34aad8..619f34972 100644
--- a/src/pages/Travel/TravelCreate.vue
+++ b/src/pages/Travel/TravelCreate.vue
@@ -2,14 +2,8 @@
 import { useI18n } from 'vue-i18n';
 import { ref, onBeforeMount } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
-
 import FetchData from 'components/FetchData.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
 import FormModel from 'components/FormModel.vue';
-import VnRow from 'components/ui/VnRow.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
-import VnInputDate from 'components/common/VnInputDate.vue';
 
 const { t } = useI18n();
 const route = useRoute();
diff --git a/src/pages/Travel/TravelFilter.vue b/src/pages/Travel/TravelFilter.vue
index 90901ee4d..d7bc9a433 100644
--- a/src/pages/Travel/TravelFilter.vue
+++ b/src/pages/Travel/TravelFilter.vue
@@ -1,13 +1,7 @@
 <script setup>
 import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
-
 import FetchData from 'components/FetchData.vue';
-import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
-import VnSelect from 'components/common/VnSelect.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-import VnInputDate from 'components/common/VnInputDate.vue';
-import VnInputTime from 'src/components/common/VnInputTime.vue';
 
 const { t } = useI18n();
 const props = defineProps({
diff --git a/src/pages/Travel/TravelList.vue b/src/pages/Travel/TravelList.vue
index e90c01be2..e2097eb36 100644
--- a/src/pages/Travel/TravelList.vue
+++ b/src/pages/Travel/TravelList.vue
@@ -2,14 +2,11 @@
 import { ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRouter, useRoute } from 'vue-router';
-import VnTable from 'components/VnTable/VnTable.vue';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import TravelSummary from './Card/TravelSummary.vue';
 import { toDate } from 'src/filters';
 import { getDateQBadgeColor } from 'src/composables/getDateQBadgeColor.js';
 import TravelFilter from './TravelFilter.vue';
-import VnInputNumber from 'src/components/common/VnInputNumber.vue';
-import VnSection from 'src/components/common/VnSection.vue';
 
 const { viewSummary } = useSummaryDialog();
 const router = useRouter();
diff --git a/src/pages/Worker/Card/WorkerBalance.vue b/src/pages/Worker/Card/WorkerBalance.vue
index 25ab92c9b..e20b9bd4f 100644
--- a/src/pages/Worker/Card/WorkerBalance.vue
+++ b/src/pages/Worker/Card/WorkerBalance.vue
@@ -2,7 +2,6 @@
 import { ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
-import VnTable from 'components/VnTable/VnTable.vue';
 import FetchData from 'src/components/FetchData.vue';
 const tableRef = ref();
 const payrollComponents = ref([]);
diff --git a/src/pages/Worker/Card/WorkerBasicData.vue b/src/pages/Worker/Card/WorkerBasicData.vue
index fcf0f0369..1dd116ca6 100644
--- a/src/pages/Worker/Card/WorkerBasicData.vue
+++ b/src/pages/Worker/Card/WorkerBasicData.vue
@@ -1,12 +1,8 @@
 <script setup>
 import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
-import VnInputDate from 'src/components/common/VnInputDate.vue';
 import FetchData from 'components/FetchData.vue';
 import FormModel from 'src/components/FormModel.vue';
-import VnRow from 'components/ui/VnRow.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
 import { useAdvancedSummary } from 'src/composables/useAdvancedSummary';
 
 const { t } = useI18n();
diff --git a/src/pages/Worker/Card/WorkerCalendarFilter.vue b/src/pages/Worker/Card/WorkerCalendarFilter.vue
index 48fc4094b..a7e3b8f1d 100644
--- a/src/pages/Worker/Card/WorkerCalendarFilter.vue
+++ b/src/pages/Worker/Card/WorkerCalendarFilter.vue
@@ -2,7 +2,6 @@
 import WorkerEventLabel from 'pages/Worker/Card/WorkerEventLabel.vue';
 import FetchData from 'components/FetchData.vue';
 import { useI18n } from 'vue-i18n';
-import VnSelect from 'components/common/VnSelect.vue';
 import useNotify from 'src/composables/useNotify';
 import { useRoute } from 'vue-router';
 import { computed, ref, watch } from 'vue';
@@ -40,7 +39,7 @@ watch(
     (newValue) => {
         checkHolidays(newValue);
     },
-    { deep: true, immediate: true }
+    { deep: true, immediate: true },
 );
 const emit = defineEmits(['update:businessFk', 'update:year', 'update:absenceType']);
 
diff --git a/src/pages/Worker/Card/WorkerCard.vue b/src/pages/Worker/Card/WorkerCard.vue
index 3b7a62025..fa6ffd9ea 100644
--- a/src/pages/Worker/Card/WorkerCard.vue
+++ b/src/pages/Worker/Card/WorkerCard.vue
@@ -1,6 +1,5 @@
 <script setup>
 import WorkerDescriptor from './WorkerDescriptor.vue';
-import VnCardBeta from 'src/components/common/VnCardBeta.vue';
 </script>
 <template>
     <VnCardBeta
diff --git a/src/pages/Worker/Card/WorkerDescriptor.vue b/src/pages/Worker/Card/WorkerDescriptor.vue
index 4a71ae898..95e17b771 100644
--- a/src/pages/Worker/Card/WorkerDescriptor.vue
+++ b/src/pages/Worker/Card/WorkerDescriptor.vue
@@ -3,11 +3,7 @@ import { computed, ref } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import CardDescriptor from 'src/components/ui/CardDescriptor.vue';
-import VnLv from 'src/components/ui/VnLv.vue';
-import VnLinkPhone from 'src/components/ui/VnLinkPhone.vue';
-import VnChangePassword from 'src/components/common/VnChangePassword.vue';
 import axios from 'axios';
-import VnImg from 'src/components/ui/VnImg.vue';
 import EditPictureForm from 'components/EditPictureForm.vue';
 import WorkerDescriptorMenu from './WorkerDescriptorMenu.vue';
 import DepartmentDescriptorProxy from 'src/pages/Department/Card/DepartmentDescriptorProxy.vue';
diff --git a/src/pages/Worker/Card/WorkerDms.vue b/src/pages/Worker/Card/WorkerDms.vue
index e2b62bc4f..2e48f7abc 100644
--- a/src/pages/Worker/Card/WorkerDms.vue
+++ b/src/pages/Worker/Card/WorkerDms.vue
@@ -1,5 +1,4 @@
 <script setup>
-import VnDmsList from 'src/components/common/VnDmsList.vue';
 import { useRoute } from 'vue-router';
 const route = useRoute();
 </script>
diff --git a/src/pages/Worker/Card/WorkerFormation.vue b/src/pages/Worker/Card/WorkerFormation.vue
index 6fd5a4eae..feb017465 100644
--- a/src/pages/Worker/Card/WorkerFormation.vue
+++ b/src/pages/Worker/Card/WorkerFormation.vue
@@ -2,7 +2,6 @@
 import { ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
-import VnTable from 'components/VnTable/VnTable.vue';
 const tableRef = ref();
 const { t } = useI18n();
 const route = useRoute();
diff --git a/src/pages/Worker/Card/WorkerLocker.vue b/src/pages/Worker/Card/WorkerLocker.vue
index 015bced35..d90f3a837 100644
--- a/src/pages/Worker/Card/WorkerLocker.vue
+++ b/src/pages/Worker/Card/WorkerLocker.vue
@@ -5,7 +5,6 @@ import { useI18n } from 'vue-i18n';
 import axios from 'axios';
 import { useAcl } from 'src/composables/useAcl';
 import FormModel from 'components/FormModel.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
 import { useArrayData } from 'src/composables/useArrayData';
 import FetchData from 'components/FetchData.vue';
 
diff --git a/src/pages/Worker/Card/WorkerLog.vue b/src/pages/Worker/Card/WorkerLog.vue
index ef5a2e0d8..db50d88ee 100644
--- a/src/pages/Worker/Card/WorkerLog.vue
+++ b/src/pages/Worker/Card/WorkerLog.vue
@@ -1,6 +1,4 @@
-<script setup>
-import VnLog from 'src/components/common/VnLog.vue';
-</script>
+<script setup></script>
 <template>
     <VnLog model="Worker" url="/WorkerLogs" />
 </template>
diff --git a/src/pages/Worker/Card/WorkerMedical.vue b/src/pages/Worker/Card/WorkerMedical.vue
index c220df76a..002191428 100644
--- a/src/pages/Worker/Card/WorkerMedical.vue
+++ b/src/pages/Worker/Card/WorkerMedical.vue
@@ -2,7 +2,6 @@
 import { ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
-import VnTable from 'components/VnTable/VnTable.vue';
 const tableRef = ref();
 const { t } = useI18n();
 const route = useRoute();
diff --git a/src/pages/Worker/Card/WorkerNotes.vue b/src/pages/Worker/Card/WorkerNotes.vue
index 4f123206b..b1363be00 100644
--- a/src/pages/Worker/Card/WorkerNotes.vue
+++ b/src/pages/Worker/Card/WorkerNotes.vue
@@ -1,8 +1,5 @@
 <script setup>
 import { useRoute } from 'vue-router';
-
-import VnNotes from 'src/components/ui/VnNotes.vue';
-
 const route = useRoute();
 
 const filter = {
diff --git a/src/pages/Worker/Card/WorkerOperator.vue b/src/pages/Worker/Card/WorkerOperator.vue
index 6faeefe67..d1654cc57 100644
--- a/src/pages/Worker/Card/WorkerOperator.vue
+++ b/src/pages/Worker/Card/WorkerOperator.vue
@@ -3,9 +3,6 @@ import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 import { ref, computed, watch } from 'vue';
 import FetchData from 'components/FetchData.vue';
-import VnRow from 'components/ui/VnRow.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
-import VnInput from 'src/components/common/VnInput.vue';
 import CrudModel from 'components/CrudModel.vue';
 import axios from 'axios';
 
diff --git a/src/pages/Worker/Card/WorkerPBX.vue b/src/pages/Worker/Card/WorkerPBX.vue
index 12f2a4b23..835f6309f 100644
--- a/src/pages/Worker/Card/WorkerPBX.vue
+++ b/src/pages/Worker/Card/WorkerPBX.vue
@@ -2,7 +2,6 @@ src/pages/Worker/Card/WorkerPBX.vue
 
 <script setup>
 import FormModel from 'src/components/FormModel.vue';
-import VnInput from 'src/components/common/VnInput.vue';
 </script>
 
 <template>
diff --git a/src/pages/Worker/Card/WorkerPda.vue b/src/pages/Worker/Card/WorkerPda.vue
index 47e13cf6d..98f8395c0 100644
--- a/src/pages/Worker/Card/WorkerPda.vue
+++ b/src/pages/Worker/Card/WorkerPda.vue
@@ -9,9 +9,7 @@ import FetchData from 'components/FetchData.vue';
 import FormModelPopup from 'src/components/FormModelPopup.vue';
 import { useVnConfirm } from 'composables/useVnConfirm';
 
-import VnPaginate from 'src/components/ui/VnPaginate.vue';
 import VnRow from 'components/ui/VnRow.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 
 const { t } = useI18n();
diff --git a/src/pages/Worker/Card/WorkerPit.vue b/src/pages/Worker/Card/WorkerPit.vue
index 40e814452..5e702667e 100644
--- a/src/pages/Worker/Card/WorkerPit.vue
+++ b/src/pages/Worker/Card/WorkerPit.vue
@@ -2,17 +2,11 @@
 import { ref } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-import VnInputDate from 'src/components/common/VnInputDate.vue';
 import axios from 'axios';
 import FetchData from 'components/FetchData.vue';
 import FormModel from 'src/components/FormModel.vue';
-import VnRow from 'components/ui/VnRow.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
 import CrudModel from 'components/CrudModel.vue';
-import VnTitle from 'src/components/common/VnTitle.vue';
 import { useQuasar } from 'quasar';
-import VnConfirm from 'components/ui/VnConfirm.vue';
 import useNotify from 'src/composables/useNotify.js';
 const { notify } = useNotify();
 const route = useRoute();
diff --git a/src/pages/Worker/Card/WorkerSummary.vue b/src/pages/Worker/Card/WorkerSummary.vue
index 992f6ec71..0ecb4fe3f 100644
--- a/src/pages/Worker/Card/WorkerSummary.vue
+++ b/src/pages/Worker/Card/WorkerSummary.vue
@@ -3,11 +3,7 @@ import { ref, onBeforeMount, computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { dashIfEmpty, toDate } from 'src/filters';
-import VnLv from 'src/components/ui/VnLv.vue';
-import VnLinkPhone from 'src/components/ui/VnLinkPhone.vue';
 import CardSummary from 'components/ui/CardSummary.vue';
-import VnUserLink from 'src/components/ui/VnUserLink.vue';
-import VnTitle from 'src/components/common/VnTitle.vue';
 import RoleDescriptorProxy from 'src/pages/Account/Role/Card/RoleDescriptorProxy.vue';
 import DepartmentDescriptorProxy from 'src/pages/Department/Card/DepartmentDescriptorProxy.vue';
 import { useAdvancedSummary } from 'src/composables/useAdvancedSummary';
diff --git a/src/pages/Worker/Card/WorkerTimeForm.vue b/src/pages/Worker/Card/WorkerTimeForm.vue
index 3250e3180..a53bbf619 100644
--- a/src/pages/Worker/Card/WorkerTimeForm.vue
+++ b/src/pages/Worker/Card/WorkerTimeForm.vue
@@ -2,10 +2,7 @@
 import { reactive, ref, computed, onBeforeMount } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
-
-import VnSelect from 'src/components/common/VnSelect.vue';
 import FormModelPopup from 'components/FormModelPopup.vue';
-import VnInputTime from 'src/components/common/VnInputTime.vue';
 
 const $props = defineProps({
     entryId: {
@@ -53,7 +50,7 @@ const title = computed(() => (isEditMode.value ? t('Edit entry') : t('Add time')
 const urlCreate = computed(() =>
     isEditMode.value
         ? `WorkerTimeControls/${$props.entryId}/updateTimeEntry`
-        : `WorkerTimeControls/${route.params.id}/addTimeEntry`
+        : `WorkerTimeControls/${route.params.id}/addTimeEntry`,
 );
 
 onBeforeMount(() => {
diff --git a/src/pages/Worker/CreateDepartmentChild.vue b/src/pages/Worker/CreateDepartmentChild.vue
index bde2b480a..8d986eccf 100644
--- a/src/pages/Worker/CreateDepartmentChild.vue
+++ b/src/pages/Worker/CreateDepartmentChild.vue
@@ -1,11 +1,7 @@
 <script setup>
 import { onMounted, reactive, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
-
-import VnRow from 'components/ui/VnRow.vue';
-import VnInput from 'src/components/common/VnInput.vue';
 import FormModel from 'components/FormModel.vue';
-
 const emit = defineEmits(['onDataSaved']);
 
 const $props = defineProps({
diff --git a/src/pages/Worker/WorkerDepartment.vue b/src/pages/Worker/WorkerDepartment.vue
index baf6db154..2d1f5ad54 100644
--- a/src/pages/Worker/WorkerDepartment.vue
+++ b/src/pages/Worker/WorkerDepartment.vue
@@ -1,5 +1,4 @@
 <script setup>
-import VnSection from 'src/components/common/VnSection.vue';
 import WorkerDepartmentTree from './WorkerDepartmentTree.vue';
 </script>
 
diff --git a/src/pages/Worker/WorkerDepartmentTree.vue b/src/pages/Worker/WorkerDepartmentTree.vue
index 14009134b..e3b4e086f 100644
--- a/src/pages/Worker/WorkerDepartmentTree.vue
+++ b/src/pages/Worker/WorkerDepartmentTree.vue
@@ -7,7 +7,6 @@ import DepartmentDescriptorProxy from 'src/pages/Department/Card/DepartmentDescr
 import CreateDepartmentChild from './CreateDepartmentChild.vue';
 import axios from 'axios';
 import { useRouter } from 'vue-router';
-import VnConfirm from 'src/components/ui/VnConfirm.vue';
 
 const quasar = useQuasar();
 const { t } = useI18n();
diff --git a/src/pages/Worker/WorkerFilter.vue b/src/pages/Worker/WorkerFilter.vue
index 8210ba0e3..5efdc2b00 100644
--- a/src/pages/Worker/WorkerFilter.vue
+++ b/src/pages/Worker/WorkerFilter.vue
@@ -3,9 +3,6 @@ import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 
 import FetchData from 'components/FetchData.vue';
-import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
 
 const { t, te } = useI18n();
 const props = defineProps({
diff --git a/src/pages/Worker/WorkerList.vue b/src/pages/Worker/WorkerList.vue
index d6eb0684d..b20a55023 100644
--- a/src/pages/Worker/WorkerList.vue
+++ b/src/pages/Worker/WorkerList.vue
@@ -2,22 +2,12 @@
 import { onBeforeMount, computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
-import VnTable from 'src/components/VnTable/VnTable.vue';
 import WorkerSummary from './Card/WorkerSummary.vue';
-import VnRow from 'src/components/ui/VnRow.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-import VnRadio from 'src/components/common/VnRadio.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
-import VnInputDate from 'src/components/common/VnInputDate.vue';
-import VnLocation from 'src/components/common/VnLocation.vue';
-import VnSelectDialog from 'src/components/common/VnSelectDialog.vue';
 import CreateBankEntityForm from 'src/components/CreateBankEntityForm.vue';
 import FetchData from 'src/components/FetchData.vue';
 import WorkerFilter from './WorkerFilter.vue';
 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';
 const { t } = useI18n();
 const tableRef = ref();
 const { viewSummary } = useSummaryDialog();
diff --git a/src/pages/Zone/Card/ZoneBasicData.vue b/src/pages/Zone/Card/ZoneBasicData.vue
index 15d335ac8..0df57271b 100644
--- a/src/pages/Zone/Card/ZoneBasicData.vue
+++ b/src/pages/Zone/Card/ZoneBasicData.vue
@@ -3,10 +3,7 @@ import { useI18n } from 'vue-i18n';
 import { computed, ref } from 'vue';
 import FetchData from 'components/FetchData.vue';
 import FormModel from 'src/components/FormModel.vue';
-import VnRow from 'components/ui/VnRow.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-import VnInputTime from 'src/components/common/VnInputTime.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
+import { QCheckbox } from 'quasar';
 
 const { t } = useI18n();
 
diff --git a/src/pages/Zone/Card/ZoneCard.vue b/src/pages/Zone/Card/ZoneCard.vue
index 41daff5c0..02bfa1f23 100644
--- a/src/pages/Zone/Card/ZoneCard.vue
+++ b/src/pages/Zone/Card/ZoneCard.vue
@@ -2,7 +2,6 @@
 import { useRoute } from 'vue-router';
 import { computed } from 'vue';
 
-import VnCard from 'components/common/VnCard.vue';
 import ZoneDescriptor from './ZoneDescriptor.vue';
 import ZoneFilterPanel from '../ZoneFilterPanel.vue';
 import filter from './ZoneFilter.js';
diff --git a/src/pages/Zone/Card/ZoneCreateWarehouse.vue b/src/pages/Zone/Card/ZoneCreateWarehouse.vue
index 88f6a7701..e3881965f 100644
--- a/src/pages/Zone/Card/ZoneCreateWarehouse.vue
+++ b/src/pages/Zone/Card/ZoneCreateWarehouse.vue
@@ -2,9 +2,7 @@
 import { reactive, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 
-import VnSelect from 'src/components/common/VnSelect.vue';
 import FetchData from 'components/FetchData.vue';
-import VnRow from 'components/ui/VnRow.vue';
 import FormPopup from 'components/FormPopup.vue';
 
 const emit = defineEmits(['onSubmitCreateWarehouse']);
diff --git a/src/pages/Zone/Card/ZoneDescriptor.vue b/src/pages/Zone/Card/ZoneDescriptor.vue
index 49237a02b..e089a55cd 100644
--- a/src/pages/Zone/Card/ZoneDescriptor.vue
+++ b/src/pages/Zone/Card/ZoneDescriptor.vue
@@ -3,7 +3,6 @@ import { computed } from 'vue';
 import { useRoute } from 'vue-router';
 
 import CardDescriptor from 'components/ui/CardDescriptor.vue';
-import VnLv from 'src/components/ui/VnLv.vue';
 import { toTimeFormat } from 'src/filters/date';
 import { toCurrency } from 'filters/index';
 
diff --git a/src/pages/Zone/Card/ZoneDescriptorMenuItems.vue b/src/pages/Zone/Card/ZoneDescriptorMenuItems.vue
index 3c45700cb..1fcf80477 100644
--- a/src/pages/Zone/Card/ZoneDescriptorMenuItems.vue
+++ b/src/pages/Zone/Card/ZoneDescriptorMenuItems.vue
@@ -3,9 +3,6 @@ import { useQuasar } from 'quasar';
 import { useRouter } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 const { dialog, notify } = useQuasar();
-
-import VnConfirm from 'components/ui/VnConfirm.vue';
-
 import axios from 'axios';
 
 const { t } = useI18n();
diff --git a/src/pages/Zone/Card/ZoneEventExclusionForm.vue b/src/pages/Zone/Card/ZoneEventExclusionForm.vue
index 4b6aa52bd..12c683774 100644
--- a/src/pages/Zone/Card/ZoneEventExclusionForm.vue
+++ b/src/pages/Zone/Card/ZoneEventExclusionForm.vue
@@ -2,11 +2,8 @@
 import { ref, computed, onMounted, reactive } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
-
-import VnRow from 'components/ui/VnRow.vue';
 import FormPopup from 'components/FormPopup.vue';
 import ZoneLocationsTree from './ZoneLocationsTree.vue';
-import VnInputDate from 'src/components/common/VnInputDate.vue';
 
 import { useArrayData } from 'src/composables/useArrayData';
 import { useVnConfirm } from 'composables/useVnConfirm';
diff --git a/src/pages/Zone/Card/ZoneEventInclusionForm.vue b/src/pages/Zone/Card/ZoneEventInclusionForm.vue
index 805d03b27..d5af6496e 100644
--- a/src/pages/Zone/Card/ZoneEventInclusionForm.vue
+++ b/src/pages/Zone/Card/ZoneEventInclusionForm.vue
@@ -3,12 +3,7 @@ import { ref, computed, onMounted } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 
-import VnRow from 'components/ui/VnRow.vue';
 import FormPopup from 'components/FormPopup.vue';
-import VnInputDate from 'src/components/common/VnInputDate.vue';
-import VnWeekdayPicker from 'src/components/common/VnWeekdayPicker.vue';
-import VnInputTime from 'components/common/VnInputTime.vue';
-import VnInput from 'src/components/common/VnInput.vue';
 
 import { useArrayData } from 'src/composables/useArrayData';
 import { useWeekdayStore } from 'src/stores/useWeekdayStore';
@@ -58,7 +53,7 @@ const arrayData = useArrayData('ZoneEvents');
 
 const createEvent = async () => {
     eventInclusionFormData.value.weekDays = weekdayStore.toSet(
-        eventInclusionFormData.value.wdays
+        eventInclusionFormData.value.wdays,
     );
 
     if (inclusionType.value == 'day') eventInclusionFormData.value.weekDays = '';
@@ -74,7 +69,7 @@ const createEvent = async () => {
     else
         await axios.put(
             `Zones/${route.params.id}/events/${props.event?.id}`,
-            eventInclusionFormData.value
+            eventInclusionFormData.value,
         );
 
     await refetchEvents();
@@ -221,7 +216,7 @@ onMounted(() => {
                     openConfirmationModal(
                         t('zone.deleteTitle'),
                         t('zone.deleteSubtitle'),
-                        () => deleteEvent()
+                        () => deleteEvent(),
                     )
                 "
             />
diff --git a/src/pages/Zone/Card/ZoneLocationsTree.vue b/src/pages/Zone/Card/ZoneLocationsTree.vue
index 5c87faf99..a5de18b32 100644
--- a/src/pages/Zone/Card/ZoneLocationsTree.vue
+++ b/src/pages/Zone/Card/ZoneLocationsTree.vue
@@ -1,11 +1,9 @@
 <script setup>
 import { onMounted, ref, computed, watch, onUnmounted } from 'vue';
 import { useRoute } from 'vue-router';
-import VnInput from 'src/components/common/VnInput.vue';
 import { useState } from 'src/composables/useState';
 import axios from 'axios';
 import { useArrayData } from 'composables/useArrayData';
-import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 
 const props = defineProps({
     rootLabel: {
@@ -82,7 +80,7 @@ const onNodeExpanded = async (nodeKeysArray) => {
         await fetchNodeLeaves(lastNodeKey, true);
     } else {
         const difference = new Set(
-            [...previousExpandedNodes.value].filter((x) => !nodeKeysSet.has(x))
+            [...previousExpandedNodes.value].filter((x) => !nodeKeysSet.has(x)),
         );
         const collapsedNode = Array.from(difference).pop();
         const node = treeRef.value?.getNodeByKey(collapsedNode);
@@ -135,7 +133,7 @@ watch(
         }
         previousExpandedNodes.value = new Set(expanded.value);
     },
-    { immediate: true }
+    { immediate: true },
 );
 
 const reFetch = async () => {
diff --git a/src/pages/Zone/Card/ZoneLog.vue b/src/pages/Zone/Card/ZoneLog.vue
index 373d210b5..47ec9a584 100644
--- a/src/pages/Zone/Card/ZoneLog.vue
+++ b/src/pages/Zone/Card/ZoneLog.vue
@@ -1,6 +1,4 @@
-<script setup>
-import VnLog from 'src/components/common/VnLog.vue';
-</script>
+<script setup></script>
 <template>
     <VnLog model="Zone" url="/ZoneLogs"></VnLog>
 </template>
diff --git a/src/pages/Zone/Card/ZoneSearchbar.vue b/src/pages/Zone/Card/ZoneSearchbar.vue
index d1188a1e8..b156cb4ee 100644
--- a/src/pages/Zone/Card/ZoneSearchbar.vue
+++ b/src/pages/Zone/Card/ZoneSearchbar.vue
@@ -1,6 +1,5 @@
 <script setup>
 import { useI18n } from 'vue-i18n';
-import VnSearchbar from 'components/ui/VnSearchbar.vue';
 
 const { t } = useI18n();
 
diff --git a/src/pages/Zone/Card/ZoneSummary.vue b/src/pages/Zone/Card/ZoneSummary.vue
index 5b29b495b..57e6adc30 100644
--- a/src/pages/Zone/Card/ZoneSummary.vue
+++ b/src/pages/Zone/Card/ZoneSummary.vue
@@ -2,10 +2,7 @@
 import { ref, onMounted, computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-
-import VnLv from 'src/components/ui/VnLv.vue';
 import CardSummary from 'components/ui/CardSummary.vue';
-import VnTitle from 'src/components/common/VnTitle.vue';
 
 import { getUrl } from 'src/composables/getUrl';
 import { toCurrency } from 'filters/index';
diff --git a/src/pages/Zone/Card/ZoneWarehouses.vue b/src/pages/Zone/Card/ZoneWarehouses.vue
index 165e9c840..e20cd8848 100644
--- a/src/pages/Zone/Card/ZoneWarehouses.vue
+++ b/src/pages/Zone/Card/ZoneWarehouses.vue
@@ -3,7 +3,6 @@ import { useRoute } from 'vue-router';
 import { computed, ref, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
 
-import VnPaginate from 'components/ui/VnPaginate.vue';
 import ZoneCreateWarehouse from './ZoneCreateWarehouse.vue';
 
 import { useVnConfirm } from 'composables/useVnConfirm';
diff --git a/src/pages/Zone/Delivery/ZoneDeliveryCreate.vue b/src/pages/Zone/Delivery/ZoneDeliveryCreate.vue
index a48eaf278..f2b71e6cd 100644
--- a/src/pages/Zone/Delivery/ZoneDeliveryCreate.vue
+++ b/src/pages/Zone/Delivery/ZoneDeliveryCreate.vue
@@ -2,9 +2,6 @@
 import { computed, ref, onMounted, onUpdated } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
 import { useQuasar } from 'quasar';
-
-import VnInput from 'src/components/common/VnInput.vue';
-
 import { useI18n } from 'vue-i18n';
 import axios from 'axios';
 
diff --git a/src/pages/Zone/Delivery/ZoneDeliveryList.vue b/src/pages/Zone/Delivery/ZoneDeliveryList.vue
index e3ec8cb2d..2ed4626ff 100644
--- a/src/pages/Zone/Delivery/ZoneDeliveryList.vue
+++ b/src/pages/Zone/Delivery/ZoneDeliveryList.vue
@@ -1,7 +1,6 @@
 <script setup>
 import axios from 'axios';
 import { useQuasar } from 'quasar';
-import VnPaginate from 'src/components/ui/VnPaginate.vue';
 import { useArrayData } from 'src/composables/useArrayData';
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
diff --git a/src/pages/Zone/Upcoming/ZoneUpcomingCreate.vue b/src/pages/Zone/Upcoming/ZoneUpcomingCreate.vue
index 6bc04c428..bc6826c57 100644
--- a/src/pages/Zone/Upcoming/ZoneUpcomingCreate.vue
+++ b/src/pages/Zone/Upcoming/ZoneUpcomingCreate.vue
@@ -3,8 +3,6 @@ import { computed, ref, onMounted, onUpdated } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
 import { useQuasar } from 'quasar';
 
-import VnInput from 'src/components/common/VnInput.vue';
-
 import { useI18n } from 'vue-i18n';
 import axios from 'axios';
 
diff --git a/src/pages/Zone/Upcoming/ZoneUpcomingList.vue b/src/pages/Zone/Upcoming/ZoneUpcomingList.vue
index 7b5c2ddbc..e71876864 100644
--- a/src/pages/Zone/Upcoming/ZoneUpcomingList.vue
+++ b/src/pages/Zone/Upcoming/ZoneUpcomingList.vue
@@ -1,7 +1,6 @@
 <script setup>
 import axios from 'axios';
 import { useQuasar } from 'quasar';
-import VnPaginate from 'src/components/ui/VnPaginate.vue';
 import { useArrayData } from 'src/composables/useArrayData';
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
diff --git a/src/pages/Zone/ZoneCreate.vue b/src/pages/Zone/ZoneCreate.vue
index 6db83c51d..0afcdd3a6 100644
--- a/src/pages/Zone/ZoneCreate.vue
+++ b/src/pages/Zone/ZoneCreate.vue
@@ -4,12 +4,7 @@ import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
 
 import FormModel from 'components/FormModel.vue';
-import VnRow from 'components/ui/VnRow.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
 import FetchData from 'components/FetchData.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-import VnInputTime from 'components/common/VnInputTime.vue';
-import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 
 const { t } = useI18n();
 const router = useRouter();
diff --git a/src/pages/Zone/ZoneDeliveryPanel.vue b/src/pages/Zone/ZoneDeliveryPanel.vue
index 0a535afcb..e2b4c5a15 100644
--- a/src/pages/Zone/ZoneDeliveryPanel.vue
+++ b/src/pages/Zone/ZoneDeliveryPanel.vue
@@ -2,7 +2,6 @@
 import { onMounted, ref, reactive, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
 
-import VnSelect from 'src/components/common/VnSelect.vue';
 import { useArrayData } from 'src/composables/useArrayData';
 import useNotify from 'src/composables/useNotify.js';
 import FetchData from 'src/components/FetchData.vue';
diff --git a/src/pages/Zone/ZoneFilterPanel.vue b/src/pages/Zone/ZoneFilterPanel.vue
index 3a35527ab..5744aad33 100644
--- a/src/pages/Zone/ZoneFilterPanel.vue
+++ b/src/pages/Zone/ZoneFilterPanel.vue
@@ -1,10 +1,7 @@
 <script setup>
 import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
-import VnInput from 'components/common/VnInput.vue';
 import FetchData from 'components/FetchData.vue';
-import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
-import VnSelect from 'components/common/VnSelect.vue';
 
 const { t } = useI18n();
 const props = defineProps({
diff --git a/src/pages/Zone/ZoneList.vue b/src/pages/Zone/ZoneList.vue
index 1fa539c91..796893da4 100644
--- a/src/pages/Zone/ZoneList.vue
+++ b/src/pages/Zone/ZoneList.vue
@@ -10,10 +10,6 @@ import { useVnConfirm } from 'composables/useVnConfirm';
 import useNotify from 'src/composables/useNotify.js';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import ZoneSummary from 'src/pages/Zone/Card/ZoneSummary.vue';
-import VnTable from 'src/components/VnTable/VnTable.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-import VnInputTime from 'src/components/common/VnInputTime.vue';
 import RightMenu from 'src/components/common/RightMenu.vue';
 import ZoneFilterPanel from './ZoneFilterPanel.vue';
 import ZoneSearchbar from './Card/ZoneSearchbar.vue';
diff --git a/src/pages/Zone/ZoneUpcoming.vue b/src/pages/Zone/ZoneUpcoming.vue
index c74ae6078..c1ed4e122 100644
--- a/src/pages/Zone/ZoneUpcoming.vue
+++ b/src/pages/Zone/ZoneUpcoming.vue
@@ -1,8 +1,6 @@
 <script setup>
 import { ref, computed, onMounted } from 'vue';
 import { useI18n } from 'vue-i18n';
-
-import VnSubToolbar from 'components/ui/VnSubToolbar.vue';
 import FetchData from 'components/FetchData.vue';
 
 import { toDateFormat } from 'src/filters/date.js';