From 397df9fd78abc5d20e88242b0fe431f770306176 Mon Sep 17 00:00:00 2001 From: Javier Segarra <jsegarra@verdnatura.es> Date: Sat, 1 Mar 2025 20:12:39 +0100 Subject: [PATCH] feat: refs #6943 solve conflicts --- src/pages/Customer/Card/CustomerFiscalData.vue | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/pages/Customer/Card/CustomerFiscalData.vue b/src/pages/Customer/Card/CustomerFiscalData.vue index e603c7268..c9eb00981 100644 --- a/src/pages/Customer/Card/CustomerFiscalData.vue +++ b/src/pages/Customer/Card/CustomerFiscalData.vue @@ -144,7 +144,6 @@ async function acceptPropagate({ isEqualizated }) { <VnInput :label="t('Street')" clearable v-model="data.street" required /> </VnRow> <VnRow> - {{ data.isTaxDataChecked }} <VnSelect :label="t('Sage tax type')" :options="typesTaxes" @@ -153,7 +152,7 @@ async function acceptPropagate({ isEqualizated }) { option-value="id" v-model="data.sageTaxTypeFk" data-cy="sageTaxTypeFk" - :required="true" + :required="data.isTaxDataChecked" @update:model-value="hasChangedTaxData = true" /> <VnSelect @@ -164,7 +163,7 @@ async function acceptPropagate({ isEqualizated }) { option-value="id" data-cy="sageTransactionTypeFk" v-model="data.sageTransactionTypeFk" - :required="true" + :required="data.isTaxDataChecked" @update:model-value="hasChangedTaxData = true" > <template #option="scope">