diff --git a/src/components/CreateBankEntityForm.vue b/src/components/CreateBankEntityForm.vue
index 4acc7b749d..068646c9af 100644
--- a/src/components/CreateBankEntityForm.vue
+++ b/src/components/CreateBankEntityForm.vue
@@ -58,23 +58,19 @@ onMounted(async () => {
     >
         <template #form-inputs="{ data, validate }">
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnInput
-                        :label="t('name')"
-                        v-model="data.name"
-                        :required="true"
-                        :rules="validate('bankEntity.name')"
-                    />
-                </div>
-                <div class="col">
-                    <VnInput
-                        ref="bicInputRef"
-                        :label="t('swift')"
-                        v-model="data.bic"
-                        :required="true"
-                        :rules="validate('bankEntity.bic')"
-                    />
-                </div>
+                <VnInput
+                    :label="t('name')"
+                    v-model="data.name"
+                    :required="true"
+                    :rules="validate('bankEntity.name')"
+                />
+                <VnInput
+                    ref="bicInputRef"
+                    :label="t('swift')"
+                    v-model="data.bic"
+                    :required="true"
+                    :rules="validate('bankEntity.bic')"
+                />
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
                 <div class="col">
diff --git a/src/components/CreateDepartmentChild.vue b/src/components/CreateDepartmentChild.vue
index 8f5b4b8745..1f1b1335b2 100644
--- a/src/components/CreateDepartmentChild.vue
+++ b/src/components/CreateDepartmentChild.vue
@@ -52,9 +52,7 @@ onMounted(() => {
             </span>
             <h1 class="title">{{ t('New department') }}</h1>
             <VnRow class="row q-gutter-md q-mb-md" style="min-width: 250px">
-                <div class="col">
-                    <VnInput :label="t('Name')" v-model="data.name" />
-                </div>
+                <VnInput :label="t('Name')" v-model="data.name" />
             </VnRow>
             <div class="q-mt-lg row justify-end">
                 <QBtn
diff --git a/src/components/CreateManualInvoiceForm.vue b/src/components/CreateManualInvoiceForm.vue
index 8ac3552adf..f3d4de6057 100644
--- a/src/components/CreateManualInvoiceForm.vue
+++ b/src/components/CreateManualInvoiceForm.vue
@@ -72,69 +72,57 @@ const onDataSaved = async (formData, requestResponse) => {
                 {{ t('Invoicing in progress...') }}
             </span>
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnSelect
-                        :label="t('Ticket')"
-                        :options="ticketsOptions"
-                        hide-selected
-                        option-label="id"
-                        option-value="id"
-                        v-model="data.ticketFk"
-                        @update:model-value="data.clientFk = null"
-                    >
-                        <template #option="scope">
-                            <QItem v-bind="scope.itemProps">
-                                <QItemSection>
-                                    <QItemLabel> #{{ scope.opt?.id }} </QItemLabel>
-                                    <QItemLabel caption>{{
-                                        scope.opt?.nickname
-                                    }}</QItemLabel>
-                                </QItemSection>
-                            </QItem>
-                        </template>
-                    </VnSelect>
-                </div>
+                <VnSelect
+                    :label="t('Ticket')"
+                    :options="ticketsOptions"
+                    hide-selected
+                    option-label="id"
+                    option-value="id"
+                    v-model="data.ticketFk"
+                    @update:model-value="data.clientFk = null"
+                >
+                    <template #option="scope">
+                        <QItem v-bind="scope.itemProps">
+                            <QItemSection>
+                                <QItemLabel> #{{ scope.opt?.id }} </QItemLabel>
+                                <QItemLabel caption>{{ scope.opt?.nickname }}</QItemLabel>
+                            </QItemSection>
+                        </QItem>
+                    </template>
+                </VnSelect>
                 <span class="row items-center" style="max-width: max-content">{{
                     t('Or')
                 }}</span>
-                <div class="col">
-                    <VnSelect
-                        :label="t('Client')"
-                        :options="clientsOptions"
-                        hide-selected
-                        option-label="name"
-                        option-value="id"
-                        v-model="data.clientFk"
-                        @update:model-value="data.ticketFk = null"
-                    />
-                </div>
-                <div class="col">
-                    <VnInputDate :label="t('Max date')" v-model="data.maxShipped" />
-                </div>
+                <VnSelect
+                    :label="t('Client')"
+                    :options="clientsOptions"
+                    hide-selected
+                    option-label="name"
+                    option-value="id"
+                    v-model="data.clientFk"
+                    @update:model-value="data.ticketFk = null"
+                />
+                <VnInputDate :label="t('Max date')" v-model="data.maxShipped" />
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnSelect
-                        :label="t('Serial')"
-                        :options="invoiceOutSerialsOptions"
-                        hide-selected
-                        option-label="description"
-                        option-value="code"
-                        v-model="data.serial"
-                        :required="true"
-                    />
-                </div>
-                <div class="col">
-                    <VnSelect
-                        :label="t('Area')"
-                        :options="taxAreasOptions"
-                        hide-selected
-                        option-label="code"
-                        option-value="code"
-                        v-model="data.taxArea"
-                        :required="true"
-                    />
-                </div>
+                <VnSelect
+                    :label="t('Serial')"
+                    :options="invoiceOutSerialsOptions"
+                    hide-selected
+                    option-label="description"
+                    option-value="code"
+                    v-model="data.serial"
+                    :required="true"
+                />
+                <VnSelect
+                    :label="t('Area')"
+                    :options="taxAreasOptions"
+                    hide-selected
+                    option-label="code"
+                    option-value="code"
+                    v-model="data.taxArea"
+                    :required="true"
+                />
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
                 <VnInput
diff --git a/src/components/CreateNewCityForm.vue b/src/components/CreateNewCityForm.vue
index a78312d08d..45fa61dffd 100644
--- a/src/components/CreateNewCityForm.vue
+++ b/src/components/CreateNewCityForm.vue
@@ -40,24 +40,20 @@ const onDataSaved = (dataSaved) => {
     >
         <template #form-inputs="{ data, validate }">
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnInput
-                        :label="t('Name')"
-                        v-model="data.name"
-                        :rules="validate('city.name')"
-                    />
-                </div>
-                <div class="col">
-                    <VnSelect
-                        :label="t('Province')"
-                        :options="provincesOptions"
-                        hide-selected
-                        option-label="name"
-                        option-value="id"
-                        v-model="data.provinceFk"
-                        :rules="validate('city.provinceFk')"
-                    />
-                </div>
+                <VnInput
+                    :label="t('Name')"
+                    v-model="data.name"
+                    :rules="validate('city.name')"
+                />
+                <VnSelect
+                    :label="t('Province')"
+                    :options="provincesOptions"
+                    hide-selected
+                    option-label="name"
+                    option-value="id"
+                    v-model="data.provinceFk"
+                    :rules="validate('city.provinceFk')"
+                />
             </VnRow>
         </template>
     </FormModelPopup>
diff --git a/src/components/CreateNewPostcodeForm.vue b/src/components/CreateNewPostcodeForm.vue
index a44363a7c9..fd85701760 100644
--- a/src/components/CreateNewPostcodeForm.vue
+++ b/src/components/CreateNewPostcodeForm.vue
@@ -30,21 +30,21 @@ const townsLocationOptions = ref([]);
 
 const onDataSaved = (formData) => {
     const newPostcode = {
-        ...formData
+        ...formData,
     };
     const townObject = townsLocationOptions.value.find(
-        ({id}) => id === formData.townFk
+        ({ id }) => id === formData.townFk
     );
     newPostcode.town = townObject?.name;
     const provinceObject = provincesOptions.value.find(
-        ({id}) => id === formData.provinceFk
+        ({ id }) => id === formData.provinceFk
     );
     newPostcode.province = provinceObject?.name;
     const countryObject = countriesOptions.value.find(
-        ({id}) => id === formData.countryFk
+        ({ id }) => id === formData.countryFk
     );
     newPostcode.country = countryObject?.country;
-    emit('onDataSaved', newPostcode);  
+    emit('onDataSaved', newPostcode);
 };
 
 const onCityCreated = async ({ name, provinceFk }, formData) => {
@@ -92,63 +92,54 @@ const onProvinceCreated = async ({ name }, formData) => {
     >
         <template #form-inputs="{ data, validate }">
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnInput
-                        :label="t('Postcode')"
-                        v-model="data.code"
-                        :rules="validate('postcode.code')"
-                    />
-                </div>
-                <div class="col">
-                    <VnSelectDialog
-                        :label="t('City')"
-                        :options="townsLocationOptions"
-                        v-model="data.townFk"
-                        hide-selected
-                        option-label="name"
-                        option-value="id"
-                        :rules="validate('postcode.city')"
-                        :roles-allowed-to-create="['deliveryAssistant']"
-                    >
-                        <template #form>
-                            <CreateNewCityForm
-                                @on-data-saved="onCityCreated($event, data)"
-                            />
-                        </template>
-                    </VnSelectDialog>
-                </div>
+                <VnInput
+                    :label="t('Postcode')"
+                    v-model="data.code"
+                    :rules="validate('postcode.code')"
+                />
+                <VnSelectDialog
+                    :label="t('City')"
+                    :options="townsLocationOptions"
+                    v-model="data.townFk"
+                    hide-selected
+                    option-label="name"
+                    option-value="id"
+                    :rules="validate('postcode.city')"
+                    :roles-allowed-to-create="['deliveryAssistant']"
+                >
+                    <template #form>
+                        <CreateNewCityForm @on-data-saved="onCityCreated($event, data)" />
+                    </template>
+                </VnSelectDialog>
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-xl">
-                <div class="col">
-                    <VnSelectDialog
-                        :label="t('Province')"
-                        :options="provincesOptions"
-                        hide-selected
-                        option-label="name"
-                        option-value="id"
-                        v-model="data.provinceFk"
-                        :rules="validate('postcode.provinceFk')"
-                        :roles-allowed-to-create="['deliveryAssistant']"
-                    >
-                        <template #form>
-                            <CreateNewProvinceForm
-                                @on-data-saved="onProvinceCreated($event, data)"
-                            />
-                        </template>
-                    </VnSelectDialog>
-                </div>
-                <div class="col">
-                    <VnSelect
-                        :label="t('Country')"
-                        :options="countriesOptions"
-                        hide-selected
-                        option-label="country"
-                        option-value="id"
-                        v-model="data.countryFk"
-                        :rules="validate('postcode.countryFk')"
-                    />
-                </div> </VnRow
-        ></template>
+                <VnSelectDialog
+                    :label="t('Province')"
+                    :options="provincesOptions"
+                    hide-selected
+                    option-label="name"
+                    option-value="id"
+                    v-model="data.provinceFk"
+                    :rules="validate('postcode.provinceFk')"
+                    :roles-allowed-to-create="['deliveryAssistant']"
+                >
+                    <template #form>
+                        <CreateNewProvinceForm
+                            @on-data-saved="onProvinceCreated($event, data)"
+                        />
+                    </template>
+                </VnSelectDialog>
+                <VnSelect
+                    :label="t('Country')"
+                    :options="countriesOptions"
+                    hide-selected
+                    option-label="country"
+                    option-value="id"
+                    v-model="data.countryFk"
+                    :rules="validate('postcode.countryFk')"
+                />
+            </VnRow>
+        </template>
     </FormModelPopup>
 </template>
 
diff --git a/src/components/CreateNewProvinceForm.vue b/src/components/CreateNewProvinceForm.vue
index d38ff94dfa..2d626ed99e 100644
--- a/src/components/CreateNewProvinceForm.vue
+++ b/src/components/CreateNewProvinceForm.vue
@@ -40,24 +40,20 @@ const onDataSaved = (dataSaved) => {
     >
         <template #form-inputs="{ data, validate }">
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnInput
-                        :label="t('Name')"
-                        v-model="data.name"
-                        :rules="validate('province.name')"
-                    />
-                </div>
-                <div class="col">
-                    <VnSelect
-                        :label="t('Autonomy')"
-                        :options="autonomiesOptions"
-                        hide-selected
-                        option-label="name"
-                        option-value="id"
-                        v-model="data.autonomyFk"
-                        :rules="validate('province.autonomyFk')"
-                    />
-                </div>
+                <VnInput
+                    :label="t('Name')"
+                    v-model="data.name"
+                    :rules="validate('province.name')"
+                />
+                <VnSelect
+                    :label="t('Autonomy')"
+                    :options="autonomiesOptions"
+                    hide-selected
+                    option-label="name"
+                    option-value="id"
+                    v-model="data.autonomyFk"
+                    :rules="validate('province.autonomyFk')"
+                />
             </VnRow>
         </template>
     </FormModelPopup>
diff --git a/src/components/CreateThermographForm.vue b/src/components/CreateThermographForm.vue
index 60c5315298..061c47712b 100644
--- a/src/components/CreateThermographForm.vue
+++ b/src/components/CreateThermographForm.vue
@@ -54,51 +54,42 @@ const onDataSaved = (dataSaved) => {
     >
         <template #form-inputs="{ data, validate }">
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnInput
-                        :label="t('Identifier')"
-                        v-model="data.thermographId"
-                        :required="true"
-                        :rules="validate('thermograph.id')"
-                    />
-                </div>
-
-                <div class="col">
-                    <VnSelect
-                        :label="t('Model')"
-                        :options="thermographsModels"
-                        hide-selected
-                        option-label="value"
-                        option-value="value"
-                        v-model="data.model"
-                        :required="true"
-                        :rules="validate('thermograph.model')"
-                    />
-                </div>
+                <VnInput
+                    :label="t('Identifier')"
+                    v-model="data.thermographId"
+                    :required="true"
+                    :rules="validate('thermograph.id')"
+                />
+                <VnSelect
+                    :label="t('Model')"
+                    :options="thermographsModels"
+                    hide-selected
+                    option-label="value"
+                    option-value="value"
+                    v-model="data.model"
+                    :required="true"
+                    :rules="validate('thermograph.model')"
+                />
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-xl">
-                <div class="col">
-                    <VnSelect
-                        :label="t('Warehouse')"
-                        :options="warehousesOptions"
-                        hide-selected
-                        option-label="name"
-                        option-value="id"
-                        v-model="data.warehouseId"
-                        :required="true"
-                    />
-                </div>
-                <div class="col">
-                    <VnSelect
-                        :label="t('Temperature')"
-                        :options="temperaturesOptions"
-                        hide-selected
-                        option-label="name"
-                        option-value="code"
-                        v-model="data.temperatureFk"
-                        :required="true"
-                    />
-                </div>
+                <VnSelect
+                    :label="t('Warehouse')"
+                    :options="warehousesOptions"
+                    hide-selected
+                    option-label="name"
+                    option-value="id"
+                    v-model="data.warehouseId"
+                    :required="true"
+                />
+                <VnSelect
+                    :label="t('Temperature')"
+                    :options="temperaturesOptions"
+                    hide-selected
+                    option-label="name"
+                    option-value="code"
+                    v-model="data.temperatureFk"
+                    :required="true"
+                />
             </VnRow>
         </template>
     </FormModelPopup>
diff --git a/src/components/EditPictureForm.vue b/src/components/EditPictureForm.vue
index 2adbf5f83c..a51ca11ad8 100644
--- a/src/components/EditPictureForm.vue
+++ b/src/components/EditPictureForm.vue
@@ -246,61 +246,55 @@ const makeRequest = async () => {
 
                 <div class="column">
                     <VnRow class="row q-gutter-md q-mb-md">
-                        <div class="col">
-                            <QOptionGroup
-                                :options="uploadMethodsOptions"
-                                type="radio"
-                                v-model="uploadMethodSelected"
-                            />
-                        </div>
+                        <QOptionGroup
+                            :options="uploadMethodsOptions"
+                            type="radio"
+                            v-model="uploadMethodSelected"
+                        />
                     </VnRow>
                     <VnRow class="row q-gutter-md q-mb-md">
-                        <div class="col">
-                            <QFile
-                                v-if="uploadMethodSelected === 'computer'"
-                                ref="inputFileRef"
-                                :label="t('File')"
-                                :multiple="false"
-                                v-model="newPhoto.files"
-                                @update:model-value="updatePhotoPreview($event)"
-                                :accept="allowedContentTypes"
-                                class="required cursor-pointer"
-                            >
-                                <template #append>
-                                    <QIcon
-                                        name="vn:attach"
-                                        class="cursor-pointer q-mr-sm"
-                                        @click="openInputFile()"
-                                    >
-                                        <!-- <QTooltip>{{ t('globals.selectFile') }}</QTooltip> -->
-                                    </QIcon>
-                                    <QIcon name="info" class="cursor-pointer">
-                                        <QTooltip>{{
-                                            t('globals.allowedFilesText', {
-                                                allowedContentTypes: allowedContentTypes,
-                                            })
-                                        }}</QTooltip>
-                                    </QIcon>
-                                </template>
-                            </QFile>
-                            <VnInput
-                                v-if="uploadMethodSelected === 'URL'"
-                                v-model="newPhoto.url"
-                                @update:model-value="updatePhotoPreview($event)"
-                                placeholder="https://"
-                            />
-                        </div>
+                        <QFile
+                            v-if="uploadMethodSelected === 'computer'"
+                            ref="inputFileRef"
+                            :label="t('File')"
+                            :multiple="false"
+                            v-model="newPhoto.files"
+                            @update:model-value="updatePhotoPreview($event)"
+                            :accept="allowedContentTypes"
+                            class="required cursor-pointer"
+                        >
+                            <template #append>
+                                <QIcon
+                                    name="vn:attach"
+                                    class="cursor-pointer q-mr-sm"
+                                    @click="openInputFile()"
+                                >
+                                    <!-- <QTooltip>{{ t('globals.selectFile') }}</QTooltip> -->
+                                </QIcon>
+                                <QIcon name="info" class="cursor-pointer">
+                                    <QTooltip>{{
+                                        t('globals.allowedFilesText', {
+                                            allowedContentTypes: allowedContentTypes,
+                                        })
+                                    }}</QTooltip>
+                                </QIcon>
+                            </template>
+                        </QFile>
+                        <VnInput
+                            v-if="uploadMethodSelected === 'URL'"
+                            v-model="newPhoto.url"
+                            @update:model-value="updatePhotoPreview($event)"
+                            placeholder="https://"
+                        />
                     </VnRow>
                     <VnRow class="row q-gutter-md q-mb-md">
-                        <div class="col">
-                            <VnSelect
-                                :label="t('Orientation')"
-                                :options="viewportTypes"
-                                hide-selected
-                                option-label="description"
-                                v-model="viewportSelection"
-                            />
-                        </div>
+                        <VnSelect
+                            :label="t('Orientation')"
+                            :options="viewportTypes"
+                            hide-selected
+                            option-label="description"
+                            v-model="viewportSelection"
+                        />
                     </VnRow>
                     <div class="q-mt-lg row justify-end">
                         <QBtn
diff --git a/src/components/FilterItemForm.vue b/src/components/FilterItemForm.vue
index 7af9adf939..a90c0e0c19 100644
--- a/src/components/FilterItemForm.vue
+++ b/src/components/FilterItemForm.vue
@@ -152,48 +152,32 @@ const selectItem = ({ id }) => {
             </span>
             <h1 class="title">{{ t('Filter item') }}</h1>
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnInput
-                        :label="t('entry.buys.name')"
-                        v-model="itemFilterParams.name"
-                    />
-                </div>
-                <div class="col">
-                    <VnInput
-                        :label="t('entry.buys.size')"
-                        v-model="itemFilterParams.size"
-                    />
-                </div>
-                <div class="col">
-                    <VnSelect
-                        :label="t('entry.buys.producer')"
-                        :options="producersOptions"
-                        hide-selected
-                        option-label="name"
-                        option-value="id"
-                        v-model="itemFilterParams.producerFk"
-                    />
-                </div>
-                <div class="col">
-                    <VnSelect
-                        :label="t('entry.buys.type')"
-                        :options="ItemTypesOptions"
-                        hide-selected
-                        option-label="name"
-                        option-value="id"
-                        v-model="itemFilterParams.typeFk"
-                    />
-                </div>
-                <div class="col">
-                    <VnSelect
-                        :label="t('entry.buys.color')"
-                        :options="InksOptions"
-                        hide-selected
-                        option-label="name"
-                        option-value="id"
-                        v-model="itemFilterParams.inkFk"
-                    />
-                </div>
+                <VnInput :label="t('entry.buys.name')" v-model="itemFilterParams.name" />
+                <VnInput :label="t('entry.buys.size')" v-model="itemFilterParams.size" />
+                <VnSelect
+                    :label="t('entry.buys.producer')"
+                    :options="producersOptions"
+                    hide-selected
+                    option-label="name"
+                    option-value="id"
+                    v-model="itemFilterParams.producerFk"
+                />
+                <VnSelect
+                    :label="t('entry.buys.type')"
+                    :options="ItemTypesOptions"
+                    hide-selected
+                    option-label="name"
+                    option-value="id"
+                    v-model="itemFilterParams.typeFk"
+                />
+                <VnSelect
+                    :label="t('entry.buys.color')"
+                    :options="InksOptions"
+                    hide-selected
+                    option-label="name"
+                    option-value="id"
+                    v-model="itemFilterParams.inkFk"
+                />
             </VnRow>
             <div class="q-mt-lg row justify-end">
                 <QBtn
diff --git a/src/components/FilterTravelForm.vue b/src/components/FilterTravelForm.vue
index 60d69e897f..61928ec047 100644
--- a/src/components/FilterTravelForm.vue
+++ b/src/components/FilterTravelForm.vue
@@ -145,48 +145,38 @@ const selectTravel = ({ id }) => {
             </span>
             <h1 class="title">{{ t('Filter travels') }}</h1>
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnSelect
-                        :label="t('entry.basicData.agency')"
-                        :options="agenciesOptions"
-                        hide-selected
-                        option-label="name"
-                        option-value="id"
-                        v-model="travelFilterParams.agencyModeFk"
-                    />
-                </div>
-                <div class="col">
-                    <VnSelect
-                        :label="t('entry.basicData.warehouseOut')"
-                        :options="warehousesOptions"
-                        hide-selected
-                        option-label="name"
-                        option-value="id"
-                        v-model="travelFilterParams.warehouseOutFk"
-                    />
-                </div>
-                <div class="col">
-                    <VnSelect
-                        :label="t('entry.basicData.warehouseIn')"
-                        :options="warehousesOptions"
-                        hide-selected
-                        option-label="name"
-                        option-value="id"
-                        v-model="travelFilterParams.warehouseInFk"
-                    />
-                </div>
-                <div class="col">
-                    <VnInputDate
-                        :label="t('entry.basicData.shipped')"
-                        v-model="travelFilterParams.shipped"
-                    />
-                </div>
-                <div class="col">
-                    <VnInputDate
-                        :label="t('entry.basicData.landed')"
-                        v-model="travelFilterParams.landed"
-                    />
-                </div>
+                <VnSelect
+                    :label="t('entry.basicData.agency')"
+                    :options="agenciesOptions"
+                    hide-selected
+                    option-label="name"
+                    option-value="id"
+                    v-model="travelFilterParams.agencyModeFk"
+                />
+                <VnSelect
+                    :label="t('entry.basicData.warehouseOut')"
+                    :options="warehousesOptions"
+                    hide-selected
+                    option-label="name"
+                    option-value="id"
+                    v-model="travelFilterParams.warehouseOutFk"
+                />
+                <VnSelect
+                    :label="t('entry.basicData.warehouseIn')"
+                    :options="warehousesOptions"
+                    hide-selected
+                    option-label="name"
+                    option-value="id"
+                    v-model="travelFilterParams.warehouseInFk"
+                />
+                <VnInputDate
+                    :label="t('entry.basicData.shipped')"
+                    v-model="travelFilterParams.shipped"
+                />
+                <VnInputDate
+                    :label="t('entry.basicData.landed')"
+                    v-model="travelFilterParams.landed"
+                />
             </VnRow>
             <div class="q-mt-lg row justify-end">
                 <QBtn
diff --git a/src/components/RegularizeStockForm.vue b/src/components/RegularizeStockForm.vue
index 098f8464dc..4f97033b38 100644
--- a/src/components/RegularizeStockForm.vue
+++ b/src/components/RegularizeStockForm.vue
@@ -50,13 +50,11 @@ const onDataSaved = (data) => {
     >
         <template #form-inputs="{ data }">
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <QInput
-                        :label="t('Type the visible quantity')"
-                        v-model.number="data.quantity"
-                        autofocus
-                    />
-                </div>
+                <QInput
+                    :label="t('Type the visible quantity')"
+                    v-model.number="data.quantity"
+                    autofocus
+                />
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
                 <div class="col">
diff --git a/src/components/TransferInvoiceForm.vue b/src/components/TransferInvoiceForm.vue
index de3196e2cb..f013e80fb7 100644
--- a/src/components/TransferInvoiceForm.vue
+++ b/src/components/TransferInvoiceForm.vue
@@ -83,74 +83,66 @@ const transferInvoice = async () => {
     >
         <template #form-inputs>
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnSelect
-                        :label="t('Client')"
-                        :options="clientsOptions"
-                        hide-selected
-                        option-label="name"
-                        option-value="id"
-                        v-model="transferInvoiceParams.newClientFk"
-                        :required="true"
-                    >
-                        <template #option="scope">
-                            <QItem v-bind="scope.itemProps">
-                                <QItemSection>
-                                    <QItemLabel>
-                                        #{{ scope.opt?.id }} -
-                                        {{ scope.opt?.name }}
-                                    </QItemLabel>
-                                </QItemSection>
-                            </QItem>
-                        </template>
-                    </VnSelect>
-                </div>
-                <div class="col">
-                    <VnSelect
-                        :label="t('Rectificative type')"
-                        :options="rectificativeTypeOptions"
-                        hide-selected
-                        option-label="description"
-                        option-value="id"
-                        v-model="transferInvoiceParams.cplusRectificationTypeFk"
-                        :required="true"
-                    />
-                </div>
+                <VnSelect
+                    :label="t('Client')"
+                    :options="clientsOptions"
+                    hide-selected
+                    option-label="name"
+                    option-value="id"
+                    v-model="transferInvoiceParams.newClientFk"
+                    :required="true"
+                >
+                    <template #option="scope">
+                        <QItem v-bind="scope.itemProps">
+                            <QItemSection>
+                                <QItemLabel>
+                                    #{{ scope.opt?.id }} -
+                                    {{ scope.opt?.name }}
+                                </QItemLabel>
+                            </QItemSection>
+                        </QItem>
+                    </template>
+                </VnSelect>
+                <VnSelect
+                    :label="t('Rectificative type')"
+                    :options="rectificativeTypeOptions"
+                    hide-selected
+                    option-label="description"
+                    option-value="id"
+                    v-model="transferInvoiceParams.cplusRectificationTypeFk"
+                    :required="true"
+                />
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnSelect
-                        :label="t('Class')"
-                        :options="siiTypeInvoiceOutsOptions"
-                        hide-selected
-                        option-label="description"
-                        option-value="id"
-                        v-model="transferInvoiceParams.siiTypeInvoiceOutFk"
-                        :required="true"
-                    >
-                        <template #option="scope">
-                            <QItem v-bind="scope.itemProps">
-                                <QItemSection>
-                                    <QItemLabel>
-                                        {{ scope.opt?.code }} -
-                                        {{ scope.opt?.description }}
-                                    </QItemLabel>
-                                </QItemSection>
-                            </QItem>
-                        </template>
-                    </VnSelect>
-                </div>
-                <div class="col">
-                    <VnSelect
-                        :label="t('Type')"
-                        :options="invoiceCorrectionTypesOptions"
-                        hide-selected
-                        option-label="description"
-                        option-value="id"
-                        v-model="transferInvoiceParams.invoiceCorrectionTypeFk"
-                        :required="true"
-                    />
-                </div>
+                <VnSelect
+                    :label="t('Class')"
+                    :options="siiTypeInvoiceOutsOptions"
+                    hide-selected
+                    option-label="description"
+                    option-value="id"
+                    v-model="transferInvoiceParams.siiTypeInvoiceOutFk"
+                    :required="true"
+                >
+                    <template #option="scope">
+                        <QItem v-bind="scope.itemProps">
+                            <QItemSection>
+                                <QItemLabel>
+                                    {{ scope.opt?.code }} -
+                                    {{ scope.opt?.description }}
+                                </QItemLabel>
+                            </QItemSection>
+                        </QItem>
+                    </template>
+                </VnSelect>
+                <VnSelect
+                    :label="t('Type')"
+                    :options="invoiceCorrectionTypesOptions"
+                    hide-selected
+                    option-label="description"
+                    option-value="id"
+                    v-model="transferInvoiceParams.invoiceCorrectionTypeFk"
+                    :required="true"
+                />
             </VnRow>
         </template>
     </FormPopup>
diff --git a/src/components/common/VnInput.vue b/src/components/common/VnInput.vue
index 3f7e46367b..684770e9c5 100644
--- a/src/components/common/VnInput.vue
+++ b/src/components/common/VnInput.vue
@@ -53,10 +53,12 @@ defineExpose({
     focus,
 });
 
-const inputRules = (val) => {
-    const { min } = vnInputRef.value.$attrs;
-    if (min >= 0) if (Math.floor(val) < min) return t('inputMin', { value: min });
-};
+const inputRules = [
+    (val) => {
+        const { min } = vnInputRef.value.$attrs;
+        if (min >= 0) if (Math.floor(val) < min) return t('inputMin', { value: min });
+    },
+];
 </script>
 
 <template>
@@ -73,8 +75,9 @@ const inputRules = (val) => {
             :class="{ required: $attrs.required }"
             @keyup.enter="onEnterPress()"
             :clearable="false"
-            :rules="[inputRules]"
+            :rules="inputRules"
             :lazy-rules="true"
+            hide-bottom-space
         >
             <template v-if="$slots.prepend" #prepend>
                 <slot name="prepend" />
diff --git a/src/components/ui/SkeletonForm.vue b/src/components/ui/SkeletonForm.vue
index d27934adf2..4ae4fb5bb5 100644
--- a/src/components/ui/SkeletonForm.vue
+++ b/src/components/ui/SkeletonForm.vue
@@ -1,28 +1,16 @@
 <template>
     <div class="q-pa-md">
         <div class="row q-gutter-md q-mb-md">
-            <div class="col">
-                <QSkeleton type="QInput" square />
-            </div>
-            <div class="col">
-                <QSkeleton type="QInput" square />
-            </div>
+            <QSkeleton type="QInput" square />
+            <QSkeleton type="QInput" square />
         </div>
         <div class="row q-gutter-md q-mb-md">
-            <div class="col">
-                <QSkeleton type="QInput" square />
-            </div>
-            <div class="col">
-                <QSkeleton type="QInput" square />
-            </div>
+            <QSkeleton type="QInput" square />
+            <QSkeleton type="QInput" square />
         </div>
         <div class="row q-gutter-md q-mb-md">
-            <div class="col">
-                <QSkeleton type="QInput" square />
-            </div>
-            <div class="col">
-                <QSkeleton type="QInput" square />
-            </div>
+            <QSkeleton type="QInput" square />
+            <QSkeleton type="QInput" square />
         </div>
         <div class="row q-gutter-md">
             <QSkeleton type="QBtn" />
diff --git a/src/components/ui/SkeletonSummary.vue b/src/components/ui/SkeletonSummary.vue
index 087dc32f9f..e8407ee7b3 100644
--- a/src/components/ui/SkeletonSummary.vue
+++ b/src/components/ui/SkeletonSummary.vue
@@ -3,46 +3,36 @@
         <QSkeleton type="rect" square />
     </div>
     <div class="row q-pa-md q-col-gutter-md q-mb-md">
-        <div class="col">
-            <QSkeleton type="rect" class="q-mb-md" square />
-            <QSkeleton type="text" square />
-            <QSkeleton type="text" square />
-            <QSkeleton type="text" square />
-            <QSkeleton type="text" square />
-            <QSkeleton type="text" square />
-        </div>
-        <div class="col">
-            <QSkeleton type="rect" class="q-mb-md" square />
-            <QSkeleton type="text" square />
-            <QSkeleton type="text" square />
-            <QSkeleton type="text" square />
-            <QSkeleton type="text" square />
-            <QSkeleton type="text" square />
-        </div>
-        <div class="col">
-            <QSkeleton type="rect" class="q-mb-md" square />
-            <QSkeleton type="text" square />
-            <QSkeleton type="text" square />
-            <QSkeleton type="text" square />
-            <QSkeleton type="text" square />
-            <QSkeleton type="text" square />
-        </div>
-        <div class="col">
-            <QSkeleton type="rect" class="q-mb-md" square />
-            <QSkeleton type="text" square />
-            <QSkeleton type="text" square />
-            <QSkeleton type="text" square />
-            <QSkeleton type="text" square />
-            <QSkeleton type="text" square />
-        </div>
-        <div class="col">
-            <QSkeleton type="rect" class="q-mb-md" square />
-            <QSkeleton type="text" square />
-            <QSkeleton type="text" square />
-            <QSkeleton type="text" square />
-            <QSkeleton type="text" square />
-            <QSkeleton type="text" square />
-        </div>
+        <QSkeleton type="rect" class="q-mb-md" square />
+        <QSkeleton type="text" square />
+        <QSkeleton type="text" square />
+        <QSkeleton type="text" square />
+        <QSkeleton type="text" square />
+        <QSkeleton type="text" square />
+        <QSkeleton type="rect" class="q-mb-md" square />
+        <QSkeleton type="text" square />
+        <QSkeleton type="text" square />
+        <QSkeleton type="text" square />
+        <QSkeleton type="text" square />
+        <QSkeleton type="text" square />
+        <QSkeleton type="rect" class="q-mb-md" square />
+        <QSkeleton type="text" square />
+        <QSkeleton type="text" square />
+        <QSkeleton type="text" square />
+        <QSkeleton type="text" square />
+        <QSkeleton type="text" square />
+        <QSkeleton type="rect" class="q-mb-md" square />
+        <QSkeleton type="text" square />
+        <QSkeleton type="text" square />
+        <QSkeleton type="text" square />
+        <QSkeleton type="text" square />
+        <QSkeleton type="text" square />
+        <QSkeleton type="rect" class="q-mb-md" square />
+        <QSkeleton type="text" square />
+        <QSkeleton type="text" square />
+        <QSkeleton type="text" square />
+        <QSkeleton type="text" square />
+        <QSkeleton type="text" square />
     </div>
 </template>
 
diff --git a/src/components/ui/SkeletonTable.vue b/src/components/ui/SkeletonTable.vue
index d58253f904..e35e2c9b01 100644
--- a/src/components/ui/SkeletonTable.vue
+++ b/src/components/ui/SkeletonTable.vue
@@ -1,45 +1,20 @@
 <template>
     <div class="q-pa-md w">
         <div class="row q-gutter-md q-mb-md">
-            <div class="col-1">
-                <QSkeleton type="rect" square />
-            </div>
-            <div class="col">
-                <QSkeleton type="rect" square />
-            </div>
-            <div class="col">
-                <QSkeleton type="rect" square />
-            </div>
-            <div class="col">
-                <QSkeleton type="rect" square />
-            </div>
-            <div class="col">
-                <QSkeleton type="rect" square />
-            </div>
-            <div class="col">
-                <QSkeleton type="rect" square />
-            </div>
-        </div>
-
-        <div class="row q-gutter-md q-mb-md" v-for="n in 5" :key="n">
-            <div class="col-1">
-                <QSkeleton type="QInput" square />
-            </div>
-            <div class="col">
-                <QSkeleton type="QInput" square />
-            </div>
-            <div class="col">
-                <QSkeleton type="QInput" square />
-            </div>
-            <div class="col">
-                <QSkeleton type="QInput" square />
-            </div>
-            <div class="col">
-                <QSkeleton type="QInput" square />
-            </div>
-            <div class="col">
-                <QSkeleton type="QInput" square />
-            </div>
+            <QSkeleton type="rect" square />
+            <QSkeleton type="rect" square />
+            <QSkeleton type="rect" square />
+            <QSkeleton type="rect" square />
+            <QSkeleton type="rect" square />
+            <QSkeleton type="rect" square />
+       </div>
+       <div class="row q-gutter-md q-mb-md" v-for="n in 5" :key="n">
+            <QSkeleton type="QInput" square />
+            <QSkeleton type="QInput" square />
+            <QSkeleton type="QInput" square />
+            <QSkeleton type="QInput" square />
+            <QSkeleton type="QInput" square />
+            <QSkeleton type="QInput" square />
         </div>
     </div>
 </template>
diff --git a/src/pages/Claim/Card/ClaimBasicData.vue b/src/pages/Claim/Card/ClaimBasicData.vue
index e2450a5e56..8f7a6fd6c8 100644
--- a/src/pages/Claim/Card/ClaimBasicData.vue
+++ b/src/pages/Claim/Card/ClaimBasicData.vue
@@ -95,83 +95,71 @@ const statesFilter = {
     >
         <template #form="{ data, validate, filter }">
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnInput
-                        v-model="data.client.name"
-                        :label="t('claim.basicData.customer')"
-                        disable
-                    />
-                </div>
-                <div class="col">
-                    <VnInputDate
-                        v-model="data.created"
-                        :label="t('claim.basicData.created')"
-                    />
-                </div>
+                <VnInput
+                    v-model="data.client.name"
+                    :label="t('claim.basicData.customer')"
+                    disable
+                />
+                <VnInputDate
+                    v-model="data.created"
+                    :label="t('claim.basicData.created')"
+                />
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnSelect
-                        :label="t('claim.basicData.assignedTo')"
-                        v-model="data.workerFk"
-                        :options="workersOptions"
-                        option-value="id"
-                        option-label="name"
-                        emit-value
-                        auto-load
-                        :rules="validate('claim.claimStateFk')"
-                    >
-                        <template #before>
-                            <QAvatar color="orange">
-                                <QImg
-                                    v-if="data.workerFk"
-                                    :src="`/api/Images/user/160x160/${data.workerFk}/download?access_token=${token}`"
-                                    spinner-color="white"
-                                />
-                            </QAvatar>
-                        </template>
-                    </VnSelect>
-                </div>
-                <div class="col">
-                    <QSelect
-                        v-model="data.claimStateFk"
-                        :options="claimStates"
-                        option-value="id"
-                        option-label="description"
-                        emit-value
-                        :label="t('claim.basicData.state')"
-                        map-options
-                        use-input
-                        @filter="(value, update) => filter(value, update, statesFilter)"
-                        :rules="validate('claim.claimStateFk')"
-                        :input-debounce="0"
-                    >
-                    </QSelect>
-                </div>
+                <VnSelect
+                    :label="t('claim.basicData.assignedTo')"
+                    v-model="data.workerFk"
+                    :options="workersOptions"
+                    option-value="id"
+                    option-label="name"
+                    emit-value
+                    auto-load
+                    :rules="validate('claim.claimStateFk')"
+                >
+                    <template #before>
+                        <QAvatar color="orange">
+                            <QImg
+                                v-if="data.workerFk"
+                                :src="`/api/Images/user/160x160/${data.workerFk}/download?access_token=${token}`"
+                                spinner-color="white"
+                            />
+                        </QAvatar>
+                    </template>
+                </VnSelect>
+                <QSelect
+                    v-model="data.claimStateFk"
+                    :options="claimStates"
+                    option-value="id"
+                    option-label="description"
+                    emit-value
+                    :label="t('claim.basicData.state')"
+                    map-options
+                    use-input
+                    @filter="(value, update) => filter(value, update, statesFilter)"
+                    :rules="validate('claim.claimStateFk')"
+                    :input-debounce="0"
+                >
+                </QSelect>
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <QInput
-                        v-model.number="data.packages"
-                        :label="t('globals.packages')"
-                        :rules="validate('claim.packages')"
-                        type="number"
-                    />
-                </div>
-                <div class="col">
-                    <QSelect
-                        v-model="data.pickup"
-                        :options="optionsList"
-                        option-value="id"
-                        option-label="description"
-                        emit-value
-                        :label="t('claim.basicData.pickup')"
-                        map-options
-                        use-input
-                        :input-debounce="0"
-                    >
-                    </QSelect>
-                </div>
+                <QInput
+                    v-model.number="data.packages"
+                    :label="t('globals.packages')"
+                    :rules="validate('claim.packages')"
+                    type="number"
+                />
+                <QSelect
+                    v-model="data.pickup"
+                    :options="optionsList"
+                    option-value="id"
+                    option-label="description"
+                    emit-value
+                    :label="t('claim.basicData.pickup')"
+                    map-options
+                    use-input
+                    :input-debounce="0"
+                >
+                </QSelect>
             </VnRow>
         </template>
     </FormModel>
diff --git a/src/pages/Customer/Card/CustomerBasicData.vue b/src/pages/Customer/Card/CustomerBasicData.vue
index d646b810ea..b0c2d60e39 100644
--- a/src/pages/Customer/Card/CustomerBasicData.vue
+++ b/src/pages/Customer/Card/CustomerBasicData.vue
@@ -70,138 +70,121 @@ const filterOptions = {
     <FormModel :url="`Clients/${route.params.id}`" auto-load model="customer">
         <template #form="{ data, validate, filter }">
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnInput
-                        :label="t('Comercial name')"
-                        :rules="validate('client.socialName')"
-                        autofocus
-                        clearable
-                        v-model="data.name"
-                    />
-                </div>
-                <div class="col">
-                    <QSelect
-                        :input-debounce="0"
-                        :label="t('customer.basicData.businessType')"
-                        :options="businessTypes"
-                        :rules="validate('client.businessTypeFk')"
-                        emit-value
-                        map-options
-                        option-label="description"
-                        option-value="code"
-                        v-model="data.businessTypeFk"
-                    />
-                </div>
+                <VnInput
+                    :label="t('Comercial name')"
+                    :rules="validate('client.socialName')"
+                    autofocus
+                    clearable
+                    v-model="data.name"
+                />
+
+                <QSelect
+                    :input-debounce="0"
+                    :label="t('customer.basicData.businessType')"
+                    :options="businessTypes"
+                    :rules="validate('client.businessTypeFk')"
+                    emit-value
+                    map-options
+                    option-label="description"
+                    option-value="code"
+                    v-model="data.businessTypeFk"
+                />
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnInput
-                        :label="t('customer.basicData.contact')"
-                        :rules="validate('client.contact')"
-                        clearable
-                        v-model="data.contact"
-                    />
-                </div>
-                <div class="col">
-                    <VnInput
-                        :label="t('customer.basicData.email')"
-                        :rules="validate('client.email')"
-                        clearable
-                        type="email"
-                        v-model="data.email"
-                    >
-                        <template #append>
-                            <QIcon name="info" class="cursor-info">
-                                <QTooltip>{{
-                                    t('customer.basicData.youCanSaveMultipleEmails')
-                                }}</QTooltip>
-                            </QIcon>
-                        </template>
-                    </VnInput>
-                </div>
+                <VnInput
+                    :label="t('customer.basicData.contact')"
+                    :rules="validate('client.contact')"
+                    clearable
+                    v-model="data.contact"
+                />
+                <VnInput
+                    :label="t('customer.basicData.email')"
+                    :rules="validate('client.email')"
+                    clearable
+                    type="email"
+                    v-model="data.email"
+                >
+                    <template #append>
+                        <QIcon name="info" class="cursor-info">
+                            <QTooltip>{{
+                                t('customer.basicData.youCanSaveMultipleEmails')
+                            }}</QTooltip>
+                        </QIcon>
+                    </template>
+                </VnInput>
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnInput
-                        :label="t('customer.basicData.phone')"
-                        :rules="validate('client.phone')"
-                        clearable
-                        v-model="data.phone"
-                    />
-                </div>
-                <div class="col">
-                    <VnInput
-                        :label="t('customer.basicData.mobile')"
-                        :rules="validate('client.mobile')"
-                        clearable
-                        v-model="data.mobile"
-                    />
-                </div>
+                <VnInput
+                    :label="t('customer.basicData.phone')"
+                    :rules="validate('client.phone')"
+                    clearable
+                    v-model="data.phone"
+                />
+                <VnInput
+                    :label="t('customer.basicData.mobile')"
+                    :rules="validate('client.mobile')"
+                    clearable
+                    v-model="data.mobile"
+                />
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <QSelect
-                        :input-debounce="0"
-                        :label="t('customer.basicData.salesPerson')"
-                        :options="workers"
-                        :rules="validate('client.salesPersonFk')"
-                        @filter="(value, update) => filter(value, update, filterOptions)"
-                        emit-value
-                        map-options
-                        option-label="name"
-                        option-value="id"
-                        use-input
-                        v-model="data.salesPersonFk"
-                    >
-                        <template #prepend>
-                            <QAvatar color="orange">
-                                <QImg
-                                    :src="`/api/Images/user/160x160/${data.salesPersonFk}/download?access_token=${token}`"
-                                    spinner-color="white"
-                                    v-if="data.salesPersonFk"
-                                />
-                            </QAvatar>
-                        </template>
-                    </QSelect>
-                </div>
-                <div class="col">
-                    <QSelect
-                        :input-debounce="0"
-                        :label="t('customer.basicData.contactChannel')"
-                        :options="contactChannels"
-                        :rules="validate('client.contactChannelFk')"
-                        emit-value
-                        map-options
-                        option-label="name"
-                        option-value="id"
-                        v-model="data.contactChannelFk"
-                    />
-                </div>
+                <QSelect
+                    :input-debounce="0"
+                    :label="t('customer.basicData.salesPerson')"
+                    :options="workers"
+                    :rules="validate('client.salesPersonFk')"
+                    @filter="(value, update) => filter(value, update, filterOptions)"
+                    emit-value
+                    map-options
+                    option-label="name"
+                    option-value="id"
+                    use-input
+                    v-model="data.salesPersonFk"
+                >
+                    <template #prepend>
+                        <QAvatar color="orange">
+                            <QImg
+                                :src="`/api/Images/user/160x160/${data.salesPersonFk}/download?access_token=${token}`"
+                                spinner-color="white"
+                                v-if="data.salesPersonFk"
+                            />
+                        </QAvatar>
+                    </template>
+                </QSelect>
+                <QSelect
+                    v-model="data.contactChannelFk"
+                    :options="contactChannels"
+                    option-value="id"
+                    option-label="name"
+                    emit-value
+                    :label="t('customer.basicData.contactChannel')"
+                    map-options
+                    :rules="validate('client.contactChannelFk')"
+                    :input-debounce="0"
+                />
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <QSelect
-                        :input-debounce="0"
-                        :label="t('customer.basicData.previousClient')"
-                        :options="clients"
-                        :rules="validate('client.transferorFk')"
-                        emit-value
-                        map-options
-                        option-label="name"
-                        option-value="id"
-                        v-model="data.transferorFk"
-                    >
-                        <template #append>
-                            <QIcon name="info" class="cursor-pointer">
-                                <QTooltip>{{
-                                    t(
-                                        'In case of a company succession, specify the grantor company'
-                                    )
-                                }}</QTooltip>
-                            </QIcon>
-                        </template>
-                    </QSelect>
-                </div>
+                <QSelect
+                    :input-debounce="0"
+                    :label="t('customer.basicData.previousClient')"
+                    :options="clients"
+                    :rules="validate('client.transferorFk')"
+                    emit-value
+                    map-options
+                    option-label="name"
+                    option-value="id"
+                    v-model="data.transferorFk"
+                >
+                    <template #append>
+                        <QIcon name="info" class="cursor-pointer">
+                            <QTooltip>{{
+                                t(
+                                    'In case of a company succession, specify the grantor company'
+                                )
+                            }}</QTooltip>
+                        </QIcon>
+                    </template>
+                </QSelect>
             </VnRow>
         </template>
     </FormModel>
diff --git a/src/pages/Customer/Card/CustomerBillingData.vue b/src/pages/Customer/Card/CustomerBillingData.vue
index 5cc0c898c6..63bbd872c5 100644
--- a/src/pages/Customer/Card/CustomerBillingData.vue
+++ b/src/pages/Customer/Card/CustomerBillingData.vue
@@ -48,74 +48,56 @@ const getBankEntities = (data, formData) => {
     >
         <template #form="{ data, validate }">
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnSelect
-                        :label="t('Billing data')"
-                        :options="payMethods"
-                        hide-selected
-                        option-label="name"
-                        option-value="id"
-                        v-model="data.payMethod"
-                    />
-                </div>
-                <div class="col">
-                    <VnInput :label="t('Due day')" clearable v-model="data.dueDay" />
-                </div>
+                <VnSelect
+                    :label="t('Billing data')"
+                    :options="payMethods"
+                    hide-selected
+                    option-label="name"
+                    option-value="id"
+                    v-model="data.payMethod"
+                />
+                <VnInput :label="t('Due day')" clearable v-model="data.dueDay" />
             </VnRow>
 
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnInput :label="t('IBAN')" clearable v-model="data.iban">
-                        <template #append>
-                            <QIcon name="info" class="cursor-info">
-                                <QTooltip>{{ t('components.iban_tooltip') }}</QTooltip>
-                            </QIcon>
-                        </template>
-                    </VnInput>
-                </div>
-                <div class="col">
-                    <VnSelectDialog
-                        :label="t('Swift / BIC')"
-                        :options="bankEntitiesOptions"
-                        :roles-allowed-to-create="['salesAssistant', 'hr']"
-                        :rules="validate('Worker.bankEntity')"
-                        hide-selected
-                        option-label="name"
-                        option-value="id"
-                        v-model="data.bankEntityFk"
-                    >
-                        <template #form>
-                            <CreateBankEntityForm
-                                @on-data-saved="getBankEntities($event, data)"
-                            />
-                        </template>
-                        <template #option="scope">
-                            <QItem v-bind="scope.itemProps">
-                                <QItemSection v-if="scope.opt">
-                                    <QItemLabel
-                                        >{{ scope.opt.bic }}
-                                        {{ scope.opt.name }}</QItemLabel
-                                    >
-                                </QItemSection>
-                            </QItem>
-                        </template>
-                    </VnSelectDialog>
-                </div>
+                <VnInput :label="t('IBAN')" clearable v-model="data.iban">
+                    <template #append>
+                        <QIcon name="info" class="cursor-info">
+                            <QTooltip>{{ t('components.iban_tooltip') }}</QTooltip>
+                        </QIcon>
+                    </template>
+                </VnInput>
+                <VnSelectDialog
+                    :label="t('Swift / BIC')"
+                    :options="bankEntitiesOptions"
+                    :roles-allowed-to-create="['salesAssistant', 'hr']"
+                    :rules="validate('Worker.bankEntity')"
+                    hide-selected
+                    option-label="name"
+                    option-value="id"
+                    v-model="data.bankEntityFk"
+                >
+                    <template #form>
+                        <CreateBankEntityForm
+                            @on-data-saved="getBankEntities($event, data)"
+                        />
+                    </template>
+                    <template #option="scope">
+                        <QItem v-bind="scope.itemProps">
+                            <QItemSection v-if="scope.opt">
+                                <QItemLabel
+                                    >{{ scope.opt.bic }} {{ scope.opt.name }}</QItemLabel
+                                >
+                            </QItemSection>
+                        </QItem>
+                    </template>
+                </VnSelectDialog>
             </VnRow>
 
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <QCheckbox :label="t('Received LCR')" v-model="data.hasLcr" />
-                </div>
-                <div class="col">
-                    <QCheckbox
-                        :label="t('VNL core received')"
-                        v-model="data.hasCoreVnl"
-                    />
-                </div>
-                <div class="col">
-                    <QCheckbox :label="t('VNL B2B received')" v-model="data.hasSepaVnl" />
-                </div>
+                <QCheckbox :label="t('Received LCR')" v-model="data.hasLcr" />
+                <QCheckbox :label="t('VNL core received')" v-model="data.hasCoreVnl" />
+                <QCheckbox :label="t('VNL B2B received')" v-model="data.hasSepaVnl" />
             </VnRow>
         </template>
     </FormModel>
diff --git a/src/pages/Customer/Card/CustomerFiscalData.vue b/src/pages/Customer/Card/CustomerFiscalData.vue
index 467ea18450..50fbec25da 100644
--- a/src/pages/Customer/Card/CustomerFiscalData.vue
+++ b/src/pages/Customer/Card/CustomerFiscalData.vue
@@ -41,150 +41,109 @@ function handleLocation(data, location) {
     >
         <template #form="{ data, validate }">
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnInput
-                        :label="t('Social name')"
-                        :required="true"
-                        :rules="validate('client.socialName')"
-                        clearable
-                        v-model="data.socialName"
-                    >
-                        <template #append>
-                            <QIcon name="info" class="cursor-info">
-                                <QTooltip>{{ t('onlyLetters') }}</QTooltip>
-                            </QIcon>
-                        </template>
-                    </VnInput>
-                </div>
-                <div class="col">
-                    <VnInput :label="t('Tax number')" clearable v-model="data.fi" />
-                </div>
+                <VnInput
+                    :label="t('Social name')"
+                    :required="true"
+                    :rules="validate('client.socialName')"
+                    clearable
+                    v-model="data.socialName"
+                >
+                    <template #append>
+                        <QIcon name="info" class="cursor-info">
+                            <QTooltip>{{ t('onlyLetters') }}</QTooltip>
+                        </QIcon>
+                    </template>
+                </VnInput>
+                <VnInput :label="t('Tax number')" clearable v-model="data.fi" />
             </VnRow>
 
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnInput :label="t('Street')" clearable v-model="data.street" />
-                </div>
+                <VnInput :label="t('Street')" clearable v-model="data.street" />
             </VnRow>
 
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnSelect
-                        :label="t('Sage tax type')"
-                        :options="typesTaxes"
-                        hide-selected
-                        option-label="vat"
-                        option-value="id"
-                        v-model="data.sageTaxTypeFk"
-                    />
-                </div>
-                <div class="col">
-                    <VnSelect
-                        :label="t('Sage transaction type')"
-                        :options="typesTransactions"
-                        hide-selected
-                        option-label="transaction"
-                        option-value="id"
-                        v-model="data.sageTransactionTypeFk"
-                    >
-                        <template #option="scope">
-                            <QItem v-bind="scope.itemProps">
-                                <QItemSection>
-                                    <QItemLabel>{{ scope.opt.name }}</QItemLabel>
-                                    <QItemLabel caption>
-                                        {{ `${scope.opt.id}: ${scope.opt.transaction}` }}
-                                    </QItemLabel>
-                                </QItemSection>
-                            </QItem>
-                        </template>
-                    </VnSelect>
-                </div>
+                <VnSelect
+                    :label="t('Sage tax type')"
+                    :options="typesTaxes"
+                    hide-selected
+                    option-label="vat"
+                    option-value="id"
+                    v-model="data.sageTaxTypeFk"
+                />
+                <VnSelect
+                    :label="t('Sage transaction type')"
+                    :options="typesTransactions"
+                    hide-selected
+                    option-label="transaction"
+                    option-value="id"
+                    v-model="data.sageTransactionTypeFk"
+                >
+                    <template #option="scope">
+                        <QItem v-bind="scope.itemProps">
+                            <QItemSection>
+                                <QItemLabel>{{ scope.opt.name }}</QItemLabel>
+                                <QItemLabel caption>
+                                    {{ `${scope.opt.id}: ${scope.opt.transaction}` }}
+                                </QItemLabel>
+                            </QItemSection>
+                        </QItem>
+                    </template>
+                </VnSelect>
             </VnRow>
 
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnLocation
-                        :rules="validate('Worker.postcode')"
-                        :roles-allowed-to-create="['deliveryAssistant']"
-                        :options="postcodesOptions"
-                        v-model="data.postcode"
-                        @update:model-value="(location) => handleLocation(data, location)"
-                    >
-                    </VnLocation>
-                </div>
+                <VnLocation
+                    :rules="validate('Worker.postcode')"
+                    :roles-allowed-to-create="['deliveryAssistant']"
+                    :options="postcodesOptions"
+                    v-model="data.postcode"
+                    @update:model-value="(location) => handleLocation(data, location)"
+                >
+                </VnLocation>
             </VnRow>
 
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <QCheckbox :label="t('Active')" v-model="data.isActive" />
-                </div>
-                <div class="col">
-                    <QCheckbox :label="t('Frozen')" v-model="data.isFreezed" />
-                </div>
+                <QCheckbox :label="t('Active')" v-model="data.isActive" />
+                <QCheckbox :label="t('Frozen')" v-model="data.isFreezed" />
             </VnRow>
 
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <QCheckbox :label="t('Has to invoice')" v-model="data.hasToInvoice" />
-                </div>
-                <div class="col">
-                    <QCheckbox :label="t('Vies')" v-model="data.isVies" />
-                    <QIcon name="info" class="cursor-info q-ml-sm" size="sm">
-                        <QTooltip>
-                            {{ t('whenActivatingIt') }}
-                        </QTooltip>
-                    </QIcon>
-                </div>
+                <QCheckbox :label="t('Has to invoice')" v-model="data.hasToInvoice" />
+                <QCheckbox :label="t('Vies')" v-model="data.isVies" />
+                <QIcon name="info" class="cursor-info q-ml-sm" size="sm">
+                    <QTooltip>
+                        {{ t('whenActivatingIt') }}
+                    </QTooltip>
+                </QIcon>
             </VnRow>
 
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <QCheckbox
-                        :label="t('Notify by email')"
-                        v-model="data.isToBeMailed"
-                    />
-                </div>
-                <div class="col">
-                    <QCheckbox
-                        :label="t('Invoice by address')"
-                        v-model="data.hasToInvoiceByAddress"
-                    />
-                </div>
+                <QCheckbox :label="t('Notify by email')" v-model="data.isToBeMailed" />
+                <QCheckbox
+                    :label="t('Invoice by address')"
+                    v-model="data.hasToInvoiceByAddress"
+                />
             </VnRow>
 
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <QCheckbox
-                        :label="t('Is equalizated')"
-                        v-model="data.isEqualizated"
-                    />
-                    <QIcon class="cursor-info q-ml-sm" name="info" size="sm">
-                        <QTooltip>
-                            {{ t('inOrderToInvoice') }}
-                        </QTooltip>
-                    </QIcon>
-                </div>
-                <div class="col">
-                    <QCheckbox
-                        :label="t('Verified data')"
-                        v-model="data.isTaxDataChecked"
-                    />
-                </div>
+                <QCheckbox :label="t('Is equalizated')" v-model="data.isEqualizated" />
+                <QIcon class="cursor-info q-ml-sm" name="info" size="sm">
+                    <QTooltip>
+                        {{ t('inOrderToInvoice') }}
+                    </QTooltip>
+                </QIcon>
+                <QCheckbox :label="t('Verified data')" v-model="data.isTaxDataChecked" />
             </VnRow>
 
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <QCheckbox
-                        :label="t('Incoterms authorization')"
-                        v-model="data.hasIncoterms"
-                    />
-                </div>
-                <div class="col">
-                    <QCheckbox
-                        :label="t('Electronic invoice')"
-                        v-model="data.hasElectronicInvoice"
-                    />
-                </div>
+                <QCheckbox
+                    :label="t('Incoterms authorization')"
+                    v-model="data.hasIncoterms"
+                />
+                <QCheckbox
+                    :label="t('Electronic invoice')"
+                    v-model="data.hasElectronicInvoice"
+                />
             </VnRow>
         </template>
     </FormModel>
diff --git a/src/pages/Customer/CustomerCreate.vue b/src/pages/Customer/CustomerCreate.vue
index c6486780d8..80bfd1efe9 100644
--- a/src/pages/Customer/CustomerCreate.vue
+++ b/src/pages/Customer/CustomerCreate.vue
@@ -49,89 +49,69 @@ function handleLocation(data, location) {
         >
             <template #form="{ data, validate }">
                 <VnRow class="row q-gutter-md q-mb-md">
-                    <div class="col">
-                        <QInput :label="t('Comercial name')" v-model="data.name" />
-                    </div>
-                    <div class="col">
-                        <VnSelect
-                            :label="t('Salesperson')"
-                            :options="workersOptions"
-                            hide-selected
-                            option-label="name"
-                            option-value="id"
-                            v-model="data.salesPersonFk"
-                        />
-                    </div>
+                    <QInput :label="t('Comercial name')" v-model="data.name" />
+                    <VnSelect
+                        :label="t('Salesperson')"
+                        :options="workersOptions"
+                        hide-selected
+                        option-label="name"
+                        option-value="id"
+                        v-model="data.salesPersonFk"
+                    />
                 </VnRow>
                 <VnRow class="row q-gutter-md q-mb-md">
-                    <div class="col">
-                        <VnSelect
-                            :label="t('Business type')"
-                            :options="businessTypesOptions"
-                            hide-selected
-                            option-label="description"
-                            option-value="code"
-                            v-model="data.businessTypeFk"
-                        />
-                    </div>
-                    <div class="col">
-                        <QInput v-model="data.fi" :label="t('Tax number')" />
-                    </div>
+                    <VnSelect
+                        :label="t('Business type')"
+                        :options="businessTypesOptions"
+                        hide-selected
+                        option-label="description"
+                        option-value="code"
+                        v-model="data.businessTypeFk"
+                    />
+                    <QInput v-model="data.fi" :label="t('Tax number')" />
                 </VnRow>
                 <VnRow class="row q-gutter-md q-mb-md">
-                    <div class="col">
-                        <QInput
-                            :label="t('Business name')"
-                            :rules="validate('client.socialName')"
-                            v-model="data.socialName"
-                        />
-                    </div>
+                    <QInput
+                        :label="t('Business name')"
+                        :rules="validate('client.socialName')"
+                        v-model="data.socialName"
+                    />
                 </VnRow>
                 <VnRow class="row q-gutter-md q-mb-md">
-                    <div class="col">
-                        <QInput
-                            :label="t('Street')"
-                            :rules="validate('client.street')"
-                            v-model="data.street"
-                        />
-                    </div>
+                    <QInput
+                        :label="t('Street')"
+                        :rules="validate('client.street')"
+                        v-model="data.street"
+                    />
                 </VnRow>
                 <VnRow class="row q-gutter-md q-mb-md">
-                    <div class="col">
-                        <VnLocation
-                            :rules="validate('Worker.postcode')"
-                            :roles-allowed-to-create="['deliveryAssistant']"
-                            :options="postcodesOptions"
-                            v-model="data.location"
-                            @update:model-value="
-                                (location) => handleLocation(data, location)
-                            "
-                        >
-                        </VnLocation>
-                    </div>
+                    <VnLocation
+                        :rules="validate('Worker.postcode')"
+                        :roles-allowed-to-create="['deliveryAssistant']"
+                        :options="postcodesOptions"
+                        v-model="data.location"
+                        @update:model-value="(location) => handleLocation(data, location)"
+                    >
+                    </VnLocation>
                 </VnRow>
 
                 <VnRow class="row q-gutter-md q-mb-md">
-                    <div class="col">
-                        <QInput v-model="data.userName" :label="t('Web user')" />
-                    </div>
-                    <div class="col">
-                        <QInput
-                            :label="t('Email')"
-                            :rules="validate('client.email')"
-                            clearable
-                            type="email"
-                            v-model="data.email"
-                        >
-                            <template #append>
-                                <QIcon name="info" class="cursor-info">
-                                    <QTooltip max-width="400px">{{
-                                        t('customer.basicData.youCanSaveMultipleEmails')
-                                    }}</QTooltip>
-                                </QIcon>
-                            </template>
-                        </QInput>
-                    </div>
+                    <QInput v-model="data.userName" :label="t('Web user')" />
+                    <QInput
+                        :label="t('Email')"
+                        :rules="validate('client.email')"
+                        clearable
+                        type="email"
+                        v-model="data.email"
+                    >
+                        <template #append>
+                            <QIcon name="info" class="cursor-info">
+                                <QTooltip max-width="400px">{{
+                                    t('customer.basicData.youCanSaveMultipleEmails')
+                                }}</QTooltip>
+                            </QIcon>
+                        </template>
+                    </QInput>
                 </VnRow>
                 <QCheckbox
                     :label="t('Is equalizated')"
diff --git a/src/pages/Customer/CustomerMain.vue b/src/pages/Customer/CustomerMain.vue
index d7b900e1f1..f0dc2e5009 100644
--- a/src/pages/Customer/CustomerMain.vue
+++ b/src/pages/Customer/CustomerMain.vue
@@ -15,10 +15,3 @@ const stateStore = useStateStore();
         <RouterView></RouterView>
     </QPageContainer>
 </template>
-
-<style lang="scss">
-#searchbar,
-.search-panel {
-    width: 400px;
-}
-</style>
diff --git a/src/pages/Customer/Defaulter/CustomerDefaulterAddObservation.vue b/src/pages/Customer/Defaulter/CustomerDefaulterAddObservation.vue
index 2d5125f391..ef1e17e83d 100644
--- a/src/pages/Customer/Defaulter/CustomerDefaulterAddObservation.vue
+++ b/src/pages/Customer/Defaulter/CustomerDefaulterAddObservation.vue
@@ -61,13 +61,11 @@ const onSubmit = async () => {
                         }}
                     </div>
                     <VnRow class="row q-gutter-md q-mb-md">
-                        <div class="col">
-                            <QInput
-                                :label="t('Message')"
-                                type="textarea"
-                                v-model="newObservation"
-                            />
-                        </div>
+                        <QInput
+                            :label="t('Message')"
+                            type="textarea"
+                            v-model="newObservation"
+                        />
                     </VnRow>
                     <div class="q-mt-lg row justify-end">
                         <QBtn
diff --git a/src/pages/Customer/components/CustomerGreugeCreate.vue b/src/pages/Customer/components/CustomerGreugeCreate.vue
index aefc4b891f..fc315d8081 100644
--- a/src/pages/Customer/components/CustomerGreugeCreate.vue
+++ b/src/pages/Customer/components/CustomerGreugeCreate.vue
@@ -56,33 +56,25 @@ const toCustomerGreuges = () => {
 
         <template #form="{ data }">
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnInput
-                        :label="t('Amount')"
-                        clearable
-                        type="number"
-                        v-model="data.amount"
-                    />
-                </div>
-                <div class="col">
-                    <VnInputDate :label="t('Date')" v-model="data.shipped" />
-                </div>
+                <VnInput
+                    :label="t('Amount')"
+                    clearable
+                    type="number"
+                    v-model="data.amount"
+                />
+                <VnInputDate :label="t('Date')" v-model="data.shipped" />
             </VnRow>
 
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnInput :label="t('Comment')" clearable v-model="data.description" />
-                </div>
-                <div class="col">
-                    <VnSelect
-                        :label="t('Type')"
-                        :options="greugeTypes"
-                        hide-selected
-                        option-label="name"
-                        option-value="id"
-                        v-model="data.greugeTypeFk"
-                    />
-                </div>
+                <VnInput :label="t('Comment')" clearable v-model="data.description" />
+                <VnSelect
+                    :label="t('Type')"
+                    :options="greugeTypes"
+                    hide-selected
+                    option-label="name"
+                    option-value="id"
+                    v-model="data.greugeTypeFk"
+                />
             </VnRow>
         </template>
     </FormModel>
diff --git a/src/pages/Customer/components/CustomerNewCustomsAgent.vue b/src/pages/Customer/components/CustomerNewCustomsAgent.vue
index 062fd0254a..b6aa7a1732 100644
--- a/src/pages/Customer/components/CustomerNewCustomsAgent.vue
+++ b/src/pages/Customer/components/CustomerNewCustomsAgent.vue
@@ -24,30 +24,22 @@ const onDataSaved = (dataSaved) => {
     >
         <template #form-inputs="{ data }">
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnInput
-                        :label="t('NIF')"
-                        :required="true"
-                        clearable
-                        v-model="data.nif"
-                    />
-                </div>
-                <div class="col">
-                    <VnInput
-                        :label="t('Fiscal name')"
-                        :required="true"
-                        clearable
-                        v-model="data.fiscalName"
-                    />
-                </div>
+                <VnInput
+                    :label="t('NIF')"
+                    :required="true"
+                    clearable
+                    v-model="data.nif"
+                />
+                <VnInput
+                    :label="t('Fiscal name')"
+                    :required="true"
+                    clearable
+                    v-model="data.fiscalName"
+                />
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnInput :label="t('Street')" clearable v-model="data.street" />
-                </div>
-                <div class="col">
-                    <VnInput :label="t('Phone')" clearable v-model="data.phone" />
-                </div>
+                <VnInput :label="t('Street')" clearable v-model="data.street" />
+                <VnInput :label="t('Phone')" clearable v-model="data.phone" />
             </VnRow>
         </template>
     </FormModelPopup>
diff --git a/src/pages/Customer/components/CustomerNewPayment.vue b/src/pages/Customer/components/CustomerNewPayment.vue
index 07cb692b42..cc92d79075 100644
--- a/src/pages/Customer/components/CustomerNewPayment.vue
+++ b/src/pages/Customer/components/CustomerNewPayment.vue
@@ -135,60 +135,52 @@ const onDataSaved = async () => {
                 <h5 class="q-mt-none">{{ t('New payment') }}</h5>
 
                 <VnRow class="row q-gutter-md q-mb-md">
-                    <div class="col">
-                        <VnInputDate
-                            :label="t('Date')"
-                            :required="true"
-                            v-model="data.payed"
-                        />
-                    </div>
-                    <div class="col">
-                        <VnSelect
-                            :label="t('Company')"
-                            :options="companyOptions"
-                            :required="true"
-                            :rules="validate('entry.companyFk')"
-                            hide-selected
-                            option-label="code"
-                            option-value="id"
-                            v-model="data.companyFk"
-                        />
-                    </div>
+                    <VnInputDate
+                        :label="t('Date')"
+                        :required="true"
+                        v-model="data.payed"
+                    />
+                    <VnSelect
+                        :label="t('Company')"
+                        :options="companyOptions"
+                        :required="true"
+                        :rules="validate('entry.companyFk')"
+                        hide-selected
+                        option-label="code"
+                        option-value="id"
+                        v-model="data.companyFk"
+                    />
                 </VnRow>
 
                 <VnRow class="row q-gutter-md q-mb-md">
-                    <div class="col">
-                        <VnSelect
-                            :label="t('Bank')"
-                            :options="bankOptions"
-                            :required="true"
-                            @update:model-value="setPaymentType($event)"
-                            hide-selected
-                            option-label="bank"
-                            option-value="id"
-                            v-model="data.bankFk"
-                        >
-                            <template #option="scope">
-                                <QItem v-bind="scope.itemProps">
-                                    <QItemSection>
-                                        <QItemLabel>
-                                            {{ scope.opt.id }}:&ensp;{{ scope.opt.bank }}
-                                        </QItemLabel>
-                                    </QItemSection>
-                                </QItem>
-                            </template>
-                        </VnSelect>
-                    </div>
-                    <div class="col">
-                        <VnInput
-                            :label="t('Amount')"
-                            :required="true"
-                            @update:model-value="calculateFromAmount($event)"
-                            clearable
-                            type="number"
-                            v-model.number="data.amountPaid"
-                        />
-                    </div>
+                    <VnSelect
+                        :label="t('Bank')"
+                        :options="bankOptions"
+                        :required="true"
+                        @update:model-value="setPaymentType($event)"
+                        hide-selected
+                        option-label="bank"
+                        option-value="id"
+                        v-model="data.bankFk"
+                    >
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection>
+                                    <QItemLabel>
+                                        {{ scope.opt.id }}:&ensp;{{ scope.opt.bank }}
+                                    </QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelect>
+                    <VnInput
+                        :label="t('Amount')"
+                        :required="true"
+                        @update:model-value="calculateFromAmount($event)"
+                        clearable
+                        type="number"
+                        v-model.number="data.amountPaid"
+                    />
                 </VnRow>
 
                 <div class="text-h6" v-if="data.bankFk === 3 || data.bankFk === 3117">
@@ -203,47 +195,37 @@ const onDataSaved = async () => {
                             v-model="data.compensationAccount"
                         />
                     </div>
-                    <div class="col">
-                        <VnInput
-                            :label="t('Reference')"
-                            :required="true"
-                            clearable
-                            v-model="data.description"
-                        />
-                    </div>
+                    <VnInput
+                        :label="t('Reference')"
+                        :required="true"
+                        clearable
+                        v-model="data.description"
+                    />
                 </VnRow>
 
                 <div class="q-mt-lg" v-if="data.bankFk === 2">
                     <div class="text-h6">{{ t('Cash') }}</div>
 
                     <VnRow class="row q-gutter-md q-mb-md">
-                        <div class="col">
-                            <VnInput
-                                :label="t('Delivered amount')"
-                                @update:model-value="calculateFromDeliveredAmount($event)"
-                                clearable
-                                type="number"
-                                v-model="deliveredAmount"
-                            />
-                        </div>
-                        <div class="col">
-                            <VnInput
-                                :label="t('Amount to return')"
-                                clearable
-                                disable
-                                type="number"
-                                v-model="amountToReturn"
-                            />
-                        </div>
+                        <VnInput
+                            :label="t('Delivered amount')"
+                            @update:model-value="calculateFromDeliveredAmount($event)"
+                            clearable
+                            type="number"
+                            v-model="deliveredAmount"
+                        />
+                        <VnInput
+                            :label="t('Amount to return')"
+                            clearable
+                            disable
+                            type="number"
+                            v-model="amountToReturn"
+                        />
                     </VnRow>
 
                     <VnRow class="row q-gutter-md q-mb-md">
-                        <div class="col">
-                            <QCheckbox v-model="viewRecipt" />
-                        </div>
-                        <div class="col">
-                            <QCheckbox v-model="sendEmail" />
-                        </div>
+                        <QCheckbox v-model="viewRecipt" />
+                        <QCheckbox v-model="sendEmail" />
                     </VnRow>
                 </div>
 
diff --git a/src/pages/Customer/components/CustomerNoteCreate.vue b/src/pages/Customer/components/CustomerNoteCreate.vue
index c6ea2d4eb0..ef99821954 100644
--- a/src/pages/Customer/components/CustomerNoteCreate.vue
+++ b/src/pages/Customer/components/CustomerNoteCreate.vue
@@ -45,9 +45,7 @@ const toCustomerNotes = () => {
 
         <template #form="{ data }">
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <QInput :label="t('Note')" type="textarea" v-model="data.text" />
-                </div>
+                <QInput :label="t('Note')" type="textarea" v-model="data.text" />
             </VnRow>
         </template>
     </FormModel>
diff --git a/src/pages/Customer/components/CustomerRecoverieCreate.vue b/src/pages/Customer/components/CustomerRecoverieCreate.vue
index b4ef5a9a3e..e70f853086 100644
--- a/src/pages/Customer/components/CustomerRecoverieCreate.vue
+++ b/src/pages/Customer/components/CustomerRecoverieCreate.vue
@@ -50,31 +50,23 @@ const toCustomerRecoveries = () => {
 
         <template #form="{ data }">
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnInputDate :label="t('Since')" v-model="data.started" />
-                </div>
-                <div class="col">
-                    <VnInputDate :label="t('To')" v-model="data.finished" />
-                </div>
+                <VnInputDate :label="t('Since')" v-model="data.started" />
+                <VnInputDate :label="t('To')" v-model="data.finished" />
             </VnRow>
 
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnInput
-                        :label="t('Amount')"
-                        clearable
-                        type="number"
-                        v-model="data.amount"
-                    />
-                </div>
-                <div class="col">
-                    <VnInput
-                        :label="t('Period')"
-                        clearable
-                        type="number"
-                        v-model="data.period"
-                    />
-                </div>
+                <VnInput
+                    :label="t('Amount')"
+                    clearable
+                    type="number"
+                    v-model="data.amount"
+                />
+                <VnInput
+                    :label="t('Period')"
+                    clearable
+                    type="number"
+                    v-model="data.period"
+                />
             </VnRow>
         </template>
     </FormModel>
diff --git a/src/pages/Department/Card/DepartmentBasicData.vue b/src/pages/Department/Card/DepartmentBasicData.vue
index 4210a62bc7..165a959d01 100644
--- a/src/pages/Department/Card/DepartmentBasicData.vue
+++ b/src/pages/Department/Card/DepartmentBasicData.vue
@@ -30,105 +30,83 @@ const clientsOptions = ref([]);
     >
         <template #form="{ data, validate }">
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnInput
-                        :label="t('department.name')"
-                        v-model="data.name"
-                        :rules="validate('department.name')"
-                        clearable
-                        autofocus
-                    />
-                </div>
-                <div class="col">
-                    <VnInput
-                        v-model="data.code"
-                        :label="t('department.code')"
-                        :rules="validate('department.code')"
-                        clearable
-                    />
-                </div>
+                <VnInput
+                    :label="t('department.name')"
+                    v-model="data.name"
+                    :rules="validate('department.name')"
+                    clearable
+                    autofocus
+                />
+                <VnInput
+                    v-model="data.code"
+                    :label="t('department.code')"
+                    :rules="validate('department.code')"
+                    clearable
+                />
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnInput
-                        :label="t('department.chat')"
-                        v-model="data.chatName"
-                        :rules="validate('department.chat')"
-                        clearable
-                    />
-                </div>
-                <div class="col">
-                    <VnInput
-                        v-model="data.notificationEmail"
-                        :label="t('department.email')"
-                        :rules="validate('department.email')"
-                        clearable
-                    />
-                </div>
+                <VnInput
+                    :label="t('department.chat')"
+                    v-model="data.chatName"
+                    :rules="validate('department.chat')"
+                    clearable
+                />
+                <VnInput
+                    v-model="data.notificationEmail"
+                    :label="t('department.email')"
+                    :rules="validate('department.email')"
+                    clearable
+                />
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnSelect
-                        :label="t('department.bossDepartment')"
-                        v-model="data.workerFk"
-                        :options="workersOptions"
-                        option-value="id"
-                        option-label="name"
-                        hide-selected
-                        map-options
-                        :rules="validate('department.workerFk')"
-                    />
-                </div>
-                <div class="col">
-                    <VnSelect
-                        :label="t('department.selfConsumptionCustomer')"
-                        v-model="data.clientFk"
-                        :options="clientsOptions"
-                        option-value="id"
-                        option-label="name"
-                        hide-selected
-                        map-options
-                        :rules="validate('department.clientFk')"
-                    />
-                </div>
+                <VnSelect
+                    :label="t('department.bossDepartment')"
+                    v-model="data.workerFk"
+                    :options="workersOptions"
+                    option-value="id"
+                    option-label="name"
+                    hide-selected
+                    map-options
+                    :rules="validate('department.workerFk')"
+                />
+                <VnSelect
+                    :label="t('department.selfConsumptionCustomer')"
+                    v-model="data.clientFk"
+                    :options="clientsOptions"
+                    option-value="id"
+                    option-label="name"
+                    hide-selected
+                    map-options
+                    :rules="validate('department.clientFk')"
+                />
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <QCheckbox
-                        :label="t('department.telework')"
-                        v-model="data.isTeleworking"
-                    />
-                </div>
-                <div class="col">
-                    <QCheckbox
-                        :label="t('department.notifyOnErrors')"
-                        v-model="data.hasToMistake"
-                        :false-value="0"
-                        :true-value="1"
-                    />
-                </div>
+                <QCheckbox
+                    :label="t('department.telework')"
+                    v-model="data.isTeleworking"
+                />
+                <QCheckbox
+                    :label="t('department.notifyOnErrors')"
+                    v-model="data.hasToMistake"
+                    :false-value="0"
+                    :true-value="1"
+                />
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <QCheckbox
-                        :label="t('department.worksInProduction')"
-                        v-model="data.isProduction"
-                    />
-                </div>
-                <div class="col">
-                    <QCheckbox
-                        :label="t('department.hasToRefill')"
-                        v-model="data.hasToRefill"
-                    />
-                </div>
+                <QCheckbox
+                    :label="t('department.worksInProduction')"
+                    v-model="data.isProduction"
+                />
+                <QCheckbox
+                    :label="t('department.hasToRefill')"
+                    v-model="data.hasToRefill"
+                />
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <QCheckbox
-                        :label="t('department.hasToSendMail')"
-                        v-model="data.hasToSendMail"
-                    />
-                </div>
+                <QCheckbox
+                    :label="t('department.hasToSendMail')"
+                    v-model="data.hasToSendMail"
+                />
             </VnRow>
         </template>
     </FormModel>
diff --git a/src/pages/Entry/Card/EntryBasicData.vue b/src/pages/Entry/Card/EntryBasicData.vue
index 3a6c72a4b5..2640d72e49 100644
--- a/src/pages/Entry/Card/EntryBasicData.vue
+++ b/src/pages/Entry/Card/EntryBasicData.vue
@@ -68,152 +68,126 @@ const onFilterTravelSelected = (formData, id) => {
     >
         <template #form="{ data }">
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnSelect
-                        :label="t('entry.basicData.supplier')"
-                        v-model="data.supplierFk"
-                        :options="suppliersOptions"
-                        option-value="id"
-                        option-label="nickname"
-                        hide-selected
-                        :required="true"
-                        map-options
-                    >
-                        <template #option="scope">
-                            <QItem v-bind="scope.itemProps">
-                                <QItemSection>
-                                    <QItemLabel>{{ scope.opt?.name }}</QItemLabel>
-                                    <QItemLabel caption>
-                                        {{ scope.opt?.nickname }}, {{ scope.opt?.id }}
-                                    </QItemLabel>
-                                </QItemSection>
-                            </QItem>
-                        </template>
-                    </VnSelect>
-                </div>
-                <div class="col">
-                    <VnSelectDialog
-                        :label="t('entry.basicData.travel')"
-                        v-model="data.travelFk"
-                        :options="travelsOptions"
-                        option-value="id"
-                        option-label="warehouseInName"
-                        map-options
-                        hide-selected
-                        :required="true"
-                        action-icon="filter_alt"
-                    >
-                        <template #form>
-                            <FilterTravelForm
-                                @travel-selected="onFilterTravelSelected(data, $event)"
-                            />
-                        </template>
-                        <template #option="scope">
-                            <QItem v-bind="scope.itemProps">
-                                <QItemSection>
-                                    <QItemLabel
-                                        >{{ scope.opt?.agencyModeName }} -
-                                        {{ scope.opt?.warehouseInName }} ({{
-                                            toDate(scope.opt?.shipped)
-                                        }}) &#x2192; {{ scope.opt?.warehouseOutName }} ({{
-                                            toDate(scope.opt?.landed)
-                                        }})</QItemLabel
-                                    >
-                                </QItemSection>
-                            </QItem>
-                        </template>
-                    </VnSelectDialog>
-                </div>
+                <VnSelect
+                    :label="t('entry.basicData.supplier')"
+                    v-model="data.supplierFk"
+                    :options="suppliersOptions"
+                    option-value="id"
+                    option-label="nickname"
+                    hide-selected
+                    :required="true"
+                    map-options
+                >
+                    <template #option="scope">
+                        <QItem v-bind="scope.itemProps">
+                            <QItemSection>
+                                <QItemLabel>{{ scope.opt?.name }}</QItemLabel>
+                                <QItemLabel caption>
+                                    {{ scope.opt?.nickname }}, {{ scope.opt?.id }}
+                                </QItemLabel>
+                            </QItemSection>
+                        </QItem>
+                    </template>
+                </VnSelect>
+                <VnSelectDialog
+                    :label="t('entry.basicData.travel')"
+                    v-model="data.travelFk"
+                    :options="travelsOptions"
+                    option-value="id"
+                    option-label="warehouseInName"
+                    map-options
+                    hide-selected
+                    :required="true"
+                    action-icon="filter_alt"
+                >
+                    <template #form>
+                        <FilterTravelForm
+                            @travel-selected="onFilterTravelSelected(data, $event)"
+                        />
+                    </template>
+                    <template #option="scope">
+                        <QItem v-bind="scope.itemProps">
+                            <QItemSection>
+                                <QItemLabel
+                                    >{{ scope.opt?.agencyModeName }} -
+                                    {{ scope.opt?.warehouseInName }} ({{
+                                        toDate(scope.opt?.shipped)
+                                    }}) &#x2192; {{ scope.opt?.warehouseOutName }} ({{
+                                        toDate(scope.opt?.landed)
+                                    }})</QItemLabel
+                                >
+                            </QItemSection>
+                        </QItem>
+                    </template>
+                </VnSelectDialog>
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnInput
-                        v-model="data.reference"
-                        :label="t('entry.basicData.reference')"
-                    />
-                </div>
+                <VnInput
+                    v-model="data.reference"
+                    :label="t('entry.basicData.reference')"
+                />
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnInput
-                        v-model="data.invoiceNumber"
-                        :label="t('entry.basicData.invoiceNumber')"
-                    />
-                </div>
-                <div class="col">
-                    <VnSelect
-                        :label="t('entry.basicData.company')"
-                        v-model="data.companyFk"
-                        :options="companiesOptions"
-                        option-value="id"
-                        option-label="code"
-                        map-options
-                        hide-selected
-                        :required="true"
-                    />
-                </div>
+                <VnInput
+                    v-model="data.invoiceNumber"
+                    :label="t('entry.basicData.invoiceNumber')"
+                />
+                <VnSelect
+                    :label="t('entry.basicData.company')"
+                    v-model="data.companyFk"
+                    :options="companiesOptions"
+                    option-value="id"
+                    option-label="code"
+                    map-options
+                    hide-selected
+                    :required="true"
+                />
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnSelect
-                        :label="t('entry.basicData.currency')"
-                        v-model="data.currencyFk"
-                        :options="currenciesOptions"
-                        option-value="id"
-                        option-label="code"
-                    />
-                </div>
-                <div class="col">
-                    <QInput
-                        :label="t('entry.basicData.commission')"
-                        v-model="data.commission"
-                        type="number"
-                        autofocus
-                        min="0"
-                    />
-                </div>
+                <VnSelect
+                    :label="t('entry.basicData.currency')"
+                    v-model="data.currencyFk"
+                    :options="currenciesOptions"
+                    option-value="id"
+                    option-label="code"
+                />
+                <QInput
+                    :label="t('entry.basicData.commission')"
+                    v-model="data.commission"
+                    type="number"
+                    autofocus
+                    min="0"
+                />
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <QInput
-                        :label="t('entry.basicData.observation')"
-                        type="textarea"
-                        v-model="data.observation"
-                        :maxlength="45"
-                        counter
-                        fill-input
-                    />
-                </div>
+                <QInput
+                    :label="t('entry.basicData.observation')"
+                    type="textarea"
+                    v-model="data.observation"
+                    :maxlength="45"
+                    counter
+                    fill-input
+                />
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <QCheckbox
-                        v-model="data.isOrdered"
-                        :label="t('entry.basicData.ordered')"
-                    />
-                </div>
-                <div class="col">
-                    <QCheckbox
-                        v-model="data.isConfirmed"
-                        :label="t('entry.basicData.confirmed')"
-                    />
-                </div>
-                <div class="col">
-                    <QCheckbox
-                        v-model="data.isExcludedFromAvailable"
-                        :label="t('entry.basicData.excludedFromAvailable')"
-                    />
-                </div>
-                <div class="col">
-                    <QCheckbox v-model="data.isRaid" :label="t('entry.basicData.raid')" />
-                </div>
-                <div class="col">
-                    <QCheckbox
-                        v-if="isAdministrative()"
-                        v-model="data.isBooked"
-                        :label="t('entry.basicData.booked')"
-                    />
-                </div>
+                <QCheckbox
+                    v-model="data.isOrdered"
+                    :label="t('entry.basicData.ordered')"
+                />
+                <QCheckbox
+                    v-model="data.isConfirmed"
+                    :label="t('entry.basicData.confirmed')"
+                />
+                <QCheckbox
+                    v-model="data.isExcludedFromAvailable"
+                    :label="t('entry.basicData.excludedFromAvailable')"
+                />
+                <QCheckbox v-model="data.isRaid" :label="t('entry.basicData.raid')" />
+                <QCheckbox
+                    v-if="isAdministrative()"
+                    v-model="data.isBooked"
+                    :label="t('entry.basicData.booked')"
+                />
             </VnRow>
         </template>
     </FormModel>
diff --git a/src/pages/Entry/Card/EntryBuysImport.vue b/src/pages/Entry/Card/EntryBuysImport.vue
index 6d856f0689..8a8a7ac321 100644
--- a/src/pages/Entry/Card/EntryBuysImport.vue
+++ b/src/pages/Entry/Card/EntryBuysImport.vue
@@ -198,44 +198,38 @@ const redirectToBuysView = () => {
         </Teleport>
         <QCard class="q-pa-lg">
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <QFile
-                        ref="inputFileRef"
-                        :label="t('entry.buys.file')"
-                        v-model="importData.file"
-                        :multiple="false"
-                        accept=".json"
-                        @update:model-value="onFileChange($event)"
-                        class="required"
-                    >
-                        <template #append>
-                            <QIcon
-                                name="vn:attach"
-                                class="cursor-pointer"
-                                @click="inputFileRef.pickFiles()"
-                            >
-                                <QTooltip>{{ t('globals.selectFile') }}</QTooltip>
-                            </QIcon>
-                        </template>
-                    </QFile>
-                </div>
+                <QFile
+                    ref="inputFileRef"
+                    :label="t('entry.buys.file')"
+                    v-model="importData.file"
+                    :multiple="false"
+                    accept=".json"
+                    @update:model-value="onFileChange($event)"
+                    class="required"
+                >
+                    <template #append>
+                        <QIcon
+                            name="vn:attach"
+                            class="cursor-pointer"
+                            @click="inputFileRef.pickFiles()"
+                        >
+                            <QTooltip>{{ t('globals.selectFile') }}</QTooltip>
+                        </QIcon>
+                    </template>
+                </QFile>
             </VnRow>
             <div v-if="importData.file">
                 <VnRow class="row q-gutter-md q-mb-md">
-                    <div class="col">
-                        <VnInput
-                            :label="t('entry.buys.reference')"
-                            v-model="importData.ref"
-                        />
-                    </div>
+                    <VnInput
+                        :label="t('entry.buys.reference')"
+                       v-model="importData.ref"
+                    />
                 </VnRow>
                 <VnRow class="row q-gutter-md q-mb-md">
-                    <div class="col">
-                        <VnInput
-                            :label="t('entry.buys.observations')"
-                            v-model="importData.observation"
-                        />
-                    </div>
+                    <VnInput
+                        :label="t('entry.buys.observations')"
+                        v-model="importData.observation"
+                    />
                 </VnRow>
                 <VnRow>
                     <QTable :columns="columns" :rows="importData.buys">
diff --git a/src/pages/Entry/EntryCreate.vue b/src/pages/Entry/EntryCreate.vue
index b04b8e8b79..3493dc9030 100644
--- a/src/pages/Entry/EntryCreate.vue
+++ b/src/pages/Entry/EntryCreate.vue
@@ -79,78 +79,71 @@ const redirectToEntryBasicData = (_, { id }) => {
         >
             <template #form="{ data, validate }">
                 <VnRow class="row q-gutter-md q-mb-md">
-                    <div class="col">
-                        <VnSelect
-                            :label="t('Supplier')"
-                            class="full-width"
-                            v-model="data.supplierFk"
-                            :options="suppliersOptions"
-                            option-value="id"
-                            option-label="nickname"
-                            hide-selected
-                            :required="true"
-                            :rules="validate('entry.supplierFk')"
-                        >
-                            <template #option="scope">
-                                <QItem v-bind="scope.itemProps">
-                                    <QItemSection>
-                                        <QItemLabel>{{ scope.opt?.nickname }}</QItemLabel>
-                                        <QItemLabel caption>
-                                            #{{ scope.opt?.id }}
-                                        </QItemLabel>
-                                    </QItemSection>
-                                </QItem>
-                            </template>
-                        </VnSelect>
-                    </div>
+                    <VnSelect
+                        :label="t('Supplier')"
+                        class="full-width"
+                        v-model="data.supplierFk"
+                        :options="suppliersOptions"
+                        option-value="id"
+                        option-label="nickname"
+                        hide-selected
+                        :required="true"
+                        :rules="validate('entry.supplierFk')"
+                    >
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection>
+                                    <QItemLabel>{{ scope.opt?.nickname }}</QItemLabel>
+                                    <QItemLabel caption>
+                                        #{{ scope.opt?.id }}
+                                    </QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelect>
                 </VnRow>
                 <VnRow class="row q-gutter-md q-mb-md">
-                    <div class="col">
-                        <VnSelect
-                            :label="t('Travel')"
-                            class="full-width"
-                            v-model="data.travelFk"
-                            :options="travelsOptions"
-                            option-value="id"
-                            option-label="warehouseInName"
-                            map-options
-                            hide-selected
-                            :required="true"
-                            :rules="validate('entry.travelFk')"
-                        >
-                            <template #option="scope">
-                                <QItem v-bind="scope.itemProps">
-                                    <QItemSection>
-                                        <QItemLabel
-                                            >{{ scope.opt?.agencyModeName }} -
-                                            {{ scope.opt?.warehouseInName }} ({{
-                                                toDate(scope.opt?.shipped)
-                                            }}) &#x2192;
-                                            {{ scope.opt?.warehouseOutName }} ({{
-                                                toDate(scope.opt?.landed)
-                                            }})</QItemLabel
-                                        >
-                                    </QItemSection>
-                                </QItem>
-                            </template>
-                        </VnSelect>
-                    </div>
+                    <VnSelect
+                        :label="t('Travel')"
+                        class="full-width"
+                        v-model="data.travelFk"
+                        :options="travelsOptions"
+                        option-value="id"
+                        option-label="warehouseInName"
+                        map-options
+                        hide-selected
+                        :required="true"
+                        :rules="validate('entry.travelFk')"
+                    >
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection>
+                                    <QItemLabel
+                                        >{{ scope.opt?.agencyModeName }} -
+                                        {{ scope.opt?.warehouseInName }} ({{
+                                            toDate(scope.opt?.shipped)
+                                        }}) &#x2192; {{ scope.opt?.warehouseOutName }} ({{
+                                            toDate(scope.opt?.landed)
+                                        }})</QItemLabel
+                                    >
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelect>
                 </VnRow>
                 <VnRow class="row q-gutter-md q-mb-md">
-                    <div class="col">
-                        <VnSelect
-                            :label="t('Company')"
-                            class="full-width"
-                            v-model="data.companyFk"
-                            :options="companiesOptions"
-                            option-value="id"
-                            option-label="code"
-                            map-options
-                            hide-selected
-                            :required="true"
-                            :rules="validate('entry.companyFk')"
-                        />
-                    </div>
+                    <VnSelect
+                        :label="t('Company')"
+                        class="full-width"
+                        v-model="data.companyFk"
+                        :options="companiesOptions"
+                        option-value="id"
+                        option-label="code"
+                        map-options
+                        hide-selected
+                        :required="true"
+                        :rules="validate('entry.companyFk')"
+                    />
                 </VnRow>
             </template>
         </FormModel>
diff --git a/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue b/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue
index 0a676b5003..bdba335000 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue
@@ -182,252 +182,225 @@ async function upsert() {
     >
         <template #form="{ data }">
             <div class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnSelect
-                        :label="t('supplierFk')"
-                        v-model="data.supplierFk"
-                        option-value="id"
-                        option-label="nickname"
-                        url="Suppliers"
-                        :fields="['id', 'nickname']"
-                        sort-by="nickname"
-                        :is-clearable="false"
-                    >
-                        <template #option="scope">
-                            <QItem v-bind="scope.itemProps">
-                                <QItemSection>
-                                    <QItemLabel>{{
-                                        `${scope.opt.id} - ${scope.opt.nickname}`
-                                    }}</QItemLabel>
-                                </QItemSection>
-                            </QItem>
-                        </template>
-                    </VnSelect>
-                </div>
-                <div class="col">
-                    <QInput
-                        clearable
-                        clear-icon="close"
-                        :label="t('Supplier ref')"
-                        v-model="data.supplierRef"
-                    />
-                </div>
+                <VnSelect
+                    :label="t('supplierFk')"
+                    v-model="data.supplierFk"
+                    option-value="id"
+                    option-label="nickname"
+                    url="Suppliers"
+                    :fields="['id', 'nickname']"
+                    sort-by="nickname"
+                    :is-clearable="false"
+                >
+                    <template #option="scope">
+                        <QItem v-bind="scope.itemProps">
+                            <QItemSection>
+                                <QItemLabel>{{
+                                    `${scope.opt.id} - ${scope.opt.nickname}`
+                                }}</QItemLabel>
+                            </QItemSection>
+                        </QItem>
+                    </template>
+                </VnSelect>
+                <QInput
+                    clearable
+                    clear-icon="close"
+                    :label="t('Supplier ref')"
+                    v-model="data.supplierRef"
+                />
             </div>
             <div class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <QInput
-                        :label="t('Expedition date')"
-                        v-model="data.issued"
-                        :mask="dateMask"
-                    >
-                        <template #append>
-                            <QIcon
-                                name="event"
-                                class="cursor-pointer"
-                                :fill-mask="fillMask"
+                <QInput
+                    :label="t('Expedition date')"
+                    v-model="data.issued"
+                    :mask="dateMask"
+                >
+                    <template #append>
+                        <QIcon name="event" class="cursor-pointer" :fill-mask="fillMask">
+                            <QPopupProxy
+                                cover
+                                transition-show="scale"
+                                transition-hide="scale"
                             >
-                                <QPopupProxy
-                                    cover
-                                    transition-show="scale"
-                                    transition-hide="scale"
-                                >
-                                    <QDate v-model="data.issued">
-                                        <div class="row items-center justify-end">
-                                            <QBtn
-                                                v-close-popup
-                                                label="Close"
-                                                color="primary"
-                                                flat
-                                            />
-                                        </div>
-                                    </QDate>
-                                </QPopupProxy>
-                            </QIcon>
-                        </template>
-                    </QInput>
-                </div>
-                <div class="col">
-                    <QInput
-                        :label="t('Operation date')"
-                        v-model="data.operated"
-                        :mask="dateMask"
-                        :fill-mask="fillMask"
-                        autofocus
-                    >
-                        <template #append>
-                            <QIcon name="event" class="cursor-pointer">
-                                <QPopupProxy
-                                    cover
-                                    transition-show="scale"
-                                    transition-hide="scale"
-                                >
-                                    <QDate v-model="data.operated" :mask="dateMask">
-                                        <div class="row items-center justify-end">
-                                            <QBtn
-                                                v-close-popup
-                                                label="Close"
-                                                color="primary"
-                                                flat
-                                            />
-                                        </div>
-                                    </QDate>
-                                </QPopupProxy>
-                            </QIcon>
-                        </template>
-                    </QInput>
-                </div>
-            </div>
-            <div class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <QInput
-                        :label="t('Undeductible VAT')"
-                        v-model="data.deductibleExpenseFk"
-                        clearable
-                        clear-icon="close"
-                    />
-                </div>
-                <div class="col">
-                    <QInput
-                        :label="t('Document')"
-                        v-model="data.dmsFk"
-                        clearable
-                        clear-icon="close"
-                        @update:model-value="checkFileExists(data.dmsFk)"
-                    >
-                        <template #prepend>
-                            <QBtn
-                                v-if="data.dmsFk"
-                                :class="{
-                                    'no-pointer-events': editDownloadDisabled,
-                                }"
-                                :disable="editDownloadDisabled"
-                                icon="cloud_download"
-                                :title="t('Download file')"
-                                padding="xs"
-                                round
-                                @click="downloadFile(data.dmsFk)"
-                            />
-                        </template>
-                        <template #append>
-                            <QBtn
-                                :class="{
-                                    'no-pointer-events': editDownloadDisabled,
-                                }"
-                                :disable="editDownloadDisabled"
-                                v-if="data.dmsFk"
-                                icon="edit"
-                                round
-                                padding="xs"
-                                @click="setEditDms(data.dmsFk)"
+                                <QDate v-model="data.issued">
+                                    <div class="row items-center justify-end">
+                                        <QBtn
+                                            v-close-popup
+                                            label="Close"
+                                            color="primary"
+                                            flat
+                                        />
+                                    </div>
+                                </QDate>
+                            </QPopupProxy>
+                        </QIcon>
+                    </template>
+                </QInput>
+                <QInput
+                    :label="t('Operation date')"
+                    v-model="data.operated"
+                    :mask="dateMask"
+                    :fill-mask="fillMask"
+                    autofocus
+                >
+                    <template #append>
+                        <QIcon name="event" class="cursor-pointer">
+                            <QPopupProxy
+                                cover
+                                transition-show="scale"
+                                transition-hide="scale"
                             >
-                                <QTooltip>{{ t('Edit document') }}</QTooltip>
-                            </QBtn>
-                            <QBtn
-                                v-else
-                                icon="add_circle"
-                                round
-                                padding="xs"
-                                @click="setCreateDms()"
+                                <QDate v-model="data.operated" :mask="dateMask">
+                                    <div class="row items-center justify-end">
+                                        <QBtn
+                                            v-close-popup
+                                            label="Close"
+                                            color="primary"
+                                            flat
+                                        />
+                                    </div>
+                                </QDate>
+                            </QPopupProxy>
+                        </QIcon>
+                    </template>
+                </QInput>
+            </div>
+            <div class="row q-gutter-md q-mb-md">
+                <QInput
+                    :label="t('Undeductible VAT')"
+                    v-model="data.deductibleExpenseFk"
+                    clearable
+                    clear-icon="close"
+                />
+                <QInput
+                    :label="t('Document')"
+                    v-model="data.dmsFk"
+                    clearable
+                    clear-icon="close"
+                    @update:model-value="checkFileExists(data.dmsFk)"
+                >
+                    <template #prepend>
+                        <QBtn
+                            v-if="data.dmsFk"
+                            :class="{
+                                'no-pointer-events': editDownloadDisabled,
+                            }"
+                            :disable="editDownloadDisabled"
+                            icon="cloud_download"
+                            :title="t('Download file')"
+                            padding="xs"
+                            round
+                            @click="downloadFile(data.dmsFk)"
+                        />
+                    </template>
+                    <template #append>
+                        <QBtn
+                            :class="{
+                                'no-pointer-events': editDownloadDisabled,
+                            }"
+                            :disable="editDownloadDisabled"
+                            v-if="data.dmsFk"
+                            icon="edit"
+                            round
+                            padding="xs"
+                            @click="setEditDms(data.dmsFk)"
+                        >
+                            <QTooltip>{{ t('Edit document') }}</QTooltip>
+                        </QBtn>
+                        <QBtn
+                            v-else
+                            icon="add_circle"
+                            round
+                            padding="xs"
+                            @click="setCreateDms()"
+                        >
+                            <QTooltip>{{ t('Create document') }}</QTooltip>
+                        </QBtn>
+                    </template>
+                </QInput>
+            </div>
+            <div class="row q-gutter-md q-mb-md">
+                <QInput
+                    :label="t('Entry date')"
+                    v-model="data.bookEntried"
+                    clearable
+                    clear-icon="close"
+                    :mask="dateMask"
+                    :fill-mask="fillMask"
+                >
+                    <template #append>
+                        <QIcon name="event" class="cursor-pointer">
+                            <QPopupProxy
+                                cover
+                                transition-show="scale"
+                                transition-hide="scale"
                             >
-                                <QTooltip>{{ t('Create document') }}</QTooltip>
-                            </QBtn>
-                        </template>
-                    </QInput>
-                </div>
+                                <QDate v-model="data.bookEntried" :mask="dateMask">
+                                    <div class="row items-center justify-end">
+                                        <QBtn
+                                            v-close-popup
+                                            label="Close"
+                                            color="primary"
+                                            flat
+                                        />
+                                    </div>
+                                </QDate>
+                            </QPopupProxy>
+                        </QIcon>
+                    </template>
+                </QInput>
+                <QInput
+                    :label="t('Accounted date')"
+                    v-model="data.booked"
+                    clearable
+                    clear-icon="close"
+                    :mask="dateMask"
+                    :fill-mask="fillMask"
+                >
+                    <template #append>
+                        <QIcon name="event" class="cursor-pointer">
+                            <QPopupProxy
+                                cover
+                                transition-show="scale"
+                                transition-hide="scale"
+                            >
+                                <QDate v-model="data.booked" :mask="maskDate">
+                                    <div class="row items-center justify-end">
+                                        <QBtn
+                                            v-close-popup
+                                            label="Close"
+                                            color="primary"
+                                            flat
+                                        />
+                                    </div>
+                                </QDate>
+                            </QPopupProxy>
+                        </QIcon>
+                    </template>
+                </QInput>
             </div>
             <div class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <QInput
-                        :label="t('Entry date')"
-                        v-model="data.bookEntried"
-                        clearable
-                        clear-icon="close"
-                        :mask="dateMask"
-                        :fill-mask="fillMask"
-                    >
-                        <template #append>
-                            <QIcon name="event" class="cursor-pointer">
-                                <QPopupProxy
-                                    cover
-                                    transition-show="scale"
-                                    transition-hide="scale"
-                                >
-                                    <QDate v-model="data.bookEntried" :mask="dateMask">
-                                        <div class="row items-center justify-end">
-                                            <QBtn
-                                                v-close-popup
-                                                label="Close"
-                                                color="primary"
-                                                flat
-                                            />
-                                        </div>
-                                    </QDate>
-                                </QPopupProxy>
-                            </QIcon>
-                        </template>
-                    </QInput>
-                </div>
-                <div class="col">
-                    <QInput
-                        :label="t('Accounted date')"
-                        v-model="data.booked"
-                        clearable
-                        clear-icon="close"
-                        :mask="dateMask"
-                        :fill-mask="fillMask"
-                    >
-                        <template #append>
-                            <QIcon name="event" class="cursor-pointer">
-                                <QPopupProxy
-                                    cover
-                                    transition-show="scale"
-                                    transition-hide="scale"
-                                >
-                                    <QDate v-model="data.booked" :mask="maskDate">
-                                        <div class="row items-center justify-end">
-                                            <QBtn
-                                                v-close-popup
-                                                label="Close"
-                                                color="primary"
-                                                flat
-                                            />
-                                        </div>
-                                    </QDate>
-                                </QPopupProxy>
-                            </QIcon>
-                        </template>
-                    </QInput>
-                </div>
+                <VnSelect
+                    :label="t('Currency')"
+                    v-model="data.currencyFk"
+                    :options="currencies"
+                    option-value="id"
+                    option-label="code"
+                />
+                <VnSelect
+                    v-if="companiesRef"
+                    :label="t('Company')"
+                    v-model="data.companyFk"
+                    :options="companies"
+                    option-value="id"
+                    option-label="code"
+                />
             </div>
             <div class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnSelect
-                        :label="t('Currency')"
-                        v-model="data.currencyFk"
-                        :options="currencies"
-                        option-value="id"
-                        option-label="code"
-                    />
-                </div>
-                <div class="col">
-                    <VnSelect
-                        v-if="companiesRef"
-                        :label="t('Company')"
-                        v-model="data.companyFk"
-                        :options="companies"
-                        option-value="id"
-                        option-label="code"
-                    />
-                </div>
-            </div>
-            <div class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <QCheckbox
-                        :label="t('invoiceIn.summary.booked')"
-                        v-model="data.isBooked"
-                    />
-                </div>
-                <div class="col"></div>
+                <QCheckbox
+                    :label="t('invoiceIn.summary.booked')"
+                    v-model="data.isBooked"
+                />
             </div>
         </template>
     </FormModel>
diff --git a/src/pages/Item/Card/ItemLastEntries.vue b/src/pages/Item/Card/ItemLastEntries.vue
index 5200db2391..9071cc6eb2 100644
--- a/src/pages/Item/Card/ItemLastEntries.vue
+++ b/src/pages/Item/Card/ItemLastEntries.vue
@@ -2,7 +2,7 @@
 import { onMounted, computed, onUnmounted, reactive, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
-
+import { dateRange } from 'src/filters';
 import EntryDescriptorProxy from 'src/pages/Entry/Card/EntryDescriptorProxy.vue';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
 
@@ -29,28 +29,19 @@ const exprBuilder = (param, value) => {
         case 'landed':
             return {
                 'tr.landed': {
-                    between: getDateRange(value),
+                    between: dateRange(value),
                 },
             };
     }
 };
 
-const dateRange = reactive({
+const datedRange = reactive({
     from: null,
     to: null,
 });
 
-const getDateRange = (val) => {
-    const minHour = new Date(val);
-    minHour.setHours(0, 0, 0, 0);
-    const maxHour = new Date(val);
-    maxHour.setHours(23, 59, 59, 59);
-
-    return [minHour, maxHour];
-};
-
 const from = computed({
-    get: () => dateRange.from,
+    get: () => datedRange.from,
     set: (val) => {
         updateFrom(val);
         updateFilter();
@@ -58,7 +49,7 @@ const from = computed({
 });
 
 const to = computed({
-    get: () => dateRange.to,
+    get: () => datedRange.to,
     set: (val) => {
         updateTo(val);
         updateFilter();
@@ -173,17 +164,17 @@ const fetchItemLastEntries = async () => {
 
 const updateFrom = async (date) => {
     date.setHours(0, 0, 0, 0);
-    dateRange.from = date.toISOString();
+    datedRange.from = date.toISOString();
 };
 
 const updateTo = async (date) => {
     date.setHours(23, 59, 59, 59);
-    dateRange.to = date.toISOString();
+    datedRange.to = date.toISOString();
 };
 
 const updateFilter = async () => {
     arrayData.store.userFilter.where.landed = {
-        between: [dateRange.from, dateRange.to],
+        between: [datedRange.from, datedRange.to],
     };
     await fetchItemLastEntries();
 };
diff --git a/src/pages/Item/ItemRequest.vue b/src/pages/Item/ItemRequest.vue
index 1872ad8597..735f3a7b7d 100644
--- a/src/pages/Item/ItemRequest.vue
+++ b/src/pages/Item/ItemRequest.vue
@@ -1,7 +1,7 @@
 <script setup>
 import { ref, computed, onMounted, onBeforeMount, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
-
+import FetchData from 'components/FetchData.vue';
 import TicketDescriptorProxy from 'src/pages/Ticket/Card/TicketDescriptorProxy.vue';
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
 import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
@@ -9,7 +9,7 @@ import VnInput from 'src/components/common/VnInput.vue';
 import ItemRequestDenyForm from './ItemRequestDenyForm.vue';
 import ItemRequestFilter from './ItemRequestFilter.vue';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
-
+import VnSelect from 'components/common/VnSelect.vue';
 import { useStateStore } from 'stores/useStateStore';
 import { useArrayData } from 'composables/useArrayData';
 import { toDateFormat } from 'src/filters/date';
@@ -21,7 +21,7 @@ import axios from 'axios';
 const { t } = useI18n();
 const { notify } = useNotify();
 const stateStore = useStateStore();
-
+const workersOptions = ref([]);
 let filterParams = ref({});
 const denyFormRef = ref(null);
 const denyRequestId = ref(null);
@@ -147,6 +147,7 @@ const confirmRequest = async (request) => {
             const params = {
                 itemFk: request.itemFk,
                 quantity: request.saleQuantity,
+                attenderFk: request.attenderFk,
             };
 
             const { data } = await axios.post(
@@ -206,6 +207,13 @@ onBeforeMount(() => {
 </script>
 
 <template>
+    <FetchData
+        url="Workers"
+        :filter="{ where: { role: 'buyer' } }"
+        order="id"
+        @on-fetch="(data) => (workersOptions = data)"
+        auto-load
+    />
     <template v-if="stateStore.isHeaderMounted()">
         <Teleport to="#searchbar">
             <VnSearchbar
@@ -278,8 +286,14 @@ onBeforeMount(() => {
             </template>
             <template #body-cell-attender="{ row }">
                 <QTd>
-                    <QBtn flat dense color="primary"> {{ row.attenderName }}</QBtn>
-                    <WorkerDescriptorProxy :id="row.attenderFk" />
+                    <VnSelect
+                        v-model="row.attenderFk"
+                        :options="workersOptions"
+                        hide-selected
+                        option-label="firstName"
+                        option-value="id"
+                        dense
+                    />
                 </QTd>
             </template>
             <template #body-cell-item="{ row }">
diff --git a/src/pages/Item/ItemRequestFilter.vue b/src/pages/Item/ItemRequestFilter.vue
index e142c28d3c..2c056acc64 100644
--- a/src/pages/Item/ItemRequestFilter.vue
+++ b/src/pages/Item/ItemRequestFilter.vue
@@ -1,7 +1,7 @@
 <script setup>
 import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
-
+import { dateRange } from 'src/filters';
 import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import VnInput from 'src/components/common/VnInput.vue';
@@ -44,15 +44,6 @@ const exprBuilder = (param, value) => {
     }
 };
 
-const dateRange = (value) => {
-    const minHour = new Date(value);
-    minHour.setHours(0, 0, 0, 0);
-    const maxHour = new Date(value);
-    maxHour.setHours(23, 59, 59, 59);
-
-    return [minHour, maxHour];
-};
-
 const add = (paramsObj, key) => {
     if (paramsObj[key] === undefined) {
         paramsObj[key] = 1;
@@ -201,6 +192,7 @@ const decrement = (paramsObj, key) => {
                             v-model="params.from"
                             @update:model-value="searchFn()"
                             is-outlined
+                            emit-date-format
                         />
                     </QItemSection>
                 </QItem>
@@ -211,6 +203,7 @@ const decrement = (paramsObj, key) => {
                             v-model="params.to"
                             @update:model-value="searchFn()"
                             is-outlined
+                            emit-date-format
                         />
                     </QItemSection>
                 </QItem>
diff --git a/src/pages/Order/Card/OrderForm.vue b/src/pages/Order/Card/OrderForm.vue
index ddb7182a05..08ed074e51 100644
--- a/src/pages/Order/Card/OrderForm.vue
+++ b/src/pages/Order/Card/OrderForm.vue
@@ -144,81 +144,73 @@ const orderFilter = {
         >
             <template #form="{ data }">
                 <VnRow class="row q-gutter-md q-mb-md">
-                    <div class="col">
-                        <VnSelect
-                            :label="t('order.form.clientFk')"
-                            v-model="data.clientFk"
-                            :options="clientList"
-                            option-value="id"
-                            option-label="name"
-                            hide-selected
-                            @update:model-value="
-                                (client) => fetchAddressList(client.defaultAddressFk)
-                            "
-                        >
-                            <template #option="scope">
-                                <QItem v-bind="scope.itemProps">
-                                    <QItemSection>
-                                        <QItemLabel>
-                                            {{ `${scope.opt.id}: ${scope.opt.name}` }}
-                                        </QItemLabel>
-                                    </QItemSection>
-                                </QItem>
-                            </template>
-                        </VnSelect>
-                    </div>
-                    <div class="col">
-                        <VnSelect
-                            :label="t('order.form.addressFk')"
-                            v-model="data.addressFk"
-                            :options="addressList"
-                            option-value="id"
-                            option-label="nickname"
-                            hide-selected
-                            :disable="!addressList?.length"
-                            @update:model-value="
-                                () => fetchAgencyList(data.landed, data.addressFk)
-                            "
-                        >
-                            <template #option="scope">
-                                <QItem v-bind="scope.itemProps">
-                                    <QItemSection>
-                                        <QItemLabel>
-                                            {{
-                                                `${scope.opt.nickname}: ${scope.opt.street},${scope.opt.city}`
-                                            }}
-                                        </QItemLabel>
-                                    </QItemSection>
-                                </QItem>
-                            </template>
-                        </VnSelect>
-                    </div>
+                    <VnSelect
+                        :label="t('order.form.clientFk')"
+                        v-model="data.clientFk"
+                        :options="clientList"
+                        option-value="id"
+                        option-label="name"
+                        hide-selected
+                        @update:model-value="
+                            (client) => fetchAddressList(client.defaultAddressFk)
+                        "
+                    >
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection>
+                                    <QItemLabel>
+                                        {{ `${scope.opt.id}: ${scope.opt.name}` }}
+                                    </QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelect>
+                    <VnSelect
+                        :label="t('order.form.addressFk')"
+                        v-model="data.addressFk"
+                        :options="addressList"
+                        option-value="id"
+                        option-label="nickname"
+                        hide-selected
+                        :disable="!addressList?.length"
+                        @update:model-value="
+                            () => fetchAgencyList(data.landed, data.addressFk)
+                        "
+                    >
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection>
+                                    <QItemLabel>
+                                        {{
+                                            `${scope.opt.nickname}: ${scope.opt.street},${scope.opt.city}`
+                                        }}
+                                    </QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelect>
                 </VnRow>
                 <VnRow class="row q-gutter-md q-mb-md">
-                    <div class="col">
-                        <VnInputDate
-                            placeholder="dd-mm-aaa"
-                            :label="t('order.form.landed')"
-                            v-model="data.landed"
-                            @update:model-value="
-                                () => fetchAgencyList(data.landed, data.addressFk)
-                            "
-                        />
-                    </div>
+                    <VnInputDate
+                        placeholder="dd-mm-aaa"
+                        :label="t('order.form.landed')"
+                        v-model="data.landed"
+                        @update:model-value="
+                            () => fetchAgencyList(data.landed, data.addressFk)
+                        "
+                    />
                 </VnRow>
                 <VnRow class="row q-gutter-md q-mb-md">
-                    <div class="col">
-                        <VnSelect
-                            :label="t('order.form.agencyModeFk')"
-                            v-model="data.agencyModeFk"
-                            :options="agencyList"
-                            option-value="agencyModeFk"
-                            option-label="agencyMode"
-                            hide-selected
-                            :disable="!agencyList?.length"
-                        >
-                        </VnSelect>
-                    </div>
+                    <VnSelect
+                        :label="t('order.form.agencyModeFk')"
+                        v-model="data.agencyModeFk"
+                        :options="agencyList"
+                        option-value="agencyModeFk"
+                        option-label="agencyMode"
+                        hide-selected
+                        :disable="!agencyList?.length"
+                    >
+                    </VnSelect>
                 </VnRow>
             </template>
         </FormModel>
diff --git a/src/pages/Route/Card/RouteForm.vue b/src/pages/Route/Card/RouteForm.vue
index b365bc9ba8..892a0333c6 100644
--- a/src/pages/Route/Card/RouteForm.vue
+++ b/src/pages/Route/Card/RouteForm.vue
@@ -123,90 +123,70 @@ const onSave = (data, response) => {
     >
         <template #form="{ data }">
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnSelect
-                        :label="t('Worker')"
-                        v-model="data.workerFk"
-                        :options="workerList"
-                        option-value="id"
-                        option-label="nickname"
-                        emit-value
-                        map-options
-                        use-input
-                        :input-debounce="0"
-                    >
-                        <template #option="{ itemProps, opt }">
-                            <QItem v-bind="itemProps">
-                                <QItemSection>
-                                    <QItemLabel>{{ opt.name }}</QItemLabel>
-                                    <QItemLabel caption>
-                                        {{ opt.nickname }}, {{ opt.code }}
-                                    </QItemLabel>
-                                </QItemSection>
-                            </QItem>
-                        </template>
-                    </VnSelect>
-                </div>
-                <div class="col">
-                    <VnSelect
-                        :label="t('Vehicle')"
-                        v-model="data.vehicleFk"
-                        :options="vehicleList"
-                        option-value="id"
-                        option-label="numberPlate"
-                        emit-value
-                        map-options
-                        use-input
-                        :input-debounce="0"
-                    />
-                </div>
+                <VnSelect
+                    :label="t('Worker')"
+                    v-model="data.workerFk"
+                    :options="workerList"
+                    option-value="id"
+                    option-label="nickname"
+                    emit-value
+                    map-options
+                    use-input
+                    :input-debounce="0"
+                >
+                    <template #option="{ itemProps, opt }">
+                        <QItem v-bind="itemProps">
+                            <QItemSection>
+                                <QItemLabel>{{ opt.name }}</QItemLabel>
+                                <QItemLabel caption>
+                                    {{ opt.nickname }}, {{ opt.code }}
+                                </QItemLabel>
+                            </QItemSection>
+                        </QItem>
+                    </template>
+                </VnSelect>
+                <VnSelect
+                    :label="t('Vehicle')"
+                    v-model="data.vehicleFk"
+                    :options="vehicleList"
+                    option-value="id"
+                    option-label="numberPlate"
+                    emit-value
+                    map-options
+                    use-input
+                    :input-debounce="0"
+                />
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnSelect
-                        :label="t('Agency')"
-                        v-model="data.agencyModeFk"
-                        :options="agencyList"
-                        option-value="id"
-                        option-label="name"
-                        emit-value
-                        map-options
-                        use-input
-                        :input-debounce="0"
-                    />
-                </div>
-                <div class="col">
-                    <VnInputDate v-model="data.created" :label="t('Created')" />
-                </div>
+                <VnSelect
+                    :label="t('Agency')"
+                    v-model="data.agencyModeFk"
+                    :options="agencyList"
+                    option-value="id"
+                    option-label="name"
+                    emit-value
+                    map-options
+                    use-input
+                    :input-debounce="0"
+                />
+                <VnInputDate v-model="data.created" :label="t('Created')" />
             </VnRow>
             <template v-if="!isNew">
                 <VnRow class="row q-gutter-md q-mb-md">
-                    <div class="col">
-                        <VnInput
-                            v-model="data.kmStart"
-                            :label="t('Km Start')"
-                            clearable
-                        />
-                    </div>
-                    <div class="col">
-                        <VnInput v-model="data.kmEnd" :label="t('Km End')" clearable />
-                    </div>
+                    <VnInput v-model="data.kmStart" :label="t('Km Start')" clearable />
+                    <VnInput v-model="data.kmEnd" :label="t('Km End')" clearable />
                 </VnRow>
                 <VnRow class="row q-gutter-md q-mb-md">
-                    <div class="col">
-                        <VnInputTime
-                            v-model="data.started"
-                            :label="t('Hour started')"
-                            clearable
-                        />
-                    </div>
-                    <div class="col">
-                        <VnInputTime
-                            v-model="data.finished"
-                            :label="t('Hour finished')"
-                            clearable
-                        />
-                    </div>
+                    <VnInputTime
+                        v-model="data.started"
+                        :label="t('Hour started')"
+                        clearable
+                    />
+                    <VnInputTime
+                        v-model="data.finished"
+                        :label="t('Hour finished')"
+                        clearable
+                    />
                     <div class="col flex items-center">
                         <QCheckbox
                             size="sm"
@@ -218,15 +198,13 @@ const onSave = (data, response) => {
                 </VnRow>
             </template>
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnInput
-                        v-model="data.description"
-                        :label="t('Description')"
-                        type="textarea"
-                        :rows="3"
-                        clearable
-                    />
-                </div>
+                <VnInput
+                    v-model="data.description"
+                    :label="t('Description')"
+                    type="textarea"
+                    :rows="3"
+                    clearable
+                />
             </VnRow>
         </template>
     </FormModel>
diff --git a/src/pages/Route/Roadmap/RoadmapBasicData.vue b/src/pages/Route/Roadmap/RoadmapBasicData.vue
index b9df0bdd75..a6c2f7d4d8 100644
--- a/src/pages/Route/Roadmap/RoadmapBasicData.vue
+++ b/src/pages/Route/Roadmap/RoadmapBasicData.vue
@@ -41,85 +41,61 @@ const onSave = (data, response) => {
     >
         <template #form="{ data }">
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnInput v-model="data.name" :label="t('Roadmap')" clearable />
-                </div>
-                <div class="col">
-                    <VnInputDate v-model="data.etd" :label="t('ETD date')" />
-                </div>
-                <div class="col">
-                    <VnInputTime v-model="data.etd" :label="t('ETD hour')" />
-                </div>
+                <VnInput v-model="data.name" :label="t('Roadmap')" clearable />
+                <VnInputDate v-model="data.etd" :label="t('ETD date')" />
+                <VnInputTime v-model="data.etd" :label="t('ETD hour')" />
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnInput
-                        v-model="data.tractorPlate"
-                        :label="t('Tractor plate')"
-                        clearable
-                    />
-                </div>
-                <div class="col">
-                    <VnInput
-                        v-model="data.trailerPlate"
-                        :label="t('Trailer plate')"
-                        clearable
-                    />
-                </div>
+                <VnInput
+                    v-model="data.tractorPlate"
+                    :label="t('Tractor plate')"
+                    clearable
+                />
+                <VnInput
+                    v-model="data.trailerPlate"
+                    :label="t('Trailer plate')"
+                    clearable
+                />
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnSelect
-                        :label="t('Carrier')"
-                        v-model="data.supplierFk"
-                        :options="supplierList"
-                        option-value="id"
-                        option-label="nickname"
-                        emit-value
-                        map-options
-                        use-input
-                        :input-debounce="0"
-                    >
-                        <template #option="{ itemProps, opt }">
-                            <QItem v-bind="itemProps">
-                                <QItemSection>
-                                    <QItemLabel
-                                        >{{ opt.id }} - {{ opt.nickname }}
-                                    </QItemLabel>
-                                </QItemSection>
-                            </QItem>
-                        </template>
-                    </VnSelect>
-                </div>
-                <div class="col">
-                    <VnInput
-                        v-model="data.price"
-                        :label="t('Price')"
-                        type="number"
-                        clearable
-                    />
-                </div>
+                <VnSelect
+                    :label="t('Carrier')"
+                    v-model="data.supplierFk"
+                    :options="supplierList"
+                    option-value="id"
+                    option-label="nickname"
+                    emit-value
+                    map-options
+                    use-input
+                    :input-debounce="0"
+                >
+                    <template #option="{ itemProps, opt }">
+                        <QItem v-bind="itemProps">
+                            <QItemSection>
+                                <QItemLabel
+                                    >{{ opt.id }} - {{ opt.nickname }}
+                                </QItemLabel>
+                            </QItemSection>
+                        </QItem>
+                    </template>
+                </VnSelect>
+                <VnInput
+                    v-model="data.price"
+                    :label="t('Price')"
+                    type="number"
+                    clearable
+                />
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnInput
-                        v-model="data.driverName"
-                        :label="t('Driver name')"
-                        clearable
-                    />
-                </div>
-                <div class="col">
-                    <VnInput v-model="data.phone" :label="t('Phone')" clearable />
-                </div>
+                <VnInput v-model="data.driverName" :label="t('Driver name')" clearable />
+                <VnInput v-model="data.phone" :label="t('Phone')" clearable />
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnInput
-                        v-model="data.observations"
-                        :label="t('Observations')"
-                        clearable
-                    />
-                </div>
+                <VnInput
+                    v-model="data.observations"
+                    :label="t('Observations')"
+                    clearable
+                />
             </VnRow>
         </template>
     </FormModel>
diff --git a/src/pages/Route/Roadmap/RoadmapCreate.vue b/src/pages/Route/Roadmap/RoadmapCreate.vue
index 214983dd3a..f5cc9ee66e 100644
--- a/src/pages/Route/Roadmap/RoadmapCreate.vue
+++ b/src/pages/Route/Roadmap/RoadmapCreate.vue
@@ -31,19 +31,13 @@ const onSave = (data, response) => {
     >
         <template #form="{ data }">
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnInput
-                        v-model="data.name"
-                        :label="t('Roadmap')"
-                        clearable
-                    />
-                </div>
-                <div class="col">
-                    <VnInputDate v-model="data.etd" :label="t('ETD date')" />
-                </div>
-                <div class="col">
-                    <VnInputTime v-model="data.etd" :label="t('ETD hour')" />
-                </div>
+                <VnInput
+                    v-model="data.name"
+                    :label="t('Roadmap')"
+                    clearable
+                />
+                <VnInputDate v-model="data.etd" :label="t('ETD date')" />
+                <VnInputTime v-model="data.etd" :label="t('ETD hour')" />
             </VnRow>
         </template>
     </FormModel>
diff --git a/src/pages/Shelving/Card/ShelvingForm.vue b/src/pages/Shelving/Card/ShelvingForm.vue
index 238879bd4c..d9b6ede0d6 100644
--- a/src/pages/Shelving/Card/ShelvingForm.vue
+++ b/src/pages/Shelving/Card/ShelvingForm.vue
@@ -86,47 +86,39 @@ const onSave = (shelving, newShelving) => {
     >
         <template #form="{ data, validate, filter }">
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnInput
-                        v-model="data.code"
-                        :label="t('shelving.basicData.code')"
-                        :rules="validate('Shelving.code')"
-                    />
-                </div>
-                <div class="col">
-                    <QSelect
-                        v-model="data.parkingFk"
-                        :options="parkingList"
-                        option-value="id"
-                        option-label="code"
-                        emit-value
-                        :label="t('shelving.basicData.parking')"
-                        map-options
-                        use-input
-                        @filter="
-                            (value, update) => filter(value, update, parkingSelectFilter)
-                        "
-                        :rules="validate('Shelving.parkingFk')"
-                        :input-debounce="0"
-                    />
-                </div>
+                <VnInput
+                    v-model="data.code"
+                    :label="t('shelving.basicData.code')"
+                    :rules="validate('Shelving.code')"
+                />
+                <QSelect
+                    v-model="data.parkingFk"
+                    :options="parkingList"
+                    option-value="id"
+                    option-label="code"
+                    emit-value
+                    :label="t('shelving.basicData.parking')"
+                    map-options
+                    use-input
+                    @filter="
+                        (value, update) => filter(value, update, parkingSelectFilter)
+                    "
+                    :rules="validate('Shelving.parkingFk')"
+                    :input-debounce="0"
+                />
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnInput
-                        v-model="data.priority"
-                        type="number"
-                        :label="t('shelving.basicData.priority')"
-                        :rules="validate('Shelving.priority')"
-                    />
-                </div>
-                <div class="col">
-                    <QCheckbox
-                        v-model="data.isRecyclable"
-                        :label="t('shelving.basicData.recyclable')"
-                        :rules="validate('Shelving.isRecyclable')"
-                    />
-                </div>
+                <VnInput
+                    v-model="data.priority"
+                    type="number"
+                    :label="t('shelving.basicData.priority')"
+                    :rules="validate('Shelving.priority')"
+                />
+                <QCheckbox
+                    v-model="data.isRecyclable"
+                    :label="t('shelving.basicData.recyclable')"
+                    :rules="validate('Shelving.isRecyclable')"
+                />
             </VnRow>
         </template>
     </FormModel>
diff --git a/src/pages/Supplier/Card/SupplierAccounts.vue b/src/pages/Supplier/Card/SupplierAccounts.vue
index d95b6c30c2..b0e8b06e80 100644
--- a/src/pages/Supplier/Card/SupplierAccounts.vue
+++ b/src/pages/Supplier/Card/SupplierAccounts.vue
@@ -99,63 +99,57 @@ const setWireTransfer = async () => {
                     :key="index"
                     class="row q-gutter-md q-mb-md"
                 >
-                    <div class="col">
-                        <VnInput :label="t('supplier.accounts.iban')" v-model="row.iban">
-                            <template #append>
-                                <QIcon name="info" class="cursor-info">
-                                    <QTooltip>{{
-                                        t('components.iban_tooltip')
-                                    }}</QTooltip>
-                                </QIcon>
-                            </template>
-                        </VnInput>
-                    </div>
-                    <div class="col">
-                        <VnSelectDialog
-                            :label="t('worker.create.bankEntity')"
-                            v-model="row.bankEntityFk"
-                            :options="bankEntitiesOptions"
-                            option-label="bic"
-                            option-value="id"
-                            hide-selected
-                        >
-                            <template #form>
-                                <CreateBankEntityForm
-                                    @on-data-saved="
-                                        (_, requestResponse) =>
-                                            onBankEntityCreated(requestResponse, row)
-                                    "
-                                    :show-entity-field="false"
-                                />
-                            </template>
-                            <template #option="scope">
-                                <QItem v-bind="scope.itemProps">
-                                    <QItemSection v-if="scope.opt">
-                                        <QItemLabel
-                                            >{{ scope.opt.bic }}
-                                            {{ scope.opt.name }}</QItemLabel
-                                        >
-                                    </QItemSection>
-                                </QItem>
-                            </template>
-                        </VnSelectDialog>
-                    </div>
-                    <div class="col">
-                        <VnInput
-                            :label="t('supplier.accounts.beneficiary')"
-                            v-model="row.beneficiary"
-                        >
-                            <template #append>
-                                <QIcon name="info" class="cursor-pointer">
-                                    <QTooltip>{{
-                                        t(
-                                            'Name of the bank account holder if different from the provider'
-                                        )
-                                    }}</QTooltip>
-                                </QIcon>
-                            </template>
-                        </VnInput>
-                    </div>
+                    <VnInput :label="t('supplier.accounts.iban')" v-model="row.iban">
+                        <template #append>
+                            <QIcon name="info" class="cursor-info">
+                                <QTooltip>{{
+                                    t('components.iban_tooltip')
+                                }}</QTooltip>
+                            </QIcon>
+                        </template>
+                    </VnInput>
+                    <VnSelectDialog
+                        :label="t('worker.create.bankEntity')"
+                        v-model="row.bankEntityFk"
+                        :options="bankEntitiesOptions"
+                        option-label="bic"
+                        option-value="id"
+                        hide-selected
+                    >
+                        <template #form>
+                            <CreateBankEntityForm
+                                @on-data-saved="
+                                    (_, requestResponse) =>
+                                        onBankEntityCreated(requestResponse, row)
+                                "
+                                :show-entity-field="false"
+                            />
+                        </template>
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection v-if="scope.opt">
+                                    <QItemLabel
+                                        >{{ scope.opt.bic }}
+                                        {{ scope.opt.name }}</QItemLabel
+                                    >
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelectDialog>
+                    <VnInput
+                        :label="t('supplier.accounts.beneficiary')"
+                        v-model="row.beneficiary"
+                    >
+                        <template #append>
+                            <QIcon name="info" class="cursor-pointer">
+                                <QTooltip>{{
+                                    t(
+                                        'Name of the bank account holder if different from the provider'
+                                    )
+                                }}</QTooltip>
+                            </QIcon>
+                        </template>
+                    </VnInput>
                     <div class="col-1 row justify-center items-center">
                         <QIcon
                             name="delete"
diff --git a/src/pages/Supplier/Card/SupplierAddressesCreate.vue b/src/pages/Supplier/Card/SupplierAddressesCreate.vue
index 54f8580bda..440922ebc3 100644
--- a/src/pages/Supplier/Card/SupplierAddressesCreate.vue
+++ b/src/pages/Supplier/Card/SupplierAddressesCreate.vue
@@ -79,45 +79,36 @@ function handleLocation(data, location) {
         >
             <template #form="{ data, validate }">
                 <VnRow class="row q-gutter-md q-mb-md">
-                    <div class="col">
-                        <VnInput
-                            v-model="data.nickname"
-                            :label="t('supplier.addresses.name')"
-                        />
-                    </div>
-                    <div class="col">
-                        <VnInput
-                            v-model="data.street"
-                            :label="t('supplier.addresses.street')"
-                        />
-                    </div>
+                    <VnInput
+                        v-model="data.nickname"
+                        :label="t('supplier.addresses.name')"
+                    />
+                    <VnInput
+                        v-model="data.street"
+                        :label="t('supplier.addresses.street')"
+                    />
                 </VnRow>
                 <VnRow class="row q-gutter-md q-mb-md">
-                    <div class="col">
-                        <VnLocation
-                            :rules="validate('Worker.postcode')"
-                            :roles-allowed-to-create="['deliveryAssistant']"
-                            :options="postcodesOptions"
-                            v-model="data.location"
-                            @update:model-value="
-                                (location) => handleLocation(data, location)
-                            "
-                        ></VnLocation>
-                    </div>
+                    <VnLocation
+                        :rules="validate('Worker.postcode')"
+                        :roles-allowed-to-create="['deliveryAssistant']"
+                        :options="postcodesOptions"
+                        v-model="data.location"
+                        @update:model-value="
+                            (location) => handleLocation(data, location)
+                        "
+                    >
+                    </VnLocation>
                 </VnRow>
                 <VnRow class="row q-gutter-md q-mb-md">
-                    <div class="col">
-                        <VnInput
-                            v-model="data.phone"
-                            :label="t('supplier.addresses.phone')"
-                        />
-                    </div>
-                    <div class="col">
-                        <VnInput
-                            v-model="data.mobile"
-                            :label="t('supplier.addresses.mobile')"
-                        />
-                    </div>
+                    <VnInput
+                        v-model="data.phone"
+                        :label="t('supplier.addresses.phone')"
+                    />
+                    <VnInput
+                        v-model="data.mobile"
+                        :label="t('supplier.addresses.mobile')"
+                    />
                 </VnRow>
             </template>
         </FormModel>
diff --git a/src/pages/Supplier/Card/SupplierAgencyTerm.vue b/src/pages/Supplier/Card/SupplierAgencyTerm.vue
index 50a4f7adc3..26a410e8ce 100644
--- a/src/pages/Supplier/Card/SupplierAgencyTerm.vue
+++ b/src/pages/Supplier/Card/SupplierAgencyTerm.vue
@@ -54,57 +54,43 @@ const redirectToCreateView = () => {
                     :key="index"
                     class="row q-gutter-md q-mb-md"
                 >
-                    <div class="col">
-                        <QField :label="t('supplier.agencyTerms.agencyFk')" stack-label>
-                            <template #control>
-                                <div tabindex="0">
-                                    {{ row.agency?.name }}
-                                </div>
-                            </template>
-                        </QField>
-                    </div>
-                    <div class="col">
-                        <QInput
-                            :label="t('supplier.agencyTerms.minimumM3')"
-                            v-model.number="row.minimumM3"
-                            type="number"
-                        />
-                    </div>
-                    <div class="col">
-                        <QInput
-                            :label="t('supplier.agencyTerms.packagePrice')"
-                            v-model.number="row.packagePrice"
-                            type="number"
-                        />
-                    </div>
-                    <div class="col">
-                        <QInput
-                            :label="t('supplier.agencyTerms.kmPrice')"
-                            v-model.number="row.kmPrice"
-                            type="number"
-                        />
-                    </div>
-                    <div class="col">
-                        <QInput
-                            :label="t('supplier.agencyTerms.m3Price')"
-                            v-model.number="row.m3Price"
-                            type="number"
-                        />
-                    </div>
-                    <div class="col">
-                        <QInput
-                            :label="t('supplier.agencyTerms.routePrice')"
-                            v-model.number="row.routePrice"
-                            type="number"
-                        />
-                    </div>
-                    <div class="col">
-                        <QInput
-                            :label="t('supplier.agencyTerms.minimumKm')"
-                            v-model.number="row.minimumKm"
-                            type="number"
-                        />
-                    </div>
+                    <QField :label="t('supplier.agencyTerms.agencyFk')" stack-label>
+                        <template #control>
+                            <div tabindex="0">
+                                {{ row.agency?.name }}
+                            </div>
+                        </template>
+                    </QField>
+                    <QInput
+                        :label="t('supplier.agencyTerms.minimumM3')"
+                        v-model.number="row.minimumM3"
+                        type="number"
+                    />
+                    <QInput
+                        :label="t('supplier.agencyTerms.packagePrice')"
+                        v-model.number="row.packagePrice"
+                        type="number"
+                    />
+                    <QInput
+                        :label="t('supplier.agencyTerms.kmPrice')"
+                        v-model.number="row.kmPrice"
+                        type="number"
+                    />
+                    <QInput
+                        :label="t('supplier.agencyTerms.m3Price')"
+                        v-model.number="row.m3Price"
+                        type="number"
+                    />
+                    <QInput
+                        :label="t('supplier.agencyTerms.routePrice')"
+                        v-model.number="row.routePrice"
+                        type="number"
+                    />
+                    <QInput
+                        :label="t('supplier.agencyTerms.minimumKm')"
+                        v-model.number="row.minimumKm"
+                        type="number"
+                    />
                     <div class="col-1 row justify-center items-center">
                         <QIcon
                             name="delete"
diff --git a/src/pages/Supplier/Card/SupplierAgencyTermCreate.vue b/src/pages/Supplier/Card/SupplierAgencyTermCreate.vue
index ccd1cafd3e..5eb64233f8 100644
--- a/src/pages/Supplier/Card/SupplierAgencyTermCreate.vue
+++ b/src/pages/Supplier/Card/SupplierAgencyTermCreate.vue
@@ -46,63 +46,49 @@ const onDataSaved = () => {
         >
             <template #form="{ data }">
                 <VnRow class="row q-gutter-md q-mb-md">
-                    <div class="col">
-                        <VnSelect
-                            :label="t('supplier.agencyTerms.agencyFk')"
-                            v-model="data.agencyFk"
-                            :options="agenciesOptions"
-                            option-label="name"
-                            option-value="id"
-                            hide-selected
-                            rounded
-                        />
-                    </div>
-                    <div class="col">
-                        <QInput
-                            :label="t('supplier.agencyTerms.minimumM3')"
-                            v-model.number="data.minimumM3"
-                            type="number"
-                        />
-                    </div>
+                    <VnSelect
+                        :label="t('supplier.agencyTerms.agencyFk')"
+                        v-model="data.agencyFk"
+                        :options="agenciesOptions"
+                        option-label="name"
+                        option-value="id"
+                        hide-selected
+                        rounded
+                    />
+                    <QInput
+                        :label="t('supplier.agencyTerms.minimumM3')"
+                        v-model.number="data.minimumM3"
+                        type="number"
+                    />
                 </VnRow>
                 <VnRow class="row q-gutter-md q-mb-md">
-                    <div class="col">
-                        <QInput
-                            :label="t('supplier.agencyTerms.packagePrice')"
-                            v-model.number="data.packagePrice"
-                            type="number"
-                        />
-                    </div>
-                    <div class="col">
-                        <QInput
-                            :label="t('supplier.agencyTerms.kmPrice')"
-                            v-model.number="data.kmPrice"
-                            type="number"
-                        />
-                    </div>
-                    <div class="col">
-                        <QInput
-                            :label="t('supplier.agencyTerms.m3Price')"
-                            v-model.number="data.m3Price"
-                            type="number"
-                        />
-                    </div>
+                    <QInput
+                        :label="t('supplier.agencyTerms.packagePrice')"
+                        v-model.number="data.packagePrice"
+                        type="number"
+                    />
+                    <QInput
+                        :label="t('supplier.agencyTerms.kmPrice')"
+                        v-model.number="data.kmPrice"
+                        type="number"
+                    />
+                    <QInput
+                        :label="t('supplier.agencyTerms.m3Price')"
+                        v-model.number="data.m3Price"
+                        type="number"
+                    />
                 </VnRow>
                 <VnRow class="row q-gutter-md q-mb-md">
-                    <div class="col">
-                        <QInput
-                            :label="t('supplier.agencyTerms.routePrice')"
-                            v-model.number="data.routePrice"
-                            type="number"
-                        />
-                    </div>
-                    <div class="col">
-                        <QInput
-                            :label="t('supplier.agencyTerms.minimumKm')"
-                            v-model.number="data.minimumKm"
-                            type="number"
-                        />
-                    </div>
+                    <QInput
+                        :label="t('supplier.agencyTerms.routePrice')"
+                        v-model.number="data.routePrice"
+                        type="number"
+                    />
+                    <QInput
+                        :label="t('supplier.agencyTerms.minimumKm')"
+                        v-model.number="data.minimumKm"
+                        type="number"
+                    />
                 </VnRow>
             </template>
         </FormModel>
diff --git a/src/pages/Supplier/Card/SupplierBasicData.vue b/src/pages/Supplier/Card/SupplierBasicData.vue
index 6a1d747d55..10d6f8f687 100644
--- a/src/pages/Supplier/Card/SupplierBasicData.vue
+++ b/src/pages/Supplier/Card/SupplierBasicData.vue
@@ -30,74 +30,62 @@ const workersOptions = ref([]);
     >
         <template #form="{ data, validate }">
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnInput
-                        v-model="data.nickname"
-                        :label="t('supplier.basicData.alias')"
-                        :rules="validate('supplier.nickname')"
-                        clearable
-                    />
-                </div>
-                <div class="col">
-                    <VnSelect
-                        :label="t('supplier.basicData.workerFk')"
-                        v-model="data.workerFk"
-                        :options="workersOptions"
-                        option-value="id"
-                        option-label="name"
-                        hide-selected
-                        map-options
-                        :rules="validate('supplier.workerFk')"
-                    >
-                        <template #append>
-                            <QIcon name="info" class="cursor-pointer">
-                                <QTooltip>{{
-                                    t('Responsible for approving invoices')
-                                }}</QTooltip>
-                            </QIcon>
-                        </template>
-                        <template #option="scope">
-                            <QItem v-bind="scope.itemProps">
-                                <QItemSection>
-                                    <QItemLabel>{{ scope.opt?.name }}</QItemLabel>
-                                    <QItemLabel caption>
-                                        {{ scope.opt?.nickname }}, {{ scope.opt?.id }}
-                                    </QItemLabel>
-                                </QItemSection>
-                            </QItem>
-                        </template>
-                    </VnSelect>
-                </div>
+                <VnInput
+                    v-model="data.nickname"
+                    :label="t('supplier.basicData.alias')"
+                    :rules="validate('supplier.nickname')"
+                    clearable
+                />
+                <VnSelect
+                    :label="t('supplier.basicData.workerFk')"
+                    v-model="data.workerFk"
+                    :options="workersOptions"
+                    option-value="id"
+                    option-label="name"
+                    hide-selected
+                    map-options
+                    :rules="validate('supplier.workerFk')"
+                >
+                    <template #append>
+                        <QIcon name="info" class="cursor-pointer">
+                            <QTooltip>{{
+                                t('Responsible for approving invoices')
+                            }}</QTooltip>
+                        </QIcon>
+                    </template>
+                    <template #option="scope">
+                        <QItem v-bind="scope.itemProps">
+                            <QItemSection>
+                                <QItemLabel>{{ scope.opt?.name }}</QItemLabel>
+                                <QItemLabel caption>
+                                    {{ scope.opt?.nickname }}, {{ scope.opt?.id }}
+                                </QItemLabel>
+                            </QItemSection>
+                        </QItem>
+                    </template>
+                </VnSelect>
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <QCheckbox
-                        v-model="data.isSerious"
-                        :label="t('supplier.basicData.isSerious')"
-                    />
-                </div>
-                <div class="col">
-                    <QCheckbox
-                        v-model="data.isActive"
-                        :label="t('supplier.basicData.isActive')"
-                    />
-                </div>
-                <div class="col">
-                    <QCheckbox
-                        v-model="data.isPayMethodChecked"
-                        :label="t('supplier.basicData.isPayMethodChecked')"
-                    />
-                </div>
+                <QCheckbox
+                    v-model="data.isSerious"
+                    :label="t('supplier.basicData.isSerious')"
+                />
+                <QCheckbox
+                    v-model="data.isActive"
+                    :label="t('supplier.basicData.isActive')"
+                />
+                <QCheckbox
+                    v-model="data.isPayMethodChecked"
+                    :label="t('supplier.basicData.isPayMethodChecked')"
+                />
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <QInput
-                        :label="t('supplier.basicData.note')"
-                        type="textarea"
-                        v-model="data.note"
-                        fill-input
-                    />
-                </div>
+                <QInput
+                    :label="t('supplier.basicData.note')"
+                    type="textarea"
+                    v-model="data.note"
+                    fill-input
+                />
             </VnRow>
         </template>
     </FormModel>
diff --git a/src/pages/Supplier/Card/SupplierBillingData.vue b/src/pages/Supplier/Card/SupplierBillingData.vue
index e6e61d3394..62ca91a546 100644
--- a/src/pages/Supplier/Card/SupplierBillingData.vue
+++ b/src/pages/Supplier/Card/SupplierBillingData.vue
@@ -37,37 +37,31 @@ const formatPayDems = (data) => {
     >
         <template #form="{ data, validate }">
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnSelect
-                        :label="t('supplier.billingData.payMethodFk')"
-                        v-model="data.payMethodFk"
-                        :options="paymethodsOptions"
-                        option-value="id"
-                        option-label="name"
-                        hide-selected
-                        :rules="validate('supplier.payMethodFk')"
-                    />
-                </div>
-                <div class="col">
-                    <VnSelect
-                        :label="t('supplier.billingData.payDemFk')"
-                        v-model="data.payDemFk"
-                        :options="payDemsOptions"
-                        option-value="id"
-                        option-label="payDem"
-                        hide-selected
-                        :rules="validate('supplier.payDemFk')"
-                    />
-                </div>
+                <VnSelect
+                    :label="t('supplier.billingData.payMethodFk')"
+                    v-model="data.payMethodFk"
+                    :options="paymethodsOptions"
+                    option-value="id"
+                    option-label="name"
+                    hide-selected
+                    :rules="validate('supplier.payMethodFk')"
+                />
+                <VnSelect
+                    :label="t('supplier.billingData.payDemFk')"
+                    v-model="data.payDemFk"
+                    :options="payDemsOptions"
+                    option-value="id"
+                    option-label="payDem"
+                    hide-selected
+                    :rules="validate('supplier.payDemFk')"
+                />
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <QInput
-                        :label="t('supplier.billingData.payDay')"
-                        type="number"
-                        v-model="data.payDay"
-                    />
-                </div>
+                <QInput
+                    :label="t('supplier.billingData.payDay')"
+                    type="number"
+                    v-model="data.payDay"
+                />
             </VnRow>
         </template>
     </FormModel>
diff --git a/src/pages/Supplier/Card/SupplierContacts.vue b/src/pages/Supplier/Card/SupplierContacts.vue
index 92ba1c1fc4..35e8b98fce 100644
--- a/src/pages/Supplier/Card/SupplierContacts.vue
+++ b/src/pages/Supplier/Card/SupplierContacts.vue
@@ -42,42 +42,32 @@ const insertRow = () => {
                     class="border q-pa-md q-mb-md"
                 >
                     <VnRow class="row q-gutter-md">
-                        <div class="col">
-                            <VnInput
-                                input-name-focusable
-                                :label="t('supplier.contacts.name')"
-                                v-model="row.name"
-                            />
-                        </div>
-                        <div class="col">
-                            <VnInput
-                                :label="t('supplier.contacts.phone')"
-                                v-model="row.phone"
-                            />
-                        </div>
-                        <div class="col">
-                            <VnInput
-                                :label="t('supplier.contacts.mobile')"
-                                v-model="row.mobile"
-                            />
-                        </div>
-                        <div class="col">
-                            <VnInput
-                                :label="t('supplier.contacts.email')"
-                                v-model="row.email"
-                            />
-                        </div>
+                        <VnInput
+                            input-name-focusable
+                            :label="t('supplier.contacts.name')"
+                            v-model="row.name"
+                        />
+                        <VnInput
+                            :label="t('supplier.contacts.phone')"
+                            v-model="row.phone"
+                        />
+                        <VnInput
+                            :label="t('supplier.contacts.mobile')"
+                            v-model="row.mobile"
+                        />
+                        <VnInput
+                            :label="t('supplier.contacts.email')"
+                            v-model="row.email"
+                        />
                     </VnRow>
                     <VnRow class="row q-gutter-md">
-                        <div class="col">
-                            <QInput
-                                :label="t('supplier.contacts.observation')"
-                                type="textarea"
-                                v-model="row.observation"
-                                fill-input
-                                autogrow
-                            />
-                        </div>
+                        <QInput
+                            :label="t('supplier.contacts.observation')"
+                            type="textarea"
+                            v-model="row.observation"
+                            fill-input
+                            autogrow
+                        />
                         <div class="col-1 row justify-center items-center">
                             <QIcon
                                 name="delete"
diff --git a/src/pages/Supplier/Card/SupplierFiscalData.vue b/src/pages/Supplier/Card/SupplierFiscalData.vue
index 8aeebaebd3..179c6f5e6d 100644
--- a/src/pages/Supplier/Card/SupplierFiscalData.vue
+++ b/src/pages/Supplier/Card/SupplierFiscalData.vue
@@ -57,105 +57,85 @@ function handleLocation(data, location) {
     >
         <template #form="{ data, validate }">
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnInput
-                        v-model="data.name"
-                        :label="t('supplier.fiscalData.name')"
-                        clearable
-                    />
-                </div>
-                <div class="col">
-                    <VnInput
-                        v-model="data.nif"
-                        :label="t('supplier.fiscalData.nif')"
-                        clearable
-                    />
-                </div>
+                <VnInput
+                    v-model="data.name"
+                    :label="t('supplier.fiscalData.name')"
+                    clearable
+                />
+                <VnInput
+                    v-model="data.nif"
+                    :label="t('supplier.fiscalData.nif')"
+                    clearable
+                />
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnInput
-                        v-model="data.account"
-                        :label="t('supplier.fiscalData.account')"
-                        clearable
-                    />
-                </div>
-                <div class="col">
-                    <VnSelect
-                        :label="t('supplier.fiscalData.sageTaxTypeFk')"
-                        v-model="data.sageTaxTypeFk"
-                        :options="sageTaxTypesOptions"
-                        option-value="id"
-                        option-label="vat"
-                        hide-selected
-                        map-options
-                    />
-                </div>
+                <VnInput
+                    v-model="data.account"
+                    :label="t('supplier.fiscalData.account')"
+                    clearable
+                />
+                <VnSelect
+                    :label="t('supplier.fiscalData.sageTaxTypeFk')"
+                    v-model="data.sageTaxTypeFk"
+                    :options="sageTaxTypesOptions"
+                    option-value="id"
+                    option-label="vat"
+                    hide-selected
+                    map-options
+                />
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnSelect
-                        :label="t('supplier.fiscalData.sageWithholdingFk')"
-                        v-model="data.sageWithholdingFk"
-                        :options="sageWithholdingsOptions"
-                        option-value="id"
-                        option-label="withholding"
-                        hide-selected
-                        map-options
-                    />
-                </div>
-                <div class="col">
-                    <VnSelect
-                        :label="t('supplier.fiscalData.sageTransactionTypeFk')"
-                        v-model="data.sageTransactionTypeFk"
-                        :options="sageTransactionTypesOptions"
-                        option-value="id"
-                        option-label="transaction"
-                        hide-selected
-                        map-options
-                    />
-                </div>
+                <VnSelect
+                    :label="t('supplier.fiscalData.sageWithholdingFk')"
+                    v-model="data.sageWithholdingFk"
+                    :options="sageWithholdingsOptions"
+                    option-value="id"
+                    option-label="withholding"
+                    hide-selected
+                    map-options
+                />
+                <VnSelect
+                    :label="t('supplier.fiscalData.sageTransactionTypeFk')"
+                    v-model="data.sageTransactionTypeFk"
+                    :options="sageTransactionTypesOptions"
+                    option-value="id"
+                    option-label="transaction"
+                    hide-selected
+                    map-options
+                />
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnSelect
-                        :label="t('supplier.fiscalData.supplierActivityFk')"
-                        v-model="data.supplierActivityFk"
-                        :options="supplierActivitiesOptions"
-                        option-value="code"
-                        option-label="name"
-                        hide-selected
-                        map-options
-                    />
-                </div>
-                <div class="col">
-                    <VnInput
-                        v-model="data.healthRegister"
-                        :label="t('supplier.fiscalData.healthRegister')"
-                        clearable
-                    />
-                </div>
+                <VnSelect
+                    :label="t('supplier.fiscalData.supplierActivityFk')"
+                    v-model="data.supplierActivityFk"
+                    :options="supplierActivitiesOptions"
+                    option-value="code"
+                    option-label="name"
+                    hide-selected
+                    map-options
+                />
+                <VnInput
+                    v-model="data.healthRegister"
+                    :label="t('supplier.fiscalData.healthRegister')"
+                    clearable
+                />
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnInput
-                        v-model="data.street"
-                        :label="t('supplier.fiscalData.street')"
-                        clearable
-                    />
-                </div>
+                <VnInput
+                    v-model="data.street"
+                    :label="t('supplier.fiscalData.street')"
+                    clearable
+                />
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnLocation
-                        :rules="validate('Worker.postcode')"
-                        :roles-allowed-to-create="['deliveryAssistant']"
-                        :options="postcodesOptions"
-                        v-model="data.postCode"
-                        @update:model-value="(location) => handleLocation(data, location)"
-                    >
-                    </VnLocation>
-                </div>
+                <VnLocation
+                    :rules="validate('Worker.postcode')"
+                    :roles-allowed-to-create="['deliveryAssistant']"
+                    :options="postcodesOptions"
+                    v-model="data.postCode"
+                    @update:model-value="(location) => handleLocation(data, location)"
+                >
+                </VnLocation>
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
                 <div class="col flex justify-around">
diff --git a/src/pages/Supplier/SupplierCreate.vue b/src/pages/Supplier/SupplierCreate.vue
index d80bd2df84..7d45bac97d 100644
--- a/src/pages/Supplier/SupplierCreate.vue
+++ b/src/pages/Supplier/SupplierCreate.vue
@@ -45,15 +45,13 @@ const redirectToSupplierFiscalData = (_, responseData) => {
         >
             <template #form="{ data }">
                 <VnRow class="row q-gutter-md q-mb-md">
-                    <div class="col">
-                        <VnInput
-                            v-model="data.name"
-                            :label="t('supplier.create.supplierName')"
-                            @keyup="
-                                newSupplierForm.name = newSupplierForm.name.toUpperCase()
-                            "
-                        />
-                    </div>
+                    <VnInput
+                        v-model="data.name"
+                        :label="t('supplier.create.supplierName')"
+                        @keyup="
+                            newSupplierForm.name = newSupplierForm.name.toUpperCase()
+                        "
+                    />
                 </VnRow>
             </template>
         </FormModel>
diff --git a/src/pages/Travel/Card/TravelBasicData.vue b/src/pages/Travel/Card/TravelBasicData.vue
index f8c03a6094..f4e97c239e 100644
--- a/src/pages/Travel/Card/TravelBasicData.vue
+++ b/src/pages/Travel/Card/TravelBasicData.vue
@@ -29,75 +29,56 @@ const agenciesOptions = ref([]);
     >
         <template #form="{ data }">
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnInput
-                        v-model="data.ref"
-                        :label="t('travel.basicData.reference')"
-                    />
-                </div>
-                <div class="col">
-                    <VnSelect
-                        :label="t('travel.basicData.agency')"
-                        v-model="data.agencyModeFk"
-                        :options="agenciesOptions"
-                        option-value="id"
-                        option-label="name"
-                        map-options
-                        hide-selected
-                    />
-                </div>
+                <VnInput v-model="data.ref" :label="t('travel.basicData.reference')" />
+                <VnSelect
+                    :label="t('travel.basicData.agency')"
+                    v-model="data.agencyModeFk"
+                    :options="agenciesOptions"
+                    option-value="id"
+                    option-label="name"
+                    map-options
+                    hide-selected
+                />
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnInputDate
-                        v-model="data.shipped"
-                        :label="t('travel.basicData.shipped')"
-                    />
-                </div>
-                <div class="col">
-                    <VnInputDate
-                        v-model="data.landed"
-                        :label="t('travel.basicData.landed')"
-                    />
-                </div>
+                <VnInputDate
+                    v-model="data.shipped"
+                    :label="t('travel.basicData.shipped')"
+                />
+                <VnInputDate
+                    v-model="data.landed"
+                    :label="t('travel.basicData.landed')"
+                />
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnSelect
-                        :label="t('travel.basicData.warehouseOut')"
-                        v-model="data.warehouseOutFk"
-                        :options="agenciesOptions"
-                        option-value="id"
-                        option-label="name"
-                        map-options
-                        hide-selected
-                    />
-                </div>
-                <div class="col">
-                    <VnSelect
-                        :label="t('travel.basicData.warehouseIn')"
-                        v-model="data.warehouseInFk"
-                        :options="agenciesOptions"
-                        option-value="id"
-                        option-label="name"
-                        map-options
-                        hide-selected
-                    />
-                </div>
+                <VnSelect
+                    :label="t('travel.basicData.warehouseOut')"
+                    v-model="data.warehouseOutFk"
+                    :options="agenciesOptions"
+                    option-value="id"
+                    option-label="name"
+                    map-options
+                    hide-selected
+                />
+                <VnSelect
+                    :label="t('travel.basicData.warehouseIn')"
+                    v-model="data.warehouseInFk"
+                    :options="agenciesOptions"
+                    option-value="id"
+                    option-label="name"
+                    map-options
+                    hide-selected
+                />
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <QCheckbox
-                        :label="t('travel.basicData.delivered')"
-                        v-model="data.isDelivered"
-                    />
-                </div>
-                <div class="col">
-                    <QCheckbox
-                        :label="t('travel.basicData.received')"
-                        v-model="data.isReceived"
-                    />
-                </div>
+                <QCheckbox
+                    :label="t('travel.basicData.delivered')"
+                    v-model="data.isDelivered"
+                />
+                <QCheckbox
+                    :label="t('travel.basicData.received')"
+                    v-model="data.isReceived"
+                />
             </VnRow>
         </template>
     </FormModel>
diff --git a/src/pages/Travel/Card/TravelThermographsForm.vue b/src/pages/Travel/Card/TravelThermographsForm.vue
index 3464a29b3a..33b56e7452 100644
--- a/src/pages/Travel/Card/TravelThermographsForm.vue
+++ b/src/pages/Travel/Card/TravelThermographsForm.vue
@@ -236,104 +236,88 @@ const onThermographCreated = async (data) => {
             </Teleport>
             <QCard class="q-pa-lg">
                 <VnRow class="row q-gutter-md q-mb-md">
-                    <div class="col">
-                        <VnSelectDialog
-                            :label="t('travel.thermographs.thermograph')"
-                            v-model="thermographForm.thermographId"
-                            :options="thermographsOptions"
-                            option-value="thermographFk"
-                            option-label="thermographFk"
-                            :disable="viewAction === 'edit'"
-                            :tooltip="t('New thermograph')"
-                        >
-                            <template #form>
-                                <CreateThermographForm
-                                    @on-data-saved="onThermographCreated($event, data)"
-                                />
-                            </template>
-                        </VnSelectDialog>
-                    </div>
-                    <div class="col">
-                        <VnInput
-                            v-model="thermographForm.state"
-                            :label="t('travel.thermographs.state')"
-                        />
-                    </div>
+                    <VnSelectDialog
+                        :label="t('travel.thermographs.thermograph')"
+                        v-model="thermographForm.thermographId"
+                        :options="thermographsOptions"
+                        option-value="thermographFk"
+                        option-label="thermographFk"
+                        :disable="viewAction === 'edit'"
+                        :tooltip="t('New thermograph')"
+                    >
+                        <template #form>
+                            <CreateThermographForm
+                                @on-data-saved="onThermographCreated($event, data)"
+                            />
+                        </template>
+                    </VnSelectDialog>
+                    <VnInput
+                        v-model="thermographForm.state"
+                        :label="t('travel.thermographs.state')"
+                    />
                 </VnRow>
                 <VnRow class="row q-gutter-md q-mb-md">
-                    <div class="col">
-                        <VnInput
-                            v-model="thermographForm.reference"
-                            :label="t('travel.thermographs.reference')"
-                        />
-                    </div>
-                    <div class="col">
-                        <VnSelect
-                            :label="t('travel.thermographs.type')"
-                            v-model="thermographForm.dmsTypeId"
-                            :options="dmsTypesOptions"
-                            option-value="id"
-                            option-label="name"
-                        />
-                    </div>
+                    <VnInput
+                        v-model="thermographForm.reference"
+                        :label="t('travel.thermographs.reference')"
+                    />
+                    <VnSelect
+                        :label="t('travel.thermographs.type')"
+                        v-model="thermographForm.dmsTypeId"
+                        :options="dmsTypesOptions"
+                        option-value="id"
+                        option-label="name"
+                    />
                 </VnRow>
                 <VnRow class="row q-gutter-md q-mb-md">
-                    <div class="col">
-                        <VnSelect
-                            :label="t('travel.thermographs.company')"
-                            v-model="thermographForm.companyId"
-                            :options="companiesOptions"
-                            option-value="id"
-                            option-label="code"
-                        />
-                    </div>
-                    <div class="col">
-                        <VnSelect
-                            :label="t('travel.thermographs.warehouse')"
-                            v-model="thermographForm.warehouseId"
-                            :options="warehousesOptions"
-                            option-value="id"
-                            option-label="name"
-                        />
-                    </div>
+                    <VnSelect
+                        :label="t('travel.thermographs.company')"
+                        v-model="thermographForm.companyId"
+                        :options="companiesOptions"
+                        option-value="id"
+                        option-label="code"
+                    />
+                    <VnSelect
+                        :label="t('travel.thermographs.warehouse')"
+                        v-model="thermographForm.warehouseId"
+                        :options="warehousesOptions"
+                        option-value="id"
+                        option-label="name"
+                    />
                 </VnRow>
                 <VnRow v-if="viewAction === 'edit'" class="row q-gutter-md q-mb-md">
-                    <div class="col">
-                        <QInput
-                            :label="t('globals.description')"
-                            type="textarea"
-                            v-model="thermographForm.description"
-                            fill-input
-                        />
-                    </div>
+                    <QInput
+                        :label="t('globals.description')"
+                        type="textarea"
+                        v-model="thermographForm.description"
+                        fill-input
+                    />
                 </VnRow>
                 <VnRow class="row q-gutter-md q-mb-md">
-                    <div class="col">
-                        <QFile
-                            ref="inputFileRef"
-                            :label="t('travel.thermographs.file')"
-                            multiple
-                            :accept="allowedContentTypes"
-                            v-model="thermographForm.files"
-                        >
-                            <template #append>
-                                <QIcon
-                                    name="vn:attach"
-                                    class="cursor-pointer q-mr-sm"
-                                    @click="inputFileRef.pickFiles()"
-                                >
-                                    <QTooltip>{{ t('Select files') }}</QTooltip>
-                                </QIcon>
-                                <QIcon name="info" class="cursor-pointer">
-                                    <QTooltip>{{
-                                        t('globals.allowedFilesText', {
-                                            allowedContentTypes: allowedContentTypes,
-                                        })
-                                    }}</QTooltip>
-                                </QIcon>
-                            </template>
-                        </QFile>
-                    </div>
+                    <QFile
+                        ref="inputFileRef"
+                        :label="t('travel.thermographs.file')"
+                        multiple
+                        :accept="allowedContentTypes"
+                        v-model="thermographForm.files"
+                    >
+                        <template #append>
+                            <QIcon
+                                name="vn:attach"
+                                class="cursor-pointer q-mr-sm"
+                                @click="inputFileRef.pickFiles()"
+                            >
+                                <QTooltip>{{ t('Select files') }}</QTooltip>
+                            </QIcon>
+                            <QIcon name="info" class="cursor-pointer">
+                                <QTooltip>{{
+                                    t('globals.allowedFilesText', {
+                                        allowedContentTypes: allowedContentTypes,
+                                    })
+                                }}</QTooltip>
+                            </QIcon>
+                        </template>
+                    </QFile>
                 </VnRow>
             </QCard>
         </QForm>
diff --git a/src/pages/Travel/TravelCreate.vue b/src/pages/Travel/TravelCreate.vue
index c8c26684c6..53c8d402dd 100644
--- a/src/pages/Travel/TravelCreate.vue
+++ b/src/pages/Travel/TravelCreate.vue
@@ -68,52 +68,37 @@ const redirectToTravelBasicData = (_, { id }) => {
         >
             <template #form="{ data }">
                 <VnRow class="row q-gutter-md q-mb-md">
-                    <div class="col">
-                        <VnInput v-model="data.ref" :label="t('globals.reference')" />
-                    </div>
-                    <div class="col">
-                        <VnSelect
-                            :label="t('globals.agency')"
-                            v-model="data.agencyModeFk"
-                            :options="agenciesOptions"
-                            option-value="agencyFk"
-                            option-label="name"
-                            hide-selected
-                        />
-                    </div>
+                    <VnInput v-model="data.ref" :label="t('globals.reference')" />
+                    <VnSelect
+                        :label="t('globals.agency')"
+                        v-model="data.agencyModeFk"
+                        :options="agenciesOptions"
+                        option-value="agencyFk"
+                        option-label="name"
+                        hide-selected
+                    />
                 </VnRow>
                 <VnRow class="row q-gutter-md q-mb-md">
-                    <div class="col">
-                        <VnInputDate
-                            v-model="data.shipped"
-                            :label="t('globals.shipped')"
-                        />
-                    </div>
-                    <div class="col">
-                        <VnInputDate :label="t('globals.landed')" v-model="data.landed" />
-                    </div>
+                    <VnInputDate v-model="data.shipped" :label="t('globals.shipped')" />
+                    <VnInputDate :label="t('globals.landed')" v-model="data.landed" />
                 </VnRow>
                 <VnRow class="row q-gutter-md q-mb-md">
-                    <div class="col">
-                        <VnSelect
-                            :label="t('globals.wareHouseOut')"
-                            v-model="data.warehouseOutFk"
-                            :options="warehousesOptions"
-                            option-value="id"
-                            option-label="name"
-                            hide-selected
-                        />
-                    </div>
-                    <div class="col">
-                        <VnSelect
-                            :label="t('globals.wareHouseIn')"
-                            v-model="data.warehouseInFk"
-                            :options="warehousesOptions"
-                            option-value="id"
-                            option-label="name"
-                            hide-selected
-                        />
-                    </div>
+                    <VnSelect
+                        :label="t('globals.wareHouseOut')"
+                        v-model="data.warehouseOutFk"
+                        :options="warehousesOptions"
+                        option-value="id"
+                        option-label="name"
+                        hide-selected
+                    />
+                    <VnSelect
+                        :label="t('globals.wareHouseIn')"
+                        v-model="data.warehouseInFk"
+                        :options="warehousesOptions"
+                        option-value="id"
+                        option-label="name"
+                        hide-selected
+                    />
                 </VnRow>
             </template>
         </FormModel>
diff --git a/src/pages/Wagon/WagonCreate.vue b/src/pages/Wagon/WagonCreate.vue
index cf6bc3ff24..411c366322 100644
--- a/src/pages/Wagon/WagonCreate.vue
+++ b/src/pages/Wagon/WagonCreate.vue
@@ -92,71 +92,63 @@ function filterType(val, update) {
         <QForm @submit="onSubmit()" @reset="onReset()" class="q-pa-sm">
             <QCard class="q-pa-md">
                 <div class="row q-col-gutter-md">
-                    <div class="col">
-                        <QInput
-                            filled
-                            v-model="wagon.label"
-                            :label="t('wagon.create.label')"
-                            type="number"
-                            min="0"
-                            :rules="[(val) => !!val || t('wagon.warnings.labelNotEmpty')]"
-                        />
-                    </div>
-                    <div class="col">
-                        <VnInput
-                            filled
-                            v-model="wagon.plate"
-                            :label="t('wagon.create.plate')"
-                            :rules="[(val) => !!val || t('wagon.warnings.plateNotEmpty')]"
-                        />
-                    </div>
+                    <QInput
+                        filled
+                        v-model="wagon.label"
+                        :label="t('wagon.create.label')"
+                        type="number"
+                        min="0"
+                        :rules="[(val) => !!val || t('wagon.warnings.labelNotEmpty')]"
+                    />
+                    <VnInput
+                        filled
+                        v-model="wagon.plate"
+                        :label="t('wagon.create.plate')"
+                        :rules="[(val) => !!val || t('wagon.warnings.plateNotEmpty')]"
+                    />
                 </div>
                 <div class="row q-col-gutter-md">
-                    <div class="col">
-                        <QInput
-                            filled
-                            v-model="wagon.volume"
-                            :label="t('wagon.create.volume')"
-                            type="number"
-                            min="0"
-                            :rules="[
-                                (val) => !!val || t('wagon.warnings.volumeNotEmpty'),
-                            ]"
-                        />
-                    </div>
-                    <div class="col">
-                        <QSelect
-                            filled
-                            v-model="wagon.typeFk"
-                            use-input
-                            fill-input
-                            hide-selected
-                            input-debounce="0"
-                            option-label="name"
-                            option-value="id"
-                            emit-value
-                            map-options
-                            :label="t('wagon.create.type')"
-                            :options="filteredWagonTypes"
-                            :rules="[(val) => !!val || t('wagon.warnings.typeNotEmpty')]"
-                            @filter="filterType"
-                        >
-                            <template v-if="wagon.typeFk" #append>
-                                <QIcon
-                                    name="cancel"
-                                    @click.stop.prevent="wagon.typeFk = null"
-                                    class="cursor-pointer"
-                                />
-                            </template>
-                            <template #no-option>
-                                <QItem>
-                                    <QItemSection class="text-grey">
-                                        {{ t('wagon.warnings.noData') }}
-                                    </QItemSection>
-                                </QItem>
-                            </template>
-                        </QSelect>
-                    </div>
+                    <QInput
+                        filled
+                        v-model="wagon.volume"
+                        :label="t('wagon.create.volume')"
+                        type="number"
+                        min="0"
+                        :rules="[
+                            (val) => !!val || t('wagon.warnings.volumeNotEmpty'),
+                        ]"
+                    />
+                    <QSelect
+                        filled
+                        v-model="wagon.typeFk"
+                        use-input
+                        fill-input
+                        hide-selected
+                        input-debounce="0"
+                        option-label="name"
+                        option-value="id"
+                        emit-value
+                        map-options
+                        :label="t('wagon.create.type')"
+                        :options="filteredWagonTypes"
+                        :rules="[(val) => !!val || t('wagon.warnings.typeNotEmpty')]"
+                        @filter="filterType"
+                    >
+                        <template v-if="wagon.typeFk" #append>
+                            <QIcon
+                                name="cancel"
+                                @click.stop.prevent="wagon.typeFk = null"
+                                class="cursor-pointer"
+                            />
+                        </template>
+                        <template #no-option>
+                            <QItem>
+                                <QItemSection class="text-grey">
+                                    {{ t('wagon.warnings.noData') }}
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </QSelect>
                 </div>
             </QCard>
             <div class="q-mt-md">
diff --git a/src/pages/Worker/Card/WorkerPBX.vue b/src/pages/Worker/Card/WorkerPBX.vue
index 681194061b..3bba5b33ea 100644
--- a/src/pages/Worker/Card/WorkerPBX.vue
+++ b/src/pages/Worker/Card/WorkerPBX.vue
@@ -57,13 +57,11 @@ const updateModelValue = (data) => {
     >
         <template #form="{}">
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnInput
-                        :label="t('worker.summary.sipExtension')"
-                        v-model="extension"
-                        @update:model-value="updateModelValue"
-                    />
-                </div>
+                <VnInput
+                    :label="t('worker.summary.sipExtension')"
+                    v-model="extension"
+                    @update:model-value="updateModelValue"
+                />
             </VnRow>
         </template>
     </FormModel>
diff --git a/src/pages/Worker/WorkerCreate.vue b/src/pages/Worker/WorkerCreate.vue
index 6c2c9f36e6..85259c043e 100644
--- a/src/pages/Worker/WorkerCreate.vue
+++ b/src/pages/Worker/WorkerCreate.vue
@@ -108,155 +108,122 @@ onMounted(async () => {
         >
             <template #form="{ data, validate }">
                 <VnRow class="row q-gutter-md q-mb-md">
-                    <div class="col">
-                        <VnInput
-                            v-model="data.firstName"
-                            :label="t('worker.create.name')"
-                            :rules="validate('Worker.firstName')"
-                        />
-                    </div>
-                    <div class="col">
-                        <VnInput
-                            v-model="data.lastNames"
-                            :label="t('worker.create.lastName')"
-                            :rules="validate('Worker.lastNames')"
-                        />
-                    </div>
-                    <div class="col">
-                        <VnInputDate
-                            v-model="data.birth"
-                            :label="t('worker.create.birth')"
-                            :rules="validate('Worker.birth')"
-                        />
-                    </div>
+                    <VnInput
+                        v-model="data.firstName"
+                        :label="t('worker.create.name')"
+                        :rules="validate('Worker.firstName')"
+                    />
+                    <VnInput
+                        v-model="data.lastNames"
+                        :label="t('worker.create.lastName')"
+                        :rules="validate('Worker.lastNames')"
+                    />
+                    <VnInputDate
+                        v-model="data.birth"
+                        :label="t('worker.create.birth')"
+                        :rules="validate('Worker.birth')"
+                    />
                 </VnRow>
                 <VnRow class="row q-gutter-md q-mb-md">
-                    <div class="col">
-                        <VnInput
-                            v-model="data.fi"
-                            :label="t('worker.create.fi')"
-                            :rules="validate('Worker.fi')"
-                        />
-                    </div>
-                    <div class="col">
-                        <VnInput
-                            v-model="data.code"
-                            :label="t('worker.create.code')"
-                            :rules="validate('Worker.code')"
-                        />
-                    </div>
-                    <div class="col">
-                        <VnInput
-                            v-model="data.phone"
-                            :label="t('worker.create.phone')"
-                            :rules="validate('Worker.phone')"
-                        />
-                    </div>
+                    <VnInput
+                        v-model="data.fi"
+                        :label="t('worker.create.fi')"
+                        :rules="validate('Worker.fi')"
+                    />
+                    <VnInput
+                        v-model="data.code"
+                        :label="t('worker.create.code')"
+                        :rules="validate('Worker.code')"
+                    />
+                    <VnInput
+                        v-model="data.phone"
+                        :label="t('worker.create.phone')"
+                        :rules="validate('Worker.phone')"
+                    />
                 </VnRow>
                 <VnRow class="row q-gutter-md q-mb-md">
-                    <div class="col">
-                        <VnLocation
-                            :rules="validate('Worker.postcode')"
-                            :roles-allowed-to-create="['deliveryAssistant']"
-                            :options="postcodesOptions"
-                            v-model="data.location"
-                            @update:model-value="
-                                (location) => handleLocation(data, location)
-                            "
-                        >
-                        </VnLocation>
-                    </div>
+                    <VnLocation
+                        :rules="validate('Worker.postcode')"
+                        :roles-allowed-to-create="['deliveryAssistant']"
+                        :options="postcodesOptions"
+                        v-model="data.location"
+                        @update:model-value="(location) => handleLocation(data, location)"
+                    >
+                    </VnLocation>
                 </VnRow>
                 <VnRow class="row q-gutter-md q-mb-md">
-                    <div class="col">
-                        <VnInput
-                            :label="t('worker.create.street')"
-                            v-model="data.street"
-                            :rules="validate('Worker.street')"
-                        />
-                    </div>
+                    <VnInput
+                        :label="t('worker.create.street')"
+                        v-model="data.street"
+                        :rules="validate('Worker.street')"
+                    />
                 </VnRow>
                 <VnRow class="row q-gutter-md q-mb-md">
-                    <div class="col">
-                        <VnInput
-                            v-model="data.name"
-                            :label="t('worker.create.webUser')"
-                            :rules="validate('Worker.name')"
-                        />
-                    </div>
-                    <div class="col">
-                        <VnInput
-                            v-model="data.email"
-                            :label="t('worker.create.personalEmail')"
-                            :rules="validate('Worker.email')"
-                        />
-                    </div>
+                    <VnInput
+                        v-model="data.name"
+                        :label="t('worker.create.webUser')"
+                        :rules="validate('Worker.name')"
+                    />
+                    <VnInput
+                        v-model="data.email"
+                        :label="t('worker.create.personalEmail')"
+                        :rules="validate('Worker.email')"
+                    />
                 </VnRow>
                 <VnRow class="row q-gutter-md q-mb-md">
-                    <div class="col">
-                        <VnSelect
-                            :label="t('worker.create.company')"
-                            v-model="data.companyFk"
-                            :options="companiesOptions"
-                            option-value="id"
-                            option-label="code"
-                            hide-selected
-                            :rules="validate('Worker.company')"
-                        />
-                    </div>
-                    <div class="col">
-                        <VnSelect
-                            :label="t('worker.create.boss')"
-                            v-model="data.bossFk"
-                            :options="workersOptions"
-                            option-value="id"
-                            option-label="name"
-                            hide-selected
-                            :rules="validate('Worker.boss')"
-                        >
-                            <template #option="scope">
-                                <QItem v-bind="scope.itemProps">
-                                    <QItemSection>
-                                        <QItemLabel>{{ scope.opt.name }}</QItemLabel>
-                                        <QItemLabel caption
-                                            >{{ scope.opt.nickname }},
-                                            {{ scope.opt.code }}
-                                        </QItemLabel>
-                                    </QItemSection>
-                                </QItem>
-                            </template>
-                        </VnSelect>
-                    </div>
+                    <VnSelect
+                        :label="t('worker.create.company')"
+                        v-model="data.companyFk"
+                        :options="companiesOptions"
+                        option-value="id"
+                        option-label="code"
+                        hide-selected
+                        :rules="validate('Worker.company')"
+                    />
+                    <VnSelect
+                        :label="t('worker.create.boss')"
+                        v-model="data.bossFk"
+                        :options="workersOptions"
+                        option-value="id"
+                        option-label="name"
+                        hide-selected
+                        :rules="validate('Worker.boss')"
+                    >
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection>
+                                    <QItemLabel>{{ scope.opt.name }}</QItemLabel>
+                                    <QItemLabel caption
+                                        >{{ scope.opt.nickname }},
+                                        {{ scope.opt.code }}
+                                    </QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelect>
                 </VnRow>
                 <VnRow class="row q-gutter-md q-mb-md">
-                    <div class="col">
-                        <VnSelect
-                            :label="t('worker.create.payMethods')"
-                            v-model="data.payMethodFk"
-                            :options="payMethodsOptions"
-                            option-value="id"
-                            option-label="name"
-                            map-options
-                            hide-selected
-                            :rules="validate('Worker.payMethodFk')"
-                        />
-                    </div>
-
-                    <div class="col">
-                        <VnInput
-                            v-model="data.iban"
-                            :label="t('worker.create.iban')"
-                            :rules="validate('Worker.iban')"
-                        >
-                            <template #append>
-                                <QIcon name="info" class="cursor-info">
-                                    <QTooltip>{{
-                                        t('components.iban_tooltip')
-                                    }}</QTooltip>
-                                </QIcon>
-                            </template>
-                        </VnInput>
-                    </div>
+                    <VnSelect
+                        :label="t('worker.create.payMethods')"
+                        v-model="data.payMethodFk"
+                        :options="payMethodsOptions"
+                        option-value="id"
+                        option-label="name"
+                        map-options
+                        hide-selected
+                        :rules="validate('Worker.payMethodFk')"
+                    />
+                    <VnInput
+                        v-model="data.iban"
+                        :label="t('worker.create.iban')"
+                        :rules="validate('Worker.iban')"
+                    >
+                        <template #append>
+                            <QIcon name="info" class="cursor-info">
+                                <QTooltip>{{ t('components.iban_tooltip') }}</QTooltip>
+                            </QIcon>
+                        </template>
+                    </VnInput>
                     <VnSelectDialog
                         :label="t('worker.create.bankEntity')"
                         v-model="data.bankEntityFk"