7983-testToMaster_2438 #718

Merged
alexm merged 353 commits from 7983-testToMaster_2438 into master 2024-09-17 05:39:39 +00:00
4 changed files with 10 additions and 5 deletions
Showing only changes of commit ed4bf3cfa8 - Show all commits

View File

@ -235,7 +235,7 @@ globals:
purchaseRequest: Petición de compra
weeklyTickets: Tickets programados
formation: Formación
locations: Ubicaciones
locations: Localizaciones
warehouses: Almacenes
roles: Roles
connections: Conexiones

View File

@ -95,7 +95,12 @@ const agencyOptions = ref([]);
</VnRow>
<VnRow>
<VnInput v-model="data.inflation" :label="t('Inflation')" clearable />
<VnInput
v-model="data.inflation"
:label="t('Inflation')"
type="number"
clearable
/>
<QCheckbox
v-model="data.isVolumetric"
:label="t('Volumetric')"

View File

@ -76,5 +76,5 @@ es:
deleteZone: Eliminar zona
confirmDeletion: Confirmar eliminación
confirmDeletionMessage: Seguro que quieres eliminar este zona?
Zone deleted: Zona eliminada
</i18n>

View File

@ -90,7 +90,7 @@ onMounted(async () => {
:label="t('deliveryPanel.postcode')"
v-model="formData.geoFk"
url="Postcodes/location"
:fields="['geoFk', 'code', 'townFk']"
:fields="['geoFk', 'code', 'townFk', 'countryFk']"
sort-by="code, townFk"
option-value="geoFk"
option-label="code"
@ -106,7 +106,7 @@ onMounted(async () => {
<QItemLabel>{{ opt.code }}</QItemLabel>
<QItemLabel caption
>{{ opt.town?.province?.name }},
{{ opt.town?.province?.country?.country }}</QItemLabel
{{ opt.town?.province?.country?.name }}</QItemLabel
>
</QItemSection>
</QItem>