7773-testToMaster_2430 #2774

Merged
alexm merged 368 commits from 7773-testToMaster_2430 into master 2024-07-23 06:21:03 +00:00
6 changed files with 25 additions and 19 deletions
Showing only changes of commit 2797a731c5 - Show all commits

View File

@ -81,6 +81,7 @@
<span v-if="sale.value5"> <strong>{{sale.tag5}}</strong> {{sale.value5}} </span>
<span v-if="sale.value6"> <strong>{{sale.tag6}}</strong> {{sale.value6}} </span>
<span v-if="sale.value7"> <strong>{{sale.tag7}}</strong> {{sale.value7}} </span>
<span v-if="sale.origin"> <strong>{{$t('producer')}}</strong> {{ sale.subName }}</span>
</td>
</tr>
</tbody>

View File

@ -20,6 +20,7 @@ vatType: VAT Type
digitalSignature: Digital signature
plantPassport: Plant passport
packages: Packages
producer: Producer
services:
title: Services
theader:

View File

@ -15,6 +15,7 @@ discount: Dto.
vat: IVA
amount: Importe
total: Total
producer: Productor
subtotal: Subtotal
vatType: Tipo de IVA
digitalSignature: Firma digital

View File

@ -14,6 +14,7 @@ price: PRIX/u
discount: Remise
vat: TVA
amount: Montant
producer: producteur
total: Total
subtotal: Total partiel
vatType: Type de TVA

View File

@ -14,6 +14,7 @@ price: PVP/u
discount: Dto.
vat: IVA
amount: Importe
producer: Produtor
total: Total
subtotal: Sub-total
vatType: Tipo de IVA

View File

@ -20,7 +20,8 @@ SELECT
i.tag6,
i.value6,
i.tag7,
i.value7
i.value7,
i.subName
FROM vn.sale s
LEFT JOIN saleComponent sc ON sc.saleFk = s.id
LEFT JOIN component cr ON cr.id = sc.componentFk