fix: fix role

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,

package.json

@@ -1,6 +1,6 @@
 {
     "name": "salix-front",
-    "version": "24.52.0",
+    "version": "24.44.0",
     "description": "Salix frontend",
     "productName": "Salix",
     "author": "Verdnatura",

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/CreateManualInvoiceForm.vue

@@ -0,0 +1,155 @@
+<script setup>
+import { reactive, ref, computed } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useRouter } from 'vue-router';
+
+import FetchData from 'components/FetchData.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import FormModelPopup from './FormModelPopup.vue';
+import VnInputDate from './common/VnInputDate.vue';
+
+const emit = defineEmits(['onDataSaved']);
+
+const { t } = useI18n();
+const router = useRouter();
+
+const manualInvoiceFormData = reactive({
+    maxShipped: Date.vnNew(),
+});
+
+const formModelPopupRef = ref();
+const invoiceOutSerialsOptions = ref([]);
+const taxAreasOptions = ref([]);
+const ticketsOptions = ref([]);
+const clientsOptions = ref([]);
+const isLoading = computed(() => formModelPopupRef.value?.isLoading);
+
+const onDataSaved = async (formData, requestResponse) => {
+    emit('onDataSaved', formData, requestResponse);
+    if (requestResponse && requestResponse.id)
+        router.push({ name: 'InvoiceOutSummary', params: { id: requestResponse.id } });
+};
+</script>
+
+<template>
+    <FetchData
+        url="InvoiceOutSerials"
+        :filter="{ where: { code: { neq: 'R' } }, order: ['code'] }"
+        @on-fetch="(data) => (invoiceOutSerialsOptions = data)"
+        auto-load
+    />
+    <FetchData
+        url="TaxAreas"
+        :filter="{ order: ['code'] }"
+        @on-fetch="(data) => (taxAreasOptions = data)"
+        auto-load
+    />
+    <FormModelPopup
+        ref="formModelPopupRef"
+        :title="t('Create manual invoice')"
+        url-create="InvoiceOuts/createManualInvoice"
+        model="invoiceOut"
+        :form-initial-data="manualInvoiceFormData"
+        @on-data-saved="onDataSaved"
+    >
+        <template #form-inputs="{ data }">
+            <span v-if="isLoading" class="text-primary invoicing-text">
+                <QIcon name="warning" class="fill-icon q-mr-sm" size="md" />
+                {{ t('Invoicing in progress...') }}
+            </span>
+            <VnRow>
+                <VnSelect
+                    :label="t('Ticket')"
+                    :options="ticketsOptions"
+                    hide-selected
+                    option-label="id"
+                    option-value="id"
+                    v-model="data.ticketFk"
+                    @update:model-value="data.clientFk = null"
+                    url="Tickets"
+                    :where="{ refFk: null }"
+                    :fields="['id', 'nickname']"
+                    :filter-options="{ order: 'shipped DESC' }"
+                >
+                    <template #option="scope">
+                        <QItem v-bind="scope.itemProps">
+                            <QItemSection>
+                                <QItemLabel> #{{ scope.opt?.id }} </QItemLabel>
+                                <QItemLabel caption>{{ scope.opt?.nickname }}</QItemLabel>
+                            </QItemSection>
+                        </QItem>
+                    </template>
+                </VnSelect>
+                <span class="row items-center" style="max-width: max-content">{{
+                    t('Or')
+                }}</span>
+                <VnSelect
+                    :label="t('Client')"
+                    :options="clientsOptions"
+                    hide-selected
+                    option-label="name"
+                    option-value="id"
+                    v-model="data.clientFk"
+                    @update:model-value="data.ticketFk = null"
+                    url="Clients"
+                    :fields="['id', 'name']"
+                    :filter-options="{ order: 'name ASC' }"
+                />
+                <VnInputDate :label="t('Max date')" v-model="data.maxShipped" />
+            </VnRow>
+            <VnRow>
+                <VnSelect
+                    :label="t('Serial')"
+                    :options="invoiceOutSerialsOptions"
+                    hide-selected
+                    option-label="description"
+                    option-value="code"
+                    v-model="data.serial"
+                />
+                <VnSelect
+                    :label="t('Area')"
+                    :options="taxAreasOptions"
+                    hide-selected
+                    option-label="code"
+                    option-value="code"
+                    v-model="data.taxArea"
+                />
+            </VnRow>
+            <VnRow>
+                <VnInput
+                    :label="t('Reference')"
+                    type="textarea"
+                    v-model="data.reference"
+                    fill-input
+                    autogrow
+                />
+            </VnRow>
+        </template>
+    </FormModelPopup>
+</template>
+
+<style lang="scss" scoped>
+.invoicing-text {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    color: $primary;
+    font-size: 24px;
+    margin-bottom: 8px;
+}
+</style>
+
+<i18n>
+es:
+    Create manual invoice: Crear factura manual
+    Ticket: Ticket
+    Client: Cliente
+    Max date: Fecha límite
+    Serial: Serie
+    Area: Area
+    Reference: Referencia
+    Or: O
+    Invoicing in progress...: Facturación en progreso...
+</i18n>

src/components/CreateNewCityForm.vue

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

src/components/CreateNewPostcodeForm.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { reactive, ref } from 'vue';
+import { reactive, ref, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
 
 import FetchData from 'components/FetchData.vue';
@@ -21,15 +21,13 @@ const postcodeFormData = reactive({
     provinceFk: null,
     townFk: null,
 });
-const townsFetchDataRef = ref(false);
-const townFilter = ref({});
 
-const countriesRef = ref(false);
+const townsFetchDataRef = ref(null);
-const provincesFetchDataRef = ref(false);
+const provincesFetchDataRef = ref(null);
+const countriesOptions = ref([]);
 const provincesOptions = ref([]);
 const townsOptions = ref([]);
 const town = ref({});
-const countryFilter = ref({});
 
 function onDataSaved(formData) {
     const newPostcode = {
@@ -41,56 +39,13 @@ 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;
     emit('onDataSaved', newPostcode);
 }
 
-async function setCountry(countryFk, data) {
-    data.townFk = null;
-    data.provinceFk = null;
-    data.countryFk = countryFk;
-    await fetchTowns();
-}
-
-// Province
-
-async function handleProvinces(data) {
-    provincesOptions.value = data;
-    if (postcodeFormData.countryFk) {
-        await fetchTowns();
-    }
-}
-async function setProvince(id, data) {
-    if (data.provinceFk === id) return;
-    const newProvince = provincesOptions.value.find((province) => province.id == id);
-    if (newProvince) data.countryFk = newProvince.countryFk;
-    postcodeFormData.provinceFk = id;
-    await fetchTowns();
-}
-async function onProvinceCreated(data) {
-    await provincesFetchDataRef.value.fetch({
-        where: { countryFk: postcodeFormData.countryFk },
-    });
-    postcodeFormData.provinceFk = data.id;
-}
-function provinceByCountry(countryFk = postcodeFormData.countryFk) {
-    return provincesOptions.value
-        .filter((province) => province.countryFk === countryFk)
-        .map(({ id }) => id);
-}
-
-// Town
-async function handleTowns(data) {
-    townsOptions.value = data;
-}
-function setTown(newTown, data) {
-    town.value = newTown;
-    data.provinceFk = newTown?.provinceFk ?? newTown;
-    data.countryFk = newTown?.province?.countryFk ?? newTown;
-}
 async function onCityCreated(newTown, formData) {
     await provincesFetchDataRef.value.fetch();
     newTown.province = provincesOptions.value.find(
@@ -99,28 +54,79 @@ async function onCityCreated(newTown, formData) {
     formData.townFk = newTown;
     setTown(newTown, formData);
 }
-async function fetchTowns(countryFk = postcodeFormData.countryFk) {
+
-    if (!countryFk) return;
+function setTown(newTown, data) {
-    const provinces = postcodeFormData.provinceFk
+    if (!newTown) return;
-        ? [postcodeFormData.provinceFk]
+    town.value = newTown;
-        : provinceByCountry();
+    data.provinceFk = newTown.provinceFk;
-    townFilter.value.where = {
+    data.countryFk = newTown.province.countryFk;
-        provinceFk: {
-            inq: provinces,
-        },
-    };
-    await townsFetchDataRef.value?.fetch();
 }
 
-async function filterTowns(name) {
+async function setProvince(id, data) {
-    if (name !== '') {
+    const newProvince = provincesOptions.value.find((province) => province.id == id);
-        townFilter.value.where = {
+    if (!newProvince) return;
-            name: {
+
-                like: `%${name}%`,
+    data.countryFk = newProvince.countryFk;
-            },
+}
-        };
+
-        await townsFetchDataRef.value?.fetch();
+async function onProvinceCreated(data) {
+    await provincesFetchDataRef.value.fetch({
+        where: { countryFk: postcodeFormData.countryFk },
+    });
+    postcodeFormData.provinceFk.value = data.id;
+}
+
+watch(
+    () => [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>
 
@@ -137,7 +143,6 @@ async function filterTowns(name) {
         ref="townsFetchDataRef"
         :sort-by="['name ASC']"
         :limit="30"
-        :filter="townFilter"
         @on-fetch="handleTowns"
         auto-load
         url="Towns/location"
@@ -159,13 +164,10 @@ async function filterTowns(name) {
                     v-model="data.code"
                     :rules="validate('postcode.code')"
                     clearable
-                    required
-                    data-cy="locationPostcode"
                 />
                 <VnSelectDialog
                     :label="t('City')"
                     @update:model-value="(value) => setTown(value, data)"
-                    @filter="filterTowns"
                     :tooltip="t('Create city')"
                     v-model="data.townFk"
                     :options="townsOptions"
@@ -174,8 +176,7 @@ async function filterTowns(name) {
                     :rules="validate('postcode.city')"
                     :acls="[{ model: 'Town', props: '*', accessType: 'WRITE' }]"
                     :emit-value="false"
-                    required
+                    :clearable="true"
-                    data-cy="locationTown"
                 >
                     <template #option="{ itemProps, opt }">
                         <QItem v-bind="itemProps">
@@ -192,6 +193,7 @@ async function filterTowns(name) {
                         <CreateNewCityForm
                             :country-fk="data.countryFk"
                             :province-selected="data.provinceFk"
+                            :provinces="provincesOptions"
                             @on-data-saved="
                                 (_, requestResponse) =>
                                     onCityCreated(requestResponse, data)
@@ -206,25 +208,20 @@ async function filterTowns(name) {
                     :province-selected="data.provinceFk"
                     @update:model-value="(value) => setProvince(value, data)"
                     v-model="data.provinceFk"
+                    :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)"
-                    data-cy="locationCountry"
                 />
             </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,19 +63,10 @@ const where = computed(() => {
                     :label="t('Name')"
                     v-model="data.name"
                     :rules="validate('province.name')"
-                    required
-                    data-cy="provinceName"
                 />
                 <VnSelect
-                    data-cy="autonomyProvince"
-                    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/CreateThermographForm.vue

@@ -38,7 +38,7 @@ const onDataSaved = (dataSaved) => {
         @on-fetch="(data) => (warehousesOptions = data)"
         auto-load
         url="Warehouses"
-        :filter="{ fields: ['id', 'name'], order: 'name ASC' }"
+        :filter="{ fields: ['id', 'name'], order: 'name ASC', limit: 30 }"
     />
     <FetchData
         @on-fetch="(data) => (temperaturesOptions = data)"

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();
@@ -78,7 +77,7 @@ const isLoading = ref(false);
 const hasChanges = ref(false);
 const originalData = ref();
 const vnPaginateRef = ref();
-const formData = ref([]);
+const formData = ref();
 const saveButtonRef = ref(null);
 const watchChanges = ref();
 const formUrl = computed(() => $props.url);
@@ -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,22 +156,26 @@ const rotateRight = () => {
 };
 
 const onSubmit = () => {
-    if (!newPhoto.files && !newPhoto.url) {
+    try {
-        notify(t('Select an image'), 'negative');
+        if (!newPhoto.files && !newPhoto.url) {
-        return;
+            notify(t('Select an image'), 'negative');
+            return;
+        }
+
+        const options = {
+            type: 'blob',
+        };
+
+        editor.value
+            .result(options)
+            .then((result) => {
+                const file = new File([result], newPhoto.files?.name || '');
+                newPhoto.blob = file;
+            })
+            .then(() => makeRequest());
+    } catch (err) {
+        console.error('Error uploading image');
     }
-
-    const options = {
-        type: 'blob',
-    };
-
-    editor.value
-        .result(options)
-        .then((result) => {
-            const file = new File([result], newPhoto.files?.name || '');
-            newPhoto.blob = file;
-        })
-        .then(() => makeRequest());
 };
 
 const makeRequest = async () => {

src/components/EditTableCellValueForm.vue

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

src/components/FilterItemForm.vue

@@ -50,25 +50,25 @@ const loading = ref(false);
 
 const tableColumns = computed(() => [
     {
-        label: t('globals.id'),
+        label: t('entry.buys.id'),
         name: 'id',
         field: 'id',
         align: 'left',
     },
     {
-        label: t('globals.name'),
+        label: t('entry.buys.name'),
         name: 'name',
         field: 'name',
         align: 'left',
     },
     {
-        label: t('globals.size'),
+        label: t('entry.buys.size'),
         name: 'size',
         field: 'size',
         align: 'left',
     },
     {
-        label: t('globals.producer'),
+        label: t('entry.buys.producer'),
         name: 'producerName',
         field: 'producer',
         align: 'left',
@@ -84,30 +84,34 @@ const tableColumns = computed(() => [
 ]);
 
 const onSubmit = async () => {
-    let filter = itemFilter;
+    try {
-    const params = itemFilterParams;
+        let filter = itemFilter;
-    const where = {};
+        const params = itemFilterParams;
-    for (let key in params) {
+        const where = {};
-        const value = params[key];
+        for (let key in params) {
-        if (!value) continue;
+            const value = params[key];
+            if (!value) continue;
 
-        switch (key) {
+            switch (key) {
-            case 'name':
+                case 'name':
-                where[key] = { like: `%${value}%` };
+                    where[key] = { like: `%${value}%` };
-                break;
+                    break;
-            case 'producerFk':
+                case 'producerFk':
-            case 'typeFk':
+                case 'typeFk':
-            case 'size':
+                case 'size':
-            case 'inkFk':
+                case 'inkFk':
-                where[key] = value;
+                    where[key] = value;
+            }
         }
-    }
+        filter.where = where;
-    filter.where = where;
 
-    const { data } = await axios.get(props.url, {
+        const { data } = await axios.get(props.url, {
-        params: { filter: JSON.stringify(filter) },
+            params: { filter: JSON.stringify(filter) },
-    });
+        });
-    tableRows.value = data;
+        tableRows.value = data;
+    } catch (err) {
+        console.error('Error fetching entries items');
+    }
 };
 
 const closeForm = () => {
@@ -148,10 +152,10 @@ const selectItem = ({ id }) => {
             </span>
             <h1 class="title">{{ t('Filter item') }}</h1>
             <VnRow>
-                <VnInput :label="t('globals.name')" v-model="itemFilterParams.name" />
+                <VnInput :label="t('entry.buys.name')" v-model="itemFilterParams.name" />
                 <VnInput :label="t('entry.buys.size')" v-model="itemFilterParams.size" />
                 <VnSelect
-                    :label="t('globals.producer')"
+                    :label="t('entry.buys.producer')"
                     :options="producersOptions"
                     hide-selected
                     option-label="name"
@@ -159,7 +163,7 @@ const selectItem = ({ id }) => {
                     v-model="itemFilterParams.producerFk"
                 />
                 <VnSelect
-                    :label="t('globals.type')"
+                    :label="t('entry.buys.type')"
                     :options="ItemTypesOptions"
                     hide-selected
                     option-label="name"

src/components/FilterTravelForm.vue

@@ -48,13 +48,13 @@ const loading = ref(false);
 
 const tableColumns = computed(() => [
     {
-        label: t('globals.id'),
+        label: t('entry.basicData.id'),
         name: 'id',
         field: 'id',
         align: 'left',
     },
     {
-        label: t('globals.warehouseOut'),
+        label: t('entry.basicData.warehouseOut'),
         name: 'warehouseOutFk',
         field: 'warehouseOutFk',
         align: 'left',
@@ -62,7 +62,7 @@ const tableColumns = computed(() => [
             warehousesOptions.value.find((warehouse) => warehouse.id === val).name,
     },
     {
-        label: t('globals.warehouseIn'),
+        label: t('entry.basicData.warehouseIn'),
         name: 'warehouseInFk',
         field: 'warehouseInFk',
         align: 'left',
@@ -70,14 +70,14 @@ const tableColumns = computed(() => [
             warehousesOptions.value.find((warehouse) => warehouse.id === val).name,
     },
     {
-        label: t('globals.shipped'),
+        label: t('entry.basicData.shipped'),
         name: 'shipped',
         field: 'shipped',
         align: 'left',
         format: (val) => toDate(val),
     },
     {
-        label: t('globals.landed'),
+        label: t('entry.basicData.landed'),
         name: 'landed',
         field: 'landed',
         align: 'left',
@@ -86,28 +86,32 @@ const tableColumns = computed(() => [
 ]);
 
 const onSubmit = async () => {
-    let filter = travelFilter;
+    try {
-    const params = travelFilterParams;
+        let filter = travelFilter;
-    const where = {};
+        const params = travelFilterParams;
-    for (let key in params) {
+        const where = {};
-        const value = params[key];
+        for (let key in params) {
-        if (!value) continue;
+            const value = params[key];
+            if (!value) continue;
 
-        switch (key) {
+            switch (key) {
-            case 'agencyModeFk':
+                case 'agencyModeFk':
-            case 'warehouseInFk':
+                case 'warehouseInFk':
-            case 'warehouseOutFk':
+                case 'warehouseOutFk':
-            case 'shipped':
+                case 'shipped':
-            case 'landed':
+                case 'landed':
-                where[key] = value;
+                    where[key] = value;
+            }
         }
-    }
 
-    filter.where = where;
+        filter.where = where;
-    const { data } = await axios.get('Travels', {
+        const { data } = await axios.get('Travels', {
-        params: { filter: JSON.stringify(filter) },
+            params: { filter: JSON.stringify(filter) },
-    });
+        });
-    tableRows.value = data;
+        tableRows.value = data;
+    } catch (err) {
+        console.error('Error fetching travels');
+    }
 };
 
 const closeForm = () => {
@@ -142,7 +146,7 @@ const selectTravel = ({ id }) => {
             <h1 class="title">{{ t('Filter travels') }}</h1>
             <VnRow>
                 <VnSelect
-                    :label="t('globals.agency')"
+                    :label="t('entry.basicData.agency')"
                     :options="agenciesOptions"
                     hide-selected
                     option-label="name"
@@ -150,7 +154,7 @@ const selectTravel = ({ id }) => {
                     v-model="travelFilterParams.agencyModeFk"
                 />
                 <VnSelect
-                    :label="t('globals.warehouseOut')"
+                    :label="t('entry.basicData.warehouseOut')"
                     :options="warehousesOptions"
                     hide-selected
                     option-label="name"
@@ -158,7 +162,7 @@ const selectTravel = ({ id }) => {
                     v-model="travelFilterParams.warehouseOutFk"
                 />
                 <VnSelect
-                    :label="t('globals.warehouseIn')"
+                    :label="t('entry.basicData.warehouseIn')"
                     :options="warehousesOptions"
                     hide-selected
                     option-label="name"
@@ -166,11 +170,11 @@ const selectTravel = ({ id }) => {
                     v-model="travelFilterParams.warehouseInFk"
                 />
                 <VnInputDate
-                    :label="t('globals.shipped')"
+                    :label="t('entry.basicData.shipped')"
                     v-model="travelFilterParams.shipped"
                 />
                 <VnInputDate
-                    :label="t('globals.landed')"
+                    :label="t('entry.basicData.landed')"
                     v-model="travelFilterParams.landed"
                 />
             </VnRow>

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',
@@ -209,9 +203,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 +283,6 @@ defineExpose({
             @submit="save"
             @reset="reset"
             class="q-pa-md"
-            :style="maxWidth ? 'max-width: ' + maxWidth : ''"
             id="formModel"
         >
             <QCard>
@@ -326,7 +317,6 @@ defineExpose({
                 :title="t(defaultButtons.reset.label)"
             />
             <QBtnDropdown
-                data-cy="saveAndContinueDefaultBtn"
                 v-if="$props.goTo"
                 @click="saveAndGo"
                 :label="tMobile('globals.saveAndContinue')"
@@ -381,6 +371,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');
-        emit('onSubmit');
+    closeForm();
-        closeForm();
-    }
 };
 
 const closeForm = () => {

src/components/ItemsFilterPanel.vue

@@ -88,16 +88,20 @@ const applyTags = (params, search) => {
 };
 
 const fetchItemTypes = async (id) => {
-    const filter = {
+    try {
-        fields: ['id', 'name', 'categoryFk'],
+        const filter = {
-        where: { categoryFk: id },
+            fields: ['id', 'name', 'categoryFk'],
-        include: 'category',
+            where: { categoryFk: id },
-        order: 'name ASC',
+            include: 'category',
-    };
+            order: 'name ASC',
-    const { data } = await axios.get('ItemTypes', {
+        };
-        params: { filter: JSON.stringify(filter) },
+        const { data } = await axios.get('ItemTypes', {
-    });
+            params: { filter: JSON.stringify(filter) },
-    itemTypesOptions.value = data;
+        });
+        itemTypesOptions.value = data;
+    } catch (err) {
+        console.error('Error fetching item types', err);
+    }
 };
 
 const getCategoryClass = (category, params) => {
@@ -107,19 +111,23 @@ const getCategoryClass = (category, params) => {
 };
 
 const getSelectedTagValues = async (tag) => {
-    if (!tag?.selectedTag?.id) return;
+    try {
-    tag.value = null;
+        if (!tag?.selectedTag?.id) return;
-    const filter = {
+        tag.value = null;
-        fields: ['value'],
+        const filter = {
-        order: 'value ASC',
+            fields: ['value'],
-        limit: 30,
+            order: 'value ASC',
-    };
+            limit: 30,
+        };
 
-    const params = { filter: JSON.stringify(filter) };
+        const params = { filter: JSON.stringify(filter) };
-    const { data } = await axios.get(`Tags/${tag.selectedTag.id}/filterValue`, {
+        const { data } = await axios.get(`Tags/${tag.selectedTag.id}/filterValue`, {
-        params,
+            params,
-    });
+        });
-    tag.valueOptions = data;
+        tag.valueOptions = data;
+    } catch (err) {
+        console.error('Error getting selected tag values');
+    }
 };
 
 const removeTag = (index, params, search) => {
@@ -240,7 +248,7 @@ const removeTag = (index, params, search) => {
             >
                 <QItemSection class="col">
                     <VnSelect
-                        :label="t('globals.tag')"
+                        :label="t('components.itemsFilterPanel.tag')"
                         v-model="value.selectedTag"
                         :options="tagOptions"
                         option-label="name"

src/components/LeftMenu.vue

@@ -22,7 +22,7 @@ const props = defineProps({
         default: 'main',
     },
 });
-const initialized = ref(false);
+
 const items = ref([]);
 const expansionItemElements = reactive({});
 const pinnedModules = computed(() => {
@@ -34,26 +34,18 @@ const search = ref(null);
 
 const filteredItems = computed(() => {
     if (!search.value) return items.value;
-    const normalizedSearch = normalize(search.value);
     return items.value.filter((item) => {
-        const locale = normalize(t(item.title));
+        const locale = t(item.title).toLowerCase();
-        return locale.includes(normalizedSearch);
+        return locale.includes(search.value.toLowerCase());
     });
 });
 
 const filteredPinnedModules = computed(() => {
     if (!search.value) return pinnedModules.value;
-    const normalizedSearch = search.value
-        .normalize('NFD')
-        .replace(/[\u0300-\u036f]/g, '')
-        .toLowerCase();
     const map = new Map();
     for (const [key, pinnedModule] of pinnedModules.value) {
-        const locale = t(pinnedModule.title)
+        const locale = t(pinnedModule.title).toLowerCase();
-            .normalize('NFD')
+        if (locale.includes(search.value.toLowerCase())) map.set(key, pinnedModule);
-            .replace(/[\u0300-\u036f]/g, '')
-            .toLowerCase();
-        if (locale.includes(normalizedSearch)) map.set(key, pinnedModule);
     }
     return map;
 });
@@ -61,13 +53,11 @@ const filteredPinnedModules = computed(() => {
 onMounted(async () => {
     await navigation.fetchPinned();
     getRoutes();
-    initialized.value = true;
 });
 
 watch(
     () => route.matched,
     () => {
-        if (!initialized.value) return;
         items.value = [];
         getRoutes();
     },
@@ -157,13 +147,6 @@ async function togglePinned(item, event) {
 const handleItemExpansion = (itemName) => {
     expansionItemElements[itemName].scrollToLastElement();
 };
-
-function normalize(text) {
-    return text
-        .normalize('NFD')
-        .replace(/[\u0300-\u036f]/g, '')
-        .toLowerCase();
-}
 </script>
 
 <template>

src/components/RefundInvoiceForm.vue

@@ -39,10 +39,14 @@ const refund = async () => {
         invoiceCorrectionTypeFk: invoiceParams.invoiceCorrectionTypeFk,
     };
 
-    const { data } = await axios.post('InvoiceOuts/refundAndInvoice', params);
+    try {
-    notify(t('Refunded invoice'), 'positive');
+        const { data } = await axios.post('InvoiceOuts/refundAndInvoice', params);
-    const [id] = data?.refundId || [];
+        notify(t('Refunded invoice'), 'positive');
-    if (id) router.push({ name: 'InvoiceOutSummary', params: { id } });
+        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,32 +49,36 @@ const makeInvoice = async () => {
         makeInvoice: checked.value,
     };
 
-    if (checked.value && hasToInvoiceByAddress) {
+    try {
-        const response = await new Promise((resolve) => {
+        if (checked.value && hasToInvoiceByAddress) {
-            quasar
+            const response = await new Promise((resolve) => {
-                .dialog({
+                quasar
-                    component: VnConfirm,
+                    .dialog({
-                    componentProps: {
+                        component: VnConfirm,
-                        title: t('Bill destination client'),
+                        componentProps: {
-                        message: t('transferInvoiceInfo'),
+                            title: t('Bill destination client'),
-                    },
+                            message: t('transferInvoiceInfo'),
-                })
+                        },
-                .onOk(() => {
+                    })
-                    resolve(true);
+                    .onOk(() => {
-                })
+                        resolve(true);
-                .onCancel(() => {
+                    })
-                    resolve(false);
+                    .onCancel(() => {
-                });
+                        resolve(false);
-        });
+                    });
-        if (!response) {
+            });
-            return;
+            if (!response) {
+                return;
+            }
         }
-    }
 
-    const { data } = await axios.post('InvoiceOuts/transfer', params);
+        const { data } = await axios.post('InvoiceOuts/transfer', params);
-    notify(t('Transferred invoice'), 'positive');
+        notify(t('Transferred invoice'), 'positive');
-    const id = data?.[0];
+        const id = data?.[0];
-    if (id) router.push({ name: 'InvoiceOutSummary', params: { id } });
+        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,31 +39,23 @@ 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
-        data-cy="locationProvince"
         :label="t('Province')"
-        :options="provincesOptions"
+        :options="$props.provinces"
         :tooltip="t('Create province')"
         hide-selected
         v-model="provinceFk"

src/components/VnTable/VnFilter.vue

@@ -25,7 +25,7 @@ const $props = defineProps({
     },
     searchUrl: {
         type: String,
-        default: 'table',
+        default: 'params',
     },
 });
 
@@ -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/VnOrder.vue

@@ -17,7 +17,7 @@ const $props = defineProps({
     },
     searchUrl: {
         type: String,
-        default: 'table',
+        default: 'params',
     },
     vertical: {
         type: Boolean,

src/components/VnTable/VnTable.vue

@@ -162,7 +162,9 @@ onMounted(() => {
             : $props.defaultMode;
     stateStore.rightDrawer = quasar.screen.gt.xs;
     columnsVisibilitySkipped.value = [
-        ...splittedColumns.value.columns.filter((c) => !c.visible).map((c) => c.name),
+        ...splittedColumns.value.columns
+            .filter((c) => c.visible == false)
+            .map((c) => c.name),
         ...['tableActions'],
     ];
     createForm.value = $props.create;
@@ -235,7 +237,7 @@ function splitColumns(columns) {
         if (col.create) splittedColumns.value.create.push(col);
         if (col.cardVisible) splittedColumns.value.cardVisible.push(col);
         if ($props.isEditable && col.disable == null) col.disable = false;
-        if ($props.useModel && col.columnFilter !== false)
+        if ($props.useModel && col.columnFilter != false)
             col.columnFilter = { inWhere: true, ...col.columnFilter };
         splittedColumns.value.columns.push(col);
     }
@@ -324,8 +326,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 +394,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 +737,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,71 +58,79 @@ const getConfig = async (url, filter) => {
 };
 
 const fetchViewConfigData = async () => {
-    const userConfigFilter = {
+    try {
-        where: { tableCode: $props.tableCode, userFk: user.value.id },
+        const userConfigFilter = {
-    };
+            where: { tableCode: $props.tableCode, userFk: user.value.id },
-    const userConfig = await getConfig('UserConfigViews', userConfigFilter);
+        };
+        const userConfig = await getConfig('UserConfigViews', userConfigFilter);
 
-    if (userConfig) {
+        if (userConfig) {
-        initialUserConfigViewData.value = userConfig;
+            initialUserConfigViewData.value = userConfig;
-        setUserConfigViewData(userConfig.configuration);
+            setUserConfigViewData(userConfig.configuration);
-        return;
+            return;
-    }
+        }
 
-    const defaultConfigFilter = { where: { tableCode: $props.tableCode } };
+        const defaultConfigFilter = { where: { tableCode: $props.tableCode } };
-    const defaultConfig = await getConfig('DefaultViewConfigs', defaultConfigFilter);
+        const defaultConfig = await getConfig('DefaultViewConfigs', defaultConfigFilter);
 
-    if (defaultConfig) {
+        if (defaultConfig) {
-        // Si el backend devuelve una configuración por defecto la usamos
+            // Si el backend devuelve una configuración por defecto la usamos
-        setUserConfigViewData(defaultConfig.columns);
+            setUserConfigViewData(defaultConfig.columns);
-        return;
+            return;
-    } else {
+        } else {
-        // Si no hay configuración por defecto mostramos todas las columnas
+            // Si no hay configuración por defecto mostramos todas las columnas
-        const defaultColumns = {};
+            const defaultColumns = {};
-        $props.allColumns.forEach((col) => (defaultColumns[col] = true));
+            $props.allColumns.forEach((col) => (defaultColumns[col] = true));
-        setUserConfigViewData(defaultColumns);
+            setUserConfigViewData(defaultColumns);
+        }
+    } catch (err) {
+        console.error('Error fetching config view data', err);
     }
 };
 
 const saveConfig = async () => {
-    const params = {};
+    try {
-    const configuration = {};
+        const params = {};
+        const configuration = {};
 
-    formattedCols.value.forEach((col) => {
+        formattedCols.value.forEach((col) => {
-        const { name, active } = col;
+            const { name, active } = col;
-        configuration[name] = active;
+            configuration[name] = active;
-    });
+        });
 
-    // Si existe una view config del usuario hacemos un update si no la creamos
+        // Si existe una view config del usuario hacemos un update si no la creamos
-    if (initialUserConfigViewData.value) {
+        if (initialUserConfigViewData.value) {
-        params.updates = [
+            params.updates = [
-            {
+                {
-                data: {
+                    data: {
+                        configuration: configuration,
+                    },
+                    where: {
+                        id: initialUserConfigViewData.value.id,
+                    },
+                },
+            ];
+        } else {
+            params.creates = [
+                {
+                    userFk: user.value.id,
+                    tableCode: $props.tableCode,
+                    tableConfig: $props.tableCode,
                     configuration: configuration,
                 },
-                where: {
+            ];
-                    id: initialUserConfigViewData.value.id,
+        }
-                },
-            },
-        ];
-    } else {
-        params.creates = [
-            {
-                userFk: user.value.id,
-                tableCode: $props.tableCode,
-                tableConfig: $props.tableCode,
-                configuration: configuration,
-            },
-        ];
-    }
 
-    const response = await axios.post('UserConfigViews/crud', params);
+        const response = await axios.post('UserConfigViews/crud', params);
-    if (response.data && response.data[0]) {
+        if (response.data && response.data[0]) {
-        initialUserConfigViewData.value = response.data[0];
+            initialUserConfigViewData.value = response.data[0];
+        }
+        emitSavedConfig();
+        notify('globals.dataSaved', 'positive');
+        popupProxyRef.value.hide();
+    } catch (err) {
+        console.error('Error saving user view config', err);
     }
-    emitSavedConfig();
-    notify('globals.dataSaved', 'positive');
-    popupProxyRef.value.hide();
 };
 
 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/VnDms.vue

@@ -163,7 +163,7 @@ function addDefaultData(data) {
                 />
                 <QFile
                     ref="inputFileRef"
-                    :label="t('globals.file')"
+                    :label="t('entry.buys.file')"
                     v-model="dms.files"
                     :multiple="false"
                     :accept="allowedContentTypes"

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/VnInputDate.vue

@@ -1,7 +1,8 @@
 <script setup>
-import { onMounted, watch, computed, ref, useAttrs } from 'vue';
+import { onMounted, watch, computed, ref } from 'vue';
 import { date } from 'quasar';
 import { useI18n } from 'vue-i18n';
+import { useAttrs } from 'vue';
 import VnDate from './VnDate.vue';
 import { useRequired } from 'src/composables/useRequired';
 

src/components/common/VnLocation.vue

@@ -75,6 +75,7 @@ const handleModelValue = (data) => {
         :input-debounce="300"
         :class="{ required: isRequired }"
         v-bind="$attrs"
+        clearable
         :emit-value="false"
         :tooltip="t('Create new location')"
         :rules="mixinRules"

src/components/common/VnRadio.vue

@@ -2,12 +2,5 @@
 const model = defineModel({ type: Boolean, required: true });
 </script>
 <template>
-    <QRadio
+    <QRadio v-model="model" v-bind="$attrs" dense :dark="true" class="q-mr-sm" />
-        v-model="model"
-        v-bind="$attrs"
-        dense
-        :dark="true"
-        class="q-mr-sm"
-        size="xs"
-    />
 </template>

src/components/common/VnSelect.vue

@@ -1,21 +1,12 @@
 <script setup>
 import { ref, toRefs, computed, watch, onMounted, useAttrs } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { useArrayData } from 'src/composables/useArrayData';
+import FetchData from 'src/components/FetchData.vue';
 import { useRequired } from 'src/composables/useRequired';
-import dataByOrder from 'src/utils/dataByOrder';
-
 const emit = defineEmits(['update:modelValue', 'update:options', 'remove']);
 const $attrs = useAttrs();
 const { t } = useI18n();
-
+const { isRequired, requiredFieldRule } = useRequired($attrs);
-const isRequired = computed(() => {
-    return useRequired($attrs).isRequired;
-});
-const requiredFieldRule = computed(() => {
-    return useRequired($attrs).requiredFieldRule;
-});
-
 const $props = defineProps({
     modelValue: {
         type: [String, Number, Object],
@@ -97,10 +88,6 @@ const $props = defineProps({
         type: Boolean,
         default: false,
     },
-    dataKey: {
-        type: String,
-        default: null,
-    },
 });
 
 const mixinRules = [requiredFieldRule, ...($attrs.rules ?? [])];
@@ -109,14 +96,14 @@ const { optionLabel, optionValue, optionFilter, optionFilterValue, options, mode
 const myOptions = ref([]);
 const myOptionsOriginal = ref([]);
 const vnSelectRef = ref();
+const dataRef = ref();
 const lastVal = ref();
 const noOneText = t('globals.noOne');
 const noOneOpt = ref({
     [optionValue.value]: false,
     [optionLabel.value]: noOneText,
 });
-const isLoading = ref(false);
+
-const useURL = computed(() => $props.url);
 const value = computed({
     get() {
         return $props.modelValue;
@@ -132,7 +119,7 @@ watch(options, (newValue) => {
 });
 
 watch(modelValue, async (newValue) => {
-    if (!myOptions?.value?.some((option) => option[optionValue.value] == newValue))
+    if (!myOptions.value.some((option) => option[optionValue.value] == newValue))
         await fetchFilter(newValue);
 
     if ($props.noOne) myOptions.value.unshift(noOneOpt.value);
@@ -140,23 +127,17 @@ watch(modelValue, async (newValue) => {
 
 onMounted(() => {
     setOptions(options.value);
-    if (useURL.value && $props.modelValue && !findKeyInOptions())
+    if ($props.url && $props.modelValue && !findKeyInOptions())
         fetchFilter($props.modelValue);
     if ($props.focusOnMount) setTimeout(() => vnSelectRef.value.showPopup(), 300);
 });
 
-const arrayDataKey =
-    $props.dataKey ?? ($props.url?.length > 0 ? $props.url : $attrs.name ?? $attrs.label);
-
-const arrayData = useArrayData(arrayDataKey, { url: $props.url, searchUrl: false });
-
 function findKeyInOptions() {
     if (!$props.options) return;
     return filter($props.modelValue, $props.options)?.length;
 }
 
 function setOptions(data) {
-    data = dataByOrder(data, $props.sortBy);
     myOptions.value = JSON.parse(JSON.stringify(data));
     myOptionsOriginal.value = JSON.parse(JSON.stringify(data));
     emit('update:options', data);
@@ -184,7 +165,7 @@ function filter(val, options) {
 }
 
 async function fetchFilter(val) {
-    if (!$props.url) return;
+    if (!$props.url || !dataRef.value) return;
 
     const { fields, include, sortBy, limit } = $props;
     const key =
@@ -206,11 +187,8 @@ async function fetchFilter(val) {
     const fetchOptions = { where, include, limit };
     if (fields) fetchOptions.fields = fields;
     if (sortBy) fetchOptions.order = sortBy;
-    arrayData.reset(['skip', 'filter.skip', 'page']);
 
-    const { data } = await arrayData.applyFilter({ filter: fetchOptions });
+    return dataRef.value.fetch(fetchOptions);
-    setOptions(data);
-    return data;
 }
 
 async function filterHandler(val, update) {
@@ -250,47 +228,20 @@ function nullishToTrue(value) {
 
 const getVal = (val) => ($props.useLike ? { like: `%${val}%` } : val);
 
-async function onScroll({ to, direction, from, index }) {
-    const lastIndex = myOptions.value.length - 1;
-
-    if (from === 0 && index === 0) return;
-    if (!useURL.value && !$props.fetchRef) return;
-    if (direction === 'decrease') return;
-    if (to === lastIndex && arrayData.store.hasMoreData && !isLoading.value) {
-        isLoading.value = true;
-        await arrayData.loadMore();
-        setOptions(arrayData.store.data);
-        vnSelectRef.value.scrollTo(lastIndex);
-        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>
+    <FetchData
+        ref="dataRef"
+        :url="$props.url"
+        @on-fetch="(data) => setOptions(data)"
+        :where="where || { [optionValue]: value }"
+        :limit="limit"
+        :sort-by="sortBy"
+        :fields="fields"
+        :params="params"
+    />
     <QSelect
         v-model="value"
         :options="myOptions"
@@ -298,7 +249,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'])"
@@ -310,14 +260,10 @@ function handleKeyDown(event) {
         :rules="mixinRules"
         virtual-scroll-slice-size="options.length"
         hide-bottom-space
-        :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="
                     () => {
@@ -330,22 +276,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/VnSelectDialog.vue

@@ -43,7 +43,6 @@ const isAllowedToCreate = computed(() => {
     >
         <template v-if="isAllowedToCreate" #append>
             <QIcon
-                :data-cy="$attrs.dataCy ?? $attrs.label + '_icon'"
                 @click.stop.prevent="$refs.dialog.show()"
                 :name="actionIcon"
                 :size="actionIcon === 'add' ? 'xs' : 'sm'"

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/CardSummary.vue

@@ -83,7 +83,7 @@ async function fetch() {
                     <slot name="header" :entity="entity" dense>
                         <VnLv :label="`${entity.id} -`" :value="entity.name" />
                     </slot>
-                    <slot name="header-right" :entity="entity">
+                    <slot name="header-right">
                         <span></span>
                     </slot>
                 </div>

src/components/ui/VnAvatar.vue

@@ -6,7 +6,7 @@ import { useColor } from 'src/composables/useColor';
 import { getCssVar } from 'quasar';
 
 const $props = defineProps({
-    workerId: { type: [Number, undefined], default: null },
+    workerId: { type: Number, required: true },
     description: { type: String, default: null },
     title: { type: String, default: null },
     color: { type: String, default: null },
@@ -38,13 +38,7 @@ watch(src, () => (showLetter.value = false));
             <template v-if="showLetter">
                 {{ title.charAt(0) }}
             </template>
-            <QImg
+            <QImg v-else :src="src" spinner-color="white" @error="showLetter = true" />
-                v-else-if="workerId"
-                :src="src"
-                spinner-color="white"
-                @error="showLetter = true"
-            />
-            <QIcon v-else name="mood" size="xs" />
         </QAvatar>
         <div class="description">
             <slot name="description" v-if="description">

src/components/ui/VnFilterPanel.vue

@@ -37,7 +37,7 @@ const $props = defineProps({
     },
     hiddenTags: {
         type: Array,
-        default: () => ['filter', 'or', 'and'],
+        default: () => ['filter', 'search', 'or', 'and'],
     },
     customTags: {
         type: Array,
@@ -49,7 +49,7 @@ const $props = defineProps({
     },
     searchUrl: {
         type: String,
-        default: 'table',
+        default: 'params',
     },
     redirect: {
         type: Boolean,
@@ -57,10 +57,12 @@ const $props = defineProps({
     },
 });
 
+defineExpose({ search, sanitizer });
 const emit = defineEmits([
     'update:modelValue',
     'refresh',
     'clear',
+    'search',
     'init',
     'remove',
     'setUserParams',
@@ -74,9 +76,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 });
@@ -171,36 +170,16 @@ const tagsList = computed(() => {
     return tagList;
 });
 
-const formatTags = (tags) => {
-    const formattedTags = [];
-    tags.forEach((tag) => {
-        if (tag.label === 'and') {
-            tag.value.forEach((item) => {
-                for (const key in item) {
-                    formattedTags.push({ label: key, value: item[key] });
-                }
-            });
-        } else {
-            formattedTags.push(tag);
-        }
-    });
-    return formattedTags;
-};
-
 const tags = computed(() => {
-    const filteredTags = tagsList.value.filter(
+    return tagsList.value.filter((tag) => !($props.customTags || []).includes(tag.label));
-        (tag) => !($props.customTags || []).includes(tag.label)
-    );
-    return formatTags(filteredTags);
 });
-
 const customTags = computed(() =>
     tagsList.value.filter((tag) => ($props.customTags || []).includes(tag.label))
 );
 
 async function remove(key) {
     userParams.value[key] = undefined;
-    await search();
+    search();
     emit('remove', key);
     emit('update:modelValue', userParams.value);
 }
@@ -214,12 +193,7 @@ function formatValue(value) {
 
 function sanitizer(params) {
     for (const [key, value] of Object.entries(params)) {
-        if (key === 'and' && Array.isArray(value)) {
+        if (value && typeof value === 'object') {
-            value.forEach((item) => {
-                Object.assign(params, item);
-            });
-            delete params[key];
-        } else if (value && typeof value === 'object') {
             const param = Object.values(value)[0];
             if (typeof param == 'string') params[key] = param.replaceAll('%', '');
         }
@@ -273,7 +247,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,60 +1,16 @@
 <script setup>
-import { ref, reactive, useAttrs, onBeforeMount, capitalize } from 'vue';
+defineProps({ phoneNumber: { type: [String, Number], default: null } });
-import axios from 'axios';
-import { parsePhone } from 'src/filters';
-import useOpenURL from 'src/composables/useOpenURL';
-
-const props = defineProps({
-    phoneNumber: { type: [String, Number], default: null },
-    channel: { type: Number, default: null },
-    country: { type: String, default: null },
-});
-
-const phone = ref(props.phoneNumber);
-const config = reactive({
-    sip: { icon: 'phone', href: `sip:${props.phoneNumber}` },
-    'say-simple': {
-        icon: 'vn:saysimple',
-        url: null,
-        channel: props.channel,
-    },
-});
-const type = Object.keys(config).find((key) => key in useAttrs()) || 'sip';
-
-onBeforeMount(async () => {
-    if (!phone.value) return;
-    let { channel } = config[type];
-
-    if (type === 'say-simple') {
-        const { url, defaultChannel } = (await axios.get('SaySimpleConfigs/findOne'))
-            .data;
-        if (!channel) channel = defaultChannel;
-
-        phone.value = await parsePhone(props.phoneNumber, props.country.toLowerCase());
-        config[
-            type
-        ].url = `${url}?customerIdentity=%2B${phone.value}&channelId=${channel}`;
-    }
-});
-
-function handleClick() {
-    if (config[type].url) useOpenURL(config[type].url);
-    else if (config[type].href) window.location.href = config[type].href;
-}
 </script>
 <template>
     <QBtn
-        v-if="phone"
+        v-if="phoneNumber"
         flat
         round
-        :icon="config[type].icon"
+        icon="phone"
         size="sm"
         color="primary"
         padding="none"
-        @click.stop="handleClick"
+        :href="`sip:${phoneNumber}`"
-    >
+        @click.stop
-        <QTooltip>
+    />
-            {{ capitalize(type).replace('-', '') }}
-        </QTooltip>
-    </QBtn>
 </template>

src/components/ui/VnNotes.vue

@@ -65,9 +65,13 @@ onBeforeRouteLeave((to, from, next) => {
         auto-load
         @on-fetch="(data) => (observationTypes = data)"
     />
-    <QCard class="q-pa-xs q-mb-lg full-width" v-if="$props.addNote">
+    <QCard class="q-pa-xs q-mb-xl full-width" v-if="$props.addNote">
         <QCardSection horizontal>
-            {{ t('New note') }}
+            <VnAvatar :worker-id="currentUser.id" size="md" />
+            <div class="full-width row justify-between q-pa-xs">
+                <VnUserLink :name="t('New note')" :worker-id="currentUser.id" />
+                {{ t('globals.now') }}
+            </div>
         </QCardSection>
         <QCardSection class="q-px-xs q-my-none q-py-none">
             <VnRow class="full-width">
@@ -101,7 +105,6 @@ onBeforeRouteLeave((to, from, next) => {
                             @click="insert"
                             class="q-mb-xs"
                             dense
-                            data-cy="saveNote"
                         />
                     </template>
                 </VnInput>
@@ -141,7 +144,7 @@ onBeforeRouteLeave((to, from, next) => {
                         <div class="full-width row justify-between q-pa-xs">
                             <div>
                                 <VnUserLink
-                                    :name="`${note.worker.user.name}`"
+                                    :name="`${note.worker.user.nickname}`"
                                     :worker-id="note.worker.id"
                                 />
                                 <QBadge

src/components/ui/VnPaginate.vue

@@ -44,7 +44,7 @@ const props = defineProps({
     },
     limit: {
         type: Number,
-        default: 20,
+        default: 10,
     },
     userParams: {
         type: Object,
@@ -100,7 +100,7 @@ const arrayData = useArrayData(props.dataKey, {
 const store = arrayData.store;
 
 onMounted(async () => {
-    if (props.autoLoad && !store.data?.length) await fetch();
+    if (props.autoLoad) await fetch();
     mounted.value = true;
 });
 
@@ -115,11 +115,7 @@ watch(
 
 watch(
     () => store.data,
-    (data) => {
+    (data) => emit('onChange', data)
-        if (!mounted.value) return;
-        emit('onChange', data);
-    },
-    { immediate: true }
 );
 
 watch(
@@ -132,24 +128,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 +177,7 @@ async function onLoad(index, done) {
     done(isDone);
 }
 
-defineExpose({ fetch, update, addFilter, paginate });
+defineExpose({ fetch, addFilter, paginate });
 </script>
 
 <template>

src/components/ui/VnRow.vue

@@ -1,5 +1,5 @@
 <template>
-    <div class="vn-row q-gutter-md">
+    <div class="vn-row q-gutter-md q-mb-md">
         <slot />
     </div>
 </template>
@@ -18,9 +18,6 @@
         &:not(.wrap) {
             flex-direction: column;
         }
-        &[fixed] {
-            flex-direction: row;
-        }
     }
 }
 </style>

src/components/ui/VnSearchbar.vue

@@ -45,7 +45,7 @@ const props = defineProps({
     },
     limit: {
         type: Number,
-        default: 20,
+        default: 10,
     },
     userParams: {
         type: Object,
@@ -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

@@ -75,10 +75,18 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
             limit: store.limit,
         };
 
+        let exprFilter;
         let userParams = { ...store.userParams };
+        if (store?.exprBuilder) {
+            const where = buildFilter(userParams, (param, value) => {
+                const res = store.exprBuilder(param, value);
+                if (res) delete userParams[param];
+                return res;
+            });
+            exprFilter = where ? { where } : null;
+        }
 
-        Object.assign(filter, store.userFilter);
+        Object.assign(filter, store.userFilter, exprFilter);
-
         let where;
         if (filter?.where || store.filter?.where)
             where = Object.assign(filter?.where ?? {}, store.filter?.where ?? {});
@@ -87,29 +95,12 @@ 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 && store.order.length) params.filter.order = store.order;
-        if (store.order?.length) params.filter.order = [...store.order];
         else delete params.filter.order;
 
-        store.currentFilter = JSON.parse(JSON.stringify(params));
-        delete store.currentFilter.filter.include;
-        store.currentFilter.filter = JSON.stringify(store.currentFilter.filter);
-
-        let exprFilter;
-        if (store?.exprBuilder) {
-            exprFilter = buildFilter(params, (param, value) => {
-                if (param == 'filter') return;
-                const res = store.exprBuilder(param, value);
-                if (res) delete params[param];
-                return res;
-            });
-        }
-
-        if (params.filter.where || exprFilter)
-            params.filter.where = { ...params.filter.where, ...exprFilter };
         params.filter = JSON.stringify(params.filter);
-
+        store.currentFilter = params;
         store.isLoading = true;
         const response = await axios.get(store.url, {
             signal: canceller.signal,
@@ -256,7 +247,6 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
     }
 
     function updateStateParams() {
-        if (!route?.path) return;
         const newUrl = { path: route.path, query: { ...(route.query ?? {}) } };
         if (store?.searchUrl)
             newUrl.query[store.searchUrl] = JSON.stringify(store.currentFilter);
@@ -280,7 +270,7 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
                 const pushUrl = { path: to };
                 if (to.endsWith('/list') || to.endsWith('/'))
                     pushUrl.query = newUrl.query;
-                else destroy();
+                destroy();
                 return router.push(pushUrl);
             }
         }

src/composables/useOpenURL.js

@@ -1,8 +0,0 @@
-import { openURL } from 'quasar';
-const defaultWindowFeatures = {
-    noopener: true,
-    noreferrer: true,
-};
-export default function (url, windowFeatures = defaultWindowFeatures, fn = undefined) {
-    openURL(url, fn, windowFeatures);
-}

src/composables/useRequired.js

@@ -2,14 +2,8 @@ import { useValidator } from 'src/composables/useValidator';
 
 export function useRequired($attrs) {
     const { validations } = useValidator();
-    const hasRequired = Object.keys($attrs).includes('required');
+
-    let isRequired = false;
+    const isRequired = Object.keys($attrs).includes('required');
-    if (hasRequired) {
-        const required = $attrs['required'];
-        if (typeof required === 'boolean') {
-            isRequired = required;
-        }
-    }
     const requiredFieldRule = (val) => validations().required(isRequired, val);
 
     return {

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/getParamWhere.js

@@ -9,20 +9,12 @@ function parseJSON(str, fallback) {
 }
 export default function (route, param) {
     // catch route query params
-    const params = parseJSON(route?.query?.table, {});
+    const params = parseJSON(route?.query?.params, {});
+
     // extract and parse filter from params
     const { filter: filterStr = '{}' } = params;
-
     const where = parseJSON(filterStr, {})?.where;
-
+    if (where && where[param] !== undefined) {
-    if (where && !param) {
-        return where;
-    } else if (where && where.and) {
-        const foundParam = where.and.find((p) => p[param]);
-        if (foundParam) {
-            return foundParam[param];
-        }
-    } else if (where && where[param]) {
         return where[param];
     }
     return null;

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,18 +0,0 @@
-import axios from 'axios';
-
-export default async function parsePhone(phone, country) {
-    if (!phone) return;
-    if (phone.startsWith('+')) return `${phone.slice(1)}`;
-    if (phone.startsWith('00')) return `${phone.slice(2)}`;
-
-    let prefix;
-    try {
-        prefix = (await axios.get(`Prefixes/${country.toLowerCase()}`)).data?.prefix;
-    } catch (e) {
-        prefix = (await axios.get('PbxConfigs/findOne')).data?.defaultPrefix;
-    }
-    prefix = prefix.replace(/^0+/, '');
-
-    if (phone.startsWith(prefix)) return phone;
-    return `${prefix}${phone}`;
-}

src/i18n/locale/en.yml

@@ -59,8 +59,8 @@ globals:
     downloadCSVSuccess: CSV downloaded successfully
     reference: Reference
     agency: Agency
-    warehouseOut: Warehouse Out
+    wareHouseOut: Warehouse Out
-    warehouseIn: Warehouse In
+    wareHouseIn: Warehouse In
     landed: Landed
     shipped: Shipped
     totalEntries: Total entries
@@ -106,26 +106,6 @@ globals:
     weight: Weight
     error: Ups! Something went wrong
     recalc: Recalculate
-    alias: Alias
-    vat: VAT
-    intrastat: Intrastat
-    tags: Tags
-    size: Size
-    producer: Producer
-    origin: Origin
-    state: State
-    subtotal: Subtotal
-    visible: Visible
-    price: Price
-    client: Client
-    country: Country
-    phone: Phone
-    mobile: Mobile
-    postcode: Postcode
-    street: Street
-    tag: Tag
-    ticketId: Ticket ID
-    confirmed: Confirmed
     small: Small
     medium: Medium
     big: Big
@@ -298,7 +278,6 @@ globals:
         clientsActionsMonitor: Clients and actions
         serial: Serial
         medical: Mutual
-        pit: IRPF
         RouteExtendedList: Router
         wasteRecalc: Waste recaclulate
         operator: Operator
@@ -321,10 +300,13 @@ globals:
     maxTemperature: Max
     minTemperature: Min
     params:
+        id: ID
         clientFk: Client id
         salesPersonFk: Sales person
         warehouseFk: Warehouse
         provinceFk: Province
+        from: From
+        To: To
         stateFk: State
         email: Email
         SSN: SSN
@@ -354,12 +336,16 @@ login:
     loginError: Invalid username or password
     fieldRequired: This field is required
     twoFactorRequired: Two-factor verification required
-twoFactorRequired:
+twoFactor:
+    code: Code
     validate: Validate
     insert: Enter the verification code
     explanation: >-
         Please, enter the verification code that we have sent to your email in the
         next 5 minutes
+verifyEmail:
+    pageTitles:
+        verifyEmail: Email verification
 recoverPassword:
     userOrEmail: User or recovery email
     explanation: >-
@@ -371,7 +357,15 @@ resetPassword:
 entry:
     list:
         newEntry: New entry
+        landed: Landed
+        invoiceNumber: Invoice number
+        supplier: Supplier
+        booked: Booked
+        confirmed: Confirmed
+        ordered: Ordered
         tableVisibleColumns:
+            id: Id
+            reference: Reference
             created: Creation
             supplierFk: Supplier
             isBooked: Booked
@@ -384,117 +378,236 @@ entry:
     summary:
         commission: Commission
         currency: Currency
+        company: Company
+        reference: Reference
         invoiceNumber: Invoice number
         ordered: Ordered
+        confirmed: Confirmed
         booked: Booked
         excludedFromAvailable: Inventory
         travelReference: Reference
         travelAgency: Agency
         travelShipped: Shipped
+        travelWarehouseOut: Warehouse Out
         travelDelivered: Delivered
         travelLanded: Landed
+        travelWarehouseIn: Warehouse In
         travelReceived: Received
         buys: Buys
+        quantity: Quantity
         stickers: Stickers
         package: Package
+        weight: Weight
         packing: Packing
         grouping: Grouping
         buyingValue: Buying value
         import: Import
         pvp: PVP
+        item: Item
     basicData:
+        supplier: Supplier
         travel: Travel
+        reference: Reference
+        invoiceNumber: Invoice number
+        company: Company
         currency: Currency
         commission: Commission
         observation: Observation
+        ordered: Ordered
+        confirmed: Confirmed
         booked: Booked
         excludedFromAvailable: Inventory
+        agency: Agency
+        warehouseOut: Warehouse Out
+        warehouseIn: Warehouse In
+        shipped: Shipped
+        landed: Landed
+        id: ID
     buys:
+        groupingPrice: Grouping price
+        packingPrice: Packing price
+        reference: Reference
         observations: Observations
+        item: Item
+        size: Size
+        packing: Packing
+        grouping: Grouping
+        buyingValue: Buying value
         packagingFk: Box
+        file: File
+        name: Name
+        producer: Producer
+        type: Type
         color: Color
+        id: ID
         printedStickers: Printed stickers
     notes:
         observationType: Observation type
+    descriptor:
+        agency: Agency
+        landed: Landed
+        warehouseOut: Warehouse Out
     latestBuys:
         tableVisibleColumns:
             image: Picture
             itemFk: Item ID
+            packing: Packing
+            grouping: Grouping
+            quantity: Quantity
+            size: Size
+            tags: Tags
+            type: Type
+            intrastat: Intrastat
+            origin: Origin
             weightByPiece: Weight/Piece
             isActive: Active
             family: Family
             entryFk: Entry
+            buyingValue: Buying value
             freightValue: Freight value
             comissionValue: Commission value
+            description: Description
             packageValue: Package value
             isIgnored: Is ignored
             price2: Grouping
             price3: Packing
             minPrice: Min
             ektFk: Ekt
+            weight: Weight
+            packagingFk: Package
             packingOut: Package out
             landing: Landing
             isExcludedFromAvailable: Es inventory
 ticket:
+    pageTitles:
+        tickets: Tickets
+        list: List
+        ticketCreate: New ticket
+        summary: Summary
+        basicData: Basic Data
+        boxing: Boxing
+        sms: Sms
+        notes: Notes
+        sale: Sale
+        dms: File management
+        volume: Volume
+        observation: Notes
+        ticketAdvance: Advance tickets
+        futureTickets: Future tickets
+        purchaseRequest: Purchase request
+        weeklyTickets: Weekly tickets
+    list:
+        nickname: Nickname
+        state: State
+        shipped: Shipped
+        landed: Landed
+        salesPerson: Sales person
+        total: Total
     card:
+        ticketId: Ticket ID
+        state: State
         customerId: Customer ID
+        salesPerson: Sales person
+        agency: Agency
+        shipped: Shipped
+        warehouse: Warehouse
         customerCard: Customer card
+        alias: Alias
         ticketList: Ticket List
         newOrder: New Order
     boxing:
         expedition: Expedition
+        item: Item
         created: Created
+        worker: Worker
         selectTime: 'Select time:'
         selectVideo: 'Select video:'
         notFound: No videos available
     summary:
+        state: State
+        salesPerson: Sales person
+        agency: Agency
         zone: Zone
+        warehouse: Warehouse
         collection: Collection
         route: Route
         invoice: Invoice
         shipped: Shipped
+        landed: Landed
         consigneePhone: Consignee phone
         consigneeMobile: Consignee mobile
         consigneeAddress: Consignee address
         clientPhone: Client phone
         clientMobile: Client mobile
         consignee: Consignee
+        subtotal: Subtotal
+        vat: VAT
         total: Total
         saleLines: Line items
+        item: Item
+        visible: Visible
         available: Available
+        quantity: Quantity
+        price: Price
         discount: Discount
         packing: Packing
         hasComponentLack: Component lack
         itemShortage: Not visible
         claim: Claim
         reserved: Reserved
+        created: Created
         package: Package
         taxClass: Tax class
         services: Services
         requester: Requester
         atender: Atender
         request: Request
+        weight: Weight
         goTo: Go to
         summaryAmount: Summary
         purchaseRequest: Purchase request
         service: Service
+        description: Description
         attender: Attender
         ok: Ok
     create:
+        client: Client
         address: Address
+        landed: Landed
+        warehouse: Warehouse
+        agency: Agency
 invoiceOut:
+    list:
+        ref: Reference
+        issued: Issued
+        shortIssued: Issued
+        client: Client
+        created: Created
+        shortCreated: Created
+        company: Company
+        dued: Due date
+        shortDued: Due date
+        amount: Amount
     card:
         issued: Issued
+        client: Client
+        company: Company
         customerCard: Customer card
     summary:
         issued: Issued
+        created: Created
         dued: Due
         booked: Booked
+        company: Company
         taxBreakdown: Tax breakdown
+        type: Type
         taxableBase: Taxable base
         rate: Rate
         fee: Fee
         tickets: Tickets
+        ticketId: Ticket id
+        nickname: Alias
+        shipped: Shipped
         totalWithVat: Amount
     globalInvoices:
         errors:
@@ -507,16 +620,23 @@ invoiceOut:
             invoiceWithFutureDate: Exists an invoice with a future date
             noTicketsToInvoice: There are not tickets to invoice
             criticalInvoiceError: 'Critical invoicing error, process stopped'
-            invalidSerialTypeForAll: The serial type must be global when invoicing all clients
         table:
+            client: Client
             addressId: Address id
             streetAddress: Street
         statusCard:
             percentageText: '{getPercentage}% {getAddressNumber} of {getNAddresses}'
             pdfsNumberText: '{nPdfs} of {totalPdfs} PDFs'
     negativeBases:
+        from: From
+        to: To
+        company: Company
+        country: Country
         clientId: Client Id
+        client: Client
+        amount: Amount
         base: Base
+        ticketId: Ticket Id
         active: Active
         hasToInvoice: Has to Invoice
         verifiedData: Verified Data
@@ -529,6 +649,15 @@ shelving:
         priority: Priority
         newShelving: New Shelving
     summary:
+        code: Code
+        parking: Parking
+        priority: Priority
+        worker: Worker
+        recyclable: Recyclable
+    basicData:
+        code: Code
+        parking: Parking
+        priority: Priority
         recyclable: Recyclable
 parking:
     pickingOrder: Picking order
@@ -541,27 +670,56 @@ parking:
 order:
     field:
         salesPersonFk: Sales Person
+        clientFk: Client
+        isConfirmed: Confirmed
+        created: Created
+        landed: Landed
+        hour: Hour
+        agency: Agency
+        total: Total
     form:
         clientFk: Client
         addressFk: Address
+        landed: Landed
         agencyModeFk: Agency
     list:
         newOrder: New Order
     summary:
         basket: Basket
+        nickname: Nickname
+        company: Company
+        confirmed: Confirmed
         notConfirmed: Not confirmed
         created: Created
+        landed: Landed
+        phone: Phone
         createdFrom: Created From
         address: Address
+        notes: Notes
+        subtotal: Subtotal
         total: Total
+        vat: VAT
+        state: State
+        alias: Alias
         items: Items
         orderTicketList: Order Ticket List
+        details: Details
+        item: Item
+        quantity: Quantity
+        price: Price
         amount: Amount
         confirm: Confirm
         confirmLines: Confirm lines
 department:
+    pageTitles:
+        basicData: Basic data
+        department: Department
+        summary: Summary
+    name: Name
+    code: Code
     chat: Chat
     bossDepartment: Boss Department
+    email: Email
     selfConsumptionCustomer: Self-consumption customer
     telework: Telework
     notifyOnErrors: Notify on errors
@@ -570,11 +728,47 @@ department:
     hasToSendMail: Send check-ins by email
     departmentRemoved: Department removed
 worker:
+    pageTitles:
+        workers: Workers
+        list: List
+        basicData: Basic data
+        summary: Summary
+        notifications: Notifications
+        workerCreate: New worker
+        department: Department
+        pda: PDA
+        notes: Notas
+        dms: My documentation
+        pbx: Private Branch Exchange
+        log: Log
+        calendar: Calendar
+        timeControl: Time control
+        locker: Locker
+        balance: Balance
+        medical: Medical
+        operator: Operator
     list:
+        name: Name
+        email: Email
+        phone: Phone
+        mobile: Mobile
+        active: Active
         department: Department
         schedule: Schedule
         newWorker: New worker
+    card:
+        workerId: Worker ID
+        user: User
+        name: Name
+        email: Email
+        phone: Phone
+        mobile: Mobile
+        active: Active
+        warehouse: Warehouse
+        agency: Agency
+        salesPerson: Sales person
     summary:
+        basicData: Basic data
         boss: Boss
         phoneExtension: Phone extension
         entPhone: Enterprise phone
@@ -585,15 +779,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
@@ -606,12 +800,19 @@ worker:
         serialNumber: Serial number
         removePDA: Deallocate PDA
     create:
+        name: Name
         lastName: Last name
         birth: Birth
         fi: Fi
         code: Worker code
+        phone: Phone
+        postcode: Postcode
+        province: Province
+        city: City
+        street: Street
         webUser: Web user
         personalEmail: Personal email
+        company: Company
         boss: Boss
         payMethods: Pay method
         iban: IBAN
@@ -623,13 +824,16 @@ worker:
             endDate: End date
             center: Training center
             invoice: Invoice
+            amount: Amount
             remark: Remark
             hasDiploma: Has diploma
     medical:
         tableVisibleColumns:
+            date: Date
             time: Hour
             center: Formation Center
             invoice: Invoice
+            amount: Amount
             isFit: Fit
             remark: Observations
     imageNotFound: Image not found
@@ -653,7 +857,18 @@ worker:
         isOnReservationMode: Reservation mode
         machine: Machine
 wagon:
+    pageTitles:
+        wagons: Wagons
+        wagonsList: Wagons List
+        wagonCreate: Create wagon
+        wagonEdit: Edit wagon
+        typesList: Types List
+        typeCreate: Create type
+        typeEdit: Edit type
+        wagonCounter: Trolley counter
+        wagonTray: Tray List
     type:
+        name: Name
         submit: Submit
         reset: Reset
         trayColor: Tray color
@@ -661,10 +876,13 @@ wagon:
     list:
         plate: Plate
         volume: Volume
+        type: Type
         remove: Remove
         removeItem: Wagon removed successfully
     create:
         plate: Plate
+        volume: Volume
+        type: Type
         label: Label
     warnings:
         noData: No data available
@@ -681,17 +899,26 @@ wagon:
 supplier:
     list:
         payMethod: Pay method
+        payDeadline: Pay deadline
+        payDay: Pay day
         account: Account
         newSupplier: New supplier
         tableVisibleColumns:
+            id: Id
+            name: Name
             nif: NIF/CIF
+            nickname: Alias
             account: Account
+            payMethod: Pay Method
             payDay: Pay Day
+            country: Country
     summary:
         responsible: Responsible
+        notes: Notes
         verified: Verified
         isActive: Is active
         billingData: Billing data
+        payMethod: Pay method
         payDeadline: Pay deadline
         payDay: Pay day
         account: Account
@@ -704,12 +931,17 @@ supplier:
         fiscalAddress: Fiscal address
         socialName: Social name
         taxNumber: Tax number
+        street: Street
         city: City
+        postCode: Postcode
+        province: Province
+        country: Country
     create:
         supplierName: Supplier name
     basicData:
+        alias: Alias
         workerFk: Responsible
-        isReal: Verified
+        isSerious: Verified
         isActive: Active
         isPayMethodChecked: PayMethod checked
         note: Notes
@@ -722,18 +954,36 @@ supplier:
         sageWithholdingFk: Sage withholding
         sageTransactionTypeFk: Sage transaction type
         supplierActivityFk: Supplier activity
+        healthRegister: Health register
+        street: Street
+        postcode: Postcode
+        city: City *
+        provinceFk: Province
+        country: Country
         isTrucker: Trucker
         isVies: Vies
     billingData:
         payMethodFk: Billing data
         payDemFk: Payment deadline
+        payDay: Pay day
     accounts:
         iban: Iban
         bankEntity: Bank entity
         beneficiary: Beneficiary
     contacts:
+        name: Name
+        phone: Phone
+        mobile: Mobile
         email: Email
         observation: Notes
+    addresses:
+        street: Street
+        postcode: Postcode
+        phone: Phone
+        name: Name
+        city: City
+        province: Province
+        mobile: Mobile
     agencyTerms:
         agencyFk: Agency
         minimumM3: Minimum M3
@@ -745,16 +995,25 @@ supplier:
         addRow: Add row
     consumption:
         entry: Entry
+        date: Date
+        reference: Reference
 travel:
     travelList:
         tableVisibleColumns:
+            id: Id
             ref: Reference
+            agency: Agency
+            shipped: Shipped
+            landed: Landed
             shipHour: Shipment Hour
             landHour: Landing Hour
+            warehouseIn: Warehouse in
+            warehouseOut: Warehouse out
             totalEntries: Total entries
             totalEntriesTooltip: Total entries
             daysOnward: Landed days onwards
     summary:
+        confirmed: Confirmed
         entryId: Entry Id
         freight: Freight
         package: Package
@@ -767,90 +1026,64 @@ travel:
         AddEntry: Add entry
         thermographs: Thermographs
         hb: HB
+    variables:
+        search: Id/Reference
+        agencyModeFk: Agency
+        warehouseInFk: ' Warehouse In'
+        warehouseOutFk: Warehouse Out
+        landedFrom: Landed from
+        landedTo: Landed to
+        continent: Continent out
+        totalEntries: Total entries
     basicData:
-        daysInForward: Automatic movement (Raid)
+        reference: Reference
-        isRaid: Raid
+        agency: Agency
+        shipped: Shipped
+        landed: Landed
+        warehouseOut: Warehouse Out
+        warehouseIn: Warehouse In
+        delivered: Delivered
+        received: Received
+        daysInForward: Days in forward
     thermographs:
+        code: Code
         temperature: Temperature
+        state: State
         destination: Destination
+        created: Created
         thermograph: Thermograph
+        reference: Reference
+        type: Type
+        company: Company
+        warehouse: Warehouse
         travelFileDescription: 'Travel id { travelId }'
-item:
+        file: File
-    descriptor:
-        buyer: Buyer
-        color: Color
-        category: Category
-        available: Available
-        warehouseText: 'Calculated on the warehouse of { warehouseName }'
-        itemDiary: Item diary
-    list:
-        id: Identifier
-        stems: Stems
-        category: Category
-        typeName: Type
-        isActive: Active
-        userName: Buyer
-        weightByPiece: Weight/Piece
-        stemMultiplier: Multiplier
-    fixedPrice:
-        itemFk: Item ID
-        groupingPrice: Grouping price
-        packingPrice: Packing price
-        hasMinPrice: Has min price
-        minPrice: Min price
-        started: Started
-        ended: Ended
-    create:
-        priority: Priority
-    buyRequest:
-        requester: Requester
-        requested: Requested
-        attender: Atender
-        achieved: Achieved
-        concept: Concept
-    summary:
-        otherData: Other data
-        tax: Tax
-        botanical: Botanical
-        barcode: Barcode
-        completeName: Complete name
-        family: Familiy
-        stems: Stems
-        multiplier: Multiplier
-        buyer: Buyer
-        doPhoto: Do photo
-        intrastatCode: Intrastat code
-        ref: Reference
-        relevance: Relevance
-        weight: Weight (gram)/stem
-        units: Units/box
-        expense: Expense
-        generic: Generic
-        recycledPlastic: Recycled plastic
-        nonRecycledPlastic: Non recycled plastic
-        minSalesQuantity: Min sales quantity
-        genus: Genus
-        specie: Specie
 components:
     topbar: {}
     itemsFilterPanel:
         typeFk: Type
+        tag: Tag
         value: Value
         # ItemFixedPriceFilter
         buyerFk: Buyer
+        warehouseFk: Warehouse
         started: From
         ended: To
         mine: For me
         hasMinPrice: Minimum price
         # LatestBuysFilter
         salesPersonFk: Buyer
+        supplierFk: Supplier
         from: From
+        to: To
         active: Is active
+        visible: Is visible
         floramondo: Is floramondo
         showBadDates: Show future items
     userPanel:
         copyToken: Token copied to clipboard
         settings: Settings
+        logOut: Log Out
         localWarehouse: Local warehouse
         localBank: Local bank
         localCompany: Local company
@@ -858,9 +1091,9 @@ components:
         userCompany: User company
     smartCard:
         downloadFile: Download file
+        clone: Clone
         openCard: View
         openSummary: Summary
-        viewSummary: Summary
     cardDescriptor:
         mainList: Main list
         summary: Summary

src/i18n/locale/es.yml

@@ -58,8 +58,8 @@ globals:
     downloadCSVSuccess: Descarga de CSV exitosa
     reference: Referencia
     agency: Agencia
-    warehouseOut: Alm. salida
+    wareHouseOut: Alm. salida
-    warehouseIn: Alm. entrada
+    wareHouseIn: Alm. entrada
     landed: F. entrega
     shipped: F. envío
     totalEntries: Ent. totales
@@ -108,26 +108,6 @@ globals:
     weight: Peso
     error: ¡Ups! Algo salió mal
     recalc: Recalcular
-    alias: Alias
-    vat: IVA
-    intrastat: Intrastat
-    tags: Etiquetas
-    size: Medida
-    producer: Productor
-    origin: Origen
-    state: Estado
-    subtotal: Subtotal
-    visible: Visible
-    price: Precio
-    client: Cliente
-    country: País
-    phone: Teléfono
-    mobile: Móvil
-    postcode: Código postal
-    street: Dirección
-    tag: Etiqueta
-    ticketId: ID ticket
-    confirmed: Confirmado
     small: Pequeño/a
     medium: Mediano/a
     big: Grande
@@ -303,7 +283,6 @@ globals:
         clientsActionsMonitor: Clientes y acciones
         serial: Facturas por serie
         medical: Mutua
-        pit: IRPF
         wasteRecalc: Recalcular mermas
         operator: Operario
         parking: Parking
@@ -325,10 +304,13 @@ globals:
     maxTemperature: Máx
     minTemperature: Mín
     params:
+        id: Id
         clientFk: Id cliente
         salesPersonFk: Comercial
         warehouseFk: Almacén
         provinceFk: Provincia
+        from: Desde
+        To: Hasta
         stateFk: Estado
         departmentFk: Departamento
         email: Correo
@@ -359,9 +341,13 @@ login:
     fieldRequired: Este campo es obligatorio
     twoFactorRequired: Verificación de doble factor requerida
 twoFactor:
+    code: Código
     validate: Validar
     insert: Introduce el código de verificación
     explanation: Por favor introduce el código de verificación que te hemos enviado a tu email en los próximos 5 minutos
+verifyEmail:
+    pageTitles:
+        verifyEmail: Verificación de correo
 recoverPassword:
     userOrEmail: Usuario o correo de recuperación
     explanation: >-
@@ -373,7 +359,15 @@ resetPassword:
 entry:
     list:
         newEntry: Nueva entrada
+        landed: F. entrega
+        invoiceNumber: Núm. factura
+        supplier: Proveedor
+        booked: Asentado
+        confirmed: Confirmado
+        ordered: Pedida
         tableVisibleColumns:
+            id: Id
+            reference: Referencia
             created: Creación
             supplierFk: Proveedor
             isBooked: Asentado
@@ -386,8 +380,11 @@ entry:
     summary:
         commission: Comisión
         currency: Moneda
+        company: Empresa
+        reference: Referencia
         invoiceNumber: Núm. factura
         ordered: Pedida
+        confirmed: Confirmada
         booked: Contabilizada
         excludedFromAvailable: Inventario
         travelReference: Referencia
@@ -396,108 +393,230 @@ entry:
         travelWarehouseOut: Alm. salida
         travelDelivered: Enviada
         travelLanded: F. entrega
+        travelWarehouseIn: Alm. entrada
         travelReceived: Recibida
         buys: Compras
+        quantity: Cantidad
         stickers: Etiquetas
         package: Embalaje
+        weight: Peso
         packing: Packing
         grouping: Grouping
         buyingValue: Coste
         import: Importe
         pvp: PVP
+        item: Artículo
     basicData:
+        supplier: Proveedor
         travel: Envío
+        reference: Referencia
+        invoiceNumber: Núm. factura
+        company: Empresa
         currency: Moneda
         observation: Observación
         commission: Comisión
+        ordered: Pedida
+        confirmed: Confirmado
         booked: Asentado
         excludedFromAvailable: Inventario
+        agency: Agencia
+        warehouseOut: Alm. salida
+        warehouseIn: Alm. entrada
+        shipped: F. envío
+        landed: F. entrega
+        id: ID
     buys:
+        groupingPrice: Precio grouping
+        packingPrice: Precio packing
+        reference: Referencia
         observations: Observaciónes
+        item: Artículo
+        size: Medida
+        packing: Packing
+        grouping: Grouping
+        buyingValue: Coste
         packagingFk: Embalaje
+        file: Fichero
+        name: Nombre
+        producer: Productor
+        type: Tipo
         color: Color
+        id: ID
         printedStickers: Etiquetas impresas
     notes:
         observationType: Tipo de observación
+    descriptor:
+        agency: Agencia
+        landed: F. entrega
+        warehouseOut: Alm. salida
     latestBuys:
         tableVisibleColumns:
             image: Foto
             itemFk: Id Artículo
+            packing: packing
+            grouping: Grouping
+            quantity: Cantidad
+            size: Medida
+            tags: Etiquetas
+            type: Tipo
+            intrastat: Intrastat
+            origin: Origen
             weightByPiece: Peso (gramos)/tallo
             isActive: Activo
             family: Familia
             entryFk: Entrada
+            buyingValue: Coste
             freightValue: Porte
             comissionValue: Comisión
+            description: Descripción
             packageValue: Embalaje
             isIgnored: Ignorado
             price2: Grouping
             price3: Packing
             minPrice: Min
             ektFk: Ekt
+            weight: Peso
+            packagingFk: Embalaje
             packingOut: Embalaje envíos
             landing: Llegada
             isExcludedFromAvailable: Es inventario
 ticket:
+    pageTitles:
+        tickets: Tickets
+        list: Listado
+        ticketCreate: Nuevo ticket
+        summary: Resumen
+        basicData: Datos básicos
+        boxing: Encajado
+        sms: Sms
+        notes: Notas
+        sale: Lineas del pedido
+        dms: Gestión documental
+        volume: Volumen
+        observation: Notas
+        ticketAdvance: Adelantar tickets
+        futureTickets: Tickets a futuro
+        expedition: Expedición
+        purchaseRequest: Petición de compra
+        weeklyTickets: Tickets programados
+        saleTracking: Líneas preparadas
+        services: Servicios
+        tracking: Estados
+        components: Componentes
+        pictures: Fotos
+        packages: Embalajes
+    list:
+        nickname: Alias
+        state: Estado
+        shipped: Enviado
+        landed: Entregado
+        salesPerson: Comercial
+        total: Total
     card:
+        ticketId: ID ticket
+        state: Estado
         customerId: ID cliente
+        salesPerson: Comercial
+        agency: Agencia
+        shipped: Enviado
+        warehouse: Almacén
         customerCard: Ficha del cliente
+        alias: Alias
         ticketList: Listado de tickets
         newOrder: Nuevo pedido
     boxing:
         expedition: Expedición
+        item: Artículo
         created: Creado
+        worker: Trabajador
         selectTime: 'Seleccionar hora:'
         selectVideo: 'Seleccionar vídeo:'
         notFound: No hay vídeos disponibles
     summary:
+        state: Estado
+        salesPerson: Comercial
+        agency: Agencia
         zone: Zona
+        warehouse: Almacén
         collection: Colección
         route: Ruta
         invoice: Factura
         shipped: Enviado
+        landed: Entregado
         consigneePhone: Tel. consignatario
         consigneeMobile: Móv. consignatario
         consigneeAddress: Dir. consignatario
         clientPhone: Tel. cliente
         clientMobile: Móv. cliente
         consignee: Consignatario
+        subtotal: Subtotal
+        vat: IVA
         total: Total
         saleLines: Líneas del pedido
+        item: Artículo
+        visible: Visible
         available: Disponible
+        quantity: Cantidad
+        price: Precio
         discount: Descuento
         packing: Encajado
         hasComponentLack: Faltan componentes
         itemShortage: No visible
         claim: Reclamación
         reserved: Reservado
+        created: Fecha creación
         package: Embalaje
         taxClass: Tipo IVA
         services: Servicios
         requester: Solicitante
         atender: Comprador
         request: Petición de compra
+        weight: Peso
         goTo: Ir a
         summaryAmount: Resumen
         purchaseRequest: Petición de compra
         service: Servicio
+        description: Descripción
         attender: Consignatario
     create:
+        client: Cliente
         address: Dirección
+        landed: F. entrega
+        warehouse: Almacén
+        agency: Agencia
 invoiceOut:
+    list:
+        ref: Referencia
+        issued: Fecha emisión
+        shortIssued: F. emisión
+        client: Cliente
+        created: Fecha creación
+        shortCreated: F. creación
+        company: Empresa
+        dued: Fecha vencimineto
+        shortDued: F. vencimiento
+        amount: Importe
     card:
         issued: Fecha emisión
+        client: Cliente
+        company: Empresa
         customerCard: Ficha del cliente
         ticketList: Listado de tickets
     summary:
         issued: Fecha
+        created: Fecha creación
         dued: Vencimiento
         booked: Contabilizada
+        company: Empresa
         taxBreakdown: Desglose impositivo
+        type: Tipo
         taxableBase: Base imp.
         rate: Tarifa
         fee: Cuota
         tickets: Tickets
+        ticketId: Id ticket
+        nickname: Alias
+        shipped: F. envío
         totalWithVat: Importe
     globalInvoices:
         errors:
@@ -510,16 +629,21 @@ invoiceOut:
             invoiceWithFutureDate: Existe una factura con una fecha futura
             noTicketsToInvoice: No existen tickets para facturar
             criticalInvoiceError: Error crítico en la facturación proceso detenido
-            invalidSerialTypeForAll: El tipo de serie debe ser global cuando se facturan todos los clientes
         table:
+            client: Cliente
             addressId: Id dirección
             streetAddress: Dirección fiscal
         statusCard:
             percentageText: '{getPercentage}% {getAddressNumber} de {getNAddresses}'
             pdfsNumberText: '{nPdfs} de {totalPdfs} PDFs'
     negativeBases:
+        company: Empresa
+        country: País
         clientId: Id cliente
+        client: Cliente
+        amount: Importe
         base: Base
+        ticketId: Id ticket
         active: Activo
         hasToInvoice: Facturar
         verifiedData: Datos comprobados
@@ -529,24 +653,43 @@ invoiceOut:
 order:
     field:
         salesPersonFk: Comercial
+        clientFk: Cliente
+        isConfirmed: Confirmada
+        created: Creado
+        landed: F. entrega
+        hour: Hora
+        agency: Agencia
+        total: Total
     form:
         clientFk: Cliente
         addressFk: Dirección
+        landed: F. entrega
         agencyModeFk: Agencia
     list:
         newOrder: Nuevo Pedido
     summary:
         basket: Cesta
+        nickname: Alias
+        company: Empresa
+        confirmed: Confirmada
         notConfirmed: No confirmada
         created: Creado
+        landed: F. entrega
+        phone: Teléfono
         createdFrom: Creado desde
         address: Dirección
+        notes: Notas
+        subtotal: Subtotal
         total: Total
         vat: IVA
         state: Estado
         alias: Alias
         items: Artículos
         orderTicketList: Tickets del pedido
+        details: Detalles
+        item: Item
+        quantity: Cantidad
+        price: Precio
         amount: Monto
         confirm: Confirmar
         confirmLines: Confirmar lineas
@@ -556,6 +699,15 @@ shelving:
         priority: Prioridad
         newShelving: Nuevo Carro
     summary:
+        code: Código
+        parking: Parking
+        priority: Prioridad
+        worker: Trabajador
+        recyclable: Reciclable
+    basicData:
+        code: Código
+        parking: Parking
+        priority: Prioridad
         recyclable: Reciclable
 parking:
     pickingOrder: Orden de recogida
@@ -565,8 +717,15 @@ parking:
         info: Puedes buscar por código de parking
         label: Buscar parking...
 department:
+    pageTitles:
+        basicData: Basic data
+        department: Departamentos
+        summary: Resumen
+    name: Nombre
+    code: Código
     chat: Chat
     bossDepartment: Jefe de departamento
+    email: Email
     selfConsumptionCustomer: Cliente autoconsumo
     telework: Teletrabaja
     notifyOnErrors: Notificar errores
@@ -575,15 +734,52 @@ department:
     hasToSendMail: Enviar fichadas por mail
     departmentRemoved: Departamento eliminado
 worker:
+    pageTitles:
+        workers: Trabajadores
+        list: Listado
+        basicData: Datos básicos
+        summary: Resumen
+        notifications: Notificaciones
+        workerCreate: Nuevo trabajador
+        department: Departamentos
+        pda: PDA
+        notes: Notas
+        dms: Mi documentación
+        pbx: Centralita
+        log: Historial
+        calendar: Calendario
+        timeControl: Control de horario
+        locker: Taquilla
+        balance: Balance
+        formation: Formación
+        medical: Mutua
+        operator: Operario
     list:
+        name: Nombre
+        email: Email
+        phone: Teléfono
+        mobile: Móvil
+        active: Activo
         department: Departamento
         schedule: Horario
         newWorker: Nuevo trabajador
+    card:
+        workerId: ID Trabajador
+        user: Usuario
+        name: Nombre
+        email: Correo personal
+        phone: Teléfono
+        mobile: Móvil
+        active: Activo
+        warehouse: Almacén
+        agency: Empresa
+        salesPerson: Comercial
     summary:
+        basicData: Datos básicos
         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
@@ -602,12 +798,19 @@ worker:
         serialNumber: Número de serie
         removePDA: Desasignar PDA
     create:
+        name: Nombre
         lastName: Apellido
         birth: Fecha de nacimiento
         fi: DNI/NIF/NIE
         code: Código de trabajador
+        phone: Teléfono
+        postcode: Código postal
+        province: Provincia
+        city: Población
+        street: Dirección
         webUser: Usuario Web
         personalEmail: Correo personal
+        company: Empresa
         boss: Jefe
         payMethods: Método de pago
         iban: IBAN
@@ -619,13 +822,16 @@ worker:
             endDate: Fecha Fin
             center: Centro Formación
             invoice: Factura
+            amount: Importe
             remark: Bonficado
             hasDiploma: Diploma
     medical:
         tableVisibleColumns:
+            date: Fecha
             time: Hora
             center: Centro de Formación
             invoice: Factura
+            amount: Importe
             isFit: Apto
             remark: Observaciones
     imageNotFound: No se ha encontrado la imagen
@@ -650,7 +856,18 @@ worker:
         machine: Máquina
 
 wagon:
+    pageTitles:
+        wagons: Vagones
+        wagonsList: Listado vagones
+        wagonCreate: Crear tipo
+        wagonEdit: Editar tipo
+        typesList: Listado tipos
+        typeCreate: Crear tipo
+        typeEdit: Editar tipo
+        wagonCounter: Contador de carros
+        wagonTray: Listado bandejas
     type:
+        name: Nombre
         submit: Guardar
         reset: Deshacer cambios
         trayColor: Color de la bandeja
@@ -658,9 +875,13 @@ wagon:
     list:
         plate: Matrícula
         volume: Volumen
+        type: Tipo
         remove: Borrar
         removeItem: Vagón borrado correctamente
     create:
+        plate: Matrícula
+        volume: Volumen
+        type: Tipo
         label: Etiqueta
     warnings:
         noData: Sin datos disponibles
@@ -676,16 +897,26 @@ wagon:
 supplier:
     list:
         payMethod: Método de pago
+        payDeadline: Plazo de pago
+        payDay: Día de pago
         account: Cuenta
         newSupplier: Nuevo proveedor
         tableVisibleColumns:
+            id: Id
+            name: Nombre
             nif: NIF/CIF
+            nickname: Alias
             account: Cuenta
+            payMethod: Método de pago
+            payDay: Dia de pago
+            country: País
     summary:
         responsible: Responsable
+        notes: Notas
         verified: Verificado
         isActive: Está activo
         billingData: Forma de pago
+        payMethod: Método de pago
         payDeadline: Plazo de pago
         payDay: Día de pago
         account: Cuenta
@@ -698,13 +929,17 @@ supplier:
         fiscalAddress: Dirección fiscal
         socialName: Razón social
         taxNumber: NIF/CIF
+        street: Dirección
         city: Población
+        postCode: Código postal
         province: Provincia
+        country: País
     create:
         supplierName: Nombre del proveedor
     basicData:
+        alias: Alias
         workerFk: Responsable
-        isReal: Verificado
+        isSerious: Verificado
         isActive: Activo
         isPayMethodChecked: Método de pago validado
         note: Notas
@@ -717,17 +952,36 @@ supplier:
         sageWithholdingFk: Retención sage
         sageTransactionTypeFk: Tipo de transacción sage
         supplierActivityFk: Actividad proveedor
+        healthRegister: Pasaporte sanitario
+        street: Calle
+        postcode: Código postal
+        city: Población *
+        provinceFk: Provincia
+        country: País
         isTrucker: Transportista
         isVies: Vies
     billingData:
         payMethodFk: Forma de pago
         payDemFk: Plazo de pago
+        payDay: Día de pago
     accounts:
         iban: Iban
         bankEntity: Entidad bancaria
         beneficiary: Beneficiario
     contacts:
+        name: Nombre
+        phone: Teléfono
+        mobile: Móvil
+        email: Email
         observation: Notas
+    addresses:
+        street: Dirección
+        postcode: Código postal
+        phone: Teléfono
+        name: Nombre
+        city: Población
+        province: Provincia
+        mobile: Móvil
     agencyTerms:
         agencyFk: Agencia
         minimumM3: M3 mínimos
@@ -739,16 +993,25 @@ supplier:
         addRow: Añadir fila
     consumption:
         entry: Entrada
+        date: Fecha
+        reference: Referencia
 travel:
     travelList:
         tableVisibleColumns:
+            id: Id
             ref: Referencia
+            agency: Agencia
+            shipped: F.envío
             shipHour: Hora de envío
             landHour: Hora de llegada
+            landed: F.entrega
+            warehouseIn: Alm.salida
+            warehouseOut: Alm.entrada
             totalEntries: ∑
             totalEntriesTooltip: Entradas totales
             daysOnward: Días de llegada en adelante
     summary:
+        confirmed: Confirmado
         entryId: Id entrada
         freight: Porte
         package: Embalaje
@@ -761,89 +1024,62 @@ travel:
         AddEntry: Añadir entrada
         thermographs: Termógrafos
         hb: HB
+    variables:
+        search: Id/Referencia
+        agencyModeFk: Agencia
+        warehouseInFk: Alm. entrada
+        warehouseOutFk: ' Alm. salida'
+        landedFrom: Llegada desde
+        landedTo: Llegada hasta
+        continent: Cont. Salida
+        totalEntries: Ent. totales
     basicData:
-        daysInForward: Desplazamiento automatico (redada)
+        reference: Referencia
-        isRaid: Redada
+        agency: Agencia
+        shipped: F. Envío
+        landed: F. entrega
+        warehouseOut: Alm. salida
+        warehouseIn: Alm. entrada
+        delivered: Enviada
+        received: Recibida
+        daysInForward: Días redada
     thermographs:
+        code: Código
         temperature: Temperatura
+        state: Estado
         destination: Destino
+        created: Fecha creación
         thermograph: Termógrafo
+        reference: Referencia
+        type: Tipo
+        company: Empresa
+        warehouse: Almacén
         travelFileDescription: 'Id envío { travelId }'
-item:
+        file: Fichero
-    descriptor:
-        buyer: Comprador
-        color: Color
-        category: Categoría
-        available: Disponible
-        warehouseText: 'Calculado sobre el almacén de { warehouseName }'
-        itemDiary: Registro de compra-venta
-    list:
-        id: Identificador
-        stems: Tallos
-        category: Reino
-        typeName: Tipo
-        isActive: Activo
-        weightByPiece: Peso (gramos)/tallo
-        userName: Comprador
-        stemMultiplier: Multiplicador
-    fixedPrice:
-        itemFk: ID Artículo
-        groupingPrice: Precio grouping
-        packingPrice: Precio packing
-        hasMinPrice: Tiene precio mínimo
-        minPrice: Precio min
-        started: Inicio
-        ended: Fin
-    create:
-        priority: Prioridad
-    summary:
-        otherData: Otros datos
-        tax: IVA
-        botanical: Botánico
-        barcode: Código de barras
-        completeName: Nombre completo
-        family: Familia
-        stems: Tallos
-        multiplier: Multiplicador
-        buyer: Comprador
-        doPhoto: Hacer foto
-        intrastatCode: Código intrastat
-        ref: Referencia
-        relevance: Relevancia
-        weight: Peso (gramos)/tallo
-        units: Unidades/caja
-        expense: Gasto
-        generic: Genérico
-        recycledPlastic: Plástico reciclado
-        nonRecycledPlastic: Plástico no reciclado
-        minSalesQuantity: Cantidad mínima de venta
-        genus: Genus
-        specie: Specie
-    buyRequest:
-        requester: Solicitante
-        requested: Solicitado
-        attender: Comprador
-        achieved: Conseguido
-        concept: Concepto
 components:
     topbar: {}
     itemsFilterPanel:
         typeFk: Tipo
+        tag: Etiqueta
         value: Valor
         # ItemFixedPriceFilter
         buyerFk: Comprador
+        warehouseFk: Almacén
         started: Desde
         ended: Hasta
         mine: Para mi
         hasMinPrice: Precio mínimo
         # LatestBuysFilter
         salesPersonFk: Comprador
+        supplierFk: Proveedor
         active: Activo
+        visible: Visible
         floramondo: Floramondo
         showBadDates: Ver items a futuro
     userPanel:
         copyToken: Token copiado al portapapeles
         settings: Configuración
+        logOut: Cerrar sesión
         localWarehouse: Almacén local
         localBank: Banco local
         localCompany: Empresa local
@@ -851,6 +1087,7 @@ components:
         userCompany: Empresa del usuario
     smartCard:
         downloadFile: Descargar archivo
+        clone: Clonar
         openCard: Ficha
         openSummary: Detalles
         viewSummary: Vista previa

src/pages/Account/AccountAccounts.vue

@@ -11,13 +11,21 @@ const { t } = useI18n();
 const { notify } = useNotify();
 
 const onSynchronizeAll = async () => {
-    notify(t('Synchronizing in the background'), 'positive');
+    try {
-    await axios.patch(`Accounts/syncAll`);
+        notify(t('Synchronizing in the background'), 'positive');
+        await axios.patch(`Accounts/syncAll`);
+    } catch (error) {
+        console.error('Error synchronizing all accounts', error);
+    }
 };
 
 const onSynchronizeRoles = async () => {
-    await axios.patch(`RoleInherits/sync`);
+    try {
-    notify(t('Roles synchronized!'), 'positive');
+        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,25 +111,29 @@ const columns = computed(() => [
     },
 ]);
 const deleteAcl = async ({ id }) => {
-    await new Promise((resolve) => {
+    try {
-        quasar
+        await new Promise((resolve) => {
-            .dialog({
+            quasar
-                component: VnConfirm,
+                .dialog({
-                componentProps: {
+                    component: VnConfirm,
-                    title: t('Remove ACL'),
+                    componentProps: {
-                    message: t('Do you want to remove this ACL?'),
+                        title: t('Remove ACL'),
-                },
+                        message: t('Do you want to remove this ACL?'),
-            })
+                    },
-            .onOk(() => {
+                })
-                resolve(true);
+                .onOk(() => {
-            })
+                    resolve(true);
-            .onCancel(() => {
+                })
-                resolve(false);
+                .onCancel(() => {
-            });
+                    resolve(false);
-    });
+                });
-    await axios.delete(`ACLs/${id}`);
+        });
-    tableRef.value.reload();
+        await axios.delete(`ACLs/${id}`);
-    notify('ACL removed', 'positive');
+        tableRef.value.reload();
+        notify('ACL removed', 'positive');
+    } catch (error) {
+        console.error('Error deleting Acl: ', error);
+    }
 };
 </script>
 

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 }) => {
-    await axios.post(`${urlPath}/killSession`, { userId, created });
+    try {
-    paginateRef.value.fetch();
+        await axios.post(`${urlPath}/killSession`, { userId, created });
-    notify(t('Session killed'), 'positive');
+        paginateRef.value.fetch();
+        notify(t('Session killed'), 'positive');
+    } catch (error) {
+        console.error('Error killing session', error);
+    }
 };
 </script>
 

src/pages/Account/AccountCreate.vue

@@ -37,7 +37,7 @@ const redirectToAccountBasicData = (_, { id }) => {
             <div class="column q-gutter-sm">
                 <VnInput
                     v-model="data.name"
-                    :label="t('globals.name')"
+                    :label="t('account.create.name')"
                     :rules="validate('VnUser.name')"
                 />
                 <VnInput
@@ -47,12 +47,12 @@ const redirectToAccountBasicData = (_, { id }) => {
                 />
                 <VnInput
                     v-model="data.email"
-                    :label="t('globals.params.email')"
+                    :label="t('account.create.email')"
                     type="email"
                     :rules="validate('VnUser.email')"
                 />
                 <VnSelect
-                    :label="t('account.card.role')"
+                    :label="t('account.create.role')"
                     v-model="data.roleFk"
                     :options="rolesOptions"
                     option-value="id"
@@ -63,7 +63,7 @@ const redirectToAccountBasicData = (_, { id }) => {
                 />
                 <VnInput
                     v-model="data.password"
-                    :label="t('ldap.password')"
+                    :label="t('account.create.password')"
                     type="password"
                     :rules="validate('VnUser.password')"
                 />

src/pages/Account/AccountFilter.vue

@@ -45,7 +45,7 @@ const rolesOptions = ref([]);
             <QItem class="q-my-sm">
                 <QItemSection>
                     <VnInput
-                        :label="t('globals.name')"
+                        :label="t('account.card.name')"
                         v-model="params.name"
                         lazy-rules
                         is-outlined

src/pages/Account/AccountLdap.vue

@@ -40,8 +40,12 @@ const formUrlCreate = ref(null);
 const formUrlUpdate = ref(null);
 const formCustomFn = ref(null);
 const onTestConection = async () => {
-    await axios.get(`LdapConfigs/test`);
+    try {
-    notify(t('LDAP connection established!'), 'positive');
+        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 () => {
-    await axios.delete(URL_UPDATE);
+    try {
-    initialData.value = { ...DEFAULT_DATA };
+        await axios.delete(URL_UPDATE);
-    hasData.value = false;
+        initialData.value = { ...DEFAULT_DATA };
-    notify(t('globals.dataSaved'), 'positive');
+        hasData.value = false;
+        notify(t('globals.dataSaved'), 'positive');
+    } catch (err) {
+        console.error('Error deleting mail forward', err);
+    }
 };
 
 onMounted(async () => await getInitialLdapConfig());
@@ -94,11 +102,11 @@ onMounted(async () => await getInitialLdapConfig());
                 <QBtn
                     class="q-ml-none"
                     color="primary"
-                    :label="t('account.card.testConnection')"
+                    :label="t('ldap.testConnection')"
                     @click="onTestConection()"
                 >
                     <QTooltip>
-                        {{ t('account.card.testConnection') }}
+                        {{ t('ldap.testConnection') }}
                     </QTooltip>
                 </QBtn>
             </template>
@@ -106,7 +114,7 @@ onMounted(async () => await getInitialLdapConfig());
                 <VnRow class="row q-gutter-md">
                     <div class="col">
                         <QCheckbox
-                            :label="t('account.card.enableSync')"
+                            :label="t('ldap.enableSync')"
                             v-model="data.hasData"
                             @update:model-value="($event) => (hasData = $event)"
                             :toggle-indeterminate="false"
@@ -138,7 +146,7 @@ onMounted(async () => await getInitialLdapConfig());
                     />
                     <VnInput :label="t('ldap.userDN')" clearable v-model="data.userDn" />
                     <VnInput
-                        :label="t('account.card.groupDN')"
+                        :label="t('ldap.groupDN')"
                         clearable
                         v-model="data.groupDn"
                     />

src/pages/Account/AccountList.vue

@@ -104,7 +104,7 @@ const exprBuilder = (param, value) => {
 
 <template>
     <VnSearchbar
-        data-key="AccountList"
+        data-key="AccountUsers"
         :expr-builder="exprBuilder"
         :label="t('account.search')"
         :info="t('account.searchInfo')"
@@ -112,12 +112,12 @@ const exprBuilder = (param, value) => {
     />
     <RightMenu>
         <template #right-panel>
-            <AccountFilter data-key="AccountList" />
+            <AccountFilter data-key="AccountUsers" />
         </template>
     </RightMenu>
     <VnTable
         ref="tableRef"
-        data-key="AccountList"
+        data-key="AccountUsers"
         url="VnUsers/preview"
         :filter="filter"
         order="id DESC"

src/pages/Account/AccountSamba.vue

@@ -46,8 +46,12 @@ const formUrlUpdate = ref(null);
 const formCustomFn = ref(null);
 
 const onTestConection = async () => {
-    await axios.get(`SambaConfigs/test`);
+    try {
-    notify(t('Samba connection established!'), 'positive');
+        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 () => {
-    await axios.delete(URL_UPDATE);
+    try {
-    initialData.value = { ...DEFAULT_DATA };
+        await axios.delete(URL_UPDATE);
-    hasData.value = false;
+        initialData.value = { ...DEFAULT_DATA };
-    notify(t('globals.dataSaved'), 'positive');
+        hasData.value = false;
+        notify(t('globals.dataSaved'), 'positive');
+    } catch (err) {
+        console.error('Error deleting mail forward', err);
+    }
 };
 
 onMounted(async () => await getInitialSambaConfig());
@@ -102,12 +110,12 @@ onMounted(async () => await getInitialSambaConfig());
                 <QBtn
                     class="q-ml-none"
                     color="primary"
-                    :label="t('account.card.testConnection')"
+                    :label="t('samba.testConnection')"
                     :disable="formModel.hasChanges"
                     @click="onTestConection()"
                 >
                     <QTooltip>
-                        {{ t('account.card.testConnection') }}
+                        {{ t('samba.testConnection') }}
                     </QTooltip>
                 </QBtn>
             </template>
@@ -115,7 +123,7 @@ onMounted(async () => await getInitialSambaConfig());
                 <VnRow class="row q-gutter-md">
                     <div class="col">
                         <QCheckbox
-                            :label="t('account.card.enableSync')"
+                            :label="t('samba.enableSync')"
                             v-model="data.hasData"
                             @update:model-value="($event) => (hasData = $event)"
                             :toggle-indeterminate="false"

src/pages/Account/Alias/AliasCreateForm.vue

@@ -36,12 +36,15 @@ const onDataSaved = ({ id }) => {
         <template #form-inputs="{ data }">
             <VnRow>
                 <div class="col">
-                    <VnInput v-model="data.alias" :label="t('globals.name')" />
+                    <VnInput v-model="data.alias" :label="t('mailAlias.name')" />
                 </div>
             </VnRow>
             <VnRow>
                 <div class="col">
-                    <VnInput v-model="data.description" :label="t('role.description')" />
+                    <VnInput
+                        v-model="data.description"
+                        :label="t('mailAlias.description')"
+                    />
                 </div>
             </VnRow>
         </template>

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

@@ -11,8 +11,8 @@ const { t } = useI18n();
     <FormModel model="Alias">
         <template #form="{ data }">
             <div class="column q-gutter-y-md">
-                <VnInput v-model="data.alias" :label="t('globals.name')" />
+                <VnInput v-model="data.alias" :label="t('mailAlias.name')" />
-                <VnInput v-model="data.description" :label="t('role.description')" />
+                <VnInput v-model="data.description" :label="t('mailAlias.description')" />
                 <QCheckbox :label="t('mailAlias.isPublic')" v-model="data.isPublic" />
             </div>
         </template>

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

@@ -44,9 +44,13 @@ const removeAlias = () => {
             cancel: true,
         })
         .onOk(async () => {
-            await axios.delete(`MailAliases/${entityId.value}`);
+            try {
-            notify(t('Alias removed'), 'positive');
+                await axios.delete(`MailAliases/${entityId.value}`);
-            router.push({ name: 'AccountAlias' });
+                notify(t('Alias removed'), 'positive');
+                router.push({ name: 'AccountAlias' });
+            } catch (err) {
+                console.error('Error removing alias');
+            }
         });
 };
 </script>
@@ -67,7 +71,7 @@ const removeAlias = () => {
             </QItem>
         </template>
         <template #body="{ entity }">
-            <VnLv :label="t('role.description')" :value="entity.description" />
+            <VnLv :label="t('mailAlias.description')" :value="entity.description" />
         </template>
     </CardDescriptor>
 </template>

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

@@ -42,8 +42,8 @@ const entityId = computed(() => $props.id || route.params.id);
                         <QIcon name="open_in_new" />
                     </router-link>
                 </QCardSection>
-                <VnLv :label="t('role.id')" :value="alias.id" />
+                <VnLv :label="t('mailAlias.id')" :value="alias.id" />
-                <VnLv :label="t('role.description')" :value="alias.description" />
+                <VnLv :label="t('mailAlias.description')" :value="alias.description" />
             </QCard>
         </template>
     </CardSummary>

src/pages/Account/Card/AccountBasicData.vue

@@ -36,7 +36,7 @@ watch(
             <div class="q-gutter-y-sm">
                 <VnInput v-model="data.name" :label="t('account.card.nickname')" />
                 <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('account.card.email')" />
                 <VnSelect
                     url="Languages"
                     v-model="data.lang"

src/pages/Account/Card/AccountDescriptor.vue

@@ -54,7 +54,7 @@ const hasAccount = ref(false);
         </template>
         <template #before>
             <!-- falla id :id="entityId.value" collection="user" size="160x160" -->
-            <VnImg :id="entityId" collection="user" resolution="520x520" class="photo">
+            <VnImg :id="entityId" collection="user" resolution="160x160" class="photo">
                 <template #error>
                     <div
                         class="absolute-full picture text-center q-pa-md flex flex-center"

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 () => {
-    await axios.delete(`MailForwards/${route.params.id}`);
+    try {
-    formData.value.forwardTo = null;
+        await axios.delete(`MailForwards/${route.params.id}`);
-    initialData.value.forwardTo = null;
+        formData.value.forwardTo = null;
-    initialData.value.hasData = hasData.value;
+        initialData.value.forwardTo = null;
-    notify(t('globals.dataSaved'), 'positive');
+        initialData.value.hasData = hasData.value;
+        notify(t('globals.dataSaved'), 'positive');
+    } catch (err) {
+        console.error('Error deleting mail forward', err);
+    }
 };
 
 const updateMailForward = async () => {
-    await axios.patch('MailForwards', formData.value);
+    try {
-    initialData.value = { ...formData.value };
+        await axios.patch('MailForwards', formData.value);
-    initialData.value.hasData = hasData.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/Role/AccountRoles.vue

@@ -82,14 +82,14 @@ const exprBuilder = (param, value) => {
 
 <template>
     <VnSearchbar
-        data-key="AccountRolesList"
+        data-key="Roles"
         :expr-builder="exprBuilder"
         :label="t('role.searchRoles')"
         :info="t('role.searchInfo')"
     />
     <VnTable
         ref="tableRef"
-        data-key="AccountRolesList"
+        data-key="Roles"
         :url="`VnRoles`"
         :create="{
             urlCreate: 'VnRoles',

src/pages/Account/Role/AccountRolesFilter.vue

@@ -29,7 +29,7 @@ const props = defineProps({
             <QItem class="q-my-sm">
                 <QItemSection>
                     <VnInput
-                        :label="t('globals.name')"
+                        :label="t('role.name')"
                         v-model="params.name"
                         lazy-rules
                         is-outlined

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

@@ -12,12 +12,15 @@ const { t } = useI18n();
         <template #form="{ data }">
             <VnRow>
                 <div class="col">
-                    <VnInput v-model="data.name" :label="t('globals.name')" />
+                    <VnInput v-model="data.name" :label="t('role.card.name')" />
                 </div>
             </VnRow>
             <VnRow>
                 <div class="col">
-                    <VnInput v-model="data.description" :label="t('role.description')" />
+                    <VnInput
+                        v-model="data.description"
+                        :label="t('role.card.description')"
+                    />
                 </div>
             </VnRow>
         </template>

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

@@ -9,7 +9,7 @@ const { t } = useI18n();
     <VnCard
         data-key="Role"
         :descriptor="RoleDescriptor"
-        search-data-key="AccountRolesList"
+        search-data-key="AccountRoles"
         :searchbar-props="{
             url: 'VnRoles',
             label: t('role.searchRoles'),

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

@@ -32,8 +32,12 @@ const filter = {
     where: { id: entityId },
 };
 const removeRole = async () => {
-    await axios.delete(`VnRoles/${entityId.value}`);
+    try {
-    notify(t('Role removed'), 'positive');
+        await axios.delete(`VnRoles/${entityId.value}`);
+        notify(t('Role removed'), 'positive');
+    } catch (error) {
+        console.error('Error deleting role', error);
+    }
 };
 </script>
 
@@ -54,7 +58,7 @@ const removeRole = async () => {
             </QItem>
         </template>
         <template #body="{ entity }">
-            <VnLv :label="t('role.description')" :value="entity.description" />
+            <VnLv :label="t('role.card.description')" :value="entity.description" />
         </template>
     </CardDescriptor>
 </template>

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

@@ -22,12 +22,15 @@ const { t } = useI18n();
         <template #form-inputs="{ data }">
             <VnRow>
                 <div class="col">
-                    <VnInput v-model="data.name" :label="t('globals.name')" />
+                    <VnInput v-model="data.name" :label="t('role.card.name')" />
                 </div>
             </VnRow>
             <VnRow>
                 <div class="col">
-                    <VnInput v-model="data.description" :label="t('role.description')" />
+                    <VnInput
+                        v-model="data.description"
+                        :label="t('role.card.description')"
+                    />
                 </div>
             </VnRow>
         </template>

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

@@ -44,9 +44,9 @@ const filter = {
                         <QIcon name="open_in_new" />
                     </a>
                 </QCardSection>
-                <VnLv :label="t('role.id')" :value="role.id" />
+                <VnLv :label="t('role.card.id')" :value="role.id" />
-                <VnLv :label="t('globals.name')" :value="role.name" />
+                <VnLv :label="t('role.card.name')" :value="role.name" />
-                <VnLv :label="t('role.description')" :value="role.description" />
+                <VnLv :label="t('role.card.description')" :value="role.description" />
             </QCard>
         </template>
     </CardSummary>

src/pages/Account/locale/en.yml

@@ -1,15 +1,32 @@
 account:
+    pageTitles:
+        users: Users
+        list: Users
+        roles: Roles
+        alias: Mail aliasses
+        accounts: Accounts
+        ldap: LDAP
+        samba: Samba
+        acls: ACLs
+        connections: Connections
+        inheritedRoles: Inherited Roles
+        subRoles: Sub Roles
+        newRole: New role
+        privileges: Privileges
+        mailAlias: Mail Alias
+        mailForwarding: Mail Forwarding
+        accountCreate: New user
+        aliasUsers: Users
     card:
+        name: Name
         nickname: User
         role: Role
+        email: Email
         alias: Alias
         lang: Language
         roleFk: Role
         newUser: New user
         ticketTracking: Ticket tracking
-        enableSync: Habilitar sincronización
-        groupDN: DN grupos
-        testConnection: Probar conexión
         privileges:
             delegate: Can delegate privileges
         enabled: Account enabled!
@@ -57,7 +74,11 @@ account:
     search: Search user
     searchInfo: You can search by id, name or nickname
     create:
+        name: Name
         nickname: Nickname
+        email: Email
+        role: Role
+        password: Password
         active: Active
     mailForwarding:
         forwardingMail: Forward email
@@ -65,30 +86,50 @@ account:
         enableMailForwarding: Enable mail forwarding
         mailInputInfo: All emails will be forwarded to the specified address.
 role:
+    pageTitles:
+        inheritedRoles: Inherited Roles
+        subRoles: Sub Roles
+    card:
+        description: Description
+        id: Id
+        name: Name
     newRole: New role
     searchRoles: Search role
     searchInfo: Search role by id or name
+    name: Name
     description: Description
     id: Id
 mailAlias:
+    pageTitles:
+        aliasUsers: Users
     search: Search mail alias
     searchInfo: Search alias by id or name
+    alias: Alias
+    description: Description
+    id: Id
     newAlias: New alias
+    name: Name
     isPublic: Public
 ldap:
+    enableSync: Enable synchronization
     server: Server
     rdn: RDN
     userDN: User DN
     filter: Filter
+    groupDN: Group DN
+    testConnection: Test connection
     success: LDAP connection established!
     password: Password
 samba:
+    enableSync: Enable synchronization
     domainController: Domain controller
     domainAD: AD domain
     userAD: AD user
+    groupDN: Group DN
     passwordAD: AD password
     domainPart: User DN (without domain part)
     verifyCertificate: Verify certificate
+    testConnection: Test connection
     success: Samba connection established!
 accounts:
     homedir: Homedir base
@@ -106,6 +147,8 @@ connections:
     created: Created
     killSession: Kill session
 acls:
+    role: Role
+    accessType: Access type
     permissions: Permission
     search: Search acls
     searchInfo: Search acls by model name

src/pages/Account/locale/es.yml

@@ -1,7 +1,27 @@
 account:
+    pageTitles:
+        users: Usuarios
+        list: Usuarios
+        roles: Roles
+        alias: Alias de correo
+        accounts: Cuentas
+        ldap: LDAP
+        samba: Samba
+        acls: ACLs
+        connections: Conexiones
+        inheritedRoles: Roles heredados
+        newRole: Nuevo rol
+        subRoles: Subroles
+        privileges: Privilegios
+        mailAlias: Alias de correo
+        mailForwarding: Reenvío de correo
+        accountCreate: Nuevo usuario
+        aliasUsers: Usuarios
     card:
         nickname: Usuario
+        name: Nombre
         role: Rol
+        email: Mail
         alias: Alias
         lang: Idioma
         roleFk: Rol
@@ -13,9 +33,6 @@ account:
         deactivated: ¡Usuario desactivado!
         newUser: Nuevo usuario
         twoFactor: Doble factor
-        enableSync: Habilitar sincronización
-        groupDN: DN grupos
-        testConnection: Probar conexión
         privileges:
             delegate: Puede delegar privilegios
         actions:
@@ -56,7 +73,11 @@ account:
     search: Buscar usuario
     searchInfo: Puedes buscar por id, nombre o usuario
     create:
+        name: Nombre
         nickname: Nombre mostrado
+        email: Email
+        role: Rol
+        password: Contraseña
         active: Activo
     mailForwarding:
         forwardingMail: Dirección de reenvío
@@ -64,30 +85,51 @@ account:
         enableMailForwarding: Habilitar redirección de correo
         mailInputInfo: Todos los correos serán reenviados a la dirección especificada, no se mantendrá copia de los mismos en el buzón del usuario.
 role:
+    pageTitles:
+        inheritedRoles: Roles heredados
+        subRoles: Subroles
+        newRole: Nuevo rol
+    card:
+        description: Descripción
+        id: Id
+        name: Nombre
     newRole: Nuevo rol
     searchRoles: Buscar roles
     searchInfo: Buscar rol por id o nombre
+    name: Nombre
     description: Descripción
     id: Id
 mailAlias:
+    pageTitles:
+        aliasUsers: Usuarios
     search: Buscar alias de correo
     searchInfo: Buscar alias por id o nombre
+    alias: Alias
+    description: Descripción
+    id: Id
     newAlias: Nuevo alias
+    name: Nombre
     isPublic: Público
 ldap:
     password: Contraseña
+    enableSync: Habilitar sincronización
     server: Servidor
     rdn: RDN
     userDN: DN usuarios
     filter: Filtro
+    groupDN: DN grupos
+    testConnection: Probar conexión
     success: ¡Conexión con LDAP establecida!
 samba:
+    enableSync: Habilitar sincronización
     domainController: Controlador de dominio
     domainAD: Dominio AD
+    groupDN: DN grupos
     userAD: Usuario AD
     passwordAD: Contraseña AD
     domainPart: DN usuarios (sin la parte del dominio)
     verifyCertificate: Verificar certificado
+    testConnection: Probar conexión
     success: ¡Conexión con Samba establecida!
 accounts:
     homedir: Directorio base para carpetas de usuario
@@ -105,6 +147,8 @@ connections:
     created: Creado
     killSession: Matar sesión
 acls:
+    role: Rol
+    accessType: Tipo de acceso
     permissions: Permiso
     search: Buscar acls
     searchInfo: Buscar acls por nombre

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/ClaimFilter.vue

@@ -23,7 +23,7 @@ defineExpose({ states });
 
 <template>
     <FetchData url="ClaimStates" @on-fetch="(data) => (states = data)" auto-load />
-    <VnFilterPanel :data-key="props.dataKey" :search-button="true">
+    <VnFilterPanel :data-key="props.dataKey" :search-button="true" search-url="table">
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">
                 <strong>{{ t(`params.${tag.label}`) }}: </strong>

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 :url="`Clients/${route.params.id}`" auto-load model="customer">
-        :url="`Clients/${route.params.id}`"
-        auto-load
-        model="customer"
-        :mapper="onBeforeSave"
-    >
         <template #form="{ data, validate }">
             <VnRow>
                 <VnInput
@@ -68,7 +55,7 @@ function onBeforeSave(formData, originalData) {
                 />
                 <VnSelect
                     :input-debounce="0"
-                    :label="t('customer.summary.businessType')"
+                    :label="t('customer.basicData.businessType')"
                     :options="businessTypes"
                     :rules="validate('client.businessTypeFk')"
                     emit-value
@@ -80,13 +67,13 @@ function onBeforeSave(formData, originalData) {
             </VnRow>
             <VnRow>
                 <VnInput
-                    :label="t('customer.summary.contact')"
+                    :label="t('customer.basicData.contact')"
                     :rules="validate('client.contact')"
                     clearable
                     v-model="data.contact"
                 />
                 <VnInput
-                    :label="t('globals.params.email')"
+                    :label="t('customer.basicData.email')"
                     :rules="validate('client.email')"
                     clearable
                     type="email"
@@ -103,14 +90,13 @@ function onBeforeSave(formData, originalData) {
             </VnRow>
             <VnRow>
                 <VnInput
-                    :label="t('customer.extendedList.tableVisibleColumns.phone')"
+                    :label="t('customer.basicData.phone')"
                     :rules="validate('client.phone')"
                     clearable
                     v-model="data.phone"
-                    data-cy="customerPhone"
                 />
                 <VnInput
-                    :label="t('customer.summary.mobile')"
+                    :label="t('customer.basicData.mobile')"
                     :rules="validate('client.mobile')"
                     clearable
                     v-model="data.mobile"
@@ -120,7 +106,7 @@ function onBeforeSave(formData, originalData) {
                 <VnSelect
                     url="Workers/search"
                     v-model="data.salesPersonFk"
-                    :label="t('customer.summary.salesPerson')"
+                    :label="t('customer.basicData.salesPerson')"
                     :params="{
                         departmentCodes: ['VT', 'shopping'],
                     }"
@@ -158,7 +144,7 @@ function onBeforeSave(formData, originalData) {
                     option-value="id"
                     option-label="name"
                     emit-value
-                    :label="t('customer.summary.contactChannel')"
+                    :label="t('customer.basicData.contactChannel')"
                     map-options
                     :rules="validate('client.contactChannelFk')"
                     :input-debounce="0"
@@ -169,6 +155,7 @@ function onBeforeSave(formData, originalData) {
                     url="Clients"
                     :input-debounce="0"
                     :label="t('customer.basicData.previousClient')"
+                    :options="clients"
                     :rules="validate('client.transferorFk')"
                     emit-value
                     map-options

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/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

@@ -36,13 +36,7 @@ const entityId = computed(() => {
 });
 
 const data = ref(useCardDescription());
-const setData = (entity) => {
+const setData = (entity) => (data.value = useCardDescription(entity?.name, entity?.id));
-    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';
-});
 </script>
 
 <template>
@@ -59,17 +53,11 @@ const debtWarning = computed(() => {
             <CustomerDescriptorMenu :customer="entity" />
         </template>
         <template #body="{ entity }">
-            <VnLv
+            <VnLv :label="t('customer.card.payMethod')" :value="entity.payMethod.name" />
-                :label="t('customer.summary.payMethod')"
-                :value="entity.payMethod.name"
-            />
 
+            <VnLv :label="t('customer.card.credit')" :value="toCurrency(entity.credit)" />
             <VnLv
-                :label="t('customer.summary.credit')"
+                :label="t('customer.card.securedCredit')"
-                :value="toCurrency(entity.credit)"
-            />
-            <VnLv
-                :label="t('customer.summary.securedCredit')"
                 :value="toCurrency(entity.creditInsurance)"
             />
 
@@ -78,7 +66,7 @@ const debtWarning = computed(() => {
                 :value="toCurrency(entity.debt)"
                 :info="t('customer.summary.riskInfo')"
             />
-            <VnLv :label="t('customer.summary.salesPerson')">
+            <VnLv :label="t('customer.card.salesPerson')">
                 <template #value>
                     <VnUserLink
                         v-if="entity.salesPersonUser"
@@ -89,7 +77,7 @@ const debtWarning = computed(() => {
                 </template>
             </VnLv>
             <VnLv
-                :label="t('customer.extendedList.tableVisibleColumns.businessTypeFk')"
+                :label="t('customer.card.businessTypeFk')"
                 :value="entity.businessType.description"
             />
         </template>
@@ -123,7 +111,7 @@ const debtWarning = computed(() => {
                     v-if="customer.debt > customer.credit"
                     name="vn:risk"
                     size="xs"
-                    :color="debtWarning"
+                    color="primary"
                 >
                     <QTooltip>{{ t('customer.card.hasDebt') }}</QTooltip>
                 </QIcon>
@@ -180,6 +168,23 @@ const debtWarning = computed(() => {
                 >
                     <QTooltip>{{ t('Customer ticket list') }}</QTooltip>
                 </QBtn>
+                <QBtn
+                    :to="{
+                        name: 'TicketList',
+                        query: {
+                            table: JSON.stringify({
+                                clientFk: entity.id,
+                            }),
+                            createForm: JSON.stringify({ clientId: entity.id }),
+                        },
+                    }"
+                    size="md"
+                    color="primary"
+                    target="_blank"
+                    icon="vn:ticketAdd"
+                >
+                    <QTooltip>{{ t('New ticket') }}</QTooltip>
+                </QBtn>
                 <QBtn
                     :to="{
                         name: 'InvoiceOutList',
@@ -191,6 +196,23 @@ const debtWarning = computed(() => {
                 >
                     <QTooltip>{{ t('Customer invoice out list') }}</QTooltip>
                 </QBtn>
+                <QBtn
+                    :to="{
+                        name: 'OrderList',
+                        query: {
+                            table: JSON.stringify({
+                                clientFk: entity.id,
+                            }),
+                            createForm: JSON.stringify({ clientFk: entity.id }),
+                        },
+                    }"
+                    size="md"
+                    target="_blank"
+                    icon="vn:basketadd"
+                    color="primary"
+                >
+                    <QTooltip>{{ t('New order') }}</QTooltip>
+                </QBtn>
                 <QBtn
                     :to="{
                         name: 'AccountSummary',

src/pages/Customer/Card/CustomerDescriptorMenu.vue

@@ -6,8 +6,8 @@ import axios from 'axios';
 import { useQuasar } from 'quasar';
 
 import useNotify from 'src/composables/useNotify';
+
 import VnSmsDialog from 'src/components/common/VnSmsDialog.vue';
-import useOpenURL from 'src/composables/useOpenURL';
 
 const $props = defineProps({
     customer: {
@@ -15,6 +15,7 @@ const $props = defineProps({
         required: true,
     },
 });
+
 const { notify } = useNotify();
 const { t } = useI18n();
 const quasar = useQuasar();
@@ -24,7 +25,7 @@ const showSmsDialog = () => {
     quasar.dialog({
         component: VnSmsDialog,
         componentProps: {
-            phone: $props.customer.mobile || $props.customer.phone,
+            phone: $props.customer.phone || $props.customer.mobile,
             promise: sendSms,
         },
     });
@@ -39,42 +40,9 @@ const sendSms = async (payload) => {
         notify(error.message, 'positive');
     }
 };
-
-const openCreateForm = (type) => {
-    const query = {
-        table: {
-            clientFk: $props.customer.id,
-        },
-        createForm: {
-            addressId: $props.customer.defaultAddressFk,
-        },
-    };
-    const clientFk = {
-        ticket: 'clientId',
-        order: 'clientFk',
-    };
-    const key = clientFk[type];
-    if (!key) return;
-    query.createForm[key] = $props.customer.id;
-
-    const params = Object.entries(query)
-        .map(([key, value]) => `${key}=${JSON.stringify(value)}`)
-        .join('&');
-    useOpenURL(`/#/${type}/list?${params}`);
-};
 </script>
 
 <template>
-    <QItem v-ripple clickable @click="openCreateForm('ticket')">
-        <QItemSection>
-            {{ t('globals.pageTitles.createTicket') }}
-        </QItemSection>
-    </QItem>
-    <QItem v-ripple clickable @click="openCreateForm('order')">
-        <QItemSection>
-            {{ t('globals.pageTitles.createOrder') }}
-        </QItemSection>
-    </QItem>
     <QItem v-ripple clickable>
         <QItemSection @click="showSmsDialog()">{{ t('Send SMS') }}</QItemSection>
     </QItem>

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"
     >
@@ -67,7 +68,6 @@ function handleLocation(data, location) {
                     option-label="vat"
                     option-value="id"
                     v-model="data.sageTaxTypeFk"
-                    data-cy="sageTaxTypeFk"
                     :required="data.isTaxDataChecked"
                 />
                 <VnSelect
@@ -76,7 +76,6 @@ function handleLocation(data, location) {
                     hide-selected
                     option-label="transaction"
                     option-value="id"
-                    data-cy="sageTransactionTypeFk"
                     v-model="data.sageTransactionTypeFk"
                     :required="data.isTaxDataChecked"
                 >

src/pages/Customer/Card/CustomerSummary.vue

@@ -4,7 +4,7 @@ import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import VnUserLink from 'src/components/ui/VnUserLink.vue';
 
-import { toCurrency, toPercentage, toDate, dashOrCurrency } from 'src/filters';
+import { toCurrency, toPercentage, toDate } from 'src/filters';
 import CardSummary from 'components/ui/CardSummary.vue';
 import { getUrl } from 'src/composables/getUrl';
 import VnLv from 'src/components/ui/VnLv.vue';
@@ -27,16 +27,21 @@ const $props = defineProps({
 const entityId = computed(() => $props.id || route.params.id);
 const customer = computed(() => summary.value.entity);
 const summary = ref();
-const defaulterAmount = computed(() => customer.value.defaulters[0]?.amount);
+const clientUrl = ref();
-const balanceDue = computed(() => {
+
-    const amount = defaulterAmount.value;
+onMounted(async () => {
-    if (!amount || amount < 0) {
+    clientUrl.value = (await getUrl('client/')) + entityId.value + '/';
-        return null;
-    }
-    return amount;
 });
 
-const balanceDueWarning = computed(() => (defaulterAmount.value ? 'negative' : ''));
+const balanceDue = computed(() => {
+    return (
+        customer.value &&
+        customer.value.defaulters.length &&
+        customer.value.defaulters[0].amount
+    );
+});
+
+const balanceDueWarning = computed(() => (balanceDue.value ? 'negative' : ''));
 
 const claimRate = computed(() => {
     return customer.value.claimsRatio?.claimingRate ?? 0;
@@ -82,7 +87,7 @@ const sumRisk = ({ clientRisks }) => {
                 <VnLv :label="t('customer.summary.contact')" :value="entity.contact" />
                 <VnLv :value="entity.phone">
                     <template #label>
-                        {{ t('customer.extendedList.tableVisibleColumns.phone') }}
+                        {{ t('customer.summary.phone') }}
                         <VnLinkPhone :phone-number="entity.phone" />
                     </template>
                 </VnLv>
@@ -90,18 +95,11 @@ const sumRisk = ({ clientRisks }) => {
                     <template #label>
                         {{ t('customer.summary.mobile') }}
                         <VnLinkPhone :phone-number="entity.mobile" />
-                        <VnLinkPhone
-                            say-simple
-                            :phone-number="entity.mobile"
-                            :channel="entity.country?.saySimpleCountry?.channel"
-                            class="q-ml-xs"
-                            :country="entity.country?.code"
-                        />
                     </template>
                 </VnLv>
                 <VnLv :value="entity.email" copy
                     ><template #label>
-                        {{ t('globals.params.email') }}
+                        {{ t('customer.summary.email') }}
                         <VnLinkMail email="entity.email"></VnLinkMail> </template
                 ></VnLv>
                 <VnLv
@@ -144,7 +142,7 @@ const sumRisk = ({ clientRisks }) => {
                 <VnLv
                     v-if="entity.country"
                     :label="t('customer.summary.country')"
-                    :value="entity.country.name"
+                    :value="entity.country.country"
                 />
                 <VnLv :label="t('customer.summary.street')" :value="entity.street" />
             </QCard>
@@ -215,7 +213,7 @@ const sumRisk = ({ clientRisks }) => {
                     :value="entity.defaultAddress.city"
                 />
                 <VnLv
-                    :label="t('customer.summary.street')"
+                    :label="t('customer.summary.addressStreet')"
                     :value="entity.defaultAddress.street"
                 />
             </QCard>
@@ -301,7 +299,7 @@ const sumRisk = ({ clientRisks }) => {
                 <VnLv
                     v-if="entity.defaulters"
                     :label="t('customer.summary.balanceDue')"
-                    :value="dashOrCurrency(balanceDue)()"
+                    :value="toCurrency(balanceDue)"
                     :class="balanceDueWarning"
                     :info="t('customer.summary.balanceDueInfo')"
                 />
@@ -321,7 +319,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,165 @@
 <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 axios from 'axios';
-import VnRow from 'components/ui/VnRow.vue';
+import useNotify from 'src/composables/useNotify';
-const formModelRef = ref(false);
+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>
+            />
-        <FormModel
+            <QBtn
-            v-if="'unpaid' in initialData"
+                :disabled="!hasChanged"
-            :observe-form-changes="false"
+                :label="t('globals.save')"
-            ref="formModelRef"
+                :loading="isLoading"
-            model="unpaid"
+                @click="onSubmit"
-            url-update="ClientUnpaids"
+                color="primary"
-            :mapper="(formData) => ({ ...formData, clientFk: route.params.id })"
+                icon="save"
-            :form-initial-data="initialData"
+            />
-        >
+        </QBtnGroup>
-            <template #form="{ data }">
+    </Teleport>
+
+    <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>
-    </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,14 +42,14 @@ 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.account.name" />
+            <VnInput :label="t('User')" clearable v-model="data.name" />
             <VnInput
                 :label="t('Recovery email')"
                 :rules="validate('client.email')"
                 clearable
                 type="email"
-                v-model="data.account.email"
+                v-model="data.email"
                 class="q-mt-sm"
                 :info="t('This email is used for user to regain access their account')"
             />

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,45 +89,72 @@ 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"
+        <QPage class="card-width q-pa-lg">
-        :filter="filter"
+            <QTable
-        @on-fetch="(data) => (rows = data)"
+                :columns="columns"
-        auto-load
+                :pagination="{ rowsPerPage: 12 }"
-        url="Clients/transactions"
+                :rows="rows"
-    />
+                class="full-width q-mt-md"
-    <QPage class="card-width q-pa-lg">
+                row-key="id"
-        <QTable
+                v-if="rows?.length"
-            :columns="columns"
+            >
-            :pagination="{ rowsPerPage: 12 }"
+                <template #body-cell="props">
-            :rows="rows"
+                    <QTd :props="props">
-            class="full-width q-mt-md"
+                        <QTr :props="props">
-            row-key="id"
+                            <component
-            v-if="rows?.length"
+                                :is="tableColumnComponents[props.col.name].component"
-        >
+                                @click="
-            <template #body-cell="props">
+                                    tableColumnComponents[props.col.name].event(props)
-                <QTd :props="props">
+                                "
-                    <QTr :props="props">
+                                class="rounded-borders q-pa-sm"
-                        <component
+                                v-bind="
-                            :is="tableColumnComponents[props.col.name].component"
+                                    tableColumnComponents[props.col.name].props(props)
-                            @click="tableColumnComponents[props.col.name].event(props)"
+                                "
-                            class="rounded-borders q-pa-sm"
+                            >
-                            v-bind="tableColumnComponents[props.col.name].props(props)"
+                                {{ props.value }}
-                        >
+                            </component>
-                            {{ props.value }}
+                        </QTr>
-                        </component>
+                    </QTd>
-                    </QTr>
+                </template>
-                </QTd>
+            </QTable>
-            </template>
-        </QTable>
 
-        <h5 class="flex justify-center color-vn-label" v-else>
+            <h5 class="flex justify-center color-vn-label" v-else>
-            {{ t('globals.noResults') }}
+                {{ t('globals.noResults') }}
-        </h5>
+            </h5>
-    </QPage>
+        </QPage>
+    </div>
 </template>
 
 <i18n>

src/pages/Customer/CustomerFilter.vue

@@ -11,24 +11,10 @@ defineProps({
         required: true,
     },
 });
-const handleSalesModelValue = (val) => ({
-    or: [
-        { id: val },
-        { name: val },
-        { nickname: { like: '%' + val + '%' } },
-        { code: { like: `${val}%` } },
-    ],
-});
-
-const exprBuilder = (param, value) => {
-    return {
-        and: [{ active: { neq: false } }, handleSalesModelValue(value)],
-    };
-};
 </script>
 
 <template>
-    <VnFilterPanel :data-key="dataKey" :search-button="true">
+    <VnFilterPanel :data-key="dataKey" :search-button="true" search-url="table">
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">
                 <strong>{{ t(`params.${tag.label}`) }}: </strong>
@@ -48,7 +34,7 @@ const exprBuilder = (param, value) => {
             <QItem class="q-mb-sm">
                 <QItemSection>
                     <VnInput
-                        :label="t('globals.name')"
+                        :label="t('customerFilter.filter.name')"
                         v-model="params.name"
                         is-outlined
                     />
@@ -57,7 +43,7 @@ const exprBuilder = (param, value) => {
             <QItem class="q-mb-sm">
                 <QItemSection>
                     <VnInput
-                        :label="t('customer.summary.socialName')"
+                        :label="t('customerFilter.filter.socialName')"
                         v-model="params.socialName"
                         is-outlined
                     />
@@ -66,18 +52,14 @@ const exprBuilder = (param, value) => {
             <QItem class="q-mb-sm">
                 <QItemSection>
                     <VnSelect
-                        url="Workers/search"
+                        url="Workers/activeWithInheritedRole"
-                        :params="{
+                        :filter="{ where: { role: 'salesPerson' } }"
-                            departmentCodes: ['VT'],
-                        }"
                         auto-load
                         :label="t('Salesperson')"
-                        :expr-builder="exprBuilder"
                         v-model="params.salesPersonFk"
                         @update:model-value="searchFn()"
                         option-value="id"
                         option-label="name"
-                        sort-by="nickname ASC"
                         emit-value
                         map-options
                         use-input
@@ -86,23 +68,12 @@ const exprBuilder = (param, value) => {
                         outlined
                         rounded
                         :input-debounce="0"
-                    >
+                    />
-                        <template #option="{ itemProps, opt }">
-                            <QItem v-bind="itemProps">
-                                <QItemSection>
-                                    <QItemLabel>{{ opt.name }}</QItemLabel>
-                                    <QItemLabel caption>
-                                        {{ opt.nickname }},{{ opt.code }}
-                                    </QItemLabel>
-                                </QItemSection>
-                            </QItem>
-                        </template></VnSelect
-                    >
                 </QItemSection>
             </QItem>
             <QItem class="q-mb-sm">
-                <QItemSection>
+                <QItemSection
-                    <VnSelect
+                    ><VnSelect
                         url="Provinces"
                         :label="t('Province')"
                         v-model="params.provinceFk"
@@ -120,31 +91,32 @@ 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 />
-                <QItemSection>
+            <QExpansionItem :label="t('More options')" expand-separator>
-                    <VnInput :label="t('Phone')" v-model="params.phone" is-outlined>
+                <QItem>
-                        <template #prepend>
+                    <QItemSection>
-                            <QIcon name="phone" size="xs" />
+                        <VnInput :label="t('Phone')" v-model="params.phone" is-outlined>
-                        </template>
+                            <template #prepend>
-                    </VnInput>
+                                <QIcon name="phone" size="xs" />
-                </QItemSection>
+                            </template>
-            </QItem>
+                        </VnInput>
-            <QItem class="q-mb-sm">
+                    </QItemSection>
-                <QItemSection>
+                </QItem>
-                    <VnInput :label="t('Email')" v-model="params.email" is-outlined>
+                <QItem>
-                        <template #prepend>
+                    <QItemSection>
-                            <QIcon name="email" size="sm" />
+                        <VnInput :label="t('Email')" v-model="params.email" is-outlined>
-                        </template>
+                            <template #prepend>
-                    </VnInput>
+                                <QIcon name="email" size="sm" />
-                </QItemSection>
+                            </template>
-            </QItem>
+                        </VnInput>
-            <QItem class="q-mb-sm">
+                    </QItemSection>
-                <QItemSection>
+                </QItem>
+                <QItem>
                     <VnSelect
                         url="Zones"
                         :label="t('Zone')"
@@ -159,17 +131,18 @@ const exprBuilder = (param, value) => {
                         outlined
                         rounded
                         auto-load
-                /></QItemSection>
-            </QItem>
-            <QItem class="q-mb-sm">
-                <QItemSection>
-                    <VnInput
-                        :label="t('Postcode')"
-                        v-model="params.postcode"
-                        is-outlined
                     />
-                </QItemSection>
+                </QItem>
-            </QItem>
+                <QItem>
+                    <QItemSection>
+                        <VnInput
+                            :label="t('Postcode')"
+                            v-model="params.postcode"
+                            is-outlined
+                        />
+                    </QItemSection>
+                </QItem>
+            </QExpansionItem>
         </template>
     </VnFilterPanel>
 </template>
@@ -201,6 +174,7 @@ es:
     Salesperson: Comercial
     Province: Provincia
     City: Ciudad
+    More options: Más opciones
     Phone: Teléfono
     Email: Email
     Zone: Zona

src/pages/Customer/CustomerList.vue

@@ -12,7 +12,6 @@ import RightMenu from 'src/components/common/RightMenu.vue';
 import VnLinkPhone from 'src/components/ui/VnLinkPhone.vue';
 import { toDate } from 'src/filters';
 import CustomerFilter from './CustomerFilter.vue';
-import VnAvatar from 'src/components/ui/VnAvatar.vue';
 
 const { t } = useI18n();
 const router = useRouter();
@@ -78,7 +77,7 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        label: t('customer.summary.credit'),
+        label: t('customer.extendedList.tableVisibleColumns.credit'),
         name: 'credit',
         columnFilter: {
             component: 'number',
@@ -116,7 +115,7 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        label: t('customer.summary.mobile'),
+        label: t('customer.extendedList.tableVisibleColumns.mobile'),
         name: 'mobile',
         cardVisible: true,
         columnFilter: {
@@ -163,17 +162,17 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        label: t('customer.summary.city'),
+        label: t('customer.extendedList.tableVisibleColumns.city'),
         name: 'city',
     },
     {
         align: 'left',
-        label: t('customer.summary.postcode'),
+        label: t('customer.extendedList.tableVisibleColumns.postcode'),
         name: 'postcode',
     },
     {
         align: 'left',
-        label: t('globals.params.email'),
+        label: t('customer.extendedList.tableVisibleColumns.email'),
         name: 'email',
         cardVisible: true,
     },
@@ -208,7 +207,7 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        label: t('customer.summary.payMethodFk'),
+        label: t('customer.extendedList.tableVisibleColumns.payMethodFk'),
         name: 'payMethodFk',
         columnFilter: {
             component: 'select',
@@ -251,7 +250,7 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        label: t('customer.summary.isActive'),
+        label: t('customer.extendedList.tableVisibleColumns.isActive'),
         name: 'isActive',
         chip: {
             color: null,
@@ -280,7 +279,7 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        label: t('customer.summary.isEqualizated'),
+        label: t('customer.extendedList.tableVisibleColumns.isEqualizated'),
         name: 'isEqualizated',
         create: true,
         columnFilter: {
@@ -326,7 +325,7 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        label: t('customer.summary.hasLcr'),
+        label: t('customer.extendedList.tableVisibleColumns.hasLcr'),
         name: 'hasLcr',
         columnFilter: {
             inWhere: true,
@@ -334,7 +333,7 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        label: t('customer.summary.hasCoreVnl'),
+        label: t('customer.extendedList.tableVisibleColumns.hasCoreVnl'),
         name: 'hasCoreVnl',
         columnFilter: {
             inWhere: true,
@@ -395,16 +394,16 @@ function handleLocation(data, location) {
     <VnSearchbar
         :info="t('You can search by customer id or name')"
         :label="t('Search customer')"
-        data-key="CustomerList"
+        data-key="Customer"
     />
     <RightMenu>
         <template #right-panel>
-            <CustomerFilter data-key="CustomerList" />
+            <CustomerFilter data-key="Customer" />
         </template>
     </RightMenu>
     <VnTable
         ref="tableRef"
-        data-key="CustomerList"
+        data-key="Customer"
         url="Clients/filter"
         :create="{
             urlCreate: 'Clients/createWithUser',
@@ -425,7 +424,7 @@ function handleLocation(data, location) {
             <VnSelect
                 url="Workers/search"
                 v-model="data.salesPersonFk"
-                :label="t('customer.summary.salesPerson')"
+                :label="t('customer.basicData.salesPerson')"
                 :params="{
                     departmentCodes: ['VT', 'shopping'],
                 }"

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';
@@ -18,10 +19,26 @@ const router = useRouter();
 
 const formInitialData = reactive({ isDefaultAddress: false });
 
+const urlCreate = ref('');
+
 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',
@@ -37,19 +54,9 @@ function handleLocation(data, location) {
     data.provinceFk = provinceFk;
     data.countryFk = countryFk;
 }
-
-function onAgentCreated({ id, fiscalName }, data) {
-    customsAgents.value.push({ id, fiscalName });
-    data.customsAgentFk = id;
-}
 </script>
 
 <template>
-    <FetchData
-        @on-fetch="(data) => (customsAgents = data)"
-        auto-load
-        url="CustomsAgents"
-    />
     <FetchData
         @on-fetch="(data) => (agencyModes = data)"
         auto-load
@@ -60,7 +67,7 @@ function onAgentCreated({ id, fiscalName }, data) {
     <FormModel
         :form-initial-data="formInitialData"
         :observe-form-changes="false"
-        :url-create="`Clients/${route.params.id}/createAddress`"
+        :url-create="urlCreate"
         @on-data-saved="toCustomerAddress()"
         model="client"
     >
@@ -132,7 +139,6 @@ function onAgentCreated({ id, fiscalName }, data) {
                 />
 
                 <VnSelectDialog
-                    url="CustomsAgents"
                     :label="t('Customs agent')"
                     :options="customsAgents"
                     hide-selected
@@ -142,11 +148,7 @@ function onAgentCreated({ id, fiscalName }, 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>