diff --git a/print/templates/reports/delivery-note/delivery-note.html b/print/templates/reports/delivery-note/delivery-note.html
index 92dd1b126..c1701e084 100644
--- a/print/templates/reports/delivery-note/delivery-note.html
+++ b/print/templates/reports/delivery-note/delivery-note.html
@@ -81,6 +81,7 @@
{{sale.tag5}} {{sale.value5}}
{{sale.tag6}} {{sale.value6}}
{{sale.tag7}} {{sale.value7}}
+ {{$t('producer')}} {{ sale.subName }}
@@ -249,4 +250,4 @@
v-bind:center-text="client.socialName" v-bind="$props">
-
\ No newline at end of file
+
diff --git a/print/templates/reports/delivery-note/locale/en.yml b/print/templates/reports/delivery-note/locale/en.yml
index 5902da8b3..84b31e494 100644
--- a/print/templates/reports/delivery-note/locale/en.yml
+++ b/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
\ No newline at end of file
+observations: Observations
diff --git a/print/templates/reports/delivery-note/locale/es.yml b/print/templates/reports/delivery-note/locale/es.yml
index d87198f45..891e59d77 100644
--- a/print/templates/reports/delivery-note/locale/es.yml
+++ b/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
\ No newline at end of file
+observations: Observaciones
diff --git a/print/templates/reports/delivery-note/locale/fr.yml b/print/templates/reports/delivery-note/locale/fr.yml
index 603623a47..87cd2bcde 100644
--- a/print/templates/reports/delivery-note/locale/fr.yml
+++ b/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
\ No newline at end of file
+observations: Observations
diff --git a/print/templates/reports/delivery-note/locale/pt.yml b/print/templates/reports/delivery-note/locale/pt.yml
index fb49d230b..be39eb3f0 100644
--- a/print/templates/reports/delivery-note/locale/pt.yml
+++ b/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
\ No newline at end of file
+observations: Observações
diff --git a/print/templates/reports/delivery-note/sql/sales.sql b/print/templates/reports/delivery-note/sql/sales.sql
index 636bbc228..4517473bd 100644
--- a/print/templates/reports/delivery-note/sql/sales.sql
+++ b/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
\ No newline at end of file
+ ORDER BY (it.isPackaging), s.concept, s.itemFk