Merge pull request 'refs #6952 subName' (!2636) from 6952-productorItemPDF into dev

Reviewed-on: #2636
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>

print/templates/reports/delivery-note/delivery-note.html

@@ -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>
@@ -249,4 +250,4 @@
             v-bind:center-text="client.socialName" v-bind="$props">
         </report-footer>
     </template>
-</report-body>
+</report-body>

print/templates/reports/delivery-note/locale/en.yml

@@ -20,6 +20,7 @@ vatType: VAT Type
 digitalSignature: Digital signature
 plantPassport: Plant passport
 packages: Packages
+producer: Producer
 services:
   title: Services
   theader:
@@ -44,7 +45,7 @@ taxes:
     taxBase: Tax base
     tax: Tax
     fee: Fee
-  tfoot: 
+  tfoot:
     subtotal: Subtotal
     total: Total
-observations: Observations
+observations: Observations

print/templates/reports/delivery-note/locale/es.yml

@@ -15,6 +15,7 @@ discount: Dto.
 vat: IVA
 amount: Importe
 total: Total
+producer: Productor
 subtotal: Subtotal
 vatType: Tipo de IVA
 digitalSignature: Firma digital
@@ -45,7 +46,7 @@ taxes:
     taxBase: Base imp.
     tax: Tasa
     fee: Cuota
-  tfoot: 
+  tfoot:
     subtotal: Subtotal
     total: Total
-observations: Observaciones
+observations: Observaciones

print/templates/reports/delivery-note/locale/fr.yml

@@ -14,7 +14,8 @@ price: PRIX/u
 discount: Remise
 vat: TVA
 amount: Montant
-total: Total 
+producer: producteur
+total: Total
 subtotal: Total partiel
 vatType: Type de TVA
 digitalSignature: Signature numérique
@@ -45,7 +46,7 @@ taxes:
     taxBase: Base imposable
     tax: Taxe
     fee: Quote
-  tfoot: 
+  tfoot:
     subtotal: Total partiel
     total: Total
-observations: Observations
+observations: Observations

print/templates/reports/delivery-note/locale/pt.yml

@@ -14,6 +14,7 @@ price: PVP/u
 discount: Dto.
 vat: IVA
 amount: Importe
+producer: Produtor
 total: Total
 subtotal: Sub-total
 vatType: Tipo de IVA
@@ -45,7 +46,7 @@ taxes:
     taxBase: Tributável
     tax: Taxa
     fee: Compartilhado
-  tfoot: 
+  tfoot:
     subtotal: Subtotal
     total: Total
-observations: Observações
+observations: Observações

print/templates/reports/delivery-note/sql/sales.sql

@@ -14,12 +14,13 @@ SELECT s.id,
 		s.ticketFk,
 		tcl.code vatType,
 		ib.ediBotanic botanical,
-		i.tag5, 
+		i.tag5,
 		i.value5,
-		i.tag6, 
-		i.value6, 
-		i.tag7, 
-		i.value7
+		i.tag6,
+		i.value6,
+		i.tag7,
+		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
@@ -31,12 +32,12 @@ SELECT s.id,
 		LEFT JOIN supplier sp ON sp.id = t.companyFk
 		LEFT JOIN itemType it ON it.id = i.typeFk
 		LEFT JOIN itemCategory ic ON ic.id = it.categoryFk
-		LEFT JOIN itemTaxCountry itc ON itc.itemFk = i.id 
-			AND itc.countryFk = sp.countryFk 
+		LEFT JOIN itemTaxCountry itc ON itc.itemFk = i.id
+			AND itc.countryFk = sp.countryFk
 		LEFT JOIN taxClass tcl ON tcl.id = itc.taxClassFk
 		LEFT JOIN itemBotanicalWithGenus ib ON ib.itemFk = i.id
 			AND ic.code = 'plant'
 			AND ib.ediBotanic IS NOT NULL
 	WHERE s.ticketFk = ?
 	GROUP BY s.id
-	ORDER BY (it.isPackaging), s.concept, s.itemFk
+	ORDER BY (it.isPackaging), s.concept, s.itemFk