diff --git a/print/templates/reports/delivery-note/delivery-note.js b/print/templates/reports/delivery-note/delivery-note.js
index 1037e51296..78f0f7662b 100755
--- a/print/templates/reports/delivery-note/delivery-note.js
+++ b/print/templates/reports/delivery-note/delivery-note.js
@@ -55,6 +55,7 @@ module.exports = {
const translatedType = this.$t(this.deliverNoteType);
return `${translatedType} ${this.id}`;
}
+
},
methods: {
fetchClient(id) {
@@ -119,6 +120,9 @@ module.exports = {
return phytosanitary.filter((item, index) =>
phytosanitary.indexOf(item) == index
).join(', ');
+ },
+ hasObservations() {
+ return this.ticket.code == 'deliveryNote' && this.ticket.description != null;
}
},
components: {
diff --git a/print/templates/reports/delivery-note/locale/en.yml b/print/templates/reports/delivery-note/locale/en.yml
index c74b875204..5902da8b39 100644
--- a/print/templates/reports/delivery-note/locale/en.yml
+++ b/print/templates/reports/delivery-note/locale/en.yml
@@ -46,4 +46,5 @@ taxes:
fee: Fee
tfoot:
subtotal: Subtotal
- total: Total
\ No newline at end of file
+ total: Total
+observations: Observations
\ No newline at end of file
diff --git a/print/templates/reports/delivery-note/locale/es.yml b/print/templates/reports/delivery-note/locale/es.yml
index 5c5a6af4d3..d87198f45a 100644
--- a/print/templates/reports/delivery-note/locale/es.yml
+++ b/print/templates/reports/delivery-note/locale/es.yml
@@ -47,4 +47,5 @@ taxes:
fee: Cuota
tfoot:
subtotal: Subtotal
- total: Total
\ No newline at end of file
+ total: Total
+observations: Observaciones
\ No newline at end of file
diff --git a/print/templates/reports/delivery-note/locale/fr.yml b/print/templates/reports/delivery-note/locale/fr.yml
index df7ca053b7..603623a475 100644
--- a/print/templates/reports/delivery-note/locale/fr.yml
+++ b/print/templates/reports/delivery-note/locale/fr.yml
@@ -47,4 +47,5 @@ taxes:
fee: Quote
tfoot:
subtotal: Total partiel
- total: Total
\ No newline at end of file
+ total: Total
+observations: Observations
\ No newline at end of file
diff --git a/print/templates/reports/delivery-note/locale/pt.yml b/print/templates/reports/delivery-note/locale/pt.yml
index 1f418b31f5..fb49d230b4 100644
--- a/print/templates/reports/delivery-note/locale/pt.yml
+++ b/print/templates/reports/delivery-note/locale/pt.yml
@@ -47,4 +47,5 @@ taxes:
fee: Compartilhado
tfoot:
subtotal: Subtotal
- total: Total
\ No newline at end of file
+ total: Total
+observations: Observações
\ No newline at end of file
diff --git a/print/templates/reports/delivery-note/sql/ticket.sql b/print/templates/reports/delivery-note/sql/ticket.sql
index f78c725444..3d16b53d85 100644
--- a/print/templates/reports/delivery-note/sql/ticket.sql
+++ b/print/templates/reports/delivery-note/sql/ticket.sql
@@ -2,7 +2,11 @@ SELECT
t.id,
t.shipped,
c.code companyCode,
- t.packages
+ t.packages,
+ tto.description,
+ ot.code
FROM ticket t
JOIN company c ON c.id = t.companyFk
-WHERE t.id = ?
\ No newline at end of file
+ LEFT JOIN ticketObservation tto ON tto.ticketFk = t.id
+ LEFT JOIN observationType ot ON tto.observationTypeFk = ot.id
+WHERE t.id = 1;
\ No newline at end of file