From c48da59314f64ed0729745f317d26c46949d8e3d Mon Sep 17 00:00:00 2001
From: Bernat Exposito Domenech <bernat.verdnatura@gmail.com>
Date: Mon, 24 Feb 2020 08:44:43 +0100
Subject: [PATCH] report entry-order

---
 print/templates/reports/entry-order/entry-order.html | 6 ++++++
 print/templates/reports/entry-order/entry-order.js   | 7 ++++++-
 print/templates/reports/entry-order/locale/es.yml    | 6 +++---
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/print/templates/reports/entry-order/entry-order.html b/print/templates/reports/entry-order/entry-order.html
index 170351cec..cbb0de0d5 100644
--- a/print/templates/reports/entry-order/entry-order.html
+++ b/print/templates/reports/entry-order/entry-order.html
@@ -48,6 +48,12 @@
                                                 <div>
                                                     {{supplier.street}}
                                                 </div>
+                                                <div>
+                                                    {{supplier.postCode}}, {{supplier.city}}, ({{supplier.province}})
+                                                </div>
+                                                <div>
+                                                    {{supplier.nif}}
+                                                </div>                                                
                                             </div>
                                         </div>
                                     </div>
diff --git a/print/templates/reports/entry-order/entry-order.js b/print/templates/reports/entry-order/entry-order.js
index 6317871e4..55492fbaf 100755
--- a/print/templates/reports/entry-order/entry-order.js
+++ b/print/templates/reports/entry-order/entry-order.js
@@ -21,9 +21,14 @@ module.exports = {
             return db.findOne(
                 `SELECT
                         s.name,
-                        s.street
+                        s.street,
+                        s.nif,
+                        s.postCode,
+                        s.city,
+                        p.name province
                 FROM supplier s
                     JOIN entry e ON e.supplierFk = s.id
+                    LEFT JOIN province p ON p.id = s.provinceFk
                 WHERE e.id = ?`, [entryId]);
         },
         fetchEntry(entryId) {
diff --git a/print/templates/reports/entry-order/locale/es.yml b/print/templates/reports/entry-order/locale/es.yml
index dd4861f9d..3c29d6401 100644
--- a/print/templates/reports/entry-order/locale/es.yml
+++ b/print/templates/reports/entry-order/locale/es.yml
@@ -1,11 +1,11 @@
 title: Pedido
 supplierName: Proveedor
 supplierStreet: Dirección
-entryId: Pedido nº
+entryId: Referencia interna
 date: Fecha
-ref: Referencia
+ref: Nº Factura
 boxes: Cajas
-packing: U/C 
+packing: U/C
 quantity: Cantidad
 price: Precio
 amount: Importe