CHANGELOG.md

@@ -1,3 +1,100 @@
+# Version 24.24 - 2024-06-11
+
+### Added 🆕
+
+-   feat: 6942 hashtag in key : value summary by:jgallego
+-   feat: #6957: Rename FetchedTags instance tag by:Javier Segarra
+-   feat: refactor template by:Javier Segarra
+-   feat: refs #6600 Add option to add comment for photo motivation by:jorgep
+-   feat: refs #6942 test e2e tobook & toUnbook by:jorgep
+-   feat: refs #6942 to book summary button & reactive value by:jorgep
+-   feat: refs #6942 to unbook by:jorgep
+-   feat: refs #6942 url update by:jorgep
+-   feat: refs #6942 use correct currency in InvoiceIn components by:jorgep
+-   feat: refs #6942 vat rate total by:jorgep
+-   feat: refs #7494 new icons (7494-icons) by:alexm
+-   feat: refs #7494 new icons by:alexm
+-   feat: refs #7542 drop space by:jorgep
+-   feat: refs #7542 empty by:jorgep
+-   fix: refs #6942 changes and new features by:jorgep
+-   fix: style by:Javier Segarra
+-   style: color transparent when is fetive by:Javier Segarra
+-   style: fix color when is empty by:Javier Segarra
+-   style: reset poc style (6957_refactorFetechedTags) by:Javier Segarra
+-   style: reset poc style by:Javier Segarra
+-   style updates by:Javier Segarra
+
+### Changed 📦
+
+-   feat: refactor template by:Javier Segarra
+-   perf: 6957 add color as new shared variable by:Javier Segarra
+-   perf: 6957 change fetchedTags color by:Javier Segarra
+-   perf: remove local tree variable by:Javier Segarra
+-   refactor: add flat by:alexm
+-   refactor: refs #6600 replace QInput to VnInput by:jorgep
+-   refactor: refs #6652 improved defaulter section by:Jon
+-   refactor: refs #6942 Fix getTotalAmount function to correctly calculate the total amount in InvoiceInDueDay.vue by:jorgep
+-   refactor: refs #6942 new summary layout by:jorgep
+-   refactor: refs #6942 store key & actions by:jorgep
+-   refactor: refs #6942 summary by:jorgep
+-   refactor: refs #6942 use router hook by:jorgep
+-   refactor: refs #6942 WIP summary layout by:jorgep
+
+### Fixed 🛠️
+
+-   fix: 9-12 by:Javier Segarra
+-   fix: defaulter icon by:alexm
+-   fix: refs #5186 validation by:jorgep
+-   fix: refs #6095 add reFfk null on search by:pablone
+-   fix: refs #6942 cardDescriptor use store if its popup or different source data by:jorgep
+-   fix: refs #6942 changes and new features by:jorgep
+-   fix: refs #6942 drop comments by:jorgep
+-   fix: refs #6942 drop console by:jorgep
+-   fix: refs #6942 drop console.log by:jorgep
+-   fix: refs #6942 e2e test (origin/6942-warmfix-fixFormModel) by:jorgep
+-   fix: refs #6942 e2e tests by:jorgep
+-   fix: refs #6942 e2e tests by:jorgep
+-   fix: refs #6942 fix emit on data saved by:jorgep
+-   fix: refs #6942 fix emit on reset by:jorgep
+-   fix: refs #6942 fix vncard by:jorgep
+-   fix: refs #6942 formModel & CardDescriptor by:jorgep
+-   fix: refs #6942 formModel watch changes & invoiceInCreate by:jorgep
+-   fix: refs #6942 import by:jorgep
+-   fix: refs #6942 reloading by:jorgep
+-   fix: refs #6942 rollback by:jorgep
+-   fix: refs #6942 selectable expense by:jorgep
+-   fix: refs #6942 skip e2e tests by:jorgep
+-   fix: refs #6942 table bottom highlight & drop isBooked field by:jorgep
+-   fix: refs #6942 tests e2e by:jorgep
+-   fix: refs #6942 tests & summary table spacing by:jorgep
+-   fix: refs #6942 unit tests by:jorgep
+-   fix: refs #6942 vnLocation by:jorgep
+-   fix: refs #6942 wip: formModel by:jorgep
+-   fix: refs #7542 use right panel by:jorgep
+-   fix: searchbar redirect by:alexm
+-   fix: style by:Javier Segarra
+-   fix: WorkerCalendarItem by:Javier Segarra
+-   mini fix by:wbuezas
+-   refs #6111 clean code fix changes by:carlossa
+-   refs #6111 fix merge, fix column by:carlossa
+-   refs #6111 fix qtable, actions, scroll by:carlossa
+-   refs #6111 fix routeList by:carlossa
+-   refs #6111 fix sticky by:carlossa
+-   refs #6111 fix trad remove logs by:carlossa
+-   refs #6111 fix visibleColumns by:carlossa
+-   refs #6111 routeList fix by:carlossa
+-   refs #6332 fix calendar by:carlossa
+-   refs #6332 fix colors by:carlossa
+-   refs #6332 fix festive by:carlossa
+-   refs #6820 fix BasicData Tickets by:carlossa
+-   refs #6820 fix error front by:carlossa
+-   refs #6820 fix traduction by:carlossa
+-   refs #7391 fix textarea by:carlossa
+-   refs #7396 fix summary by:carlossa
+-   Search childs fix by:wbuezas
+-   small fix by:wbuezas
+-   style: fix color when is empty by:Javier Segarra
+
 # Changelog
 
 All notable changes to this project will be documented in this file.
@@ -7,6 +104,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [2420.01]
 
+### Added
+
+-   (Item) => Se añade la opción de añadir un comentario del motivo de hacer una foto
+-   (Worker) => Se añade la opción de crear un trabajador ajeno a la empresa
+-   (Route) => Ahora se muestran todos los cmrs
+
 ## [2418.01]
 
 ## [2416.01] - 2024-04-18

Jenkinsfile

@@ -94,7 +94,7 @@ pipeline {
                 sh 'quasar build'
                 script {
                     def packageJson = readJSON file: 'package.json'
-                    env.VERSION = packageJson.version
+                    env.VERSION = "${packageJson.version}-build${env.BUILD_ID}"
                 }
                 dockerBuild()
             }
@@ -106,7 +106,7 @@ pipeline {
             steps {
                 script {
                     def packageJson = readJSON file: 'package.json'
-                    env.VERSION = packageJson.version
+                    env.VERSION = "${packageJson.version}-build${env.BUILD_ID}"
                 }
                 withKubeConfig([
                     serverUrl: "$KUBERNETES_API",

changelog.sh

@@ -0,0 +1,34 @@
+features_types=(chore feat style)
+changes_types=(refactor perf)
+fix_types=(fix revert)
+file="CHANGELOG.md"
+file_tmp="temp_log.txt"
+file_current_tmp="temp_current_log.txt"
+
+setType(){
+    echo "### $1" >> $file_tmp
+    arr=("$@")
+    echo "" > $file_current_tmp
+    for i in "${arr[@]}"
+    do
+        git log --grep="$i" --oneline --no-merges --format="- %s %d by:%an" master..test >> $file_current_tmp
+    done
+    # remove duplicates
+    sort -o $file_current_tmp -u $file_current_tmp
+    cat $file_current_tmp >> $file_tmp
+    echo "" >> $file_tmp
+    # remove tmp current file
+    [ -e $file_current_tmp ] && rm $file_current_tmp
+}
+
+echo "# Version XX.XX - XXXX-XX-XX" >> $file_tmp
+echo "" >> $file_tmp
+
+setType "Added 🆕" "${features_types[@]}"
+setType "Changed 📦" "${changes_types[@]}"
+setType "Fixed 🛠️" "${fix_types[@]}"
+
+cat $file >> $file_tmp
+mv $file_tmp $file
+
+

package.json

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

src/boot/qformMixin.js

@@ -1,21 +1,48 @@
 import { getCurrentInstance } from 'vue';
 
-const filterAvailableInput = element => element.classList.contains('q-field__native') && !element.disabled
-const filterAvailableText = element => element.__vueParentComponent.type.name === 'QInput' && element.__vueParentComponent?.attrs?.class !== 'vn-input-date';
-
+const filterAvailableInput = (element) => {
+    return element.classList.contains('q-field__native') && !element.disabled;
+};
+const filterAvailableText = (element) => {
+    return (
+        element.__vueParentComponent.type.name === 'QInput' &&
+        element.__vueParentComponent?.attrs?.class !== 'vn-input-date'
+    );
+};
 
 export default {
     mounted: function () {
         const vm = getCurrentInstance();
-        if (vm.type.name === 'QForm')
-            if (!['searchbarForm','filterPanelForm'].includes(this.$el?.id)) {
+        if (vm.type.name === 'QForm') {
+            if (!['searchbarForm', 'filterPanelForm'].includes(this.$el?.id)) {
                 // AUTOFOCUS
                 const elementsArray = Array.from(this.$el.elements);
-                const firstInputElement = elementsArray.filter(filterAvailableInput).find(filterAvailableText);
+                const availableInputs = elementsArray.filter(filterAvailableInput);
+                const firstInputElement = availableInputs.find(filterAvailableText);
 
                 if (firstInputElement) {
                     firstInputElement.focus();
                 }
+                const that = this;
+                this.$el.addEventListener('keyup', function (evt) {
+                    if (evt.key === 'Enter') {
+                        const input = evt.target;
+                        console.log('input', input);
+                        if (input.type == 'textarea' && evt.shiftKey) {
+                            evt.preventDefault();
+                            let { selectionStart, selectionEnd } = input;
+                            input.value =
+                                input.value.substring(0, selectionStart) +
+                                '\n' +
+                                input.value.substring(selectionEnd);
+                            selectionStart = selectionEnd = selectionStart + 1;
+                            return;
+                        }
+                        evt.preventDefault();
+                        that.onSubmit();
+                    }
+                });
             }
+        }
     },
 };

src/components/EditPictureForm.vue

@@ -155,7 +155,7 @@ const rotateRight = () => {
     editor.value.rotate(-90);
 };
 
-const onUploadAccept = () => {
+const onSubmit = () => {
     try {
         if (!newPhoto.files && !newPhoto.url) {
             notify(t('Select an image'), 'negative');
@@ -206,7 +206,7 @@ const makeRequest = async () => {
         @on-fetch="(data) => (allowedContentTypes = data.join(', '))"
         auto-load
     />
-    <QForm @submit="onUploadAccept()" class="all-pointer-events">
+    <QForm @submit="onSubmit()" class="all-pointer-events">
         <QCard class="q-pa-lg">
             <span ref="closeButton" class="close-icon" v-close-popup>
                 <QIcon name="close" size="sm" />

src/components/EditTableCellValueForm.vue

@@ -50,7 +50,7 @@ const onDataSaved = () => {
     closeForm();
 };
 
-const submitData = async () => {
+const onSubmit = async () => {
     try {
         isLoading.value = true;
         const rowsToEdit = $props.rows.map((row) => ({ id: row.id, itemFk: row.itemFk }));
@@ -74,7 +74,7 @@ const closeForm = () => {
 </script>
 
 <template>
-    <QForm @submit="submitData()" class="all-pointer-events">
+    <QForm @submit="onSubmit()" class="all-pointer-events">
         <QCard class="q-pa-lg">
             <span ref="closeButton" class="close-icon" v-close-popup>
                 <QIcon name="close" size="sm" />

src/components/FilterItemForm.vue

@@ -83,7 +83,7 @@ const tableColumns = computed(() => [
     },
 ]);
 
-const fetchResults = async () => {
+const onSubmit = async () => {
     try {
         let filter = itemFilter;
         const params = itemFilterParams;
@@ -145,7 +145,7 @@ const selectItem = ({ id }) => {
         @on-fetch="(data) => (InksOptions = data)"
         auto-load
     />
-    <QForm @submit="fetchResults()" class="all-pointer-events">
+    <QForm @submit="onSubmit()" class="all-pointer-events">
         <QCard class="column" style="padding: 32px; z-index: 100">
             <span ref="closeButton" class="close-icon" v-close-popup>
                 <QIcon name="close" size="sm" />

src/components/FilterTravelForm.vue

@@ -85,7 +85,7 @@ const tableColumns = computed(() => [
     },
 ]);
 
-const fetchResults = async () => {
+const onSubmit = async () => {
     try {
         let filter = travelFilter;
         const params = travelFilterParams;
@@ -138,7 +138,7 @@ const selectTravel = ({ id }) => {
         @on-fetch="(data) => (warehousesOptions = data)"
         auto-load
     />
-    <QForm @submit="fetchResults()" class="all-pointer-events">
+    <QForm @submit="onSubmit()" class="all-pointer-events">
         <QCard class="column" style="padding: 32px; z-index: 100">
             <span ref="closeButton" class="close-icon" v-close-popup>
                 <QIcon name="close" size="sm" />

src/components/FormModel.vue

@@ -12,6 +12,7 @@ import SkeletonForm from 'components/ui/SkeletonForm.vue';
 import VnConfirm from './ui/VnConfirm.vue';
 import { tMobile } from 'src/composables/tMobile';
 import { useArrayData } from 'src/composables/useArrayData';
+import { useRoute } from 'vue-router';
 
 const { push } = useRouter();
 const quasar = useQuasar();
@@ -20,6 +21,7 @@ const stateStore = useStateStore();
 const { t } = useI18n();
 const { validate } = useValidator();
 const { notify } = useNotify();
+const route = useRoute();
 
 const $props = defineProps({
     url: {
@@ -28,7 +30,7 @@ const $props = defineProps({
     },
     model: {
         type: String,
-        default: '',
+        default: null,
     },
     filter: {
         type: Object,
@@ -82,17 +84,18 @@ const $props = defineProps({
         description: 'It is used for redirect on click "save and continue"',
     },
 });
-
 const emit = defineEmits(['onFetch', 'onDataSaved']);
-
+const modelValue = computed(
+    () => $props.model ?? `formModel_${route?.meta?.title ?? route.name}`
+);
 const componentIsRendered = ref(false);
-const arrayData = useArrayData($props.model);
+const arrayData = useArrayData(modelValue);
 const isLoading = ref(false);
 // Si elegimos observar los cambios del form significa que inicialmente las actions estaran deshabilitadas
 const isResetting = ref(false);
 const hasChanges = ref(!$props.observeFormChanges);
 const originalData = ref({});
-const formData = computed(() => state.get($props.model));
+const formData = computed(() => state.get(modelValue));
 const formUrl = computed(() => $props.url);
 const defaultButtons = computed(() => ({
     save: {
@@ -114,10 +117,10 @@ onMounted(async () => {
     nextTick(() => (componentIsRendered.value = true));
 
     // Podemos enviarle al form la estructura de data inicial sin necesidad de fetchearla
-    state.set($props.model, $props.formInitialData);
+    state.set(modelValue, $props.formInitialData);
 
     if ($props.autoLoad && !$props.formInitialData && $props.url) await fetch();
-    else if (arrayData.store.data) updateAndEmit(arrayData.store.data, 'onFetch');
+    else if (arrayData.store.data) updateAndEmit('onFetch', arrayData.store.data);
 
     if ($props.observeFormChanges) {
         watch(
@@ -137,7 +140,7 @@ onMounted(async () => {
 if (!$props.url)
     watch(
         () => arrayData.store.data,
-        (val) => updateAndEmit(val, 'onFetch')
+        (val) => updateAndEmit('onFetch', val)
     );
 
 watch(formUrl, async () => {
@@ -161,8 +164,8 @@ onBeforeRouteLeave((to, from, next) => {
 
 onUnmounted(() => {
     // Restauramos los datos originales en el store si se realizaron cambios en el formulario pero no se guardaron, evitando modificaciones erróneas.
-    if (hasChanges.value) return state.set($props.model, originalData.value);
-    if ($props.clearStoreOnUnmount) state.unset($props.model);
+    if (hasChanges.value) return state.set(modelValue, originalData.value);
+    if ($props.clearStoreOnUnmount) state.unset(modelValue);
 });
 
 async function fetch() {
@@ -172,9 +175,9 @@ async function fetch() {
         });
         if (Array.isArray(data)) data = data[0] ?? {};
 
-        updateAndEmit(data, 'onFetch');
-    } catch (error) {
-        state.set($props.model, {});
+        updateAndEmit('onFetch', data);
+    } catch (e) {
+        state.set(modelValue, {});
         originalData.value = {};
     }
 }
@@ -196,13 +199,13 @@ async function save() {
 
         if ($props.urlCreate) notify('globals.dataCreated', 'positive');
 
-        hasChanges.value = false;
-        isLoading.value = false;
-
-        updateAndEmit(response?.data, 'onDataSaved');
+        updateAndEmit('onDataSaved', formData.value, response?.data);
     } catch (err) {
         console.error(err);
         notify('errors.writeRequest', 'negative');
+    } finally {
+        hasChanges.value = false;
+        isLoading.value = false;
     }
 }
 
@@ -212,7 +215,7 @@ async function saveAndGo() {
 }
 
 function reset() {
-    updateAndEmit(originalData.value, 'onFetch');
+    updateAndEmit('onFetch', originalData.value);
     if ($props.observeFormChanges) {
         hasChanges.value = false;
         isResetting.value = true;
@@ -234,12 +237,12 @@ function filter(value, update, filterOptions) {
     );
 }
 
-function updateAndEmit(val, evt) {
-    state.set($props.model, val);
+function updateAndEmit(evt, val, res) {
+    state.set(modelValue, val);
     originalData.value = val && JSON.parse(JSON.stringify(val));
     if (!$props.url) arrayData.store.data = val;
 
-    emit(evt, state.get($props.model));
+    emit(evt, state.get(modelValue), res);
 }
 
 defineExpose({ save, isLoading, hasChanges });

src/components/FormModelPopup.vue

@@ -4,7 +4,7 @@ import { useI18n } from 'vue-i18n';
 
 import FormModel from 'components/FormModel.vue';
 
-const emit = defineEmits(['onDataSaved']);
+const emit = defineEmits(['onDataSaved', 'onDataCanceled']);
 
 defineProps({
     title: {
@@ -15,26 +15,6 @@ defineProps({
         type: String,
         default: '',
     },
-    url: {
-        type: String,
-        default: '',
-    },
-    model: {
-        type: String,
-        default: '',
-    },
-    filter: {
-        type: Object,
-        default: null,
-    },
-    urlCreate: {
-        type: String,
-        default: null,
-    },
-    formInitialData: {
-        type: Object,
-        default: () => {},
-    },
 });
 
 const { t } = useI18n();
@@ -43,8 +23,8 @@ const formModelRef = ref(null);
 const closeButton = ref(null);
 
 const onDataSaved = (formData, requestResponse) => {
-    emit('onDataSaved', formData, requestResponse);
     closeForm();
+    emit('onDataSaved', formData, requestResponse);
 };
 
 const isLoading = computed(() => formModelRef.value?.isLoading);
@@ -61,11 +41,9 @@ defineExpose({
 <template>
     <FormModel
         ref="formModelRef"
-        :form-initial-data="formInitialData"
         :observe-form-changes="false"
         :default-actions="false"
-        :url-create="urlCreate"
-        :model="model"
+        v-bind="$attrs"
         @on-data-saved="onDataSaved"
     >
         <template #form="{ data, validate }">
@@ -84,6 +62,7 @@ defineExpose({
                     flat
                     :disabled="isLoading"
                     :loading="isLoading"
+                    @click="emit('onDataCanceled')"
                     v-close-popup
                 />
                 <QBtn

src/components/FormPopup.vue

@@ -74,7 +74,7 @@ const closeForm = () => {
                     :disabled="isLoading"
                     :loading="isLoading"
                 />
-                <slot name="customButtons" />
+                <slot name="custom-buttons" />
             </div>
         </QCard>
     </QForm>

src/components/LeftMenuItem.vue

@@ -20,7 +20,13 @@ const itemComputed = computed(() => {
 });
 </script>
 <template>
-    <QItem active-class="bg-hover" :to="{ name: itemComputed.name }" clickable v-ripple>
+    <QItem
+        active-class="bg-hover"
+        class="min-height"
+        :to="{ name: itemComputed.name }"
+        clickable
+        v-ripple
+    >
         <QItemSection avatar v-if="itemComputed.icon">
             <QIcon :name="itemComputed.icon" />
         </QItemSection>
@@ -33,3 +39,9 @@ const itemComputed = computed(() => {
         </QItemSection>
     </QItem>
 </template>
+
+<style lang="scss" scoped>
+.q-item {
+    min-height: 5vh;
+}
+</style>

src/components/UserPanel.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { onMounted, computed } from 'vue';
+import { onMounted, computed, ref } from 'vue';
 import { Dark, Quasar } from 'quasar';
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
@@ -10,13 +10,12 @@ import { localeEquivalence } from 'src/i18n/index';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import FetchData from 'components/FetchData.vue';
+import { useClipboard } from 'src/composables/useClipboard';
 
 const state = useState();
 const session = useSession();
 const router = useRouter();
 const { t, locale } = useI18n();
-import { useClipboard } from 'src/composables/useClipboard';
-import { ref } from 'vue';
 const { copyText } = useClipboard();
 const userLocale = computed({
     get() {
@@ -91,6 +90,15 @@ function logout() {
 function copyUserToken() {
     copyText(session.getToken(), { label: 'components.userPanel.copyToken' });
 }
+
+function localUserData() {
+    state.setUser(user.value);
+}
+
+function saveUserData(param, value) {
+    axios.post('UserConfigs/setUserConfig', { [param]: value });
+    localUserData();
+}
 </script>
 
 <template>
@@ -180,6 +188,7 @@ function copyUserToken() {
                     option-value="id"
                     input-debounce="0"
                     hide-selected
+                    @update:model-value="localUserData"
                 />
                 <VnSelect
                     :label="t('components.userPanel.localBank')"
@@ -189,6 +198,7 @@ function copyUserToken() {
                     option-value="id"
                     input-debounce="0"
                     hide-selected
+                    @update:model-value="localUserData"
                 >
                     <template #option="{ itemProps, opt }">
                         <QItem v-bind="itemProps">
@@ -210,6 +220,7 @@ function copyUserToken() {
                     option-label="code"
                     option-value="id"
                     input-debounce="0"
+                    @update:model-value="localUserData"
                 />
                 <VnSelect
                     :label="t('components.userPanel.userWarehouse')"
@@ -219,6 +230,7 @@ function copyUserToken() {
                     option-label="name"
                     option-value="id"
                     input-debounce="0"
+                    @update:model-value="(v) => saveUserData('warehouseFk', v)"
                 />
             </VnRow>
             <VnRow>
@@ -232,6 +244,7 @@ function copyUserToken() {
                     style="flex: 0"
                     dense
                     input-debounce="0"
+                    @update:model-value="(v) => saveUserData('companyFk', v)"
                 />
             </VnRow>
         </div>

src/components/common/RightMenu.vue

@@ -9,19 +9,18 @@ const rightPanel = ref(null);
 
 onMounted(() => {
     rightPanel.value = document.querySelector('#right-panel');
-    if (rightPanel.value.childNodes.length) hasContent.value = true;
+    if (!rightPanel.value) return;
 
     // Check if there's content to display
     const observer = new MutationObserver(() => {
         hasContent.value = rightPanel.value.childNodes.length;
     });
 
-    if (rightPanel.value)
-        observer.observe(rightPanel.value, {
-            subtree: true,
-            childList: true,
-            attributes: true,
-        });
+    observer.observe(rightPanel.value, {
+        subtree: true,
+        childList: true,
+        attributes: true,
+    });
 
     if (!slots['right-panel'] && !hasContent.value) stateStore.rightDrawer = false;
 });
@@ -30,7 +29,7 @@ const { t } = useI18n();
 const stateStore = useStateStore();
 </script>
 <template>
-    <Teleport to="#actions-append">
+    <Teleport to="#actions-append" v-if="stateStore.isHeaderMounted()">
         <div class="row q-gutter-x-sm">
             <QBtn
                 v-if="hasContent || $slots['right-panel']"

src/components/common/VnCard.vue

@@ -21,7 +21,8 @@ const props = defineProps({
     searchbarLabel: { type: String, default: '' },
     searchbarInfo: { type: String, default: '' },
     searchCustomRouteRedirect: { type: String, default: undefined },
-    searchRedirect: { type: Boolean, default: false },
+    searchRedirect: { type: Boolean, default: true },
+    searchMakeFetch: { type: Boolean, default: true },
 });
 
 const stateStore = useStateStore();
@@ -56,33 +57,34 @@ watchEffect(() => {
 });
 </script>
 <template>
-    <template v-if="stateStore.isHeaderMounted()">
-        <Teleport to="#searchbar" v-if="props.searchDataKey">
-            <slot name="searchbar">
-                <VnSearchbar
-                    :data-key="props.searchDataKey"
-                    :url="props.searchUrl"
-                    :label="props.searchbarLabel"
-                    :info="props.searchbarInfo"
-                    :custom-route-redirect-name="searchCustomRouteRedirect"
-                    :redirect="searchRedirect"
-                />
-            </slot>
-        </Teleport>
-        <slot v-else name="searchbar" />
-        <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
-            <QScrollArea class="fit">
-                <component :is="descriptor" />
-                <QSeparator />
-                <LeftMenu source="card" />
-            </QScrollArea>
-        </QDrawer>
-        <RightMenu>
-            <template #right-panel v-if="props.filterPanel">
-                <component :is="props.filterPanel" :data-key="props.searchDataKey" />
-            </template>
-        </RightMenu>
-    </template>
+    <QDrawer
+        v-model="stateStore.leftDrawer"
+        show-if-above
+        :width="256"
+        v-if="stateStore.isHeaderMounted()"
+    >
+        <QScrollArea class="fit">
+            <component :is="descriptor" />
+            <QSeparator />
+            <LeftMenu source="card" />
+        </QScrollArea>
+    </QDrawer>
+    <slot name="searchbar" v-if="props.searchDataKey">
+        <VnSearchbar
+            :data-key="props.searchDataKey"
+            :url="props.searchUrl"
+            :label="props.searchbarLabel"
+            :info="props.searchbarInfo"
+            :custom-route-redirect-name="searchCustomRouteRedirect"
+            :redirect="searchRedirect"
+        />
+    </slot>
+    <slot v-else name="searchbar" />
+    <RightMenu>
+        <template #right-panel v-if="props.filterPanel">
+            <component :is="props.filterPanel" :data-key="props.searchDataKey" />
+        </template>
+    </RightMenu>
     <QPageContainer>
         <QPage>
             <VnSubToolbar />

src/components/common/VnInput.vue

@@ -13,6 +13,10 @@ const $props = defineProps({
         type: Boolean,
         default: false,
     },
+    info: {
+        type: String,
+        default: '',
+    },
 });
 
 const { t } = useI18n();
@@ -74,15 +78,20 @@ const inputRules = [
             <template v-if="$slots.prepend" #prepend>
                 <slot name="prepend" />
             </template>
-            
+
             <template #append>
                 <slot name="append" v-if="$slots.append && !$attrs.disabled" />
                 <QIcon
                     name="close"
                     size="xs"
-                    v-if="$slots.append && hover && value && !$attrs.disabled"
+                    v-if="hover && value && !$attrs.disabled"
                     @click="value = null"
                 ></QIcon>
+                <QIcon v-if="info" name="info">
+                    <QTooltip max-width="350px">
+                        {{ info }}
+                    </QTooltip>
+                </QIcon>
             </template>
         </QInput>
     </div>

src/components/common/VnInputTime.vue

@@ -2,7 +2,6 @@
 import { computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import isValidDate from 'filters/isValidDate';
-import VnInput from 'components/common/VnInput.vue';
 
 const props = defineProps({
     modelValue: {

src/components/common/VnLog.vue

@@ -622,145 +622,140 @@ setLogTree();
             </QList>
         </div>
     </div>
-    <QDrawer v-model="stateStore.rightDrawer" show-if-above side="right" :width="300">
-        <QScrollArea class="fit text-grey-8">
-            <QList dense>
-                <QSeparator />
-                <QItem class="q-mt-sm">
-                    <QInput
-                        :label="t('globals.search')"
-                        v-model="searchInput"
-                        class="full-width"
-                        clearable
-                        clear-icon="close"
-                        @keyup.enter="() => selectFilter('search')"
-                        @focusout="() => selectFilter('search')"
-                        @clear="() => selectFilter('search')"
-                    >
-                        <template #append>
-                            <QIcon name="info" class="cursor-pointer">
-                                <QTooltip>{{ t('tooltips.search') }}</QTooltip>
-                            </QIcon>
-                        </template>
-                    </QInput>
-                </QItem>
-                <QItem>
+    <Teleport to="#right-panel" v-if="stateStore.isHeaderMounted()">
+        <QList dense>
+            <QSeparator />
+            <QItem class="q-mt-sm">
+                <QInput
+                    :label="t('globals.search')"
+                    v-model="searchInput"
+                    class="full-width"
+                    clearable
+                    clear-icon="close"
+                    @keyup.enter="() => selectFilter('search')"
+                    @focusout="() => selectFilter('search')"
+                    @clear="() => selectFilter('search')"
+                >
+                    <template #append>
+                        <QIcon name="info" class="cursor-pointer">
+                            <QTooltip>{{ t('tooltips.search') }}</QTooltip>
+                        </QIcon>
+                    </template>
+                </QInput>
+            </QItem>
+            <QItem>
+                <VnSelect
+                    class="full-width"
+                    :label="t('globals.entity')"
+                    v-model="selectedFilters.changedModel"
+                    option-label="locale"
+                    option-value="value"
+                    :options="actions"
+                    @update:model-value="selectFilter('action')"
+                    hide-selected
+                />
+            </QItem>
+            <QItem class="q-mt-sm">
+                <QOptionGroup
+                    size="sm"
+                    v-model="userRadio"
+                    :options="userTypes"
+                    color="primary"
+                    @update:model-value="selectFilter('userRadio')"
+                    right-label
+                >
+                    <template #label="{ label }">
+                        {{ t(`Users.${label}`) }}
+                    </template>
+                </QOptionGroup>
+            </QItem>
+            <QItem class="q-mt-sm">
+                <QItemSection v-if="!workers">
+                    <QSkeleton type="QInput" class="full-width" />
+                </QItemSection>
+                <QItemSection v-if="workers && userRadio !== null">
                     <VnSelect
                         class="full-width"
-                        :label="t('globals.entity')"
-                        v-model="selectedFilters.changedModel"
-                        option-label="locale"
-                        option-value="value"
-                        :options="actions"
-                        @update:model-value="selectFilter('action')"
+                        :label="t('globals.user')"
+                        v-model="userSelect"
+                        option-label="name"
+                        option-value="id"
+                        :options="workers"
+                        @update:model-value="selectFilter('userSelect')"
                         hide-selected
-                    />
-                </QItem>
-                <QItem class="q-mt-sm">
-                    <QOptionGroup
-                        size="sm"
-                        v-model="userRadio"
-                        :options="userTypes"
-                        color="primary"
-                        @update:model-value="selectFilter('userRadio')"
-                        right-label
                     >
-                        <template #label="{ label }">
-                            {{ t(`Users.${label}`) }}
+                        <template #option="{ opt, itemProps }">
+                            <QItem v-bind="itemProps" class="q-pa-xs row items-center">
+                                <QItemSection class="col-3 items-center">
+                                    <VnAvatar :worker-id="opt.id" />
+                                </QItemSection>
+                                <QItemSection class="col-9 justify-center">
+                                    <span>{{ opt.name }}</span>
+                                    <span class="text-grey">{{ opt.nickname }}</span>
+                                </QItemSection>
+                            </QItem>
                         </template>
-                    </QOptionGroup>
-                </QItem>
-                <QItem class="q-mt-sm">
-                    <QItemSection v-if="!workers">
-                        <QSkeleton type="QInput" class="full-width" />
-                    </QItemSection>
-                    <QItemSection v-if="workers && userRadio !== null">
-                        <VnSelect
-                            class="full-width"
-                            :label="t('globals.user')"
-                            v-model="userSelect"
-                            option-label="name"
-                            option-value="id"
-                            :options="workers"
-                            @update:model-value="selectFilter('userSelect')"
-                            hide-selected
-                        >
-                            <template #option="{ opt, itemProps }">
-                                <QItem
-                                    v-bind="itemProps"
-                                    class="q-pa-xs row items-center"
-                                >
-                                    <QItemSection class="col-3 items-center">
-                                        <VnAvatar :worker-id="opt.id" />
-                                    </QItemSection>
-                                    <QItemSection class="col-9 justify-center">
-                                        <span>{{ opt.name }}</span>
-                                        <span class="text-grey">{{ opt.nickname }}</span>
-                                    </QItemSection>
-                                </QItem>
-                            </template>
-                        </VnSelect>
-                    </QItemSection>
-                </QItem>
-                <QItem class="q-mt-sm">
-                    <QInput
-                        :label="t('globals.changes')"
-                        v-model="changeInput"
-                        class="full-width"
-                        clearable
-                        clear-icon="close"
-                        @keyup.enter="selectFilter('change')"
-                        @focusout="selectFilter('change')"
-                        @clear="selectFilter('change')"
-                    >
-                        <template #append>
-                            <QIcon name="info" class="cursor-pointer">
-                                <QTooltip max-width="250px">{{
-                                    t('tooltips.changes')
-                                }}</QTooltip>
-                            </QIcon>
-                        </template>
-                    </QInput>
-                </QItem>
-                <QItem
-                    :class="index == 'create' ? 'q-mt-md' : 'q-mt-xs'"
-                    v-for="(checkboxOption, index) in checkboxOptions"
-                    :key="index"
+                    </VnSelect>
+                </QItemSection>
+            </QItem>
+            <QItem class="q-mt-sm">
+                <QInput
+                    :label="t('globals.changes')"
+                    v-model="changeInput"
+                    class="full-width"
+                    clearable
+                    clear-icon="close"
+                    @keyup.enter="selectFilter('change')"
+                    @focusout="selectFilter('change')"
+                    @clear="selectFilter('change')"
                 >
-                    <QCheckbox
-                        size="sm"
-                        v-model="checkboxOption.selected"
-                        :label="t(`actions.${checkboxOption.label}`)"
-                        @update:model-value="selectFilter"
-                    />
-                </QItem>
-                <QItem class="q-mt-sm">
-                    <QInput
-                        class="full-width"
-                        :label="t('globals.date')"
-                        @click="dateFromDialog = true"
-                        @focus="(evt) => evt.target.blur()"
-                        @clear="selectFilter('date', 'to')"
-                        v-model="dateFrom"
-                        clearable
-                        clear-icon="close"
-                    />
-                </QItem>
-                <QItem class="q-mt-sm">
-                    <QInput
-                        class="full-width"
-                        :label="t('to')"
-                        @click="dateToDialog = true"
-                        @focus="(evt) => evt.target.blur()"
-                        @clear="selectFilter('date', 'from')"
-                        v-model="dateTo"
-                        clearable
-                        clear-icon="close"
-                    />
-                </QItem>
-            </QList>
-        </QScrollArea>
-    </QDrawer>
+                    <template #append>
+                        <QIcon name="info" class="cursor-pointer">
+                            <QTooltip max-width="250px">{{
+                                t('tooltips.changes')
+                            }}</QTooltip>
+                        </QIcon>
+                    </template>
+                </QInput>
+            </QItem>
+            <QItem
+                :class="index == 'create' ? 'q-mt-md' : 'q-mt-xs'"
+                v-for="(checkboxOption, index) in checkboxOptions"
+                :key="index"
+            >
+                <QCheckbox
+                    size="sm"
+                    v-model="checkboxOption.selected"
+                    :label="t(`actions.${checkboxOption.label}`)"
+                    @update:model-value="selectFilter"
+                />
+            </QItem>
+            <QItem class="q-mt-sm">
+                <QInput
+                    class="full-width"
+                    :label="t('globals.date')"
+                    @click="dateFromDialog = true"
+                    @focus="(evt) => evt.target.blur()"
+                    @clear="selectFilter('date', 'to')"
+                    v-model="dateFrom"
+                    clearable
+                    clear-icon="close"
+                />
+            </QItem>
+            <QItem class="q-mt-sm">
+                <QInput
+                    class="full-width"
+                    :label="t('to')"
+                    @click="dateToDialog = true"
+                    @focus="(evt) => evt.target.blur()"
+                    @clear="selectFilter('date', 'from')"
+                    v-model="dateTo"
+                    clearable
+                    clear-icon="close"
+                />
+            </QItem>
+        </QList>
+    </Teleport>
     <QDialog v-model="dateFromDialog">
         <QDate
             :years-in-month-view="false"

src/components/common/VnRadio.vue

@@ -0,0 +1,6 @@
+<script setup>
+const model = defineModel({ type: Boolean, required: true });
+</script>
+<template>
+    <QRadio v-model="model" v-bind="$attrs" dense :dark="true" class="q-mr-sm" />
+</template>

src/components/common/VnWeekdayPicker.vue

@@ -0,0 +1,37 @@
+<script setup>
+import { computed } from 'vue';
+
+import { useWeekdayStore } from 'src/stores/useWeekdayStore';
+
+const props = defineProps({
+    wdays: {
+        type: Array,
+        default: () => [],
+    },
+});
+
+const emit = defineEmits(['update:wdays']);
+
+const weekdayStore = useWeekdayStore();
+
+const selectedWDays = computed({
+    get: () => props.wdays,
+    set: (value) => emit('update:wdays', value),
+});
+
+const toggleDay = (index) => (selectedWDays.value[index] = !selectedWDays.value[index]);
+</script>
+
+<template>
+    <div class="q-gutter-x-sm" style="width: max-content">
+        <QBtn
+            v-for="(weekday, index) in weekdayStore.getLocalesMap"
+            :key="index"
+            :label="weekday.localeChar"
+            rounded
+            style="max-width: 36px"
+            :color="selectedWDays[weekday.index] ? 'primary' : ''"
+            @click="toggleDay(weekday.index)"
+        />
+    </div>
+</template>

src/components/ui/CardDescriptor.vue

@@ -242,6 +242,7 @@ const emit = defineEmits(['onFetch']);
     width: 256px;
     .header {
         display: flex;
+        align-items: center;
     }
     .icons {
         margin: 0 10px;

src/components/ui/CardList.vue

@@ -28,7 +28,7 @@ const toggleCardCheck = (item) => {
                         <div class="title text-primary text-weight-bold text-h5">
                             {{ $props.title }}
                         </div>
-                        <QChip class="q-chip-color" outline size="sm">
+                        <QChip v-if="$props.id" class="q-chip-color" outline size="sm">
                             {{ t('ID') }}: {{ $props.id }}
                         </QChip>
                     </div>

src/components/ui/QCalendarMonthWrapper.vue

@@ -147,7 +147,7 @@ const containerClasses = computed(() => {
     .q-calendar-month__head--workweek,
     .q-calendar-month__head--weekday.q-calendar__center.q-calendar__ellipsis {
         text-transform: capitalize;
-        color: var(---color-font-secondary);
+        color: $color-font-secondary;
         font-weight: bold;
         font-size: 0.8rem;
         text-align: center;

src/components/ui/VnFilterPanel.vue

@@ -46,6 +46,10 @@ const props = defineProps({
         type: Array,
         default: () => [],
     },
+    redirect: {
+        type: Boolean,
+        default: true,
+    },
 });
 
 const emit = defineEmits(['refresh', 'clear', 'search', 'init', 'remove']);
@@ -93,7 +97,7 @@ async function search() {
 
     isLoading.value = false;
     emit('search');
-    navigate(store.data, {});
+    if (props.redirect) navigate(store.data, {});
 }
 
 async function reload() {
@@ -104,7 +108,7 @@ async function reload() {
     if (!props.showAll && !params.length) store.data = [];
     isLoading.value = false;
     emit('refresh');
-    navigate(store.data, {});
+    if (props.redirect) navigate(store.data, {});
 }
 
 async function clearFilters() {

src/components/ui/VnNotes.vue

@@ -20,7 +20,12 @@ const state = useState();
 const currentUser = ref(state.getUser());
 const newNote = ref('');
 const vnPaginateRef = ref();
-
+function handleKeyUp(event) {
+      if (event.key === 'Enter') {
+        event.preventDefault();
+        if (!event.shiftKey) insert();
+    }
+}
 async function insert() {
     const body = $props.body;
     Object.assign(body, { text: newNote.value });
@@ -48,12 +53,12 @@ async function insert() {
                 size="lg"
                 autogrow
                 autofocus
-                @keyup.ctrl.enter.stop="insert"
+                @keyup="handleKeyUp"
                 clearable
             >
-                <template #append
-                    ><QBtn
-                        :title="t('Save (ctrl + Enter)')"
+                <template #append>
+                    <QBtn
+                        :title="t('Save (Enter)')"
                         icon="save"
                         color="primary"
                         flat
@@ -130,6 +135,6 @@ async function insert() {
     es:
         Add note here...: Añadir nota aquí...
         New note: Nueva nota
-        Save (ctrl + Enter): Guardar (Ctrl + Intro)
+        Save (Enter): Guardar (Intro)
 
 </i18n>

src/components/ui/VnSearchbar.vue

@@ -5,9 +5,11 @@ import { useArrayData } from 'composables/useArrayData';
 import VnInput from 'src/components/common/VnInput.vue';
 import useRedirect from 'src/composables/useRedirect';
 import { useI18n } from 'vue-i18n';
+import { useStateStore } from 'src/stores/useStateStore';
 
 const quasar = useQuasar();
 const { t } = useI18n();
+const state = useStateStore();
 
 const props = defineProps({
     dataKey: {
@@ -65,6 +67,10 @@ const props = defineProps({
         type: String,
         default: '',
     },
+    makeFetch: {
+        type: Boolean,
+        default: true,
+    },
 });
 
 let arrayData = useArrayData(props.dataKey, { ...props });
@@ -92,12 +98,14 @@ async function search() {
         ([key, value]) => value && (props.staticParams || []).includes(key)
     );
     store.skip = 0;
-    await arrayData.applyFilter({
-        params: {
-            ...Object.fromEntries(staticParams),
-            search: searchText.value,
-        },
-    });
+
+    if (props.makeFetch)
+        await arrayData.applyFilter({
+            params: {
+                ...Object.fromEntries(staticParams),
+                search: searchText.value,
+            },
+        });
 
     if (!props.redirect) return;
 
@@ -107,36 +115,37 @@ async function search() {
     });
 }
 </script>
-
 <template>
-    <QForm @submit="search" id="searchbarForm">
-        <VnInput
-            id="searchbar"
-            v-model="searchText"
-            :placeholder="t(props.label)"
-            dense
-            standout
-            autofocus
-        >
-            <template #prepend>
-                <QIcon
-                    v-if="!quasar.platform.is.mobile"
-                    class="cursor-pointer"
-                    name="search"
-                    @click="search"
-                />
-            </template>
-            <template #append>
-                <QIcon
-                    v-if="props.info && $q.screen.gt.xs"
-                    name="info"
-                    class="cursor-info"
-                >
-                    <QTooltip>{{ t(props.info) }}</QTooltip>
-                </QIcon>
-            </template>
-        </VnInput>
-    </QForm>
+    <Teleport to="#searchbar" v-if="state.isHeaderMounted()">
+        <QForm @submit="search" id="searchbarForm">
+            <VnInput
+                id="searchbar"
+                v-model="searchText"
+                :placeholder="t(props.label)"
+                dense
+                standout
+                autofocus
+            >
+                <template #prepend>
+                    <QIcon
+                        v-if="!quasar.platform.is.mobile"
+                        class="cursor-pointer"
+                        name="search"
+                        @click="search"
+                    />
+                </template>
+                <template #append>
+                    <QIcon
+                        v-if="props.info && $q.screen.gt.xs"
+                        name="info"
+                        class="cursor-info"
+                    >
+                        <QTooltip>{{ t(props.info) }}</QTooltip>
+                    </QIcon>
+                </template>
+            </VnInput>
+        </QForm>
+    </Teleport>
 </template>
 
 <style lang="scss" scoped>

src/components/ui/VnSubToolbar.vue

@@ -18,7 +18,7 @@ onMounted(() => {
     const observer = new MutationObserver(
         () =>
             (hasContent.value =
-                actions.value.childNodes.length + data.value.childNodes.length)
+                actions.value?.childNodes?.length + data.value?.childNodes?.length)
     );
     if (actions.value) observer.observe(actions.value, opts);
     if (data.value) observer.observe(data.value, opts);

src/composables/useAcl.js

@@ -0,0 +1,33 @@
+import axios from 'axios';
+import { useState } from './useState';
+
+export function useAcl() {
+    const state = useState();
+
+    async function fetch() {
+        const { data } = await axios.get('VnUsers/acls');
+        const acls = {};
+        data.forEach((acl) => {
+            acls[acl.model] = acls[acl.model] || {};
+            acls[acl.model][acl.property] = acls[acl.model][acl.property] || {};
+            acls[acl.model][acl.property][acl.accessType] = true;
+        });
+
+        state.setAcls(acls);
+    }
+
+    function hasAny(model, prop, accessType) {
+        const acls = state.getAcls().value[model];
+        if (acls) 
+            return ['*', prop].some((key) => {
+                const acl = acls[key];
+                return acl && (acl['*'] || acl[accessType]);
+            });
+    }
+
+    return {
+        fetch,
+        hasAny,
+        state,
+    };
+}

src/composables/useArrayData.js

@@ -6,7 +6,7 @@ import { buildFilter } from 'filters/filterPanel';
 
 const arrayDataStore = useArrayDataStore();
 
-export function useArrayData(key, userOptions) {
+export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
     if (!key) throw new Error('ArrayData: A key is required to use this composable');
 
     if (!arrayDataStore.get(key)) arrayDataStore.set(key);

src/composables/useSession.js

@@ -1,5 +1,6 @@
 import { useState } from './useState';
 import { useRole } from './useRole';
+import { useAcl } from './useAcl';
 import { useUserConfig } from './useUserConfig';
 import axios from 'axios';
 import useNotify from './useNotify';
@@ -88,6 +89,7 @@ export function useSession() {
         setSession(data);
 
         await useRole().fetch();
+        await useAcl().fetch();
         await useUserConfig().fetch();
         await useTokenConfig().fetch();
 

src/composables/useState.js

@@ -11,8 +11,11 @@ const user = ref({
     companyFk: null,
     warehouseFk: null,
 });
+if (sessionStorage.getItem('user'))
+    user.value = JSON.parse(sessionStorage.getItem('user'));
 
 const roles = ref([]);
+const acls = ref([]);
 const tokenConfig = ref({});
 const drawer = ref(true);
 const headerMounted = ref(false);
@@ -25,7 +28,10 @@ export function useState() {
     }
 
     function setUser(data) {
-        user.value = data;
+        const currentUser = { ...JSON.parse(sessionStorage.getItem('user')), ...data };
+        sessionStorage.setItem('user', JSON.stringify(currentUser));
+        user.value = currentUser;
+        return currentUser;
     }
 
     function getRoles() {
@@ -37,6 +43,14 @@ export function useState() {
     function setRoles(data) {
         roles.value = data;
     }
+
+    function getAcls() {
+        return computed(() => acls.value);
+    }
+
+    function setAcls(data) {
+        acls.value = data;
+    }
     function getTokenConfig() {
         return computed(() => {
             return tokenConfig.value;
@@ -64,6 +78,8 @@ export function useState() {
         setUser,
         getRoles,
         setRoles,
+        getAcls,
+        setAcls,
         getTokenConfig,
         setTokenConfig,
         set,

src/css/app.scss

@@ -76,7 +76,7 @@ select:-webkit-autofill {
 }
 
 .color-vn-label {
-    color: var(--vn-label);
+    color: var(--vn-label-color);
 }
 
 .color-vn-text {

src/css/icons.scss

@@ -1,436 +1,438 @@
 @font-face {
-    font-family: 'icon';
-    src: url('fonts/icon.eot?1om04h');
-    src: url('fonts/icon.eot?1om04h#iefix') format('embedded-opentype'),
-        url('fonts/icon.ttf?1om04h') format('truetype'),
-        url('fonts/icon.woff?1om04h') format('woff'),
-        url('fonts/icon.svg?1om04h#icon') format('svg');
-    font-weight: normal;
-    font-style: normal;
-    font-display: block;
+  font-family: 'icon';
+  src:  url('fonts/icon.eot?y0x93o');
+  src:  url('fonts/icon.eot?y0x93o#iefix') format('embedded-opentype'),
+    url('fonts/icon.ttf?y0x93o') format('truetype'),
+    url('fonts/icon.woff?y0x93o') format('woff'),
+    url('fonts/icon.svg?y0x93o#icon') format('svg');
+  font-weight: normal;
+  font-style: normal;
+  font-display: block;
 }
 
-[class^='icon-'],
-[class*=' icon-'] {
-    /* use !important to prevent issues with browser extensions that change fonts */
-    font-family: 'icon' !important;
-    speak: never;
-    font-style: normal;
-    font-weight: normal;
-    font-variant: normal;
-    text-transform: none;
-    line-height: 1;
+[class^="icon-"], [class*=" icon-"] {
+  /* use !important to prevent issues with browser extensions that change fonts */
+  font-family: 'icon' !important;
+  speak: never;
+  font-style: normal;
+  font-weight: normal;
+  font-variant: normal;
+  text-transform: none;
+  line-height: 1;
 
-    /* Better Font Rendering =========== */
-    -webkit-font-smoothing: antialiased;
-    -moz-osx-font-smoothing: grayscale;
+  /* Better Font Rendering =========== */
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-entry_lastbuys:before {
+  content: "\e91a";
+}
 .icon-100:before {
-    content: '\e901';
+  content: "\e901";
 }
 .icon-Client_unpaid:before {
-    content: '\e98c';
+  content: "\e98c";
 }
 .icon-History:before {
-    content: '\e902';
+  content: "\e902";
 }
 .icon-Person:before {
-    content: '\e903';
+  content: "\e903";
 }
 .icon-accessory:before {
-    content: '\e904';
+  content: "\e904";
 }
 .icon-account:before {
-    content: '\e905';
+  content: "\e905";
 }
 .icon-actions:before {
-    content: '\e907';
+  content: "\e907";
 }
 .icon-addperson:before {
-    content: '\e908';
+  content: "\e908";
 }
 .icon-agency:before {
-    content: '\e92a';
+  content: "\e92a";
 }
 .icon-agency-term:before {
-    content: '\e909';
+  content: "\e909";
 }
 .icon-albaran:before {
-    content: '\e92c';
+  content: "\e92c";
 }
 .icon-anonymous:before {
-    content: '\e90b';
+  content: "\e90b";
 }
 .icon-apps:before {
-    content: '\e90c';
+  content: "\e90c";
 }
 .icon-artificial:before {
-    content: '\e90d';
+  content: "\e90d";
 }
 .icon-attach:before {
-    content: '\e90e';
+  content: "\e90e";
 }
 .icon-barcode:before {
-    content: '\e90f';
+  content: "\e90f";
 }
 .icon-basket:before {
-    content: '\e910';
+  content: "\e910";
 }
 .icon-basketadd:before {
-    content: '\e911';
+  content: "\e911";
 }
 .icon-bin:before {
-    content: '\e913';
+  content: "\e913";
 }
 .icon-botanical:before {
-    content: '\e914';
+  content: "\e914";
 }
 .icon-bucket:before {
-    content: '\e915';
+  content: "\e915";
 }
 .icon-buscaman:before {
-    content: '\e916';
+  content: "\e916";
 }
 .icon-buyrequest:before {
-    content: '\e917';
+  content: "\e917";
 }
 .icon-calc_volum .path1:before {
-    content: '\e918';
-    color: rgb(0, 0, 0);
+  content: "\e918";
+  color: rgb(0, 0, 0);
 }
 .icon-calc_volum .path2:before {
-    content: '\e919';
-    margin-left: -1em;
-    color: rgb(0, 0, 0);
+  content: "\e919";
+  margin-left: -1em;
+  color: rgb(0, 0, 0);
 }
 .icon-calc_volum .path3:before {
-    content: '\e91c';
-    margin-left: -1em;
-    color: rgb(0, 0, 0);
+  content: "\e91c";
+  margin-left: -1em;
+  color: rgb(0, 0, 0);
 }
 .icon-calc_volum .path4:before {
-    content: '\e91d';
-    margin-left: -1em;
-    color: rgb(0, 0, 0);
+  content: "\e91d";
+  margin-left: -1em;
+  color: rgb(0, 0, 0);
 }
 .icon-calc_volum .path5:before {
-    content: '\e91e';
-    margin-left: -1em;
-    color: rgb(0, 0, 0);
+  content: "\e91e";
+  margin-left: -1em;
+  color: rgb(0, 0, 0);
 }
 .icon-calc_volum .path6:before {
-    content: '\e91f';
-    margin-left: -1em;
-    color: rgb(255, 255, 255);
+  content: "\e91f";
+  margin-left: -1em;
+  color: rgb(255, 255, 255);
 }
 .icon-calendar:before {
-    content: '\e920';
+  content: "\e920";
 }
 .icon-catalog:before {
-    content: '\e921';
+  content: "\e921";
 }
 .icon-claims:before {
-    content: '\e922';
+  content: "\e922";
 }
 .icon-client:before {
-    content: '\e923';
+  content: "\e923";
 }
 .icon-clone:before {
-    content: '\e924';
+  content: "\e924";
 }
 .icon-columnadd:before {
-    content: '\e925';
+  content: "\e925";
 }
 .icon-columndelete:before {
-    content: '\e926';
+  content: "\e926";
 }
 .icon-components:before {
-    content: '\e927';
+  content: "\e927";
 }
 .icon-consignatarios:before {
-    content: '\e928';
+  content: "\e928";
 }
 .icon-control:before {
-    content: '\e929';
+  content: "\e929";
 }
 .icon-credit:before {
-    content: '\e92b';
+  content: "\e92b";
 }
 .icon-defaulter:before {
-    content: '\e92d';
+  content: "\e92d";
 }
 .icon-deletedTicket:before {
-    content: '\e92e';
+  content: "\e92e";
 }
 .icon-deleteline:before {
-    content: '\e92f';
+  content: "\e92f";
 }
 .icon-delivery:before {
-    content: '\e930';
+  content: "\e930";
 }
 .icon-deliveryprices:before {
-    content: '\e932';
+  content: "\e932";
 }
 .icon-details:before {
-    content: '\e933';
+  content: "\e933";
 }
 .icon-dfiscales:before {
-    content: '\e934';
+  content: "\e934";
 }
 .icon-disabled:before {
-    content: '\e935';
+  content: "\e935";
 }
 .icon-doc:before {
-    content: '\e936';
+  content: "\e936";
 }
 .icon-entry:before {
-    content: '\e937';
+  content: "\e937";
 }
 .icon-exit:before {
-    content: '\e938';
+  content: "\e938";
 }
 .icon-eye:before {
-    content: '\e939';
+  content: "\e939";
 }
 .icon-fixedPrice:before {
-    content: '\e93a';
+  content: "\e93a";
 }
 .icon-flower:before {
-    content: '\e93b';
+  content: "\e93b";
 }
 .icon-frozen:before {
-    content: '\e93c';
+  content: "\e93c";
 }
 .icon-fruit:before {
-    content: '\e93d';
+  content: "\e93d";
 }
 .icon-funeral:before {
-    content: '\e93e';
+  content: "\e93e";
 }
 .icon-grafana:before {
-    content: '\e906';
+  content: "\e906";
 }
 .icon-greenery:before {
-    content: '\e93f';
+  content: "\e93f";
 }
 .icon-greuge:before {
-    content: '\e940';
+  content: "\e940";
 }
 .icon-grid:before {
-    content: '\e941';
+  content: "\e941";
 }
 .icon-handmade:before {
-    content: '\e942';
+  content: "\e942";
 }
 .icon-handmadeArtificial:before {
-    content: '\e943';
+  content: "\e943";
 }
 .icon-headercol:before {
-    content: '\e945';
+  content: "\e945";
 }
 .icon-info:before {
-    content: '\e946';
+  content: "\e946";
 }
 .icon-inventory:before {
-    content: '\e947';
+  content: "\e947";
 }
 .icon-invoice:before {
-    content: '\e968';
-    color: #5f5f5f;
+  content: "\e968";
+  color: #5f5f5f;
 }
 .icon-invoice-in:before {
-    content: '\e949';
+  content: "\e949";
 }
 .icon-invoice-in-create:before {
-    content: '\e94a';
+  content: "\e94a";
 }
 .icon-invoice-out:before {
-    content: '\e94b';
+  content: "\e94b";
 }
 .icon-isTooLittle:before {
-    content: '\e94c';
+  content: "\e94c";
 }
 .icon-item:before {
-    content: '\e94d';
+  content: "\e94d";
 }
 .icon-languaje:before {
-    content: '\e970';
+  content: "\e970";
 }
 .icon-lines:before {
-    content: '\e94e';
+  content: "\e94e";
 }
 .icon-linesprepaired:before {
-    content: '\e94f';
+  content: "\e94f";
 }
 .icon-link-to-corrected:before {
-    content: '\e931';
+  content: "\e931";
 }
 .icon-link-to-correcting:before {
-    content: '\e944';
+  content: "\e944";
 }
 .icon-logout:before {
-    content: '\e973';
+  content: "\e973";
 }
 .icon-mana:before {
-    content: '\e950';
+  content: "\e950";
 }
 .icon-mandatory:before {
-    content: '\e951';
+  content: "\e951";
 }
 .icon-net:before {
-    content: '\e952';
+  content: "\e952";
 }
 .icon-newalbaran:before {
-    content: '\e954';
+  content: "\e954";
 }
 .icon-niche:before {
-    content: '\e955';
+  content: "\e955";
 }
 .icon-no036:before {
-    content: '\e956';
+  content: "\e956";
 }
 .icon-noPayMethod:before {
-    content: '\e958';
+  content: "\e958";
 }
 .icon-notes:before {
-    content: '\e959';
+  content: "\e959";
 }
 .icon-noweb:before {
-    content: '\e95a';
+  content: "\e95a";
 }
 .icon-onlinepayment:before {
-    content: '\e95b';
+  content: "\e95b";
 }
 .icon-package:before {
-    content: '\e95c';
+  content: "\e95c";
 }
 .icon-payment:before {
-    content: '\e95d';
+  content: "\e95d";
 }
 .icon-pbx:before {
-    content: '\e95e';
+  content: "\e95e";
 }
 .icon-pets:before {
-    content: '\e95f';
+  content: "\e95f";
 }
 .icon-photo:before {
-    content: '\e960';
+  content: "\e960";
 }
 .icon-plant:before {
-    content: '\e961';
+  content: "\e961";
 }
 .icon-polizon:before {
-    content: '\e962';
+  content: "\e962";
 }
 .icon-preserved:before {
-    content: '\e963';
+  content: "\e963";
 }
 .icon-recovery:before {
-    content: '\e964';
+  content: "\e964";
 }
 .icon-regentry:before {
-    content: '\e965';
+  content: "\e965";
 }
 .icon-reserva:before {
-    content: '\e966';
+  content: "\e966";
 }
 .icon-revision:before {
-    content: '\e967';
+  content: "\e967";
 }
 .icon-risk:before {
-    content: '\e969';
+  content: "\e969";
 }
 .icon-saysimple:before {
-    content: '\e912';
+  content: "\e912";
 }
 .icon-services:before {
-    content: '\e96a';
+  content: "\e96a";
 }
 .icon-settings:before {
-    content: '\e96b';
+  content: "\e96b";
 }
 .icon-shipment:before {
-    content: '\e96c';
+  content: "\e96c";
 }
 .icon-sign:before {
-    content: '\e90a';
+  content: "\e90a";
 }
 .icon-sms:before {
-    content: '\e96e';
+  content: "\e96e";
 }
 .icon-solclaim:before {
-    content: '\e96f';
+  content: "\e96f";
 }
 .icon-solunion:before {
-    content: '\e971';
+  content: "\e971";
 }
 .icon-splitline:before {
-    content: '\e972';
+  content: "\e972";
 }
 .icon-splur:before {
-    content: '\e974';
+  content: "\e974";
 }
 .icon-stowaway:before {
-    content: '\e975';
+  content: "\e975";
 }
 .icon-supplier:before {
-    content: '\e976';
+  content: "\e976";
 }
 .icon-supplierfalse:before {
-    content: '\e977';
+  content: "\e977";
 }
 .icon-tags:before {
-    content: '\e979';
+  content: "\e979";
 }
 .icon-tax:before {
-    content: '\e97a';
+  content: "\e97a";
 }
 .icon-thermometer:before {
-    content: '\e97b';
+  content: "\e97b";
 }
 .icon-ticket:before {
-    content: '\e97c';
+  content: "\e97c";
 }
 .icon-ticketAdd:before {
-    content: '\e97e';
+  content: "\e97e";
 }
 .icon-traceability:before {
-    content: '\e97f';
+  content: "\e97f";
 }
 .icon-transaction:before {
-    content: '\e91b';
+  content: "\e91b";
 }
 .icon-treatments:before {
-    content: '\e980';
+  content: "\e980";
 }
 .icon-trolley:before {
-    content: '\e900';
+  content: "\e900";
 }
 .icon-troncales:before {
-    content: '\e982';
+  content: "\e982";
 }
 .icon-unavailable:before {
-    content: '\e983';
+  content: "\e983";
 }
-.icon-visible_columns_Icono:before {
-    content: '\e984';
+.icon-visible_columns:before {
+  content: "\e984";
 }
 .icon-volume:before {
-    content: '\e985';
+  content: "\e985";
 }
 .icon-wand:before {
-    content: '\e986';
+  content: "\e986";
 }
 .icon-web:before {
-    content: '\e987';
+  content: "\e987";
 }
 .icon-wiki:before {
-    content: '\e989';
+  content: "\e989";
 }
 .icon-worker:before {
-    content: '\e98a';
+  content: "\e98a";
 }
 .icon-zone:before {
-    content: '\e98b';
+  content: "\e98b";
 }

src/filters/dashOrCurrency.js

@@ -0,0 +1,6 @@
+import toCurrency from './toCurrency';
+
+export default function (value) {
+    if (value == null || value === '') return () => '-';
+    return () => toCurrency(value);
+}

src/filters/index.js

@@ -10,6 +10,7 @@ import toLowerCamel from './toLowerCamel';
 import dashIfEmpty from './dashIfEmpty';
 import dateRange from './dateRange';
 import toHour from './toHour';
+import dashOrCurrency from './dashOrCurrency';
 
 export {
     toLowerCase,
@@ -17,6 +18,7 @@ export {
     toDate,
     toHour,
     toDateString,
+    dashOrCurrency,
     toDateHourMin,
     toDateHourMinSec,
     toRelativeDate,

src/i18n/locale/en.yml

@@ -17,6 +17,7 @@ globals:
     date: Date
     dataSaved: Data saved
     dataDeleted: Data deleted
+    delete: Delete
     search: Search
     changes: Changes
     dataCreated: Data created
@@ -101,11 +102,17 @@ globals:
         zonesList: Zones
         deliveryList: Delivery days
         upcomingList: Upcoming deliveries
+        role: Role
+        alias: Alias
+        aliasUsers: Users
+        subRoles: Subroles
+        inheritedRoles: Inherited Roles
     created: Created
     worker: Worker
     now: Now
     name: Name
     new: New
+    comment: Comment
 errors:
     statusUnauthorized: Access denied
     statusInternalServerError: An internal server error has ocurred
@@ -389,6 +396,7 @@ entry:
         type: Type
         color: Color
         id: ID
+        printedStickers: Printed stickers
     notes:
         observationType: Observation type
     descriptor:
@@ -465,6 +473,7 @@ ticket:
         agency: Agency
         zone: Zone
         warehouse: Warehouse
+        collection: Collection
         route: Route
         invoice: Invoice
         shipped: Shipped
@@ -574,6 +583,9 @@ claim:
         created: Created
         state: State
         pickup: Pick up
+        null: No
+        agency: Agency
+        delivery: Delivery
     photo:
         fileDescription: 'Claim id {claimId} from client {clientName} id {clientId}'
         noData: 'There are no images/videos, click here or drag and drop the file'
@@ -958,7 +970,7 @@ roadmap:
 route:
     pageTitles:
         routes: Routes
-        cmrsList: External CMRs list
+        cmrsList: CMRs list
         RouteList: List
         routeCreate: New route
         basicData: Basic Data
@@ -1173,6 +1185,7 @@ item:
         available: Available
         warehouseText: 'Calculated on the warehouse of { warehouseName }'
         itemDiary: Item diary
+        producer: Producer
     list:
         id: Identifier
         grouping: Grouping
@@ -1256,6 +1269,13 @@ monitor:
     pageTitles:
         monitors: Monitors
         list: List
+zone:
+    pageTitles:
+        zones: Zones
+        zonesList: Zones
+        deliveryList: Delivery days
+        upcomingList: Upcoming deliveries
+
 components:
     topbar: {}
     itemsFilterPanel:

src/i18n/locale/es.yml

@@ -17,6 +17,7 @@ globals:
     date: Fecha
     dataSaved: Datos guardados
     dataDeleted: Datos eliminados
+    delete: Eliminar
     search: Buscar
     changes: Cambios
     dataCreated: Datos creados
@@ -101,11 +102,17 @@ globals:
         zonesList: Zonas
         deliveryList: Días de entrega
         upcomingList: Próximos repartos
+        role: Role
+        alias: Alias
+        aliasUsers: Usuarios
+        subRoles: Subroles
+        inheritedRoles: Roles heredados
     created: Fecha creación
     worker: Trabajador
     now: Ahora
     name: Nombre
     new: Nuevo
+    comment: Comentario
 errors:
     statusUnauthorized: Acceso denegado
     statusInternalServerError: Ha ocurrido un error interno del servidor
@@ -387,6 +394,7 @@ entry:
         type: Tipo
         color: Color
         id: ID
+        printedStickers: Etiquetas impresas
     notes:
         observationType: Tipo de observación
     descriptor:
@@ -463,6 +471,7 @@ ticket:
         agency: Agencia
         zone: Zona
         warehouse: Almacén
+        collection: Colección
         route: Ruta
         invoice: Factura
         shipped: Enviado
@@ -946,7 +955,7 @@ roadmap:
 route:
     pageTitles:
         routes: Rutas
-        cmrsList: Listado de CMRs externos
+        cmrsList: Listado de CMRs
         RouteList: Listado
         routeCreate: Nueva ruta
         basicData: Datos básicos
@@ -1162,6 +1171,7 @@ item:
         available: Disponible
         warehouseText: 'Calculado sobre el almacén de { warehouseName }'
         itemDiary: Registro de compra-venta
+        producer: Productor
     list:
         id: Identificador
         grouping: Grouping
@@ -1243,8 +1253,14 @@ item/itemType:
         summary: Resumen
 zone:
     pageTitles:
-        zones: Zona
-        zonesList: Zonas
+        zones: Zonas
+        list: Zonas
+        deliveryList: Días de entrega
+        upcomingList: Próximos repartos
+role:
+    pageTitles:
+        zones: Zonas
+        list: Zonas
         deliveryList: Días de entrega
         upcomingList: Próximos repartos
 monitor:

src/pages/Account/AccountAccounts.vue

@@ -0,0 +1,104 @@
+<script setup>
+import { useI18n } from 'vue-i18n';
+
+import FormModel from 'components/FormModel.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+
+import axios from 'axios';
+import useNotify from 'src/composables/useNotify.js';
+
+const { t } = useI18n();
+const { notify } = useNotify();
+
+const onSynchronizeAll = async () => {
+    try {
+        notify(t('Synchronizing in the background'), 'positive');
+        await axios.patch(`Accounts/syncAll`);
+    } catch (error) {
+        console.error('Error synchronizing all accounts', error);
+    }
+};
+
+const onSynchronizeRoles = async () => {
+    try {
+        await axios.patch(`RoleInherits/sync`);
+        notify(t('Roles synchronized!'), 'positive');
+    } catch (error) {
+        console.error('Error synchronizing roles', error);
+    }
+};
+</script>
+
+<template>
+    <QPage>
+        <VnSubToolbar />
+        <FormModel
+            :url="`AccountConfigs/${1}`"
+            :url-update="`AccountConfigs/${1}`"
+            model="AccountAccounts"
+            auto-load
+        >
+            <template #moreActions>
+                <QBtn
+                    class="q-ml-none"
+                    color="primary"
+                    :label="t('accounts.syncAll')"
+                    @click="onSynchronizeAll()"
+                />
+                <QBtn
+                    color="primary"
+                    :label="t('accounts.syncRoles')"
+                    @click="onSynchronizeRoles()"
+                />
+            </template>
+            <template #form="{ data }">
+                <div class="q-gutter-y-sm">
+                    <VnInput :label="t('accounts.homedir')" v-model="data.homedir" />
+                    <VnInput :label="t('accounts.shell')" v-model="data.shell" />
+                    <VnInput
+                        :label="t('accounts.idBase')"
+                        v-model="data.idBase"
+                        type="number"
+                        min="0"
+                    />
+                    <VnRow>
+                        <VnInput
+                            :label="t('accounts.min')"
+                            v-model="data.min"
+                            type="number"
+                            min="0"
+                        />
+                        <VnInput
+                            :label="t('accounts.max')"
+                            v-model="data.max"
+                            type="number"
+                            min="0"
+                        />
+                    </VnRow>
+                    <VnRow>
+                        <VnInput
+                            :label="t('accounts.warn')"
+                            v-model="data.warn"
+                            type="number"
+                            min="0"
+                        />
+                        <VnInput
+                            :label="t('accounts.inact')"
+                            v-model="data.inact"
+                            type="number"
+                            min="0"
+                        />
+                    </VnRow>
+                </div>
+            </template>
+        </FormModel>
+    </QPage>
+</template>
+
+<i18n>
+es:
+    Roles synchronized!: ¡Roles sincronizados!
+    Synchronizing in the background: Sincronizando en segundo plano
+</i18n>

src/pages/Account/AccountAcls.vue

@@ -0,0 +1,151 @@
+<script setup>
+import { useI18n } from 'vue-i18n';
+import { ref } from 'vue';
+import FetchData from 'components/FetchData.vue';
+
+import VnPaginate from 'components/ui/VnPaginate.vue';
+import VnSearchbar from 'components/ui/VnSearchbar.vue';
+import CardList from 'src/components/ui/CardList.vue';
+import VnLv from 'src/components/ui/VnLv.vue';
+import AclFilter from './Acls/AclFilter.vue';
+import AclFormView from './Acls/AclFormView.vue';
+
+import { useVnConfirm } from 'composables/useVnConfirm';
+import { useStateStore } from 'stores/useStateStore';
+import axios from 'axios';
+import useNotify from 'src/composables/useNotify.js';
+
+defineProps({
+    id: {
+        type: Number,
+        default: 0,
+    },
+});
+
+const { notify } = useNotify();
+const { t } = useI18n();
+const stateStore = useStateStore();
+const { openConfirmationModal } = useVnConfirm();
+
+const paginateRef = ref();
+const formDialog = ref(false);
+const rolesOptions = ref([]);
+
+const exprBuilder = (param, value) => {
+    switch (param) {
+        case 'search':
+            return { model: { like: `%${value}%` } };
+        default:
+            return { [param]: value };
+    }
+};
+
+const deleteAcl = async (id) => {
+    try {
+        await axios.delete(`ACLs/${id}`);
+        paginateRef.value.fetch();
+        notify('ACL removed', 'positive');
+    } catch (error) {
+        console.error('Error deleting Acl: ', error);
+    }
+};
+function showFormDialog(data) {
+    formDialog.value = {
+        show: true,
+        formInitialData: { ...data },
+    };
+}
+</script>
+
+<template>
+    <FetchData
+        url="VnRoles"
+        :filter="{ fields: ['name'], order: 'name ASC' }"
+        @on-fetch="(data) => (rolesOptions = data)"
+        auto-load
+    />
+    <template v-if="stateStore.isHeaderMounted()">
+        <Teleport to="#searchbar">
+            <VnSearchbar
+                data-key="AccountAcls"
+                url="ACLs"
+                :expr-builder="exprBuilder"
+                :label="t('acls.search')"
+                :info="t('acls.searchInfo')"
+            />
+        </Teleport>
+    </template>
+    <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
+        <QScrollArea class="fit text-grey-8">
+            <AclFilter data-key="AccountAcls" />
+        </QScrollArea>
+    </QDrawer>
+
+    <QPage class="flex justify-center q-pa-md">
+        <div class="vn-card-list">
+            <VnPaginate
+                ref="paginateRef"
+                data-key="AccountAcls"
+                url="ACLs"
+                :expr-builder="exprBuilder"
+            >
+                <template #body="{ rows }">
+                    <CardList
+                        v-for="row of rows"
+                        :id="row.id"
+                        :key="row.id"
+                        :title="`${row.model}.${row.property}`"
+                        @click="showFormDialog(row)"
+                    >
+                        <template #list-items>
+                            <VnLv :label="t('acls.role')" :value="row.principalId" />
+                            <VnLv :label="t('acls.accessType')" :value="row.accessType" />
+                            <VnLv
+                                :label="t('acls.permissions')"
+                                :value="row.permission"
+                            />
+                        </template>
+                        <template #actions>
+                            <QBtn
+                                :label="t('globals.delete')"
+                                @click.stop="
+                                    openConfirmationModal(
+                                        t('ACL will be removed'),
+                                        t('Are you sure you want to continue?'),
+                                        () => deleteAcl(row.id)
+                                    )
+                                "
+                                color="primary"
+                                style="margin-top: 15px"
+                            />
+                        </template>
+                    </CardList>
+                </template>
+            </VnPaginate>
+        </div>
+        <QDialog
+            v-model="formDialog.show"
+            transition-show="scale"
+            transition-hide="scale"
+        >
+            <AclFormView
+                :form-initial-data="formDialog.formInitialData"
+                @on-data-change="paginateRef.fetch()"
+                :roles-options="rolesOptions"
+            />
+        </QDialog>
+        <QPageSticky position="bottom-right" :offset="[18, 18]">
+            <QBtn fab icon="add" color="primary" @click="showFormDialog()">
+                <QTooltip class="text-no-wrap">{{ t('New ACL') }}</QTooltip>
+            </QBtn>
+        </QPageSticky>
+    </QPage>
+</template>
+
+<i18n>
+es:
+    New ACL: Nuevo ACL
+    ACL removed: ACL eliminado
+    ACL will be removed: El ACL será eliminado
+    Are you sure you want to continue?: ¿Seguro que quieres continuar?
+</i18n>

src/pages/Account/AccountAliasList.vue

@@ -0,0 +1,105 @@
+<script setup>
+import { useRouter } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+import { ref } from 'vue';
+
+import VnPaginate from 'components/ui/VnPaginate.vue';
+import VnSearchbar from 'components/ui/VnSearchbar.vue';
+import CardList from 'src/components/ui/CardList.vue';
+import VnLv from 'src/components/ui/VnLv.vue';
+import AliasSummary from './Alias/Card/AliasSummary.vue';
+import AliasCreateForm from './Alias/AliasCreateForm.vue';
+
+import { useSummaryDialog } from 'src/composables/useSummaryDialog';
+import { useStateStore } from 'stores/useStateStore';
+
+defineProps({
+    id: {
+        type: Number,
+        default: 0,
+    },
+});
+
+const { t } = useI18n();
+const { viewSummary } = useSummaryDialog();
+const router = useRouter();
+const stateStore = useStateStore();
+const aliasCreateDialogRef = ref(null);
+
+const exprBuilder = (param, value) => {
+    switch (param) {
+        case 'search':
+            return /^\d+$/.test(value)
+                ? { id: value }
+                : { alias: { like: `%${value}%` } };
+    }
+};
+
+const navigate = (id) => router.push({ name: 'AliasSummary', params: { id } });
+
+const openCreateModal = () => aliasCreateDialogRef.value.show();
+</script>
+
+<template>
+    <template v-if="stateStore.isHeaderMounted()">
+        <Teleport to="#searchbar">
+            <VnSearchbar
+                data-key="AccountAliasList"
+                url="MailAliases"
+                :expr-builder="exprBuilder"
+                :label="t('mailAlias.search')"
+                :info="t('mailAlias.searchInfo')"
+            />
+        </Teleport>
+    </template>
+    <QPage class="flex justify-center q-pa-md">
+        <div class="vn-card-list">
+            <VnPaginate
+                ref="paginateRef"
+                data-key="AccountAliasList"
+                url="MailAliases"
+                :expr-builder="exprBuilder"
+            >
+                <template #body="{ rows }">
+                    <CardList
+                        v-for="row of rows"
+                        :id="row.id"
+                        :key="row.id"
+                        :title="row.alias"
+                        @click="navigate(row.id)"
+                    >
+                        <template #list-items>
+                            <VnLv :label="t('mailAlias.alias')" :value="row.alias">
+                            </VnLv>
+                            <VnLv
+                                :label="t('mailAlias.description')"
+                                :value="row.description"
+                            >
+                            </VnLv>
+                        </template>
+                        <template #actions>
+                            <QBtn
+                                :label="t('components.smartCard.openSummary')"
+                                @click.stop="viewSummary(row.id, AliasSummary)"
+                                color="primary"
+                                style="margin-top: 15px"
+                            />
+                        </template>
+                    </CardList>
+                </template>
+            </VnPaginate>
+        </div>
+        <QDialog
+            ref="aliasCreateDialogRef"
+            transition-show="scale"
+            transition-hide="scale"
+        >
+            <AliasCreateForm />
+        </QDialog>
+        <QPageSticky position="bottom-right" :offset="[18, 18]">
+            <QBtn fab icon="add" color="primary" @click="openCreateModal()">
+                <QTooltip class="text-no-wrap">{{ t('mailAlias.newAlias') }}</QTooltip>
+            </QBtn>
+        </QPageSticky>
+    </QPage>
+</template>

src/pages/Account/AccountConnections.vue

@@ -0,0 +1,112 @@
+<script setup>
+import { ref } from 'vue';
+import { useRouter } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+
+import VnPaginate from 'components/ui/VnPaginate.vue';
+import CardList from 'src/components/ui/CardList.vue';
+import VnLv from 'src/components/ui/VnLv.vue';
+
+import { toDateTimeFormat } from 'src/filters/date.js';
+import axios from 'axios';
+import useNotify from 'src/composables/useNotify.js';
+import { useVnConfirm } from 'composables/useVnConfirm';
+
+const { t } = useI18n();
+const router = useRouter();
+const { notify } = useNotify();
+const { openConfirmationModal } = useVnConfirm();
+
+const paginateRef = ref(null);
+const filter = {
+    fields: ['id', 'created', 'userId'],
+    include: {
+        relation: 'user',
+        scope: {
+            fields: ['username'],
+        },
+    },
+    order: 'created DESC',
+};
+
+const urlPath = 'AccessTokens';
+
+const refresh = () => paginateRef.value.fetch();
+
+const navigate = (id) => router.push({ name: 'AccountSummary', params: { id } });
+
+const killSession = async (id) => {
+    try {
+        await axios.delete(`${urlPath}/${id}`);
+        paginateRef.value.fetch();
+        notify(t('Session killed'), 'positive');
+    } catch (error) {
+        console.error('Error killing session', error);
+    }
+};
+</script>
+
+<template>
+    <QPage class="column items-center q-pa-md">
+        <div class="vn-card-list">
+            <VnPaginate
+                :data-key="urlPath"
+                ref="paginateRef"
+                :filter="filter"
+                :url="urlPath"
+                order="created DESC"
+                auto-load
+            >
+                <template #body="{ rows }">
+                    <CardList
+                        :key="row.id"
+                        :title="row.user?.username"
+                        @click="navigate(row.userId)"
+                        v-for="row of rows"
+                    >
+                        <template #list-items>
+                            <div style="flex-direction: column; width: 100%">
+                                <VnLv
+                                    :label="t('connections.username')"
+                                    :value="row.user?.username"
+                                >
+                                </VnLv>
+                                <VnLv
+                                    :label="t('connections.created')"
+                                    :value="toDateTimeFormat(row.created)"
+                                >
+                                </VnLv>
+                            </div>
+                        </template>
+                        <template #actions>
+                            <QBtn
+                                class="q-mt-xs"
+                                :label="t('connections.killSession')"
+                                @click.stop="
+                                    openConfirmationModal(
+                                        t('Session will be killed'),
+                                        t('Are you sure you want to continue?'),
+                                        () => killSession(row.id)
+                                    )
+                                "
+                                outline
+                            />
+                        </template>
+                    </CardList>
+                </template>
+            </VnPaginate>
+        </div>
+        <QPageSticky position="bottom-right" :offset="[18, 18]">
+            <QBtn fab icon="refresh" color="primary" @click="refresh()">
+                <QTooltip>{{ t('connections.refresh') }}</QTooltip>
+            </QBtn>
+        </QPageSticky>
+    </QPage>
+</template>
+
+<i18n>
+es:
+    Session killed: Sesión matada
+    Session will be killed: Se va a matar la sesión
+    Are you sure you want to continue?: ¿Seguro que quieres continuar?
+</i18n>

src/pages/Account/AccountLdap.vue

@@ -0,0 +1,171 @@
+<script setup>
+import { ref, onMounted, computed } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import FormModel from 'components/FormModel.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
+
+import { useArrayData } from 'src/composables/useArrayData';
+import useNotify from 'src/composables/useNotify.js';
+import axios from 'axios';
+
+const { t } = useI18n();
+const { notify } = useNotify();
+
+const arrayData = useArrayData('AccountLdap');
+
+const URL_UPDATE = `LdapConfigs/${1}`;
+const URL_CREATE = `LdapConfigs`;
+const DEFAULT_DATA = {
+    id: 1,
+    hasData: false,
+    groupDn: null,
+    password: null,
+    rdn: null,
+    server: null,
+    userDn: null,
+};
+
+const initialData = ref({
+    ...DEFAULT_DATA,
+});
+
+const hasData = computed({
+    get: () => initialData.value.hasData,
+    set: (val) => {
+        initialData.value.hasData = val;
+        if (!val) formCustomFn.value = deleteMailForward;
+        else formCustomFn.value = null;
+    },
+});
+
+const initialDataLoaded = ref(false);
+const formUrlCreate = ref(null);
+const formUrlUpdate = ref(null);
+const formCustomFn = ref(null);
+
+const onTestConection = async () => {
+    try {
+        await axios.get(`LdapConfigs/test`);
+        notify(t('LDAP connection established!'), 'positive');
+    } catch (error) {
+        console.error('Error testing connection', error);
+    }
+};
+
+const getInitialLdapConfig = async () => {
+    try {
+        initialDataLoaded.value = false;
+        const { data } = await axios.get(URL_UPDATE);
+        initialData.value = data;
+        hasData.value = true;
+        return data;
+    } catch (error) {
+        hasData.value = false;
+        arrayData.destroy();
+        console.error('Error fetching initial LDAP config', error);
+        return null;
+    } finally {
+        // Si asignamos un valor a urlUpdate, debemos asignar null a urlCreate y viceversa, ya puede causar problemas en formModel
+        if (hasData.value) {
+            formUrlUpdate.value = URL_UPDATE;
+            formUrlCreate.value = null;
+        } else {
+            formUrlUpdate.value = null;
+            formUrlCreate.value = URL_CREATE;
+        }
+        initialDataLoaded.value = true;
+    }
+};
+
+const deleteMailForward = async () => {
+    try {
+        await axios.delete(URL_UPDATE);
+        initialData.value = { ...DEFAULT_DATA };
+        hasData.value = false;
+        notify(t('globals.dataSaved'), 'positive');
+    } catch (err) {
+        console.error('Error deleting mail forward', err);
+    }
+};
+
+onMounted(async () => await getInitialLdapConfig());
+</script>
+
+<template>
+    <QPage>
+        <VnSubToolbar />
+        <FormModel
+            :key="initialDataLoaded"
+            model="AccountLdap"
+            :form-initial-data="initialData"
+            :url-create="formUrlCreate"
+            :url-update="formUrlUpdate"
+            :save-fn="formCustomFn"
+            auto-load
+            @on-data-saved="getInitialLdapConfig()"
+        >
+            <template #moreActions>
+                <QBtn
+                    class="q-ml-none"
+                    color="primary"
+                    :label="t('ldap.testConnection')"
+                    @click="onTestConection()"
+                >
+                    <QTooltip>
+                        {{ t('ldap.testConnection') }}
+                    </QTooltip>
+                </QBtn>
+            </template>
+            <template #form="{ data, validate }">
+                <VnRow class="row q-gutter-md">
+                    <div class="col">
+                        <QCheckbox
+                            :label="t('ldap.enableSync')"
+                            v-model="data.hasData"
+                            @update:model-value="($event) => (hasData = $event)"
+                            :toggle-indeterminate="false"
+                        />
+                    </div>
+                </VnRow>
+                <template v-if="hasData">
+                    <VnInput
+                        :label="t('ldap.server')"
+                        clearable
+                        v-model="data.server"
+                        :required="true"
+                        :rules="validate('LdapConfig.server')"
+                    />
+                    <VnInput
+                        :label="t('ldap.rdn')"
+                        clearable
+                        v-model="data.rdn"
+                        :required="true"
+                        :rules="validate('LdapConfig.rdn')"
+                    />
+                    <VnInput
+                        :label="t('ldap.password')"
+                        clearable
+                        type="password"
+                        v-model="data.password"
+                        :required="true"
+                        :rules="validate('LdapConfig.password')"
+                    />
+                    <VnInput :label="t('ldap.userDN')" clearable v-model="data.userDn" />
+                    <VnInput
+                        :label="t('ldap.groupDN')"
+                        clearable
+                        v-model="data.groupDn"
+                    />
+                </template>
+            </template>
+        </FormModel>
+    </QPage>
+</template>
+
+<i18n>
+es:
+    LDAP connection established!: ¡Conexión con LDAP establecida!
+</i18n>

src/pages/Account/AccountList.vue

@@ -0,0 +1 @@
+<template>Account list</template>

src/pages/Account/AccountMain.vue

@@ -0,0 +1,17 @@
+<script setup>
+import { useStateStore } from 'stores/useStateStore';
+import LeftMenu from 'components/LeftMenu.vue';
+
+const stateStore = useStateStore();
+</script>
+
+<template>
+    <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
+        <QScrollArea class="fit text-grey-8">
+            <LeftMenu />
+        </QScrollArea>
+    </QDrawer>
+    <QPageContainer>
+        <RouterView></RouterView>
+    </QPageContainer>
+</template>

src/pages/Account/AccountSamba.vue

@@ -0,0 +1,187 @@
+<script setup>
+import { ref, onMounted, computed } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import FormModel from 'components/FormModel.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
+
+import { useArrayData } from 'src/composables/useArrayData';
+import useNotify from 'src/composables/useNotify.js';
+import axios from 'axios';
+
+const { t } = useI18n();
+const { notify } = useNotify();
+
+const arrayData = useArrayData('AccountSamba');
+
+const formModel = ref(null);
+
+const URL_UPDATE = `SambaConfigs/${1}`;
+const URL_CREATE = `SambaConfigs`;
+
+const DEFAULT_DATA = {
+    id: 1,
+    hasData: false,
+    adDomain: null,
+    adController: null,
+    adUser: null,
+    adPassword: null,
+    userDn: null,
+    verifyCert: false,
+};
+
+const initialData = ref({
+    ...DEFAULT_DATA,
+});
+
+const hasData = computed({
+    get: () => initialData.value.hasData,
+    set: (val) => {
+        initialData.value.hasData = val;
+        if (!val) formCustomFn.value = deleteMailForward;
+        else formCustomFn.value = null;
+    },
+});
+
+const initialDataLoaded = ref(false);
+const formUrlCreate = ref(null);
+const formUrlUpdate = ref(null);
+const formCustomFn = ref(null);
+
+const onTestConection = async () => {
+    try {
+        await axios.get(`SambaConfigs/test`);
+        notify(t('Samba connection established!'), 'positive');
+    } catch (error) {
+        console.error('Error testing connection', error);
+    }
+};
+
+const getInitialSambaConfig = async () => {
+    try {
+        initialDataLoaded.value = false;
+        const { data } = await axios.get(URL_UPDATE);
+        initialData.value = data;
+        hasData.value = true;
+        return data;
+    } catch (error) {
+        hasData.value = false;
+        arrayData.destroy();
+        console.error('Error fetching initial Samba config', error);
+        return null;
+    } finally {
+        if (hasData.value) {
+            formUrlUpdate.value = URL_UPDATE;
+            formUrlCreate.value = null;
+        } else {
+            formUrlUpdate.value = null;
+            formUrlCreate.value = URL_CREATE;
+        }
+        initialDataLoaded.value = true;
+    }
+};
+
+const deleteMailForward = async () => {
+    try {
+        await axios.delete(URL_UPDATE);
+        initialData.value = { ...DEFAULT_DATA };
+        hasData.value = false;
+        notify(t('globals.dataSaved'), 'positive');
+    } catch (err) {
+        console.error('Error deleting mail forward', err);
+    }
+};
+
+onMounted(async () => await getInitialSambaConfig());
+</script>
+
+<template>
+    <QPage>
+        <VnSubToolbar />
+        <FormModel
+            ref="formModel"
+            :key="initialDataLoaded"
+            model="AccountSamba"
+            :form-initial-data="initialData"
+            :url-create="formUrlCreate"
+            :url-update="formUrlUpdate"
+            :save-fn="formCustomFn"
+            auto-load
+            @on-data-saved="getInitialSambaConfig()"
+        >
+            <template #moreActions>
+                <QBtn
+                    class="q-ml-none"
+                    color="primary"
+                    :label="t('samba.testConnection')"
+                    :disable="formModel.hasChanges"
+                    @click="onTestConection()"
+                >
+                    <QTooltip>
+                        {{ t('samba.testConnection') }}
+                    </QTooltip>
+                </QBtn>
+            </template>
+            <template #form="{ data, validate }">
+                <VnRow class="row q-gutter-md">
+                    <div class="col">
+                        <QCheckbox
+                            :label="t('samba.enableSync')"
+                            v-model="data.hasData"
+                            @update:model-value="($event) => (hasData = $event)"
+                            :toggle-indeterminate="false"
+                        />
+                    </div>
+                </VnRow>
+                <template v-if="hasData">
+                    <VnInput
+                        :label="t('samba.domainAD')"
+                        clearable
+                        v-model="data.adDomain"
+                        :required="true"
+                        :rules="validate('SambaConfigs.server')"
+                    />
+                    <VnInput
+                        :label="t('samba.domainController')"
+                        clearable
+                        v-model="data.adController"
+                        :required="true"
+                        :rules="validate('SambaConfigs.adController')"
+                    />
+                    <VnInput
+                        :label="t('samba.userAD')"
+                        clearable
+                        v-model="data.adUser"
+                        :rules="validate('SambaConfigs.adUser')"
+                    />
+                    <VnInput
+                        :label="t('samba.passwordAD')"
+                        clearable
+                        type="password"
+                        v-model="data.adPassword"
+                    />
+                    <VnInput
+                        :label="t('samba.domainPart')"
+                        clearable
+                        v-model="data.userDn"
+                        :required="true"
+                        :rules="validate('SambaConfigs.userDn')"
+                    />
+                    <QCheckbox
+                        :label="t('samba.verifyCertificate')"
+                        v-model="data.verifyCert"
+                        :rules="validate('SambaConfigs.groupDn')"
+                        :toggle-indeterminate="false"
+                    />
+                </template>
+            </template>
+        </FormModel>
+    </QPage>
+</template>
+
+<i18n>
+es:
+    Samba connection established!: ¡Conexión con LDAP establecida!
+</i18n>

src/pages/Account/Acls/AclFilter.vue

@@ -0,0 +1,128 @@
+<script setup>
+import { ref, onBeforeMount } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import FetchData from 'components/FetchData.vue';
+import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
+import VnSelect from 'components/common/VnSelect.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+
+import { useValidator } from 'src/composables/useValidator';
+
+const props = defineProps({
+    dataKey: {
+        type: String,
+        required: true,
+    },
+});
+
+const { t } = useI18n();
+const validationsStore = useValidator();
+const { models } = validationsStore;
+
+const validations = ref([]);
+const accessTypes = [{ name: '*' }, { name: 'READ' }, { name: 'WRITE' }];
+const permissions = [{ name: 'ALLOW' }, { name: 'DENY' }];
+const rolesOptions = ref([]);
+
+onBeforeMount(() => {
+    for (let model in models) validations.value.push({ name: model });
+});
+</script>
+
+<template>
+    <FetchData
+        url="VnRoles"
+        :filter="{ fields: ['name'], order: 'name ASC' }"
+        @on-fetch="(data) => (rolesOptions = data)"
+        auto-load
+    />
+    <VnFilterPanel
+        :data-key="props.dataKey"
+        :search-button="true"
+        :hidden-tags="['search']"
+    >
+        <template #tags="{ tag, formatFn }">
+            <div class="q-gutter-x-xs">
+                <strong>{{ t(`acls.aclFilter.${tag.label}`) }}: </strong>
+                <span>{{ formatFn(tag.value) }}</span>
+            </div>
+        </template>
+        <template #body="{ params, searchFn }">
+            <QItem class="q-mb-sm">
+                <QItemSection>
+                    <VnSelect
+                        :label="t('acls.aclFilter.principalId')"
+                        v-model="params.principalId"
+                        @update:model-value="searchFn()"
+                        :options="rolesOptions"
+                        option-value="name"
+                        option-label="name"
+                        use-input
+                        dense
+                        outlined
+                        rounded
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem class="q-mb-sm">
+                <QItemSection>
+                    <VnSelect
+                        :label="t('acls.aclFilter.model')"
+                        v-model="params.model"
+                        @update:model-value="searchFn()"
+                        :options="validations"
+                        option-value="name"
+                        option-label="name"
+                        use-input
+                        dense
+                        outlined
+                        rounded
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem class="q-mb-sm">
+                <QItemSection>
+                    <VnInput
+                        :label="t('acls.aclFilter.property')"
+                        v-model="params.property"
+                        lazy-rules
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem class="q-mb-sm">
+                <QItemSection>
+                    <VnSelect
+                        :label="t('acls.aclFilter.accessType')"
+                        v-model="params.accessType"
+                        @update:model-value="searchFn()"
+                        :options="accessTypes"
+                        option-value="name"
+                        option-label="name"
+                        use-input
+                        dense
+                        outlined
+                        rounded
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem class="q-mb-sm">
+                <QItemSection>
+                    <VnSelect
+                        :label="t('acls.aclFilter.permission')"
+                        v-model="params.permission"
+                        @update:model-value="searchFn()"
+                        :options="permissions"
+                        option-value="name"
+                        option-label="name"
+                        use-input
+                        dense
+                        outlined
+                        rounded
+                    />
+                </QItemSection>
+            </QItem>
+        </template>
+    </VnFilterPanel>
+</template>

src/pages/Account/Acls/AclFormView.vue

@@ -0,0 +1,126 @@
+<script setup>
+import { useI18n } from 'vue-i18n';
+import { ref, onBeforeMount, onMounted } from 'vue';
+
+import VnSelect from 'src/components/common/VnSelect.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import FormModelPopup from 'components/FormModelPopup.vue';
+
+import { useValidator } from 'src/composables/useValidator';
+import { useArrayData } from 'src/composables/useArrayData';
+
+const emit = defineEmits(['onDataChange']);
+const { t } = useI18n();
+const validationsStore = useValidator();
+const { models } = validationsStore;
+const arrayData = useArrayData('aclCreate');
+const { store } = arrayData;
+
+const accessTypes = [{ name: '*' }, { name: 'READ' }, { name: 'WRITE' }];
+const permissions = [{ name: 'ALLOW' }, { name: 'DENY' }];
+const validations = ref([]);
+
+const url = ref();
+const urlCreate = ref('ACLs');
+const urlUpdate = ref();
+const action = ref('New');
+
+const $props = defineProps({
+    formInitialData: {
+        type: Object,
+        default: () => {
+            return {
+                property: '*',
+                principalType: 'ROLE',
+                accessType: 'READ',
+                permission: 'ALLOW',
+            };
+        },
+    },
+    rolesOptions: {
+        type: Array,
+        required: true,
+    },
+});
+
+onBeforeMount(() => {
+    for (let model in models) validations.value.push({ name: model });
+});
+
+onMounted(() => {
+    store.data = $props.formInitialData;
+    if ($props.formInitialData.id) {
+        urlCreate.value = null;
+        urlUpdate.value = 'ACLs';
+        action.value = 'Edit';
+    }
+});
+</script>
+
+<template>
+    <FormModelPopup
+        v-if="urlCreate || urlUpdate"
+        :title="t(`${action} ACL`)"
+        :url="url"
+        :url-update="urlUpdate"
+        :url-create="urlCreate"
+        :form-initial-data="formInitialData"
+        auto-load
+        model="aclCreate"
+        @on-data-saved="emit('onDataChange')"
+        @on-data-canceled="emit('onDataChange')"
+    >
+        <template #form-inputs="{ data }">
+            <div class="column q-gutter-y-md">
+                <VnSelect
+                    :label="t('acls.aclFilter.principalId')"
+                    v-model="data.principalId"
+                    :options="$props.rolesOptions"
+                    option-value="name"
+                    option-label="name"
+                    use-input
+                    rounded
+                />
+                <VnSelect
+                    :label="t('acls.aclFilter.model')"
+                    v-model="data.model"
+                    :options="validations"
+                    option-value="name"
+                    option-label="name"
+                    use-input
+                    rounded
+                />
+
+                <VnInput
+                    :label="t('acls.aclFilter.property')"
+                    v-model="data.property"
+                    lazy-rules
+                >
+                    <template #append>
+                        <QIcon name="info" class="cursor-pointer">
+                            <QTooltip>{{ t('acls.tooltip') }}</QTooltip>
+                        </QIcon>
+                    </template></VnInput
+                >
+                <VnSelect
+                    :label="t('acls.aclFilter.accessType')"
+                    v-model="data.accessType"
+                    :options="accessTypes"
+                    option-value="name"
+                    option-label="name"
+                    use-input
+                    rounded
+                />
+                <VnSelect
+                    :label="t('acls.aclFilter.permission')"
+                    v-model="data.permission"
+                    :options="permissions"
+                    option-value="name"
+                    option-label="name"
+                    use-input
+                    rounded
+                />
+            </div>
+        </template>
+    </FormModelPopup>
+</template>

src/pages/Account/Alias/AliasCreateForm.vue

@@ -0,0 +1,57 @@
+<script setup>
+import { useRouter } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+
+import FormModelPopup from 'components/FormModelPopup.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+
+import { useArrayData } from 'src/composables/useArrayData';
+
+const router = useRouter();
+const { t } = useI18n();
+const arrayData = useArrayData('AliasCreate');
+const { store } = arrayData;
+
+const defaultInitialData = {
+    alias: null,
+    description: null,
+};
+
+const onDataSaved = ({ id }) => {
+    router.push({ name: 'AliasBasicData', params: { id } });
+    store.data = null;
+};
+</script>
+
+<template>
+    <FormModelPopup
+        :title="t('Create alias')"
+        ref="formModelPopupRef"
+        url-create="MailAliases"
+        model="AliasCreate"
+        :form-initial-data="defaultInitialData"
+        @on-data-saved="onDataSaved"
+    >
+        <template #form-inputs="{ data }">
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnInput v-model="data.alias" :label="t('mailAlias.name')" />
+                </div>
+            </VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnInput
+                        v-model="data.description"
+                        :label="t('mailAlias.description')"
+                    />
+                </div>
+            </VnRow>
+        </template>
+    </FormModelPopup>
+</template>
+
+<i18n>
+    es:
+        Create alias: Crear alias
+</i18n>

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

@@ -0,0 +1,20 @@
+<script setup>
+import { useI18n } from 'vue-i18n';
+
+import FormModel from 'components/FormModel.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+
+const { t } = useI18n();
+</script>
+
+<template>
+    <FormModel model="Alias">
+        <template #form="{ data }">
+            <div class="column q-gutter-y-md">
+                <VnInput v-model="data.alias" :label="t('mailAlias.name')" />
+                <VnInput v-model="data.description" :label="t('mailAlias.description')" />
+                <QCheckbox :label="t('mailAlias.isPublic')" v-model="data.isPublic" />
+            </div>
+        </template>
+    </FormModel>
+</template>

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

@@ -0,0 +1,33 @@
+<script setup>
+import { useI18n } from 'vue-i18n';
+import { useRoute } from 'vue-router';
+import { computed } from 'vue';
+
+import VnCard from 'components/common/VnCard.vue';
+import AliasDescriptor from './AliasDescriptor.vue';
+
+const { t } = useI18n();
+const route = useRoute();
+
+const routeName = computed(() => route.name);
+const customRouteRedirectName = computed(() => {
+    return routeName.value;
+});
+const searchBarDataKeys = {
+    AliasBasicData: 'AliasBasicData',
+    AliasUsers: 'AliasUsers',
+};
+</script>
+
+<template>
+    <VnCard
+        data-key="Alias"
+        base-url="MailAliases"
+        :descriptor="AliasDescriptor"
+        :search-data-key="searchBarDataKeys[routeName]"
+        :search-custom-route-redirect="customRouteRedirectName"
+        :search-redirect="!!customRouteRedirectName"
+        :searchbar-label="t('mailAlias.search')"
+        :searchbar-info="t('mailAlias.searchInfo')"
+    />
+</template>

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

@@ -0,0 +1,88 @@
+<script setup>
+import { ref, computed } from 'vue';
+import { useRoute, useRouter } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+import { useQuasar } from 'quasar';
+
+import CardDescriptor from 'components/ui/CardDescriptor.vue';
+import VnLv from 'src/components/ui/VnLv.vue';
+
+import useCardDescription from 'src/composables/useCardDescription';
+import axios from 'axios';
+import useNotify from 'src/composables/useNotify.js';
+
+const $props = defineProps({
+    id: {
+        type: Number,
+        required: false,
+        default: null,
+    },
+});
+
+const { t } = useI18n();
+const route = useRoute();
+const quasar = useQuasar();
+const router = useRouter();
+const { notify } = useNotify();
+
+const entityId = computed(() => {
+    return $props.id || route.params.id;
+});
+
+const data = ref(useCardDescription());
+const setData = (entity) => (data.value = useCardDescription(entity.alias, entity.id));
+
+const removeAlias = () => {
+    quasar
+        .dialog({
+            title: t('Alias will be removed'),
+            message: t('Are you sure you want to continue?'),
+            ok: {
+                push: true,
+                color: 'primary',
+            },
+            cancel: true,
+        })
+        .onOk(async () => {
+            try {
+                await axios.delete(`MailAliases/${entityId.value}`);
+                notify(t('Alias removed'), 'positive');
+                router.push({ name: 'AccountAlias' });
+            } catch (err) {
+                console.error('Error removing alias');
+            }
+        });
+};
+</script>
+
+<template>
+    <CardDescriptor
+        ref="descriptor"
+        :url="`MailAliases/${entityId}`"
+        module="Alias"
+        @on-fetch="setData"
+        data-key="aliasData"
+        :title="data.title"
+        :subtitle="data.subtitle"
+    >
+        <template #menu>
+            <QItem v-ripple clickable @click="removeAlias()">
+                <QItemSection>{{ t('Delete') }}</QItemSection>
+            </QItem>
+        </template>
+        <template #body="{ entity }">
+            <VnLv :label="t('mailAlias.description')" :value="entity.description" />
+        </template>
+    </CardDescriptor>
+</template>
+
+<i18n>
+    en:
+        accountRate: Claming rate
+    es:
+        accountRate: Ratio de reclamación
+        Delete: Eliminar
+        Alias will be removed: El alias será eliminado
+        Are you sure you want to continue?: ¿Seguro que quieres continuar?
+        Alias removed: Alias eliminado
+</i18n>

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

@@ -0,0 +1,49 @@
+<script setup>
+import { ref, computed } from 'vue';
+import { useRoute } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+
+import CardSummary from 'components/ui/CardSummary.vue';
+import VnLv from 'src/components/ui/VnLv.vue';
+
+import { useArrayData } from 'src/composables/useArrayData';
+
+const route = useRoute();
+const { t } = useI18n();
+
+const $props = defineProps({
+    id: {
+        type: Number,
+        default: 0,
+    },
+});
+
+const { store } = useArrayData('Alias');
+const alias = ref(store.data);
+const entityId = computed(() => $props.id || route.params.id);
+</script>
+
+<template>
+    <CardSummary
+        ref="summary"
+        :url="`MailAliases/${entityId}`"
+        @on-fetch="(data) => (alias = data)"
+    >
+        <template #header> {{ alias.id }} - {{ alias.alias }} </template>
+        <template #body>
+            <QCard class="vn-one">
+                <QCardSection class="q-pa-none">
+                    <router-link
+                        :to="{ name: 'AliasBasicData', params: { id: entityId } }"
+                        class="header header-link"
+                    >
+                        {{ t('globals.summary.basicData') }}
+                        <QIcon name="open_in_new" />
+                    </router-link>
+                </QCardSection>
+                <VnLv :label="t('mailAlias.id')" :value="alias.id" />
+                <VnLv :label="t('mailAlias.description')" :value="alias.description" />
+            </QCard>
+        </template>
+    </CardSummary>
+</template>

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

@@ -0,0 +1,122 @@
+<script setup>
+import { useRoute } from 'vue-router';
+import { computed, ref, watch } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import VnPaginate from 'components/ui/VnPaginate.vue';
+
+import { useVnConfirm } from 'composables/useVnConfirm';
+import { useArrayData } from 'composables/useArrayData';
+import useNotify from 'src/composables/useNotify.js';
+import axios from 'axios';
+
+const { t } = useI18n();
+const { notify } = useNotify();
+const route = useRoute();
+const { openConfirmationModal } = useVnConfirm();
+
+const paginateRef = ref(null);
+
+const arrayData = useArrayData('AliasUsers');
+const { store } = arrayData;
+
+const data = computed(() => {
+    const dataCopy = JSON.parse(JSON.stringify(store.data));
+    return dataCopy.sort((a, b) => a.user?.name.localeCompare(b.user?.name));
+});
+
+const filter = {
+    include: {
+        relation: 'user',
+        scope: {
+            fields: ['id', 'name'],
+        },
+    },
+};
+
+const urlPath = computed(() => `MailAliases/${route.params.id}/accounts`);
+
+const columns = computed(() => [
+    {
+        name: 'alias',
+    },
+    {
+        name: 'action',
+    },
+]);
+
+const deleteAlias = async (row) => {
+    try {
+        await axios.delete(`${urlPath.value}/${row.id}`);
+        notify(t('User removed'), 'positive');
+        fetchAliases();
+    } catch (error) {
+        console.error(error);
+    }
+};
+
+watch(
+    () => route.params.id,
+    () => {
+        store.url = urlPath.value;
+        store.filter = filter;
+        fetchAliases();
+    }
+);
+
+const fetchAliases = () => paginateRef.value.fetch();
+</script>
+
+<template>
+    <QPage class="column items-center q-pa-md">
+        <div class="full-width" style="max-width: 400px">
+            <VnPaginate
+                ref="paginateRef"
+                data-key="AliasUsers"
+                :filter="filter"
+                :url="urlPath"
+                :limit="0"
+                auto-load
+            >
+                <template #body>
+                    <QTable :rows="data" :columns="columns" hide-header>
+                        <template #body="{ row }">
+                            <QTr>
+                                <QTd>
+                                    <span>{{ row.user?.name }}</span>
+                                </QTd>
+                                <QTd style="width: 50px !important">
+                                    <QIcon
+                                        name="delete"
+                                        size="sm"
+                                        class="cursor-pointer"
+                                        color="primary"
+                                        @click="
+                                            openConfirmationModal(
+                                                t('User will be removed from alias'),
+                                                t('Are you sure you want to continue?'),
+                                                () => deleteAlias(row)
+                                            )
+                                        "
+                                    >
+                                        <QTooltip>
+                                            {{ t('Delete') }}
+                                        </QTooltip>
+                                    </QIcon>
+                                </QTd>
+                            </QTr>
+                        </template>
+                    </QTable>
+                </template>
+            </VnPaginate>
+        </div>
+    </QPage>
+</template>
+
+<i18n>
+es:
+    User will be removed from alias: El usuario será borrado del alias
+    Are you sure you want to continue?: ¿Seguro que quieres continuar?
+    User removed: Usuario borrado
+    Delete: Eliminar
+</i18n>

src/pages/Account/Role/AccountRoles.vue

@@ -0,0 +1,131 @@
+<script setup>
+import { useI18n } from 'vue-i18n';
+import { useRouter } from 'vue-router';
+import { ref } from 'vue';
+
+import VnPaginate from 'src/components/ui/VnPaginate.vue';
+import VnLv from 'src/components/ui/VnLv.vue';
+import CardList from 'src/components/ui/CardList.vue';
+import RoleSummary from './Card/RoleSummary.vue';
+import RoleForm from './Card/RoleForm.vue';
+import VnSearchbar from 'components/ui/VnSearchbar.vue';
+import AccountRolesFilter from './AccountRolesFilter.vue';
+
+import { useStateStore } from 'stores/useStateStore';
+import { useSummaryDialog } from 'src/composables/useSummaryDialog';
+
+const stateStore = useStateStore();
+const router = useRouter();
+const { t } = useI18n();
+const { viewSummary } = useSummaryDialog();
+
+const roleCreateDialogRef = ref(null);
+
+const exprBuilder = (param, value) => {
+    switch (param) {
+        case 'search':
+            return /^\d+$/.test(value)
+                ? { id: value }
+                : {
+                      or: [
+                          { name: { like: `%${value}%` } },
+                          { nickname: { like: `%${value}%` } },
+                      ],
+                  };
+        case 'name':
+        case 'description':
+            return { [param]: { like: `%${value}%` } };
+    }
+};
+
+const openCreateModal = () => roleCreateDialogRef.value.show();
+
+const getApiUrl = () => new URL(window.location).origin;
+
+const navigate = (event, id) => {
+    if (event.ctrlKey || event.metaKey)
+        return window.open(`${getApiUrl()}/#/account/role/${id}/summary`);
+    router.push({ name: 'RoleSummary', params: { id } });
+};
+</script>
+
+<template>
+    <template v-if="stateStore.isHeaderMounted()">
+        <Teleport to="#searchbar">
+            <VnSearchbar
+                data-key="RolesList"
+                url="VnRoles"
+                :label="t('role.searchRoles')"
+                :info="t('role.searchInfo')"
+            />
+        </Teleport>
+        <Teleport to="#actions-append">
+            <div class="row q-gutter-x-sm">
+                <QBtn
+                    flat
+                    @click="stateStore.toggleRightDrawer()"
+                    round
+                    dense
+                    icon="menu"
+                >
+                    <QTooltip bottom anchor="bottom right">
+                        {{ t('globals.collapseMenu') }}
+                    </QTooltip>
+                </QBtn>
+            </div>
+        </Teleport>
+    </template>
+    <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
+        <QScrollArea class="fit text-grey-8">
+            <AccountRolesFilter data-key="RolesList" :expr-builder="exprBuilder" />
+        </QScrollArea>
+    </QDrawer>
+    <QPage class="column items-center q-pa-md">
+        <div class="vn-card-list">
+            <VnPaginate data-key="RolesList" url="VnRoles">
+                <template #body="{ rows }">
+                    <CardList
+                        :id="row.id"
+                        :key="row.id"
+                        :title="row.name"
+                        @click="navigate($event, row.id)"
+                        v-for="row of rows"
+                    >
+                        <template #list-items>
+                            <div style="flex-direction: column; width: 100%">
+                                <VnLv :label="t('role.card.name')" :value="row.name">
+                                </VnLv>
+                                <VnLv
+                                    :label="t('role.card.description')"
+                                    :value="row.description"
+                                >
+                                </VnLv>
+                            </div>
+                        </template>
+                        <template #actions>
+                            <QBtn
+                                :label="t('components.smartCard.openSummary')"
+                                @click.stop="viewSummary(row.id, RoleSummary)"
+                                color="primary"
+                                style="margin-top: 15px"
+                            />
+                        </template>
+                    </CardList>
+                </template>
+            </VnPaginate>
+        </div>
+        <QDialog
+            ref="roleCreateDialogRef"
+            transition-show="scale"
+            transition-hide="scale"
+        >
+            <RoleForm />
+        </QDialog>
+        <QPageSticky :offset="[20, 20]">
+            <QBtn fab icon="add" color="primary" @click="openCreateModal()" />
+            <QTooltip>
+                {{ t('role.newRole') }}
+            </QTooltip>
+        </QPageSticky>
+    </QPage>
+</template>

src/pages/Account/Role/AccountRolesFilter.vue

@@ -0,0 +1,52 @@
+<script setup>
+import { useI18n } from 'vue-i18n';
+
+import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+
+const { t } = useI18n();
+const props = defineProps({
+    dataKey: {
+        type: String,
+        required: true,
+    },
+});
+</script>
+
+<template>
+    <VnFilterPanel
+        :data-key="props.dataKey"
+        :search-button="true"
+        :hidden-tags="['search']"
+        :redirect="false"
+    >
+        <template #tags="{ tag, formatFn }">
+            <div class="q-gutter-x-xs">
+                <strong>{{ t(`role.${tag.label}`) }}: </strong>
+                <span>{{ formatFn(tag.value) }}</span>
+            </div>
+        </template>
+        <template #body="{ params }">
+            <QItem class="q-my-sm">
+                <QItemSection>
+                    <VnInput
+                        :label="t('role.name')"
+                        v-model="params.name"
+                        lazy-rules
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem class="q-my-sm">
+                <QItemSection>
+                    <VnInput
+                        :label="t('role.description')"
+                        v-model="params.description"
+                        lazy-rules
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
+        </template>
+    </VnFilterPanel>
+</template>

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

@@ -0,0 +1,96 @@
+<script setup>
+import { useRoute, useRouter } from 'vue-router';
+import { computed, ref, watch } from 'vue';
+
+import VnPaginate from 'components/ui/VnPaginate.vue';
+
+import { useArrayData } from 'composables/useArrayData';
+
+const route = useRoute();
+const router = useRouter();
+
+const paginateRef = ref(null);
+
+const arrayData = useArrayData('InheritedRoles');
+const store = arrayData.store;
+
+const data = computed(() => {
+    const dataCopy = store.data;
+    return dataCopy.sort((a, b) => a.inherits?.name.localeCompare(b.inherits?.name));
+});
+
+const filter = computed(() => ({
+    where: { role: route.params.id },
+    include: {
+        relation: 'inherits',
+        scope: {
+            fields: ['id', 'name', 'description'],
+        },
+    },
+}));
+
+const urlPath = computed(() => 'RoleRoles');
+
+const columns = computed(() => [
+    {
+        name: 'name',
+    },
+]);
+
+watch(
+    () => route.params.id,
+    () => {
+        store.url = urlPath.value;
+        store.filter = filter.value;
+        fetchSubRoles();
+    }
+);
+
+const fetchSubRoles = () => paginateRef.value.fetch();
+
+const redirectToRoleSummary = (id) =>
+    router.push({ name: 'RoleSummary', params: { id } });
+</script>
+
+<template>
+    <QPage class="column items-center q-pa-md">
+        <div class="full-width" style="max-width: 400px">
+            <VnPaginate
+                ref="paginateRef"
+                data-key="InheritedRoles"
+                :filter="filter"
+                :url="urlPath"
+                :limit="0"
+                auto-load
+            >
+                <template #body>
+                    <QTable :rows="data" :columns="columns" hide-header>
+                        <template #body="{ row }">
+                            <QTr
+                                @click="redirectToRoleSummary(row.inherits?.id)"
+                                class="cursor-pointer"
+                            >
+                                <QTd>
+                                    <div class="column">
+                                        <span>{{ row.inherits?.name }}</span>
+                                        <span class="color-vn-label">{{
+                                            row.inherits?.description
+                                        }}</span>
+                                    </div>
+                                </QTd>
+                            </QTr>
+                        </template>
+                    </QTable>
+                </template>
+            </VnPaginate>
+        </div>
+    </QPage>
+</template>
+
+<i18n>
+es:
+    Role removed. Changes will take a while to fully propagate.: Rol eliminado. Los cambios tardaran un tiempo en propagarse completamente.
+    Role added! Changes will take a while to fully propagate.: ¡Rol añadido! Los cambios tardaran un tiempo en propagarse completamente.
+    El rol va a ser eliminado: Role will be removed
+    ¿Seguro que quieres continuar?: Are you sure you want to continue?
+</i18n>

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

@@ -0,0 +1,33 @@
+<script setup>
+import { useRoute } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+import FormModel from 'components/FormModel.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+const route = useRoute();
+const { t } = useI18n();
+</script>
+<template>
+    <FormModel :url="`VnRoles/${route.params.id}`" model="VnRole" auto-load>
+        <template #form="{ data }">
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnInput v-model="data.name" :label="t('role.card.name')" />
+                </div>
+            </VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnInput
+                        v-model="data.description"
+                        :label="t('role.card.description')"
+                    />
+                </div>
+            </VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <QCheckbox :label="t('mailAlias.isPublic')" v-model="data.isPublic" />
+                </div>
+            </VnRow>
+        </template>
+    </FormModel>
+</template>

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

@@ -0,0 +1,32 @@
+<script setup>
+import { computed } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useRoute } from 'vue-router';
+
+import VnCard from 'components/common/VnCard.vue';
+import RoleDescriptor from './RoleDescriptor.vue';
+
+const { t } = useI18n();
+const route = useRoute();
+
+const routeName = computed(() => route.name);
+const customRouteRedirectName = computed(() => routeName.value);
+const searchBarDataKeys = {
+    RoleSummary: 'RoleSummary',
+    RoleBasicData: 'RoleBasicData',
+    SubRoles: 'SubRoles',
+    InheritedRoles: 'InheritedRoles',
+    RoleLog: 'RoleLog',
+};
+</script>
+<template>
+    <VnCard
+        data-key="Role"
+        :descriptor="RoleDescriptor"
+        :search-data-key="searchBarDataKeys[routeName]"
+        :search-custom-route-redirect="customRouteRedirectName"
+        :search-redirect="!!customRouteRedirectName"
+        :searchbar-label="t('role.searchRoles')"
+        :searchbar-info="t('role.searchInfo')"
+    />
+</template>

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

@@ -0,0 +1,92 @@
+<script setup>
+import { ref, computed } from 'vue';
+import { useRoute, useRouter } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+import CardDescriptor from 'components/ui/CardDescriptor.vue';
+import VnLv from 'src/components/ui/VnLv.vue';
+import useCardDescription from 'src/composables/useCardDescription';
+import { useQuasar } from 'quasar';
+
+import axios from 'axios';
+import useNotify from 'src/composables/useNotify.js';
+const $props = defineProps({
+    id: {
+        type: Number,
+        required: false,
+        default: null,
+    },
+});
+
+const route = useRoute();
+
+const quasar = useQuasar();
+const router = useRouter();
+
+const { notify } = useNotify();
+const { t } = useI18n();
+const entityId = computed(() => {
+    return $props.id || route.params.id;
+});
+const data = ref(useCardDescription());
+const setData = (entity) => (data.value = useCardDescription(entity.name, entity.id));
+const filter = {
+    where: { id: entityId },
+};
+const removeRole = () => {
+    quasar
+        .dialog({
+            title: 'Are you sure you want to delete it?',
+            message: 'Delete department',
+            ok: {
+                push: true,
+                color: 'primary',
+            },
+            cancel: true,
+        })
+        .onOk(async () => {
+            try {
+                await axios.post(
+                    `/Departments/${entityId.value}/removeChild`,
+                    entityId.value
+                );
+                router.push({ name: 'WorkerDepartment' });
+                notify('department.departmentRemoved', 'positive');
+            } catch (err) {
+                console.error('Error removing department');
+            }
+        });
+};
+</script>
+
+<template>
+    <CardDescriptor
+        ref="descriptor"
+        :url="`VnRoles`"
+        :filter="filter"
+        module="Role"
+        @on-fetch="setData"
+        data-key="accountData"
+        :title="data.title"
+        :subtitle="data.subtitle"
+    >
+        <template #menu>
+            <QItem v-ripple clickable @click="removeRole()">
+                <QItemSection>{{ t('Delete') }}</QItemSection>
+            </QItem>
+        </template>
+        <template #body="{ entity }">
+            <VnLv :label="t('role.card.description')" :value="entity.description" />
+        </template>
+    </CardDescriptor>
+</template>
+<style scoped>
+.q-item__label {
+    margin-top: 0;
+}
+</style>
+<i18n>
+    en:
+        accountRate: Claming rate
+    es:
+        accountRate: Ratio de reclamación
+</i18n>

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

@@ -0,0 +1,44 @@
+<script setup>
+import { useRouter } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+
+import FormModelPopup from 'components/FormModelPopup.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+
+const router = useRouter();
+const { t } = useI18n();
+</script>
+<template>
+    <FormModelPopup
+        :title="t('Create role')"
+        ref="formModelPopupRef"
+        url-create="VnRoles"
+        model="VnRole"
+        :form-initial-data="{}"
+        @on-data-saved="
+            (_, { id }) => router.push({ name: 'RoleBasicData', params: { id } })
+        "
+    >
+        <template #form-inputs="{ data }">
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnInput v-model="data.name" :label="t('role.card.name')" />
+                </div>
+            </VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnInput
+                        v-model="data.description"
+                        :label="t('role.card.description')"
+                    />
+                </div>
+            </VnRow>
+        </template>
+    </FormModelPopup>
+</template>
+
+<i18n>
+    es:
+        Create role: Crear role
+</i18n>

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

@@ -0,0 +1,6 @@
+<script setup>
+import VnLog from 'src/components/common/VnLog.vue';
+</script>
+<template>
+    <VnLog model="Role" url="/RoleLogs"></VnLog>
+</template>

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

@@ -0,0 +1,52 @@
+<script setup>
+import { ref, computed } from 'vue';
+import { useRoute } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+import CardSummary from 'components/ui/CardSummary.vue';
+import VnLv from 'src/components/ui/VnLv.vue';
+import { useArrayData } from 'src/composables/useArrayData';
+
+const route = useRoute();
+const { t } = useI18n();
+
+const $props = defineProps({
+    id: {
+        type: Number,
+        default: 0,
+    },
+});
+
+const { store } = useArrayData('Role');
+const role = ref(store.data);
+const entityId = computed(() => $props.id || route.params.id);
+const filter = {
+    where: { id: entityId },
+};
+</script>
+
+<template>
+    <CardSummary
+        ref="summary"
+        :url="`VnRoles`"
+        :filter="filter"
+        @on-fetch="(data) => (role = data)"
+    >
+        <template #header> {{ role.id }} - {{ role.name }} </template>
+        <template #body>
+            <QCard class="vn-one">
+                <QCardSection class="q-pa-none">
+                    <a
+                        class="header header-link"
+                        :href="`#/VnUser/${entityId}/basic-data`"
+                    >
+                        {{ t('globals.pageTitles.basicData') }}
+                        <QIcon name="open_in_new" />
+                    </a>
+                </QCardSection>
+                <VnLv :label="t('role.card.id')" :value="role.id" />
+                <VnLv :label="t('role.card.name')" :value="role.name" />
+                <VnLv :label="t('role.card.description')" :value="role.description" />
+            </QCard>
+        </template>
+    </CardSummary>
+</template>

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

@@ -0,0 +1,51 @@
+<script setup>
+import { reactive, ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useRoute } from 'vue-router';
+
+import VnSelect from 'src/components/common/VnSelect.vue';
+import FetchData from 'components/FetchData.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import FormPopup from 'components/FormPopup.vue';
+
+const emit = defineEmits(['onSubmitCreateSubrole']);
+
+const { t } = useI18n();
+const route = useRoute();
+
+const subRoleFormData = reactive({
+    inheritsFrom: null,
+    role: route.params.id,
+});
+
+const rolesOptions = ref([]);
+</script>
+
+<template>
+    <FetchData
+        url="VnRoles"
+        :filter="{ fields: ['id', 'name'], order: 'name ASC' }"
+        auto-load
+        @on-fetch="(data) => (rolesOptions = data)"
+    />
+    <FormPopup
+        model="ZoneWarehouse"
+        @on-submit="emit('onSubmitCreateSubrole', subRoleFormData)"
+    >
+        <template #form-inputs>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnSelect
+                        :label="t('account.card.role')"
+                        v-model="subRoleFormData.inheritsFrom"
+                        :options="rolesOptions"
+                        option-value="id"
+                        option-label="name"
+                        hide-selected
+                        :required="true"
+                    />
+                </div>
+            </VnRow>
+        </template>
+    </FormPopup>
+</template>

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

@@ -0,0 +1,162 @@
+<script setup>
+import { useRoute, useRouter } from 'vue-router';
+import { computed, ref, watch } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import VnPaginate from 'components/ui/VnPaginate.vue';
+import SubRoleCreateForm from './SubRoleCreateForm.vue';
+
+import { useVnConfirm } from 'composables/useVnConfirm';
+import { useArrayData } from 'composables/useArrayData';
+import useNotify from 'src/composables/useNotify.js';
+import axios from 'axios';
+
+const { t } = useI18n();
+const route = useRoute();
+const router = useRouter();
+const { openConfirmationModal } = useVnConfirm();
+const { notify } = useNotify();
+
+const paginateRef = ref(null);
+const createSubRoleDialogRef = ref(null);
+
+const arrayData = useArrayData('SubRoles');
+const store = arrayData.store;
+
+const data = computed(() => {
+    const dataCopy = store.data;
+    return dataCopy.sort((a, b) => a.inherits?.name.localeCompare(b.inherits?.name));
+});
+
+const filter = computed(() => ({
+    where: { role: route.params.id },
+    include: {
+        relation: 'inherits',
+        scope: {
+            fields: ['id', 'name', 'description'],
+        },
+    },
+}));
+
+const urlPath = computed(() => `RoleInherits`);
+
+const columns = computed(() => [
+    {
+        name: 'name',
+    },
+    {
+        name: 'action',
+    },
+]);
+
+const deleteSubRole = async (row) => {
+    try {
+        await axios.delete(`${urlPath.value}/${row.id}`);
+        fetchSubRoles();
+        notify(
+            t('Role removed. Changes will take a while to fully propagate.'),
+            'positive'
+        );
+    } catch (error) {
+        console.error(error);
+    }
+};
+
+const createSubRole = async (subRoleFormData) => {
+    try {
+        await axios.post(urlPath.value, subRoleFormData);
+        notify(
+            t('Role added! Changes will take a while to fully propagate.'),
+            'positive'
+        );
+        fetchSubRoles();
+    } catch (error) {
+        console.error(error);
+    }
+};
+
+watch(
+    () => route.params.id,
+    () => {
+        store.url = urlPath.value;
+        store.filter = filter.value;
+        fetchSubRoles();
+    }
+);
+
+const fetchSubRoles = () => paginateRef.value.fetch();
+
+const openCreateSubRoleForm = () => createSubRoleDialogRef.value.show();
+
+const redirectToRoleSummary = (id) =>
+    router.push({ name: 'RoleSummary', params: { id } });
+</script>
+
+<template>
+    <QPage class="column items-center q-pa-md">
+        <div class="full-width" style="max-width: 400px">
+            <VnPaginate
+                ref="paginateRef"
+                data-key="SubRoles"
+                :filter="filter"
+                :url="urlPath"
+                auto-load
+            >
+                <template #body="{ rows }">
+                    <QTable :rows="data" :columns="columns" hide-header>
+                        <template #body="{ row, rowIndex }">
+                            <QTr
+                                @click="redirectToRoleSummary(row.inherits?.id)"
+                                class="cursor-pointer"
+                            >
+                                <QTd>
+                                    <div class="column">
+                                        <span>{{ row.inherits?.name }}</span>
+                                        <span class="color-vn-label">{{
+                                            row.inherits?.description
+                                        }}</span>
+                                    </div>
+                                </QTd>
+                                <QTd style="width: 50px !important">
+                                    <QIcon
+                                        name="delete"
+                                        size="sm"
+                                        class="cursor-pointer"
+                                        color="primary"
+                                        @click.stop.prevent="
+                                            openConfirmationModal(
+                                                t('El rol va a ser eliminado'),
+                                                t('¿Seguro que quieres continuar?'),
+                                                () => deleteSubRole(row, rows, rowIndex)
+                                            )
+                                        "
+                                    >
+                                        <QTooltip>
+                                            {{ t('globals.delete') }}
+                                        </QTooltip>
+                                    </QIcon>
+                                </QTd>
+                            </QTr>
+                        </template>
+                    </QTable>
+                </template>
+            </VnPaginate>
+        </div>
+        <QDialog ref="createSubRoleDialogRef">
+            <SubRoleCreateForm @on-submit-create-subrole="createSubRole" />
+        </QDialog>
+        <QPageSticky position="bottom-right" :offset="[18, 18]">
+            <QBtn fab icon="add" color="primary" @click="openCreateSubRoleForm()">
+                <QTooltip>{{ t('warehouses.add') }}</QTooltip>
+            </QBtn>
+        </QPageSticky>
+    </QPage>
+</template>
+
+<i18n>
+es:
+    Role removed. Changes will take a while to fully propagate.: Rol eliminado. Los cambios tardaran un tiempo en propagarse completamente.
+    Role added! Changes will take a while to fully propagate.: ¡Rol añadido! Los cambios tardaran un tiempo en propagarse completamente.
+    El rol va a ser eliminado: Role will be removed
+    ¿Seguro que quieres continuar?: Are you sure you want to continue?
+</i18n>

src/pages/Account/locale/en.yml

@@ -0,0 +1,109 @@
+account:
+    pageTitles:
+        users: Users
+        list: Users
+        roles: Roles
+        alias: Mail aliasses
+        accounts: Accounts
+        ldap: LDAP
+        samba: Samba
+        acls: ACLs
+        connections: Connections
+        inheritedRoles: Inherited Roles
+        subRoles: Sub Roles
+        newRole: New role
+        privileges: Privileges
+        mailAlias: Mail Alias
+        mailForwarding: Mail Forwarding
+        aliasUsers: Users
+    card:
+        name: Name
+        nickname: User
+        role: Rol
+        email: Email
+        alias: Alias
+        lang: Language
+        actions:
+            setPassword: Set password
+            disableAccount:
+                name: Disable account
+                title: La cuenta será deshabilitada
+                subtitle: ¿Seguro que quieres continuar?
+            disableUser: Disable user
+            sync: Sync
+            delete: Delete
+    search: Search user
+role:
+    pageTitles:
+        inheritedRoles: Inherited Roles
+        subRoles: Sub Roles
+    card:
+        description: Description
+        id: Id
+        name: Name
+    newRole: New role
+    searchRoles: Search role
+    searchInfo: Search role by id or name
+    name: Name
+    description: Description
+    id: Id
+mailAlias:
+    pageTitles:
+        aliasUsers: Users
+    search: Search mail alias
+    searchInfo: Search alias by id or name
+    alias: Alias
+    description: Description
+    id: Id
+    newAlias: New alias
+    name: Name
+    isPublic: Public
+ldap:
+    enableSync: Enable synchronization
+    server: Server
+    rdn: RDN
+    userDN: User DN
+    filter: Filter
+    groupDN: Group DN
+    testConnection: Test connection
+    success: LDAP connection established!
+    password: Password
+samba:
+    enableSync: Enable synchronization
+    domainController: Domain controller
+    domainAD: AD domain
+    userAD: AD user
+    groupDN: Group DN
+    passwordAD: AD password
+    domainPart: User DN (without domain part)
+    verifyCertificate: Verify certificate
+    testConnection: Test connection
+    success: Samba connection established!
+accounts:
+    homedir: Homedir base
+    shell: Shell
+    idBase: User and role base id
+    min: Min
+    max: Max
+    warn: Warn
+    inact: Inact
+    syncAll: Synchronize all
+    syncRoles: Synchronize roles
+connections:
+    refresh: Refresh
+    username: Username
+    created: Created
+    killSession: Kill session
+acls:
+    role: Role
+    accessType: Access type
+    permissions: Permission
+    search: Search acls
+    searchInfo: Search acls by model name
+    tooltip: Use * to match all properties
+    aclFilter:
+        principalId: Role
+        model: Model
+        property: Property
+        accessType: Access type
+        permission: Permission

src/pages/Account/locale/es.yml

@@ -0,0 +1,120 @@
+account:
+    pageTitles:
+        users: Usuarios
+        list: Usuarios
+        roles: Roles
+        alias: Alias de correo
+        accounts: Cuentas
+        ldap: LDAP
+        samba: Samba
+        acls: ACLs
+        connections: Conexiones
+        inheritedRoles: Roles heredados
+        newRole: Nuevo rol
+        subRoles: Subroles
+        privileges: Privilegios
+        mailAlias: Alias de correo
+        mailForwarding: Reenvío de correo
+        aliasUsers: Usuarios
+    card:
+        nickname: Usuario
+        name: Nombre
+        role: Rol
+        email: Mail
+        alias: Alias
+        lang: dioma
+        actions:
+            setPassword: Establecer contraseña
+            disableAccount:
+                name: Deshabilitar cuenta
+                title: La cuenta será deshabilitada
+                subtitle: ¿Seguro que quieres continuar?
+            disableUser:
+                name: Desactivar usuario
+                title: El usuario será deshabilitado
+                subtitle: ¿Seguro que quieres continuar?
+            sync:
+                name: Sincronizar
+                title: El usuario será sincronizado
+                subtitle: ¿Seguro que quieres continuar?
+            delete:
+                name: Eliminar
+                title: El usuario será eliminado
+                subtitle: ¿Seguro que quieres continuar?
+
+    search: Buscar usuario
+role:
+    pageTitles:
+        inheritedRoles: Roles heredados
+        subRoles: Subroles
+        newRole: Nuevo rol
+    card:
+        description: Descripción
+        id: Id
+        name: Nombre
+    newRole: Nuevo rol
+    searchRoles: Buscar roles
+    searchInfo: Buscar rol por id o nombre
+    name: Nombre
+    description: Descripción
+    id: Id
+mailAlias:
+    pageTitles:
+        aliasUsers: Usuarios
+    search: Buscar alias de correo
+    searchInfo: Buscar alias por id o nombre
+    alias: Alias
+    description: Descripción
+    id: Id
+    newAlias: Nuevo alias
+    name: Nombre
+    isPublic: Público
+ldap:
+    password: Contraseña
+    enableSync: Habilitar sincronización
+    server: Servidor
+    rdn: RDN
+    userDN: DN usuarios
+    filter: Filtro
+    groupDN: DN grupos
+    testConnection: Probar conexión
+    success: ¡Conexión con LDAP establecida!
+samba:
+    enableSync: Habilitar sincronización
+    domainController: Controlador de dominio
+    domainAD: Dominio AD
+    groupDN: DN grupos
+    userAD: Usuario AD
+    passwordAD: Contraseña AD
+    domainPart: DN usuarios (sin la parte del dominio)
+    verifyCertificate: Verificar certificado
+    testConnection: Probar conexión
+    success: ¡Conexión con Samba establecida!
+accounts:
+    homedir: Directorio base para carpetas de usuario
+    shell: Intérprete de línea de comandos
+    idBase: Id base usuarios y roles
+    min: Min
+    max: Max
+    warn: Warn
+    inact: Inact
+    syncAll: Sincronizar todo
+    syncRoles: Sincronizar roles
+connections:
+    refresh: Actualizar
+    username: Nombre de usuario
+    created: Creado
+    killSession: Matar sesión
+acls:
+    role: Rol
+    accessType: Tipo de acceso
+    permissions: Permiso
+    search: Buscar acls
+    searchInfo: Buscar acls por nombre
+    tooltip: Usa * para marcar todas las propiedades
+    aclFilter:
+        principalId: Rol
+        model: Modelo
+        property: Propiedad
+        accessType: Tipo de acceso
+        permission: Permiso

src/pages/Agency/AgencyList.vue

@@ -2,13 +2,11 @@
 import VnPaginate from 'src/components/ui/VnPaginate.vue';
 import CardList from 'src/components/ui/CardList.vue';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
-import { useStateStore } from 'stores/useStateStore';
 import { useRouter } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 
 const { t } = useI18n();
 const router = useRouter();
-const stateStore = useStateStore();
 function navigate(id) {
     router.push({ path: `/agency/${id}` });
 }
@@ -22,16 +20,12 @@ function exprBuilder(param, value) {
 }
 </script>
 <template>
-    <template v-if="stateStore.isHeaderMounted()">
-        <Teleport to="#searchbar">
-            <VnSearchbar
-                :info="t('You can search by name')"
-                :label="t('Search agency')"
-                data-key="AgencyList"
-                url="Agencies"
-            />
-        </Teleport>
-    </template>
+    <VnSearchbar
+        :info="t('You can search by name')"
+        :label="t('Search agency')"
+        data-key="AgencyList"
+        url="Agencies"
+    />
     <QPage class="column items-center q-pa-md">
         <div class="vn-card-list">
             <VnPaginate

src/pages/Claim/Card/ClaimBasicData.vue

@@ -158,8 +158,7 @@ const statesFilter = {
                     map-options
                     use-input
                     :input-debounce="0"
-                >
-                </QSelect>
+                />
             </VnRow>
         </template>
     </FormModel>

src/pages/Claim/ClaimList.vue

@@ -1,7 +1,6 @@
 <script setup>
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
-import { useStateStore } from 'stores/useStateStore';
 import { toDate } from 'filters/index';
 import VnPaginate from 'src/components/ui/VnPaginate.vue';
 import VnSearchbar from 'components/ui/VnSearchbar.vue';
@@ -12,8 +11,8 @@ import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorP
 import VnUserLink from 'src/components/ui/VnUserLink.vue';
 import ClaimSummary from './Card/ClaimSummary.vue';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
+import RightMenu from 'src/components/common/RightMenu.vue';
 
-const stateStore = useStateStore();
 const router = useRouter();
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
@@ -37,35 +36,16 @@ function navigate(event, id) {
 </script>
 
 <template>
-    <template v-if="stateStore.isHeaderMounted()">
-        <Teleport to="#searchbar">
-            <VnSearchbar
-                data-key="ClaimList"
-                :label="t('Search claim')"
-                :info="t('You can search by claim id or customer name')"
-            />
-        </Teleport>
-        <Teleport to="#actions-append">
-            <div class="row q-gutter-x-sm">
-                <QBtn
-                    flat
-                    @click="stateStore.toggleRightDrawer()"
-                    round
-                    dense
-                    icon="menu"
-                >
-                    <QTooltip bottom anchor="bottom right">
-                        {{ t('globals.collapseMenu') }}
-                    </QTooltip>
-                </QBtn>
-            </div>
-        </Teleport>
-    </template>
-    <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
-        <QScrollArea class="fit text-grey-8">
+    <VnSearchbar
+        data-key="ClaimList"
+        :label="t('Search claim')"
+        :info="t('You can search by claim id or customer name')"
+    />
+    <RightMenu>
+        <template #right-panel>
             <ClaimFilter data-key="ClaimList" />
-        </QScrollArea>
-    </QDrawer>
+        </template>
+    </RightMenu>
     <QPage class="column items-center q-pa-md">
         <div class="vn-card-list">
             <VnPaginate

src/pages/Customer/Card/CustomerBalance.vue

@@ -234,7 +234,7 @@ const showBalancePdf = (balance) => {
                 <template #body-cell-employee="{ row }">
                     <QTd auto-width @click.stop>
                         <QBtn color="blue" flat no-caps>{{ row.userName }}</QBtn>
-                        <WorkerDescriptorProxy :id="row.clientFk" />
+                        <WorkerDescriptorProxy :id="row.workerFk" />
                     </QTd>
                 </template>
 

src/pages/Customer/CustomerList.vue

@@ -1,7 +1,6 @@
 <script setup>
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
-import { useStateStore } from 'stores/useStateStore';
 import VnPaginate from 'src/components/ui/VnPaginate.vue';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 import CustomerFilter from './CustomerFilter.vue';
@@ -10,8 +9,8 @@ import CardList from 'src/components/ui/CardList.vue';
 import VnLinkPhone from 'src/components/ui/VnLinkPhone.vue';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import CustomerSummary from './Card/CustomerSummary.vue';
+import RightMenu from 'src/components/common/RightMenu.vue';
 
-const stateStore = useStateStore();
 const router = useRouter();
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
@@ -26,35 +25,16 @@ const redirectToCreateView = () => {
 </script>
 
 <template>
-    <template v-if="stateStore.isHeaderMounted()">
-        <Teleport to="#searchbar">
-            <VnSearchbar
-                :info="t('You can search by customer id or name')"
-                :label="t('Search customer')"
-                data-key="CustomerList"
-            />
-        </Teleport>
-        <Teleport to="#actions-append">
-            <div class="row q-gutter-x-sm">
-                <QBtn
-                    @click="stateStore.toggleRightDrawer()"
-                    dense
-                    flat
-                    icon="menu"
-                    round
-                >
-                    <QTooltip bottom anchor="bottom right">
-                        {{ t('globals.collapseMenu') }}
-                    </QTooltip>
-                </QBtn>
-            </div>
-        </Teleport>
-    </template>
-    <QDrawer :width="256" show-if-above side="right" v-model="stateStore.rightDrawer">
-        <QScrollArea class="fit text-grey-8">
+    <VnSearchbar
+        :info="t('You can search by customer id or name')"
+        :label="t('Search customer')"
+        data-key="CustomerList"
+    />
+    <RightMenu>
+        <template #right-panel>
             <CustomerFilter data-key="CustomerList" />
-        </QScrollArea>
-    </QDrawer>
+        </template>
+    </RightMenu>
     <QPage class="column items-center q-pa-md">
         <div class="vn-card-list">
             <VnPaginate

src/pages/Customer/Defaulter/CustomerDefaulter.vue

@@ -1,10 +1,7 @@
 <script setup>
 import { ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
-
 import { QBtn, QCheckbox, useQuasar } from 'quasar';
-import { useStateStore } from 'stores/useStateStore';
-
 import { toCurrency, toDate, dateRange } from 'filters/index';
 import VnPaginate from 'src/components/ui/VnPaginate.vue';
 import CustomerNotificationsFilter from './CustomerDefaulterFilter.vue';
@@ -15,7 +12,7 @@ import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import CustomerDefaulterAddObservation from './CustomerDefaulterAddObservation.vue';
 import axios from 'axios';
-const stateStore = useStateStore();
+import RightMenu from 'src/components/common/RightMenu.vue';
 
 const { t } = useI18n();
 const quasar = useQuasar();
@@ -266,30 +263,11 @@ function exprBuilder(param, value) {
 </script>
 
 <template>
-    <template v-if="stateStore.isHeaderMounted()">
-        <Teleport to="#actions-append">
-            <div class="row q-gutter-x-sm">
-                <QBtn
-                    flat
-                    @click="stateStore.toggleRightDrawer()"
-                    round
-                    dense
-                    icon="menu"
-                >
-                    <QTooltip bottom anchor="bottom right">
-                        {{ t('globals.collapseMenu') }}
-                    </QTooltip>
-                </QBtn>
-            </div>
-        </Teleport>
-    </template>
-
-    <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
-        <QScrollArea class="fit text-grey-8">
+    <RightMenu>
+        <template #right-panel>
             <CustomerNotificationsFilter data-key="CustomerDefaulter" />
-        </QScrollArea>
-    </QDrawer>
-
+        </template>
+    </RightMenu>
     <VnSubToolbar>
         <template #st-data>
             <CustomerBalanceDueTotal :amount="balanceDueTotal" />

src/pages/Customer/ExtendedList/CustomerExtendedList.vue

@@ -14,6 +14,7 @@ import VnPaginate from 'src/components/ui/VnPaginate.vue';
 import { useArrayData } from 'composables/useArrayData';
 import { useStateStore } from 'stores/useStateStore';
 import { toDate } from 'src/filters';
+import RightMenu from 'src/components/common/RightMenu.vue';
 
 const { t } = useI18n();
 const router = useRouter();
@@ -494,32 +495,15 @@ const selectSalesPersonId = (id) => (selectedSalesPersonId.value = id);
 </script>
 
 <template>
-    <template v-if="stateStore.isHeaderMounted()">
-        <Teleport to="#actions-append">
-            <div class="row q-gutter-x-sm">
-                <QBtn
-                    flat
-                    @click="stateStore.toggleRightDrawer()"
-                    round
-                    dense
-                    icon="menu"
-                >
-                    <QTooltip bottom anchor="bottom right">
-                        {{ t('globals.collapseMenu') }}
-                    </QTooltip>
-                </QBtn>
-            </div>
-        </Teleport></template
-    >
-    <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
-        <QScrollArea class="fit text-grey-8">
+    <RightMenu>
+        <template #right-panel>
             <CustomerExtendedListFilter
                 v-if="visibleColumns.length !== 0"
                 data-key="CustomerExtendedList"
                 :visible-columns="visibleColumns"
             />
-        </QScrollArea>
-    </QDrawer>
+        </template>
+    </RightMenu>
     <VnSubToolbar>
         <template #st-data>
             <TableVisibleColumns
@@ -532,7 +516,6 @@ const selectSalesPersonId = (id) => (selectedSalesPersonId.value = id);
             />
         </template>
     </VnSubToolbar>
-
     <QPage class="column items-center q-pa-md">
         <VnPaginate
             data-key="CustomerExtendedList"

src/pages/Customer/Notifications/CustomerNotifications.vue

@@ -5,11 +5,10 @@ import { QBtn } from 'quasar';
 import CustomerNotificationsFilter from './CustomerNotificationsFilter.vue';
 import CustomerDescriptorProxy from '../Card/CustomerDescriptorProxy.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
-import { useStateStore } from 'stores/useStateStore';
 import VnPaginate from 'src/components/ui/VnPaginate.vue';
 import CustomerNotificationsCampaignConsumption from './CustomerNotificationsCampaignConsumption.vue';
+import RightMenu from 'src/components/common/RightMenu.vue';
 
-const stateStore = useStateStore();
 const { t } = useI18n();
 const selected = ref([]);
 const selectedCustomerId = ref(0);
@@ -81,29 +80,11 @@ const selectCustomerId = (id) => {
 </script>
 
 <template>
-    <template v-if="stateStore.isHeaderMounted()">
-        <Teleport to="#actions-append">
-            <div class="row q-gutter-x-sm">
-                <QBtn
-                    flat
-                    @click="stateStore.toggleRightDrawer()"
-                    round
-                    dense
-                    icon="menu"
-                >
-                    <QTooltip bottom anchor="bottom right">
-                        {{ t('globals.collapseMenu') }}
-                    </QTooltip>
-                </QBtn>
-            </div>
-        </Teleport>
-    </template>
-
-    <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
-        <QScrollArea class="fit text-grey-8">
+    <RightMenu>
+        <template #right-panel>
             <CustomerNotificationsFilter data-key="CustomerNotifications" />
-        </QScrollArea>
-    </QDrawer>
+        </template>
+    </RightMenu>
     <VnSubToolbar class="justify-end">
         <template #st-data>
             <CustomerNotificationsCampaignConsumption

src/pages/Customer/Payments/CustomerPayments.vue

@@ -3,15 +3,14 @@ import axios from 'axios';
 import { ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
-import { useStateStore } from 'stores/useStateStore';
 import { useArrayData } from 'composables/useArrayData';
 import VnPaginate from 'components/ui/VnPaginate.vue';
 import VnConfirm from 'components/ui/VnConfirm.vue';
 import CustomerDescriptorProxy from '../Card/CustomerDescriptorProxy.vue';
 import { toDate, toCurrency } from 'filters/index';
 import CustomerPaymentsFilter from './CustomerPaymentsFilter.vue';
+import RightMenu from 'src/components/common/RightMenu.vue';
 
-const stateStore = useStateStore();
 const quasar = useQuasar();
 const { t } = useI18n();
 const arrayData = useArrayData('CustomerTransactions');
@@ -93,28 +92,11 @@ function stateColor(row) {
 </script>
 
 <template>
-    <template v-if="stateStore.isHeaderMounted()">
-        <Teleport to="#actions-append">
-            <div class="row q-gutter-x-sm">
-                <QBtn
-                    flat
-                    @click="stateStore.toggleRightDrawer()"
-                    round
-                    dense
-                    icon="menu"
-                >
-                    <QTooltip bottom anchor="bottom right">
-                        {{ t('globals.collapseMenu') }}
-                    </QTooltip>
-                </QBtn>
-            </div>
-        </Teleport>
-    </template>
-    <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
-        <QScrollArea class="fit text-grey-8">
+    <RightMenu>
+        <template #right-panel>
             <CustomerPaymentsFilter data-key="CustomerTransactions" />
-        </QScrollArea>
-    </QDrawer>
+        </template>
+    </RightMenu>
     <QPage class="column items-center q-pa-md customer-payments">
         <div class="vn-card-list">
             <QToolbar class="q-pa-none justify-end">

src/pages/Department/Card/DepartmentDescriptor.vue

@@ -2,7 +2,6 @@
 import { computed, ref } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-import { useQuasar } from 'quasar';
 import { useVnConfirm } from 'composables/useVnConfirm';
 import VnLv from 'src/components/ui/VnLv.vue';
 import CardDescriptor from 'src/components/ui/CardDescriptor.vue';
@@ -23,7 +22,6 @@ const $props = defineProps({
     },
 });
 
-const quasar = useQuasar();
 const route = useRoute();
 const router = useRouter();
 

src/pages/Entry/Card/EntryBuys.vue

@@ -82,6 +82,16 @@ const tableColumnComponents = computed(() => ({
         },
         event: getInputEvents,
     },
+    printedStickers: {
+        component: VnInput,
+        props: {
+            type: 'number',
+            min: 0,
+            class: 'input-number',
+            dense: true,
+        },
+        event: getInputEvents,
+    },
     weight: {
         component: VnInput,
         props: {
@@ -147,7 +157,7 @@ const entriesTableColumns = computed(() => {
     return [
         {
             label: t('entry.summary.item'),
-            field: 'id',
+            field: 'itemFk',
             name: 'item',
             align: 'left',
         },
@@ -169,6 +179,12 @@ const entriesTableColumns = computed(() => {
             name: 'stickers',
             align: 'left',
         },
+        {
+            label: t('entry.buys.printedStickers'),
+            field: 'printedStickers',
+            name: 'printedStickers',
+            align: 'left',
+        },
         {
             label: t('entry.summary.weight'),
             field: 'weight',
@@ -216,7 +232,6 @@ const entriesTableColumns = computed(() => {
 });
 
 const copyOriginalRowsData = (rows) => {
-    // el objetivo de esto es guardar los valores iniciales de todas las rows para evitar guardar cambios si la data no cambió al disparar los eventos
     originalRowDataCopy.value = JSON.parse(JSON.stringify(rows));
 };
 
@@ -386,19 +401,16 @@ const lockIconType = (groupingMode, mode) => {
                                 </template>
                                 <ItemDescriptorProxy
                                     v-if="col.name === 'item'"
-                                    :id="props.row.id"
+                                    :id="props.row.item.id"
                                 />
                             </component>
                         </QTd>
                     </QTr>
-                    <QTr no-hover>
+                    <QTr no-hover class="full-width infoRow" style="column-span: all">
                         <QTd />
-                        <QTd>
+                        <QTd cols>
                             <span>{{ props.row.item.itemType.code }}</span>
                         </QTd>
-                        <QTd>
-                            <span>{{ props.row.item.id }}</span>
-                        </QTd>
                         <QTd>
                             <span>{{ props.row.item.size }}</span>
                         </QTd>
@@ -413,10 +425,6 @@ const lockIconType = (groupingMode, mode) => {
                             <FetchedTags :item="props.row.item" :max-length="5" />
                         </QTd>
                     </QTr>
-                    <!-- Esta última row es utilizada para agregar un espaciado y así marcar una diferencia visual entre los diferentes buys -->
-                    <QTr v-if="props.rowIndex !== rows.length - 1" class="separation-row">
-                        <QTd colspan="12" class="vn-table-separation-row" />
-                    </QTr>
                 </template>
                 <template #item="props">
                     <div class="q-pa-xs col-xs-12 col-sm-6 grid-style-transition">
@@ -466,11 +474,13 @@ const lockIconType = (groupingMode, mode) => {
 </template>
 
 <style lang="scss" scoped>
-.separation-row {
-    background-color: var(--vn-section-color) !important;
+.q-table--horizontal-separator tbody tr:nth-child(odd) > td {
+    border-bottom-width: 0px;
+    border-top-width: 2px;
+    border-color: var(--vn-text-color);
 }
-.grid-style-transition {
-    transition: transform 0.28s, background-color 0.28s;
+.infoRow > td {
+    color: var(--vn-label-color);
 }
 </style>
 

src/pages/Entry/Card/EntryBuysImport.vue

@@ -174,7 +174,7 @@ const redirectToBuysView = () => {
         @on-fetch="(data) => (packagingsOptions = data)"
         auto-load
     />
-    <QForm>
+    <QForm @submit="onSubmit()">
         <Teleport to="#st-actions" v-if="stateStore?.isSubToolbarShown()">
             <div>
                 <QBtnGroup push class="q-gutter-x-sm">
@@ -222,7 +222,7 @@ const redirectToBuysView = () => {
                 <VnRow class="row q-gutter-md q-mb-md">
                     <VnInput
                         :label="t('entry.buys.reference')"
-                       v-model="importData.ref"
+                        v-model="importData.ref"
                     />
                 </VnRow>
                 <VnRow class="row q-gutter-md q-mb-md">

src/pages/Entry/Card/EntryDescriptor.vue

@@ -34,7 +34,7 @@ const entryFilter = {
         {
             relation: 'travel',
             scope: {
-                fields: ['id', 'landed', 'agencyModeFk', 'warehouseOutFk'],
+                fields: ['id', 'landed', 'shipped', 'agencyModeFk', 'warehouseOutFk'],
                 include: [
                     {
                         relation: 'agency',
@@ -125,10 +125,8 @@ watch;
                 :label="t('entry.descriptor.agency')"
                 :value="entity.travel?.agency?.name"
             />
-            <VnLv
-                :label="t('entry.descriptor.landed')"
-                :value="toDate(entity.travel?.landed)"
-            />
+            <VnLv :label="t('shipped')" :value="toDate(entity.travel?.shipped)" />
+            <VnLv :label="t('landed')" :value="toDate(entity.travel?.landed)" />
             <VnLv
                 :label="t('entry.descriptor.warehouseOut')"
                 :value="entity.travel?.warehouseOut?.name"

src/pages/Entry/Card/EntrySummary.vue

@@ -221,10 +221,7 @@ const fetchEntryBuys = async () => {
                     :value="entry.travel.agency.name"
                 />
 
-                <VnLv
-                    :label="t('entry.summary.travelShipped')"
-                    :value="toDate(entry.travel.shipped)"
-                />
+                <VnLv :label="t('shipped')" :value="toDate(entry.travel.shipped)" />
 
                 <VnLv
                     :label="t('entry.summary.travelWarehouseOut')"
@@ -236,10 +233,7 @@ const fetchEntryBuys = async () => {
                     v-model="entry.travel.isDelivered"
                     :disable="true"
                 />
-                <VnLv
-                    :label="t('entry.summary.travelLanded')"
-                    :value="toDate(entry.travel.landed)"
-                />
+                <VnLv :label="t('landed')" :value="toDate(entry.travel.landed)" />
 
                 <VnLv
                     :label="t('entry.summary.travelWarehouseIn')"

src/pages/Entry/EntryLatestBuys.vue

@@ -19,6 +19,7 @@ import { toDate, toCurrency } from 'src/filters';
 import { useSession } from 'composables/useSession';
 import { dashIfEmpty } from 'src/filters';
 import { useArrayData } from 'composables/useArrayData';
+import RightMenu from 'src/components/common/RightMenu.vue';
 
 const router = useRouter();
 const { getTokenMultimedia } = useSession();
@@ -646,14 +647,12 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                 @on-config-saved="visibleColumns = ['picture', ...$event]"
             />
         </template>
-        <QSpace />
-        <div id="st-actions"></div>
     </VnSubToolbar>
-    <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
-        <QScrollArea class="fit text-grey-8">
+    <RightMenu>
+        <template #right-panel>
             <EntryLatestBuysFilter data-key="EntryLatestBuys" />
-        </QScrollArea>
-    </QDrawer>
+        </template>
+    </RightMenu>
     <QPage class="column items-center q-pa-md">
         <QTable
             :rows="rows"

src/pages/Entry/EntryList.vue

@@ -11,6 +11,7 @@ import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 import { useStateStore } from 'stores/useStateStore';
 import { toDate } from 'src/filters/index';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
+import RightMenu from 'src/components/common/RightMenu.vue';
 
 const stateStore = useStateStore();
 const router = useRouter();
@@ -29,23 +30,18 @@ onMounted(async () => {
     stateStore.rightDrawer = true;
 });
 </script>
-
 <template>
-    <template v-if="stateStore.isHeaderMounted()">
-        <Teleport to="#searchbar">
-            <VnSearchbar
-                data-key="EntryList"
-                url="Entries/filter"
-                :label="t('Search entries')"
-                :info="t('You can search by entry reference')"
-            />
-        </Teleport>
-    </template>
-    <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
-        <QScrollArea class="fit text-grey-8">
+    <VnSearchbar
+        data-key="EntryList"
+        url="Entries/filter"
+        :label="t('Search entries')"
+        :info="t('You can search by entry reference')"
+    />
+    <RightMenu>
+        <template #right-panel>
             <EntryFilter data-key="EntryList" />
-        </QScrollArea>
-    </QDrawer>
+        </template>
+    </RightMenu>
     <QPage class="column items-center q-pa-md">
         <div class="vn-card-list">
             <VnPaginate
@@ -82,10 +78,7 @@ onMounted(async () => {
                             </QIcon>
                         </template>
                         <template #list-items>
-                            <VnLv
-                                :label="t('entry.list.landed')"
-                                :value="toDate(row.landed)"
-                            />
+                            <VnLv :label="t('landed')" :value="toDate(row.landed)" />
                             <VnLv
                                 :label="t('entry.list.booked')"
                                 :value="!!row.isBooked"

src/pages/Entry/locale/en.yml

@@ -6,3 +6,5 @@ entryFilter:
     filter:
         search: General search
         reference: Reference
+landed: Landed
+shipped: Shipped

src/pages/Entry/locale/es.yml

@@ -8,3 +8,6 @@ entryFilter:
     filter:
         search: Búsqueda general
         reference: Referencia
+
+landed: F. llegada
+shipped: F. salida

src/pages/InvoiceIn/Card/InvoiceInBasicData.vue

@@ -19,7 +19,8 @@ const { t } = useI18n();
 const dms = ref({});
 const route = useRoute();
 const editDownloadDisabled = ref(false);
-const invoiceIn = computed(() => useArrayData(route.meta.moduleName).store.data);
+const arrayData = useArrayData();
+const invoiceIn = computed(() => arrayData.store.data);
 const userConfig = ref(null);
 const invoiceId = computed(() => +route.params.id);
 
@@ -81,7 +82,7 @@ async function setCreateDms() {
     createDmsRef.value.show();
 }
 
-async function upsert() {
+async function onSubmit() {
     try {
         const isEdit = !!dms.value.id;
         const errors = {
@@ -318,224 +319,236 @@ async function upsert() {
         </template>
     </FormModel>
     <QDialog ref="editDmsRef">
-        <QCard>
-            <QCardSection class="q-pb-none">
-                <QItem class="q-px-none">
-                    <span class="text-primary text-h6 full-width">
+        <QForm @submit="onSubmit()" class="all-pointer-events">
+            <QCard class="q-pa-sm">
+                <QCardSection class="row items-center q-pb-none">
+                    <span class="text-primary text-h6">
                         <QIcon name="edit" class="q-mr-xs" />
                         {{ t('Edit document') }}
                     </span>
+                    <QSpace />
                     <QBtn icon="close" flat round dense v-close-popup />
-                </QItem>
-            </QCardSection>
-            <QCardSection class="q-py-none">
-                <QItem>
-                    <VnInput
-                        class="full-width q-pa-xs"
-                        :label="t('Reference')"
-                        v-model="dms.reference"
-                        clearable
-                        clear-icon="close"
+                </QCardSection>
+                <QCardSection class="q-py-none">
+                    <QItem>
+                        <VnInput
+                            class="full-width q-pa-xs"
+                            :label="t('Reference')"
+                            v-model="dms.reference"
+                            clearable
+                            clear-icon="close"
+                        />
+                        <VnSelect
+                            class="full-width q-pa-xs"
+                            :label="t('Company')"
+                            v-model="dms.companyId"
+                            :options="companies"
+                            option-value="id"
+                            option-label="code"
+                            :required="true"
+                        />
+                    </QItem>
+                    <QItem>
+                        <VnSelect
+                            class="full-width q-pa-xs"
+                            :label="t('Warehouse')"
+                            v-model="dms.warehouseId"
+                            :options="warehouses"
+                            option-value="id"
+                            option-label="name"
+                            :required="true"
+                        />
+                        <VnSelect
+                            class="full-width q-pa-xs"
+                            :label="t('Type')"
+                            v-model="dms.dmsTypeId"
+                            :options="dmsTypes"
+                            option-value="id"
+                            option-label="name"
+                            :required="true"
+                        />
+                    </QItem>
+                    <QItem>
+                        <VnInput
+                            :label="t('Description')"
+                            v-model="dms.description"
+                            :required="true"
+                            type="textarea"
+                            class="full-width q-pa-xs"
+                            size="lg"
+                            autogrow
+                            clearable
+                            clear-icon="close"
+                        />
+                    </QItem>
+                    <QItem>
+                        <QFile
+                            ref="inputFileRef"
+                            class="full-width q-pa-xs"
+                            :label="t('File')"
+                            v-model="dms.files"
+                            multiple
+                            :accept="allowedContentTypes.join(',')"
+                            clearable
+                            clear-icon="close"
+                        >
+                            <template #append>
+                                <QBtn
+                                    icon="attach_file_add"
+                                    flat
+                                    round
+                                    padding="xs"
+                                    @click="inputFileRef.pickFiles()"
+                                >
+                                    <QTooltip>
+                                        {{ t('globals.selectFile') }}
+                                    </QTooltip>
+                                </QBtn>
+                                <QBtn icon="info" flat round padding="xs">
+                                    <QTooltip max-width="30rem">
+                                        {{
+                                            `${t(
+                                                'Allowed content types'
+                                            )}: ${allowedContentTypes.join(', ')}`
+                                        }}
+                                    </QTooltip>
+                                </QBtn>
+                            </template>
+                        </QFile>
+                    </QItem>
+                    <QItem>
+                        <QCheckbox
+                            :label="t('Generate identifier for original file')"
+                            v-model="dms.hasFile"
+                        />
+                    </QItem>
+                </QCardSection>
+                <QCardActions class="justify-end">
+                    <QBtn
+                        flat
+                        :label="t('globals.close')"
+                        color="primary"
+                        v-close-popup
                     />
-                    <VnSelect
-                        class="full-width q-pa-xs"
-                        :label="t('Company')"
-                        v-model="dms.companyId"
-                        :options="companies"
-                        option-value="id"
-                        option-label="code"
-                        :required="true"
-                    />
-                </QItem>
-                <QItem>
-                    <VnSelect
-                        class="full-width q-pa-xs"
-                        :label="t('Warehouse')"
-                        v-model="dms.warehouseId"
-                        :options="warehouses"
-                        option-value="id"
-                        option-label="name"
-                        :required="true"
-                    />
-                    <VnSelect
-                        class="full-width q-pa-xs"
-                        :label="t('Type')"
-                        v-model="dms.dmsTypeId"
-                        :options="dmsTypes"
-                        option-value="id"
-                        option-label="name"
-                        :required="true"
-                    />
-                </QItem>
-                <QItem>
-                    <VnInput
-                        :label="t('Description')"
-                        v-model="dms.description"
-                        :required="true"
-                        type="textarea"
-                        class="full-width q-pa-xs"
-                        size="lg"
-                        autogrow
-                        clearable
-                        clear-icon="close"
-                    />
-                </QItem>
-                <QItem>
-                    <QFile
-                        ref="inputFileRef"
-                        class="full-width q-pa-xs"
-                        :label="t('File')"
-                        v-model="dms.files"
-                        multiple
-                        :accept="allowedContentTypes.join(',')"
-                        clearable
-                        clear-icon="close"
-                    >
-                        <template #append>
-                            <QBtn
-                                icon="attach_file_add"
-                                flat
-                                round
-                                padding="xs"
-                                @click="inputFileRef.pickFiles()"
-                            >
-                                <QTooltip>
-                                    {{ t('globals.selectFile') }}
-                                </QTooltip>
-                            </QBtn>
-                            <QBtn icon="info" flat round padding="xs">
-                                <QTooltip max-width="30rem">
-                                    {{
-                                        `${t(
-                                            'Allowed content types'
-                                        )}: ${allowedContentTypes.join(', ')}`
-                                    }}
-                                </QTooltip>
-                            </QBtn>
-                        </template>
-                    </QFile>
-                </QItem>
-                <QItem>
-                    <QCheckbox
-                        :label="t('Generate identifier for original file')"
-                        v-model="dms.hasFile"
-                    />
-                </QItem>
-            </QCardSection>
-            <QCardActions class="justify-end">
-                <QBtn flat :label="t('globals.close')" color="primary" v-close-popup />
-                <QBtn :label="t('globals.save')" color="primary" @click="upsert" />
-            </QCardActions>
-        </QCard>
+                    <QBtn :label="t('globals.save')" color="primary" @click="onSubmit" />
+                </QCardActions>
+            </QCard>
+        </QForm>
     </QDialog>
     <QDialog ref="createDmsRef">
-        <QCard>
-            <QCardSection class="q-pb-none">
-                <QItem>
-                    <span class="text-primary text-h6 full-width">
+        <QForm @submit="onSubmit()" class="all-pointer-events">
+            <QCard class="q-pa-sm">
+                <QCardSection class="row items-center q-pb-none">
+                    <span class="text-primary text-h6">
                         <QIcon name="edit" class="q-mr-xs" />
                         {{ t('Create document') }}
                     </span>
-                    <QBtn icon="close" flat round dense v-close-popup align="right" />
-                </QItem>
-            </QCardSection>
-            <QCardSection class="q-pb-none">
-                <QItem>
-                    <VnInput
-                        class="full-width q-pa-xs"
-                        :label="t('Reference')"
-                        v-model="dms.reference"
+                    <QSpace />
+                    <QBtn icon="close" flat round dense v-close-popup />
+                </QCardSection>
+                <QCardSection class="q-pb-none">
+                    <QItem>
+                        <VnInput
+                            class="full-width q-pa-xs"
+                            :label="t('Reference')"
+                            v-model="dms.reference"
+                        />
+                        <VnSelect
+                            class="full-width q-pa-xs"
+                            :label="`${t('Company')}*`"
+                            v-model="dms.companyId"
+                            :options="companies"
+                            option-value="id"
+                            option-label="code"
+                            :required="true"
+                        />
+                    </QItem>
+                    <QItem>
+                        <VnSelect
+                            class="full-width q-pa-xs"
+                            :label="`${t('Warehouse')}*`"
+                            v-model="dms.warehouseId"
+                            :options="warehouses"
+                            option-value="id"
+                            option-label="name"
+                            :required="true"
+                        />
+                        <VnSelect
+                            class="full-width q-pa-xs"
+                            :label="`${t('Type')}*`"
+                            v-model="dms.dmsTypeId"
+                            :options="dmsTypes"
+                            option-value="id"
+                            option-label="name"
+                            :required="true"
+                        />
+                    </QItem>
+                    <QItem>
+                        <VnInput
+                            class="full-width q-pa-xs"
+                            type="textarea"
+                            size="lg"
+                            autogrow
+                            :label="`${t('Description')}*`"
+                            v-model="dms.description"
+                            clearable
+                            clear-icon="close"
+                            :rules="[(val) => val.length || t('Required field')]"
+                        />
+                    </QItem>
+                    <QItem>
+                        <QFile
+                            ref="inputFileRef"
+                            class="full-width q-pa-xs"
+                            :label="t('File')"
+                            v-model="dms.files"
+                            multiple
+                            :accept="allowedContentTypes.join(',')"
+                            clearable
+                            clear-icon="close"
+                        >
+                            <template #append>
+                                <QBtn
+                                    icon="attach_file_add"
+                                    flat
+                                    round
+                                    padding="xs"
+                                    @click="inputFileRef.pickFiles()"
+                                >
+                                    <QTooltip>
+                                        {{ t('globals.selectFile') }}
+                                    </QTooltip>
+                                </QBtn>
+                                <QBtn icon="info" flat round padding="xs">
+                                    <QTooltip max-width="30rem">
+                                        {{
+                                            `${t(
+                                                'Allowed content types'
+                                            )}: ${allowedContentTypes.join(', ')}`
+                                        }}
+                                    </QTooltip>
+                                </QBtn>
+                            </template>
+                        </QFile>
+                    </QItem>
+                    <QItem>
+                        <QCheckbox
+                            :label="t('Generate identifier for original file')"
+                            v-model="dms.hasFile"
+                        />
+                    </QItem>
+                </QCardSection>
+                <QCardActions align="right">
+                    <QBtn
+                        flat
+                        :label="t('globals.close')"
+                        color="primary"
+                        v-close-popup
                     />
-                    <VnSelect
-                        class="full-width q-pa-xs"
-                        :label="`${t('Company')}*`"
-                        v-model="dms.companyId"
-                        :options="companies"
-                        option-value="id"
-                        option-label="code"
-                        :required="true"
-                    />
-                </QItem>
-                <QItem>
-                    <VnSelect
-                        class="full-width q-pa-xs"
-                        :label="`${t('Warehouse')}*`"
-                        v-model="dms.warehouseId"
-                        :options="warehouses"
-                        option-value="id"
-                        option-label="name"
-                        :required="true"
-                    />
-                    <VnSelect
-                        class="full-width q-pa-xs"
-                        :label="`${t('Type')}*`"
-                        v-model="dms.dmsTypeId"
-                        :options="dmsTypes"
-                        option-value="id"
-                        option-label="name"
-                        :required="true"
-                    />
-                </QItem>
-                <QItem>
-                    <VnInput
-                        class="full-width q-pa-xs"
-                        type="textarea"
-                        size="lg"
-                        autogrow
-                        :label="`${t('Description')}*`"
-                        v-model="dms.description"
-                        clearable
-                        clear-icon="close"
-                        :rules="[(val) => val.length || t('Required field')]"
-                    />
-                </QItem>
-                <QItem>
-                    <QFile
-                        ref="inputFileRef"
-                        class="full-width q-pa-xs"
-                        :label="t('File')"
-                        v-model="dms.files"
-                        multiple
-                        :accept="allowedContentTypes.join(',')"
-                        clearable
-                        clear-icon="close"
-                    >
-                        <template #append>
-                            <QBtn
-                                icon="attach_file_add"
-                                flat
-                                round
-                                padding="xs"
-                                @click="inputFileRef.pickFiles()"
-                            >
-                                <QTooltip>
-                                    {{ t('globals.selectFile') }}
-                                </QTooltip>
-                            </QBtn>
-                            <QBtn icon="info" flat round padding="xs">
-                                <QTooltip max-width="30rem">
-                                    {{
-                                        `${t(
-                                            'Allowed content types'
-                                        )}: ${allowedContentTypes.join(', ')}`
-                                    }}
-                                </QTooltip>
-                            </QBtn>
-                        </template>
-                    </QFile>
-                </QItem>
-                <QItem>
-                    <QCheckbox
-                        :label="t('Generate identifier for original file')"
-                        v-model="dms.hasFile"
-                    />
-                </QItem>
-            </QCardSection>
-            <QCardActions align="right">
-                <QBtn flat :label="t('globals.close')" color="primary" v-close-popup />
-                <QBtn :label="t('globals.save')" color="primary" @click="upsert" />
-            </QCardActions>
-        </QCard>
+                    <QBtn :label="t('globals.save')" color="primary" @click="onSubmit" />
+                </QCardActions>
+            </QCard>
+        </QForm>
     </QDialog>
 </template>
 <style lang="scss" scoped>

src/pages/InvoiceIn/Card/InvoiceInCorrective.vue

@@ -12,7 +12,7 @@ const { push, currentRoute } = useRouter();
 const { t } = useI18n();
 
 const invoiceId = +currentRoute.value.params.id;
-const arrayData = useArrayData(currentRoute.value.meta.moduleName);
+const arrayData = useArrayData();
 const invoiceIn = computed(() => arrayData.store.data);
 const invoiceInCorrectionRef = ref();
 const filter = {

src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue

@@ -27,9 +27,9 @@ const quasar = useQuasar();
 const { hasAny } = useRole();
 const { t } = useI18n();
 const { openReport, sendEmail } = usePrintService();
-const { store } = useArrayData(currentRoute.value.meta.moduleName);
+const arrayData = useArrayData();
 
-const invoiceIn = computed(() => store.data);
+const invoiceIn = computed(() => arrayData.store.data);
 const cardDescriptorRef = ref();
 const correctionDialogRef = ref();
 const entityId = computed(() => $props.id || +currentRoute.value.params.id);
@@ -184,7 +184,7 @@ async function toUnbook() {
         : t('isNotLinked', { bookEntry });
 
     quasar.notify({ type, message });
-    if (!isLinked) store.data.isBooked = false;
+    if (!isLinked) arrayData.store.data.isBooked = false;
 }
 
 async function deleteInvoice() {
@@ -487,9 +487,6 @@ const createInvoiceInCorrection = async () => {
 .q-dialog {
     .q-card {
         max-width: 45em;
-        .q-item__section > .q-input {
-            padding-bottom: 1.4em;
-        }
     }
 }
 

src/pages/InvoiceIn/Card/InvoiceInDueDay.vue

@@ -13,7 +13,7 @@ import { toCurrency } from 'src/filters';
 
 const route = useRoute();
 const { t } = useI18n();
-const arrayData = useArrayData(route.meta.moduleName);
+const arrayData = useArrayData();
 const invoiceIn = computed(() => arrayData.store.data);
 
 const rowsSelected = ref([]);

src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue

@@ -11,9 +11,8 @@ import { useArrayData } from 'src/composables/useArrayData';
 const { t } = useI18n();
 
 const route = useRoute();
-const currency = computed(
-    () => useArrayData(route.meta.moduleName).store.data?.currency?.code
-);
+const arrayData = useArrayData();
+const currency = computed(() => arrayData.store.data?.currency?.code);
 const invoceInIntrastat = ref([]);
 const rowsSelected = ref([]);
 const countries = ref([]);

src/pages/InvoiceIn/Card/InvoiceInSummary.vue

@@ -14,9 +14,10 @@ import VnTitle from 'src/components/common/VnTitle.vue';
 const props = defineProps({ id: { type: [Number, String], default: 0 } });
 const { t } = useI18n();
 const route = useRoute();
+const arrayData = useArrayData();
 
 const entityId = computed(() => props.id || +route.params.id);
-const invoiceIn = computed(() => useArrayData(route.meta.moduleName).store.data);
+const invoiceIn = computed(() => arrayData.store.data);
 const currency = computed(() => invoiceIn.value?.currency?.code);
 const invoiceInUrl = ref();
 const amountsNotMatch = ref(null);

src/pages/InvoiceIn/Card/InvoiceInVat.vue

@@ -11,13 +11,12 @@ import VnSelect from 'src/components/common/VnSelect.vue';
 import CrudModel from 'src/components/CrudModel.vue';
 import VnCurrency from 'src/components/common/VnCurrency.vue';
 
-const router = useRoute();
 const { t } = useI18n();
 const quasar = useQuasar();
 
-const arrayData = useArrayData(router.meta.moduleName);
+const arrayData = useArrayData();
 const invoiceIn = computed(() => arrayData.store.data);
-const invoiceId = +router.params.id;
+const invoiceId = +useRoute().params.id;
 const currency = computed(() => invoiceIn.value?.currency?.code);
 const expenses = ref([]);
 const sageTaxTypes = ref([]);

src/pages/InvoiceIn/InvoiceInCreate.vue

@@ -29,7 +29,7 @@ const newInvoiceIn = reactive({
 const suppliersOptions = ref([]);
 const companiesOptions = ref([]);
 
-const redirectToInvoiceInBasicData = ({ id }) => {
+const redirectToInvoiceInBasicData = (__, { id }) => {
     router.push({ name: 'InvoiceInBasicData', params: { id } });
 };
 </script>

src/pages/InvoiceIn/InvoiceInList.vue

@@ -14,6 +14,7 @@ import { getUrl } from 'src/composables/getUrl';
 import InvoiceInSummary from './Card/InvoiceInSummary.vue';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import SupplierDescriptorProxy from 'src/pages/Supplier/Card/SupplierDescriptorProxy.vue';
+import RightMenu from 'src/components/common/RightMenu.vue';
 
 const stateStore = useStateStore();
 const router = useRouter();
@@ -33,35 +34,16 @@ function navigate(id) {
 </script>
 
 <template>
-    <template v-if="stateStore.isHeaderMounted()">
-        <Teleport to="#searchbar">
-            <VnSearchbar
-                data-key="InvoiceInList"
-                :label="t('Search invoice')"
-                :info="t('You can search by invoice reference')"
-            />
-        </Teleport>
-        <Teleport to="#actions-append">
-            <div class="row q-gutter-x-sm">
-                <QBtn
-                    flat
-                    @click="stateStore.toggleRightDrawer()"
-                    round
-                    dense
-                    icon="menu"
-                >
-                    <QTooltip bottom anchor="bottom right">
-                        {{ t('globals.collapseMenu') }}
-                    </QTooltip>
-                </QBtn>
-            </div>
-        </Teleport>
-    </template>
-    <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
-        <QScrollArea class="fit text-grey-8">
+    <VnSearchbar
+        data-key="InvoiceInList"
+        :label="t('Search invoice')"
+        :info="t('You can search by invoice reference')"
+    />
+    <RightMenu>
+        <template #right-panel>
             <InvoiceInFilter data-key="InvoiceInList" />
-        </QScrollArea>
-    </QDrawer>
+        </template>
+    </RightMenu>
     <QPage class="column items-center q-pa-md">
         <div class="vn-card-list">
             <VnPaginate

src/pages/InvoiceIn/InvoiceInToBook.vue

@@ -1,5 +1,4 @@
 <script setup>
-import { useRoute } from 'vue-router';
 import axios from 'axios';
 import { useQuasar } from 'quasar';
 import { useI18n } from 'vue-i18n';
@@ -10,7 +9,7 @@ const { t } = useI18n();
 
 defineExpose({ checkToBook });
 
-const { store } = useArrayData(useRoute().meta.moduleName);
+const { store } = useArrayData();
 
 async function checkToBook(id) {
     let directBooking = true;