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 @@
{{supplier.street}}
+
+ {{supplier.postCode}}, {{supplier.city}}, ({{supplier.province}}) +
+
+ {{supplier.nif}} +
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