Merge branch 'dev' into feature/ZoneCalendar

2024-06-07 09:32:51 +02:00 · 2024-06-07 09:32:51 +02:00 · ec5d5e52f4
parent 1237dd5c10 53c47301c7
commit ec5d5e52f4
89 changed files with 2160 additions and 6243 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -7,6 +7,10 @@ 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
+
 ## [2418.01]

 ## [2416.01] - 2024-04-18
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
    "name": "salix-front",
-    "version": "24.24.3",
+    "version": "24.26.0",
    "description": "Salix frontend",
    "productName": "Salix",
    "author": "Verdnatura",
@ -56,4 +56,4 @@
        "vite": "^5.1.4",
        "vitest": "^0.31.1"
    }
-}
+}
--- a/src/boot/qformMixin.js
+++ b/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();
+                    }
+                });
            }
+        }
    },
 };
--- a/src/components/EditPictureForm.vue
+++ b/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" />
--- a/src/components/EditTableCellValueForm.vue
+++ b/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" />
--- a/src/components/FilterItemForm.vue
+++ b/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" />
--- a/src/components/FilterTravelForm.vue
+++ b/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" />
--- a/src/components/FormModel.vue
+++ b/src/components/FormModel.vue
@ -117,7 +117,7 @@ onMounted(async () => {
    state.set($props.model, $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 +137,7 @@ onMounted(async () => {
 if (!$props.url)
    watch(
        () => arrayData.store.data,
-        (val) => updateAndEmit(val, 'onFetch')
+        (val) => updateAndEmit('onFetch', val)
    );

 watch(formUrl, async () => {
@ -172,8 +172,8 @@ async function fetch() {
        });
        if (Array.isArray(data)) data = data[0] ?? {};

-        updateAndEmit(data, 'onFetch');
-    } catch (error) {
+        updateAndEmit('onFetch', data);
+    } catch (e) {
        state.set($props.model, {});
        originalData.value = {};
    }
@ -196,13 +196,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 +212,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 +234,12 @@ function filter(value, update, filterOptions) {
    );
 }

-function updateAndEmit(val, evt) {
+function updateAndEmit(evt, val, res) {
    state.set($props.model, 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($props.model), res);
 }

 defineExpose({ save, isLoading, hasChanges });
--- a/src/components/LeftMenuItem.vue
+++ b/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>
--- a/src/components/common/RightMenu.vue
+++ b/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']"
--- a/src/components/common/VnCard.vue
+++ b/src/components/common/VnCard.vue
@ -57,34 +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"
-                    :make-fetch="props.searchMakeFetch"
-                />
-            </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 />
--- a/src/components/common/VnInput.vue
+++ b/src/components/common/VnInput.vue
@ -74,13 +74,13 @@ 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>
            </template>
--- a/src/components/ui/CardDescriptor.vue
+++ b/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;
--- a/src/components/ui/VnFilterPanel.vue
+++ b/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() {
--- a/src/components/ui/VnNotes.vue
+++ b/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>
--- a/src/components/ui/VnSearchbar.vue
+++ b/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: {
@ -113,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>
--- a/src/css/fonts/icon.eot
+++ b/src/css/fonts/icon.eot
--- a/src/css/fonts/icon.svg
+++ b/src/css/fonts/icon.svg
--- a/src/css/fonts/icon.ttf
+++ b/src/css/fonts/icon.ttf
--- a/src/css/fonts/icon.woff
+++ b/src/css/fonts/icon.woff
--- a/src/css/fonts/selection.json
+++ b/src/css/fonts/selection.json
--- a/src/css/icons.scss
+++ b/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";
 }
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@ -102,11 +102,15 @@ globals:
        zonesList: Zones
        deliveryList: Delivery days
        upcomingList: Upcoming deliveries
+        role: Role
+        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
@ -1254,6 +1258,13 @@ monitor:
    pageTitles:
        monitors: Monitors
        list: List
+zone:
+    pageTitles:
+        zones: Zones
+        zonesList: Zones
+        deliveryList: Delivery days
+        upcomingList: Upcoming deliveries
+
 components:
    topbar: {}
    itemsFilterPanel:
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@ -102,11 +102,15 @@ globals:
        zonesList: Zonas
        deliveryList: Días de entrega
        upcomingList: Próximos repartos
+        role: Role
+        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
@ -1241,8 +1245,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:
--- a/src/pages/Account/AccountList.vue
+++ b/src/pages/Account/AccountList.vue
@ -0,0 +1 @@
+<template>account list view</template>
--- a/src/pages/Account/AccountMain.vue
+++ b/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>
--- a/src/pages/Account/Card/AccountInheritedRoles.vue
+++ b/src/pages/Account/Card/AccountInheritedRoles.vue
@ -0,0 +1,256 @@
+<script setup>
+import { ref, computed } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useRoute } from 'vue-router';
+import CrudModel from 'components/CrudModel.vue';
+import FetchData from 'components/FetchData.vue';
+import VnSelect from 'components/common/VnSelect.vue';
+import { tMobile } from 'composables/tMobile';
+
+const route = useRoute();
+
+const { t } = useI18n();
+
+const accountDevelopmentForm = ref();
+const accountReasons = ref([]);
+const accountResults = ref([]);
+const accountResponsibles = ref([]);
+const accountRedeliveries = ref([]);
+const workers = ref([]);
+const selected = ref([]);
+const saveButtonRef = ref();
+
+const developmentsFilter = {
+    fields: [
+        'id',
+        'accountFk',
+        'accountReasonFk',
+        'accountResultFk',
+        'accountResponsibleFk',
+        'workerFk',
+        'accountRedeliveryFk',
+    ],
+    where: {
+        accountFk: route.params.id,
+    },
+};
+
+const columns = computed(() => [
+    {
+        name: 'accountReason',
+        label: t('Reason'),
+        field: (row) => row.accountReasonFk,
+        sortable: true,
+        options: accountReasons.value,
+        required: true,
+        model: 'accountReasonFk',
+        optionValue: 'id',
+        optionLabel: 'description',
+        tabIndex: 1,
+        align: 'left',
+    },
+    {
+        name: 'accountResult',
+        label: t('Result'),
+        field: (row) => row.accountResultFk,
+        sortable: true,
+        options: accountResults.value,
+        required: true,
+        model: 'accountResultFk',
+        optionValue: 'id',
+        optionLabel: 'description',
+        tabIndex: 2,
+        align: 'left',
+    },
+    {
+        name: 'accountResponsible',
+        label: t('Responsible'),
+        field: (row) => row.accountResponsibleFk,
+        sortable: true,
+        options: accountResponsibles.value,
+        required: true,
+        model: 'accountResponsibleFk',
+        optionValue: 'id',
+        optionLabel: 'description',
+        tabIndex: 3,
+        align: 'left',
+    },
+    {
+        name: 'worker',
+        label: t('Worker'),
+        field: (row) => row.workerFk,
+        sortable: true,
+        options: workers.value,
+        model: 'workerFk',
+        optionValue: 'id',
+        optionLabel: 'nickname',
+        tabIndex: 4,
+        align: 'left',
+    },
+    {
+        name: 'accountRedelivery',
+        label: t('Redelivery'),
+        field: (row) => row.accountRedeliveryFk,
+        sortable: true,
+        options: accountRedeliveries.value,
+        required: true,
+        model: 'accountRedeliveryFk',
+        optionValue: 'id',
+        optionLabel: 'description',
+        tabIndex: 5,
+        align: 'left',
+    },
+]);
+</script>
+<template>
+    <FetchData
+        url="AccountReasons"
+        order="description"
+        @on-fetch="(data) => (accountReasons = data)"
+        auto-load
+    />
+    <FetchData
+        url="AccountResults"
+        order="description"
+        @on-fetch="(data) => (accountResults = data)"
+        auto-load
+    />
+    <FetchData
+        url="AccountResponsibles"
+        order="description"
+        @on-fetch="(data) => (accountResponsibles = data)"
+        auto-load
+    />
+    <FetchData
+        url="AccountRedeliveries"
+        order="description"
+        @on-fetch="(data) => (accountRedeliveries = data)"
+        auto-load
+    />
+    <FetchData
+        url="Workers/search"
+        :where="{ active: 1 }"
+        order="name ASC"
+        @on-fetch="(data) => (workers = data)"
+        auto-load
+    />
+    <CrudModel
+        data-key="AccountDevelopments"
+        url="AccountDevelopments"
+        model="accountDevelopment"
+        :filter="developmentsFilter"
+        ref="accountDevelopmentForm"
+        :data-required="{ accountFk: route.params.id }"
+        v-model:selected="selected"
+        auto-load
+        @save-changes="$router.push(`/account/${route.params.id}/action`)"
+        :default-save="false"
+    >
+        <template #body="{ rows }">
+            <QTable
+                :columns="columns"
+                :rows="rows"
+                row-key="$index"
+                selection="multiple"
+                v-model:selected="selected"
+                :grid="$q.screen.lt.md"
+                table-header-class="text-left"
+            >
+                <template #body-cell="{ row, col }">
+                    <QTd
+                        auto-width
+                        @keyup.ctrl.enter.stop="accountDevelopmentForm.saveChanges()"
+                    >
+                        <VnSelect
+                            v-model="row[col.model]"
+                            :options="col.options"
+                            :option-value="col.optionValue"
+                            :option-label="col.optionLabel"
+                            :autofocus="col.tabIndex == 1"
+                            input-debounce="0"
+                            hide-selected
+                        >
+                            <template #option="scope" v-if="col.name == 'worker'">
+                                <QItem v-bind="scope.itemProps">
+                                    <QItemSection>
+                                        <QItemLabel>{{ scope.opt?.name }}</QItemLabel>
+                                        <QItemLabel caption>
+                                            {{ scope.opt?.nickname }}
+                                            {{ scope.opt?.code }}
+                                        </QItemLabel>
+                                    </QItemSection>
+                                </QItem>
+                            </template>
+                        </VnSelect>
+                    </QTd>
+                </template>
+                <template #item="props">
+                    <div class="q-pa-xs col-xs-12 col-sm-6 grid-style-transition">
+                        <QCard
+                            bordered
+                            flat
+                            @keyup.ctrl.enter.stop="accountDevelopmentForm?.saveChanges()"
+                        >
+                            <QCardSection>
+                                <QCheckbox v-model="props.selected" dense />
+                            </QCardSection>
+                            <QSeparator />
+                            <QList dense>
+                                <QItem v-for="col in props.cols" :key="col.name">
+                                    <QItemSection>
+                                        <VnSelect
+                                            :label="col.label"
+                                            v-model="props.row[col.model]"
+                                            :options="col.options"
+                                            :option-value="col.optionValue"
+                                            :option-label="col.optionLabel"
+                                            dense
+                                            input-debounce="0"
+                                            :autofocus="col.tabIndex == 1"
+                                            hide-selected
+                                        />
+                                    </QItemSection>
+                                </QItem>
+                            </QList>
+                        </QCard>
+                    </div>
+                </template>
+            </QTable>
+        </template>
+        <template #moreAfterActions>
+            <QBtn
+                :label="tMobile('globals.save')"
+                ref="saveButtonRef"
+                color="primary"
+                icon="save"
+                :disable="!accountDevelopmentForm?.hasChanges"
+                @click="accountDevelopmentForm?.onSubmit"
+                :title="t('globals.save')"
+            />
+        </template>
+    </CrudModel>
+    <QPageSticky position="bottom-right" :offset="[25, 25]">
+        <QBtn
+            fab
+            color="primary"
+            icon="add"
+            @keydown.tab.prevent="saveButtonRef.$el.focus()"
+            @click="accountDevelopmentForm.insert()"
+        />
+    </QPageSticky>
+</template>
+
+<style lang="scss" scoped>
+.grid-style-transition {
+    transition: transform 0.28s, background-color 0.28s;
+}
+</style>
+
+<i18n>
+es:
+    Reason: Motivo
+    Result: Consecuencia
+    Responsible: Responsable
+    Worker: Trabajador
+    Redelivery: Devolución
+</i18n>
--- a/src/pages/Account/Role/AccountRoles.vue
+++ b/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>
--- a/src/pages/Account/Role/AccountRolesFilter.vue
+++ b/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>
--- a/src/pages/Account/Role/Card/InheritedRoles.vue
+++ b/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>
--- a/src/pages/Account/Role/Card/RoleBasicData.vue
+++ b/src/pages/Account/Role/Card/RoleBasicData.vue
@ -0,0 +1,28 @@
+<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>
+        </template>
+    </FormModel>
+</template>
--- a/src/pages/Account/Role/Card/RoleCard.vue
+++ b/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>
--- a/src/pages/Account/Role/Card/RoleDescriptor.vue
+++ b/src/pages/Account/Role/Card/RoleDescriptor.vue
@ -0,0 +1,93 @@
+<script setup>
+import { ref, computed } from 'vue';
+import { useRoute, useRouter } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+import { useState } from 'src/composables/useState';
+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="Account"
+        @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>
--- a/src/pages/Account/Role/Card/RoleForm.vue
+++ b/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>
--- a/src/pages/Account/Role/Card/RoleLog.vue
+++ b/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>
--- a/src/pages/Account/Role/Card/RoleSummary.vue
+++ b/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>
--- a/src/pages/Account/Role/Card/SubRoleCreateForm.vue
+++ b/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>
--- a/src/pages/Account/Role/Card/SubRoles.vue
+++ b/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>
--- a/src/pages/Account/locale/en.yml
+++ b/src/pages/Account/locale/en.yml
@ -0,0 +1,67 @@
+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
+    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
+ldap:
+    enableSync: Enable synchronization
+    server: Server
+    rdn: RDN
+    userDN: User DN
+    filter: Filter
+    groupDN: Group DN
+    testConnection: Test connection
+    success: LDAP connection established!
+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!
--- a/src/pages/Account/locale/es.yml
+++ b/src/pages/Account/locale/es.yml
@ -0,0 +1,78 @@
+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
+    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
+ldap:
+    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)
+    Verify certificate: Verificar certificado
+    testConnection: Probar conexión
+    success: ¡Conexión con Samba establecida!
--- a/src/pages/Agency/AgencyList.vue
+++ b/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
--- a/src/pages/Claim/Card/ClaimBasicData.vue
+++ b/src/pages/Claim/Card/ClaimBasicData.vue
@ -158,8 +158,7 @@ const statesFilter = {
                    map-options
                    use-input
                    :input-debounce="0"
-                >
-                </QSelect>
+                />
            </VnRow>
        </template>
    </FormModel>
--- a/src/pages/Claim/ClaimList.vue
+++ b/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
--- a/src/pages/Customer/CustomerList.vue
+++ b/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
--- a/src/pages/Customer/Defaulter/CustomerDefaulter.vue
+++ b/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" />
--- a/src/pages/Customer/ExtendedList/CustomerExtendedList.vue
+++ b/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"
--- a/src/pages/Customer/Notifications/CustomerNotifications.vue
+++ b/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
--- a/src/pages/Customer/Payments/CustomerPayments.vue
+++ b/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">
--- a/src/pages/Entry/Card/EntryBuysImport.vue
+++ b/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">
--- a/src/pages/Entry/EntryLatestBuys.vue
+++ b/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"
--- a/src/pages/Entry/EntryList.vue
+++ b/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
--- a/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue
@ -81,7 +81,7 @@ async function setCreateDms() {
    createDmsRef.value.show();
 }

-async function upsert() {
+async function onSubmit() {
    try {
        const isEdit = !!dms.value.id;
        const errors = {
@ -318,224 +318,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>
--- a/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
@ -487,9 +487,6 @@ const createInvoiceInCorrection = async () => {
 .q-dialog {
    .q-card {
        max-width: 45em;
-        .q-item__section > .q-input {
-            padding-bottom: 1.4em;
-        }
    }
 }

--- a/src/pages/InvoiceIn/InvoiceInCreate.vue
+++ b/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>
--- a/src/pages/InvoiceIn/InvoiceInList.vue
+++ b/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
--- a/src/pages/InvoiceOut/InvoiceOutGlobal.vue
+++ b/src/pages/InvoiceOut/InvoiceOutGlobal.vue
@ -7,6 +7,7 @@ import { useInvoiceOutGlobalStore } from 'src/stores/invoiceOutGlobal.js';
 import { storeToRefs } from 'pinia';
 import { QBadge, QBtn } from 'quasar';
 import CustomerDescriptor from 'src/pages/Customer/Card/CustomerDescriptor.vue';
+import RightMenu from 'src/components/common/RightMenu.vue';

 const stateStore = useStateStore();
 const { t } = useI18n();
@ -103,12 +104,11 @@ onUnmounted(() => {
 </script>

 <template>
-    <QDrawer v-model="stateStore.rightDrawer" :width="256" side="right" show-if-above>
-        <QScrollArea class="fit text-grey-8">
+    <RightMenu>
+        <template #right-panel>
            <InvoiceOutGlobalForm />
-        </QScrollArea>
-    </QDrawer>
-
+        </template>
+    </RightMenu>
    <QPage class="column items-center q-pa-md">
        <QCard v-if="status" class="card">
            <QCardSection class="card-section">
--- a/src/pages/InvoiceOut/InvoiceOutList.vue
+++ b/src/pages/InvoiceOut/InvoiceOutList.vue
@ -17,6 +17,7 @@ import { toDate, toCurrency } from 'src/filters/index';
 import { useStateStore } from 'stores/useStateStore';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import { useSession } from 'src/composables/useSession';
+import RightMenu from 'src/components/common/RightMenu.vue';

 const { t } = useI18n();
 const router = useRouter();
@ -93,35 +94,16 @@ const openCreateInvoiceModal = () => {
 </script>

 <template>
-    <template v-if="stateStore.isHeaderMounted()">
-        <Teleport to="#searchbar">
-            <VnSearchbar
-                :info="t('youCanSearchByInvoiceReference')"
-                :label="t('searchInvoice')"
-                data-key="InvoiceOutList"
-            />
-        </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 v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
-        <QScrollArea class="fit text-grey-8">
+    <VnSearchbar
+        :info="t('youCanSearchByInvoiceReference')"
+        :label="t('searchInvoice')"
+        data-key="InvoiceOutList"
+    />
+    <RightMenu>
+        <template #right-panel>
            <InvoiceOutFilter data-key="InvoiceOutList" />
-        </QScrollArea>
-    </QDrawer>
+        </template>
+    </RightMenu>
    <QPage>
        <VnPaginate
            auto-load
--- a/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue
+++ b/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue
@ -1,59 +1,43 @@
 <script setup>
-import { ref, computed, onBeforeMount, onMounted, nextTick } from 'vue';
+import { computed, onBeforeMount } from 'vue';
 import { useI18n } from 'vue-i18n';
-
 import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
 import InvoiceOutNegativeFilter from './InvoiceOutNegativeBasesFilter.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
 import TicketDescriptorProxy from 'src/pages/Ticket/Card/TicketDescriptorProxy.vue';
-
 import { toCurrency } from 'src/filters';
 import { useInvoiceOutGlobalStore } from 'src/stores/invoiceOutGlobal.js';
 import { useStateStore } from 'stores/useStateStore';
 import { useArrayData } from 'composables/useArrayData';
+import RightMenu from 'src/components/common/RightMenu.vue';

 const invoiceOutGlobalStore = useInvoiceOutGlobalStore();
 const stateStore = useStateStore();
 const { t } = useI18n();

-const arrayData = ref(null);
-
-function exprBuilder(param, value) {
-    switch (param) {
-        case 'from':
-        case 'to':
-            return;
-        default:
-            return { [param]: value };
-    }
-}
-
-onBeforeMount(async () => {
-    const defaultParams = {
+const arrayData = useArrayData('InvoiceOutNegative', {
+    url: 'InvoiceOuts/negativeBases',
+    limit: 0,
+    userParams: {
        from: Date.vnFirstDayOfMonth().toISOString(),
        to: Date.vnLastDayOfMonth().toISOString(),
-    };
-    arrayData.value = useArrayData('InvoiceOutNegative', {
-        url: 'InvoiceOuts/negativeBases',
-        limit: 0,
-        userParams: defaultParams,
-        exprBuilder: exprBuilder,
-    });
-    await arrayData.value.fetch({ append: false });
-
-    stateStore.rightDrawer = true;
+    },
+    exprBuilder: (param, value) => {
+        switch (param) {
+            case 'from':
+            case 'to':
+                return;
+            default:
+                return { [param]: value };
+        }
+    },
 });

-const componentIsRendered = ref(false);
-
-onMounted(() =>
-    nextTick(() => {
-        componentIsRendered.value = true;
-    })
-);
-
-const rows = computed(() => arrayData.value.store.data);
+onBeforeMount(async () => {
+    await arrayData.fetch({ append: false });
+    stateStore.rightDrawer = true;
+});

 const columns = computed(() => [
    {
@ -144,28 +128,23 @@ const downloadCSV = async () => {
    );
 };
 </script>
-
 <template>
-    <template v-if="stateStore.isHeaderMounted()">
-        <Teleport
-            to="#st-actions"
-            v-if="stateStore?.isSubToolbarShown() && componentIsRendered"
-        >
+    <VnSubToolbar>
+        <template #st-actions>
            <QBtn color="primary" icon-right="download" no-caps @click="downloadCSV()">
                <QTooltip>{{ t('Download as CSV') }}</QTooltip>
            </QBtn>
-        </Teleport>
-    </template>
-    <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
-        <QScrollArea class="fit text-grey-8">
+        </template>
+    </VnSubToolbar>
+    <RightMenu>
+        <template #right-panel>
            <InvoiceOutNegativeFilter data-key="InvoiceOutNegative" />
-        </QScrollArea>
-    </QDrawer>
-    <VnSubToolbar />
+        </template>
+    </RightMenu>
    <QPage class="column items-center q-pa-md">
        <QTable
            :columns="columns"
-            :rows="rows"
+            :rows="arrayData.store.data"
            row-key="clientId"
            class="full-width q-mt-md"
        >
--- a/src/pages/Item/Card/ItemBasicData.vue
+++ b/src/pages/Item/Card/ItemBasicData.vue
@ -220,13 +220,20 @@ const onIntrastatCreated = (response, formData) => {
                    </QIcon>
                </div>
            </VnRow>
-            <VnRow class="row q-gutter-md q-mb-md">
-                <QInput
+            <VnRow>
+                <VnInput
                    :label="t('basicData.description')"
                    type="textarea"
                    v-model="data.description"
                    fill-input
                />
+                <VnInput
+                    v-show="data.isPhotoRequested"
+                    type="textarea"
+                    :label="t('globals.comment')"
+                    v-model="data.photoMotivation"
+                    fill-input
+                />
            </VnRow>
        </template>
    </FormModel>
--- a/src/pages/Item/ItemFixedPrice.vue
+++ b/src/pages/Item/ItemFixedPrice.vue
@ -20,6 +20,7 @@ import useNotify from 'src/composables/useNotify.js';
 import axios from 'axios';
 import { useArrayData } from 'composables/useArrayData';
 import { isLower, isBigger } from 'src/filters/date.js';
+import RightMenu from 'src/components/common/RightMenu.vue';

 const stateStore = useStateStore();
 const { t } = useI18n();
@ -376,31 +377,14 @@ onUnmounted(() => (stateStore.rightDrawer = false));
        auto-load
        @on-fetch="(data) => (itemsWithNameOptions = data)"
    />
-    <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>
            <ItemFixedPriceFilter
                data-key="ItemFixedPrices"
                :warehouses-options="warehousesOptions"
            />
-        </QScrollArea>
-    </QDrawer>
+        </template>
+    </RightMenu>
    <QPage class="column items-center q-pa-md">
        <QTable
            :rows="fixedPrices"
--- a/src/pages/Item/ItemList.vue
+++ b/src/pages/Item/ItemList.vue
@ -21,6 +21,8 @@ import { dashIfEmpty } from 'src/filters';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import { useVnConfirm } from 'composables/useVnConfirm';
 import axios from 'axios';
+import RightMenu from 'src/components/common/RightMenu.vue';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';

 const router = useRouter();
 const { getTokenMultimedia } = useSession();
@ -430,24 +432,21 @@ onUnmounted(() => (stateStore.rightDrawer = false));
        auto-load
        @on-fetch="(data) => (buyersOptions = data)"
    />
-
-    <QToolbar class="bg-vn-dark justify-end">
-        <div id="st-data">
+    <VnSubToolbar>
+        <template #st-data>
            <TableVisibleColumns
                :all-columns="allColumnNames"
                table-code="itemsIndex"
                labels-traductions-path="item.list"
                @on-config-saved="visibleColumns = ['picture', ...$event, 'actions']"
            />
-        </div>
-        <QSpace />
-        <div id="st-actions"></div>
-    </QToolbar>
-    <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
-        <QScrollArea class="fit text-grey-8">
+        </template>
+    </VnSubToolbar>
+    <RightMenu>
+        <template #right-panel>
            <ItemListFilter data-key="ItemList" />
-        </QScrollArea>
-    </QDrawer>
+        </template>
+    </RightMenu>
    <QPage class="column items-center q-pa-md">
        <VnPaginate
            ref="paginateRef"
--- a/src/pages/Item/ItemRequest.vue
+++ b/src/pages/Item/ItemRequest.vue
@ -17,6 +17,7 @@ import { toCurrency } from 'filters/index';
 import useNotify from 'src/composables/useNotify.js';
 import { getDateQBadgeColor } from 'src/composables/getDateQBadgeColor.js';
 import axios from 'axios';
+import RightMenu from 'src/components/common/RightMenu.vue';

 const { t } = useI18n();
 const { notify } = useNotify();
@ -214,39 +215,18 @@ onBeforeMount(() => {
        @on-fetch="(data) => (workersOptions = data)"
        auto-load
    />
-    <template v-if="stateStore.isHeaderMounted()">
-        <Teleport to="#searchbar">
-            <VnSearchbar
-                data-key="ItemRequests"
-                url="TicketRequests/filter"
-                :label="t('globals.search')"
-                :info="t('You can search by Id or alias')"
-                :redirect="false"
-            />
-        </Teleport>
-    </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">
+    <VnSearchbar
+        data-key="ItemRequests"
+        url="TicketRequests/filter"
+        :label="t('globals.search')"
+        :info="t('You can search by Id or alias')"
+        :redirect="false"
+    />
+    <RightMenu>
+        <template #right-panel>
            <ItemRequestFilter data-key="ItemRequests" />
-        </QScrollArea>
-    </QDrawer>
+        </template>
+    </RightMenu>
    <QPage class="column items-center q-pa-md">
        <QTable
            :rows="itemRequestsOptions"
--- a/src/pages/Item/ItemTypeList.vue
+++ b/src/pages/Item/ItemTypeList.vue
@ -8,10 +8,9 @@ import CardList from 'src/components/ui/CardList.vue';
 import ItemTypeSummary from 'src/pages/ItemType/Card/ItemTypeSummary.vue';
 import ItemTypeFilter from 'src/pages/ItemType/ItemTypeFilter.vue';
 import ItemTypeSearchbar from '../ItemType/ItemTypeSearchbar.vue';
-import { useStateStore } from 'stores/useStateStore';
 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();
@ -60,31 +59,12 @@ const exprBuilder = (param, value) => {
 </script>

 <template>
-    <template v-if="stateStore.isHeaderMounted()">
-        <Teleport to="#searchbar">
-            <ItemTypeSearchbar />
-        </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">
+    <ItemTypeSearchbar />
+    <RightMenu>
+        <template #right-panel>
            <ItemTypeFilter data-key="ItemTypeList" />
-        </QScrollArea>
-    </QDrawer>
+        </template>
+    </RightMenu>
    <QPage class="column items-center q-pa-md">
        <div class="vn-card-list">
            <VnPaginate
--- a/src/pages/Order/Card/OrderCatalogItemDialog.vue
+++ b/src/pages/Order/Card/OrderCatalogItemDialog.vue
@ -33,7 +33,7 @@ const addToOrder = async () => {

 <template>
    <div class="container order-catalog-item q-pb-md">
-        <QForm @submit.prevent="addToOrder">
+        <QForm @submit="addToOrder">
            <QMarkupTable class="shadow-0">
                <tbody>
                    <tr v-for="item in fields" :key="item.warehouse">
--- a/src/pages/Order/OrderList.vue
+++ b/src/pages/Order/OrderList.vue
@ -13,6 +13,7 @@ import OrderSearchbar from 'pages/Order/Card/OrderSearchbar.vue';
 import OrderFilter from 'pages/Order/Card/OrderFilter.vue';
 import OrderSummary from 'pages/Order/Card/OrderSummary.vue';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
+import RightMenu from 'src/components/common/RightMenu.vue';

 const stateStore = useStateStore();
 const router = useRouter();
@ -26,33 +27,13 @@ function navigate(id) {
    router.push({ path: `/order/${id}` });
 }
 </script>
-
 <template>
-    <template v-if="stateStore.isHeaderMounted()">
-        <Teleport to="#searchbar">
-            <OrderSearchbar />
-        </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">
+    <OrderSearchbar />
+    <RightMenu>
+        <template #right-panel>
            <OrderFilter data-key="OrderList" />
-        </QScrollArea>
-    </QDrawer>
+        </template>
+    </RightMenu>
    <QPage class="column items-center q-pa-md">
        <div class="vn-card-list">
            <VnPaginate
--- a/src/pages/Parking/ParkingList.vue
+++ b/src/pages/Parking/ParkingList.vue
@ -10,6 +10,7 @@ import CardList from 'components/ui/CardList.vue';
 import VnLv from 'components/ui/VnLv.vue';
 import ParkingFilter from './ParkingFilter.vue';
 import ParkingSummary from './Card/ParkingSummary.vue';
+import RightMenu from 'src/components/common/RightMenu.vue';

 const stateStore = useStateStore();
 const { push } = useRouter();
@ -37,35 +38,18 @@ function exprBuilder(param, value) {
 </script>

 <template>
-    <template v-if="stateStore.isHeaderMounted()">
-        <Teleport to="#searchbar">
-            <VnSearchbar
-                data-key="ParkingList"
-                :label="t('Search parking')"
-                :info="t('You can search by parking code')"
-            />
-        </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>
+        <VnSearchbar
+            data-key="ParkingList"
+            :label="t('Search parking')"
+            :info="t('You can search by parking code')"
+        />
    </template>
-    <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
-        <QScrollArea class="fit text-grey-8">
+    <RightMenu>
+        <template #right-panel>
            <ParkingFilter data-key="ParkingList" />
-        </QScrollArea>
-    </QDrawer>
+        </template>
+    </RightMenu>
    <QPage class="column items-center q-pa-md">
        <div class="vn-card-list">
            <VnPaginate
--- a/src/pages/Route/Card/RouteForm.vue
+++ b/src/pages/Route/Card/RouteForm.vue
@ -11,13 +11,10 @@ import VnInputDate from 'components/common/VnInputDate.vue';
 import VnInput from 'components/common/VnInput.vue';
 import axios from 'axios';
 import VnInputTime from 'components/common/VnInputTime.vue';
-import RouteSearchbar from 'pages/Route/Card/RouteSearchbar.vue';
-import { useStateStore } from 'stores/useStateStore';

 const { t } = useI18n();
 const route = useRoute();
 const router = useRouter();
-const stateStore = useStateStore();
 const shelvingId = ref(route.params?.id || null);
 const isNew = Boolean(!shelvingId.value);
 const defaultInitialData = {
--- a/src/pages/Route/Cmr/CmrList.vue
+++ b/src/pages/Route/Cmr/CmrList.vue
@ -2,15 +2,14 @@
 import { computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { Notify } from 'quasar';
-import { useStateStore } from 'stores/useStateStore';
 import VnPaginate from 'components/ui/VnPaginate.vue';
 import { useSession } from 'src/composables/useSession';
 import { toDate } from 'filters/index';
 import CmrFilter from './CmrFilter.vue';
 import TicketDescriptorProxy from 'pages/Ticket/Card/TicketDescriptorProxy.vue';
 import CustomerDescriptorProxy from 'pages/Customer/Card/CustomerDescriptorProxy.vue';
+import RightMenu from 'src/components/common/RightMenu.vue';

-const stateStore = useStateStore();
 const { t } = useI18n();
 const { getTokenMultimedia } = useSession();
 const token = getTokenMultimedia();
@ -91,24 +90,11 @@ function downloadPdfs() {
 }
 </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>
+    <RightMenu>
+        <template #right-panel>
+            <CmrFilter data-key="CmrList" />
+        </template>
+    </RightMenu>
    <div class="column items-center">
        <div class="list">
            <VnPaginate
@ -182,15 +168,10 @@ function downloadPdfs() {
        </div>
        <QPageSticky :offset="[20, 20]">
            <QBtn @click="downloadPdfs" fab icon="cloud_download" color="primary" />
+            <QTooltip>
+                {{ t('route.cmr.list.downloadCmrs') }}
+            </QTooltip>
        </QPageSticky>
-        <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
-            <QScrollArea class="fit text-grey-8">
-                <CmrFilter data-key="CmrList" />
-                <QTooltip>
-                    {{ t('route.cmr.list.downloadCmrs') }}
-                </QTooltip>
-            </QScrollArea>
-        </QDrawer>
    </div>
 </template>

--- a/src/pages/Route/RouteAutonomous.vue
+++ b/src/pages/Route/RouteAutonomous.vue
@ -17,6 +17,7 @@ import { useSummaryDialog } from 'composables/useSummaryDialog';
 import VnDms from 'components/common/VnDms.vue';
 import { useState } from 'composables/useState';
 import axios from 'axios';
+import RightMenu from 'src/components/common/RightMenu.vue';

 const stateStore = useStateStore();
 const { t } = useI18n();
@ -172,35 +173,16 @@ function navigateToRouteSummary(event, row) {
 </script>

 <template>
-    <template v-if="stateStore.isHeaderMounted()">
-        <Teleport to="#searchbar">
-            <VnSearchbar
-                data-key="RouteAutonomousList"
-                :label="t('Search autonomous')"
-                :info="t('You can search by autonomous 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="RouteAutonomousList"
+        :label="t('Search autonomous')"
+        :info="t('You can search by autonomous reference')"
+    />
+    <RightMenu>
+        <template #right-panel>
            <RouteAutonomousFilter data-key="RouteAutonomousList" />
-        </QScrollArea>
-    </QDrawer>
+        </template>
+    </RightMenu>
    <QPage class="column items-center">
        <div class="route-list">
            <div class="q-pa-md">
--- a/src/pages/Route/RouteList.vue
+++ b/src/pages/Route/RouteList.vue
@ -21,6 +21,7 @@ import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import RouteListTicketsDialog from 'pages/Route/Card/RouteListTicketsDialog.vue';
 import { useQuasar } from 'quasar';
 import { useArrayData } from 'composables/useArrayData';
+import RightMenu from 'src/components/common/RightMenu.vue';

 const stateStore = useStateStore();
 const { t } = useI18n();
@ -186,26 +187,12 @@ onUnmounted(() => (stateStore.rightDrawer = false));
 </script>

 <template>
-    <template v-if="stateStore.isHeaderMounted()">
-        <Teleport to="#searchbar">
-            <RouteSearchbar />
-        </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>
+    <RouteSearchbar />
+    <RightMenu>
+        <template #right-panel>
+            <RouteFilter data-key="RouteList" />
+        </template>
+    </RightMenu>
    <QDialog v-model="confirmationDialog">
        <QCard style="min-width: 350px">
            <QCardSection>
@ -227,11 +214,6 @@ onUnmounted(() => (stateStore.rightDrawer = false));
            </QCardActions>
        </QCard>
    </QDialog>
-    <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
-        <QScrollArea class="fit text-grey-8">
-            <RouteFilter data-key="RouteList" />
-        </QScrollArea>
-    </QDrawer>
    <FetchData
        url="Workers/activeWithInheritedRole"
        @on-fetch="(data) => (workers = data)"
--- a/src/pages/Route/RouteRoadmap.vue
+++ b/src/pages/Route/RouteRoadmap.vue
@ -16,6 +16,7 @@ import VnInputDate from 'components/common/VnInputDate.vue';
 import { useSummaryDialog } from 'composables/useSummaryDialog';
 import RoadmapSummary from 'pages/Route/Roadmap/RoadmapSummary.vue';
 import { useRouter } from 'vue-router';
+import RightMenu from 'src/components/common/RightMenu.vue';

 const stateStore = useStateStore();
 const { t } = useI18n();
@ -133,35 +134,16 @@ function navigateToRoadmapSummary(event, row) {
 </script>

 <template>
-    <template v-if="stateStore.isHeaderMounted()">
-        <Teleport to="#searchbar">
-            <VnSearchbar
-                data-key="RoadmapList"
-                :label="t('Search roadmaps')"
-                :info="t('You can search by roadmap 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="RoadmapList"
+        :label="t('Search roadmaps')"
+        :info="t('You can search by roadmap reference')"
+    />
+    <RightMenu>
+        <template #right-panel>
            <RoadmapFilter data-key="RoadmapList" />
-        </QScrollArea>
-    </QDrawer>
+        </template>
+    </RightMenu>
    <QDialog v-model="isCloneDialogOpen">
        <QCard style="min-width: 350px">
            <QCardSection>
--- a/src/pages/Route/RouteTickets.vue
+++ b/src/pages/Route/RouteTickets.vue
@ -15,14 +15,11 @@ import VnConfirm from 'components/ui/VnConfirm.vue';
 import FetchData from 'components/FetchData.vue';
 import { openBuscaman } from 'src/utils/buscaman';
 import SendSmsDialog from 'components/common/SendSmsDialog.vue';
-import RouteSearchbar from 'pages/Route/Card/RouteSearchbar.vue';
-import { useStateStore } from 'stores/useStateStore';

 const { t } = useI18n();
 const quasar = useQuasar();
 const route = useRoute();

-const stateStore = useStateStore();
 const selectedRows = ref([]);
 const columns = computed(() => [
    {
--- a/src/pages/Shelving/ShelvingList.vue
+++ b/src/pages/Shelving/ShelvingList.vue
@ -10,6 +10,7 @@ import ShelvingFilter from 'pages/Shelving/Card/ShelvingFilter.vue';
 import ShelvingSummary from 'pages/Shelving/Card/ShelvingSummary.vue';
 import ShelvingSearchbar from 'pages/Shelving/Card/ShelvingSearchbar.vue';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
+import RightMenu from 'src/components/common/RightMenu.vue';

 const stateStore = useStateStore();
 const router = useRouter();
@ -39,31 +40,12 @@ function exprBuilder(param, value) {
 </script>

 <template>
-    <template v-if="stateStore.isHeaderMounted()">
-        <Teleport to="#searchbar">
-            <ShelvingSearchbar />
-        </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">
+    <ShelvingSearchbar />
+    <RightMenu>
+        <template #right-panel>
            <ShelvingFilter data-key="ShelvingList" />
-        </QScrollArea>
-    </QDrawer>
+        </template>
+    </RightMenu>
    <QPage class="column items-center q-pa-md">
        <div class="vn-card-list">
            <VnPaginate
--- a/src/pages/Supplier/SupplierList.vue
+++ b/src/pages/Supplier/SupplierList.vue
@ -7,10 +7,9 @@ import CardList from 'src/components/ui/CardList.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import SupplierSummary from './Card/SupplierSummary.vue';
 import SupplierListFilter from './SupplierListFilter.vue';
-import { useStateStore } from 'stores/useStateStore';
 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();
@ -25,22 +24,13 @@ const redirectToCreateView = () => {
 </script>

 <template>
-    <template v-if="stateStore.isHeaderMounted()">
-        <Teleport to="#searchbar">
-            <VnSearchbar
-                data-key="SuppliersList"
-                :limit="20"
-                :label="t('Search suppliers')"
-            />
-        </Teleport>
-    </template>
-
+    <VnSearchbar data-key="SuppliersList" :limit="20" :label="t('Search suppliers')" />
+    <RightMenu>
+        <template #right-panel>
+            <SupplierListFilter data-key="SuppliersList" />
+        </template>
+    </RightMenu>
    <QPage class="column items-center q-pa-md">
-        <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
-            <QScrollArea class="fit text-grey-8">
-                <SupplierListFilter data-key="SuppliersList" />
-            </QScrollArea>
-        </QDrawer>
        <div class="vn-card-list">
            <VnPaginate data-key="SuppliersList" url="Suppliers/filter">
                <template #body="{ rows }">
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@ -11,6 +11,7 @@ import TicketFilter from './TicketFilter.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import CardList from 'src/components/ui/CardList.vue';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
+import RightMenu from 'src/components/common/RightMenu.vue';

 const router = useRouter();
 const { t } = useI18n();
@ -35,35 +36,16 @@ function navigate(id) {
 </script>

 <template>
-    <template v-if="stateStore.isHeaderMounted()">
-        <Teleport to="#searchbar">
-            <VnSearchbar
-                data-key="TicketList"
-                :label="t('Search ticket')"
-                :info="t('You can search by ticket id or alias')"
-            />
-        </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">
-        <QScrollArea class="fit text-grey-8">
+    <VnSearchbar
+        data-key="TicketList"
+        :label="t('Search ticket')"
+        :info="t('You can search by ticket id or alias')"
+    />
+    <RightMenu>
+        <template #right-panel>
            <TicketFilter data-key="TicketList" />
-        </QScrollArea>
-    </QDrawer>
+        </template>
+    </RightMenu>
    <QPage class="column items-center q-pa-md">
        <div class="vn-card-list">
            <VnPaginate
--- a/src/pages/Travel/ExtraCommunity.vue
+++ b/src/pages/Travel/ExtraCommunity.vue
@ -18,6 +18,7 @@ import { toDate } from 'src/filters';
 import { usePrintService } from 'composables/usePrintService';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import axios from 'axios';
+import RightMenu from 'src/components/common/RightMenu.vue';

 const router = useRouter();
 const stateStore = useStateStore();
@ -421,15 +422,16 @@ const handleDragScroll = (event) => {
 </script>

 <template>
-    <template v-if="stateStore.isHeaderMounted()">
-        <Teleport to="#searchbar">
-            <VnSearchbar
-                data-key="ExtraCommunity"
-                :limit="20"
-                :label="t('searchExtraCommunity')"
-            />
-        </Teleport>
-    </template>
+    <VnSearchbar
+        data-key="ExtraCommunity"
+        :limit="20"
+        :label="t('searchExtraCommunity')"
+    />
+    <RightMenu>
+        <template #right-panel>
+            <ExtraCommunityFilter data-key="ExtraCommunity" />
+        </template>
+    </RightMenu>
    <VnSubToolbar class="justify-end">
        <template #st-actions>
            <QBtn
@ -444,11 +446,6 @@ const handleDragScroll = (event) => {
            </QBtn>
        </template>
    </VnSubToolbar>
-    <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
-        <QScrollArea class="fit text-grey-8">
-            <ExtraCommunityFilter data-key="ExtraCommunity" />
-        </QScrollArea>
-    </QDrawer>
    <QPage class="column items-center q-pa-md">
        <QTable
            :rows="rows"
--- a/src/pages/Travel/TravelList.vue
+++ b/src/pages/Travel/TravelList.vue
@ -14,6 +14,7 @@ import { useStateStore } from 'stores/useStateStore';
 import { toDate } from 'src/filters/index';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import { getDateQBadgeColor } from 'src/composables/getDateQBadgeColor.js';
+import RightMenu from 'src/components/common/RightMenu.vue';

 const router = useRouter();
 const { t } = useI18n();
@ -49,15 +50,6 @@ onMounted(async () => {
 </script>

 <template>
-    <template v-if="stateStore.isHeaderMounted()">
-        <Teleport to="#searchbar">
-            <VnSearchbar
-                data-key="TravelList"
-                :limit="20"
-                :label="t('searchByIdOrReference')"
-            />
-        </Teleport>
-    </template>
    <FetchData
        url="Warehouses"
        :filter="{ fields: ['id', 'name'] }"
@ -65,11 +57,12 @@ onMounted(async () => {
        @on-fetch="(data) => (warehouses = data)"
        auto-load
    />
-    <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
-        <QScrollArea class="fit text-grey-8">
+    <VnSearchbar data-key="TravelList" :limit="20" :label="t('searchByIdOrReference')" />
+    <RightMenu>
+        <template #right-panel>
            <TravelFilter data-key="TravelList" />
-        </QScrollArea>
-    </QDrawer>
+        </template>
+    </RightMenu>
    <QPage class="column items-center q-pa-md">
        <div class="vn-card-list">
            <VnPaginate
--- a/src/pages/Worker/Card/WorkerCalendarItem.vue
+++ b/src/pages/Worker/Card/WorkerCalendarItem.vue
@ -136,13 +136,6 @@ const getEventByTimestamp = ({ year, month, day }) => {
    return props.events[stamp] || null;
 };

-const isFestive = (timestamp) => {
-    const event = getEventByTimestamp(timestamp);
-    if (!event) return false;
-
-    const { isFestive } = event;
-    return isFestive;
-};
 const getEventAttrs = (timestamp) => {
    const event = getEventByTimestamp(timestamp);
    if (!event) return {};
--- a/src/pages/Worker/WorkerList.vue
+++ b/src/pages/Worker/WorkerList.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 WorkerSummary from './Card/WorkerSummary.vue';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
@ -9,8 +8,8 @@ import WorkerFilter from './WorkerFilter.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import CardList from 'src/components/ui/CardList.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();
@ -23,37 +22,17 @@ const redirectToCreateView = () => {
    router.push({ name: 'WorkerCreate' });
 };
 </script>
-
 <template>
-    <template v-if="stateStore.isHeaderMounted()">
-        <Teleport to="#searchbar">
-            <VnSearchbar
-                data-key="WorkerList"
-                :label="t('Search worker')"
-                :info="t('You can search by worker id or 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="WorkerList"
+        :label="t('Search worker')"
+        :info="t('You can search by worker id or name')"
+    />
+    <RightMenu>
+        <template #right-panel>
            <WorkerFilter data-key="WorkerList" />
-        </QScrollArea>
-    </QDrawer>
+        </template>
+    </RightMenu>
    <QPage class="column items-center q-pa-md">
        <div class="vn-card-list">
            <VnPaginate
--- a/src/pages/Zone/ZoneDeliveryDays.vue
+++ b/src/pages/Zone/ZoneDeliveryDays.vue
@ -1,14 +1,8 @@
 <script setup>
 import { ref } from 'vue';
-import { useI18n } from 'vue-i18n';
-
 import ZoneDeliveryPanel from './ZoneDeliveryPanel.vue';
 import ZoneCalendarGrid from './ZoneCalendarGrid.vue';
-
-import { useStateStore } from 'stores/useStateStore';
-
-const { t } = useI18n();
-const stateStore = useStateStore();
+import RightMenu from 'src/components/common/RightMenu.vue';

 const firstDay = ref(null);
 const lastDay = ref(null);
@ -16,28 +10,11 @@ const events = ref([]);
 </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>
            <ZoneDeliveryPanel />
-        </QScrollArea>
-    </QDrawer>
+        </template>
+    </RightMenu>
    <QPage class="q-pa-md flex justify-center">
        <ZoneCalendarGrid
            v-model:events="events"
--- a/src/pages/Zone/ZoneList.vue
+++ b/src/pages/Zone/ZoneList.vue
@ -13,6 +13,8 @@ import { useVnConfirm } from 'composables/useVnConfirm';
 import useNotify from 'src/composables/useNotify.js';
 import { useStateStore } from 'stores/useStateStore';
 import axios from 'axios';
+import RightMenu from 'src/components/common/RightMenu.vue';
+import ZoneFilterPanel from './ZoneFilterPanel.vue';

 const stateStore = useStateStore();
 const { t } = useI18n();
@ -85,6 +87,11 @@ onMounted(() => (stateStore.rightDrawer = true));
 </script>

 <template>
+    <RightMenu>
+        <template #right-panel>
+            <ZoneFilterPanel data-key="ZoneList" :expr-builder="exprBuilder" />
+        </template>
+    </RightMenu>
    <QPage class="column items-center q-pa-md">
        <div class="vn-card-list">
            <VnPaginate
--- a/src/pages/Zone/ZoneMain.vue
+++ b/src/pages/Zone/ZoneMain.vue
@ -1,14 +1,11 @@
 <script setup>
 import { useI18n } from 'vue-i18n';
-import { useRoute } from 'vue-router';
 import { useStateStore } from 'stores/useStateStore';
 import LeftMenu from 'src/components/LeftMenu.vue';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
-import ZoneFilterPanel from './ZoneFilterPanel.vue';

 const { t } = useI18n();
 const stateStore = useStateStore();
-const route = useRoute();

 const exprBuilder = (param, value) => {
    switch (param) {
@ -41,32 +38,17 @@ const exprBuilder = (param, value) => {
 </script>

 <template>
-    <template v-if="stateStore.isHeaderMounted()">
-        <Teleport to="#searchbar">
-            <VnSearchbar
-                data-key="ZoneList"
-                url="Zones"
-                :filter="{
-                    include: { relation: 'agencyMode', scope: { fields: ['name'] } },
-                }"
-                :expr-builder="exprBuilder"
-                :label="t('list.searchZone')"
-                :info="t('list.searchInfo')"
-                custom-route-redirect-name="ZoneSummary"
-            />
-        </Teleport>
-    </template>
-    <QDrawer
-        v-if="route.name === 'ZoneList'"
-        v-model="stateStore.rightDrawer"
-        side="right"
-        :width="256"
-        show-if-above
-    >
-        <QScrollArea class="fit text-grey-8">
-            <ZoneFilterPanel data-key="ZoneList" :expr-builder="exprBuilder" />
-        </QScrollArea>
-    </QDrawer>
+    <VnSearchbar
+        data-key="ZoneList"
+        url="Zones"
+        :filter="{
+            include: { relation: 'agencyMode', scope: { fields: ['name'] } },
+        }"
+        :expr-builder="exprBuilder"
+        :label="t('list.searchZone')"
+        :info="t('list.searchInfo')"
+        custom-route-redirect-name="ZoneSummary"
+    />
    <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
        <QScrollArea class="fit text-grey-8">
            <LeftMenu />
--- a/src/router/modules/account.js
+++ b/src/router/modules/account.js
@ -0,0 +1,45 @@
+import { RouterView } from 'vue-router';
+
+export default {
+    path: '/account',
+    name: 'Account',
+    meta: {
+        title: 'users',
+        icon: 'face',
+        moduleName: 'Account',
+    },
+    component: RouterView,
+    redirect: { name: 'AccountMain' },
+    menus: {
+        main: ['AccountRoles'],
+        card: [],
+    },
+    children: [
+        {
+            path: '',
+            name: 'AccountMain',
+            component: () => import('src/pages/Account/AccountMain.vue'),
+            redirect: { name: 'AccountList' },
+            children: [
+                {
+                    path: 'list',
+                    name: 'AccountList',
+                    meta: {
+                        title: 'list',
+                        icon: 'view_list',
+                    },
+                    component: () => import('src/pages/Account/AccountList.vue'),
+                },
+                {
+                    path: 'role-list',
+                    name: 'AccountRoles',
+                    meta: {
+                        title: 'roles',
+                        icon: 'group',
+                    },
+                    component: () => import('src/pages/Account/Role/AccountRoles.vue'),
+                },
+            ],
+        },
+    ],
+};
--- a/src/router/modules/index.js
+++ b/src/router/modules/index.js
@ -12,12 +12,14 @@ import Supplier from './Supplier';
 import Travel from './travel';
 import Order from './order';
 import Department from './department';
+import Role from './role';
 import Entry from './entry';
 import roadmap from './roadmap';
 import Parking from './parking';
 import Agency from './agency';
 import ItemType from './itemType';
 import Zone from './zone';
+import Account from './account';
 import Monitor from './monitor';

 export default [
@ -35,11 +37,13 @@ export default [
    Order,
    invoiceIn,
    Department,
+    Role,
    Entry,
    roadmap,
    Parking,
    Agency,
    ItemType,
    Zone,
+    Account,
    Monitor,
 ];
--- a/src/router/modules/role.js
+++ b/src/router/modules/role.js
@ -0,0 +1,76 @@
+import { RouterView } from 'vue-router';
+
+export default {
+    path: 'account/role',
+    name: 'Role',
+    meta: {
+        title: 'role',
+        icon: 'vn:greuge',
+        moduleName: 'Role',
+    },
+    component: RouterView,
+    redirect: { name: 'AccountRoles' },
+    menus: {
+        main: [],
+        card: ['RoleBasicData', 'SubRoles', 'InheritedRoles', 'RoleLog'],
+    },
+    children: [
+        {
+            name: 'RoleCard',
+            path: ':id',
+            component: () => import('src/pages/Account/Role/Card/RoleCard.vue'),
+            redirect: { name: 'RoleSummary' },
+            children: [
+                {
+                    name: 'RoleSummary',
+                    path: 'summary',
+                    meta: {
+                        title: 'summary',
+                        icon: 'launch',
+                    },
+                    component: () =>
+                        import('src/pages/Account/Role/Card/RoleSummary.vue'),
+                },
+                {
+                    name: 'RoleBasicData',
+                    path: 'basic-data',
+                    meta: {
+                        title: 'basicData',
+                        icon: 'vn:settings',
+                    },
+                    component: () =>
+                        import('src/pages/Account/Role/Card/RoleBasicData.vue'),
+                },
+                {
+                    name: 'SubRoles',
+                    path: 'sub-roles',
+                    meta: {
+                        title: 'subRoles',
+                        icon: 'group',
+                    },
+                    component: () => import('src/pages/Account/Role/Card/SubRoles.vue'),
+                },
+
+                {
+                    name: 'InheritedRoles',
+                    path: 'inherited-roles',
+                    meta: {
+                        title: 'inheritedRoles',
+                        icon: 'account_tree',
+                    },
+                    component: () =>
+                        import('src/pages/Account/Role/Card/InheritedRoles.vue'),
+                },
+                {
+                    name: 'RoleLog',
+                    path: 'log',
+                    meta: {
+                        title: 'log',
+                        icon: 'history',
+                    },
+                    component: () => import('src/pages/Account/Role/Card/RoleLog.vue'),
+                },
+            ],
+        },
+    ],
+};
--- a/src/router/modules/worker.js
+++ b/src/router/modules/worker.js
@ -24,7 +24,6 @@ export default {
            'WorkerTimeControl',
            'WorkerLocker',
        ],
-        departmentCard: ['BasicData'],
    },
    children: [
        {
--- a/src/router/routes.js
+++ b/src/router/routes.js
@ -10,6 +10,7 @@ import supplier from './modules/Supplier';
 import route from './modules/route';
 import travel from './modules/travel';
 import department from './modules/department';
+import role from './modules/role';
 import ItemType from './modules/itemType';
 import shelving from 'src/router/modules/shelving';
 import order from 'src/router/modules/order';
@ -18,6 +19,7 @@ import roadmap from 'src/router/modules/roadmap';
 import parking from 'src/router/modules/parking';
 import agency from 'src/router/modules/agency';
 import zone from 'src/router/modules/zone';
+import account from './modules/account';
 import monitor from 'src/router/modules/monitor';

 const routes = [
@ -73,12 +75,14 @@ const routes = [
            supplier,
            travel,
            department,
+            role,
            roadmap,
            entry,
            parking,
            agency,
            ItemType,
            zone,
+            account,
            {
                path: '/:catchAll(.*)*',
                name: 'NotFound',
--- a/src/stores/useNavigationStore.js
+++ b/src/stores/useNavigationStore.js
@ -23,6 +23,7 @@ export const useNavigationStore = defineStore('navigationStore', () => {
        'worker',
        'wagon',
        'zone',
+        'account',
    ];
    const pinnedModules = ref([]);
    const role = useRole();
--- a/test/cypress/integration/agency/agencyWorkCenter.spec.js
+++ b/test/cypress/integration/agency/agencyWorkCenter.spec.js
@ -13,7 +13,6 @@ describe('AgencyWorkCenter', () => {
        cy.get(
            '.vn-row > .q-field > .q-field__inner > .q-field__control > .q-field__control-container'
        ).type('workCenterOne{enter}');
-        cy.get('.q-btn--standard > .q-btn__content > .block').click();
        cy.get('.q-notification__message').should('have.text', 'Data created');
    });

@ -35,13 +34,11 @@ describe('AgencyWorkCenter', () => {
        cy.get(
            '.vn-row > .q-field > .q-field__inner > .q-field__control > .q-field__control-container'
        ).type('workCenterOne{enter}');
-        cy.get('.q-btn--standard > .q-btn__content > .block').click();
        cy.get('.q-notification__message').should('have.text', 'Data created');
        cy.get('.q-page-sticky > div > .q-btn > .q-btn__content > .q-icon').click();
        cy.get(
            '.vn-row > .q-field > .q-field__inner > .q-field__control > .q-field__control-container'
        ).type('workCenterOne{enter}');
-        cy.get('.q-btn--standard > .q-btn__content > .block').click();

        cy.get(
            ':nth-child(2) > .q-notification__wrapper > .q-notification__content > .q-notification__message'