feat: refs #6943 solve conflicts
gitea/salix-front/pipeline/pr-dev This commit is unstable Details

This commit is contained in:
Javier Segarra 2025-03-01 20:12:39 +01:00
parent a92f66fbcb
commit 397df9fd78
1 changed files with 2 additions and 3 deletions

View File

@ -144,7 +144,6 @@ async function acceptPropagate({ isEqualizated }) {
<VnInput :label="t('Street')" clearable v-model="data.street" required /> <VnInput :label="t('Street')" clearable v-model="data.street" required />
</VnRow> </VnRow>
<VnRow> <VnRow>
{{ data.isTaxDataChecked }}
<VnSelect <VnSelect
:label="t('Sage tax type')" :label="t('Sage tax type')"
:options="typesTaxes" :options="typesTaxes"
@ -153,7 +152,7 @@ async function acceptPropagate({ isEqualizated }) {
option-value="id" option-value="id"
v-model="data.sageTaxTypeFk" v-model="data.sageTaxTypeFk"
data-cy="sageTaxTypeFk" data-cy="sageTaxTypeFk"
:required="true" :required="data.isTaxDataChecked"
@update:model-value="hasChangedTaxData = true" @update:model-value="hasChangedTaxData = true"
/> />
<VnSelect <VnSelect
@ -164,7 +163,7 @@ async function acceptPropagate({ isEqualizated }) {
option-value="id" option-value="id"
data-cy="sageTransactionTypeFk" data-cy="sageTransactionTypeFk"
v-model="data.sageTransactionTypeFk" v-model="data.sageTransactionTypeFk"
:required="true" :required="data.isTaxDataChecked"
@update:model-value="hasChangedTaxData = true" @update:model-value="hasChangedTaxData = true"
> >
<template #option="scope"> <template #option="scope">