Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7529-workerPIT

CHANGELOG.md

@@ -1,3 +1,184 @@
+# Version 24.38 - 2024-09-17
+
+### Added 🆕
+
+-   chore: refs #6772 fix e2e (origin/6772-warmfix-fixE2e) by:jorgep
+-   chore: refs #7323 worker changes by:jorgep
+-   chore: refs #7353 fix warnings by:jorgep
+-   chore: refs #7353 use Vue component nomenclature by:jorgep
+-   chore: refs #7356 fix type by:jorgep
+-   feat(AccountConnections): use VnToken by:alexm
+-   feat: add key to routerView by:Javier Segarra
+-   feat: add plus shortcut in VnTable by:Javier Segarra
+-   feat: add row by:Javier Segarra
+-   feat: addRow withour dialog by:Javier Segarra
+-   feat: apply mixin by:Javier Segarra
+-   feat by:Javier Segarra
+-   feat: change navBar buttons by:Javier Segarra
+-   feat: dense rows by:Javier Segarra
+-   feat: fields with wrong name by:jgallego
+-   feat: fix bugs and filters by:Javier Segarra
+-   feat: fix refund parameters by:jgallego
+-   feat: handle create row by:Javier Segarra
+-   feat: handle dates by:Javier Segarra
+-   feat: handle qCheckbox 3rd state by:Javier Segarra
+-   feat: imrpove VnInputTime to set cursor at start by:Javier Segarra
+-   feat: keyShortcut directive by:Javier Segarra
+-   feat: minor fixes by:jgallego
+-   feat: only filter by isDestiny by:Javier Segarra
+-   feat: refs #211153 businessDataLinkGrafana by:robert
+-   feat: refs #7129 add km start and end on create form by:pablone
+-   feat: refs #7353 add filter & fix customTags by:jorgep
+-   feat: refs #7353 add locale by:jorgep
+-   feat: refs #7353 add no one opt by:jorgep
+-   feat: refs #7353 add right icons by:jorgep
+-   feat: refs #7353 imporve toDateFormat by:jorgep
+-   feat: refs #7353 salesPerson nickname & id by:jorgep
+-   feat: refs #7353 split sections by:jorgep
+-   feat: refs #7847 remove reload btn by:jorgep
+-   feat: refs #7847 remove reload fn by:jorgep
+-   feat: refs #7889 added shortcuts to modules by:Jon
+-   feat: refs #7911 added shortcut to modules by:Jon
+-   feat: refuncInvoiceForm component by:jgallego
+-   feat: remove duplicity by:Javier Segarra
+-   feat: remove future itemFixedPrices by:Javier Segarra
+-   feat: replace stickyButtons by subtoolbar by:Javier Segarra
+-   feat: required validation by:Javier Segarra
+-   feat: show bad dates by:Javier Segarra
+-   feat: showdate icons by:Javier Segarra
+-   feat: solve ItemFixedFilterPanel by:Javier Segarra
+-   feat: transfer an invoice by:jgallego
+-   feat: try to fix ItemFixedFilterPanel by:Javier Segarra
+-   feat: unnecessary changes by:Javier Segarra
+-   feat: update changelog (origin/7896_down_devToTest_2436) by:Javier Segarra
+-   feat: updates by:Javier Segarra
+-   feat: update version and changelog by:Javier Segarra
+-   feat: vnInput\* by:Javier Segarra
+-   feat: with VnTable by:Javier Segarra
+-   refs #6772 feat: fix approach by:Javier Segarra
+-   refs #6772 feat: refresh shelving.basic-data by:Javier Segarra
+-   style: show subName value by:Javier Segarra
+
+### Changed 📦
+
+-   perf: add v-shortcut in VnCard by:Javier Segarra
+-   perf: approach by:Javier Segarra
+-   perf: change directive location by:Javier Segarra
+-   perf: change slots order by:Javier Segarra
+-   perf: examples by:Javier Segarra
+-   perf: hide icon for VnInputDate by:Javier Segarra
+-   perf: improve ItemFixedPricefilterPanel by:Javier Segarra
+-   perf: improve mainShrotcutMixin by:Javier Segarra
+-   perf: minor clean code by:Javier Segarra
+-   perf: onRowchange by:Javier Segarra
+-   perf: order by by:Javier Segarra
+-   perf: order components by:Javier Segarra
+-   perf: refs #7889 perf shortcut test by:Jon
+-   perf: remove console.log by:Javier Segarra
+-   perf: remove icons in header slot by:Javier Segarra
+-   perf: remove print variables by:Javier Segarra
+-   perf: restore CustomerBasicData by:Javier Segarra
+-   refactor: deleted useless prop by:Jon
+-   refactor: deleted useless prop in FetchedTags by:Jon
+-   refactor: refs #7323 drop useless code by:jorgep
+-   refactor: refs #7353 clients correction by:jorgep
+-   refactor: refs #7353 clients correction wip by:jorgep
+-   refactor: refs #7353 ease logic by:jorgep
+-   refactor: refs #7353 order correction by:jorgep
+-   refactor: refs #7353 simplify code by:jorgep
+-   refactor: refs #7353 tickets correction by:jorgep
+-   refactor: refs #7353 use global locales by:jorgep
+-   refactor: refs #7354 changed descriptor menu options by:Jon
+-   refactor: refs #7354 changed icon color in table and notification when deleting a zone by:Jon
+-   refactor: refs #7354 fix tableFilters by:Jon
+-   refactor: refs #7354 modified VnInputTime by:Jon
+-   refactor: refs #7354 refactor deliveryPanel by:Jon
+-   refactor: refs #7354 refactor zones section and fixed e2e tests by:Jon
+-   refactor: refs #7354 requested changes by:Jon
+-   refactor: refs #7354 reverse deliveryPanel changes by:Jon
+-   refactor: refs #7354 Zone migration changes by:Jon
+-   refactor: refs #7889 deleted subtitle attr and use keyBinding instead by:Jon
+-   refactor: refs #7889 modified shortcut and dashboard, and added tootlip in LeftMenu by:Jon
+-   refs #6722 perf: not fetch when id not exists by:Javier Segarra
+-   refs #6772 perf: change variable name by:JAVIER SEGARRA MARTINEZ
+-   refs #6772 perf: use ArrayData (6772_reload_sections) by:Javier Segarra
+-   refs #7283 refactor fix ItemDescriptor by:carlossa
+-   refs #7283 refactor ItexDescriptor by:carlossa
+
+### Fixed 🛠️
+
+-   chore: refs #6772 fix e2e (origin/6772-warmfix-fixE2e) by:jorgep
+-   chore: refs #7353 fix warnings by:jorgep
+-   chore: refs #7356 fix type by:jorgep
+-   feat: fix bugs and filters by:Javier Segarra
+-   feat: fix refund parameters by:jgallego
+-   feat: minor fixes by:jgallego
+-   feat: refs #7353 add filter & fix customTags by:jorgep
+-   feat: try to fix ItemFixedFilterPanel by:Javier Segarra
+-   fix: add border-top by:Javier Segarra
+-   fix: added missing descriptors and small details by:Jon
+-   fix branch by:carlossa
+-   fix: call upsert when crudModel haschanges by:Javier Segarra
+-   fix(ClaimList): fix summary by:alexm
+-   fix: cli warnings by:Javier Segarra
+-   fix: editTableOptions by:Javier Segarra
+-   fix events and descriptor menu by:Jon
+-   fix: InvoiceIn sections (origin/6772_reload_sections) by:Javier Segarra
+-   fix: minor changes by:Javier Segarra
+-   fix: minor error whit dates by:Javier Segarra
+-   fix: module icon by:Javier Segarra
+-   fix: options QDate by:Javier Segarra
+-   fix: refs #6900 e2e error by:jorgep
+-   fix: refs #6900 rollback by:jorgep
+-   fix: refs #7353 css by:jorgep
+-   fix: refs #7353 hide search param (origin/7353-warmfix-fixSearchbar) by:jorgep
+-   fix: refs #7353 iron out filter by:jorgep
+-   fix: refs #7353 iron out ticket table by:jorgep
+-   fix: refs #7353 padding by:jorgep
+-   fix: refs #7353 salesClientTable by:jorgep
+-   fix: refs #7353 salesorderTable by:jorgep
+-   fix: refs #7353 saleTicketMonitors by:jorgep
+-   fix: refs #7353 use same datakey by:jorgep
+-   fix: refs #7353 vnTable colors by:jorgep
+-   fix: refs #7354 e2e tests by:Jon
+-   fix: refs #7354 fix delivery days by:Jon
+-   fix: refs #7354 fix list searchbar and filters by:Jon
+-   fix: refs #7354 fix VnSearchbar search for zone section & finished basic tests by:Jon
+-   fix: refs #7354 fix VnTable filters and agency field by:Jon
+-   fix: refs #7354 fix zoneSearchbar by:Jon
+-   fix: refs #7354 requested changes by:Jon
+-   fix: refs #7356 colors by:jorgep
+-   fix: refs #7356 create claim dialog by:jorgep
+-   fix: refs #7889 fixed shortcut test by:Jon
+-   fix: refs #7903 fixed ticket's search bar and keybinding tooltip by:Jon
+-   fix: refs #7911 fixed shortcut and related files by:Jon
+-   fix: remove condition duplicated by:Javier Segarra
+-   fix: remove property by:Javier Segarra
+-   fix tootltip by:carlossa
+-   fix traduction by:carlossa
+-   fix(VnSectionMain): add QPage by:alexm
+-   fix(zone): zoneLocation and the others searchbar by:alexm
+-   refactor: refs #7354 fix tableFilters by:Jon
+-   refactor: refs #7354 refactor zones section and fixed e2e tests by:Jon
+-   refs #6772 feat: fix approach by:Javier Segarra
+-   refs #6772 fix: claimPhoto reload by:Javier Segarra
+-   refs #6896 fix searchbar by:carlossa
+-   refs #6897 fix entry by:carlossa
+-   refs #6899 fix invoiceFix by:carlossa
+-   refs #6899 fix order by:carlossa
+-   refs #7283 fix by:carlossa
+-   refs #7283 fix ItemDescriptor warehouse by:carlossa
+-   refs #7283 refactor fix ItemDescriptor by:carlossa
+-   refs #7355 #7366 fix account, summary, list, travelList, tooltip by:carlossa
+-   refs #7355 fix accountPrivileges by:carlossa
+-   refs #7355 fix accounts, vnTable by:carlossa
+-   refs #7355 fix privileges by:carlossa
+-   refs #7355 fix roles filters by:carlossa
+-   refs #7355 fix total by:carlossa
+-   refs #7355 fix views summarys, entryList, travelList refact by:carlossa
+-   refs #7366 fix travel hours by:carlossa
+-   test: fix e2e by:Javier Segarra
+
 # Version 24.36 - 2024-08-27
 
 ### Added 🆕

package.json

@@ -1,6 +1,6 @@
 {
     "name": "salix-front",
-    "version": "24.40.0",
+    "version": "24.42.0",
     "description": "Salix frontend",
     "productName": "Salix",
     "author": "Verdnatura",
@@ -62,4 +62,4 @@
         "vite": "^5.1.4",
         "vitest": "^0.31.1"
     }
-}
+}

src/boot/quasar.js

@@ -2,9 +2,15 @@ import { boot } from 'quasar/wrappers';
 import qFormMixin from './qformMixin';
 import mainShortcutMixin from './mainShortcutMixin';
 import keyShortcut from './keyShortcut';
+import useNotify from 'src/composables/useNotify.js';
+const { notify } = useNotify();
 
 export default boot(({ app }) => {
     app.mixin(qFormMixin);
     app.mixin(mainShortcutMixin);
     app.directive('shortcut', keyShortcut);
+    app.config.errorHandler = function (err) {
+        console.error(err);
+        notify('globals.error', 'negative', 'error');
+    };
 });

src/components/CreateBankEntityForm.vue

@@ -21,7 +21,7 @@ const customer = computed(() => state.get('customer'));
 const bankEntityFormData = reactive({
     name: null,
     bic: null,
-    countryFk: customer.value.countryFk,
+    countryFk: customer.value?.countryFk,
     id: null,
 });
 

src/components/CreateNewCityForm.vue

@@ -1,35 +1,42 @@
 <script setup>
-import { reactive, ref } from 'vue';
+import { onMounted, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 
-import FetchData from 'components/FetchData.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnSelectProvince from 'components/VnSelectProvince.vue';
 import VnInput from 'components/common/VnInput.vue';
 import FormModelPopup from './FormModelPopup.vue';
 
 const emit = defineEmits(['onDataSaved']);
-
+const $props = defineProps({
+    countryFk: {
+        type: Number,
+        default: null,
+    },
+    provinceSelected: {
+        type: Number,
+        default: null,
+    },
+    provinces: {
+        type: Array,
+        default: () => [],
+    },
+});
 const { t } = useI18n();
 
-const cityFormData = reactive({
+const cityFormData = ref({
     name: null,
     provinceFk: null,
 });
-
+onMounted(() => {
-const provincesOptions = ref([]);
+    cityFormData.value.provinceFk = $props.provinceSelected;
-
+});
 const onDataSaved = (...args) => {
     emit('onDataSaved', ...args);
 };
 </script>
 
 <template>
-    <FetchData
-        @on-fetch="(data) => (provincesOptions = data)"
-        auto-load
-        url="Provinces"
-    />
     <FormModelPopup
         :title="t('New city')"
         :subtitle="t('Please, ensure you put the correct data!')"
@@ -41,11 +48,16 @@ const onDataSaved = (...args) => {
         <template #form-inputs="{ data, validate }">
             <VnRow>
                 <VnInput
-                    :label="t('Name')"
+                    :label="t('Names')"
                     v-model="data.name"
                     :rules="validate('city.name')"
                 />
-                <VnSelectProvince v-model="data.provinceFk" />
+                <VnSelectProvince
+                    :province-selected="$props.provinceSelected"
+                    :country-fk="$props.countryFk"
+                    v-model="data.provinceFk"
+                    :provinces="$props.provinces"
+                />
             </VnRow>
         </template>
     </FormModelPopup>

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';
@@ -22,9 +22,11 @@ const postcodeFormData = reactive({
     townFk: null,
 });
 
+const townsFetchDataRef = ref(null);
 const provincesFetchDataRef = ref(null);
 const countriesOptions = ref([]);
 const provincesOptions = ref([]);
+const townsOptions = ref([]);
 const town = ref({});
 
 function onDataSaved(formData) {
@@ -61,26 +63,78 @@ function setTown(newTown, data) {
 }
 
 async function setProvince(id, data) {
-    await provincesFetchDataRef.value.fetch();
     const newProvince = provincesOptions.value.find((province) => province.id == id);
     if (!newProvince) return;
 
     data.countryFk = newProvince.countryFk;
 }
+
+async function onProvinceCreated(data) {
+    await provincesFetchDataRef.value.fetch({
+        where: { countryFk: postcodeFormData.countryFk },
+    });
+    postcodeFormData.provinceFk.value = data.id;
+}
+
+watch(
+    () => [postcodeFormData.countryFk],
+    async (newCountryFk, oldValueFk) => {
+        if (!!oldValueFk[0] && newCountryFk[0] !== oldValueFk[0]) {
+            postcodeFormData.provinceFk = null;
+            postcodeFormData.townFk = null;
+        }
+        if ((newCountryFk, newCountryFk !== postcodeFormData.countryFk)) {
+            await provincesFetchDataRef.value.fetch({
+                where: {
+                    countryFk: newCountryFk[0],
+                },
+            });
+            await townsFetchDataRef.value.fetch({
+                where: {
+                    provinceFk: {
+                        inq: provincesOptions.value.map(({ id }) => id),
+                    },
+                },
+            });
+        }
+    }
+);
+
+watch(
+    () => postcodeFormData.provinceFk,
+    async (newProvinceFk) => {
+        if (newProvinceFk[0] && newProvinceFk[0] !== postcodeFormData.provinceFk) {
+            await townsFetchDataRef.value.fetch({
+                where: { provinceFk: newProvinceFk[0] },
+            });
+        }
+    }
+);
+async function handleProvinces(data) {
+    provincesOptions.value = data;
+}
+async function handleTowns(data) {
+    townsOptions.value = data;
+}
+async function handleCountries(data) {
+    countriesOptions.value = data;
+}
 </script>
 
 <template>
     <FetchData
         ref="provincesFetchDataRef"
-        @on-fetch="(data) => (provincesOptions = data)"
+        @on-fetch="handleProvinces"
         auto-load
         url="Provinces/location"
     />
     <FetchData
-        @on-fetch="(data) => (countriesOptions = data)"
+        ref="townsFetchDataRef"
+        @on-fetch="handleTowns"
         auto-load
-        url="Countries"
+        url="Towns/location"
     />
+    <FetchData @on-fetch="handleCountries" auto-load url="Countries" />
     <FormModelPopup
         url-create="postcodes"
         model="postcode"
@@ -96,18 +150,20 @@ async function setProvince(id, data) {
                     :label="t('Postcode')"
                     v-model="data.code"
                     :rules="validate('postcode.code')"
+                    clearable
                 />
                 <VnSelectDialog
                     :label="t('City')"
-                    url="Towns/location"
                     @update:model-value="(value) => setTown(value, data)"
+                    :tooltip="t('Create city')"
                     v-model="data.townFk"
+                    :options="townsOptions"
                     option-label="name"
                     option-value="id"
                     :rules="validate('postcode.city')"
                     :acls="[{ model: 'Town', props: '*', accessType: 'WRITE' }]"
                     :emit-value="false"
-                    clearable
+                    :clearable="true"
                 >
                     <template #option="{ itemProps, opt }">
                         <QItem v-bind="itemProps">
@@ -122,6 +178,9 @@ async function setProvince(id, data) {
                     </template>
                     <template #form>
                         <CreateNewCityForm
+                            :country-fk="data.countryFk"
+                            :province-selected="data.provinceFk"
+                            :provinces="provincesOptions"
                             @on-data-saved="
                                 (_, requestResponse) =>
                                     onCityCreated(requestResponse, data)
@@ -132,8 +191,13 @@ async function setProvince(id, data) {
             </VnRow>
             <VnRow>
                 <VnSelectProvince
+                    :country-fk="data.countryFk"
+                    :province-selected="data.provinceFk"
                     @update:model-value="(value) => setProvince(value, data)"
                     v-model="data.provinceFk"
+                    :clearable="true"
+                    :provinces="provincesOptions"
+                    @on-province-created="onProvinceCreated"
                 />
                 <VnSelect
                     :label="t('Country')"
@@ -152,6 +216,7 @@ async function setProvince(id, data) {
 <i18n>
 es:
     New postcode: Nuevo código postal
+    Create city: Crear población
     Please, ensure you put the correct data!: ¡Por favor, asegúrese de poner los datos correctos!
     City: Población
     Province: Provincia

src/components/CreateNewProvinceForm.vue

@@ -16,7 +16,16 @@ const provinceFormData = reactive({
     name: null,
     autonomyFk: null,
 });
-
+const $props = defineProps({
+    countryFk: {
+        type: Number,
+        default: null,
+    },
+    provinces: {
+        type: Array,
+        default: () => [],
+    },
+});
 const autonomiesOptions = ref([]);
 
 const onDataSaved = (dataSaved, requestResponse) => {
@@ -31,6 +40,11 @@ const onDataSaved = (dataSaved, requestResponse) => {
     <FetchData
         @on-fetch="(data) => (autonomiesOptions = data)"
         auto-load
+        :filter="{
+            where: {
+                countryFk: $props.countryFk,
+            },
+        }"
         url="Autonomies/location"
     />
     <FormModelPopup

src/components/CreateThermographForm.vue

@@ -50,7 +50,7 @@ const onDataSaved = (dataSaved) => {
         model="thermograph"
         :title="t('New thermograph')"
         :form-initial-data="thermographFormData"
-        @on-data-saved="onDataSaved($event)"
+        @on-data-saved="(_, response) => onDataSaved(response)"
     >
         <template #form-inputs="{ data, validate }">
             <VnRow>

src/components/CrudModel.vue

@@ -234,6 +234,8 @@ async function remove(data) {
                 newData = newData.filter((form) => !ids.some((id) => id == form[pk]));
                 fetch(newData);
             });
+    } else {
+        reset();
     }
     emit('update:selected', []);
 }

src/components/ItemsFilterPanel.vue

@@ -297,11 +297,12 @@ const removeTag = (index, params, search) => {
                 />
             </QItem>
             <QItem class="q-mt-lg">
-                <QIcon
+                <QBtn
-                    name="add_circle"
+                    icon="add_circle"
+                    shortcut="+"
+                    flat
                     class="fill-icon-on-hover q-px-xs"
                     color="primary"
-                    size="sm"
                     @click="tagValues.push({})"
                 />
             </QItem>

src/components/LeftMenuItem.vue

@@ -44,7 +44,6 @@ const itemComputed = computed(() => {
         </QItemSection>
     </QItem>
 </template>
-
 <style lang="scss" scoped>
 .q-item {
     min-height: 5vh;

src/components/RefundInvoiceForm.vue

@@ -24,9 +24,9 @@ const { notify } = useNotify();
 
 const rectificativeTypeOptions = ref([]);
 const siiTypeInvoiceOutsOptions = ref([]);
-const inheritWarehouse = ref(true);
 const invoiceParams = reactive({
     id: $props.invoiceOutData?.id,
+    inheritWarehouse: true,
 });
 const invoiceCorrectionTypesOptions = ref([]);
 
@@ -138,7 +138,7 @@ const refund = async () => {
                     <div>
                         <QCheckbox
                             :label="t('Inherit warehouse')"
-                            v-model="inheritWarehouse"
+                            v-model="invoiceParams.inheritWarehouse"
                         />
                         <QIcon name="info" class="cursor-info q-ml-sm" size="sm">
                             <QTooltip>{{ t('Inherit warehouse tooltip') }}</QTooltip>

src/components/UserPanel.vue

@@ -13,12 +13,14 @@ import FetchData from 'components/FetchData.vue';
 import { useClipboard } from 'src/composables/useClipboard';
 import { useRole } from 'src/composables/useRole';
 import VnAvatar from './ui/VnAvatar.vue';
+import useNotify from 'src/composables/useNotify';
 
 const state = useState();
 const session = useSession();
 const router = useRouter();
 const { t, locale } = useI18n();
 const { copyText } = useClipboard();
+const { notify } = useNotify();
 
 const userLocale = computed({
     get() {
@@ -53,6 +55,7 @@ const user = state.getUser();
 const warehousesData = ref();
 const companiesData = ref();
 const accountBankData = ref();
+const isEmployee = computed(() => useRole().isEmployee());
 
 onMounted(async () => {
     updatePreferences();
@@ -70,18 +73,28 @@ function updatePreferences() {
 
 async function saveDarkMode(value) {
     const query = `/UserConfigs/${user.value.id}`;
-    await axios.patch(query, {
+    try {
-        darkMode: value,
+        await axios.patch(query, {
-    });
+            darkMode: value,
-    user.value.darkMode = value;
+        });
+        user.value.darkMode = value;
+        onDataSaved();
+    } catch (error) {
+        onDataError();
+    }
 }
 
 async function saveLanguage(value) {
     const query = `/VnUsers/${user.value.id}`;
-    await axios.patch(query, {
+    try {
-        lang: value,
+        await axios.patch(query, {
-    });
+            lang: value,
-    user.value.lang = value;
+        });
+        user.value.lang = value;
+        onDataSaved();
+    } catch (error) {
+        onDataError();
+    }
 }
 
 function logout() {
@@ -97,11 +110,23 @@ function localUserData() {
     state.setUser(user.value);
 }
 
-function saveUserData(param, value) {
+async function saveUserData(param, value) {
-    axios.post('UserConfigs/setUserConfig', { [param]: value });
+    try {
-    localUserData();
+        await axios.post('UserConfigs/setUserConfig', { [param]: value });
+        localUserData();
+        onDataSaved();
+    } catch (error) {
+        onDataError();
+    }
 }
-const isEmployee = computed(() => useRole().isEmployee());
+
+const onDataSaved = () => {
+    notify('globals.dataSaved', 'positive');
+};
+
+const onDataError = () => {
+    notify('errors.updateUserConfig', 'negative');
+};
 </script>
 
 <template>

src/components/VnSelectProvince.vue

@@ -8,33 +8,55 @@ import FetchData from 'components/FetchData.vue';
 import CreateNewProvinceForm from './CreateNewProvinceForm.vue';
 
 const emit = defineEmits(['onProvinceCreated']);
-const provinceFk = defineModel({ type: Number });
+const $props = defineProps({
-watch(provinceFk, async () => await provincesFetchDataRef.value.fetch());
+    countryFk: {
+        type: Number,
+        default: null,
+    },
+    provinceSelected: {
+        type: Number,
+        default: null,
+    },
+    provinces: {
+        type: Array,
+        default: () => [],
+    },
+});
+const provinceFk = defineModel({ type: Number, default: null });
 
 const { validate } = useValidator();
 const { t } = useI18n();
 
-const provincesOptions = ref();
+const provincesOptions = ref($props.provinces);
+provinceFk.value = $props.provinceSelected;
 const provincesFetchDataRef = ref();
 
 async function onProvinceCreated(_, data) {
-    await provincesFetchDataRef.value.fetch();
+    await provincesFetchDataRef.value.fetch({ where: { countryFk: $props.countryFk } });
     provinceFk.value = data.id;
     emit('onProvinceCreated', data);
 }
+async function handleProvinces(data) {
+    provincesOptions.value = data;
+}
 </script>
 
 <template>
     <FetchData
         ref="provincesFetchDataRef"
-        :filter="{ include: { relation: 'country' } }"
+        :filter="{
-        @on-fetch="(data) => (provincesOptions = data)"
+            include: { relation: 'country' },
-        auto-load
+            where: {
+                countryFk: $props.countryFk,
+            },
+        }"
+        @on-fetch="handleProvinces"
         url="Provinces"
     />
     <VnSelectDialog
         :label="t('Province')"
-        :options="provincesOptions"
+        :options="$props.provinces"
+        :tooltip="t('Create province')"
         hide-selected
         v-model="provinceFk"
         :rules="validate && validate('postcode.provinceFk')"
@@ -49,11 +71,15 @@ async function onProvinceCreated(_, data) {
             </QItem>
         </template>
         <template #form>
-            <CreateNewProvinceForm @on-data-saved="onProvinceCreated" />
+            <CreateNewProvinceForm
+                :country-fk="$props.countryFk"
+                @on-data-saved="onProvinceCreated"
+            />
         </template>
     </VnSelectDialog>
 </template>
 <i18n>
     es:
         Province: Provincia
+        Create province: Crear provincia
 </i18n>

src/components/VnTable/VnFilter.vue

@@ -10,8 +10,6 @@ import VnInputDate from 'components/common/VnInputDate.vue';
 import VnInputTime from 'components/common/VnInputTime.vue';
 import VnTableColumn from 'components/VnTable/VnColumn.vue';
 
-defineExpose({ addFilter });
-
 const $props = defineProps({
     column: {
         type: Object,
@@ -30,6 +28,9 @@ const $props = defineProps({
         default: 'params',
     },
 });
+
+defineExpose({ addFilter, props: $props });
+
 const model = defineModel(undefined, { required: true });
 const arrayData = useArrayData($props.dataKey, { searchUrl: $props.searchUrl });
 const columnFilter = computed(() => $props.column?.columnFilter);
@@ -115,11 +116,11 @@ const components = {
     rawSelect: selectComponent,
 };
 
-async function addFilter(value) {
+async function addFilter(value, name) {
     value ??= undefined;
     if (value && typeof value === 'object') value = model.value;
     value = value === '' ? undefined : value;
-    let field = columnFilter.value?.name ?? $props.column.name;
+    let field = columnFilter.value?.name ?? $props.column.name ?? name;
 
     if (columnFilter.value?.inWhere) {
         if (columnFilter.value.alias) field = columnFilter.value.alias + '.' + field;

src/components/VnTable/VnTable.vue

@@ -10,7 +10,7 @@ import FormModelPopup from 'components/FormModelPopup.vue';
 
 import VnFilterPanel from 'components/ui/VnFilterPanel.vue';
 import VnTableColumn from 'components/VnTable/VnColumn.vue';
-import VnTableFilter from 'components/VnTable/VnFilter.vue';
+import VnFilter from 'components/VnTable/VnFilter.vue';
 import VnTableChip from 'components/VnTable/VnChip.vue';
 import VnVisibleColumn from 'src/components/VnTable/VnVisibleColumn.vue';
 import VnLv from 'components/ui/VnLv.vue';
@@ -53,6 +53,10 @@ const $props = defineProps({
         type: Boolean,
         default: true,
     },
+    bottom: {
+        type: Object,
+        default: null,
+    },
     cardClass: {
         type: String,
         default: 'flex-one',
@@ -69,10 +73,6 @@ const $props = defineProps({
         type: Boolean,
         default: false,
     },
-    disableInfiniteScroll: {
-        type: Boolean,
-        default: false,
-    },
     hasSubToolbar: {
         type: Boolean,
         default: null,
@@ -101,10 +101,18 @@ const $props = defineProps({
         type: String,
         default: '90vh',
     },
+    chipLocale: {
+        type: String,
+        default: null,
+    },
     footer: {
         type: Boolean,
         default: false,
     },
+    disabledAttr: {
+        type: Boolean,
+        default: false,
+    },
 });
 const { t } = useI18n();
 const stateStore = useStateStore();
@@ -125,6 +133,7 @@ const showForm = ref(false);
 const splittedColumns = ref({ columns: [] });
 const columnsVisibilitySkipped = ref();
 const createForm = ref();
+const tableFilterRef = ref([]);
 
 const tableModes = [
     {
@@ -150,7 +159,7 @@ onMounted(() => {
         quasar.platform.is.mobile && !$props.disableOption?.card
             ? CARD_MODE
             : $props.defaultMode;
-    stateStore.rightDrawer = true;
+    stateStore.rightDrawer = quasar.screen.gt.xs;
     columnsVisibilitySkipped.value = [
         ...splittedColumns.value.columns
             .filter((c) => c.visible == false)
@@ -227,7 +236,7 @@ function splitColumns(columns) {
         if (col.cardVisible) splittedColumns.value.cardVisible.push(col);
         if ($props.isEditable && col.disable == null) col.disable = false;
         if ($props.useModel && col.columnFilter != false)
-            col.columnFilter = { ...col.columnFilter, inWhere: true };
+            col.columnFilter = { inWhere: true, ...col.columnFilter };
         splittedColumns.value.columns.push(col);
     }
     // Status column
@@ -305,10 +314,11 @@ defineExpose({
     redirect: redirectFn,
     selected,
     CrudModelRef,
+    params,
 });
 
-function handleOnDataSaved(_) {
+function handleOnDataSaved(_, res) {
-    if (_.onDataSaved) _.onDataSaved(this);
+    if (_.onDataSaved) _.onDataSaved({ CrudModelRef: CrudModelRef.value });
     else $props.create.onDataSaved(_);
 }
 </script>
@@ -328,6 +338,13 @@ function handleOnDataSaved(_) {
                 :search-url="searchUrl"
                 :redirect="!!redirect"
                 @set-user-params="setUserParams"
+                :disable-submit-event="true"
+                @remove="
+                    (key) =>
+                        tableFilterRef
+                            .find((f) => f.props?.column.name == key)
+                            ?.addFilter()
+                "
             >
                 <template #body>
                     <div
@@ -337,7 +354,8 @@ function handleOnDataSaved(_) {
                         )"
                         :key="col.id"
                     >
-                        <VnTableFilter
+                        <VnFilter
+                            ref="tableFilterRef"
                             :column="col"
                             :data-key="$attrs['data-key']"
                             v-model="params[columnName(col)]"
@@ -361,10 +379,15 @@ function handleOnDataSaved(_) {
                         :columns="splittedColumns.columns"
                     />
                 </template>
+                <template #tags="{ tag, formatFn }" v-if="chipLocale">
+                    <div class="q-gutter-x-xs">
+                        <strong>{{ t(`${chipLocale}.${tag.label}`) }}: </strong>
+                        <span>{{ formatFn(tag.value) }}</span>
+                    </div>
+                </template>
             </VnFilterPanel>
         </QScrollArea>
     </QDrawer>
-    <!-- class in div to fix warn-->
     <CrudModel
         v-bind="$attrs"
         :class="$attrs['class'] ?? 'q-px-md'"
@@ -372,9 +395,7 @@ function handleOnDataSaved(_) {
         ref="CrudModelRef"
         @on-fetch="(...args) => emit('onFetch', ...args)"
         :search-url="searchUrl"
-        :disable-infinite-scroll="
+        :disable-infinite-scroll="isTableMode"
-            $attrs['disableInfiniteScroll'] ? isTableMode : !disableInfiniteScroll
-        "
         @save-changes="reload"
         :has-sub-toolbar="$props.hasSubToolbar ?? isEditable"
         :auto-load="hasParams || $attrs['auto-load']"
@@ -394,7 +415,7 @@ function handleOnDataSaved(_) {
                 card-container-class="grid-three"
                 flat
                 :style="isTableMode && `max-height: ${tableHeight}`"
-                :virtual-scroll="!isTableMode"
+                :virtual-scroll="isTableMode"
                 @virtual-scroll="
                     (event) =>
                         event.index > rows.length - 2 &&
@@ -424,7 +445,7 @@ function handleOnDataSaved(_) {
                     <QBtn
                         v-if="$props.rightSearch"
                         icon="filter_alt"
-                        class="bg-vn-section-color q-ml-md"
+                        class="bg-vn-section-color q-ml-sm"
                         dense
                         @click="stateStore.toggleRightDrawer()"
                     />
@@ -446,7 +467,7 @@ function handleOnDataSaved(_) {
                                     :search-url="searchUrl"
                                 />
                             </div>
-                            <VnTableFilter
+                            <VnFilter
                                 v-if="$props.columnSearch"
                                 :column="col"
                                 :show-title="true"
@@ -511,8 +532,12 @@ function handleOnDataSaved(_) {
                             :key="index"
                             :title="btn.title"
                             :icon="btn.icon"
-                            class="q-px-sm text-primary-light"
+                            class="q-pa-xs"
                             flat
+                            dense
+                            :class="
+                                btn.isPrimary ? 'text-primary-light' : 'color-vn-text '
+                            "
                             :style="`visibility: ${
                                 (btn.show && btn.show(row)) ?? true ? 'visible' : 'hidden'
                             }`"
@@ -520,6 +545,29 @@ function handleOnDataSaved(_) {
                         />
                     </QTd>
                 </template>
+                <template #bottom v-if="bottom">
+                    <slot name="bottom-table">
+                        <QBtn
+                            @click="
+                                () =>
+                                    createAsDialog
+                                        ? (showForm = !showForm)
+                                        : handleOnDataSaved(create)
+                            "
+                            class="cursor-pointer fill-icon"
+                            color="primary"
+                            icon="add_circle"
+                            size="md"
+                            round
+                            flat
+                            shortcut="+"
+                            :disabled="!disabledAttr"
+                        />
+                        <QTooltip>
+                            {{ createForm.title }}
+                        </QTooltip>
+                    </slot>
+                </template>
                 <template #item="{ row, colsMap }">
                     <component
                         :is="$props.redirect ? 'router-link' : 'span'"
@@ -636,25 +684,15 @@ function handleOnDataSaved(_) {
                         </QCard>
                     </component>
                 </template>
-                <template #bottom-row="{ cols }" v-if="footer">
+                <template #bottom-row="{ cols }" v-if="$props.footer">
-                    <QTr v-if="rows.length" class="bg-header" style="height: 30px">
+                    <QTr v-if="rows.length" style="height: 30px">
                         <QTh
                             v-for="col of cols.filter((cols) => cols.visible ?? true)"
                             :key="col?.id"
                             class="text-center"
+                            :class="getColAlign(col)"
                         >
-                            <div
+                            <slot :name="`column-footer-${col.name}`" />
-                                v-if="col?.summation"
-                                :class="`text-${col?.align ?? 'left'}`"
-                                class="text-bold q-pa-sm"
-                            >
-                                {{
-                                    rows.reduce(
-                                        (sum, currentRow) => sum + currentRow[col.name],
-                                        0
-                                    )
-                                }}
-                            </div>
                         </QTh>
                     </QTr>
                 </template>
@@ -733,16 +771,6 @@ es:
     color: var(--vn-text-color);
 }
 
-.q-table--dark .q-table__bottom,
-.q-table--dark thead,
-.q-table--dark tr {
-    border-color: var(--vn-section-color);
-}
-
-.q-table__container > div:first-child {
-    background-color: var(--vn-page-color);
-}
-
 .grid-three {
     display: grid;
     grid-template-columns: repeat(auto-fit, minmax(400px, max-content));
@@ -771,10 +799,16 @@ es:
     }
 }
 
-.q-table th {
+.q-table {
-    padding: 0;
+    th {
-}
+        padding: 0;
+    }
 
+    &__top {
+        padding: 12px 0px;
+        top: 0;
+    }
+}
 .vnTable {
     thead tr th {
         position: sticky;
@@ -810,6 +844,15 @@ es:
         background-color: var(--vn-section-color);
         z-index: 1;
     }
+    table tbody th {
+        position: relative;
+    }
+    tbody:nth-last-child(1) {
+        @extend .bg-header;
+        position: sticky;
+        z-index: 2;
+        bottom: 0;
+    }
 }
 
 .vn-label-value {
@@ -855,4 +898,12 @@ es:
     cursor: text;
     user-select: all;
 }
+
+.q-table__container {
+    background-color: transparent;
+}
+
+.q-table__middle.q-virtual-scroll.q-virtual-scroll--vertical.scroll {
+    background-color: var(--vn-section-color);
+}
 </style>

src/components/VnTable/VnVisibleColumn.vue

@@ -135,7 +135,7 @@ onMounted(async () => {
 });
 </script>
 <template>
-    <QBtn icon="vn:visible_columns" class="bg-vn-section-color q-mr-md q-px-sm" dense>
+    <QBtn icon="vn:visible_columns" class="bg-vn-section-color q-mr-sm q-px-sm" dense>
         <QPopupProxy ref="popupProxyRef">
             <QCard class="column q-pa-md">
                 <QIcon name="info" size="sm" class="info-icon">

src/components/common/VnCard.vue

@@ -24,7 +24,9 @@ const stateStore = useStateStore();
 const route = useRoute();
 const router = useRouter();
 const url = computed(() => {
-    if (props.baseUrl) return `${props.baseUrl}/${route.params.id}`;
+    if (props.baseUrl) {
+        return `${props.baseUrl}/${route.params.id}`;
+    }
     return props.customUrl;
 });
 const searchRightDataKey = computed(() => {
@@ -40,8 +42,10 @@ onBeforeMount(async () => {
     try {
         if (!props.baseUrl) arrayData.store.filter.where = { id: route.params.id };
         await arrayData.fetch({ append: false, updateRouter: false });
-    } catch (e) {
+    } catch {
-        router.push({ name: 'WorkerList' });
+        const { matched: matches } = router.currentRoute.value;
+        const { path } = matches.at(-1);
+        router.push({ path: path.replace(/:id.*/, '') });
     }
 });
 

src/components/common/VnDmsList.vue

@@ -400,7 +400,14 @@ defineExpose({
         />
     </QDialog>
     <QPageSticky position="bottom-right" :offset="[25, 25]">
-        <QBtn fab color="primary" icon="add" @click="showFormDialog()" class="fill-icon">
+        <QBtn
+            fab
+            color="primary"
+            icon="add"
+            shortcut="+"
+            @click="showFormDialog()"
+            class="fill-icon"
+        >
             <QTooltip>
                 {{ t('Upload file') }}
             </QTooltip>

src/components/common/VnInput.vue

@@ -103,6 +103,7 @@ const mixinRules = [
                     @click="
                         () => {
                             value = null;
+                            vnInputRef.focus();
                             emit('remove');
                         }
                     "
@@ -129,4 +130,24 @@ const mixinRules = [
 .q-field__append {
     padding-inline: 0;
 }
+
+.q-field__append.q-field__marginal.row.no-wrap.items-center.row {
+    height: 20px;
+}
+.q-field--outlined .q-field__append.q-field__marginal.row.no-wrap.items-center.row {
+    height: auto;
+}
+.q-field__control {
+    height: unset;
+}
+
+.q-field--labeled {
+    .q-field__native,
+    .q-field__prefix,
+    .q-field__suffix,
+    .q-field__input {
+        padding-bottom: 0;
+        min-height: 15px;
+    }
+}
 </style>

src/components/common/VnInputDate.vue

@@ -20,6 +20,7 @@ const { validations } = useValidator();
 
 const { t } = useI18n();
 const requiredFieldRule = (val) => validations().required($attrs.required, val);
+const vnInputDateRef = ref(null);
 
 const dateFormat = 'DD/MM/YYYY';
 const isPopupOpen = ref();
@@ -91,6 +92,7 @@ const styleAttrs = computed(() => {
 <template>
     <div @mouseover="hover = true" @mouseleave="hover = false">
         <QInput
+            ref="vnInputDateRef"
             v-model="formattedDate"
             class="vn-input-date"
             :mask="mask"
@@ -113,6 +115,7 @@ const styleAttrs = computed(() => {
                         !$attrs.disable
                     "
                     @click="
+                        vnInputDateRef.focus();
                         model = null;
                         isPopupOpen = false;
                     "

src/components/common/VnInputTime.vue

@@ -16,6 +16,7 @@ const props = defineProps({
         default: false,
     },
 });
+const vnInputTimeRef = ref(null);
 const initialDate = ref(model.value ?? Date.vnNew());
 const { t } = useI18n();
 const requiredFieldRule = (val) => validations().required($attrs.required, val);
@@ -69,6 +70,7 @@ function dateToTime(newDate) {
 <template>
     <div @mouseover="hover = true" @mouseleave="hover = false">
         <QInput
+            ref="vnInputTimeRef"
             class="vn-input-time"
             mask="##:##"
             placeholder="--:--"
@@ -92,6 +94,7 @@ function dateToTime(newDate) {
                         !$attrs.disable
                     "
                     @click="
+                        vnInputTimeRef.focus();
                         model = null;
                         isPopupOpen = false;
                     "

src/components/common/VnLocation.vue

@@ -12,14 +12,46 @@ const props = defineProps({
         default: null,
     },
 });
+
+const locationProperties = [
+    'postcode',
+    (obj) =>
+        obj.city
+            ? `${obj.city}${obj.province?.name ? `(${obj.province.name})` : ''}`
+            : null,
+    (obj) => obj.country?.name,
+];
+
+const formatLocation = (obj, properties) => {
+    const parts = properties.map((prop) => {
+        if (typeof prop === 'string') {
+            return obj[prop];
+        } else if (typeof prop === 'function') {
+            return prop(obj);
+        }
+        return null;
+    });
+
+    const filteredParts = parts.filter(
+        (part) => part !== null && part !== undefined && part !== ''
+    );
+
+    return filteredParts.join(', ');
+};
+
 const modelValue = ref(
-    props.location
+    props.location ? formatLocation(props.location, locationProperties) : null
-        ? `${props.location?.postcode} - ${props.location?.city}(${props.location?.province?.name}), ${props.location?.country?.name}`
-        : null
 );
+
 function showLabel(data) {
-    return `${data.code} - ${data.town}(${data.province}), ${data.country}`;
+    const dataProperties = [
+        'code',
+        (obj) => (obj.town ? `${obj.town}(${obj.province})` : null),
+        'country',
+    ];
+    return formatLocation(data, dataProperties);
 }
+
 const handleModelValue = (data) => {
     emit('update:model-value', data);
 };
@@ -41,6 +73,7 @@ const handleModelValue = (data) => {
         v-bind="$attrs"
         clearable
         :emit-value="false"
+        :tooltip="t('Create new location')"
     >
         <template #form>
             <CreateNewPostcode
@@ -73,7 +106,9 @@ const handleModelValue = (data) => {
 <i18n>
 en:
     search_by_postalcode: Search by postalcode, town, province or country
+    Create new location: Create new location
 es:
     Location: Ubicación
+    Create new location: Crear nueva ubicación
     search_by_postalcode: Buscar por código postal, ciudad o país
 </i18n>

src/components/common/VnLog.vue

@@ -406,6 +406,7 @@ watch(
         :skeleton="false"
         auto-load
         @on-fetch="setLogTree"
+        search-url="logs"
     >
         <template #body>
             <div

src/components/common/VnSectionMain.vue

@@ -2,6 +2,7 @@
 import { useStateStore } from 'stores/useStateStore';
 import LeftMenu from 'components/LeftMenu.vue';
 import { onMounted } from 'vue';
+import { useQuasar } from 'quasar';
 
 const stateStore = useStateStore();
 const $props = defineProps({
@@ -10,7 +11,9 @@ const $props = defineProps({
         default: true,
     },
 });
-onMounted(() => (stateStore.leftDrawer = $props.leftDrawer));
+onMounted(
+    () => (stateStore.leftDrawer = useQuasar().screen.gt.xs ? $props.leftDrawer : false)
+);
 </script>
 
 <template>

src/components/common/VnSelect.vue

@@ -38,6 +38,10 @@ const $props = defineProps({
         type: [Array],
         default: () => [],
     },
+    exprBuilder: {
+        type: Function,
+        default: null,
+    },
     isClearable: {
         type: Boolean,
         default: true,
@@ -179,6 +183,7 @@ async function fetchFilter(val) {
         }, {});
     } else defaultWhere = { [key]: getVal(val) };
     const where = { ...(val ? defaultWhere : {}), ...$props.where };
+    $props.exprBuilder && Object.assign(where, $props.exprBuilder(key, val));
     const fetchOptions = { where, include, limit };
     if (fields) fetchOptions.fields = fields;
     if (sortBy) fetchOptions.order = sortBy;
@@ -278,4 +283,15 @@ const getVal = (val) => ($props.useLike ? { like: `%${val}%` } : val);
 .q-field--outlined {
     max-width: 100%;
 }
+.q-field__inner {
+    .q-field__control {
+        min-height: auto !important;
+
+        display: flex;
+        align-items: flex-end;
+        .q-field__native.row {
+            min-height: auto !important;
+        }
+    }
+}
 </style>

src/components/common/VnSelectDialog.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { ref, computed } from 'vue';
+import { computed } from 'vue';
 import { useRole } from 'src/composables/useRole';
 import { useAcl } from 'src/composables/useAcl';
 

src/components/common/VnSelectEnum.vue

@@ -0,0 +1,52 @@
+<script setup>
+import { onBeforeMount, ref, useAttrs } from 'vue';
+import axios from 'axios';
+import VnSelect from 'components/common/VnSelect.vue';
+
+const { schema, table, column, translation, defaultOptions } = defineProps({
+    schema: {
+        type: String,
+        default: 'vn',
+    },
+    table: {
+        type: String,
+        required: true,
+    },
+    column: {
+        type: String,
+        required: true,
+    },
+    translation: {
+        type: Function,
+        default: null,
+    },
+    defaultOptions: {
+        type: Array,
+        default: () => [],
+    },
+});
+
+const $attrs = useAttrs();
+const options = ref([]);
+onBeforeMount(async () => {
+    options.value = [].concat(defaultOptions);
+    const { data } = await axios.get(`Applications/get-enum-values`, {
+        params: { schema, table, column },
+    });
+
+    for (const value of data)
+        options.value.push({
+            [$attrs['option-value'] ?? 'id']: value,
+            [$attrs['option-label'] ?? 'name']: translation ? translation(value) : value,
+        });
+});
+</script>
+
+<template>
+    <VnSelect
+        v-bind="$attrs"
+        :options="options"
+        :key="options.length"
+        :input-debounce="0"
+    />
+</template>

src/components/ui/CardDescriptor.vue

@@ -47,6 +47,7 @@ let store;
 let entity;
 const isLoading = ref(false);
 const isSameDataKey = computed(() => $props.dataKey === route.meta.moduleName);
+const menuRef = ref();
 defineExpose({ getData });
 
 onBeforeMount(async () => {
@@ -170,7 +171,7 @@ const toModule = computed(() =>
                     <QTooltip>
                         {{ t('components.cardDescriptor.moreOptions') }}
                     </QTooltip>
-                    <QMenu ref="menuRef">
+                    <QMenu :ref="menuRef">
                         <QList>
                             <slot name="menu" :entity="entity" :menu-ref="menuRef" />
                         </QList>

src/components/ui/VnFilterPanel.vue

@@ -3,7 +3,6 @@ import { onMounted, ref, computed, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useArrayData } from 'composables/useArrayData';
 import { useRoute } from 'vue-router';
-import { date } from 'quasar';
 import toDate from 'filters/toDate';
 import VnFilterPanelChip from 'components/ui/VnFilterPanelChip.vue';
 
@@ -59,7 +58,6 @@ const $props = defineProps({
 });
 
 defineExpose({ search, sanitizer });
-
 const emit = defineEmits([
     'update:modelValue',
     'refresh',
@@ -187,7 +185,6 @@ async function remove(key) {
 }
 
 function formatValue(value) {
-    if (value instanceof Date) return date.formatDate(value, 'DD/MM/YYYY');
     if (typeof value === 'boolean') return value ? t('Yes') : t('No');
     if (isNaN(value) && !isNaN(Date.parse(value))) return toDate(value);
 
@@ -214,7 +211,7 @@ function sanitizer(params) {
         icon="search"
         @click="search()"
     ></QBtn>
-    <QForm @submit="search" id="filterPanelForm">
+    <QForm @submit="search" id="filterPanelForm" @keyup.enter="search()">
         <QList dense>
             <QItem class="q-mt-xs">
                 <QItemSection top>

src/components/ui/VnPaginate.vue

@@ -119,10 +119,9 @@ watch(
 );
 
 watch(
-    () => [props.url, props.filter, props.userParams],
+    () => [props.url, props.filter],
-    ([url, filter, userParams]) => mounted.value && fetch({ url, filter, userParams })
+    ([url, filter]) => mounted.value && fetch({ url, filter })
 );
-
 const addFilter = async (filter, params) => {
     await arrayData.addFilter({ filter, params });
 };
@@ -131,9 +130,8 @@ async function fetch(params) {
     useArrayData(props.dataKey, params);
     arrayData.reset(['filter.skip', 'skip']);
     await arrayData.fetch({ append: false });
-    if (!store.hasMoreData) {
+    if (!store.hasMoreData) isLoading.value = false;
-        isLoading.value = false;
+
-    }
     emit('onFetch', store.data);
     return store.data;
 }

src/components/ui/VnRow.vue

@@ -9,6 +9,7 @@ defineProps({ wrap: { type: Boolean, default: false } });
 <style lang="scss" scoped>
 .vn-row {
     display: flex;
+    align-items: flex-end;
     > :deep(*) {
         flex: 1;
     }

src/components/ui/VnSearchbar.vue

@@ -108,6 +108,7 @@ async function search() {
             ...Object.fromEntries(staticParams),
             search: searchText.value,
         },
+        ...{ filter: props.filter },
     };
 
     if (props.whereFilter) {

src/composables/useArrayData.js

@@ -26,7 +26,8 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
             const params = JSON.parse(query[searchUrl]);
             const filter = params?.filter && JSON.parse(params?.filter ?? '{}');
             delete params.filter;
-            store.userParams = { ...params, ...store.userParams };
+
+            store.userParams = { ...store.userParams, ...params };
             store.userFilter = { ...filter, ...store.userFilter };
             if (filter?.order) store.order = filter.order;
         }

src/composables/usePrintService.js

@@ -1,15 +1,18 @@
 import { useSession } from './useSession';
 import axios from 'axios';
 import { useQuasar } from 'quasar';
+import { useI18n } from 'vue-i18n';
 
 export function usePrintService() {
     const quasar = useQuasar();
+    const { t } = useI18n();
+
     const { getTokenMultimedia } = useSession();
 
     function sendEmail(path, params) {
         return axios.post(path, params).then(() =>
             quasar.notify({
-                message: 'Notification sent',
+                message: t('globals.notificationSent'),
                 type: 'positive',
                 icon: 'check',
             })

src/css/app.scss

@@ -268,6 +268,7 @@ input::-webkit-inner-spin-button {
         max-width: 400px;
     }
 }
+
 .edit-photo-btn {
     position: absolute;
     right: 12px;
@@ -280,3 +281,21 @@ input::-webkit-inner-spin-button {
     color: var(--vn-label-color);
     text-transform: uppercase;
 }
+
+.q-date {
+    &__today {
+        border: 2px solid $info;
+        color: $info;
+    }
+}
+.q-field__inner {
+    .q-field__control {
+        min-height: auto !important;
+        display: flex;
+        align-items: flex-end;
+        padding-bottom: 2px;
+        .q-field__native.row {
+            min-height: auto !important;
+        }
+    }
+}

src/css/quasar.variables.scss

@@ -36,7 +36,6 @@ $color-font-secondary: #777;
 .bg-success {
     background-color: $positive;
 }
-
 .bg-notice {
     background-color: $info;
 }

src/filters/toHour.js

@@ -4,7 +4,7 @@ export default function toHour(date) {
     if (!isValidDate(date)) {
         return '--:--';
     }
-    return (new Date(date || '')).toLocaleTimeString([], {
+    return new Date(date || '').toLocaleTimeString([], {
         hour: '2-digit',
         minute: '2-digit',
     });

src/i18n/locale/en.yml

@@ -50,6 +50,7 @@ globals:
     summary:
         basicData: Basic data
     daysOnward: Days onward
+    daysAgo: Days ago
     today: Today
     yesterday: Yesterday
     dateFormat: en-GB
@@ -103,6 +104,7 @@ globals:
     ticket: Ticket
     campaign: Campaign
     weight: Weight
+    error: Ups! Something went wrong
     pageTitles:
         logIn: Login
         addressEdit: Update address
@@ -110,7 +112,7 @@ globals:
         basicData: Basic data
         log: Logs
         parkingList: Parkings list
-        agencyList: Agencies list
+        agencyList: Agencies
         agency: Agency
         workCenters: Work centers
         modes: Modes
@@ -134,7 +136,7 @@ globals:
         fiscalData: Fiscal data
         billingData: Billing data
         consignees: Consignees
-        'address-create': New address
+        address-create: New address
         notes: Notes
         credits: Credits
         greuges: Greuges
@@ -206,7 +208,7 @@ globals:
         roadmap: Roadmap
         stops: Stops
         routes: Routes
-        cmrsList: CMRs list
+        cmrsList: CMRs
         RouteList: List
         routeCreate: New route
         RouteRoadmap: Roadmaps
@@ -273,6 +275,7 @@ globals:
         serial: Serial
         medical: Mutual
         pit: IRPF
+        RouteExtendedList: Router
     supplier: Supplier
     created: Created
     worker: Worker
@@ -288,6 +291,8 @@ globals:
     createInvoiceIn: Create invoice in
     myAccount: My account
     noOne: No one
+    maxTemperature: Max
+    minTemperature: Min
     params:
         clientFk: Client id
         salesPersonFk: Sales person
@@ -302,6 +307,7 @@ errors:
     statusBadGateway: It seems that the server has fall down
     statusGatewayTimeout: Could not contact the server
     userConfig: Error fetching user config
+    updateUserConfig: Error updating user config
     tokenConfig: Error fetching token config
     writeRequest: The requested operation could not be completed
 login:
@@ -495,6 +501,8 @@ ticket:
         warehouse: Warehouse
         customerCard: Customer card
         alias: Alias
+        ticketList: Ticket List
+        newOrder: New Order
     boxing:
         expedition: Expedition
         item: Item
@@ -516,6 +524,7 @@ ticket:
         landed: Landed
         consigneePhone: Consignee phone
         consigneeMobile: Consignee mobile
+        consigneeAddress: Consignee address
         clientPhone: Client phone
         clientMobile: Client mobile
         consignee: Consignee
@@ -545,6 +554,11 @@ ticket:
         weight: Weight
         goTo: Go to
         summaryAmount: Summary
+        purchaseRequest: Purchase request
+        service: Service
+        description: Description
+        attender: Attender
+        ok: Ok
     create:
         client: Client
         address: Address
@@ -568,7 +582,6 @@ invoiceOut:
         client: Client
         company: Company
         customerCard: Customer card
-        ticketList: Ticket List
     summary:
         issued: Issued
         created: Created
@@ -872,6 +885,7 @@ route:
         tickets: Tickets
         log: Log
         autonomous: Autonomous
+        RouteExtendedList: Router
     cmr:
         list:
             results: results
@@ -901,6 +915,7 @@ supplier:
             account: Account
             payMethod: Pay Method
             payDay: Pay Day
+            country: Country
     summary:
         responsible: Responsible
         notes: Notes
@@ -999,6 +1014,7 @@ travel:
             warehouseOut: Warehouse out
             totalEntries: Total entries
             totalEntriesTooltip: Total entries
+            daysOnward: Landed days onwards
     summary:
         confirmed: Confirmed
         entryId: Entry Id
@@ -1074,7 +1090,7 @@ item:
         producer: Producer
         landed: Landed
     fixedPrice:
-        itemId: Item ID
+        itemFk: Item ID
         groupingPrice: Grouping price
         packingPrice: Packing price
         hasMinPrice: Has min price

src/i18n/locale/es.yml

@@ -49,6 +49,7 @@ globals:
     summary:
         basicData: Datos básicos
     daysOnward: Días adelante
+    daysAgo: Días atras
     today: Hoy
     yesterday: Ayer
     dateFormat: es-ES
@@ -63,7 +64,7 @@ globals:
     shipped: F. envío
     totalEntries: Ent. totales
     amount: Importe
-    packages: Bultos
+    packages: Embalajes
     download: Descargar
     downloadPdf: Descargar PDF
     selectRows: 'Seleccionar las { numberRows } filas(s)'
@@ -105,6 +106,7 @@ globals:
     ticket: Ticket
     campaign: Campaña
     weight: Peso
+    error: ¡Ups! Algo salió mal
     pageTitles:
         logIn: Inicio de sesión
         addressEdit: Modificar consignatario
@@ -112,7 +114,7 @@ globals:
         basicData: Datos básicos
         log: Historial
         parkingList: Listado de parkings
-        agencyList: Listado de agencias
+        agencyList: Agencias
         agency: Agencia
         workCenters: Centros de trabajo
         modes: Modos
@@ -161,6 +163,7 @@ globals:
         dms: Gestión documental
         entryCreate: Nueva entrada
         latestBuys: Últimas compras
+        reserves: Reservas
         tickets: Tickets
         ticketCreate: Nuevo ticket
         boxing: Encajado
@@ -209,12 +212,13 @@ globals:
         roadmap: Troncales
         stops: Paradas
         routes: Rutas
-        cmrsList: Listado de CMRs
+        cmrsList: CMRs
         RouteList: Listado
         routeCreate: Nueva ruta
         RouteRoadmap: Troncales
         RouteRoadmapCreate: Crear troncal
         autonomous: Autónomos
+        RouteExtendedList: Enrutador
         suppliers: Proveedores
         supplier: Proveedor
         supplierCreate: Nuevo proveedor
@@ -265,7 +269,7 @@ globals:
         tracking: Estados
         components: Componentes
         pictures: Fotos
-        packages: Bultos
+        packages: Embalajes
         ldap: LDAP
         samba: Samba
         twoFactor: Doble factor
@@ -291,6 +295,8 @@ globals:
     createInvoiceIn: Crear factura recibida
     myAccount: Mi cuenta
     noOne: Nadie
+    maxTemperature: Máx
+    minTemperature: Mín
     params:
         clientFk: Id cliente
         salesPersonFk: Comercial
@@ -305,6 +311,7 @@ errors:
     statusBadGateway: Parece ser que el servidor ha caído
     statusGatewayTimeout: No se ha podido contactar con el servidor
     userConfig: Error al obtener configuración de usuario
+    updateUserConfig: Error al actualizar la configuración de usuario
     tokenConfig: Error al obtener configuración de token
     writeRequest: No se pudo completar la operación solicitada
 login:
@@ -485,7 +492,7 @@ ticket:
         tracking: Estados
         components: Componentes
         pictures: Fotos
-        packages: Bultos
+        packages: Embalajes
     list:
         nickname: Alias
         state: Estado
@@ -503,6 +510,8 @@ ticket:
         warehouse: Almacén
         customerCard: Ficha del cliente
         alias: Alias
+        ticketList: Listado de tickets
+        newOrder: Nuevo pedido
     boxing:
         expedition: Expedición
         item: Artículo
@@ -524,6 +533,7 @@ ticket:
         landed: Entregado
         consigneePhone: Tel. consignatario
         consigneeMobile: Móv. consignatario
+        consigneeAddress: Dir. consignatario
         clientPhone: Tel. cliente
         clientMobile: Móv. cliente
         consignee: Consignatario
@@ -553,6 +563,10 @@ ticket:
         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
@@ -885,6 +899,7 @@ supplier:
             account: Cuenta
             payMethod: Método de pago
             payDay: Dia de pago
+            country: País
     summary:
         responsible: Responsable
         notes: Notas
@@ -983,6 +998,7 @@ travel:
             warehouseOut: Alm.entrada
             totalEntries: ∑
             totalEntriesTooltip: Entradas totales
+            daysOnward: Días de llegada en adelante
     summary:
         confirmed: Confirmado
         entryId: Id entrada
@@ -1058,7 +1074,7 @@ item:
         producer: Productor
         landed: F. entrega
     fixedPrice:
-        itemId: ID Artículo
+        itemFk: ID Artículo
         groupingPrice: Precio grouping
         packingPrice: Precio packing
         hasMinPrice: Tiene precio mínimo

src/pages/Account/AccountList.vue

@@ -9,7 +9,9 @@ import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
 const tableRef = ref();
-
+const filter = {
+    include: { relation: 'role', scope: { fields: ['id', 'name'] } },
+};
 const columns = computed(() => [
     {
         align: 'left',
@@ -29,7 +31,22 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        name: 'username',
+        name: 'roleFk',
+        label: t('role'),
+        columnFilter: {
+            component: 'select',
+            name: 'roleFk',
+            attrs: {
+                url: 'VnRoles',
+                optionValue: 'id',
+                optionLabel: 'name',
+            },
+        },
+        format: ({ role }, dashIfEmpty) => dashIfEmpty(role?.name),
+    },
+    {
+        align: 'left',
+        name: 'nickname',
         label: t('Nickname'),
         isTitle: true,
         component: 'input',
@@ -104,12 +121,13 @@ const exprBuilder = (param, value) => {
         :expr-builder="exprBuilder"
         :label="t('account.search')"
         :info="t('account.searchInfo')"
+        :filter="filter"
     />
-
     <VnTable
         ref="tableRef"
         data-key="AccountUsers"
         url="VnUsers/preview"
+        :filter="filter"
         order="id DESC"
         :columns="columns"
         default-mode="table"

src/pages/Account/Card/AccountBasicData.vue

@@ -2,6 +2,7 @@
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import VnSelect from 'src/components/common/VnSelect.vue';
+import VnSelectEnum from 'src/components/common/VnSelectEnum.vue';
 import FormModel from 'components/FormModel.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import { ref, watch } from 'vue';
@@ -24,7 +25,7 @@ watch(
 <template>
     <FormModel
         ref="formModelRef"
-        :url="`VnUsers/preview`"
+        url="VnUsers/preview"
         :url-update="`VnUsers/${route.params.id}/update-user`"
         :filter="accountFilter"
         model="Accounts"
@@ -43,6 +44,15 @@ watch(
                     option-value="code"
                     option-label="code"
                 />
+                <VnSelectEnum
+                    schema="account"
+                    table="user"
+                    column="twoFactor"
+                    v-model="data.twoFactor"
+                    :label="t('account.card.twoFactor')"
+                    option-value="code"
+                    option-label="code"
+                />
             </div>
         </template>
     </FormModel>

src/pages/Account/Card/AccountCard.vue

@@ -11,6 +11,9 @@ const { t } = useI18n();
         data-key="Account"
         :descriptor="AccountDescriptor"
         search-data-key="AccountUsers"
+        :filter="{
+            include: { relation: 'role', scope: { fields: ['id', 'name'] } },
+        }"
         :searchbar-props="{
             url: 'VnUsers/preview',
             label: t('account.search'),

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

@@ -142,7 +142,13 @@ const redirectToRoleSummary = (id) =>
             <SubRoleCreateForm @on-submit-create-subrole="createSubRole" />
         </QDialog>
         <QPageSticky position="bottom-right" :offset="[18, 18]">
-            <QBtn fab icon="add" color="primary" @click="openCreateSubRoleForm()">
+            <QBtn
+                fab
+                icon="add"
+                shortcut="+"
+                color="primary"
+                @click="openCreateSubRoleForm()"
+            >
                 <QTooltip>{{ t('warehouses.add') }}</QTooltip>
             </QBtn>
         </QPageSticky>

src/pages/Account/locale/en.yml

@@ -35,6 +35,7 @@ account:
         willDeactivated: User will be deactivated
         activated: User activated!
         deactivated: User deactivated!
+        twoFactor: Two factor
         actions:
             setPassword: Set password
             disableAccount:

src/pages/Account/locale/es.yml

@@ -32,6 +32,7 @@ account:
         activated: ¡Usuario activado!
         deactivated: ¡Usuario desactivado!
         newUser: Nuevo usuario
+        twoFactor: Doble factor
         privileges:
             delegate: Puede delegar privilegios
         actions:

src/pages/Claim/Card/ClaimBasicData.vue

@@ -3,58 +3,18 @@ import { ref } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import VnSelect from 'src/components/common/VnSelect.vue';
+import VnSelectEnum from 'src/components/common/VnSelectEnum.vue';
 import FetchData from 'components/FetchData.vue';
 import FormModel from 'components/FormModel.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
 
-import axios from 'axios';
 import VnAvatar from 'src/components/ui/VnAvatar.vue';
 
 const route = useRoute();
 const { t } = useI18n();
-
-const claimStates = ref([]);
-const claimStatesCopy = ref([]);
-const optionsList = ref([]);
-
 const workersOptions = ref([]);
-
-function setClaimStates(data) {
-    claimStates.value = data;
-    claimStatesCopy.value = data;
-}
-
-async function getEnumValues() {
-    optionsList.value = [{ id: null, description: t('claim.null') }];
-    const { data } = await axios.get(`Applications/get-enum-values`, {
-        params: {
-            schema: 'vn',
-            table: 'claim',
-            column: 'pickup',
-        },
-    });
-    for (let value of data)
-        optionsList.value.push({ id: value, description: t(`claim.${value}`) });
-}
-
-getEnumValues();
-
-const statesFilter = {
-    options: claimStates,
-    filterFn: (options, value) => {
-        const search = value.toLowerCase();
-
-        if (value === '') return claimStatesCopy.value;
-
-        return options.value.filter((row) => {
-            const description = row.description.toLowerCase();
-
-            return description.indexOf(search) > -1;
-        });
-    },
-};
 </script>
 <template>
     <FetchData
@@ -70,7 +30,7 @@ const statesFilter = {
         auto-load
         :reload="true"
     >
-        <template #form="{ data, validate, filter }">
+        <template #form="{ data, validate }">
             <VnRow>
                 <VnInput
                     v-model="data.client.name"
@@ -101,20 +61,14 @@ const statesFilter = {
                         />
                     </template>
                 </VnSelect>
-                <QSelect
+                <VnSelect
                     v-model="data.claimStateFk"
-                    :options="claimStates"
+                    url="ClaimStates"
-                    option-value="id"
-                    option-label="description"
-                    emit-value
                     :label="t('claim.state')"
-                    map-options
+                    option-label="description"
-                    use-input
-                    @filter="(value, update) => filter(value, update, statesFilter)"
                     :rules="validate('claim.claimStateFk')"
                     :input-debounce="0"
-                >
+                />
-                </QSelect>
             </VnRow>
             <VnRow>
                 <QInput
@@ -123,16 +77,14 @@ const statesFilter = {
                     :rules="validate('claim.packages')"
                     type="number"
                 />
-                <QSelect
+                <VnSelectEnum
                     v-model="data.pickup"
-                    :options="optionsList"
-                    option-value="id"
-                    option-label="description"
-                    emit-value
                     :label="t('claim.pickup')"
-                    map-options
+                    table="claim"
-                    use-input
+                    column="pickup"
-                    :input-debounce="0"
+                    option-label="description"
+                    :translation="(value) => t(`claim.${value}`)"
+                    :default-options="[{ id: null, description: t('claim.null') }]"
                 />
             </VnRow>
         </template>

src/pages/Claim/Card/ClaimLines.vue

@@ -317,7 +317,7 @@ async function saveWhenHasChanges() {
     </div>
 
     <QPageSticky position="bottom-right" :offset="[25, 25]">
-        <QBtn fab color="primary" icon="add" @click="showImportDialog()" />
+        <QBtn fab color="primary" shortcut="+" icon="add" @click="showImportDialog()" />
     </QPageSticky>
 </template>
 

src/pages/Claim/Card/ClaimPhoto.vue

@@ -246,7 +246,13 @@ function onDrag() {
     </QDialog>
     <QPageSticky position="bottom-right" :offset="[25, 25]">
         <label for="fileInput">
-            <QBtn fab @click="inputFile.nativeEl.click()" icon="add" color="primary">
+            <QBtn
+                fab
+                @click="inputFile.nativeEl.click()"
+                shortcut="+"
+                icon="add"
+                color="primary"
+            >
                 <QInput
                     ref="inputFile"
                     type="file"

src/pages/Customer/Card/CustomerBalance.vue

@@ -16,7 +16,7 @@ import { useVnConfirm } from 'composables/useVnConfirm';
 import VnTable from 'components/VnTable/VnTable.vue';
 import VnInput from 'components/common/VnInput.vue';
 import VnSubToolbar from 'components/ui/VnSubToolbar.vue';
-import VnFilter from 'components/VnTable/VnFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 
 import CustomerNewPayment from 'src/pages/Customer/components/CustomerNewPayment.vue';
 import InvoiceOutDescriptorProxy from 'src/pages/InvoiceOut/Card/InvoiceOutDescriptorProxy.vue';
@@ -33,9 +33,9 @@ const stateStore = useStateStore();
 const user = state.getUser();
 
 const clientRisk = ref([]);
+const companies = ref([]);
 const tableRef = ref();
 const companyId = ref(user.value.companyFk);
-const companyLastId = ref(user.value.companyFk);
 const balances = ref([]);
 const vnFilterRef = ref({});
 const filter = computed(() => {
@@ -45,33 +45,6 @@ const filter = computed(() => {
     };
 });
 
-const companyFilterColumn = {
-    align: 'left',
-    name: 'companyId',
-    label: t('Company'),
-    component: 'select',
-    attrs: {
-        url: 'Companies',
-        optionLabel: 'code',
-        sortBy: 'code',
-        limit: 0,
-    },
-    columnFilter: {
-        event: {
-            remove: () => (companyId.value = null),
-            'update:modelValue': (newCompanyFk) => {
-                if (!newCompanyFk) return;
-                vnFilterRef.value.addFilter(newCompanyFk);
-                companyLastId.value = newCompanyFk;
-            },
-            blur: () =>
-                !companyId.value &&
-                (companyId.value = companyLastId.value ?? user.value.companyFk),
-        },
-    },
-    visible: false,
-};
-
 const columns = computed(() => [
     {
         align: 'right',
@@ -166,6 +139,11 @@ onBeforeMount(() => {
 });
 
 async function getCurrentBalance(data) {
+    currentBalance.value[companyId.value] = {
+        amount: 0,
+        code: companies.value.find((c) => c.id === companyId.value)?.code,
+    };
+
     for (const balance of data) {
         currentBalance.value[balance.companyFk] = {
             code: balance.company.code,
@@ -192,14 +170,21 @@ const showBalancePdf = ({ id }) => {
 
 <template>
     <FetchData
+        url="Companies"
+        auto-load
+        @on-fetch="(data) => (companies = data)"
+    ></FetchData>
+    <FetchData
+        v-if="companies.length > 0"
         url="clientRisks"
         :filter="{
             include: { relation: 'company', scope: { fields: ['code'] } },
-            where: { clientFk: route.params.id, companyFk: companyId },
+            where: { clientFk: route.params.id },
         }"
         auto-load
         @on-fetch="getCurrentBalance"
     ></FetchData>
+
     <VnSubToolbar class="q-mb-md">
         <template #st-data>
             <div class="column justify-center q-px-md q-py-sm">
@@ -212,13 +197,15 @@ const showBalancePdf = ({ id }) => {
         </template>
         <template #st-actions>
             <div>
-                <VnFilter
+                <VnSelect
+                    :label="t('Company')"
                     ref="vnFilterRef"
                     v-model="companyId"
                     data-key="CustomerBalance"
-                    :column="companyFilterColumn"
+                    :options="companies"
-                    search-url="balance"
+                    option-label="code"
-                />
+                    option-value="id"
+                ></VnSelect>
             </div>
         </template>
     </VnSubToolbar>

src/pages/Customer/Card/CustomerBasicData.vue

@@ -16,6 +16,20 @@ const { t } = useI18n();
 const businessTypes = ref([]);
 const contactChannels = ref([]);
 const title = ref();
+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>
     <FetchData
@@ -34,7 +48,7 @@ const title = ref();
             <VnRow>
                 <VnInput
                     :label="t('globals.name')"
-                    :rules="validate('client.socialName')"
+                    :rules="validate('client.name')"
                     autofocus
                     clearable
                     v-model="data.name"
@@ -98,8 +112,10 @@ const title = ref();
                     }"
                     :fields="['id', 'nickname']"
                     sort-by="nickname ASC"
+                    option-label="nickname"
+                    option-value="id"
                     :rules="validate('client.salesPersonFk')"
-                    :use-like="false"
+                    :expr-builder="exprBuilder"
                     emit-value
                     auto-load
                 >

src/pages/Customer/Card/CustomerConsumptionFilter.vue

@@ -0,0 +1,177 @@
+<script setup>
+import { useI18n } from 'vue-i18n';
+import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import { QItem } from 'quasar';
+import VnSelect from 'src/components/common/VnSelect.vue';
+import { QItemSection } from 'quasar';
+import VnInputDate from 'src/components/common/VnInputDate.vue';
+import { toDate } from 'src/filters';
+
+const { t } = useI18n();
+defineProps({ dataKey: { type: String, required: true } });
+</script>
+<template>
+    <VnFilterPanel :data-key="dataKey" :search-button="true">
+        <template #tags="{ tag, formatFn }">
+            <div class="q-gutter-x-xs">
+                <strong>{{ t(`params.${tag.label}`) }}: </strong>
+                <span>{{ formatFn(tag.value) }}</span>
+            </div>
+        </template>
+        <template #body="{ params }">
+            <QItem>
+                <QItemSection>
+                    <VnInput
+                        :label="t('params.item')"
+                        v-model="params.itemId"
+                        is-outlined
+                        lazy-rules
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnSelect
+                        v-model="params.buyerId"
+                        url="TicketRequests/getItemTypeWorker"
+                        :fields="['id', 'nickname']"
+                        sort-by="nickname ASC"
+                        :label="t('params.buyer')"
+                        option-value="id"
+                        option-label="nickname"
+                        dense
+                        outlined
+                        rounded
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnSelect
+                        v-model="params.typeId"
+                        url="ItemTypes"
+                        :include="['category']"
+                        :fields="['id', 'name', 'categoryFk']"
+                        sort-by="name ASC"
+                        :label="t('params.typeId')"
+                        option-label="name"
+                        option-value="id"
+                        dense
+                        outlined
+                        rounded
+                    >
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection>
+                                    <QItemLabel>{{ scope.opt?.name }}</QItemLabel>
+                                    <QItemLabel caption>{{
+                                        scope.opt?.category?.name
+                                    }}</QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelect>
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnSelect
+                        v-model="params.categoryId"
+                        url="ItemCategories"
+                        :fields="['id', 'name']"
+                        sort-by="name ASC"
+                        :label="t('params.categoryId')"
+                        option-label="name"
+                        option-value="id"
+                        dense
+                        outlined
+                        rounded
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnSelect
+                        v-model="params.campaignId"
+                        url="Campaigns/latest"
+                        sort-by="dated DESC"
+                        :label="t('params.campaignId')"
+                        option-label="code"
+                        option-value="id"
+                        dense
+                        outlined
+                        rounded
+                    >
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection>
+                                    <QItemLabel>{{
+                                        t(`params.${scope.opt?.code}`)
+                                    }}</QItemLabel>
+                                    <QItemLabel caption>{{
+                                        toDate(scope.opt.dated)
+                                    }}</QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelect>
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInputDate
+                        :label="t('params.from')"
+                        v-model="params.from"
+                        @update:model-value="searchFn()"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInputDate
+                        :label="t('params.to')"
+                        v-model="params.to"
+                        @update:model-value="searchFn()"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
+        </template>
+    </VnFilterPanel>
+</template>
+<i18n>
+en:
+    params:
+        item: Item id
+        buyer: Buyer
+        type: Type
+        category: Category
+        itemId: Item id
+        buyerId: Buyer
+        typeId: Type
+        categoryId: Category
+        from: From
+        to: To
+        campaignId: Campaña
+        valentinesDay: Valentine's Day
+        mothersDay: Mother's Day
+        allSaints: All Saints' Day
+es:
+    params:
+        item: Id artículo
+        buyer: Comprador
+        type: Tipo
+        category: Categoría
+        itemId: Id Artículo
+        buyerId: Comprador
+        typeId: Tipo
+        categoryId: Reino
+        from: Desde
+        to: Hasta
+        campaignId: Campaña
+        valentinesDay: Día de San Valentín
+        mothersDay: Día de la Madre
+        allSaints: Día de Todos los Santos
+</i18n>

src/pages/Customer/Card/CustomerContacts.vue

@@ -56,17 +56,18 @@ const customerContactsRef = ref(null);
                             </div>
                         </VnRow>
                         <VnRow>
-                            <QIcon
+                            <QBtn
                                 @click="customerContactsRef.insert()"
                                 class="cursor-pointer"
                                 color="primary"
-                                name="add"
+                                flat
-                                size="sm"
+                                icon="add"
+                                shortcut="+"
                             >
                                 <QTooltip>
                                     {{ t('Add contact') }}
                                 </QTooltip>
-                            </QIcon>
+                            </QBtn>
                         </VnRow>
                     </QCard>
                 </template>

src/pages/Customer/Card/CustomerDescriptor.vue

@@ -190,6 +190,18 @@ const setData = (entity) => (data.value = useCardDescription(entity?.name, entit
                 >
                     <QTooltip>{{ t('Go to user') }}</QTooltip>
                 </QBtn>
+                <QBtn
+                    v-if="entity.supplier"
+                    :to="{
+                        name: 'SupplierSummary',
+                        params: { id: entity.supplier.id },
+                    }"
+                    size="md"
+                    icon="vn:supplier"
+                    color="primary"
+                >
+                    <QTooltip>{{ t('Go to supplier') }}</QTooltip>
+                </QBtn>
             </QCardActions>
         </template>
     </CardDescriptor>
@@ -204,6 +216,7 @@ es:
     Customer ticket list: Listado de tickets del cliente
     Customer invoice out list: Listado de facturas del cliente
     Go to user: Ir al usuario
+    Go to supplier: Ir al proveedor
     Customer unpaid: Cliente impago
     Unpaid: Impagado
     unpaidDated: 'Fecha {dated}'

src/pages/Customer/Card/CustomerFileManagement.vue

@@ -236,6 +236,7 @@ const toCustomerFileManagementCreate = () => {
             @click.stop="toCustomerFileManagementCreate()"
             color="primary"
             fab
+            shortcut="+"
             icon="add"
         />
         <QTooltip>

src/pages/Customer/Card/CustomerFiscalData.vue

@@ -93,6 +93,7 @@ function handleLocation(data, location) {
             <VnRow>
                 <VnLocation
                     :rules="validate('Worker.postcode')"
+                    :roles-allowed-to-create="['deliveryAssistant', 'administrative']"
                     :acls="[{ model: 'Town', props: '*', accessType: 'WRITE' }]"
                     :location="data"
                     @update:model-value="(location) => handleLocation(data, location)"
@@ -134,15 +135,17 @@ function handleLocation(data, location) {
                         </QTooltip>
                     </QIcon>
                 </div>
-                <QCheckbox :label="t('Verified data')" v-model="data.isTaxDataChecked" />
+                <QCheckbox :label="t('Daily invoice')" v-model="data.hasDailyInvoice" />
             </VnRow>
 
             <VnRow>
                 <QCheckbox
                     :label="t('Electronic invoice')"
                     v-model="data.hasElectronicInvoice"
+                /><QCheckbox
+                    :label="t('Verified data')"
+                    v-model="data.isTaxDataChecked"
                 />
-                <QCheckbox :label="t('Daily invoice')" v-model="data.hasDailyInvoice" />
             </VnRow>
         </template>
     </FormModel>

src/pages/Customer/Card/CustomerSamples.vue

@@ -99,7 +99,13 @@ const tableRef = ref();
     </VnTable>
 
     <QPageSticky :offset="[18, 18]">
-        <QBtn @click.stop="toCustomerSamplesCreate()" color="primary" fab icon="add" />
+        <QBtn
+            @click.stop="toCustomerSamplesCreate()"
+            color="primary"
+            fab
+            icon="add"
+            shortcut="+"
+        />
         <QTooltip>
             {{ t('Send sample') }}
         </QTooltip>

src/pages/Customer/Card/CustomerSummary.vue

@@ -13,6 +13,7 @@ import VnTitle from 'src/components/common/VnTitle.vue';
 import VnRow from 'src/components/ui/VnRow.vue';
 const route = useRoute();
 const { t } = useI18n();
+const grafanaUrl = 'https://grafana.verdnatura.es';
 
 const $props = defineProps({
     id: {

src/pages/Customer/CustomerFilter.vue

@@ -1,35 +1,20 @@
 <script setup>
-import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
-
-import FetchData from 'components/FetchData.vue';
 import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
 import VnSelect from 'components/common/VnSelect.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 
 const { t } = useI18n();
-const props = defineProps({
+defineProps({
     dataKey: {
         type: String,
         required: true,
     },
 });
-
-const provinces = ref();
-const workers = ref();
-const zones = ref();
 </script>
 
 <template>
-    <FetchData url="Provinces" @on-fetch="(data) => (provinces = data)" auto-load />
+    <VnFilterPanel :data-key="dataKey" :search-button="true" search-url="table">
-    <FetchData url="Zones" @on-fetch="(data) => (zones = data)" auto-load />
-    <FetchData
-        url="Workers/activeWithInheritedRole"
-        :filter="{ where: { role: 'salesPerson' } }"
-        @on-fetch="(data) => (workers = data)"
-        auto-load
-    />
-    <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>
@@ -65,15 +50,14 @@ const zones = ref();
                 </QItemSection>
             </QItem>
             <QItem class="q-mb-sm">
-                <QItemSection v-if="!workers">
+                <QItemSection>
-                    <QSkeleton type="QInput" class="full-width" />
-                </QItemSection>
-                <QItemSection v-if="workers">
                     <VnSelect
+                        url="Workers/activeWithInheritedRole"
+                        :filter="{ where: { role: 'salesPerson' } }"
+                        auto-load
                         :label="t('Salesperson')"
                         v-model="params.salesPersonFk"
                         @update:model-value="searchFn()"
-                        :options="workers"
                         option-value="id"
                         option-label="name"
                         emit-value
@@ -88,15 +72,12 @@ const zones = ref();
                 </QItemSection>
             </QItem>
             <QItem class="q-mb-sm">
-                <QItemSection v-if="!provinces">
+                <QItemSection
-                    <QSkeleton type="QInput" class="full-width" />
+                    ><VnSelect
-                </QItemSection>
+                        url="Provinces"
-                <QItemSection v-if="provinces">
-                    <VnSelect
                         :label="t('Province')"
                         v-model="params.provinceFk"
                         @update:model-value="searchFn()"
-                        :options="provinces"
                         option-value="id"
                         option-label="name"
                         emit-value
@@ -105,6 +86,7 @@ const zones = ref();
                         dense
                         outlined
                         rounded
+                        auto-load
                         :input-debounce="0"
                     />
                 </QItemSection>
@@ -135,25 +117,21 @@ const zones = ref();
                     </QItemSection>
                 </QItem>
                 <QItem>
-                    <QItemSection v-if="!zones">
+                    <VnSelect
-                        <QSkeleton type="QInput" class="full-width" />
+                        url="Zones"
-                    </QItemSection>
+                        :label="t('Zone')"
-                    <QItemSection v-if="zones">
+                        v-model="params.zoneFk"
-                        <VnSelect
+                        @update:model-value="searchFn()"
-                            :label="t('Zone')"
+                        option-value="id"
-                            v-model="params.zoneFk"
+                        option-label="name"
-                            @update:model-value="searchFn()"
+                        emit-value
-                            :options="zones"
+                        map-options
-                            option-value="id"
+                        hide-selected
-                            option-label="name"
+                        dense
-                            emit-value
+                        outlined
-                            map-options
+                        rounded
-                            hide-selected
+                        auto-load
-                            dense
+                    />
-                            outlined
-                            rounded
-                        />
-                    </QItemSection>
                 </QItem>
                 <QItem>
                     <QItemSection>

src/pages/Customer/CustomerList.vue

@@ -8,10 +8,10 @@ import VnLocation from 'src/components/common/VnLocation.vue';
 import VnSearchbar from 'components/ui/VnSearchbar.vue';
 import CustomerSummary from './Card/CustomerSummary.vue';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
-
+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';
 
 const { t } = useI18n();
 const router = useRouter();
@@ -397,6 +397,11 @@ function handleLocation(data, location) {
         :label="t('Search customer')"
         data-key="Customer"
     />
+    <RightMenu>
+        <template #right-panel>
+            <CustomerFilter data-key="Customer" />
+        </template>
+    </RightMenu>
     <VnTable
         ref="tableRef"
         data-key="Customer"
@@ -413,6 +418,7 @@ function handleLocation(data, location) {
         order="id DESC"
         :columns="columns"
         redirect="customer"
+        :right-search="false"
         auto-load
     >
         <template #more-create-dialog="{ data }">

src/pages/Customer/Defaulter/CustomerDefaulter.vue

@@ -3,7 +3,6 @@ import { ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
 import { toCurrency, toDate, dateRange } from 'filters/index';
-import CustomerNotificationsFilter from './CustomerDefaulterFilter.vue';
 import CustomerBalanceDueTotal from './CustomerBalanceDueTotal.vue';
 import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
@@ -11,7 +10,6 @@ import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import CustomerDefaulterAddObservation from './CustomerDefaulterAddObservation.vue';
 import DepartmentDescriptorProxy from 'src/pages/Department/Card/DepartmentDescriptorProxy.vue';
-import RightMenu from 'src/components/common/RightMenu.vue';
 import VnTable from 'src/components/VnTable/VnTable.vue';
 
 const { t } = useI18n();
@@ -192,11 +190,6 @@ function exprBuilder(param, value) {
 </script>
 
 <template>
-    <RightMenu>
-        <template #right-panel>
-            <CustomerNotificationsFilter data-key="CustomerDefaulter" />
-        </template>
-    </RightMenu>
     <VnSubToolbar>
         <template #st-data>
             <CustomerBalanceDueTotal :amount="balanceDueTotal" />

src/pages/Customer/components/CustomerAddressCreate.vue

@@ -134,6 +134,7 @@ function handleLocation(data, location) {
                     option-label="fiscalName"
                     option-value="id"
                     v-model="data.customsAgentFk"
+                    :tooltip="t('Create a new expense')"
                 >
                     <template #form>
                         <CustomerNewCustomsAgent @on-data-saved="refreshData()" />

src/pages/Customer/components/CustomerAddressEdit.vue

@@ -11,7 +11,7 @@ import VnRow from 'components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import VnSelectDialog from 'src/components/common/VnSelectDialog.vue';
-import CustomsNewCustomsAgent from 'src/pages/Customer/components/CustomerNewCustomsAgent.vue';
+import CustomerNewCustomsAgent from 'src/pages/Customer/components/CustomerNewCustomsAgent.vue';
 
 const { t } = useI18n();
 const route = useRoute();
@@ -226,9 +226,10 @@ function handleLocation(data, location) {
                         option-label="fiscalName"
                         option-value="id"
                         v-model="data.customsAgentFk"
+                        :tooltip="t('New customs agent')"
                     >
                         <template #form>
-                            <CustomsNewCustomsAgent />
+                            <CustomerNewCustomsAgent />
                         </template>
                     </VnSelectDialog>
                 </div>
@@ -272,16 +273,17 @@ function handleLocation(data, location) {
                 </div>
             </VnRow>
 
-            <QIcon
+            <QBtn
                 @click.stop="addNote()"
                 class="cursor-pointer add-icon q-mt-md"
-                name="add"
+                flat
-                size="sm"
+                icon="add"
+                shortcut="+"
             >
                 <QTooltip>
                     {{ t('Add note') }}
                 </QTooltip>
-            </QIcon>
+            </QBtn>
         </template>
     </FormModel>
 </template>
@@ -308,6 +310,7 @@ es:
     Mobile: Movíl
     Incoterms: Incoterms
     Customs agent: Agente de aduanas
+    New customs agent: Nuevo agente de aduanas
     Notes: Notas
     Observation type: Tipo de observación
     Description: Descripción

src/pages/Customer/components/CustomerChangePassword.vue

@@ -46,7 +46,6 @@ const onSubmit = async () => {
     };
     try {
         await axios.patch(`Clients/${$props.id}/setPassword`, payload);
-        await $props.promise();
     } catch (error) {
         notify('errors.create', 'negative');
     } finally {

src/pages/Customer/components/CustomerSummaryTable.vue

@@ -35,6 +35,7 @@ const filter = {
     ],
     where: { clientFk: route.params.id },
     order: ['shipped DESC', 'id'],
+    limit: 30,
 };
 
 const columns = computed(() => [
@@ -149,7 +150,6 @@ const setShippedColor = (date) => {
         auto-load
         order="shipped DESC, id"
         :disable-option="{ card: true, table: true }"
-        limit="5"
         class="full-width"
         :disable-infinite-scroll="true"
     >

src/pages/Customer/locale/es.yml

@@ -58,7 +58,7 @@ customer:
         vies: VIES
         payMethod: Método de pago
         bankAccount: Cuenta bancaria
-        dueDay: Día de pago
+        dueDay: Vencimiento
         hasLcr: Recibido LCR
         hasCoreVnl: Recibido core VNL
         hasB2BVnl: Recibido B2B VNL

src/pages/Entry/Card/EntryNotes.vue

@@ -138,7 +138,13 @@ const columns = computed(() => [
         </template>
     </CrudModel>
     <QPageSticky position="bottom-right" :offset="[25, 25]">
-        <QBtn fab color="primary" icon="add" @click="entryObservationsRef.insert()" />
+        <QBtn
+            fab
+            color="primary"
+            icon="add"
+            shortcut="+"
+            @click="entryObservationsRef.insert()"
+        />
     </QPageSticky>
 </template>
 <i18n>

src/pages/Entry/Card/EntrySummary.vue

@@ -10,6 +10,7 @@ import TravelDescriptorProxy from 'src/pages/Travel/Card/TravelDescriptorProxy.v
 import { toDate, toCurrency } from 'src/filters';
 import { getUrl } from 'src/composables/getUrl';
 import axios from 'axios';
+import FetchedTags from 'src/components/ui/FetchedTags.vue';
 
 const route = useRoute();
 const { t } = useI18n();
@@ -163,7 +164,7 @@ const fetchEntryBuys = async () => {
     >
         <template #header-left>
             <router-link
-                v-if="route.name !== 'EntrySummary'"
+                v-if="route?.name !== 'EntrySummary'"
                 :to="{ name: 'EntrySummary', params: { id: entityId } }"
                 class="header link"
                 :href="entryUrl"
@@ -184,7 +185,10 @@ const fetchEntryBuys = async () => {
                     <QIcon name="open_in_new" />
                 </router-link>
                 <VnLv :label="t('entry.summary.commission')" :value="entry.commission" />
-                <VnLv :label="t('entry.summary.currency')" :value="entry.currency.name" />
+                <VnLv
+                    :label="t('entry.summary.currency')"
+                    :value="entry.currency?.name"
+                />
                 <VnLv :label="t('entry.summary.company')" :value="entry.company.code" />
                 <VnLv :label="t('entry.summary.reference')" :value="entry.reference" />
                 <VnLv
@@ -210,12 +214,12 @@ const fetchEntryBuys = async () => {
                 </VnLv>
                 <VnLv
                     :label="t('entry.summary.travelAgency')"
-                    :value="entry.travel.agency.name"
+                    :value="entry.travel.agency?.name"
                 />
                 <VnLv :label="t('shipped')" :value="toDate(entry.travel.shipped)" />
                 <VnLv
                     :label="t('entry.summary.travelWarehouseOut')"
-                    :value="entry.travel.warehouseOut.name"
+                    :value="entry.travel.warehouseOut?.name"
                 />
                 <QCheckbox
                     :label="t('entry.summary.travelDelivered')"
@@ -225,7 +229,7 @@ const fetchEntryBuys = async () => {
                 <VnLv :label="t('landed')" :value="toDate(entry.travel.landed)" />
                 <VnLv
                     :label="t('entry.summary.travelWarehouseIn')"
-                    :value="entry.travel.warehouseIn.name"
+                    :value="entry.travel.warehouseIn?.name"
                 />
                 <QCheckbox
                     :label="t('entry.summary.travelReceived')"
@@ -281,17 +285,17 @@ const fetchEntryBuys = async () => {
                 >
                     <template #body="{ cols, row, rowIndex }">
                         <QTr no-hover>
-                            <QTd v-for="col in cols" :key="col.name">
+                            <QTd v-for="col in cols" :key="col?.name">
                                 <component
-                                    :is="tableColumnComponents[col.name].component(props)"
+                                    :is="tableColumnComponents[col?.name].component()"
-                                    v-bind="tableColumnComponents[col.name].props(props)"
+                                    v-bind="tableColumnComponents[col?.name].props()"
-                                    @click="tableColumnComponents[col.name].event(props)"
+                                    @click="tableColumnComponents[col?.name].event()"
                                     class="col-content"
                                 >
                                     <template
                                         v-if="
-                                            col.name !== 'observation' &&
+                                            col?.name !== 'observation' &&
-                                            col.name !== 'isConfirmed'
+                                            col?.name !== 'isConfirmed'
                                         "
                                         >{{ col.value }}</template
                                     >

src/pages/Entry/EntryLatestBuys.vue

@@ -1,16 +1,17 @@
 <script setup>
 import { onMounted, onUnmounted, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
-import RightMenu from 'src/components/common/RightMenu.vue';
-import VnTable from 'components/VnTable/VnTable.vue';
-import EntryLatestBuysFilter from './EntryLatestBuysFilter.vue';
 import { useStateStore } from 'stores/useStateStore';
+import { toDate } from 'src/filters';
+
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
+import RightMenu from 'src/components/common/RightMenu.vue';
+import EntryLatestBuysFilter from './EntryLatestBuysFilter.vue';
+import VnTable from 'components/VnTable/VnTable.vue';
+import VnImg from 'src/components/ui/VnImg.vue';
+
 const stateStore = useStateStore();
 const { t } = useI18n();
-import { toDate } from 'src/filters';
-import VnImg from 'src/components/ui/VnImg.vue';
-import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
-
 const columns = [
     {
         align: 'center',

src/pages/Entry/EntryLatestBuysFilter.vue

@@ -4,6 +4,7 @@ import { useI18n } from 'vue-i18n';
 
 import FetchData from 'components/FetchData.vue';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
+import VnInput from 'components/common/VnInput.vue';
 import VnSelect from 'components/common/VnSelect.vue';
 import ItemsFilterPanel from 'src/components/ItemsFilterPanel.vue';
 
@@ -18,6 +19,7 @@ defineProps({
 
 const itemTypeWorkersOptions = ref([]);
 const suppliersOptions = ref([]);
+const tagValues = ref([]);
 </script>
 
 <template>

src/pages/Entry/EntryStockBought.vue

@@ -47,17 +47,16 @@ const columns = [
         },
     },
     {
-        align: 'left',
+        align: 'center',
         label: t('Reserve'),
         name: 'reserve',
         columnFilter: false,
         create: true,
         component: 'number',
         summation: true,
-        cardVisible: true,
     },
     {
-        align: 'left',
+        align: 'center',
         label: t('Bought'),
         name: 'bought',
         summation: true,
@@ -77,7 +76,7 @@ const columns = [
         name: 'tableActions',
         actions: [
             {
-                title: t('More'),
+                title: t('View more details'),
                 icon: 'search',
                 isPrimary: true,
                 action: (row) => {
@@ -101,14 +100,9 @@ const travel = ref(null);
 const userParams = ref({
     dated: Date.vnNew(),
 });
+
 const filter = ref({
-    where: {
+    fields: ['id', 'm3', 'warehouseInFk'],
-        shipped: (userParams.value.dated
-            ? new Date(userParams.value.dated)
-            : Date.vnNew()
-        ).setHours(0, 0, 0, 0),
-        m3: { neq: null },
-    },
     include: [
         {
             relation: 'warehouseIn',
@@ -117,6 +111,13 @@ const filter = ref({
             },
         },
     ],
+    where: {
+        shipped: (userParams.value.dated
+            ? new Date(userParams.value.dated)
+            : Date.vnNew()
+        ).setHours(0, 0, 0, 0),
+        m3: { neq: null },
+    },
 });
 
 const setUserParams = async ({ dated }) => {
@@ -128,6 +129,22 @@ const setUserParams = async ({ dated }) => {
 function openDialog() {
     travelDialogRef.value = true;
 }
+
+function setFooter(data) {
+    const footer = {
+        bought: 0,
+        reserve: 0,
+    };
+    data.forEach((row) => {
+        footer.bought += row?.bought;
+        footer.reserve += row?.reserve;
+    });
+    tableRef.value.footer = footer;
+}
+
+function round(value) {
+    return Math.round(value * 100) / 100;
+}
 </script>
 <template>
     <VnSubToolbar>
@@ -139,7 +156,9 @@ function openDialog() {
                 :filter="filter"
                 @on-fetch="
                     (data) => {
-                        travel = data.filter((data) => data.warehouseIn.code === 'VNH');
+                        travel = data.find(
+                            (data) => data.warehouseIn.code.toLowerCase() === 'vnh'
+                        );
                     }
                 "
             />
@@ -149,10 +168,10 @@ function openDialog() {
                         {{ t('Booked trucks') }}:
                     </span>
                     <span>
-                        {{ travel[0]?.m3 }}
+                        {{ travel?.m3 }}
                     </span>
                     <QBtn
-                        v-if="travel[0]?.m3"
+                        v-if="travel?.m3"
                         style="max-width: 20%"
                         flat
                         icon="edit"
@@ -166,10 +185,10 @@ function openDialog() {
     </VnSubToolbar>
     <QDialog v-model="travelDialogRef" :maximized="true" :class="['vn-row', 'wrap']">
         <FormModelPopup
-            :url-update="`Travels/${travel[0].id}`"
+            :url-update="`Travels/${travel?.id}`"
             model="travel"
             :title="t('Travel m3')"
-            :form-initial-data="{ id: travel[0].id, m3: travel[0].m3 }"
+            :form-initial-data="{ id: travel?.id, m3: travel?.m3 }"
             @on-data-saved="fetchDataRef.fetch()"
         >
             <template #form-inputs="{ data }">
@@ -192,51 +211,80 @@ function openDialog() {
             />
         </template>
     </RightMenu>
-    <QPage class="column items-center q-pa-md">
+    <div class="table-container">
-        <VnTable
+        <div class="column items-center">
-            ref="tableRef"
+            <VnTable
-            data-key="StockBoughts"
+                ref="tableRef"
-            url="StockBoughts/getStockBought"
+                data-key="StockBoughts"
-            save-url="StockBoughts/crud"
+                url="StockBoughts/getStockBought"
-            order="reserve DESC"
+                save-url="StockBoughts/crud"
-            :right-search="false"
+                order="reserve DESC"
-            :is-editable="true"
+                :right-search="false"
-            :create="{
+                :is-editable="true"
-                urlCreate: 'StockBoughts',
+                @on-fetch="(data) => setFooter(data)"
-                title: t('Reserve some space'),
+                :create="{
-                onDataSaved: () => tableRef.reload(),
+                    urlCreate: 'StockBoughts',
-                formInitialData: {
+                    title: t('Reserve some space'),
-                    workerFk: user.id,
+                    onDataSaved: () => tableRef.reload(),
-                    dated: Date.vnNow(),
+                    formInitialData: {
-                },
+                        workerFk: user.id,
-            }"
+                        dated: Date.vnNow(),
-            :columns="columns"
+                    },
-            :user-params="userParams"
+                }"
-            :footer="true"
+                :columns="columns"
-            auto-load
+                :user-params="userParams"
-        >
+                :footer="true"
-            <template #column-workerFk="{ row }">
+                table-height="80vh"
-                <span class="link" @click.stop>
+                auto-load
-                    {{ row?.worker?.user?.name }}
+            >
-                    <WorkerDescriptorProxy :id="row?.workerFk" />
+                <template #column-workerFk="{ row }">
-                </span>
+                    <span class="link" @click.stop>
-            </template>
+                        {{ row?.worker?.user?.name }}
-        </VnTable>
+                        <WorkerDescriptorProxy :id="row?.workerFk" />
-    </QPage>
+                    </span>
+                </template>
+                <template #column-bought="{ row }">
+                    <span :class="{ 'text-negative': row.reserve < row.bought }">
+                        {{ row?.bought }}
+                    </span>
+                </template>
+                <template #column-footer-reserve>
+                    <span>
+                        {{ round(tableRef.footer.reserve) }}
+                    </span>
+                </template>
+                <template #column-footer-bought>
+                    <span
+                        :class="{
+                            'text-negative':
+                                tableRef.footer.reserve < tableRef.footer.bought,
+                        }"
+                    >
+                        {{ round(tableRef.footer.bought) }}
+                    </span>
+                </template>
+            </VnTable>
+        </div>
+    </div>
 </template>
-<style lang="css" scoped>
+<style lang="scss" scoped>
 .travel {
     margin-bottom: 0px;
 }
+.table-container {
+    display: flex;
+    justify-content: center;
+}
+.column {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+}
+.text-negative {
+    color: $negative !important;
+}
 </style>
 <i18n>
-    en:
-        Buyer: Buyer
-        Reserve: Reserve
-        Bought: Bought
-        More: More
-        Date: Date
-        This buyer has already made a reservation for this date: This buyer has already made a reservation for this date
     es:
         Edit travel: Editar envío
         Travel: Envíos
@@ -244,8 +292,8 @@ function openDialog() {
         Buyer: Comprador
         Reserve: Reservado
         Bought: Comprado
-        More: Más
         Date: Fecha
+        View more details: Ver más detalles
         Reserve some space: Reservar espacio
-        This buyer has already made a reservation for this date: Este comprador ya ha hecho una reserva para esta fecha
+        This buyer has already made a reservation for this date: Este comprador ya ha hecho una reserva para esta fecha 
 </i18n>

src/pages/Entry/EntryStockBoughtDetail.vue

@@ -22,7 +22,7 @@ const customUrl = `StockBoughts/getStockBoughtDetail?workerFk=${$props.workerFk}
 const columns = [
     {
         align: 'left',
-        label: 'Entry',
+        label: t('Entry'),
         name: 'entryFk',
         isTitle: true,
         isId: true,
@@ -41,29 +41,33 @@ const columns = [
         create: true,
         columnClass: 'expand',
         columnFilter: false,
+        cardVisible: true,
     },
     {
         align: 'left',
         name: 'volume',
         label: t('Volume'),
         columnFilter: false,
+        cardVisible: true,
     },
     {
         align: 'left',
         label: t('Packaging'),
         name: 'packagingFk',
         columnFilter: false,
+        cardVisible: true,
     },
     {
         align: 'left',
         label: 'Packing',
         name: 'packing',
         columnFilter: false,
+        cardVisible: true,
     },
 ];
 </script>
 <template>
-    <QDialog :maximized="true">
+    <QDialog>
         <div class="container">
             <VnTable
                 ref="tableRef"
@@ -78,13 +82,13 @@ const columns = [
                 auto-load
             >
                 <template #column-entryFk="{ row }">
-                    <span class="link" @click.stop>
+                    <span class="link">
                         {{ row?.entryFk }}
                         <EntryDescriptorProxy :id="row.entryFk" />
                     </span>
                 </template>
                 <template #column-itemName="{ row }">
-                    <span class="link" @click.stop>
+                    <span class="link">
                         {{ row?.itemName }}
                         <ItemDescriptorProxy :id="row.itemFk" />
                     </span>
@@ -93,14 +97,18 @@ const columns = [
         </div>
     </QDialog>
 </template>
-<style lang="css">
+<style lang="css" scoped>
-.q-dialog__inner {
+.container {
     max-width: 50vw;
     overflow: auto;
-    display: flex;
     justify-content: center;
     align-items: center;
     margin: auto;
+    background-color: var(--vn-section-color);
+    padding: 4px;
+}
+.container > div > div > .q-table__top.relative-position.row.items-center {
+    background-color: red !important;
 }
 </style>
 <i18n>
@@ -110,4 +118,9 @@ const columns = [
         Bought: Comprado
         More: Más
         Date: Fecha
+        Entry: Entrada
+        Item: Artículo
+        Name: Nombre
+        Volume: Volumen
+        Packaging: Embalage 
 </i18n>

src/pages/Entry/MyEntries.vue

@@ -9,22 +9,27 @@ import VnTable from 'components/VnTable/VnTable.vue';
 
 const { t } = useI18n();
 const quasar = useQuasar();
+const params = {
+    daysOnward: 7,
+    daysAgo: 3,
+};
+
 const columns = computed(() => [
     {
         align: 'left',
         name: 'id',
-        label: t('customer.extendedList.tableVisibleColumns.id'),
+        label: t('myEntries.id'),
         columnFilter: false,
         isTitle: true,
     },
     {
         visible: false,
         align: 'right',
-        label: t('shipped'),
+        label: t('myEntries.shipped'),
         name: 'shipped',
         columnFilter: {
             name: 'fromShipped',
-            label: t('fromShipped'),
+            label: t('myEntries.fromShipped'),
             component: 'date',
         },
         format: ({ shipped }) => toDate(shipped),
@@ -32,11 +37,11 @@ const columns = computed(() => [
     {
         visible: false,
         align: 'left',
-        label: t('shipped'),
+        label: t('myEntries.shipped'),
         name: 'shipped',
         columnFilter: {
             name: 'toShipped',
-            label: t('toShipped'),
+            label: t('myEntries.toShipped'),
             component: 'date',
         },
         format: ({ shipped }) => toDate(shipped),
@@ -44,14 +49,14 @@ const columns = computed(() => [
     },
     {
         align: 'right',
-        label: t('shipped'),
+        label: t('myEntries.shipped'),
         name: 'shipped',
         columnFilter: false,
         format: ({ shipped }) => toDate(shipped),
     },
     {
         align: 'right',
-        label: t('landed'),
+        label: t('myEntries.landed'),
         name: 'landed',
         columnFilter: false,
         format: ({ landed }) => toDate(landed),
@@ -59,26 +64,36 @@ const columns = computed(() => [
 
     {
         align: 'right',
-        label: t('globals.wareHouseIn'),
+        label: t('myEntries.wareHouseIn'),
         name: 'warehouseInFk',
-        format: (row) => row.warehouseInName,
+        format: (row) => {
+            row.warehouseInName;
+        },
         cardVisible: true,
         columnFilter: {
+            name: 'warehouseInFk',
+            label: t('myEntries.warehouseInFk'),
             component: 'select',
             attrs: {
                 url: 'warehouses',
                 fields: ['id', 'name'],
                 optionLabel: 'name',
                 optionValue: 'id',
+                alias: 't',
             },
-            alias: 't',
             inWhere: true,
         },
     },
     {
         align: 'left',
-        label: t('globals.daysOnward'),
+        label: t('myEntries.daysOnward'),
-        name: 'days',
+        name: 'daysOnward',
+        visible: false,
+    },
+    {
+        align: 'left',
+        label: t('myEntries.daysAgo'),
+        name: 'daysAgo',
         visible: false,
     },
     {
@@ -88,6 +103,7 @@ const columns = computed(() => [
             {
                 title: t('printLabels'),
                 icon: 'print',
+                isPrimary: true,
                 action: (row) => printBuys(row.id),
             },
         ],
@@ -114,9 +130,11 @@ const printBuys = (rowId) => {
         data-key="myEntriesList"
         url="Entries/filter"
         :columns="columns"
+        :user-params="params"
         default-mode="card"
         order="shipped DESC"
         auto-load
+        chip-locale="myEntries"
     />
 </template>
 

src/pages/Entry/locale/en.yml

@@ -6,9 +6,15 @@ entryFilter:
     filter:
         search: General search
         reference: Reference
-landed: Landed
+myEntries:
-shipped: Shipped
+    id: ID
-fromShipped: Shipped(from)
+    landed: Landed
-toShipped: Shipped(to)
+    shipped: Shipped
-printLabels: Print stickers
+    fromShipped: Shipped(from)
-viewLabel: View sticker
+    toShipped: Shipped(to)
+    printLabels: Print stickers
+    viewLabel: View sticker
+    wareHouseIn: Warehouse in
+    warehouseInFk: Warehouse in
+    daysOnward: Days onward
+    daysAgo: Days ago

src/pages/Entry/locale/es.yml

@@ -9,10 +9,15 @@ entryFilter:
     filter:
         search: Búsqueda general
         reference: Referencia
-
+myEntries:
-landed: F. llegada
+    id: ID
-shipped: F. salida
+    landed: F. llegada
-fromShipped: F. salida(desde)
+    shipped: F. salida
-toShipped: F. salida(hasta)
+    fromShipped: F. salida(desde)
-printLabels: Imprimir etiquetas
+    toShipped: F. salida(hasta)
-viewLabel: Ver etiqueta
+    printLabels: Imprimir etiquetas
+    viewLabel: Ver etiqueta
+    wareHouseIn: Alm. entrada
+    warehouseInFk: Alm. entrada
+    daysOnward: Días adelante
+    daysAgo: Días atras

src/pages/InvoiceIn/Card/InvoiceInBasicData.vue

@@ -281,6 +281,7 @@ async function onSubmit() {
                             v-else
                             icon="add_circle"
                             round
+                            shortcut="+"
                             padding="xs"
                             @click="setCreateDms()"
                         >

src/pages/InvoiceIn/Card/InvoiceInDueDay.vue

@@ -230,7 +230,7 @@ async function insert() {
         </template>
     </CrudModel>
     <QPageSticky position="bottom-right" :offset="[25, 25]">
-        <QBtn color="primary" icon="add" size="lg" round @click="insert" />
+        <QBtn color="primary" icon="add" shortcut="+" size="lg" round @click="insert" />
     </QPageSticky>
 </template>
 <style lang="scss" scoped>

src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue

@@ -224,6 +224,7 @@ const formatOpt = (row, { model, options }, prop) => {
         <QBtn
             color="primary"
             icon="add"
+            shortcut="+"
             size="lg"
             round
             @click="invoiceInFormRef.insert()"

src/pages/InvoiceIn/Card/InvoiceInVat.vue

@@ -405,6 +405,7 @@ const formatOpt = (row, { model, options }, prop) => {
             color="primary"
             icon="add"
             size="lg"
+            shortcut="+"
             round
             @click="invoiceInFormRef.insert()"
         >

src/pages/InvoiceOut/Card/InvoiceOutDescriptorProxy.vue

@@ -1,5 +1,6 @@
 <script setup>
 import InvoiceOutDescriptor from './InvoiceOutDescriptor.vue';
+import InvoiceOutSummary from './InvoiceOutSummary.vue';
 
 const $props = defineProps({
     id: {
@@ -10,6 +11,10 @@ const $props = defineProps({
 </script>
 <template>
     <QPopupProxy>
-        <InvoiceOutDescriptor v-if="$props.id" :id="$props.id" />
+        <InvoiceOutDescriptor
+            v-if="$props.id"
+            :id="$props.id"
+            :summary="InvoiceOutSummary"
+        />
     </QPopupProxy>
 </template>

src/pages/InvoiceOut/InvoiceOutList.vue

@@ -27,13 +27,16 @@ const { openReport } = usePrintService();
 
 const columns = computed(() => [
     {
-        align: 'left',
+        align: 'center',
         name: 'id',
         label: t('invoiceOutList.tableVisibleColumns.id'),
         chip: {
             condition: () => true,
         },
         isId: true,
+        columnFilter: {
+            name: 'search',
+        },
     },
     {
         align: 'left',
@@ -177,7 +180,7 @@ watchEffect(selectedRows);
     <VnSearchbar
         :info="t('youCanSearchByInvoiceReference')"
         :label="t('searchInvoice')"
-        data-key="InvoiceOutList"
+        data-key="invoiceOut"
     />
     <VnSubToolbar>
         <template #st-actions>

src/pages/InvoiceOut/InvoiceOutNegativeBases.vue

@@ -9,6 +9,7 @@ import { useArrayData } from 'src/composables/useArrayData';
 import CustomerDescriptorProxy from '../Customer/Card/CustomerDescriptorProxy.vue';
 import TicketDescriptorProxy from '../Ticket/Card/TicketDescriptorProxy.vue';
 import WorkerDescriptorProxy from '../Worker/Card/WorkerDescriptorProxy.vue';
+import VnInputDate from 'components/common/VnInputDate.vue';
 
 const { t } = useI18n();
 const tableRef = ref();
@@ -64,7 +65,8 @@ const columns = computed(() => [
         cardVisible: true,
         attrs: {
             url: 'Clients',
-            fields: ['id', 'name'],
+            optionLabel: 'socialName',
+            optionValue: 'socialName',
         },
         columnField: {
             component: null,
@@ -192,10 +194,33 @@ const downloadCSV = async () => {
                 <WorkerDescriptorProxy :id="row.comercialId" />
             </span>
         </template>
+        <template #moreFilterPanel="{ params }">
+            <VnInputDate
+                :label="t('params.from')"
+                v-model="params.from"
+                class="q-px-xs q-pr-lg"
+                filled
+                dense
+            />
+            <VnInputDate
+                :label="t('params.to')"
+                v-model="params.to"
+                class="q-px-xs q-pr-lg"
+                filled
+                dense
+            />
+        </template>
     </VnTable>
 </template>
 
 <i18n>
 es:
     Download as CSV: Descargar como CSV
+    params:
+        from: Desde
+        to: Hasta
+en:
+    params:
+        from: From
+        to: To
 </i18n>

src/pages/Item/Card/ItemBarcode.vue

@@ -65,17 +65,18 @@ const focusLastInput = () => {
                                 </QTooltip>
                             </QIcon>
                         </div>
-                        <QIcon
+                        <QBtn
                             @click="insertRow()"
                             class="cursor-pointer fill-icon-on-hover"
                             color="primary"
-                            name="add_circle"
+                            icon="add_circle"
-                            size="sm"
+                            shortcut="+"
+                            flat
                         >
                             <QTooltip>
                                 {{ t('Add barcode') }}
                             </QTooltip>
-                        </QIcon>
+                        </QBtn>
                     </QCard>
                 </template>
             </CrudModel>

src/pages/Item/Card/ItemCard.vue

@@ -12,7 +12,7 @@ import ItemListFilter from '../ItemListFilter.vue';
         search-data-key="ItemList"
         :searchbar-props="{
             url: 'Items/filter',
-            label: 'searchbar.labelr',
+            label: 'searchbar.label',
             info: 'searchbar.info',
         }"
     />

src/pages/Item/Card/ItemDescriptor.vue

@@ -11,7 +11,6 @@ import VnConfirm from 'components/ui/VnConfirm.vue';
 import RegularizeStockForm from 'components/RegularizeStockForm.vue';
 import ItemDescriptorImage from 'src/pages/Item/Card/ItemDescriptorImage.vue';
 import useCardDescription from 'src/composables/useCardDescription';
-import { getUrl } from 'src/composables/getUrl';
 import axios from 'axios';
 import { dashIfEmpty } from 'src/filters';
 
@@ -51,10 +50,8 @@ const entityId = computed(() => {
 const regularizeStockFormDialog = ref(null);
 const available = ref(null);
 const visible = ref(null);
-const salixUrl = ref();
 
 onMounted(async () => {
-    salixUrl.value = await getUrl('');
     await getItemConfigs();
     await updateStock();
 });
@@ -200,16 +197,11 @@ const openCloneDialog = async () => {
         <template #actions="{}">
             <QCardActions class="row justify-center">
                 <QBtn
-                    :href="
+                    :to="{
-                        salixUrl +
+                        name: 'ItemDiary',
-                        'item/' +
+                        params: { id: entityId },
-                        entityId +
+                        query: { warehouseFk, lineFk: $props.saleFk },
-                        '/diary?' +
+                    }"
-                        'warehouseFk=' +
-                        warehouseFk +
-                        '&lineFk=' +
-                        $props.saleFk
-                    "
                     size="md"
                     icon="vn:transaction"
                     color="primary"

src/pages/Item/Card/ItemTags.vue

@@ -168,19 +168,20 @@ const insertTag = (rows) => {
                             </div>
                         </VnRow>
                         <VnRow class="justify-center items-center">
-                            <QIcon
+                            <QBtn
                                 @click="insertTag(rows)"
                                 class="cursor-pointer"
                                 :disable="!validRow"
                                 color="primary"
-                                name="add"
+                                flat
-                                size="sm"
+                                icon="add"
+                                shortcut="+"
                                 style="flex: 0"
                             >
                                 <QTooltip>
                                     {{ t('itemTags.addTag') }}
                                 </QTooltip>
-                            </QIcon>
+                            </QBtn>
                         </VnRow>
                     </QCard>
                 </template>

src/pages/Item/ItemFixedPrice.vue

@@ -36,23 +36,23 @@ const user = state.getUser();
 const fixedPrices = ref([]);
 const warehousesOptions = ref([]);
 const rowsSelected = ref([]);
-
 const itemFixedPriceFilterRef = ref();
-
 const params = reactive({});
-const defaultColumnAttrs = {
+
-    align: 'left',
-    sortable: true,
-};
 onMounted(async () => {
     stateStore.rightDrawer = true;
     params.warehouseFk = user.value.warehouseFk;
 });
 onUnmounted(() => (stateStore.rightDrawer = false));
+
+const defaultColumnAttrs = {
+    align: 'left',
+    sortable: true,
+};
 const columns = computed(() => [
     {
-        label: t('item.fixedPrice.itemId'),
+        label: t('item.fixedPrice.itemFk'),
-        name: 'itemId',
+        name: 'itemFk',
         ...defaultColumnAttrs,
         isId: true,
         cardVisible: true,
@@ -426,7 +426,7 @@ function handleOnDataSave({ CrudModelRef }) {
             :default-save="false"
             data-key="ItemFixedPrices"
             url="FixedPrices/filter"
-            :order="['itemFk ASC']"
+            :order="['description DESC']"
             save-url="FixedPrices/crud"
             :user-params="{ warehouseFk: user.warehouseFk }"
             ref="tableRef"
@@ -460,7 +460,7 @@ function handleOnDataSave({ CrudModelRef }) {
                 <QCheckbox flat v-model="scope.selected" />
             </template>
 
-            <template #column-itemId="props">
+            <template #column-itemFk="props">
                 <VnSelect
                     style="max-width: 100px"
                     url="Items/withName"
@@ -514,7 +514,7 @@ function handleOnDataSave({ CrudModelRef }) {
             </template>
             <template #column-minPrice="props">
                 <QTd class="col">
-                    <div class="row">
+                    <div class="row" style="align-items: center">
                         <QCheckbox
                             :model-value="props.row.hasMinPrice"
                             @update:model-value="updateMinPrice($event, props)"
@@ -600,11 +600,14 @@ function handleOnDataSave({ CrudModelRef }) {
 .q-table th,
 .q-table td {
     padding-inline: 5px !important;
-    // text-align: -webkit-right;
+}
+.q-table tr td {
+    font-size: 10pt;
+    border-top: none;
+    border-collapse: collapse;
 }
 .q-table tbody td {
     max-width: none;
-
     .q-td.col {
         & .vnInputDate {
             min-width: 90px;

src/pages/Item/ItemRequestFilter.vue

@@ -212,6 +212,7 @@ const decrement = (paramsObj, key) => {
                                     flat
                                     dense
                                     size="12px"
+                                    shortcut="+"
                                     @click="add(params, 'scopeDays')"
                                 />
                                 <QBtn

src/pages/Monitor/MonitorClients.vue

@@ -139,7 +139,11 @@ const columns = computed(() => [
     </VnTable>
 </template>
 <style lang="scss" scoped>
-.full-width .vn-row > * {
+.full-width .vn-row {
-    flex: 0.4;
+    margin-bottom: 0;
+    flex-direction: row;
+    > * {
+        max-width: 125px;
+    }
 }
 </style>

src/pages/Monitor/MonitorOrders.vue

@@ -132,7 +132,6 @@ const openTab = (id) =>
         :table="{
             'row-key': 'id',
             selection: 'multiple',
-            'hide-bottom': true,
         }"
         default-mode="table"
         :row-click="({ id }) => openTab(id)"

src/pages/Monitor/Ticket/MonitorTicketFilter.vue

@@ -11,7 +11,7 @@ import FetchData from 'src/components/FetchData.vue';
 import { dateRange } from 'src/filters';
 
 defineProps({ dataKey: { type: String, required: true } });
-const { t } = useI18n();
+const { t, te } = useI18n();
 const warehouses = ref();
 const groupedStates = ref();
 
@@ -26,6 +26,12 @@ const handleScopeDays = (params, days, callback) => {
     }
     if (callback) callback();
 };
+
+const getLocale = (label) => {
+    const param = label.split('.').at(-1);
+    const globalLocale = `globals.params.${param}`;
+    return te(globalLocale) ? t(globalLocale) : t(`params.${param}`);
+};
 </script>
 <template>
     <FetchData url="Warehouses" auto-load @on-fetch="(data) => (warehouses = data)" />
@@ -43,10 +49,11 @@ const handleScopeDays = (params, days, callback) => {
         :hidden-tags="['from', 'to', 'search']"
         :custom-tags="['scopeDays']"
         :unremovable-params="['from', 'to', 'scopeDays']"
+        search-url="saleMonitorTickets"
     >
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">
-                <strong v-text="`${t(`params.${tag.label}`)}:`" />
+                <strong v-text="`${getLocale(tag.label)}:`" />
                 <span v-text="formatFn(tag.value)" />
             </div>
         </template>
@@ -110,7 +117,7 @@ const handleScopeDays = (params, days, callback) => {
                         url="Workers/search"
                         :params="{ departmentCodes: ['VT'] }"
                         is-outlined
-                        option-value="code"
+                        option-value="id"
                         option-label="name"
                         :no-one="true"
                     >

src/pages/Monitor/Ticket/MonitorTickets.vue

@@ -54,7 +54,6 @@ const columns = computed(() => [
         label: t('salesTicketsTable.problems'),
         name: 'totalProblems',
         align: 'left',
-
         columnFilter: false,
         attrs: {
             dense: true,
@@ -65,7 +64,6 @@ const columns = computed(() => [
         name: 'id',
         field: 'id',
         align: 'left',
-
         columnFilter: {
             component: 'number',
             name: 'id',
@@ -108,9 +106,7 @@ const columns = computed(() => [
     {
         label: t('salesTicketsTable.date'),
         name: 'shippedDate',
-        style: { 'max-width': '100px' },
         align: 'left',
-
         columnFilter: {
             component: 'date',
             name: 'shippedDate',
@@ -164,7 +160,6 @@ const columns = computed(() => [
         label: t('salesTicketsTable.state'),
         name: 'state',
         align: 'left',
-        style: { 'max-width': '100px' },
         columnFilter: {
             component: 'select',
             name: 'stateFk',
@@ -193,7 +188,6 @@ const columns = computed(() => [
         label: t('salesTicketsTable.zone'),
         name: 'zoneFk',
         align: 'left',
-
         columnFilter: {
             component: 'select',
             name: 'zoneFk',
@@ -210,8 +204,6 @@ const columns = computed(() => [
         name: 'totalWithVat',
         field: 'totalWithVat',
         align: 'left',
-        style: { 'max-width': '75px' },
-
         columnFilter: {
             component: 'number',
             name: 'totalWithVat',
@@ -370,7 +362,7 @@ const openTab = (id) =>
             </QCheckbox>
         </template>
         <template #column-totalProblems="{ row }">
-            <QTd class="no-padding" style="max-width: 60px">
+            <span>
                 <QIcon
                     v-if="row.isTaxDataChecked === 0"
                     name="vn:no036"
@@ -424,46 +416,40 @@ const openTab = (id) =>
                 >
                     <QTooltip>{{ $t('salesTicketsTable.tooLittle') }}</QTooltip>
                 </QIcon>
-            </QTd>
+            </span>
         </template>
         <template #column-id="{ row }">
-            <QTd class="no-padding">
+            <span class="link" @click.stop.prevent>
-                <span class="link" @click.stop.prevent>
+                {{ row.id }}
-                    {{ row.id }}
+                <TicketDescriptorProxy :id="row.id" />
-                    <TicketDescriptorProxy :id="row.id" />
+            </span>
-                </span>
-            </QTd>
         </template>
         <template #column-clientFk="{ row }">
-            <QTd class="no-padding" @click.stop :title="row.nickname">
+            <div @click.stop :title="row.nickname">
-                <span class="link">{{ row.nickname }}</span>
+                <span class="link" v-text="row.nickname" />
                 <CustomerDescriptorProxy :id="row.clientFk" />
-            </QTd>
+            </div>
         </template>
         <template #column-salesPersonFk="{ row }">
-            <QTd class="no-padding" @click.stop :title="row.userName">
+            <div @click.stop :title="row.userName">
                 <span class="link" v-text="dashIfEmpty(row.userName)" />
                 <WorkerDescriptorProxy :id="row.salesPersonFk" />
-            </QTd>
+            </div>
         </template>
         <template #column-shippedDate="{ row }">
-            <QTd class="no-padding">
+            <QBadge
-                <QBadge
+                v-bind="getBadgeAttrs(row.shippedDate)"
-                    v-bind="getBadgeAttrs(row.shippedDate)"
+                class="q-pa-sm"
-                    class="q-pa-sm"
+                style="font-size: 14px"
-                    style="font-size: 14px"
+            >
-                >
+                {{ formatShippedDate(row.shippedDate) }}
-                    {{ formatShippedDate(row.shippedDate) }}
+            </QBadge>
-                </QBadge>
-            </QTd>
         </template>
         <template #column-provinceFk="{ row }">
-            <QTd class="no-padding">
+            <span :title="row.province" v-text="row.province" />
-                <span :title="row.province" v-text="row.province" />
-            </QTd>
         </template>
         <template #column-state="{ row }">
-            <QTd class="no-padding" @click.stop.prevent>
+            <div @click.stop.prevent>
                 <div v-if="row.refFk">
                     <span class="link">{{ row.refFk }}</span>
                     <InvoiceOutDescriptorProxy :id="row.invoiceOutId" />
@@ -477,32 +463,33 @@ const openTab = (id) =>
                 >
                     {{ row.state }}
                 </QBadge>
-            </QTd>
+            </div>
         </template>
         <template #column-isFragile="{ row }">
-            <QTd class="no-padding">
+            <QIcon v-if="row.isFragile" name="local_bar" color="primary" size="sm">
-                <QIcon v-if="row.isFragile" name="local_bar" color="primary" size="sm">
+                <QTooltip>{{ $t('salesTicketsTable.isFragile') }}</QTooltip>
-                    <QTooltip>{{ $t('salesTicketsTable.isFragile') }}</QTooltip>
+            </QIcon>
-                </QIcon>
-            </QTd>
         </template>
         <template #column-zoneFk="{ row }">
-            <QTd class="no-padding" @click.stop.prevent :title="row.zoneName">
+            <div @click.stop.prevent :title="row.zoneName">
                 <span class="link">{{ row.zoneName }}</span>
                 <ZoneDescriptorProxy :id="row.zoneFk" />
-            </QTd>
+            </div>
         </template>
         <template #column-totalWithVat="{ row }">
-            <QTd class="no-padding">
+            <QBadge
-                <QBadge
+                :color="totalPriceColor(row) || 'transparent'"
-                    :color="totalPriceColor(row) || 'transparent'"
+                :text-color="totalPriceColor(row) ? 'black' : 'white'"
-                    :text-color="totalPriceColor(row) ? 'black' : 'white'"
+                class="q-pa-sm"
-                    class="q-pa-sm"
+                style="font-size: 14px"
-                    style="font-size: 14px"
+            >
-                >
+                {{ toCurrency(row.totalWithVat) }}
-                    {{ toCurrency(row.totalWithVat) }}
+            </QBadge>
-                </QBadge>
-            </QTd>
         </template>
     </VnTable>
 </template>
+<style lang="scss" scoped>
+td .q-icon {
+    margin: 0 2px;
+}
+</style>

src/pages/Order/Card/OrderCatalogFilter.vue

@@ -374,8 +374,10 @@ function addOrder(value, field, params) {
                 />
             </QItem>
             <QItem class="q-mt-lg">
-                <QIcon
+                <QBtn
-                    name="add_circle"
+                    icon="add_circle"
+                    shortcut="+"
+                    flat
                     class="filter-icon"
                     @click="tagValues.push({})"
                 />

src/pages/Order/Card/OrderLines.vue

@@ -249,7 +249,7 @@ watch(
         @on-fetch="(data) => (orderSummary.vat = data)"
         auto-load
     />
-    <QDrawer side="right" :width="270" v-model="stateStore.rightDrawer">
+    <QDrawer side="right" :width="265" v-model="stateStore.rightDrawer">
         <QCard
             class="order-lines-summary q-pa-lg"
             v-if="orderSummary.vat && orderSummary.total"

src/pages/Order/OrderList.vue

@@ -14,14 +14,15 @@ import OrderFilter from './Card/OrderFilter.vue';
 import CustomerDescriptorProxy from '../Customer/Card/CustomerDescriptorProxy.vue';
 import WorkerDescriptorProxy from '../Worker/Card/WorkerDescriptorProxy.vue';
 import { toDateTimeFormat } from 'src/filters/date';
+import { onMounted } from 'vue';
+import { useRoute } from 'vue-router';
 
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
 const tableRef = ref();
 const agencyList = ref([]);
 const addressesList = ref([]);
-const clientId = ref();
+const route = useRoute();
-
 const columns = computed(() => [
     {
         align: 'left',
@@ -169,6 +170,13 @@ const getDateColor = (date) => {
     if (comparation == 0) return 'bg-warning';
     if (comparation < 0) return 'bg-success';
 };
+
+onMounted(() => {
+    if (!route.query.createForm) return;
+    const clientId = route.query.createForm;
+    const id = JSON.parse(clientId);
+    fetchClientAddress(id.clientFk, id);
+});
 </script>
 <template>
     <OrderSearchbar />
@@ -184,13 +192,14 @@ const getDateColor = (date) => {
         :order="['landed DESC', 'clientFk ASC', 'id DESC']"
         :create="{
             urlCreate: 'Orders/new',
-            title: 'Create Order',
+            title: t('module.cerateOrder'),
             onDataSaved: (url) => {
                 tableRef.redirect(url);
             },
             formInitialData: {
                 active: true,
                 addressId: null,
+                clientFk: null,
             },
         }"
         :user-params="{ showEmpty: false }"
@@ -221,7 +230,7 @@ const getDateColor = (date) => {
             <VnSelect
                 url="Clients"
                 :include="{ relation: 'addresses' }"
-                v-model="clientId"
+                v-model="data.clientFk"
                 :label="t('module.customer')"
                 @update:model-value="(id) => fetchClientAddress(id, data)"
             />

src/pages/Order/locale/en.yml

@@ -10,6 +10,7 @@ module:
     total: Total
     salesPerson: Sales Person
     address: Address
+    cerateOrder: Create order
 lines:
     item: Item
     warehouse: Warehouse

src/pages/Order/locale/es.yml

@@ -10,6 +10,7 @@ module:
     total: Total
     salesPerson: Comercial
     address: Dirección
+    cerateOrder: Crear cesta
 lines:
     item: Artículo
     warehouse: Almacén

src/pages/Route/Agency/AgencyList.vue

@@ -27,12 +27,15 @@ const columns = computed(() => [
             condition: () => true,
         },
         isId: true,
+        columnFilter: false,
     },
     {
         align: 'left',
         label: t('globals.name'),
         name: 'name',
         isTitle: true,
+        columnFilter: false,
+        columnClass: 'expand',
     },
     {
         align: 'left',
@@ -70,18 +73,33 @@ const columns = computed(() => [
         data-key="AgencyList"
         :expr-builder="exprBuilder"
     />
-    <VnTable
+    <div class="list-container">
-        ref="tableRef"
+        <div class="list">
-        data-key="AgencyList"
+            <VnTable
-        url="Agencies"
+                data-key="AgencyList"
-        order="name"
+                url="Agencies"
-        :columns="columns"
+                order="name"
-        :right-search="false"
+                :columns="columns"
-        :use-model="true"
+                :right-search="false"
-        redirect="agency"
+                :use-model="true"
-        default-mode="card"
+                redirect="agency"
-    />
+                default-mode="card"
+            />
+        </div>
+    </div>
 </template>
+<style lang="scss" scoped>
+.list {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    width: 55%;
+}
+.list-container {
+    display: flex;
+    justify-content: center;
+}
+</style>
 <i18n>
     es:
         isOwn: Tiene propietario

src/pages/Route/Agency/Card/AgencyWorkcenter.vue

@@ -88,7 +88,7 @@ async function deleteWorCenter(id) {
         </VnPaginate>
     </div>
     <QPageSticky :offset="[18, 18]">
-        <QBtn @click.stop="dialog.show()" color="primary" fab icon="add">
+        <QBtn @click.stop="dialog.show()" color="primary" fab shortcut="+" icon="add">
             <QDialog ref="dialog">
                 <FormModelPopup
                     :title="t('Add work center')"

src/pages/Route/Card/RouteListTicketsDialog.vue

@@ -167,8 +167,8 @@ const setTicketsRoute = async () => {
                         <QTd :props="props">
                             <span class="link">
                                 {{ props.value }}
-                                <TicketDescriptorProxy :id="props?.row?.id" />
                             </span>
+                            <TicketDescriptorProxy :id="props?.row?.id" />
                         </QTd>
                     </template>
                     <template #body-cell-client="props">