+
+@@ -148,8 +153,6 @@ const filterOptions = {
+ @filter="(value, update) => filter(value, update, filterOptions)"
+ emit-value
+ map-options
+- option-label="name"
+- option-value="id"
+ use-input
+ v-model="data.salesPersonFk"
+ >
+@@ -172,8 +175,6 @@ const filterOptions = {
+ :rules="validate('client.contactChannelFk')"
+ emit-value
+ map-options
+- option-label="name"
+- option-value="id"
+ v-model="data.contactChannelFk"
+ />
+
+@@ -187,8 +188,6 @@ const filterOptions = {
+ :rules="validate('client.transferorFk')"
+ emit-value
+ map-options
+- option-label="name"
+- option-value="id"
+ v-model="data.transferorFk"
+ >
+
+diff --git a/src/pages/Customer/Card/CustomerBillingData.vue b/src/pages/Customer/Card/CustomerBillingData.vue
+index e1b12619..3a553b88 100644
+--- a/src/pages/Customer/Card/CustomerBillingData.vue
++++ b/src/pages/Customer/Card/CustomerBillingData.vue
+@@ -53,8 +53,6 @@ const getBankEntities = (data, formData) => {
+ :label="t('Billing data')"
+ :options="payMethods"
+ hide-selected
+- option-label="name"
+- option-value="id"
+ v-model="data.payMethod"
+ />
+
+@@ -85,8 +83,6 @@ const getBankEntities = (data, formData) => {
+ :roles-allowed-to-create="['salesAssistant', 'hr']"
+ :rules="validate('Worker.bankEntity')"
+ hide-selected
+- option-label="name"
+- option-value="id"
+ v-model="data.bankEntityFk"
+ >
+
+diff --git a/src/pages/Customer/Card/CustomerFiscalData.vue b/src/pages/Customer/Card/CustomerFiscalData.vue
+index f74cbc2c..f61f88cd 100644
+--- a/src/pages/Customer/Card/CustomerFiscalData.vue
++++ b/src/pages/Customer/Card/CustomerFiscalData.vue
+@@ -74,7 +74,6 @@ function handleLocation(data, location) {
+ :options="typesTaxes"
+ hide-selected
+ option-label="vat"
+- option-value="id"
+ v-model="data.sageTaxTypeFk"
+ />
+
+@@ -84,7 +83,6 @@ function handleLocation(data, location) {
+ :options="typesTransactions"
+ hide-selected
+ option-label="transaction"
+- option-value="id"
+ v-model="data.sageTransactionTypeFk"
+ >
+
+diff --git a/src/pages/Customer/Card/CustomerLog.vue b/src/pages/Customer/Card/CustomerLog.vue
+index c237e5fd..02b7b745 100644
+--- a/src/pages/Customer/Card/CustomerLog.vue
++++ b/src/pages/Customer/Card/CustomerLog.vue
+@@ -144,8 +144,6 @@ const setInq = (value, status) => {
+ :options="[]"
+ class="q-mt-md"
+ hide-selected
+- option-label="name"
+- option-value="id"
+ />
+
+
+@@ -184,8 +182,6 @@ const setInq = (value, status) => {
+ :options="[]"
+ class="q-mt-sm"
+ hide-selected
+- option-label="name"
+- option-value="id"
+ />
+
+
+diff --git a/src/pages/Customer/CustomerCreate.vue b/src/pages/Customer/CustomerCreate.vue
+index 4addb1d6..627908a3 100644
+--- a/src/pages/Customer/CustomerCreate.vue
++++ b/src/pages/Customer/CustomerCreate.vue
+@@ -57,8 +57,6 @@ function handleLocation(data, location) {
+ :label="t('Salesperson')"
+ :options="workersOptions"
+ hide-selected
+- option-label="name"
+- option-value="id"
+ v-model="data.salesPersonFk"
+ />
+
+diff --git a/src/pages/Customer/CustomerFilter.vue b/src/pages/Customer/CustomerFilter.vue
+index 593b4550..333951b7 100644
+--- a/src/pages/Customer/CustomerFilter.vue
++++ b/src/pages/Customer/CustomerFilter.vue
+@@ -70,8 +70,6 @@ const zones = ref();
+ v-model="params.salesPersonFk"
+ @update:model-value="searchFn()"
+ :options="workers"
+- option-value="id"
+- option-label="name"
+ emit-value
+ map-options
+ use-input
+@@ -93,8 +91,6 @@ const zones = ref();
+ v-model="params.provinceFk"
+ @update:model-value="searchFn()"
+ :options="provinces"
+- option-value="id"
+- option-label="name"
+ emit-value
+ map-options
+ hide-selected
+@@ -140,8 +136,6 @@ const zones = ref();
+ v-model="params.zoneFk"
+ @update:model-value="searchFn()"
+ :options="zones"
+- option-value="id"
+- option-label="name"
+ emit-value
+ map-options
+ hide-selected
+diff --git a/src/pages/Customer/Defaulter/CustomerDefaulterFilter.vue b/src/pages/Customer/Defaulter/CustomerDefaulterFilter.vue
+index 3ba7f655..c07dd5b4 100644
+--- a/src/pages/Customer/Defaulter/CustomerDefaulterFilter.vue
++++ b/src/pages/Customer/Defaulter/CustomerDefaulterFilter.vue
+@@ -56,7 +56,6 @@ const authors = ref();
+ emit-value
+ hide-selected
+ map-options
+- option-label="name"
+ option-value="clientTypeFk"
+ outlined
+ rounded
+@@ -79,8 +78,6 @@ const authors = ref();
+ emit-value
+ hide-selected
+ map-options
+- option-label="name"
+- option-value="id"
+ outlined
+ rounded
+ use-input
+@@ -103,7 +100,6 @@ const authors = ref();
+ hide-selected
+ map-options
+ option-label="country"
+- option-value="id"
+ outlined
+ rounded
+ use-input
+@@ -147,8 +143,6 @@ const authors = ref();
+ emit-value
+ hide-selected
+ map-options
+- option-label="name"
+- option-value="id"
+ outlined
+ rounded
+ use-input
+diff --git a/src/pages/Customer/ExtendedList/CustomerExtendedListFilter.vue b/src/pages/Customer/ExtendedList/CustomerExtendedListFilter.vue
+index df898e7c..b3191316 100644
+--- a/src/pages/Customer/ExtendedList/CustomerExtendedListFilter.vue
++++ b/src/pages/Customer/ExtendedList/CustomerExtendedListFilter.vue
+@@ -208,8 +208,6 @@ const shouldRenderColumn = (colName) => {
+ v-model="params.salesPersonFk"
+ @update:model-value="searchFn()"
+ :options="workers"
+- option-value="id"
+- option-label="name"
+ emit-value
+ map-options
+ use-input
+@@ -275,7 +273,6 @@ const shouldRenderColumn = (colName) => {
+ v-model="params.countryFk"
+ @update:model-value="searchFn()"
+ :options="countriesOptions"
+- option-value="id"
+ option-label="country"
+ map-options
+ hide-selected
+@@ -292,8 +289,6 @@ const shouldRenderColumn = (colName) => {
+ v-model="params.provinceFk"
+ @update:model-value="searchFn()"
+ :options="provincesOptions"
+- option-value="id"
+- option-label="name"
+ map-options
+ hide-selected
+ dense
+@@ -368,8 +363,6 @@ const shouldRenderColumn = (colName) => {
+ v-model="params.payMethodFk"
+ :options="paymethodsOptions"
+ @update:model-value="searchFn()"
+- option-value="id"
+- option-label="name"
+ map-options
+ hide-selected
+ dense
+@@ -387,7 +380,6 @@ const shouldRenderColumn = (colName) => {
+ v-model="params.sageTaxTypeFk"
+ @update:model-value="searchFn()"
+ :options="sageTaxTypesOptions"
+- option-value="id"
+ option-label="vat"
+ map-options
+ hide-selected
+@@ -408,7 +400,6 @@ const shouldRenderColumn = (colName) => {
+ v-model="params.sageTransactionTypeFk"
+ @update:model-value="searchFn()"
+ :options="sageTransactionTypesOptions"
+- option-value="id"
+ option-label="transaction"
+ map-options
+ hide-selected
+diff --git a/src/pages/Customer/Notifications/CustomerNotificationsFilter.vue b/src/pages/Customer/Notifications/CustomerNotificationsFilter.vue
+index 320fc205..539b9065 100644
+--- a/src/pages/Customer/Notifications/CustomerNotificationsFilter.vue
++++ b/src/pages/Customer/Notifications/CustomerNotificationsFilter.vue
+@@ -85,7 +85,6 @@ const clients = ref();
+ emit-value
+ hide-selected
+ map-options
+- option-label="name"
+ option-value="name"
+ outlined
+ rounded
+diff --git a/src/pages/Customer/components/CustomerAddressCreate.vue b/src/pages/Customer/components/CustomerAddressCreate.vue
+index 30d4acf8..2d379448 100644
+--- a/src/pages/Customer/components/CustomerAddressCreate.vue
++++ b/src/pages/Customer/components/CustomerAddressCreate.vue
+@@ -119,8 +119,6 @@ function handleLocation(data, location) {
+ :options="agencyModes"
+ :rules="validate('route.agencyFk')"
+ hide-selected
+- option-label="name"
+- option-value="id"
+ v-model="data.agencyModeFk"
+ />
+
+@@ -138,7 +136,6 @@ function handleLocation(data, location) {
+ :label="t('Incoterms')"
+ :options="incoterms"
+ hide-selected
+- option-label="name"
+ option-value="code"
+ v-model="data.incotermsFk"
+ />
+@@ -149,7 +146,6 @@ function handleLocation(data, location) {
+ :options="customsAgents"
+ hide-selected
+ option-label="fiscalName"
+- option-value="id"
+ v-model="data.customsAgentFk"
+ >
+
+diff --git a/src/pages/Customer/components/CustomerAddressEdit.vue b/src/pages/Customer/components/CustomerAddressEdit.vue
+index 8f4be134..85e6456a 100644
+--- a/src/pages/Customer/components/CustomerAddressEdit.vue
++++ b/src/pages/Customer/components/CustomerAddressEdit.vue
+@@ -190,8 +190,6 @@ function handleLocation(data, location) {
+ :options="agencyModes"
+ :rules="validate('route.agencyFk')"
+ hide-selected
+- option-label="name"
+- option-value="id"
+ v-model="data.agencyModeFk"
+ />
+
+@@ -209,7 +207,6 @@ function handleLocation(data, location) {
+ :label="t('Incoterms')"
+ :options="incoterms"
+ hide-selected
+- option-label="name"
+ option-value="code"
+ v-model="data.incotermsFk"
+ />
+@@ -220,7 +217,6 @@ function handleLocation(data, location) {
+ :options="customsAgents"
+ hide-selected
+ option-label="fiscalName"
+- option-value="id"
+ v-model="data.customsAgentFk"
+ >
+
+@@ -242,7 +238,6 @@ function handleLocation(data, location) {
+ :options="observationTypes"
+ hide-selected
+ option-label="description"
+- option-value="id"
+ v-model="note.observationTypeFk"
+ />
+
+diff --git a/src/pages/Customer/components/CustomerFileManagementCreate.vue b/src/pages/Customer/components/CustomerFileManagementCreate.vue
+index 6d76c2b7..8bde9642 100644
+--- a/src/pages/Customer/components/CustomerFileManagementCreate.vue
++++ b/src/pages/Customer/components/CustomerFileManagementCreate.vue
+@@ -154,7 +154,6 @@ const toCustomerFileManagement = () => {
+ :options="optionsCompanies"
+ :rules="validate('entry.companyFk')"
+ option-label="code"
+- option-value="id"
+ v-model="dms.companyId"
+ />
+
+@@ -165,8 +164,6 @@ const toCustomerFileManagement = () => {
+
+
+@@ -174,8 +171,6 @@ const toCustomerFileManagement = () => {
+
+
+diff --git a/src/pages/Customer/components/CustomerFileManagementEdit.vue b/src/pages/Customer/components/CustomerFileManagementEdit.vue
+index f1279b93..f813d1d6 100644
+--- a/src/pages/Customer/components/CustomerFileManagementEdit.vue
++++ b/src/pages/Customer/components/CustomerFileManagementEdit.vue
+@@ -132,7 +132,6 @@ const toCustomerFileManagement = () => {
+ :options="optionsCompanies"
+ :rules="validate('entry.companyFk')"
+ option-label="code"
+- option-value="id"
+ v-model="dms.companyId"
+ />
+
+@@ -143,8 +142,6 @@ const toCustomerFileManagement = () => {
+
+
+@@ -152,8 +149,6 @@ const toCustomerFileManagement = () => {
+
+
+diff --git a/src/pages/Customer/components/CustomerGreugeCreate.vue b/src/pages/Customer/components/CustomerGreugeCreate.vue
+index d8915dc1..8eb67582 100644
+--- a/src/pages/Customer/components/CustomerGreugeCreate.vue
++++ b/src/pages/Customer/components/CustomerGreugeCreate.vue
+@@ -78,8 +78,6 @@ const toCustomerGreuges = () => {
+ :label="t('Type')"
+ :options="greugeTypes"
+ hide-selected
+- option-label="name"
+- option-value="id"
+ v-model="data.greugeTypeFk"
+ />
+
+diff --git a/src/pages/Customer/components/CustomerNewPayment.vue b/src/pages/Customer/components/CustomerNewPayment.vue
+index c52cc18d..322c43c8 100644
+--- a/src/pages/Customer/components/CustomerNewPayment.vue
++++ b/src/pages/Customer/components/CustomerNewPayment.vue
+@@ -150,7 +150,6 @@ const onDataSaved = async () => {
+ :rules="validate('entry.companyFk')"
+ hide-selected
+ option-label="code"
+- option-value="id"
+ v-model="data.companyFk"
+ />
+
+@@ -165,7 +164,6 @@ const onDataSaved = async () => {
+ @update:model-value="setPaymentType($event)"
+ hide-selected
+ option-label="bank"
+- option-value="id"
+ v-model="data.bankFk"
+ >
+
+diff --git a/src/pages/Customer/components/CustomerSamplesCreate.vue b/src/pages/Customer/components/CustomerSamplesCreate.vue
+index 7b0d34bd..ad7f98cd 100644
+--- a/src/pages/Customer/components/CustomerSamplesCreate.vue
++++ b/src/pages/Customer/components/CustomerSamplesCreate.vue
+@@ -189,7 +189,6 @@ const toCustomerSamples = () => {
+ @update:model-value="setSampleType"
+ hide-selected
+ option-label="description"
+- option-value="id"
+ required="true"
+ v-model="data.typeFk"
+ />
+@@ -242,7 +241,6 @@ const toCustomerSamples = () => {
+ :rules="validate('entry.companyFk')"
+ hide-selected
+ option-label="code"
+- option-value="id"
+ required="true"
+ v-model="data.companyFk"
+ v-if="sampleType.hasCompany"
+@@ -254,7 +252,6 @@ const toCustomerSamples = () => {
+ :options="optionsClientsAddressess"
+ hide-selected
+ option-label="nickname"
+- option-value="id"
+ required="true"
+ v-model="data.addressId"
+ v-if="sampleType.id === 20"
+diff --git a/src/pages/Department/Card/DepartmentBasicData.vue b/src/pages/Department/Card/DepartmentBasicData.vue
+index 3b30a97e..819d6a2c 100644
+--- a/src/pages/Department/Card/DepartmentBasicData.vue
++++ b/src/pages/Department/Card/DepartmentBasicData.vue
+@@ -72,8 +72,6 @@ const clientsOptions = ref([]);
+ :label="t('department.bossDepartment')"
+ v-model="data.workerFk"
+ :options="workersOptions"
+- option-value="id"
+- option-label="name"
+ hide-selected
+ map-options
+ :rules="validate('department.workerFk')"
+@@ -84,8 +82,6 @@ const clientsOptions = ref([]);
+ :label="t('department.selfConsumptionCustomer')"
+ v-model="data.clientFk"
+ :options="clientsOptions"
+- option-value="id"
+- option-label="name"
+ hide-selected
+ map-options
+ :rules="validate('department.clientFk')"
+diff --git a/src/pages/Entry/Card/EntryBasicData.vue b/src/pages/Entry/Card/EntryBasicData.vue
+index a98a1227..57b29651 100644
+--- a/src/pages/Entry/Card/EntryBasicData.vue
++++ b/src/pages/Entry/Card/EntryBasicData.vue
+@@ -69,7 +69,6 @@ const onFilterTravelSelected = (formData, id) => {
+ :label="t('entry.basicData.supplier')"
+ v-model="data.supplierFk"
+ :options="suppliersOptions"
+- option-value="id"
+ option-label="nickname"
+ hide-selected
+ :required="true"
+@@ -92,7 +91,6 @@ const onFilterTravelSelected = (formData, id) => {
+ :label="t('entry.basicData.travel')"
+ v-model="data.travelFk"
+ :options="travelsOptions"
+- option-value="id"
+ option-label="warehouseInName"
+ map-options
+ hide-selected
+@@ -141,7 +139,6 @@ const onFilterTravelSelected = (formData, id) => {
+ :label="t('entry.basicData.company')"
+ v-model="data.companyFk"
+ :options="companiesOptions"
+- option-value="id"
+ option-label="code"
+ map-options
+ hide-selected
+@@ -155,7 +152,6 @@ const onFilterTravelSelected = (formData, id) => {
+ :label="t('entry.basicData.currency')"
+ v-model="data.currencyFk"
+ :options="currenciesOptions"
+- option-value="id"
+ option-label="code"
+ />
+
+diff --git a/src/pages/Entry/Card/EntryNotes.vue b/src/pages/Entry/Card/EntryNotes.vue
+index 0d2e5e51..846b891a 100644
+--- a/src/pages/Entry/Card/EntryNotes.vue
++++ b/src/pages/Entry/Card/EntryNotes.vue
+@@ -57,7 +57,6 @@ onMounted(() => {
+ :options="entryObservationsOptions"
+ :disable="!!row.id"
+ option-label="description"
+- option-value="id"
+ hide-selected
+ />
+
+diff --git a/src/pages/Entry/EntryCreate.vue b/src/pages/Entry/EntryCreate.vue
+index 8c434217..0f9dad2a 100644
+--- a/src/pages/Entry/EntryCreate.vue
++++ b/src/pages/Entry/EntryCreate.vue
+@@ -85,7 +85,6 @@ const redirectToEntryBasicData = (_, { id }) => {
+ class="full-width"
+ v-model="data.supplierFk"
+ :options="suppliersOptions"
+- option-value="id"
+ option-label="nickname"
+ hide-selected
+ :required="true"
+@@ -111,7 +110,6 @@ const redirectToEntryBasicData = (_, { id }) => {
+ class="full-width"
+ v-model="data.travelFk"
+ :options="travelsOptions"
+- option-value="id"
+ option-label="warehouseInName"
+ map-options
+ hide-selected
+@@ -143,7 +141,6 @@ const redirectToEntryBasicData = (_, { id }) => {
+ class="full-width"
+ v-model="data.companyFk"
+ :options="companiesOptions"
+- option-value="id"
+ option-label="code"
+ map-options
+ hide-selected
+diff --git a/src/pages/Entry/EntryFilter.vue b/src/pages/Entry/EntryFilter.vue
+index 22ddf0bb..ccef9b4e 100644
+--- a/src/pages/Entry/EntryFilter.vue
++++ b/src/pages/Entry/EntryFilter.vue
+@@ -97,7 +97,6 @@ const suppliersOptions = ref([]);
+ v-model="params.companyFk"
+ @update:model-value="searchFn()"
+ :options="companiesOptions"
+- option-value="id"
+ option-label="code"
+ hide-selected
+ dense
+@@ -113,8 +112,6 @@ const suppliersOptions = ref([]);
+ v-model="params.currencyFk"
+ @update:model-value="searchFn()"
+ :options="currenciesOptions"
+- option-value="id"
+- option-label="name"
+ hide-selected
+ dense
+ outlined
+@@ -129,8 +126,6 @@ const suppliersOptions = ref([]);
+ v-model="params.supplierFk"
+ @update:model-value="searchFn()"
+ :options="suppliersOptions"
+- option-value="id"
+- option-label="name"
+ hide-selected
+ dense
+ outlined
+diff --git a/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue b/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue
+index f557c8ef..5dd0aa15 100644
+--- a/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue
++++ b/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue
+@@ -186,7 +186,6 @@ async function upsert() {
+
+
+@@ -415,7 +413,6 @@ async function upsert() {
+ :label="t('Company')"
+ v-model="data.companyFk"
+ :options="companies"
+- option-value="id"
+ option-label="code"
+ />
+
+@@ -456,7 +453,6 @@ async function upsert() {
+ :label="`${t('Company')}*`"
+ v-model="dms.companyId"
+ :options="companies"
+- option-value="id"
+ option-label="code"
+ :rules="[requiredFieldRule]"
+ />
+@@ -467,8 +463,6 @@ async function upsert() {
+ :label="`${t('Warehouse')}*`"
+ v-model="dms.warehouseId"
+ :options="warehouses"
+- option-value="id"
+- option-label="name"
+ :rules="[requiredFieldRule]"
+ />
+
+
+@@ -565,7 +557,6 @@ async function upsert() {
+ :label="`${t('Company')}*`"
+ v-model="dms.companyId"
+ :options="companies"
+- option-value="id"
+ option-label="code"
+ :rules="[requiredFieldRule]"
+ />
+@@ -576,8 +567,6 @@ async function upsert() {
+ :label="`${t('Warehouse')}*`"
+ v-model="dms.warehouseId"
+ :options="warehouses"
+- option-value="id"
+- option-label="name"
+ :rules="[requiredFieldRule]"
+ />
+
+
+diff --git a/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue b/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
+index 5adaeca9..280c194d 100644
+--- a/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
++++ b/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
+@@ -484,7 +484,6 @@ const createInvoiceInCorrection = async () => {
+ :label="`${useCapitalize(t('globals.class'))}*`"
+ v-model="correctionFormData.invoiceClass"
+ :options="siiTypeInvoiceOuts"
+- option-value="id"
+ option-label="code"
+ :rules="[requiredFieldRule]"
+ />
+@@ -494,7 +493,6 @@ const createInvoiceInCorrection = async () => {
+ :label="`${useCapitalize(t('globals.type'))}*`"
+ v-model="correctionFormData.invoiceType"
+ :options="cplusRectificationTypes"
+- option-value="id"
+ option-label="description"
+ :rules="[requiredFieldRule]"
+ />
+@@ -502,7 +500,6 @@ const createInvoiceInCorrection = async () => {
+ :label="`${useCapitalize(t('globals.reason'))}*`"
+ v-model="correctionFormData.invoiceReason"
+ :options="invoiceCorrectionTypes"
+- option-value="id"
+ option-label="description"
+ :rules="[requiredFieldRule]"
+ />
+diff --git a/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue b/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue
+index e240e9a8..5cca5ee3 100644
+--- a/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue
++++ b/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue
+@@ -235,7 +235,6 @@ async function insert() {
+ class="full-width"
+ v-model="props.row['bankFk']"
+ :options="banks"
+- option-value="id"
+ option-label="bank"
+ >
+
+diff --git a/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue b/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue
+index 58f52153..a6ccd8b0 100644
+--- a/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue
++++ b/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue
+@@ -151,7 +151,6 @@ function getTotal(type) {
+
+@@ -168,7 +167,6 @@ function getTotal(type) {
+
+