diff --git a/print/templates/reports/invoiceIn/invoiceIn.html b/print/templates/reports/invoiceIn/invoiceIn.html index 69ce3d0f2f..9b2392d999 100644 --- a/print/templates/reports/invoiceIn/invoiceIn.html +++ b/print/templates/reports/invoiceIn/invoiceIn.html @@ -5,9 +5,8 @@
-
-
-

{{$t('title')}}

+
+
@@ -16,7 +15,7 @@ - + @@ -26,7 +25,7 @@
{{$t('invoiceId')}}{{invoice.id}}{{invoice.supplierRef}}
{{$t('date')}}
-
+
{{$t('invoiceData')}}
@@ -43,7 +42,7 @@
-

{{$t('invoiceId')}}

+

{{$t('entry')}}

@@ -82,7 +81,7 @@ {{buy.name}} {{buy.quantity}} - {{buy.buyingValue}} + {{buy.buyingValue | currency('EUR', $i18n.locale)}} {{buyImport(buy) | currency('EUR', $i18n.locale)}} @@ -103,6 +102,27 @@
+ +
+
+
+
{{$t('observations')}}
+
+
{{$t('payMethod')}}
+
{{invoice.payMethod}}
+
+
+
+
+
+
{{invoice.name}}
+
+ {{$t('signer.received')}}: + {{$t('signer.signed')}}: +
+
+
+
@@ -150,17 +170,7 @@ -
-
-
-
{{$t('observations')}}
-
-
{{$t('payMethod')}}
-
{{invoice.payMethod}}
-
-
-
-
+ diff --git a/print/templates/reports/invoiceIn/locale/en.yml b/print/templates/reports/invoiceIn/locale/en.yml index 92d3b0c2dd..040b8d5ecc 100644 --- a/print/templates/reports/invoiceIn/locale/en.yml +++ b/print/templates/reports/invoiceIn/locale/en.yml @@ -23,3 +23,7 @@ subtotal: Subtotal taxBreakdown: Tax breakdown observations: Observations payMethod: Pay method +entry: Entry +signer: + received: Received + signed: Signature diff --git a/print/templates/reports/invoiceIn/locale/es.yml b/print/templates/reports/invoiceIn/locale/es.yml index f2fb28e644..79c160685a 100644 --- a/print/templates/reports/invoiceIn/locale/es.yml +++ b/print/templates/reports/invoiceIn/locale/es.yml @@ -1,6 +1,6 @@ -reportName: factura -title: Factura Agrícola -invoiceId: Factura Agrícola +reportName: recibo agrícola +title: Recibo Agrícola +invoiceId: Recibo Agrícola supplierId: Proveedor invoiceData: Datos de facturación reference: Referencia @@ -23,3 +23,7 @@ subtotal: Subtotal taxBreakdown: Desglose impositivo observations: Observaciones payMethod: Método de pago +entry: Entrada +signer: + received: Recibí + signed: Firma y sello diff --git a/print/templates/reports/invoiceIn/sql/invoice.sql b/print/templates/reports/invoiceIn/sql/invoice.sql index fe9ef1e9e0..80c2c1e108 100644 --- a/print/templates/reports/invoiceIn/sql/invoice.sql +++ b/print/templates/reports/invoiceIn/sql/invoice.sql @@ -1,5 +1,5 @@ SELECT - i.id, + i.supplierRef , s.id supplierId, i.created, s.name,