MALIO-DEV/Starseed
3
0
Fork 0
Code Issues Pull Requests 6 Actions Packages Projects Releases Wiki Activity

fix(front) : pas d'etoile required sur les champs adresse en consultation (4 modules) (ERP-193)

Browse Source 
Les *AddressBlock derivent desormais required de l'etat editable
(:required="!readonly && !disabled") : l'asterisque obligatoire reste en
creation/edition mais disparait en consultation (bloc disabled).
This commit is contained in:
Autin
2026-06-19 15:45:49 +02:00
parent ad7d201285
commit 3462510c15
4 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/modules/commercial/components/ClientAddressBlock.vue
+10 -10
View File
@@ -22,7 +22,7 @@
:label="t('commercial.clients.form.address.addressType')" :label="t('commercial.clients.form.address.addressType')"
:readonly="readonly" :readonly="readonly"
:disabled="disabled" :disabled="disabled"
:required="true" :required="!readonly && !disabled"
:error="errors?.isProspect" :error="errors?.isProspect"
@update:model-value="onAddressTypeChange" @update:model-value="onAddressTypeChange"
/> />
@@ -35,7 +35,7 @@
:display-tag="true" :display-tag="true"
:readonly="readonly" :readonly="readonly"
:disabled="disabled" :disabled="disabled"
:required="true" :required="!readonly && !disabled"
:error="errors?.sites" :error="errors?.sites"
@update:model-value="(v: (string | number)[]) => update('siteIris', v.map(String))" @update:model-value="(v: (string | number)[]) => update('siteIris', v.map(String))"
/> />
@@ -58,7 +58,7 @@
v-if="isBillingEmailRequired(model)" v-if="isBillingEmailRequired(model)"
:model-value="model.billingEmail" :model-value="model.billingEmail"
:label="t('commercial.clients.form.address.billingEmail')" :label="t('commercial.clients.form.address.billingEmail')"
:required="true" :required="!readonly && !disabled"
:readonly="readonly" :readonly="readonly"
:disabled="disabled" :disabled="disabled"
:lowercase="true" :lowercase="true"
@@ -88,7 +88,7 @@
:display-tag="true" :display-tag="true"
:readonly="readonly" :readonly="readonly"
:disabled="disabled" :disabled="disabled"
:required="true" :required="!readonly && !disabled"
:error="errors?.categories" :error="errors?.categories"
@update:model-value="(v: (string | number)[]) => update('categoryIris', v.map(String))" @update:model-value="(v: (string | number)[]) => update('categoryIris', v.map(String))"
/> />
@@ -99,7 +99,7 @@
:label="t('commercial.clients.form.address.country')" :label="t('commercial.clients.form.address.country')"
:readonly="readonly" :readonly="readonly"
:disabled="disabled" :disabled="disabled"
:required="true" :required="!readonly && !disabled"
@update:model-value="(v: string | number | null) => update('country', String(v ?? 'France'))" @update:model-value="(v: string | number | null) => update('country', String(v ?? 'France'))"
/> />
@@ -109,7 +109,7 @@
:mask="POSTAL_CODE_MASK" :mask="POSTAL_CODE_MASK"
:readonly="readonly" :readonly="readonly"
:disabled="disabled" :disabled="disabled"
:required="true" :required="!readonly && !disabled"
:error="errors?.postalCode" :error="errors?.postalCode"
@update:model-value="onPostalCodeChange" @update:model-value="onPostalCodeChange"
/> />
@@ -125,7 +125,7 @@
:readonly="readonly" :readonly="readonly"
:disabled="disabled" :disabled="disabled"
empty-option-label="" empty-option-label=""
:required="true" :required="!readonly && !disabled"
:error="errors?.city" :error="errors?.city"
@update:model-value="(v: string | number | null) => update('city', v === null ? null : String(v))" @update:model-value="(v: string | number | null) => update('city', v === null ? null : String(v))"
/> />
@@ -136,7 +136,7 @@
:mask="ADDRESS_MASK" :mask="ADDRESS_MASK"
:readonly="readonly" :readonly="readonly"
:disabled="disabled" :disabled="disabled"
:required="true" :required="!readonly && !disabled"
:error="errors?.city" :error="errors?.city"
@update:model-value="(v: string) => update('city', v)" @update:model-value="(v: string) => update('city', v)"
/> />
@@ -161,7 +161,7 @@
:label="t('commercial.clients.form.address.street')" :label="t('commercial.clients.form.address.street')"
:readonly="readonly" :readonly="readonly"
:disabled="disabled" :disabled="disabled"
:required="true" :required="!readonly && !disabled"
:error="errors?.street" :error="errors?.street"
:allow-create="true" :allow-create="true"
:no-results-text="t('commercial.clients.form.address.streetNotFound')" :no-results-text="t('commercial.clients.form.address.streetNotFound')"
@@ -175,7 +175,7 @@
:label="t('commercial.clients.form.address.street')" :label="t('commercial.clients.form.address.street')"
:readonly="readonly" :readonly="readonly"
:disabled="disabled" :disabled="disabled"
:required="true" :required="!readonly && !disabled"
:error="errors?.street" :error="errors?.street"
@update:model-value="(v: string) => update('street', v)" @update:model-value="(v: string) => update('street', v)"
/> />
frontend/modules/commercial/components/SupplierAddressBlock.vue
+9 -9
View File
@@ -20,7 +20,7 @@
:readonly="readonly" :readonly="readonly"
:disabled="disabled" :disabled="disabled"
empty-option-label="" empty-option-label=""
:required="true" :required="!readonly && !disabled"
:error="errors?.addressType" :error="errors?.addressType"
@update:model-value="(v: string | number | null) => update('addressType', v === null ? null : (v as SupplierAddressType))" @update:model-value="(v: string | number | null) => update('addressType', v === null ? null : (v as SupplierAddressType))"
/> />
@@ -33,7 +33,7 @@
:display-tag="true" :display-tag="true"
:readonly="readonly" :readonly="readonly"
:disabled="disabled" :disabled="disabled"
:required="true" :required="!readonly && !disabled"
:error="errors?.sites" :error="errors?.sites"
@update:model-value="(v: (string | number)[]) => update('siteIris', v.map(String))" @update:model-value="(v: (string | number)[]) => update('siteIris', v.map(String))"
/> />
@@ -61,7 +61,7 @@
:display-tag="true" :display-tag="true"
:readonly="readonly" :readonly="readonly"
:disabled="disabled" :disabled="disabled"
:required="true" :required="!readonly && !disabled"
:error="errors?.categories" :error="errors?.categories"
@update:model-value="(v: (string | number)[]) => update('categoryIris', v.map(String))" @update:model-value="(v: (string | number)[]) => update('categoryIris', v.map(String))"
/> />
@@ -72,7 +72,7 @@
:label="t('commercial.suppliers.form.address.country')" :label="t('commercial.suppliers.form.address.country')"
:readonly="readonly" :readonly="readonly"
:disabled="disabled" :disabled="disabled"
:required="true" :required="!readonly && !disabled"
@update:model-value="(v: string | number | null) => update('country', String(v ?? 'France'))" @update:model-value="(v: string | number | null) => update('country', String(v ?? 'France'))"
/> />
@@ -82,7 +82,7 @@
:mask="POSTAL_CODE_MASK" :mask="POSTAL_CODE_MASK"
:readonly="readonly" :readonly="readonly"
:disabled="disabled" :disabled="disabled"
:required="true" :required="!readonly && !disabled"
:error="errors?.postalCode" :error="errors?.postalCode"
@update:model-value="onPostalCodeChange" @update:model-value="onPostalCodeChange"
/> />
@@ -96,7 +96,7 @@
:readonly="readonly" :readonly="readonly"
:disabled="disabled" :disabled="disabled"
empty-option-label="" empty-option-label=""
:required="true" :required="!readonly && !disabled"
:error="errors?.city" :error="errors?.city"
@update:model-value="(v: string | number | null) => update('city', v === null ? null : String(v))" @update:model-value="(v: string | number | null) => update('city', v === null ? null : String(v))"
/> />
@@ -107,7 +107,7 @@
:mask="ADDRESS_MASK" :mask="ADDRESS_MASK"
:readonly="readonly" :readonly="readonly"
:disabled="disabled" :disabled="disabled"
:required="true" :required="!readonly && !disabled"
:error="errors?.city" :error="errors?.city"
@update:model-value="(v: string) => update('city', v)" @update:model-value="(v: string) => update('city', v)"
/> />
@@ -124,7 +124,7 @@
:label="t('commercial.suppliers.form.address.street')" :label="t('commercial.suppliers.form.address.street')"
:readonly="readonly" :readonly="readonly"
:disabled="disabled" :disabled="disabled"
:required="true" :required="!readonly && !disabled"
:error="errors?.street" :error="errors?.street"
:allow-create="true" :allow-create="true"
:no-results-text="t('commercial.suppliers.form.address.streetNotFound')" :no-results-text="t('commercial.suppliers.form.address.streetNotFound')"
@@ -139,7 +139,7 @@
:mask="ADDRESS_MASK" :mask="ADDRESS_MASK"
:readonly="readonly" :readonly="readonly"
:disabled="disabled" :disabled="disabled"
:required="true" :required="!readonly && !disabled"
:error="errors?.street" :error="errors?.street"
@update:model-value="(v: string) => update('street', v)" @update:model-value="(v: string) => update('street', v)"
/> />
frontend/modules/technique/components/ProviderAddressBlock.vue
+8 -8
View File
@@ -18,7 +18,7 @@
:display-tag="true" :display-tag="true"
:readonly="readonly" :readonly="readonly"
:disabled="disabled" :disabled="disabled"
:required="true" :required="!readonly && !disabled"
:error="errors?.sites" :error="errors?.sites"
@update:model-value="(v: (string | number)[]) => update('siteIris', v.map(String))" @update:model-value="(v: (string | number)[]) => update('siteIris', v.map(String))"
/> />
@@ -31,7 +31,7 @@
:display-tag="true" :display-tag="true"
:readonly="readonly" :readonly="readonly"
:disabled="disabled" :disabled="disabled"
:required="true" :required="!readonly && !disabled"
:error="errors?.categories" :error="errors?.categories"
@update:model-value="(v: (string | number)[]) => update('categoryIris', v.map(String))" @update:model-value="(v: (string | number)[]) => update('categoryIris', v.map(String))"
/> />
@@ -53,7 +53,7 @@
:label="t('technique.providers.form.address.country')" :label="t('technique.providers.form.address.country')"
:readonly="readonly" :readonly="readonly"
:disabled="disabled" :disabled="disabled"
:required="true" :required="!readonly && !disabled"
@update:model-value="(v: string | number | null) => update('country', String(v ?? 'France'))" @update:model-value="(v: string | number | null) => update('country', String(v ?? 'France'))"
/> />
@@ -63,7 +63,7 @@
:mask="POSTAL_CODE_MASK" :mask="POSTAL_CODE_MASK"
:readonly="readonly" :readonly="readonly"
:disabled="disabled" :disabled="disabled"
:required="true" :required="!readonly && !disabled"
:error="errors?.postalCode" :error="errors?.postalCode"
@update:model-value="onPostalCodeChange" @update:model-value="onPostalCodeChange"
/> />
@@ -77,7 +77,7 @@
:readonly="readonly" :readonly="readonly"
:disabled="disabled" :disabled="disabled"
empty-option-label="" empty-option-label=""
:required="true" :required="!readonly && !disabled"
:error="errors?.city" :error="errors?.city"
@update:model-value="(v: string | number | null) => update('city', v === null ? null : String(v))" @update:model-value="(v: string | number | null) => update('city', v === null ? null : String(v))"
/> />
@@ -88,7 +88,7 @@
:mask="ADDRESS_MASK" :mask="ADDRESS_MASK"
:readonly="readonly" :readonly="readonly"
:disabled="disabled" :disabled="disabled"
:required="true" :required="!readonly && !disabled"
:error="errors?.city" :error="errors?.city"
@update:model-value="(v: string) => update('city', v)" @update:model-value="(v: string) => update('city', v)"
/> />
@@ -105,7 +105,7 @@
:label="t('technique.providers.form.address.street')" :label="t('technique.providers.form.address.street')"
:readonly="readonly" :readonly="readonly"
:disabled="disabled" :disabled="disabled"
:required="true" :required="!readonly && !disabled"
:error="errors?.street" :error="errors?.street"
:allow-create="true" :allow-create="true"
:no-results-text="t('technique.providers.form.address.streetNotFound')" :no-results-text="t('technique.providers.form.address.streetNotFound')"
@@ -119,7 +119,7 @@
:label="t('technique.providers.form.address.street')" :label="t('technique.providers.form.address.street')"
:readonly="readonly" :readonly="readonly"
:disabled="disabled" :disabled="disabled"
:required="true" :required="!readonly && !disabled"
:error="errors?.street" :error="errors?.street"
@update:model-value="(v: string) => update('street', v)" @update:model-value="(v: string) => update('street', v)"
/> />
frontend/modules/transport/components/CarrierAddressBlock.vue
+6 -6
View File
@@ -8,7 +8,7 @@
:label="t('transport.carriers.form.address.country')" :label="t('transport.carriers.form.address.country')"
:readonly="readonly" :readonly="readonly"
:disabled="disabled" :disabled="disabled"
:required="true" :required="!readonly && !disabled"
:error="errors?.country" :error="errors?.country"
@update:model-value="(v: string | number | null) => update('country', String(v ?? 'France'))" @update:model-value="(v: string | number | null) => update('country', String(v ?? 'France'))"
/> />
@@ -20,7 +20,7 @@
:mask="POSTAL_CODE_MASK" :mask="POSTAL_CODE_MASK"
:readonly="readonly" :readonly="readonly"
:disabled="disabled" :disabled="disabled"
:required="true" :required="!readonly && !disabled"
:error="errors?.postalCode" :error="errors?.postalCode"
@update:model-value="onPostalCodeChange" @update:model-value="onPostalCodeChange"
/> />
@@ -34,7 +34,7 @@
:readonly="readonly" :readonly="readonly"
:disabled="disabled" :disabled="disabled"
empty-option-label="" empty-option-label=""
:required="true" :required="!readonly && !disabled"
:error="errors?.city" :error="errors?.city"
@update:model-value="(v: string | number | null) => update('city', v === null ? null : String(v))" @update:model-value="(v: string | number | null) => update('city', v === null ? null : String(v))"
/> />
@@ -45,7 +45,7 @@
:mask="ADDRESS_MASK" :mask="ADDRESS_MASK"
:readonly="readonly" :readonly="readonly"
:disabled="disabled" :disabled="disabled"
:required="true" :required="!readonly && !disabled"
:error="errors?.city" :error="errors?.city"
@update:model-value="(v: string) => update('city', v)" @update:model-value="(v: string) => update('city', v)"
/> />
@@ -65,7 +65,7 @@
:label="t('transport.carriers.form.address.street')" :label="t('transport.carriers.form.address.street')"
:readonly="readonly" :readonly="readonly"
:disabled="disabled" :disabled="disabled"
:required="true" :required="!readonly && !disabled"
:error="errors?.street" :error="errors?.street"
:allow-create="true" :allow-create="true"
:no-results-text="t('transport.carriers.form.address.streetNotFound')" :no-results-text="t('transport.carriers.form.address.streetNotFound')"
@@ -79,7 +79,7 @@
:label="t('transport.carriers.form.address.street')" :label="t('transport.carriers.form.address.street')"
:readonly="readonly" :readonly="readonly"
:disabled="disabled" :disabled="disabled"
:required="true" :required="!readonly && !disabled"
:error="errors?.street" :error="errors?.street"
@update:model-value="(v: string) => update('street', v)" @update:model-value="(v: string) => update('street', v)"
/> />