Merge pull request 'refs #6952 subName' (!2636) from 6952-productorItemPDF into dev
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details

Reviewed-on: #2636
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
This commit is contained in:
Carlos Satorres 2024-07-03 12:43:46 +00:00
commit 5500a6f085
6 changed files with 24 additions and 18 deletions

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.subName"> <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

@ -19,7 +19,8 @@ SELECT s.id,
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