feat: refs #6919 sync account summary

CHANGELOG.md

@@ -1,189 +1,3 @@
-# Version 24.48 - 2024-11-25
-
-### Added 🆕
-
--   chore: correct checkNotification (fix_customer_issues) by:alexm
--   chore: perf (warmFix_order_equalSalix) by:alexm
--   chore: refs #6818 add spaces by:jorgep
--   chore: refs #6818 drop useless code & comment by:jorgep
--   chore: refs #7273 sticky add btn & refactor by:jorgep
--   chore: refs #7524 fix test by:jorgep
--   chore: refs #8039 not required by:alexm
--   chore: refs #8078 fiz tests by:jorgep
--   chore: refs #8078 rollback ref by:jorgep
--   chore: remove console.log (warmFix_invoiceOut_Global) by:alexm
--   chore: typo (fix_itemType-redirection) by:alexm
--   feat: #6943 use openURL quasar by:Javier Segarra
--   feat: #7782 add cypress report by:Javier Segarra
--   feat: #7782 cypress.config watchForFileChanges by:Javier Segarra
--   feat: #7782 npm run resetDatabase by:Javier Segarra
--   feat: #7782 waitUntil domContentLoad by:Javier Segarra
--   feat: added composable to confirm orders by:Jon
--   feat: add /reports in gitignore (warmFix_reports_in_gitignore) by:alexm
--   feat: apply changes for customerModule by:Javier Segarra
--   feat: disabled buttons by:Javier Segarra
--   feat: move buttons to DescriptorMenu by:Javier Segarra
--   feat: refs #6818 add icon by:jorgep
--   feat: refs #6818 fetch url & default channel by:jorgep
--   feat: refs #6818 saysimple integration by:jorgep
--   feat: refs #6839 module searching (6839-addSearchMenu) by:jorgep
--   feat: refs #6839 normalize search by:jorgep
--   feat: refs #6919 sync entry data by:jorgep
--   feat: refs #7006 itemType basic data new inputs by:guillermo
--   feat: refs #7006 itemTypeLog added by:guillermo
--   feat: refs #7193 modified parking to use the scope and corrected small errors by:Jon
--   feat: refs #7206 added inactive label and corrected minor errors by:Jon
--   feat: refs #7308 #7308 remove warnings related to useSession by:Javier Segarra
--   feat: refs #7349 usa back con permisos by:jgallego
--   feat: refs #7524 add front test by:jorgep
--   feat: refs #7874 improve vn-notes ui by:jorgep
--   feat: refs #7970 notify changes by:Jon
--   feat(): refs #8039 canceledError not notify by:alexm
--   feat: refs #8039 notify error unify by:alexm
--   feat: refs #8039 show duplicate request in local by:alexm
--   feat: refs #8078 add shortcut multi selection by:jorgep
--   feat: refs #8078 add tests by:jorgep
--   feat: refs#8087 Redadas en travel by:Carlos Andrés
--   feat: refs #8087 Traspasar redadas a travels by:Carlos Andrés
--   feat: remove comments by:Javier Segarra
--   feat(Supplier): add companySize by:alexm
--   feat: use composable to unify logic by:Javier Segarra
--   feat(VnInput): empty to null by:alexm
--   feat(VnSelect): order data equal salix by:alexm
--   feat(VnSelect): refs #7136 add scroll (7136-vnSelect_paginate_simplify_2) by:alexm
-
-### Changed 📦
-
--   chore: perf (warmFix_order_equalSalix) by:alexm
--   chore: refs #7273 sticky add btn & refactor by:jorgep
--   fix: better performance (warmFix_accountAcls) by:alexm
--   perf: minor bugs detected by:Javier Segarra
--   perf: refs #6943 #6943 merge command by:Javier Segarra
--   perf: refs #7283 #7283 declare composable inst4ead code duplicated by:Javier Segarra
--   perf: refs #7283 #7283 handle composable i18n by:Javier Segarra
--   perf: refs #7283 #7283 handle i18n by:Javier Segarra
--   perf: refs #7283 #7283 i18n params by:Javier Segarra
--   perf: refs #7308 #7308 remove comments by:Javier Segarra
--   perf: remove appendParams by:Javier Segarra
--   perf: use const in VnLocation by:Javier Segarra
--   perf: use required instead :required="true" by:Javier Segarra
--   refactor: apply QPopupProxy by:wbuezas
--   refactor: changed confirmOrder directory by:Jon
--   refactor: change keyup.enter for update:model-value by:wbuezas
--   refactor(InvoiceInBasicData): use VnDms by:alexm
--   refactor: modified composable by:Jon
--   refactor: refs #6818 change channel source by:jorgep
--   refactor: refs #6818 channel logic by:jorgep
--   refactor: refs #6919 export filter by:jorgep
--   refactor: refs #7132 1st wave of changes in global translations files by:Jon
--   refactor: refs #7132 account's module translations by:Jon
--   refactor: refs #7132 customer's module translations by:Jon
--   refactor: refs #7132 deleted pageTitles repeated by:Jon
--   refactor: refs #7132 delete duplicate translations' keys by:Jon
--   refactor: refs #7132 deleted useless code by:Jon
--   refactor: refs #7132 global translations files changed by:Jon
--   refactor: refs #7266 Changed method name by:guillermo
--   refactor: refs #7950 Created cmr model by:guillermo
--   refactor: refs #7970 added emit by:Jon
--   refactor: refs #7970 refactored VnConfirm to emit events by:Jon
--   refactor: refs #8185 modified LeftMenu to avoid duplicates by:Jon
--   refactor: remove unused variable by:wbuezas
--   refactor: revert catalog changes by:Jon
--   refactor: small change by:wbuezas
--   test: refactor e2e by:alexm
--   test: refs #8039 add hasNotify and, refactor: agencyWorkCenter test by:alexm
-
-### Fixed 🛠️
-
--   chore: refs #7524 fix test by:jorgep
--   fix: better performance (warmFix_accountAcls) by:alexm
--   fix: catalog view category and type filter by:wbuezas
--   fix: category and tags filters by:Jon
--   fix: changed route.query by:Jon
--   fix: change type vnput by:Javier Segarra
--   fix(ClaimList): stateCode orderBy priority by:alexm
--   fix: entryFilters by:carlossa
--   fix: filter panel by:Jon
--   fix(InvoiceOutGlobal): parallelism by:alexm
--   fix: itemBotanical by:Javier Segarra
--   fix: itemType redirection and fix filters by:alexm
--   fix: logout spec (warmFix_logout.spec) by:alexm
--   fix: merge errors by:alexm
--   fix: order catalog by:wbuezas
--   fix: order catalog fixes by:wbuezas
--   fix: refs #6818 use right icon by:jorgep
--   fix: refs #6896 fixed module problems by:Jon
--   fix: refs #7193 fixed e2e test by:Jon
--   fix: refs #7206 deleted duplicate code by:Jon
--   fix: refs #7273 use same filter by:jorgep
--   fix: refs #7283 #7283 bugs by:Javier Segarra
--   fix: refs #7283 #7283 ItemDiary subToolbar by:Javier Segarra
--   fix: refs #7283 #7283 ItemSummary bugs by:Javier Segarra
--   fix: refs #7283 Account image resolution by:guillermo
--   fix: refs #7283 css by:jorgep
--   fix: refs #7283 filter by:carlossa
--   fix: refs #7283 fix image by:carlossa
--   fix: refs #7283 fix pr by:carlossa
--   fix: refs #7283 fix preview by:carlossa
--   fix: refs #7283 fix required by:carlossa
--   fix: refs #7283 item filters by:carlossa
--   fix: refs #7283 itemtype fix by:carlossa
--   fix: refs #7283 order translation by:carlossa
--   fix: refs #7283 preview by:carlossa
--   fix: refs #7283 tooltips !Item by:Javier Segarra
--   fix: refs #7306 clean warning by:carlossa
--   fix: refs #7310 clean warning by:carlossa
--   fix: refs #7323 locale #7396 by:jorgep
--   fix: refs #7323 show advanced fields by:jorgep
--   fix: refs #7349 dependencia no usada by:jgallego
--   fix: refs #7524 e2e & worker module by:jorgep
--   fix: refs #7874 add title by:jorgep
--   fix: refs #7874 show name by:jorgep
--   fix: refs #7943 use correct data-key by:jorgep
--   fix: refs #7943 use summary by:jorgep
--   fix: refs #8039 bad tests by:alexm
--   fix: refs #8039 o not handle unnecessary errors by:alexm
--   fix: refs #8078 e2e #7970 by:jorgep
--   fix: refs #8078 handleSelection by:jorgep
--   fix: refs #8078 improve cy command (8078-enableMultiSelection) by:jorgep
--   fix: refs #8078 improve handleSelection by:jorgep
--   fix: reset category by:wbuezas
--   fix: tag chips by:Jon
--   fix: vnSearchbar spec (warmFix_vnSearchBar.spec) by:alexm
--   fix(VnSelect): setOptions when applyFilter by:alexm
--   fix: worker test e2e by:Jon
--   Merge branch 'dev' into fix_customer_issues by:Javier Segarra
--   refactor: revert catalog changes by:Jon
--   refs #7283 fix conflicts by:carlossa
--   refs #7283 fix descriptorproxy by:carlossa
--   refs #7283 fixedPrice by:carlossa
--   refs #7283 fixedPrices by:carlossa
--   refs #7283 fix itemFixed by:carlossa
--   refs #7283 fix itemFixedPrice by:carlossa
--   refs #7283 fix itemMigration by:carlossa
--   refs #7283 fix itemMigration list filters by:carlossa
--   refs #7283 fix items by:carlossa
--   refs #7283 fix items error get images by:carlossa
--   refs #7283 fix items images by:carlossa
--   refs #7283 fix request by:carlossa
--   refs #7283 fix searchbar by:carlossa
--   refs #7283 fix viewSummary by:carlossa
--   refs #7283 fix yml list basicData by:carlossa
--   refs #7283 itemRequest fix by:carlossa
--   refs #7283 itemRequest fix deny by:carlossa
--   refs #7283 itemRequest fix reload by:carlossa
--   refs #72983 fix filters by:carlossa
--   revert: commit by:Javier Segarra
--   revert e57a253c6f649382da187d1129449d265fb26d3b by:Javier Segarra
--   test: #8162 fix clientList spec by:Javier Segarra
--   test: #8162 fix vnLocation spec by:Javier Segarra
--   test: fix arrayData by:Javier Segarra
--   test: fix e2e by:alexm
--   test: fix e2e by:Javier Segarra
--   test: refs #8039 fix WorkerNotification e2e by:alexm
--   test: refs #8039 fix ZoneWarehouse e2e by:alexm
--   warmfix: ItemLastEntries to date (origin/warmfix_itemLastEntriesFilter) by:Javier Segarra
-
 # Version 24.40 - 2024-10-02
 
 ### Added 🆕

cypress.config.js

@@ -1,7 +1,4 @@
 const { defineConfig } = require('cypress');
-// https://docs.cypress.io/app/tooling/reporters
-// https://docs.cypress.io/app/references/configuration
-// https://www.npmjs.com/package/cypress-mochawesome-reporter
 
 module.exports = defineConfig({
     e2e: {
@@ -19,7 +16,6 @@ module.exports = defineConfig({
         reporterOptions: {
             charts: true,
             reportPageTitle: 'Cypress Inline Reporter',
-            reportFilename: '[status]_[datetime]-report',
             embeddedScreenshots: true,
             reportDir: 'test/cypress/reports',
             inlineAssets: true,

src/components/CreateBankEntityForm.vue

@@ -9,6 +9,8 @@ import VnRow from 'components/ui/VnRow.vue';
 import FormModelPopup from './FormModelPopup.vue';
 import { useState } from 'src/composables/useState';
 
+defineProps({ showEntityField: { type: Boolean, default: true } });
+
 const emit = defineEmits(['onDataSaved']);
 const { t } = useI18n();
 const bicInputRef = ref(null);
@@ -16,16 +18,17 @@ const state = useState();
 
 const customer = computed(() => state.get('customer'));
 
-const countriesFilter = {
-    fields: ['id', 'name', 'code'],
-};
-
 const bankEntityFormData = reactive({
     name: null,
     bic: null,
     countryFk: customer.value?.countryFk,
+    id: null,
 });
 
+const countriesFilter = {
+    fields: ['id', 'name', 'code'],
+};
+
 const countriesOptions = ref([]);
 
 const onDataSaved = (...args) => {
@@ -41,6 +44,7 @@ onMounted(async () => {
 <template>
     <FetchData
         url="Countries"
+        :filter="countriesFilter"
         auto-load
         @on-fetch="(data) => (countriesOptions = data)"
     />
@@ -50,7 +54,6 @@ onMounted(async () => {
         :title="t('title')"
         :subtitle="t('subtitle')"
         :form-initial-data="bankEntityFormData"
-        :filter="countriesFilter"
         @on-data-saved="onDataSaved"
     >
         <template #form-inputs="{ data, validate }">
@@ -82,13 +85,7 @@ onMounted(async () => {
                         :rules="validate('bankEntity.countryFk')"
                     />
                 </div>
-                <div
+                <div v-if="showEntityField" class="col">
-                    v-if="
-                        countriesOptions.find((c) => c.id === data.countryFk)?.code ==
-                        'ES'
-                    "
-                    class="col"
-                >
                     <VnInput
                         :label="t('id')"
                         v-model="data.id"

src/components/CreateNewCityForm.vue

@@ -17,6 +17,10 @@ const $props = defineProps({
         type: Number,
         default: null,
     },
+    provinces: {
+        type: Array,
+        default: () => [],
+    },
 });
 const { t } = useI18n();
 
@@ -44,16 +48,15 @@ const onDataSaved = (...args) => {
         <template #form-inputs="{ data, validate }">
             <VnRow>
                 <VnInput
-                    :label="t('Name')"
+                    :label="t('Names')"
                     v-model="data.name"
                     :rules="validate('city.name')"
-                    required
                 />
                 <VnSelectProvince
                     :province-selected="$props.provinceSelected"
                     :country-fk="$props.countryFk"
                     v-model="data.provinceFk"
-                    required
+                    :provinces="$props.provinces"
                 />
             </VnRow>
         </template>

src/components/CreateNewPostcodeForm.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { computed, reactive, ref } from 'vue';
+import { reactive, ref, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
 
 import FetchData from 'components/FetchData.vue';
@@ -22,14 +22,12 @@ const postcodeFormData = reactive({
     townFk: null,
 });
 
-const townsFetchDataRef = ref(false);
+const townsFetchDataRef = ref(null);
-const countriesRef = ref(false);
+const provincesFetchDataRef = ref(null);
-const townsRef = ref(false);
+const countriesOptions = ref([]);
-const provincesFetchDataRef = ref(false);
 const provincesOptions = ref([]);
+const townsOptions = ref([]);
 const town = ref({});
-const townFilter = ref({});
-const countryFilter = ref({});
 
 function onDataSaved(formData) {
     const newPostcode = {
@@ -41,7 +39,7 @@ function onDataSaved(formData) {
         ({ id }) => id === formData.provinceFk
     );
     newPostcode.province = provinceObject?.name;
-    const countryObject = countriesRef.value.opts.find(
+    const countryObject = countriesOptions.value.find(
         ({ id }) => id === formData.countryFk
     );
     newPostcode.country = countryObject?.name;
@@ -58,19 +56,10 @@ async function onCityCreated(newTown, formData) {
 }
 
 function setTown(newTown, data) {
+    if (!newTown) return;
     town.value = newTown;
-    data.provinceFk = newTown?.provinceFk ?? newTown;
+    data.provinceFk = newTown.provinceFk;
-    data.countryFk = newTown?.province?.countryFk ?? newTown;
+    data.countryFk = newTown.province.countryFk;
-}
-
-async function setCountry(countryFk, data) {
-    data.townFk = null;
-    data.provinceFk = null;
-    data.countryFk = countryFk;
-}
-
-async function handleProvinces(data) {
-    provincesOptions.value = data;
 }
 
 async function setProvince(id, data) {
@@ -84,16 +73,61 @@ async function onProvinceCreated(data) {
     await provincesFetchDataRef.value.fetch({
         where: { countryFk: postcodeFormData.countryFk },
     });
-    postcodeFormData.provinceFk = data.id;
+    postcodeFormData.provinceFk.value = data.id;
 }
 
-const whereTowns = computed(() => {
+watch(
-    return {
+    () => [postcodeFormData.countryFk],
+    async (newCountryFk, oldValueFk) => {
+        if (Array.isArray(newCountryFk)) {
+            newCountryFk = newCountryFk[0];
+        }
+        if (Array.isArray(oldValueFk)) {
+            oldValueFk = oldValueFk[0];
+        }
+        if (!!oldValueFk && newCountryFk !== oldValueFk) {
+            postcodeFormData.provinceFk = null;
+            postcodeFormData.townFk = null;
+        }
+        if (oldValueFk !== newCountryFk) {
+            await provincesFetchDataRef.value.fetch({
+                where: {
+                    countryFk: newCountryFk,
+                },
+            });
+            await townsFetchDataRef.value.fetch({
+                where: {
                     provinceFk: {
                         inq: provincesOptions.value.map(({ id }) => id),
                     },
-    };
+                },
-});
+            });
+        }
+    }
+);
+
+watch(
+    () => postcodeFormData.provinceFk,
+    async (newProvinceFk, oldValueFk) => {
+        if (Array.isArray(newProvinceFk)) {
+            newProvinceFk = newProvinceFk[0];
+        }
+        if (newProvinceFk !== oldValueFk) {
+            await townsFetchDataRef.value.fetch({
+                where: { provinceFk: newProvinceFk },
+            });
+        }
+    }
+);
+async function handleProvinces(data) {
+    provincesOptions.value = data;
+}
+async function handleTowns(data) {
+    townsOptions.value = data;
+}
+async function handleCountries(data) {
+    countriesOptions.value = data;
+}
 </script>
 
 <template>
@@ -105,6 +139,14 @@ const whereTowns = computed(() => {
         auto-load
         url="Provinces/location"
     />
+    <FetchData
+        ref="townsFetchDataRef"
+        :sort-by="['name ASC']"
+        :limit="30"
+        @on-fetch="handleTowns"
+        auto-load
+        url="Towns/location"
+    />
 
     <FormModelPopup
         url-create="postcodes"
@@ -122,26 +164,19 @@ const whereTowns = computed(() => {
                     v-model="data.code"
                     :rules="validate('postcode.code')"
                     clearable
-                    required
                 />
                 <VnSelectDialog
-                    ref="townsRef"
-                    :sort-by="['name ASC']"
-                    :limit="30"
-                    auto-load
-                    url="Towns/location"
-                    :where="whereTowns"
                     :label="t('City')"
                     @update:model-value="(value) => setTown(value, data)"
                     :tooltip="t('Create city')"
                     v-model="data.townFk"
+                    :options="townsOptions"
                     option-label="name"
                     option-value="id"
                     :rules="validate('postcode.city')"
                     :acls="[{ model: 'Town', props: '*', accessType: 'WRITE' }]"
                     :emit-value="false"
                     :clearable="true"
-                    required
                 >
                     <template #option="{ itemProps, opt }">
                         <QItem v-bind="itemProps">
@@ -158,6 +193,7 @@ const whereTowns = computed(() => {
                         <CreateNewCityForm
                             :country-fk="data.countryFk"
                             :province-selected="data.provinceFk"
+                            :provinces="provincesOptions"
                             @on-data-saved="
                                 (_, requestResponse) =>
                                     onCityCreated(requestResponse, data)
@@ -172,25 +208,20 @@ const whereTowns = computed(() => {
                     :province-selected="data.provinceFk"
                     @update:model-value="(value) => setProvince(value, data)"
                     v-model="data.provinceFk"
-                    @on-province-fetched="handleProvinces"
+                    :clearable="true"
+                    :provinces="provincesOptions"
                     @on-province-created="onProvinceCreated"
-                    required
                 />
                 <VnSelect
-                    ref="countriesRef"
-                    :limit="30"
-                    :filter="countryFilter"
-                    :sort-by="['name ASC']"
-                    auto-load
                     url="Countries"
-                    required
+                    :sort-by="['name ASC']"
                     :label="t('Country')"
+                    @update:options="handleCountries"
                     hide-selected
                     option-label="name"
                     option-value="id"
                     v-model="data.countryFk"
                     :rules="validate('postcode.countryFk')"
-                    @update:model-value="(value) => setCountry(value, data)"
                 />
             </VnRow>
         </template>

src/components/CreateNewProvinceForm.vue

@@ -1,7 +1,8 @@
 <script setup>
-import { computed, reactive, ref } from 'vue';
+import { reactive, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 
+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';
@@ -20,24 +21,34 @@ const $props = defineProps({
         type: Number,
         default: null,
     },
+    provinces: {
+        type: Array,
+        default: () => [],
+    },
 });
-const autonomiesRef = ref([]);
+const autonomiesOptions = ref([]);
 
 const onDataSaved = (dataSaved, requestResponse) => {
-    requestResponse.autonomy = autonomiesRef.value.opts.find(
+    requestResponse.autonomy = autonomiesOptions.value.find(
         (autonomy) => autonomy.id == requestResponse.autonomyFk
     );
     emit('onDataSaved', dataSaved, requestResponse);
 };
-const where = computed(() => {
-    if (!$props.countryFk) {
-        return {};
-    }
-    return { countryFk: $props.countryFk };
-});
 </script>
 
 <template>
+    <FetchData
+        @on-fetch="(data) => (autonomiesOptions = data)"
+        auto-load
+        :filter="{
+            where: {
+                countryFk: $props.countryFk,
+            },
+        }"
+        url="Autonomies/location"
+        :sort-by="['name ASC']"
+        :limit="30"
+    />
     <FormModelPopup
         :title="t('New province')"
         :subtitle="t('Please, ensure you put the correct data!')"
@@ -52,17 +63,10 @@ const where = computed(() => {
                     :label="t('Name')"
                     v-model="data.name"
                     :rules="validate('province.name')"
-                    required
                 />
                 <VnSelect
-                    required
-                    ref="autonomiesRef"
-                    auto-load
-                    :where="where"
-                    url="Autonomies/location"
-                    :sort-by="['name ASC']"
-                    :limit="30"
                     :label="t('Autonomy')"
+                    :options="autonomiesOptions"
                     hide-selected
                     option-label="name"
                     option-value="id"

src/components/CrudModel.vue

@@ -10,7 +10,6 @@ import VnPaginate from 'components/ui/VnPaginate.vue';
 import VnConfirm from 'components/ui/VnConfirm.vue';
 import SkeletonTable from 'components/ui/SkeletonTable.vue';
 import { tMobile } from 'src/composables/tMobile';
-import getDifferences from 'src/filters/getDifferences';
 
 const { push } = useRouter();
 const quasar = useQuasar();
@@ -95,7 +94,6 @@ defineExpose({
     saveChanges,
     getChanges,
     formData,
-    originalData,
     vnPaginateRef,
 });
 
@@ -176,13 +174,14 @@ async function saveChanges(data) {
     const changes = data || getChanges();
     try {
         await axios.post($props.saveUrl || $props.url + '/crud', changes);
-    } finally {
+    } catch (e) {
-        isLoading.value = false;
+        return (isLoading.value = false);
     }
     originalData.value = JSON.parse(JSON.stringify(formData.value));
     if (changes.creates?.length) await vnPaginateRef.value.fetch();
 
     hasChanges.value = false;
+    isLoading.value = false;
     emit('saveChanges', data);
     quasar.notify({
         type: 'positive',
@@ -268,6 +267,28 @@ function getChanges() {
     return changes;
 }
 
+function getDifferences(obj1, obj2) {
+    let diff = {};
+    delete obj1.$index;
+    delete obj2.$index;
+
+    for (let key in obj1) {
+        if (obj2[key] && JSON.stringify(obj1[key]) !== JSON.stringify(obj2[key])) {
+            diff[key] = obj2[key];
+        }
+    }
+    for (let key in obj2) {
+        if (
+            obj1[key] === undefined ||
+            JSON.stringify(obj1[key]) !== JSON.stringify(obj2[key])
+        ) {
+            diff[key] = obj2[key];
+        }
+    }
+
+    return diff;
+}
+
 function isEmpty(obj) {
     if (obj == null) return true;
     if (obj === undefined) return true;
@@ -373,7 +394,6 @@ watch(formUrl, async () => {
                 @click="onSubmit"
                 :disable="!hasChanges"
                 :title="t('globals.save')"
-                data-cy="crudModelDefaultSaveBtn"
             />
             <slot name="moreAfterActions" />
         </QBtnGroup>

src/components/EditPictureForm.vue

@@ -156,6 +156,7 @@ const rotateRight = () => {
 };
 
 const onSubmit = () => {
+    try {
         if (!newPhoto.files && !newPhoto.url) {
             notify(t('Select an image'), 'negative');
             return;
@@ -172,6 +173,9 @@ const onSubmit = () => {
                 newPhoto.blob = file;
             })
             .then(() => makeRequest());
+    } catch (err) {
+        console.error('Error uploading image');
+    }
 };
 
 const makeRequest = async () => {

src/components/EditTableCellValueForm.vue

@@ -51,6 +51,7 @@ const onDataSaved = () => {
 };
 
 const onSubmit = async () => {
+    try {
         isLoading.value = true;
         const rowsToEdit = $props.rows.map((row) => ({ id: row.id, itemFk: row.itemFk }));
         const payload = {
@@ -62,6 +63,9 @@ const onSubmit = async () => {
         await axios.post($props.editUrl, payload);
         onDataSaved();
         isLoading.value = false;
+    } catch (err) {
+        console.error('Error submitting table cell edit');
+    }
 };
 
 const closeForm = () => {

src/components/FilterItemForm.vue

@@ -84,6 +84,7 @@ const tableColumns = computed(() => [
 ]);
 
 const onSubmit = async () => {
+    try {
         let filter = itemFilter;
         const params = itemFilterParams;
         const where = {};
@@ -108,6 +109,9 @@ const onSubmit = async () => {
             params: { filter: JSON.stringify(filter) },
         });
         tableRows.value = data;
+    } catch (err) {
+        console.error('Error fetching entries items');
+    }
 };
 
 const closeForm = () => {

src/components/FilterTravelForm.vue

@@ -86,6 +86,7 @@ const tableColumns = computed(() => [
 ]);
 
 const onSubmit = async () => {
+    try {
         let filter = travelFilter;
         const params = travelFilterParams;
         const where = {};
@@ -108,6 +109,9 @@ const onSubmit = async () => {
             params: { filter: JSON.stringify(filter) },
         });
         tableRows.value = data;
+    } catch (err) {
+        console.error('Error fetching travels');
+    }
 };
 
 const closeForm = () => {

src/components/FormModel.vue

@@ -91,10 +91,6 @@ const $props = defineProps({
         type: Boolean,
         default: true,
     },
-    maxWidth: {
-        type: [String, Boolean],
-        default: '800px',
-    },
 });
 const emit = defineEmits(['onFetch', 'onDataSaved']);
 const modelValue = computed(
@@ -110,7 +106,6 @@ const originalData = ref({});
 const formData = computed(() => state.get(modelValue));
 const defaultButtons = computed(() => ({
     save: {
-        dataCy: 'saveDefaultBtn',
         color: 'primary',
         icon: 'save',
         label: 'globals.save',
@@ -118,7 +113,6 @@ const defaultButtons = computed(() => ({
         type: 'submit',
     },
     reset: {
-        dataCy: 'resetDefaultBtn',
         color: 'primary',
         icon: 'restart_alt',
         label: 'globals.reset',
@@ -137,7 +131,13 @@ onMounted(async () => {
 
     if (!$props.formInitialData) {
         if ($props.autoLoad && $props.url) await fetch();
-        else if (arrayData.store.data) updateAndEmit('onFetch', arrayData.store.data);
+        else if (arrayData.store.data)
+            updateAndEmit(
+                'onFetch',
+                Array.isArray(arrayData.store.data)
+                    ? arrayData.store.data[0]
+                    : arrayData.store.data
+            );
     }
     if ($props.observeFormChanges) {
         watch(
@@ -157,7 +157,10 @@ onMounted(async () => {
 if (!$props.url)
     watch(
         () => arrayData.store.data,
-        (val) => updateAndEmit('onFetch', val)
+        (val) => {
+            if (Array.isArray(val)) val = val[0] ?? {};
+            updateAndEmit('onFetch', val);
+        }
     );
 
 watch(
@@ -209,9 +212,7 @@ async function save() {
     isLoading.value = true;
     try {
         formData.value = trimData(formData.value);
-        const body = $props.mapper
+        const body = $props.mapper ? $props.mapper(formData.value) : formData.value;
-            ? $props.mapper(formData.value, originalData.value)
-            : formData.value;
         const method = $props.urlCreate ? 'post' : 'patch';
         const url =
             $props.urlCreate || $props.urlUpdate || $props.url || arrayData.store.url;
@@ -291,7 +292,6 @@ defineExpose({
             @submit="save"
             @reset="reset"
             class="q-pa-md"
-            :style="maxWidth ? 'max-width: ' + maxWidth : ''"
             id="formModel"
         >
             <QCard>
@@ -326,7 +326,6 @@ defineExpose({
                 :title="t(defaultButtons.reset.label)"
             />
             <QBtnDropdown
-                data-cy="saveAndContinueDefaultBtn"
                 v-if="$props.goTo"
                 @click="saveAndGo"
                 :label="tMobile('globals.saveAndContinue')"
@@ -381,6 +380,7 @@ defineExpose({
     color: black;
 }
 #formModel {
+    max-width: 800px;
     width: 100%;
 }
 

src/components/FormPopup.vue

@@ -4,7 +4,7 @@ import { useI18n } from 'vue-i18n';
 
 const emit = defineEmits(['onSubmit']);
 
-const $props = defineProps({
+defineProps({
     title: {
         type: String,
         default: '',
@@ -25,21 +25,16 @@ const $props = defineProps({
         type: String,
         default: '',
     },
-    submitOnEnter: {
-        type: Boolean,
-        default: true,
-    },
 });
 
 const { t } = useI18n();
+
 const closeButton = ref(null);
 const isLoading = ref(false);
 
 const onSubmit = () => {
-    if ($props.submitOnEnter) {
     emit('onSubmit');
     closeForm();
-    }
 };
 
 const closeForm = () => {

src/components/ItemsFilterPanel.vue

@@ -88,6 +88,7 @@ const applyTags = (params, search) => {
 };
 
 const fetchItemTypes = async (id) => {
+    try {
         const filter = {
             fields: ['id', 'name', 'categoryFk'],
             where: { categoryFk: id },
@@ -98,6 +99,9 @@ const fetchItemTypes = async (id) => {
             params: { filter: JSON.stringify(filter) },
         });
         itemTypesOptions.value = data;
+    } catch (err) {
+        console.error('Error fetching item types', err);
+    }
 };
 
 const getCategoryClass = (category, params) => {
@@ -107,6 +111,7 @@ const getCategoryClass = (category, params) => {
 };
 
 const getSelectedTagValues = async (tag) => {
+    try {
         if (!tag?.selectedTag?.id) return;
         tag.value = null;
         const filter = {
@@ -120,6 +125,9 @@ const getSelectedTagValues = async (tag) => {
             params,
         });
         tag.valueOptions = data;
+    } catch (err) {
+        console.error('Error getting selected tag values');
+    }
 };
 
 const removeTag = (index, params, search) => {

src/components/RefundInvoiceForm.vue

@@ -39,10 +39,14 @@ const refund = async () => {
         invoiceCorrectionTypeFk: invoiceParams.invoiceCorrectionTypeFk,
     };
 
+    try {
         const { data } = await axios.post('InvoiceOuts/refundAndInvoice', params);
         notify(t('Refunded invoice'), 'positive');
         const [id] = data?.refundId || [];
         if (id) router.push({ name: 'InvoiceOutSummary', params: { id } });
+    } catch (err) {
+        console.error('Error refunding invoice', err);
+    }
 };
 </script>
 

src/components/TicketProblems.vue

@@ -1,40 +0,0 @@
-<script setup>
-defineProps({ row: { type: Object, required: true } });
-</script>
-<template>
-    <span>
-        <QIcon
-            v-if="row.isTaxDataChecked === 0"
-            name="vn:no036"
-            color="primary"
-            size="xs"
-        >
-            <QTooltip>{{ $t('salesTicketsTable.noVerifiedData') }}</QTooltip>
-        </QIcon>
-        <QIcon v-if="row.hasTicketRequest" name="vn:buyrequest" color="primary" size="xs">
-            <QTooltip>{{ $t('salesTicketsTable.purchaseRequest') }}</QTooltip>
-        </QIcon>
-        <QIcon v-if="row.itemShortage" name="vn:unavailable" color="primary" size="xs">
-            <QTooltip>{{ $t('salesTicketsTable.notVisible') }}</QTooltip>
-        </QIcon>
-        <QIcon v-if="row.isFreezed" name="vn:frozen" color="primary" size="xs">
-            <QTooltip>{{ $t('salesTicketsTable.clientFrozen') }}</QTooltip>
-        </QIcon>
-        <QIcon
-            v-if="row.risk"
-            name="vn:risk"
-            :color="row.hasHighRisk ? 'negative' : 'primary'"
-            size="xs"
-        >
-            <QTooltip>
-                {{ $t('salesTicketsTable.risk') }}: {{ row.risk - row.credit }}
-            </QTooltip>
-        </QIcon>
-        <QIcon v-if="row.hasComponentLack" name="vn:components" color="primary" size="xs">
-            <QTooltip>{{ $t('salesTicketsTable.componentLack') }}</QTooltip>
-        </QIcon>
-        <QIcon v-if="row.isTooLittle" name="vn:isTooLittle" color="primary" size="xs">
-            <QTooltip>{{ $t('salesTicketsTable.tooLittle') }}</QTooltip>
-        </QIcon>
-    </span>
-</template>

src/components/TransferInvoiceForm.vue

@@ -49,6 +49,7 @@ const makeInvoice = async () => {
         makeInvoice: checked.value,
     };
 
+    try {
         if (checked.value && hasToInvoiceByAddress) {
             const response = await new Promise((resolve) => {
                 quasar
@@ -75,6 +76,9 @@ const makeInvoice = async () => {
         notify(t('Transferred invoice'), 'positive');
         const id = data?.[0];
         if (id) router.push({ name: 'InvoiceOutSummary', params: { id } });
+    } catch (err) {
+        console.error('Error transfering invoice', err);
+    }
 };
 </script>
 

src/components/VnSelectProvince.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { ref, watch } from 'vue';
+import { ref } from 'vue';
 import { useValidator } from 'src/composables/useValidator';
 import { useI18n } from 'vue-i18n';
 
@@ -7,7 +7,7 @@ import VnSelectDialog from 'components/common/VnSelectDialog.vue';
 import FetchData from 'components/FetchData.vue';
 import CreateNewProvinceForm from './CreateNewProvinceForm.vue';
 
-const emit = defineEmits(['onProvinceCreated', 'onProvinceFetched']);
+const emit = defineEmits(['onProvinceCreated']);
 const $props = defineProps({
     countryFk: {
         type: Number,
@@ -17,23 +17,20 @@ const $props = defineProps({
         type: Number,
         default: null,
     },
+    provinces: {
+        type: Array,
+        default: () => [],
+    },
 });
 const provinceFk = defineModel({ type: Number, default: null });
 
 const { validate } = useValidator();
 const { t } = useI18n();
-const filter = ref({
+
-    include: { relation: 'country' },
-    where: {
-        countryFk: $props.countryFk,
-    },
-});
 const provincesOptions = ref($props.provinces);
-const provincesFetchDataRef = ref();
 provinceFk.value = $props.provinceSelected;
-if (!$props.countryFk) {
+const provincesFetchDataRef = ref();
-    filter.value.where = {};
+
-}
 async function onProvinceCreated(_, data) {
     await provincesFetchDataRef.value.fetch({ where: { countryFk: $props.countryFk } });
     provinceFk.value = data.id;
@@ -42,33 +39,25 @@ async function onProvinceCreated(_, data) {
 async function handleProvinces(data) {
     provincesOptions.value = data;
 }
-
-watch(
-    () => $props.countryFk,
-    async () => {
-        if ($props.countryFk) {
-            filter.value.where.countryFk = $props.countryFk;
-        } else filter.value.where = {};
-        await provincesFetchDataRef.value.fetch({});
-        emit('onProvinceFetched', provincesOptions.value);
-    }
-);
 </script>
 
 <template>
     <FetchData
         ref="provincesFetchDataRef"
-        :filter="filter"
+        :filter="{
+            include: { relation: 'country' },
+            where: {
+                countryFk: $props.countryFk,
+            },
+        }"
         @on-fetch="handleProvinces"
         url="Provinces"
-        auto-load
     />
     <VnSelectDialog
         :label="t('Province')"
-        :options="provincesOptions"
+        :options="$props.provinces"
         :tooltip="t('Create province')"
         hide-selected
-        :clearable="true"
         v-model="provinceFk"
         :rules="validate && validate('postcode.provinceFk')"
         :acls="[{ model: 'Province', props: '*', accessType: 'WRITE' }]"

src/components/VnTable/VnFilter.vue

@@ -143,10 +143,6 @@ function alignRow() {
 const showFilter = computed(
     () => $props.column?.columnFilter !== false && $props.column.name != 'tableActions'
 );
-
-const onTabPressed = async () => {
-    if (model.value) enterEvent['keyup.enter']();
-};
 </script>
 <template>
     <div
@@ -161,7 +157,6 @@ const onTabPressed = async () => {
             v-model="model"
             :components="components"
             component-prop="columnFilter"
-            @keydown.tab="onTabPressed"
         />
     </div>
 </template>

src/components/VnTable/VnTable.vue

@@ -324,8 +324,6 @@ function handleOnDataSaved(_) {
 }
 
 function handleScroll() {
-    if ($props.crudModel.disableInfiniteScroll) return;
-
     const tMiddle = tableRef.value.$el.querySelector('.q-table__middle');
     const { scrollHeight, scrollTop, clientHeight } = tMiddle;
     const isAtBottom = Math.abs(scrollHeight - scrollTop - clientHeight) <= 40;
@@ -394,7 +392,7 @@ function handleSelection({ evt, added, rows: selectedRows }, rows) {
                             :name="col.orderBy ?? col.name"
                             :data-key="$attrs['data-key']"
                             :search-url="searchUrl"
-                            :vertical="false"
+                            :vertical="true"
                         />
                     </div>
                     <slot
@@ -737,7 +735,6 @@ function handleSelection({ evt, added, rows: selectedRows }, rows) {
             fab
             icon="add"
             shortcut="+"
-            data-cy="vnTableCreateBtn"
         />
         <QTooltip self="top right">
             {{ createForm?.title }}

src/components/common/TableVisibleColumns.vue

@@ -58,6 +58,7 @@ const getConfig = async (url, filter) => {
 };
 
 const fetchViewConfigData = async () => {
+    try {
         const userConfigFilter = {
             where: { tableCode: $props.tableCode, userFk: user.value.id },
         };
@@ -82,9 +83,13 @@ const fetchViewConfigData = async () => {
             $props.allColumns.forEach((col) => (defaultColumns[col] = true));
             setUserConfigViewData(defaultColumns);
         }
+    } catch (err) {
+        console.error('Error fetching config view data', err);
+    }
 };
 
 const saveConfig = async () => {
+    try {
         const params = {};
         const configuration = {};
 
@@ -123,6 +128,9 @@ const saveConfig = async () => {
         emitSavedConfig();
         notify('globals.dataSaved', 'positive');
         popupProxyRef.value.hide();
+    } catch (err) {
+        console.error('Error saving user view config', err);
+    }
 };
 
 const emitSavedConfig = () => {

src/components/common/VnAccountNumber.vue

@@ -1,24 +1,20 @@
 <script setup>
-import { nextTick, ref, watch } from 'vue';
+import { ref, watch } from 'vue';
 import { QInput } from 'quasar';
 
-const $props = defineProps({
+const props = defineProps({
     modelValue: {
         type: String,
         default: '',
     },
-    insertable: {
-        type: Boolean,
-        default: false,
-    },
 });
 
 const emit = defineEmits(['update:modelValue', 'accountShortToStandard']);
 
-let internalValue = ref($props.modelValue);
+let internalValue = ref(props.modelValue);
 
 watch(
-    () => $props.modelValue,
+    () => props.modelValue,
     (newVal) => {
         internalValue.value = newVal;
     }
@@ -32,46 +28,8 @@ watch(
     }
 );
 
-const handleKeydown = (e) => {
-    if (e.key === 'Backspace') return;
-    if (e.key === '.') {
-        accountShortToStandard();
-        // TODO: Fix this setTimeout, with nextTick doesn't work
-        setTimeout(() => {
-            setCursorPosition(0, e.target);
-        }, 1);
-        return;
-    }
-
-    if ($props.insertable && e.key.match(/[0-9]/)) {
-        handleInsertMode(e);
-    }
-};
-function setCursorPosition(pos, el = vnInputRef.value) {
-    el.focus();
-    el.setSelectionRange(pos, pos);
-}
-const vnInputRef = ref(false);
-const handleInsertMode = (e) => {
-    e.preventDefault();
-    const input = e.target;
-    const cursorPos = input.selectionStart;
-    const { maxlength } = vnInputRef.value;
-    let currentValue = internalValue.value;
-    if (!currentValue) currentValue = e.key;
-    const newValue = e.key;
-    if (newValue && !isNaN(newValue) && cursorPos < maxlength) {
-        internalValue.value =
-            currentValue.substring(0, cursorPos) +
-            newValue +
-            currentValue.substring(cursorPos + 1);
-    }
-    nextTick(() => {
-        input.setSelectionRange(cursorPos + 1, cursorPos + 1);
-    });
-};
 function accountShortToStandard() {
-    internalValue.value = internalValue.value?.replace(
+    internalValue.value = internalValue.value.replace(
         '.',
         '0'.repeat(11 - internalValue.value.length)
     );
@@ -79,5 +37,5 @@ function accountShortToStandard() {
 </script>
 
 <template>
-    <QInput @keydown="handleKeydown" ref="vnInputRef" v-model="internalValue" />
+    <q-input v-model="internalValue" />
 </template>

src/components/common/VnCard.vue

@@ -10,11 +10,11 @@ import LeftMenu from 'components/LeftMenu.vue';
 import RightMenu from 'components/common/RightMenu.vue';
 const props = defineProps({
     dataKey: { type: String, required: true },
-    baseUrl: { type: String, default: undefined },
+    url: { type: String, default: undefined },
-    customUrl: { type: String, default: undefined },
     filter: { type: Object, default: () => {} },
     descriptor: { type: Object, required: true },
     filterPanel: { type: Object, default: undefined },
+    idInWhere: { type: Boolean, default: false },
     searchDataKey: { type: String, default: undefined },
     searchbarProps: { type: Object, default: undefined },
     redirectOnError: { type: Boolean, default: false },
@@ -23,24 +23,22 @@ const props = defineProps({
 const stateStore = useStateStore();
 const route = useRoute();
 const router = useRouter();
-const url = computed(() => {
+const regex = /(\/\d+)/;
-    if (props.baseUrl) {
-        return `${props.baseUrl}/${route.params.id}`;
-    }
-    return props.customUrl;
-});
 const searchRightDataKey = computed(() => {
     if (!props.searchDataKey) return route.name;
     return props.searchDataKey;
 });
 const arrayData = useArrayData(props.dataKey, {
-    url: url.value,
+    url: props.url,
     filter: props.filter,
 });
 
 onBeforeMount(async () => {
     try {
-        if (!props.baseUrl) arrayData.store.filter.where = { id: route.params.id };
+        if (props.idInWhere) arrayData.store.filter.where = { id: route.params.id };
+        else if (!regex.test(props.url))
+            arrayData.store.url = `${props.url}/${route.params.id}`;
+
         await arrayData.fetch({ append: false, updateRouter: false });
     } catch {
         const { matched: matches } = router.currentRoute.value;
@@ -49,14 +47,14 @@ onBeforeMount(async () => {
     }
 });
 
-if (props.baseUrl) {
+onBeforeRouteUpdate(async (to, from) => {
-    onBeforeRouteUpdate(async (to, from) => {
     if (to.params.id !== from.params.id) {
-            arrayData.store.url = `${props.baseUrl}/${to.params.id}`;
+        if (props.idInWhere) arrayData.store.filter.where = { id: to.params.id };
-            await arrayData.fetch({ append: false, updateRouter: false });
+        else arrayData.store.url = `${props.url}/${to.params.id}`;
+
+        await arrayData.fetch({ updateRouter: false });
     }
-    });
+});
-}
 </script>
 <template>
     <QDrawer

src/components/common/VnInput.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { computed, ref, useAttrs, nextTick } from 'vue';
+import { computed, ref, useAttrs } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRequired } from 'src/composables/useRequired';
 
@@ -34,14 +34,6 @@ const $props = defineProps({
         type: Boolean,
         default: true,
     },
-    insertable: {
-        type: Boolean,
-        default: false,
-    },
-    maxlength: {
-        type: Number,
-        default: null,
-    },
 });
 
 const vnInputRef = ref(null);
@@ -77,9 +69,6 @@ const mixinRules = [
     requiredFieldRule,
     ...($attrs.rules ?? []),
     (val) => {
-        const { maxlength } = vnInputRef.value;
-        if (maxlength && +val.length > maxlength)
-            return t(`maxLength`, { value: maxlength });
         const { min, max } = vnInputRef.value.$attrs;
         if (!min) return null;
         if (min >= 0) if (Math.floor(val) < min) return t('inputMin', { value: min });
@@ -89,33 +78,6 @@ const mixinRules = [
         }
     },
 ];
-
-const handleKeydown = (e) => {
-    if (e.key === 'Backspace') return;
-
-    if ($props.insertable && e.key.match(/[0-9]/)) {
-        handleInsertMode(e);
-    }
-};
-
-const handleInsertMode = (e) => {
-    e.preventDefault();
-    const input = e.target;
-    const cursorPos = input.selectionStart;
-    const { maxlength } = vnInputRef.value;
-    let currentValue = value.value;
-    if (!currentValue) currentValue = e.key;
-    const newValue = e.key;
-    if (newValue && !isNaN(newValue) && cursorPos < maxlength) {
-        value.value =
-            currentValue.substring(0, cursorPos) +
-            newValue +
-            currentValue.substring(cursorPos + 1);
-    }
-    nextTick(() => {
-        input.setSelectionRange(cursorPos + 1, cursorPos + 1);
-    });
-};
 </script>
 
 <template>
@@ -127,12 +89,10 @@ const handleInsertMode = (e) => {
             :type="$attrs.type"
             :class="{ required: isRequired }"
             @keyup.enter="emit('keyup.enter')"
-            @keydown="handleKeydown"
             :clearable="false"
             :rules="mixinRules"
             :lazy-rules="true"
             hide-bottom-space
-            :data-cy="$attrs.dataCy ?? $attrs.label + '_input'"
         >
             <template v-if="$slots.prepend" #prepend>
                 <slot name="prepend" />
@@ -141,13 +101,7 @@ const handleInsertMode = (e) => {
                 <QIcon
                     name="close"
                     size="xs"
-                    v-if="
+                    v-if="hover && value && !$attrs.disabled && $props.clearable"
-                        hover &&
-                        value &&
-                        !$attrs.disabled &&
-                        !$attrs.readonly &&
-                        $props.clearable
-                    "
                     @click="
                         () => {
                             value = null;
@@ -169,11 +123,9 @@ const handleInsertMode = (e) => {
 <i18n>
     en:
         inputMin: Must be more than {value}
-        maxLength: The value exceeds {value} characters
         inputMax: Must be less than {value}
     es:
         inputMin: Debe ser mayor a {value}
-        maxLength: El valor excede los {value} carácteres
         inputMax: Debe ser menor a {value}
 </i18n>
 <style lang="scss">

src/components/common/VnSelect.vue

@@ -138,6 +138,8 @@ onMounted(() => {
     if ($props.focusOnMount) setTimeout(() => vnSelectRef.value.showPopup(), 300);
 });
 
+defineExpose({ opts: myOptions });
+
 const arrayDataKey =
     $props.dataKey ?? ($props.url?.length > 0 ? $props.url : $attrs.name ?? $attrs.label);
 
@@ -200,10 +202,7 @@ async function fetchFilter(val) {
     if (fields) fetchOptions.fields = fields;
     if (sortBy) fetchOptions.order = sortBy;
     arrayData.reset(['skip', 'filter.skip', 'page']);
-
+    return (await arrayData.applyFilter({ filter: fetchOptions }))?.data;
-    const { data } = await arrayData.applyFilter({ filter: fetchOptions });
-    setOptions(data);
-    return data;
 }
 
 async function filterHandler(val, update) {
@@ -257,30 +256,6 @@ async function onScroll({ to, direction, from, index }) {
         isLoading.value = false;
     }
 }
-
-defineExpose({ opts: myOptions });
-
-function handleKeyDown(event) {
-    if (event.key === 'Tab') {
-        event.preventDefault();
-
-        const inputValue = vnSelectRef.value?.inputValue;
-
-        if (inputValue) {
-            const matchingOption = myOptions.value.find(
-                (option) =>
-                    option[optionLabel.value].toLowerCase() === inputValue.toLowerCase()
-            );
-
-            if (matchingOption) {
-                emit('update:modelValue', matchingOption[optionValue.value]);
-            } else {
-                emit('update:modelValue', inputValue);
-            }
-            vnSelectRef.value?.hidePopup();
-        }
-    }
-}
 </script>
 
 <template>
@@ -291,7 +266,6 @@ function handleKeyDown(event) {
         :option-value="optionValue"
         v-bind="$attrs"
         @filter="filterHandler"
-        @keydown="handleKeyDown"
         :emit-value="nullishToTrue($attrs['emit-value'])"
         :map-options="nullishToTrue($attrs['map-options'])"
         :use-input="nullishToTrue($attrs['use-input'])"
@@ -306,11 +280,10 @@ function handleKeyDown(event) {
         :input-debounce="useURL ? '300' : '0'"
         :loading="isLoading"
         @virtual-scroll="onScroll"
-        :data-cy="$attrs.dataCy ?? $attrs.label + '_select'"
     >
-        <template #append>
+        <template v-if="isClearable" #append>
             <QIcon
-                v-show="isClearable && value"
+                v-show="value"
                 name="close"
                 @click.stop="
                     () => {
@@ -323,22 +296,7 @@ function handleKeyDown(event) {
             />
         </template>
         <template v-for="(_, slotName) in $slots" #[slotName]="slotData" :key="slotName">
-            <div v-if="slotName == 'append'">
+            <slot :name="slotName" v-bind="slotData ?? {}" :key="slotName" />
-                <QIcon
-                    v-show="isClearable && value"
-                    name="close"
-                    @click.stop="
-                        () => {
-                            value = null;
-                            emit('remove');
-                        }
-                    "
-                    class="cursor-pointer"
-                    size="xs"
-                />
-                <slot name="append" v-if="$slots.append" v-bind="slotData ?? {}" />
-            </div>
-            <slot v-else :name="slotName" v-bind="slotData ?? {}" :key="slotName" />
         </template>
     </QSelect>
 </template>

src/components/common/VnSmsDialog.vue

@@ -86,7 +86,7 @@ async function send() {
 </script>
 
 <template>
-    <QDialog ref="dialogRef" data-cy="vnSmsDialog">
+    <QDialog ref="dialogRef">
         <QCard class="q-pa-sm">
             <QCardSection class="row items-center q-pb-none">
                 <span class="text-h6 text-grey">
@@ -161,7 +161,6 @@ async function send() {
                     :loading="isLoading"
                     color="primary"
                     unelevated
-                    data-cy="sendSmsBtn"
                 />
             </QCardActions>
         </QCard>

src/components/ui/VnFilterPanel.vue

@@ -74,9 +74,6 @@ const arrayData = useArrayData($props.dataKey, {
 const route = useRoute();
 const store = arrayData.store;
 const userParams = ref({});
-
-defineExpose({ search, sanitizer, params: userParams });
-
 onMounted(() => {
     userParams.value = $props.modelValue ?? {};
     emit('init', { params: userParams.value });
@@ -200,7 +197,7 @@ const customTags = computed(() =>
 
 async function remove(key) {
     userParams.value[key] = undefined;
-    await search();
+    search();
     emit('remove', key);
     emit('update:modelValue', userParams.value);
 }
@@ -226,6 +223,8 @@ function sanitizer(params) {
     }
     return params;
 }
+
+defineExpose({ search, sanitizer, userParams });
 </script>
 
 <template>
@@ -273,7 +272,6 @@ function sanitizer(params) {
                         :key="chip.label"
                         :removable="!unremovableParams?.includes(chip.label)"
                         @remove="remove(chip.label)"
-                        data-cy="vnFilterPanelChip"
                     >
                         <slot name="tags" :tag="chip" :format-fn="formatValue">
                             <div class="q-gutter-x-xs">

src/components/ui/VnLinkPhone.vue

@@ -1,7 +1,6 @@
 <script setup>
 import { reactive, useAttrs, onBeforeMount, capitalize } from 'vue';
 import axios from 'axios';
-import { parsePhone } from 'src/filters';
 const props = defineProps({
     phoneNumber: { type: [String, Number], default: null },
     channel: { type: Number, default: null },
@@ -25,9 +24,9 @@ onBeforeMount(async () => {
             .data;
         if (!channel) channel = defaultChannel;
 
-        config[type].href = `${url}?customerIdentity=%2B${parsePhone(
+        config[
-            props.phoneNumber
+            type
-        )}&channelId=${channel}`;
+        ].href = `${url}?customerIdentity=%2B${props.phoneNumber}&channelId=${channel}`;
     }
 });
 </script>

src/components/ui/VnNotes.vue

@@ -101,7 +101,6 @@ onBeforeRouteLeave((to, from, next) => {
                             @click="insert"
                             class="q-mb-xs"
                             dense
-                            data-cy="saveNote"
                         />
                     </template>
                 </VnInput>

src/components/ui/VnPaginate.vue

@@ -132,24 +132,10 @@ const addFilter = async (filter, params) => {
 
 async function fetch(params) {
     useArrayData(props.dataKey, params);
-    arrayData.reset(['filter.skip', 'skip', 'page']);
+    arrayData.reset(['filter.skip', 'skip']);
-    await arrayData.fetch({ append: false, updateRouter: mounted.value });
-    return emitStoreData();
-}
-
-async function update(params) {
-    useArrayData(props.dataKey, params);
-    const { limit, skip } = store;
-    store.limit = limit + skip;
-    store.skip = 0;
     await arrayData.fetch({ append: false });
-    store.limit = limit;
-    store.skip = skip;
-    return emitStoreData();
-}
-
-function emitStoreData() {
     if (!store.hasMoreData) isLoading.value = false;
+
     emit('onFetch', store.data);
     return store.data;
 }
@@ -195,7 +181,7 @@ async function onLoad(index, done) {
     done(isDone);
 }
 
-defineExpose({ fetch, update, addFilter, paginate });
+defineExpose({ fetch, addFilter, paginate });
 </script>
 
 <template>

src/components/ui/VnSearchbar.vue

@@ -130,7 +130,6 @@ async function search() {
                 dense
                 standout
                 autofocus
-                data-cy="vnSearchBar"
             >
                 <template #prepend>
                     <QIcon

src/components/ui/VnToSummary.vue

@@ -1,5 +1,6 @@
 <script setup>
 import { useRoute } from 'vue-router';
+import { defineProps } from 'vue';
 
 const props = defineProps({
     routeName: {

src/composables/downloadFile.js

@@ -1,24 +1,11 @@
 import { useSession } from 'src/composables/useSession';
 import { getUrl } from './getUrl';
-import axios from 'axios';
-import { exportFile } from 'quasar';
 
 const { getTokenMultimedia } = useSession();
 const token = getTokenMultimedia();
 
 export async function downloadFile(id, model = 'dms', urlPath = '/downloadFile', url) {
-    const appUrl = (await getUrl('', 'lilium')).replace('/#/', '');
+    let appUrl = await getUrl('', 'lilium');
-    const response = await axios.get(
+    appUrl = appUrl.replace('/#/', '');
-        url ?? `${appUrl}/api/${model}/${id}${urlPath}?access_token=${token}`,
+    window.open(url ?? `${appUrl}/api/${model}/${id}${urlPath}?access_token=${token}`);
-        { responseType: 'blob' }
-    );
-
-    const contentDisposition = response.headers['content-disposition'];
-    const matches = /filename[^;=\n]*=((['"]).*?\2|[^;\n]*)/.exec(contentDisposition);
-    const filename =
-        matches != null && matches[1]
-            ? matches[1].replace(/['"]/g, '')
-            : 'downloaded-file';
-
-    exportFile(filename, response.data);
 }

src/composables/useArrayData.js

@@ -87,7 +87,7 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
         const params = { filter };
 
         Object.assign(params, userParams);
-        if (params.filter) params.filter.skip = store.skip;
+        params.filter.skip = store.skip;
         if (store?.order && typeof store?.order == 'string') store.order = [store.order];
         if (store.order?.length) params.filter.order = [...store.order];
         else delete params.filter.order;

src/css/app.scss

@@ -241,7 +241,7 @@ input::-webkit-inner-spin-button {
     th,
     td {
         padding: 1px 10px 1px 10px;
-        max-width: 130px;
+        max-width: 100px;
         div span {
             overflow: hidden;
             white-space: nowrap;

src/filters/getDifferences.js

@@ -1,21 +0,0 @@
-export default function getDifferences(obj1, obj2) {
-    let diff = {};
-    delete obj1.$index;
-    delete obj2.$index;
-
-    for (let key in obj1) {
-        if (obj2[key] && JSON.stringify(obj1[key]) !== JSON.stringify(obj2[key])) {
-            diff[key] = obj2[key];
-        }
-    }
-    for (let key in obj2) {
-        if (
-            obj1[key] === undefined ||
-            JSON.stringify(obj1[key]) !== JSON.stringify(obj2[key])
-        ) {
-            diff[key] = obj2[key];
-        }
-    }
-
-    return diff;
-}

src/filters/getUpdatedValues.js

@@ -1,6 +0,0 @@
-export default function getUpdatedValues(keys, formData) {
-    return keys.reduce((acc, key) => {
-        acc[key] = formData[key];
-        return acc;
-    }, {});
-}

src/filters/index.js

@@ -11,17 +11,11 @@ import dashIfEmpty from './dashIfEmpty';
 import dateRange from './dateRange';
 import toHour from './toHour';
 import dashOrCurrency from './dashOrCurrency';
-import getDifferences from './getDifferences';
-import getUpdatedValues from './getUpdatedValues';
 import getParamWhere from './getParamWhere';
-import parsePhone from './parsePhone';
 import isDialogOpened from './isDialogOpened';
 
 export {
-    getUpdatedValues,
-    getDifferences,
     isDialogOpened,
-    parsePhone,
     toLowerCase,
     toLowerCamel,
     toDate,

src/filters/parsePhone.js

@@ -1,12 +0,0 @@
-export default function (phone, prefix = 34) {
-    if (phone.startsWith('+')) {
-        return `${phone.slice(1)}`;
-    }
-    if (phone.startsWith('00')) {
-        return `${phone.slice(2)}`;
-    }
-    if (phone.startsWith(prefix) && phone.length === prefix.length + 9) {
-        return `${prefix}${phone.slice(prefix.length)}`;
-    }
-    return `${prefix}${phone}`;
-}

src/i18n/locale/en.yml

@@ -60,7 +60,7 @@ globals:
     reference: Reference
     agency: Agency
     warehouseOut: Warehouse Out
-    warehouseIn: Warehouse In
+    wareHouseIn: Warehouse In
     landed: Landed
     shipped: Shipped
     totalEntries: Total entries
@@ -298,7 +298,6 @@ globals:
         clientsActionsMonitor: Clients and actions
         serial: Serial
         medical: Mutual
-        pit: IRPF
         RouteExtendedList: Router
         wasteRecalc: Waste recaclulate
         operator: Operator
@@ -585,15 +584,15 @@ worker:
         role: Role
         sipExtension: Extension
         locker: Locker
-        fiDueDate: FI due date
+        fiDueDate: Fecha de caducidad del DNI
-        sex: Sex
+        sex: Sexo
-        seniority: Seniority
+        seniority: Antigüedad
         fi: DNI/NIE/NIF
-        birth: Birth
+        birth: Fecha de nacimiento
-        isFreelance: Freelance
+        isFreelance: Autónomo
         isSsDiscounted: Bonificación SS
-        hasMachineryAuthorized: Machinery authorized
+        hasMachineryAuthorized: Autorizado para llevar maquinaria
-        isDisable: Disable
+        isDisable: Trabajador desactivado
     notificationsManager:
         activeNotifications: Active notifications
         availableNotifications: Available notifications
@@ -709,7 +708,7 @@ supplier:
         supplierName: Supplier name
     basicData:
         workerFk: Responsible
-        isReal: Verified
+        isSerious: Verified
         isActive: Active
         isPayMethodChecked: PayMethod checked
         note: Notes
@@ -768,8 +767,7 @@ travel:
         thermographs: Thermographs
         hb: HB
     basicData:
-        daysInForward: Automatic movement (Raid)
+        daysInForward: Days in forward
-        isRaid: Raid
     thermographs:
         temperature: Temperature
         destination: Destination

src/i18n/locale/es.yml

@@ -303,7 +303,6 @@ globals:
         clientsActionsMonitor: Clientes y acciones
         serial: Facturas por serie
         medical: Mutua
-        pit: IRPF
         wasteRecalc: Recalcular mermas
         operator: Operario
         parking: Parking
@@ -581,9 +580,9 @@ worker:
         newWorker: Nuevo trabajador
     summary:
         boss: Jefe
-        phoneExtension: Ext. de teléfono
+        phoneExtension: Extensión de teléfono
-        entPhone: Tel. de empresa
+        entPhone: Teléfono de empresa
-        personalPhone: Tel. personal
+        personalPhone: Teléfono personal
         noBoss: Sin jefe
         userData: Datos de usuario
         userId: ID del usuario
@@ -704,7 +703,7 @@ supplier:
         supplierName: Nombre del proveedor
     basicData:
         workerFk: Responsable
-        isReal: Verificado
+        isSerious: Verificado
         isActive: Activo
         isPayMethodChecked: Método de pago validado
         note: Notas
@@ -762,8 +761,7 @@ travel:
         thermographs: Termógrafos
         hb: HB
     basicData:
-        daysInForward: Desplazamiento automatico (redada)
+        daysInForward: Días redada
-        isRaid: Redada
     thermographs:
         temperature: Temperatura
         destination: Destino

src/pages/Account/AccountAccounts.vue

@@ -11,13 +11,21 @@ const { t } = useI18n();
 const { notify } = useNotify();
 
 const onSynchronizeAll = async () => {
+    try {
         notify(t('Synchronizing in the background'), 'positive');
         await axios.patch(`Accounts/syncAll`);
+    } catch (error) {
+        console.error('Error synchronizing all accounts', error);
+    }
 };
 
 const onSynchronizeRoles = async () => {
+    try {
         await axios.patch(`RoleInherits/sync`);
         notify(t('Roles synchronized!'), 'positive');
+    } catch (error) {
+        console.error('Error synchronizing roles', error);
+    }
 };
 </script>
 

src/pages/Account/AccountAcls.vue

@@ -111,6 +111,7 @@ const columns = computed(() => [
     },
 ]);
 const deleteAcl = async ({ id }) => {
+    try {
         await new Promise((resolve) => {
             quasar
                 .dialog({
@@ -130,6 +131,9 @@ const deleteAcl = async ({ id }) => {
         await axios.delete(`ACLs/${id}`);
         tableRef.value.reload();
         notify('ACL removed', 'positive');
+    } catch (error) {
+        console.error('Error deleting Acl: ', error);
+    }
 };
 </script>
 

src/pages/Account/AccountAliasList.vue

@@ -4,19 +4,11 @@ import { ref, computed } from 'vue';
 import VnTable from 'components/VnTable/VnTable.vue';
 import VnSearchbar from 'components/ui/VnSearchbar.vue';
 import { useStateStore } from 'stores/useStateStore';
-
+import exprBuilder from './Alias/AliasExprBuilder.js';
 const tableRef = ref();
 const { t } = useI18n();
 const stateStore = useStateStore();
 
-const exprBuilder = (param, value) => {
-    switch (param) {
-        case 'search':
-            return /^\d+$/.test(value)
-                ? { id: value }
-                : { alias: { like: `%${value}%` } };
-    }
-};
 const columns = computed(() => [
     {
         align: 'left',

src/pages/Account/AccountConnections.vue

@@ -34,9 +34,13 @@ const refresh = () => paginateRef.value.fetch();
 const navigate = (id) => router.push({ name: 'AccountSummary', params: { id } });
 
 const killSession = async ({ userId, created }) => {
+    try {
         await axios.post(`${urlPath}/killSession`, { userId, created });
         paginateRef.value.fetch();
         notify(t('Session killed'), 'positive');
+    } catch (error) {
+        console.error('Error killing session', error);
+    }
 };
 </script>
 

src/pages/Account/AccountExprBuilder.js

@@ -0,0 +1,18 @@
+export default (param, value) => {
+    switch (param) {
+        case 'search':
+            return /^\d+$/.test(value)
+                ? { id: value }
+                : {
+                      or: [
+                          { name: { like: `%${value}%` } },
+                          { nickname: { like: `%${value}%` } },
+                      ],
+                  };
+        case 'name':
+        case 'nickname':
+            return { [param]: { like: `%${value}%` } };
+        case 'roleFk':
+            return { [param]: value };
+    }
+};

src/pages/Account/AccountLdap.vue

@@ -40,8 +40,12 @@ const formUrlCreate = ref(null);
 const formUrlUpdate = ref(null);
 const formCustomFn = ref(null);
 const onTestConection = async () => {
+    try {
         await axios.get(`LdapConfigs/test`);
         notify(t('LDAP connection established!'), 'positive');
+    } catch (error) {
+        console.error('Error testing connection', error);
+    }
 };
 const getInitialLdapConfig = async () => {
     try {
@@ -68,10 +72,14 @@ const getInitialLdapConfig = async () => {
     }
 };
 const deleteMailForward = async () => {
+    try {
         await axios.delete(URL_UPDATE);
         initialData.value = { ...DEFAULT_DATA };
         hasData.value = false;
         notify(t('globals.dataSaved'), 'positive');
+    } catch (err) {
+        console.error('Error deleting mail forward', err);
+    }
 };
 
 onMounted(async () => await getInitialLdapConfig());

src/pages/Account/AccountList.vue

@@ -7,12 +7,13 @@ import AccountSummary from './Card/AccountSummary.vue';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import AccountFilter from './AccountFilter.vue';
 import RightMenu from 'src/components/common/RightMenu.vue';
+import exprBuilder from './AccountExprBuilder.js';
+import filter from './Card/AccountFilter.js';
+
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
 const tableRef = ref();
-const filter = {
+
-    include: { relation: 'role', scope: { fields: ['id', 'name'] } },
-};
 const columns = computed(() => [
     {
         align: 'left',
@@ -82,24 +83,6 @@ const columns = computed(() => [
         ],
     },
 ]);
-const exprBuilder = (param, value) => {
-    switch (param) {
-        case 'search':
-            return /^\d+$/.test(value)
-                ? { id: value }
-                : {
-                      or: [
-                          { name: { like: `%${value}%` } },
-                          { nickname: { like: `%${value}%` } },
-                      ],
-                  };
-        case 'name':
-        case 'nickname':
-            return { [param]: { like: `%${value}%` } };
-        case 'roleFk':
-            return { [param]: value };
-    }
-};
 </script>
 
 <template>

src/pages/Account/AccountSamba.vue

@@ -46,8 +46,12 @@ const formUrlUpdate = ref(null);
 const formCustomFn = ref(null);
 
 const onTestConection = async () => {
+    try {
         await axios.get(`SambaConfigs/test`);
         notify(t('Samba connection established!'), 'positive');
+    } catch (error) {
+        console.error('Error testing connection', error);
+    }
 };
 
 const getInitialSambaConfig = async () => {
@@ -75,10 +79,14 @@ const getInitialSambaConfig = async () => {
 };
 
 const deleteMailForward = async () => {
+    try {
         await axios.delete(URL_UPDATE);
         initialData.value = { ...DEFAULT_DATA };
         hasData.value = false;
         notify(t('globals.dataSaved'), 'positive');
+    } catch (err) {
+        console.error('Error deleting mail forward', err);
+    }
 };
 
 onMounted(async () => await getInitialSambaConfig());

src/pages/Account/Alias/AliasExprBuilder.js

@@ -0,0 +1,8 @@
+export default (param, value) => {
+    switch (param) {
+        case 'search':
+            return /^\d+$/.test(value)
+                ? { id: value }
+                : { alias: { like: `%${value}%` } };
+    }
+};

src/pages/Account/Alias/Card/AliasCard.vue

@@ -1,21 +1,21 @@
 <script setup>
-import { useI18n } from 'vue-i18n';
 import VnCard from 'components/common/VnCard.vue';
 import AliasDescriptor from './AliasDescriptor.vue';
-const { t } = useI18n();
+import exprBuilder from '../AliasExprBuilder.js';
 </script>
 
 <template>
     <VnCard
         data-key="Alias"
-        base-url="MailAliases"
+        url="MailAliases"
         :descriptor="AliasDescriptor"
         search-data-key="AccountAliasList"
         :searchbar-props="{
             url: 'MailAliases',
-            info: t('mailAlias.searchInfo'),
+            info: $t('mailAlias.searchInfo'),
-            label: t('mailAlias.search'),
+            label: $t('mailAlias.search'),
             searchUrl: 'table',
+            exprBuilder,
         }"
     />
 </template>

src/pages/Account/Alias/Card/AliasDescriptor.vue

@@ -7,7 +7,6 @@ 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';
 
@@ -29,9 +28,6 @@ const entityId = computed(() => {
     return $props.id || route.params.id;
 });
 
-const data = ref(useCardDescription());
-const setData = (entity) => (data.value = useCardDescription(entity.alias, entity.id));
-
 const removeAlias = () => {
     quasar
         .dialog({
@@ -44,9 +40,13 @@ const removeAlias = () => {
             cancel: true,
         })
         .onOk(async () => {
+            try {
                 await axios.delete(`MailAliases/${entityId.value}`);
                 notify(t('Alias removed'), 'positive');
                 router.push({ name: 'AccountAlias' });
+            } catch (err) {
+                console.error('Error removing alias');
+            }
         });
 };
 </script>
@@ -56,10 +56,8 @@ const removeAlias = () => {
         ref="descriptor"
         :url="`MailAliases/${entityId}`"
         module="Alias"
-        @on-fetch="setData"
+        data-key="Alias"
-        data-key="aliasData"
+        title="alias"
-        :title="data.title"
-        :subtitle="data.subtitle"
     >
         <template #menu>
             <QItem v-ripple clickable @click="removeAlias()">

src/pages/Account/Alias/Card/AliasSummary.vue

@@ -1,13 +1,11 @@
 <script setup>
-import { ref, computed } from 'vue';
+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();
 
@@ -18,20 +16,15 @@ const $props = defineProps({
     },
 });
 
-const { store } = useArrayData('Alias');
-const alias = ref(store.data);
 const entityId = computed(() => $props.id || route.params.id);
 </script>
 
 <template>
-    <CardSummary
+    <CardSummary ref="summary" :url="`MailAliases/${entityId}`" data-key="Alias">
-        ref="summary"
+        <template #header="{ entity: alias }">
-        :url="`MailAliases/${entityId}`"
+            {{ alias.id }} - {{ alias.alias }}
-        @on-fetch="(data) => (alias = data)"
+        </template>
-        data-key="MailAliasesSummary"
+        <template #body="{ entity: alias }">
-    >
-        <template #header> {{ alias.id }} - {{ alias.alias }} </template>
-        <template #body>
             <QCard class="vn-one">
                 <QCardSection class="q-pa-none">
                     <router-link

src/pages/Account/Card/AccountBasicData.vue

@@ -1,46 +1,26 @@
 <script setup>
-import { useRoute } from 'vue-router';
-import { useI18n } from 'vue-i18n';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import VnSelectEnum from 'src/components/common/VnSelectEnum.vue';
 import FormModel from 'components/FormModel.vue';
 import VnInput from 'src/components/common/VnInput.vue';
-import { ref, watch } from 'vue';
-
-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
         ref="formModelRef"
-        url="VnUsers/preview"
+        :url-update="`VnUsers/${$route.params.id}/update-user`"
-        :url-update="`VnUsers/${route.params.id}/update-user`"
+        model="Account"
-        :filter="accountFilter"
-        model="Accounts"
         auto-load
-        @on-data-saved="formModelRef.fetch()"
+        @on-data-saved="$refs.formModelRef.fetch()"
     >
         <template #form="{ data }">
             <div class="q-gutter-y-sm">
-                <VnInput v-model="data.name" :label="t('account.card.nickname')" />
+                <VnInput v-model="data.name" :label="$t('account.card.nickname')" />
-                <VnInput v-model="data.nickname" :label="t('account.card.alias')" />
+                <VnInput v-model="data.nickname" :label="$t('account.card.alias')" />
-                <VnInput v-model="data.email" :label="t('globals.params.email')" />
+                <VnInput v-model="data.email" :label="$t('globals.params.email')" />
                 <VnSelect
                     url="Languages"
                     v-model="data.lang"
-                    :label="t('account.card.lang')"
+                    :label="$t('account.card.lang')"
                     option-value="code"
                     option-label="code"
                 />
@@ -49,7 +29,7 @@ watch(
                     table="user"
                     column="twoFactor"
                     v-model="data.twoFactor"
-                    :label="t('account.card.twoFactor')"
+                    :label="$t('account.card.twoFactor')"
                     option-value="code"
                     option-label="code"
                 />

src/pages/Account/Card/AccountCard.vue

@@ -1,20 +1,25 @@
 <script setup>
-import { useI18n } from 'vue-i18n';
 import VnCard from 'components/common/VnCard.vue';
 import AccountDescriptor from './AccountDescriptor.vue';
-
+import exprBuilder from '../AccountExprBuilder.js';
-const { t } = useI18n();
+import filter from './AccountFilter.js';
 </script>
-
 <template>
     <VnCard
+        url="VnUsers/preview"
+        :id-in-where="true"
         data-key="Account"
+        :filter="filter"
         :descriptor="AccountDescriptor"
-        search-data-key="AccountList"
+        search-data-key="AccountUsers"
         :searchbar-props="{
             url: 'VnUsers/preview',
-            label: t('account.search'),
+            label: $t('account.search'),
-            info: t('account.searchInfo'),
+            info: $t('account.searchInfo'),
+            exprBuilder,
+            filter: {
+                include: { relation: 'role', scope: { fields: ['id', 'name'] } },
+            },
         }"
     />
 </template>

src/pages/Account/Card/AccountDescriptor.vue

@@ -4,11 +4,10 @@ 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 AccountDescriptorMenu from './AccountDescriptorMenu.vue';
 import FetchData from 'src/components/FetchData.vue';
 import VnImg from 'src/components/ui/VnImg.vue';
-
+import filter from './AccountFilter.js';
 const $props = defineProps({
     id: {
         type: Number,
@@ -22,14 +21,6 @@ const { t } = useI18n();
 const entityId = computed(() => {
     return $props.id || route.params.id;
 });
-const data = ref(useCardDescription());
-const setData = (entity) => (data.value = useCardDescription(entity.nickname, entity.id));
-
-const filter = {
-    where: { id: entityId },
-    fields: ['id', 'nickname', 'name', 'role'],
-    include: { relation: 'role', scope: { fields: ['id', 'name'] } },
-};
 const hasAccount = ref(false);
 </script>
 
@@ -44,10 +35,8 @@ const hasAccount = ref(false);
         :url="`VnUsers/preview`"
         :filter="filter"
         module="Account"
-        @on-fetch="setData"
+        data-key="Account"
-        data-key="AccountId"
+        title="nickname"
-        :title="data.title"
-        :subtitle="data.subtitle"
     >
         <template #menu>
             <AccountDescriptorMenu :has-account="hasAccount" />
@@ -73,7 +62,7 @@ const hasAccount = ref(false);
         </template>
         <template #body="{ entity }">
             <VnLv :label="t('account.card.nickname')" :value="entity.name" />
-            <VnLv :label="t('account.card.role')" :value="entity.role.name" />
+            <VnLv :label="t('account.card.role')" :value="entity.role?.name" />
         </template>
         <template #actions="{ entity }">
             <QCardActions class="q-gutter-x-md">

src/pages/Account/Card/AccountFilter.js

@@ -0,0 +1,13 @@
+export default {
+    fields: [
+        'id',
+        'email',
+        'nickname',
+        'name',
+        'accountStateFk',
+        'packages',
+        'pickup',
+        'role',
+    ],
+    include: { relation: 'role', scope: { fields: ['id', 'name'] } },
+};

src/pages/Account/Card/AccountMailForwarding.vue

@@ -44,23 +44,32 @@ const fetchMailForwards = async () => {
     try {
         const response = await axios.get(`MailForwards/${route.params.id}`);
         return response.data;
-    } catch {
+    } catch (err) {
+        console.error('Error fetching mail forwards', err);
         return null;
     }
 };
 
 const deleteMailForward = async () => {
+    try {
         await axios.delete(`MailForwards/${route.params.id}`);
         formData.value.forwardTo = null;
         initialData.value.forwardTo = null;
         initialData.value.hasData = hasData.value;
         notify(t('globals.dataSaved'), 'positive');
+    } catch (err) {
+        console.error('Error deleting mail forward', err);
+    }
 };
 
 const updateMailForward = async () => {
+    try {
         await axios.patch('MailForwards', formData.value);
         initialData.value = { ...formData.value };
         initialData.value.hasData = hasData.value;
+    } catch (err) {
+        console.error('Error creating mail forward', err);
+    }
 };
 
 const onSubmit = async () => {

src/pages/Account/Card/AccountSummary.vue

@@ -1,15 +1,12 @@
 <script setup>
-import { ref, computed } from 'vue';
+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';
-import { useArrayData } from 'src/composables/useArrayData';
 
 const route = useRoute();
-const { t } = useI18n();
 
 const $props = defineProps({
     id: {
@@ -17,39 +14,26 @@ const $props = defineProps({
         default: 0,
     },
 });
-const { store } = useArrayData('Account');
-const account = ref(store.data);
 
 const entityId = computed(() => $props.id || route.params.id);
-const filter = {
-    where: { id: entityId },
-    fields: ['id', 'nickname', 'name', 'role'],
-    include: { relation: 'role', scope: { fields: ['id', 'name'] } },
-};
 </script>
 
 <template>
-    <CardSummary
+    <CardSummary data-key="Account" url="VnUsers/preview" :filter="filter">
-        data-key="AccountSummary"
+        <template #header="{ entity }">{{ entity.id }} - {{ entity.nickname }}</template>
-        ref="AccountSummary"
+        <template #body="{ entity }">
-        url="VnUsers/preview"
-        :filter="filter"
-        @on-fetch="(data) => (account = data)"
-    >
-        <template #header>{{ account.id }} - {{ account.nickname }}</template>
-        <template #body>
             <QCard class="vn-one">
                 <QCardSection class="q-pa-none">
                     <router-link
                         :to="{ name: 'AccountBasicData', params: { id: entityId } }"
                         class="header header-link"
                     >
-                        {{ t('globals.pageTitles.basicData') }}
+                        {{ $t('globals.pageTitles.basicData') }}
                         <QIcon name="open_in_new" />
                     </router-link>
                 </QCardSection>
-                <VnLv :label="t('account.card.nickname')" :value="account.name" />
+                <VnLv :label="$t('account.card.nickname')" :value="entity.name" />
-                <VnLv :label="t('account.card.role')" :value="account.role.name" />
+                <VnLv :label="$t('account.card.role')" :value="entity.role?.name" />
             </QCard>
         </template>
     </CardSummary>

src/pages/Account/Role/AccountExprBuilder.js

@@ -0,0 +1,16 @@
+export default (param, value) => {
+    switch (param) {
+        case 'search':
+            return /^\d+$/.test(value)
+                ? { id: value }
+                : {
+                      or: [
+                          { name: { like: `%${value}%` } },
+                          { nickname: { like: `%${value}%` } },
+                      ],
+                  };
+        case 'name':
+        case 'description':
+            return { [param]: { like: `%${value}%` } };
+    }
+};

src/pages/Account/Role/AccountRoles.vue

@@ -6,6 +6,7 @@ import { useRoute } from 'vue-router';
 import VnSearchbar from 'components/ui/VnSearchbar.vue';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import RoleSummary from './Card/RoleSummary.vue';
+import exprBuilder from './AccountExprBuilder.js';
 const route = useRoute();
 const { t } = useI18n();
 const $props = defineProps({
@@ -62,24 +63,7 @@ const columns = computed(() => [
         ],
     },
 ]);
-const exprBuilder = (param, value) => {
-    switch (param) {
-        case 'search':
-            return /^\d+$/.test(value)
-                ? { id: value }
-                : {
-                      or: [
-                          { name: { like: `%${value}%` } },
-                          { nickname: { like: `%${value}%` } },
-                      ],
-                  };
-        case 'name':
-        case 'description':
-            return { [param]: { like: `%${value}%` } };
-    }
-};
 </script>
-
 <template>
     <VnSearchbar
         data-key="AccountRolesList"

src/pages/Account/Role/Card/RoleBasicData.vue

@@ -1,24 +1,16 @@
 <script setup>
-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';
-const route = useRoute();
-const { t } = useI18n();
 </script>
 <template>
-    <FormModel :url="`VnRoles/${route.params.id}`" model="VnRole" auto-load>
+    <FormModel model="Role" auto-load>
         <template #form="{ data }">
             <VnRow>
-                <div class="col">
+                <VnInput v-model="data.name" :label="$t('globals.name')" />
-                    <VnInput v-model="data.name" :label="t('globals.name')" />
-                </div>
             </VnRow>
             <VnRow>
-                <div class="col">
+                <VnInput v-model="data.description" :label="$t('role.description')" />
-                    <VnInput v-model="data.description" :label="t('role.description')" />
-                </div>
             </VnRow>
         </template>
     </FormModel>

src/pages/Account/Role/Card/RoleCard.vue

@@ -1,20 +1,21 @@
 <script setup>
-import { useI18n } from 'vue-i18n';
 import VnCard from 'components/common/VnCard.vue';
 import RoleDescriptor from './RoleDescriptor.vue';
-
+import exprBuilder from '../AccountExprBuilder.js';
-const { t } = useI18n();
 </script>
 <template>
     <VnCard
+        url="VnRoles"
+        :id-in-where="true"
         data-key="Role"
         :descriptor="RoleDescriptor"
-        search-data-key="AccountRolesList"
+        search-data-key="Roles"
         :searchbar-props="{
             url: 'VnRoles',
-            label: t('role.searchRoles'),
+            label: $t('role.searchRoles'),
-            info: t('role.searchInfo'),
+            info: $t('role.searchInfo'),
             searchUrl: 'table',
+            exprBuilder,
         }"
     />
 </template>

src/pages/Account/Role/Card/RoleDescriptor.vue

@@ -1,10 +1,9 @@
 <script setup>
-import { ref, computed } from 'vue';
+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({
@@ -26,26 +25,22 @@ const { t } = useI18n();
 const entityId = computed(() => {
     return $props.id || route.params.id;
 });
-const data = ref(useCardDescription());
-const setData = (entity) => (data.value = useCardDescription(entity.name, entity.id));
-const filter = {
-    where: { id: entityId },
-};
 const removeRole = async () => {
+    try {
         await axios.delete(`VnRoles/${entityId.value}`);
         notify(t('Role removed'), 'positive');
+    } catch (error) {
+        console.error('Error deleting role', error);
+    }
 };
 </script>
 
 <template>
     <CardDescriptor
-        :url="`VnRoles/${entityId}`"
+        url="VnRoles"
-        :filter="filter"
+        :filter="{ where: { id: entityId } }"
         module="Role"
-        @on-fetch="setData"
+        data-key="Role"
-        data-key="accountData"
-        :title="data.title"
-        :subtitle="data.subtitle"
         :summary="$props.summary"
     >
         <template #menu>

src/pages/Account/Role/Card/RoleSummary.vue

@@ -19,18 +19,15 @@ const $props = defineProps({
 const { store } = useArrayData('Role');
 const role = ref(store.data);
 const entityId = computed(() => $props.id || route.params.id);
-const filter = {
-    where: { id: entityId },
-};
 </script>
 
 <template>
     <CardSummary
         ref="summary"
-        :url="`VnRoles`"
+        url="VnRoles"
-        :filter="filter"
+        :filter="{ where: { id: entityId } }"
         @on-fetch="(data) => (role = data)"
-        data-key="RoleSummary"
+        data-key="Role"
     >
         <template #header> {{ role.id }} - {{ role.name }} </template>
         <template #body>

src/pages/Claim/Card/ClaimCard.vue

@@ -7,7 +7,7 @@ import filter from './ClaimFilter.js';
 <template>
     <VnCard
         data-key="Claim"
-        base-url="Claims"
+        url="Claims"
         :descriptor="ClaimDescriptor"
         :filter-panel="ClaimFilter"
         search-data-key="ClaimList"

src/pages/Claim/Card/ClaimDescriptor.vue

@@ -8,7 +8,6 @@ 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 useCardDescription from 'src/composables/useCardDescription';
 import VnUserLink from 'src/components/ui/VnUserLink.vue';
 import { getUrl } from 'src/composables/getUrl';
 import ZoneDescriptorProxy from 'src/pages/Zone/Card/ZoneDescriptorProxy.vue';
@@ -39,10 +38,8 @@ const STATE_COLOR = {
 function stateColor(code) {
     return STATE_COLOR[code];
 }
-const data = ref(useCardDescription());
 const setData = (entity) => {
     if (!entity) return;
-    data.value = useCardDescription(entity?.client?.name, entity.id);
     state.set('ClaimDescriptor', entity);
 };
 onMounted(async () => {

src/pages/Claim/Card/ClaimDescriptorMenu.vue

@@ -100,7 +100,7 @@ async function remove() {
         </QMenu>
     </QItem>
     <QSeparator />
-    <QItem @click="confirmRemove()" v-ripple clickable data-cy="deleteClaim">
+    <QItem @click="confirmRemove()" v-ripple clickable>
         <QItemSection avatar>
             <QIcon name="delete" />
         </QItemSection>

src/pages/Claim/Card/ClaimLinesImport.vue

@@ -130,7 +130,7 @@ function cancel() {
                 <template #body-cell-description="{ row, value }">
                     <QTd auto-width align="right" class="link">
                         {{ value }}
-                        <ItemDescriptorProxy :id="row.itemFk" />
+                        <ItemDescriptorProxy :id="row.itemFk"></ItemDescriptorProxy>
                     </QTd>
                 </template>
             </QTable>

src/pages/Claim/Card/ClaimNotes.vue

@@ -25,7 +25,7 @@ const claimFilter = computed(() => {
                 include: {
                     relation: 'user',
                     scope: {
-                        fields: ['id', 'nickname', 'name'],
+                        fields: ['id', 'nickname'],
                     },
                 },
             },

src/pages/Claim/ClaimList.vue

@@ -95,7 +95,6 @@ const columns = computed(() => [
                 optionLabel: 'description',
             },
         },
-        orderBy: 'priority',
     },
     {
         align: 'right',

src/pages/Customer/Card/CustomerAddress.vue

@@ -2,7 +2,6 @@
 import { onBeforeMount, ref, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute, useRouter } from 'vue-router';
-import FetchData from 'components/FetchData.vue';
 
 import axios from 'axios';
 
@@ -53,6 +52,7 @@ const addressFilter = {
 
 onBeforeMount(() => {
     const { id } = route.params;
+    getAddressesData(id);
     getClientData(id);
 });
 
@@ -60,10 +60,23 @@ watch(
     () => route.params.id,
     (newValue) => {
         if (!newValue) return;
+        getAddressesData(newValue);
         getClientData(newValue);
     }
 );
 
+const getAddressesData = async (id) => {
+    try {
+        const { data } = await axios.get(`Clients/${id}/addresses`, {
+            params: { filter: JSON.stringify(addressFilter) },
+        });
+        addresses.value = data;
+        sortAddresses();
+    } catch (error) {
+        return error;
+    }
+};
+
 const getClientData = async (id) => {
     try {
         const { data } = await axios.get(`Clients/${id}`);
@@ -88,9 +101,9 @@ const setDefault = (address) => {
     });
 };
 
-const sortAddresses = (data) => {
+const sortAddresses = () => {
-    if (!client.value || !data) return;
+    if (!client.value || !addresses.value) return;
-    addresses.value = data.sort((a, b) => {
+    addresses.value = addresses.value.sort((a, b) => {
         return isDefaultAddress(b) - isDefaultAddress(a);
     });
 };
@@ -111,17 +124,8 @@ const toCustomerAddressEdit = (addressId) => {
 </script>
 
 <template>
-    <FetchData
-        @on-fetch="sortAddresses"
-        auto-load
-        data-key="CustomerAddresses"
-        order="id DESC"
-        ref="vnPaginateRef"
-        :filter="addressFilter"
-        :url="`Clients/${route.params.id}/addresses`"
-    />
     <div class="full-width flex justify-center">
-        <QCard class="card-width q-pa-lg">
+        <QCard class="card-width q-pa-lg" v-if="addresses.length">
             <QCardSection>
                 <div
                     v-for="(item, index) in addresses"
@@ -163,7 +167,7 @@ const toCustomerAddressEdit = (addressId) => {
                         <div>{{ item.street }}</div>
                         <div>
                             {{ item.postalCode }} - {{ item.city }},
-                            {{ item.province?.name }}
+                            {{ item.province.name }}
                         </div>
                         <div>
                             {{ item.phone }}

src/pages/Customer/Card/CustomerBalance.vue

@@ -256,10 +256,10 @@ const showBalancePdf = ({ id }) => {
             {{ toCurrency(balances[rowIndex]?.balance) }}
         </template>
         <template #column-description="{ row }">
-            <span class="link" v-if="row.isInvoice" @click.stop>
+            <div class="link" v-if="row.isInvoice">
                 {{ t('bill', { ref: row.description }) }}
-                <InvoiceOutDescriptorProxy :id="row.id" />
+                <InvoiceOutDescriptorProxy :id="row.description" />
-            </span>
+            </div>
             <span v-else class="q-pa-xs dotted rounded-borders" :title="row.description">
                 {{ row.description }}
             </span>

src/pages/Customer/Card/CustomerBasicData.vue

@@ -9,7 +9,6 @@ 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';
-import { getDifferences, getUpdatedValues } from 'src/filters';
 
 const route = useRoute();
 const { t } = useI18n();
@@ -31,13 +30,6 @@ const exprBuilder = (param, value) => {
         and: [{ active: { neq: false } }, handleSalesModelValue(value)],
     };
 };
-
-function onBeforeSave(formData, originalData) {
-    return getUpdatedValues(
-        Object.keys(getDifferences(formData, originalData)),
-        formData
-    );
-}
 </script>
 <template>
     <FetchData
@@ -51,12 +43,7 @@ function onBeforeSave(formData, originalData) {
         @on-fetch="(data) => (businessTypes = data)"
         auto-load
     />
-    <FormModel
+    <FormModel auto-load model="Client" :url-update="`Clients/${$route.params.id}`">
-        :url="`Clients/${route.params.id}`"
-        auto-load
-        model="customer"
-        :mapper="onBeforeSave"
-    >
         <template #form="{ data, validate }">
             <VnRow>
                 <VnInput
@@ -107,7 +94,6 @@ function onBeforeSave(formData, originalData) {
                     :rules="validate('client.phone')"
                     clearable
                     v-model="data.phone"
-                    data-cy="customerPhone"
                 />
                 <VnInput
                     :label="t('customer.summary.mobile')"

src/pages/Customer/Card/CustomerBillingData.vue

@@ -28,7 +28,12 @@ const getBankEntities = (data, formData) => {
 </script>
 
 <template>
-    <FormModel :url-update="`Clients/${route.params.id}`" auto-load model="customer">
+    <FormModel
+        :url-update="`Clients/${route.params.id}`"
+        :url="`Clients/${route.params.id}/getCard`"
+        auto-load
+        model="customer"
+    >
         <template #form="{ data, validate }">
             <VnRow>
                 <VnSelect

src/pages/Customer/Card/CustomerCard.vue

@@ -1,20 +1,14 @@
 <script setup>
-import { computed } from 'vue';
-import { useRoute } from 'vue-router';
-
 import VnCard from 'components/common/VnCard.vue';
 import CustomerDescriptor from './CustomerDescriptor.vue';
 import CustomerFilter from '../CustomerFilter.vue';
-const route = useRoute();
-
-const routeName = computed(() => route.name);
 </script>
 <template>
     <VnCard
         data-key="Client"
-        base-url="Clients"
+        :url="`Clients/${$route.params.id}/getCard`"
         :descriptor="CustomerDescriptor"
-        :filter-panel="routeName != 'CustomerConsumption' && CustomerFilter"
+        :filter-panel="$route.name != 'CustomerConsumption' && CustomerFilter"
         search-data-key="CustomerList"
         :searchbar-props="{
             url: 'Clients/filter',

src/pages/Customer/Card/CustomerCreditOpinion.vue

@@ -93,6 +93,22 @@ const columns = computed(() => [
             <WorkerDescriptorProxy :id="row.worker.id" />
         </template>
     </VnTable>
+    <!-- <QTable
+            :columns="columns"
+            :pagination="{ rowsPerPage: 0 }"
+            :rows="rows"
+            hide-bottom
+            row-key="id"
+            v-model:selected="selected"
+            class="card-width q-px-lg"
+        >
+            <template #body-cell-employee="{ row }">
+                <QTd @click.stop>
+                    <span class="link">{{ row.worker.user.nickname }}</span>
+                    <WorkerDescriptorProxy :id="row.clientFk" />
+                </QTd>
+            </template>
+        </QTable> -->
 </template>
 
 <i18n>

src/pages/Customer/Card/CustomerDescriptor.vue

@@ -1,12 +1,10 @@
 <script setup>
-import { ref, computed } from 'vue';
+import { 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';
@@ -35,11 +33,6 @@ const entityId = computed(() => {
     return $props.id || route.params.id;
 });
 
-const data = ref(useCardDescription());
-const setData = (entity) => {
-    data.value = useCardDescription(entity?.name, entity?.id);
-    if (customer.value) customer.value.webAccess = data.value?.account?.isActive;
-};
 const debtWarning = computed(() => {
     return customer.value?.debt > customer.value?.credit ? 'negative' : 'primary';
 });
@@ -49,11 +42,9 @@ const debtWarning = computed(() => {
     <CardDescriptor
         module="Customer"
         :url="`Clients/${entityId}/getCard`"
-        :title="data.title"
-        :subtitle="data.subtitle"
         @on-fetch="setData"
         :summary="$props.summary"
-        data-key="customer"
+        data-key="Client"
     >
         <template #menu="{ entity }">
             <CustomerDescriptorMenu :customer="entity" />

src/pages/Customer/Card/CustomerFiscalData.vue

@@ -34,6 +34,7 @@ function handleLocation(data, location) {
     />
     <FormModel
         :url-update="`Clients/${route.params.id}/updateFiscalData`"
+        :url="`Clients/${route.params.id}/getCard`"
         auto-load
         model="customer"
     >

src/pages/Customer/Card/CustomerSummary.vue

@@ -320,7 +320,7 @@ const sumRisk = ({ clientRisks }) => {
                     :value="entity.recommendedCredit"
                 />
             </QCard>
-            <QCard class="vn-max">
+            <QCard class="vn-one">
                 <VnTitle :text="t('Latest tickets')" />
                 <CustomerSummaryTable />
             </QCard>

src/pages/Customer/Card/CustomerUnpaid.vue

@@ -1,82 +1,164 @@
 <script setup>
-import { ref } from 'vue';
+import { computed, onBeforeMount, ref, watch, nextTick } 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 VnInput from 'src/components/common/VnInput.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);
+import axios from 'axios';
+import useNotify from 'src/composables/useNotify';
+import { useStateStore } from 'stores/useStateStore';
 
 const { t } = useI18n();
 const route = useRoute();
+const { notify } = useNotify();
+const stateStore = useStateStore();
+
 const amountInputRef = ref(null);
+const initialDated = Date.vnNew();
+const unpaidClient = ref(false);
+const isLoading = ref(false);
+const amount = ref(null);
+const dated = ref(initialDated);
 
 const initialData = ref({
-    dated: Date.vnNew(),
+    dated: initialDated,
-    amount: null,
 });
 
-const filterClientFindOne = {
+const hasChanged = computed(() => {
-    fields: ['unpaid', 'dated', 'amount'],
+    return (
-    where: {
+        initialData.value.dated !== dated.value ||
-        clientFk: route.params.id,
+        initialData.value.amount !== amount.value
-    },
+    );
+});
+
+onBeforeMount(() => {
+    getData(route.params.id);
+});
+
+watch(
+    () => route.params.id,
+    (newValue) => {
+        if (!newValue) return;
+        getData(newValue);
+    }
+);
+
+const getData = async (id) => {
+    const filter = { where: { clientFk: id } };
+    try {
+        const { data } = await axios.get('ClientUnpaids', {
+            params: { filter: JSON.stringify(filter) },
+        });
+        if (data.length) {
+            setValues(data[0]);
+        } else {
+            defaultValues();
+        }
+    } catch (error) {
+        defaultValues();
+    }
 };
+
+const setValues = (data) => {
+    unpaidClient.value = true;
+    amount.value = data.amount;
+    dated.value = data.dated;
+    initialData.value = data;
+};
+
+const defaultValues = () => {
+    unpaidClient.value = false;
+    initialData.value.amount = null;
+    setInitialData();
+};
+
+const setInitialData = () => {
+    amount.value = initialData.value.amount;
+    dated.value = initialData.value.dated;
+};
+
+const onSubmit = async () => {
+    isLoading.value = true;
+
+    const payload = {
+        amount: amount.value,
+        clientFk: route.params.id,
+        dated: dated.value,
+    };
+    try {
+        await axios.patch('ClientUnpaids', payload);
+        notify('globals.dataSaved', 'positive');
+        unpaidClient.value = true;
+    } catch (error) {
+        notify('errors.writeRequest', 'negative');
+    } finally {
+        isLoading.value = false;
+    }
+};
+
+watch(
+    () => unpaidClient.value,
+    async (val) => {
+        await nextTick();
+        if (val) amountInputRef.value.focus();
+    }
+);
 </script>
 
 <template>
-    <FetchData
+    <Teleport v-if="stateStore?.isSubToolbarShown()" to="#st-actions">
-        :filter="filterClientFindOne"
+        <QBtnGroup push class="q-gutter-x-sm">
-        auto-load
+            <QBtn
-        url="ClientUnpaids"
+                :disabled="!hasChanged"
-        @on-fetch="
+                :label="t('globals.reset')"
-            (data) => {
+                :loading="isLoading"
-                const unpaid = data.length == 1;
+                @click="setInitialData"
-                initialData = { ...data[0], unpaid };
+                color="primary"
-            }
+                flat
-        "
+                icon="restart_alt"
+                type="reset"
             />
-    <QCard>
+            <QBtn
-        <FormModel
+                :disabled="!hasChanged"
-            v-if="'unpaid' in initialData"
+                :label="t('globals.save')"
-            :observe-form-changes="false"
+                :loading="isLoading"
-            ref="formModelRef"
+                @click="onSubmit"
-            model="unpaid"
+                color="primary"
-            url-update="ClientUnpaids"
+                icon="save"
-            :mapper="(formData) => ({ ...formData, clientFk: route.params.id })"
+            />
-            :form-initial-data="initialData"
+        </QBtnGroup>
-        >
+    </Teleport>
-            <template #form="{ data }">
+
+    <div class="full-width flex justify-center">
+        <QCard class="card-width q-pa-lg">
+            <QForm>
                 <VnRow>
-                    <QCheckbox :label="t('Unpaid client')" v-model="data.unpaid" />
+                    <div class="col">
+                        <QCheckbox :label="t('Unpaid client')" v-model="unpaidClient" />
+                    </div>
                 </VnRow>
 
-                <VnRow class="row q-gutter-md q-mb-md" v-show="data.unpaid">
+                <VnRow class="row q-gutter-md q-mb-md" v-show="unpaidClient">
                     <div class="col">
-                        <VnInputDate
+                        <VnInputDate :label="t('Date')" v-model="dated" />
-                            data-cy="customerUnpaidDate"
-                            :label="t('Date')"
-                            v-model="data.dated"
-                        />
                     </div>
                     <div class="col">
-                        <VnInputNumber
+                        <VnInput
-                            data-cy="customerUnpaidAmount"
                             ref="amountInputRef"
                             :label="t('Amount')"
                             clearable
-                            v-model="data.amount"
+                            type="number"
+                            v-model="amount"
                             autofocus
                         >
-                            <template #append>€</template></VnInputNumber
+                            <template #append>€</template></VnInput
                         >
                     </div>
                 </VnRow>
-            </template>
+            </QForm>
-        </FormModel>
         </QCard>
+    </div>
 </template>
 
 <i18n>

src/pages/Customer/Card/CustomerWebAccess.vue

@@ -25,9 +25,10 @@ async function hasCustomerRole() {
 </script>
 <template>
     <FormModel
+        url="VnUsers/preview"
         :url-update="`Clients/${route.params.id}/updateUser`"
         :filter="filter"
-        model="customer"
+        model="webAccess"
         :mapper="
             ({ active, name, email }) => {
                 return {
@@ -41,7 +42,7 @@ async function hasCustomerRole() {
         auto-load
     >
         <template #form="{ data, validate }">
-            <QCheckbox :label="t('Enable web access')" v-model="data.account.active" />
+            <QCheckbox :label="t('Enable web access')" v-model="data.active" />
             <VnInput :label="t('User')" clearable v-model="data.name" />
             <VnInput
                 :label="t('Recovery email')"

src/pages/Customer/Card/CustomerWebPayment.vue

@@ -1,9 +1,9 @@
 <script setup>
-import { computed, ref } from 'vue';
+import { computed, onBeforeMount, ref, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 
-import FetchData from 'src/components/FetchData.vue';
+import axios from 'axios';
 
 import { toCurrency, toDateHourMin } from 'src/filters';
 
@@ -20,11 +20,10 @@ const filter = {
         { relation: 'mandateType', scope: { fields: ['id', 'name'] } },
         { relation: 'company', scope: { fields: ['id', 'code'] } },
     ],
-    where: { clientFk: route.params.id },
+    where: { clientFk: null },
     order: ['created DESC'],
     limit: 20,
 };
-const ClientDmsRef = ref(false);
 
 const tableColumnComponents = {
     state: {
@@ -51,7 +50,7 @@ const tableColumnComponents = {
         component: CustomerCheckIconTooltip,
         props: ({ row }) => ({
             transaction: row,
-            promise: () => ClientDmsRef.value.fetch(),
+            promise: refreshData,
         }),
         event: () => {},
     },
@@ -90,16 +89,38 @@ const columns = computed(() => [
         name: 'validate',
     },
 ]);
+
+onBeforeMount(() => {
+    getData(route.params.id);
+});
+
+watch(
+    () => route.params.id,
+    (newValue) => {
+        if (!newValue) return;
+        getData(newValue);
+    }
+);
+
+const getData = async (id) => {
+    filter.where.clientFk = id;
+    try {
+        const { data } = await axios.get('clients/transactions', {
+            params: { filter: JSON.stringify(filter) },
+        });
+        rows.value = data;
+    } catch (error) {
+        return error;
+    }
+};
+
+const refreshData = () => {
+    getData(route.params.id);
+};
 </script>
 
 <template>
-    <FetchData
+    <div class="full-width flex justify-center">
-        ref="ClientDmsRef"
-        :filter="filter"
-        @on-fetch="(data) => (rows = data)"
-        auto-load
-        url="Clients/transactions"
-    />
         <QPage class="card-width q-pa-lg">
             <QTable
                 :columns="columns"
@@ -114,9 +135,13 @@ const columns = computed(() => [
                         <QTr :props="props">
                             <component
                                 :is="tableColumnComponents[props.col.name].component"
-                            @click="tableColumnComponents[props.col.name].event(props)"
+                                @click="
+                                    tableColumnComponents[props.col.name].event(props)
+                                "
                                 class="rounded-borders q-pa-sm"
-                            v-bind="tableColumnComponents[props.col.name].props(props)"
+                                v-bind="
+                                    tableColumnComponents[props.col.name].props(props)
+                                "
                             >
                                 {{ props.value }}
                             </component>
@@ -129,6 +154,7 @@ const columns = computed(() => [
                 {{ t('globals.noResults') }}
             </h5>
         </QPage>
+    </div>
 </template>
 
 <i18n>

src/pages/Customer/CustomerFilter.vue

@@ -101,8 +101,8 @@ const exprBuilder = (param, value) => {
                 </QItemSection>
             </QItem>
             <QItem class="q-mb-sm">
-                <QItemSection>
+                <QItemSection
-                    <VnSelect
+                    ><VnSelect
                         url="Provinces"
                         :label="t('Province')"
                         v-model="params.provinceFk"
@@ -120,12 +120,14 @@ const exprBuilder = (param, value) => {
                     />
                 </QItemSection>
             </QItem>
-            <QItem class="q-mb-sm">
+            <QItem class="q-mb-md">
                 <QItemSection>
                     <VnInput :label="t('City')" v-model="params.city" is-outlined />
                 </QItemSection>
             </QItem>
-            <QItem class="q-mb-sm">
+            <QSeparator />
+            <QExpansionItem :label="t('More options')" expand-separator>
+                <QItem>
                     <QItemSection>
                         <VnInput :label="t('Phone')" v-model="params.phone" is-outlined>
                             <template #prepend>
@@ -134,7 +136,7 @@ const exprBuilder = (param, value) => {
                         </VnInput>
                     </QItemSection>
                 </QItem>
-            <QItem class="q-mb-sm">
+                <QItem>
                     <QItemSection>
                         <VnInput :label="t('Email')" v-model="params.email" is-outlined>
                             <template #prepend>
@@ -143,8 +145,7 @@ const exprBuilder = (param, value) => {
                         </VnInput>
                     </QItemSection>
                 </QItem>
-            <QItem class="q-mb-sm">
+                <QItem>
-                <QItemSection>
                     <VnSelect
                         url="Zones"
                         :label="t('Zone')"
@@ -159,9 +160,9 @@ const exprBuilder = (param, value) => {
                         outlined
                         rounded
                         auto-load
-                /></QItemSection>
+                    />
                 </QItem>
-            <QItem class="q-mb-sm">
+                <QItem>
                     <QItemSection>
                         <VnInput
                             :label="t('Postcode')"
@@ -170,6 +171,7 @@ const exprBuilder = (param, value) => {
                         />
                     </QItemSection>
                 </QItem>
+            </QExpansionItem>
         </template>
     </VnFilterPanel>
 </template>
@@ -201,6 +203,7 @@ es:
     Salesperson: Comercial
     Province: Provincia
     City: Ciudad
+    More options: Más opciones
     Phone: Teléfono
     Email: Email
     Zone: Zona

src/pages/Customer/components/CustomerAddressCreate.vue

@@ -1,8 +1,9 @@
 <script setup>
-import { reactive, ref } from 'vue';
+import { onBeforeMount, reactive, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute, useRouter } from 'vue-router';
 
+import axios from 'axios';
 import VnLocation from 'src/components/common/VnLocation.vue';
 import FetchData from 'components/FetchData.vue';
 import FormModel from 'components/FormModel.vue';
@@ -24,6 +25,20 @@ const agencyModes = ref([]);
 const incoterms = ref([]);
 const customsAgents = ref([]);
 
+onBeforeMount(() => {
+    urlCreate.value = `Clients/${route.params.id}/createAddress`;
+    getCustomsAgents();
+});
+
+const getCustomsAgents = async () => {
+    const { data } = await axios.get('CustomsAgents');
+    customsAgents.value = data;
+};
+
+const refreshData = () => {
+    getCustomsAgents();
+};
+
 const toCustomerAddress = () => {
     router.push({
         name: 'CustomerAddress',
@@ -39,11 +54,6 @@ function handleLocation(data, location) {
     data.provinceFk = provinceFk;
     data.countryFk = countryFk;
 }
-
-function onAgentCreated(requestResponse, data) {
-    customsAgents.value.push(requestResponse);
-    data.customsAgentFk = requestResponse.id;
-}
 </script>
 
 <template>
@@ -129,7 +139,6 @@ function onAgentCreated(requestResponse, data) {
                 />
 
                 <VnSelectDialog
-                    url="CustomsAgents"
                     :label="t('Customs agent')"
                     :options="customsAgents"
                     hide-selected
@@ -139,12 +148,7 @@ function onAgentCreated(requestResponse, data) {
                     :tooltip="t('Create a new expense')"
                 >
                     <template #form>
-                        <CustomerNewCustomsAgent
+                        <CustomerNewCustomsAgent @on-data-saved="refreshData()" />
-                            @on-data-saved="
-                                (_, requestResponse) =>
-                                    onAgentCreated(requestResponse, data)
-                            "
-                        />
                     </template>
                 </VnSelectDialog>
             </VnRow>

src/pages/Customer/components/CustomerAddressEdit.vue

@@ -144,7 +144,7 @@ function handleLocation(data, location) {
         :url="`Addresses/${route.params.addressId}`"
         @on-data-saved="onDataSaved()"
         auto-load
-        model="customer"
+        model="client"
     >
         <template #moreActions>
             <QBtn

src/pages/Customer/components/CustomerSamplesCreate.vue

@@ -106,6 +106,7 @@ const setParams = (params) => {
 };
 
 const getPreview = async () => {
+    try {
         const params = {
             recipientId: entityId,
         };
@@ -124,6 +125,9 @@ const getPreview = async () => {
                 htmlContent: data,
             },
         });
+    } catch (err) {
+        notify('Errors getting preview', 'negative');
+    }
 };
 
 const onSubmit = async () => {

src/pages/Department/Card/DepartmentBasicData.vue

@@ -1,26 +1,15 @@
 <script setup>
-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';
-
-const route = useRoute();
-const { t } = useI18n();
 </script>
 <template>
-    <FormModel
+    <FormModel model="Department" auto-load class="full-width">
-        :url="`Departments/${route.params.id}`"
-        model="department"
-        auto-load
-        class="full-width"
-    >
         <template #form="{ data, validate }">
             <VnRow>
                 <VnInput
-                    :label="t('globals.name')"
+                    :label="$t('globals.name')"
                     v-model="data.name"
                     :rules="validate('globals.name')"
                     clearable
@@ -28,28 +17,28 @@ const { t } = useI18n();
                 />
                 <VnInput
                     v-model="data.code"
-                    :label="t('globals.code')"
+                    :label="$t('globals.code')"
                     :rules="validate('globals.code')"
                     clearable
                 />
             </VnRow>
             <VnRow>
                 <VnInput
-                    :label="t('department.chat')"
+                    :label="$t('department.chat')"
                     v-model="data.chatName"
                     :rules="validate('department.chat')"
                     clearable
                 />
                 <VnInput
                     v-model="data.notificationEmail"
-                    :label="t('globals.params.email')"
+                    :label="$t('globals.params.email')"
                     :rules="validate('globals.params.email')"
                     clearable
                 />
             </VnRow>
             <VnRow>
                 <VnSelect
-                    :label="t('department.bossDepartment')"
+                    :label="$t('department.bossDepartment')"
                     v-model="data.workerFk"
                     url="Workers/search"
                     option-value="id"
@@ -59,7 +48,7 @@ const { t } = useI18n();
                     :rules="validate('department.workerFk')"
                 />
                 <VnSelect
-                    :label="t('department.selfConsumptionCustomer')"
+                    :label="$t('department.selfConsumptionCustomer')"
                     v-model="data.clientFk"
                     url="Clients"
                     option-value="id"
@@ -71,11 +60,11 @@ const { t } = useI18n();
             </VnRow>
             <VnRow>
                 <QCheckbox
-                    :label="t('department.telework')"
+                    :label="$t('department.telework')"
                     v-model="data.isTeleworking"
                 />
                 <QCheckbox
-                    :label="t('department.notifyOnErrors')"
+                    :label="$t('department.notifyOnErrors')"
                     v-model="data.hasToMistake"
                     :false-value="0"
                     :true-value="1"
@@ -83,17 +72,17 @@ const { t } = useI18n();
             </VnRow>
             <VnRow>
                 <QCheckbox
-                    :label="t('department.worksInProduction')"
+                    :label="$t('department.worksInProduction')"
                     v-model="data.isProduction"
                 />
                 <QCheckbox
-                    :label="t('department.hasToRefill')"
+                    :label="$t('department.hasToRefill')"
                     v-model="data.hasToRefill"
                 />
             </VnRow>
             <VnRow>
                 <QCheckbox
-                    :label="t('department.hasToSendMail')"
+                    :label="$t('department.hasToSendMail')"
                     v-model="data.hasToSendMail"
                 />
             </VnRow>

src/pages/Department/Card/DepartmentCard.vue

@@ -7,7 +7,7 @@ import DepartmentDescriptor from 'pages/Department/Card/DepartmentDescriptor.vue
         class="q-pa-md column items-center"
         v-bind="{ ...$attrs }"
         data-key="Department"
-        base-url="Departments"
+        url="Departments"
         :descriptor="DepartmentDescriptor"
     />
 </template>

src/pages/Department/Card/DepartmentDescriptor.vue

@@ -5,7 +5,6 @@ import { useI18n } from 'vue-i18n';
 import { useVnConfirm } from 'composables/useVnConfirm';
 import VnLv from 'src/components/ui/VnLv.vue';
 import CardDescriptor from 'src/components/ui/CardDescriptor.vue';
-import useCardDescription from 'src/composables/useCardDescription';
 
 import axios from 'axios';
 import useNotify from 'src/composables/useNotify.js';
@@ -32,19 +31,14 @@ const entityId = computed(() => {
     return $props.id || route.params.id;
 });
 
-const department = ref();
-
-const data = ref(useCardDescription());
-
-const setData = (entity) => {
-    if (!entity) return;
-    data.value = useCardDescription(entity.name, entity.id);
-};
-
 const removeDepartment = async () => {
+    try {
         await axios.post(`/Departments/${entityId.value}/removeChild`, entityId.value);
         router.push({ name: 'WorkerDepartment' });
         notify('department.departmentRemoved', 'positive');
+    } catch (err) {
+        console.error('Error removing department');
+    }
 };
 
 const { openConfirmationModal } = useVnConfirm();
@@ -54,17 +48,9 @@ const { openConfirmationModal } = useVnConfirm();
         ref="DepartmentDescriptorRef"
         module="Department"
         :url="`Departments/${entityId}`"
-        :title="data.title"
-        :subtitle="data.subtitle"
         :summary="$props.summary"
         :to-module="{ name: 'WorkerDepartment' }"
-        @on-fetch="
+        data-key="Department"
-            (data) => {
-                department = data;
-                setData(data);
-            }
-        "
-        data-key="department"
     >
         <template #menu="{}">
             <QItem

src/pages/Entry/Card/EntryBuys.vue

@@ -236,9 +236,13 @@ const copyOriginalRowsData = (rows) => {
 };
 
 const saveChange = async (field, { rowIndex, row }) => {
+    try {
         if (originalRowDataCopy.value[rowIndex][field] == row[field]) return;
         await axios.patch(`Buys/${row.id}`, row);
         originalRowDataCopy.value[rowIndex][field] = row[field];
+    } catch (err) {
+        console.error('Error saving changes', err);
+    }
 };
 
 const openRemoveDialog = async () => {
@@ -256,11 +260,15 @@ const openRemoveDialog = async () => {
             },
         })
         .onOk(async () => {
+            try {
                 await deleteBuys();
                 const notifyMessage = t(
                     `Buy${rowsSelected.value.length > 1 ? 's' : ''} deleted`
                 );
                 notify(notifyMessage, 'positive');
+            } catch (err) {
+                console.error('Error deleting buys');
+            }
         });
 };
 
@@ -274,6 +282,7 @@ const importBuys = () => {
 };
 
 const toggleGroupingMode = async (buy, mode) => {
+    try {
         const groupingMode = mode === 'grouping' ? mode : 'packing';
         const newGroupingMode = buy.groupingMode === groupingMode ? null : groupingMode;
         const params = {
@@ -281,6 +290,9 @@ const toggleGroupingMode = async (buy, mode) => {
         };
         await axios.patch(`Buys/${buy.id}`, params);
         buy.groupingMode = newGroupingMode;
+    } catch (err) {
+        console.error('Error toggling grouping mode');
+    }
 };
 
 const lockIconType = (groupingMode, mode) => {

src/pages/Entry/Card/EntryBuysImport.vue

@@ -123,15 +123,20 @@ const fillData = async (rawData) => {
 };
 
 const fetchBuys = async (buys) => {
+    try {
         const params = { buys };
         const { data } = await axios.post(
             `Entries/${route.params.id}/importBuysPreview`,
             params
         );
         importData.value.buys = data;
+    } catch (err) {
+        console.error('Error fetching buys');
+    }
 };
 
 const onSubmit = async () => {
+    try {
         const params = importData.value;
         const hasAnyEmptyRow = params.buys.some((buy) => {
             return buy.itemFk === null;
@@ -145,6 +150,9 @@ const onSubmit = async () => {
         await axios.post(`Entries/${route.params.id}/importBuys`, params);
         notify('globals.dataSaved', 'positive');
         redirectToBuysView();
+    } catch (err) {
+        console.error('Error importing buys', err);
+    }
 };
 
 const redirectToBuysView = () => {

src/pages/Entry/Card/EntryCard.vue

@@ -7,7 +7,7 @@ import filter from './EntryFilter.js';
 <template>
     <VnCard
         data-key="Entry"
-        base-url="Entries"
+        url="Entries"
         :filter="filter"
         :descriptor="EntryDescriptor"
         :filter-panel="EntryFilter"

src/pages/Entry/Card/EntrySummary.vue

@@ -147,9 +147,12 @@ async function setEntryData(data) {
 }
 
 const fetchEntryBuys = async () => {
+    try {
         const { data } = await axios.get(`Entries/${entry.value.id}/getBuys`);
         if (data) entryBuys.value = data;
-
+    } catch (err) {
+        console.error('Error fetching entry buys');
+    }
 };
 </script>
 

src/pages/Entry/EntryBuysTableDialog.vue

@@ -82,11 +82,11 @@ const entriesTableColumns = computed(() => [
             </QCardSection>
             <QCardActions align="right">
                 <QBtn
-                    :label="t('myEntries.printLabels')"
+                    :label="t('printLabels')"
                     color="primary"
                     icon="print"
                     :loading="isLoading"
-                    @click="openReport(`Entries/${entityId}/labelSupplier`)"
+                    @click="openReport(`Entries/${entityId}/print`)"
                     unelevated
                     autofocus
                 />
@@ -126,9 +126,7 @@ const entriesTableColumns = computed(() => [
                                         "
                                         unelevated
                                     >
-                                        <QTooltip>{{
+                                        <QTooltip>{{ t('viewLabel') }}</QTooltip>
-                                            t('myEntries.viewLabel')
-                                        }}</QTooltip>
                                     </QBtn>
                                 </QTr>
                             </template>

src/pages/Entry/EntryLatestBuys.vue

@@ -12,7 +12,6 @@ import VnImg from 'src/components/ui/VnImg.vue';
 
 const stateStore = useStateStore();
 const { t } = useI18n();
-const tableRef = ref();
 const columns = [
     {
         align: 'center',
@@ -235,6 +234,7 @@ const columns = [
         format: (row, dashIfEmpty) => dashIfEmpty(toDate(row.landing)),
     },
 ];
+const tableRef = ref();
 
 onMounted(async () => {
     stateStore.rightDrawer = true;

src/pages/Entry/EntryList.vue

@@ -221,7 +221,7 @@ onMounted(async () => {
                         t('entry.list.tableVisibleColumns.isExcludedFromAvailable')
                     }}</QTooltip>
                 </QIcon>
-                <QIcon v-if="!!row.isRaid" name="vn:net" color="primary">
+                <QIcon v-if="!!row.daysInForward" name="vn:net" color="primary">
                     <QTooltip>
                         {{
                             t('globals.raid', { daysInForward: row.daysInForward })

src/pages/Entry/EntryWasteRecalc.vue

@@ -30,6 +30,8 @@ const recalc = async () => {
         isLoading.value = true;
         await axios.post('Applications/waste_addSales/execute-proc', params);
         notify('wasteRecalc.recalcOk', 'positive');
+    } catch (err) {
+        console.error(err);
     } finally {
         isLoading.value = false;
     }

src/pages/Entry/MyEntries.vue

@@ -101,7 +101,7 @@ const columns = computed(() => [
         name: 'tableActions',
         actions: [
             {
-                title: t('myEntries.printLabels'),
+                title: t('printLabels'),
                 icon: 'print',
                 isPrimary: true,
                 action: (row) => printBuys(row.id),

src/pages/InvoiceIn/Card/InvoiceInCard.vue

@@ -45,7 +45,7 @@ onBeforeRouteUpdate(async (to) => await setRectificative(to));
 <template>
     <VnCard
         data-key="InvoiceIn"
-        base-url="InvoiceIns"
+        url="InvoiceIns"
         :filter="filter"
         :descriptor="InvoiceInDescriptor"
         :filter-panel="InvoiceInFilter"