From 325afe2245573725d8dd70cb4cf1a4fb610142f5 Mon Sep 17 00:00:00 2001
From: joan <joan@verdnatura.es>
Date: Fri, 18 Jun 2021 08:42:55 +0200
Subject: [PATCH] 2906 - Number of packages

---
 modules/client/back/models/receipt.json                  | 3 ---
 print/templates/reports/delivery-note/delivery-note.html | 4 ++++
 print/templates/reports/delivery-note/locale/en.yml      | 3 ++-
 print/templates/reports/delivery-note/locale/es.yml      | 3 ++-
 print/templates/reports/delivery-note/locale/fr.yml      | 3 ++-
 print/templates/reports/delivery-note/locale/pt.yml      | 3 ++-
 print/templates/reports/delivery-note/sql/ticket.sql     | 3 ++-
 7 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/modules/client/back/models/receipt.json b/modules/client/back/models/receipt.json
index 3207546a3..19107f561 100644
--- a/modules/client/back/models/receipt.json
+++ b/modules/client/back/models/receipt.json
@@ -16,9 +16,6 @@
             "type": "number",
             "required": true
         },
-        "amountUnpaid": {
-            "type": "number"
-        },
         "payed": {
             "type": "date",
             "required": true
diff --git a/print/templates/reports/delivery-note/delivery-note.html b/print/templates/reports/delivery-note/delivery-note.html
index 0004d171b..771f1fd0c 100644
--- a/print/templates/reports/delivery-note/delivery-note.html
+++ b/print/templates/reports/delivery-note/delivery-note.html
@@ -30,6 +30,10 @@
                                                         <td class="font gray uppercase">{{$t('date')}}</td>
                                                         <th>{{ticket.shipped | date('%d-%m-%Y')}}</th>
                                                     </tr>
+                                                    <tr>
+                                                        <td class="font gray uppercase">{{$t('packages')}}</td>
+                                                        <th>{{ticket.packages}}</th>
+                                                    </tr>
                                                 </tbody>
                                             </table>
                                         </div>
diff --git a/print/templates/reports/delivery-note/locale/en.yml b/print/templates/reports/delivery-note/locale/en.yml
index 74caa0eb6..ec961cabe 100644
--- a/print/templates/reports/delivery-note/locale/en.yml
+++ b/print/templates/reports/delivery-note/locale/en.yml
@@ -24,4 +24,5 @@ services: Services
 vatType: VAT Type
 digitalSignature: Digital signature
 ticket: Delivery note {0}
-plantPassport: Plant passport
\ No newline at end of file
+plantPassport: Plant passport
+packages: Packages
\ 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 d9890d924..674cb875e 100644
--- a/print/templates/reports/delivery-note/locale/es.yml
+++ b/print/templates/reports/delivery-note/locale/es.yml
@@ -24,4 +24,5 @@ services: Servicios
 vatType: Tipo de IVA
 digitalSignature: Firma digital
 ticket: Albarán {0}
-plantPassport: Pasaporte fitosanitario
\ No newline at end of file
+plantPassport: Pasaporte fitosanitario
+packages: Bultos
\ 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 22d77012a..526df3068 100644
--- a/print/templates/reports/delivery-note/locale/fr.yml
+++ b/print/templates/reports/delivery-note/locale/fr.yml
@@ -24,4 +24,5 @@ services: Service
 vatType: Type de TVA
 digitalSignature: Signature numérique
 ticket: BL {0}
-plantPassport: Passeport phytosanitaire
\ No newline at end of file
+plantPassport: Passeport phytosanitaire
+packages: Paquets
\ 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 a1f93550c..95bcd857e 100644
--- a/print/templates/reports/delivery-note/locale/pt.yml
+++ b/print/templates/reports/delivery-note/locale/pt.yml
@@ -24,4 +24,5 @@ services: Serviços
 vatType: Tipo de IVA
 digitalSignature: Assinatura digital
 ticket: Nota de Entrega {0}
-plantPassport: Passaporte vegetal
\ No newline at end of file
+plantPassport: Passaporte vegetal
+packages: Pacotes
\ 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 ccc3f9d25..f78c72544 100644
--- a/print/templates/reports/delivery-note/sql/ticket.sql
+++ b/print/templates/reports/delivery-note/sql/ticket.sql
@@ -1,7 +1,8 @@
 SELECT
     t.id,
     t.shipped,
-    c.code companyCode
+    c.code companyCode,
+    t.packages
 FROM ticket t
     JOIN company c ON c.id = t.companyFk
 WHERE t.id = ?
\ No newline at end of file