refs #4650 observaciones añadidas

print/templates/reports/delivery-note/assets/css/style.css

@@ -38,3 +38,8 @@ h2 {
 .phytosanitary-info {
     margin-top: 10px
 }
+
+.observations{
+    text-align: justify;
+    text-justify: inter-word;
+}

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

@@ -263,6 +263,12 @@
                                     </div>
                                     <!-- End of phytosanitary block -->
                                 </div>
+                                <div class="columns vn-mb-ml">
+                                    <!-- Observations block-->
+                                    <div class="size100 no-page-break" v-if="hasObservations">
+                                        <h2>{{$t('observations')}}</h2>
+                                        <p class="observations">{{ticket.description}}</p>
+                                    </div>
                                 <div class="columns">
                                     <!-- Signature block -->
                                     <div class="size50 pull-left no-page-break">

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: {

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

@@ -47,3 +47,4 @@ taxes:
   tfoot: 
     subtotal: Subtotal
     total: Total
+observations: Observations

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

@@ -48,3 +48,4 @@ taxes:
   tfoot: 
     subtotal: Subtotal
     total: Total
+observations: Observaciones

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

@@ -48,3 +48,4 @@ taxes:
   tfoot: 
     subtotal: Total partiel
     total: Total
+observations: Observations

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

@@ -48,3 +48,4 @@ taxes:
   tfoot: 
     subtotal: Subtotal
     total: Total
+observations: Observações

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 = ?
+    LEFT JOIN ticketObservation tto ON tto.ticketFk = t.id
+    LEFT JOIN observationType ot ON tto.observationTypeFk = ot.id 
+WHERE t.id = 1;