fix invoiceIn

print/templates/reports/invoiceIn/invoiceIn.html

@@ -5,9 +5,8 @@
     <div class="grid-row">
         <div class="grid-block">
             <div class="columns vn-mb-lg">
-                <div class="size50">
+                <div class="size75">
-                    <div class="size75 vn-mt-ml">
+                    <div class="size100 vn-mt-ml">
-                        <h1 class="title uppercase">{{$t('title')}}</h1>
                         <table class="row-oriented ticket-info">
                             <tbody>
                                 <tr>
@@ -16,7 +15,7 @@
                                 </tr>
                                 <tr>
                                     <td class="font gray uppercase">{{$t('invoiceId')}}</td>
-                                    <th>{{invoice.id}}</th>
+                                    <th>{{invoice.supplierRef}}</th>
                                 </tr>
                                 <tr>
                                     <td class="font gray uppercase">{{$t('date')}}</td>
@@ -26,7 +25,7 @@
                         </table>
                     </div>
                 </div>
-                <div class="size50">
+                <div class="size25">
                     <div class="panel">
                         <div class="header">{{$t('invoiceData')}}</div>
                         <div class="body">
@@ -43,7 +42,7 @@
             <div class="vn-mt-lg" v-for="entry in entries">
                 <div class="table-title clearfix">
                     <div class="pull-left">
-                        <h2>{{$t('invoiceId')}}</h2>
+                        <h2>{{$t('entry')}}</h2>
                     </div>
                     <div class="pull-left vn-mr-md">
                         <div class="field rectangle">
@@ -82,7 +81,7 @@
                         <tr>
                             <td width="50%">{{buy.name}}</td>
                             <td class="number">{{buy.quantity}}</td>
-                            <td class="number">{{buy.buyingValue}}</td>
+                            <td class="number">{{buy.buyingValue | currency('EUR', $i18n.locale)}}</td>
                             <td class="number">{{buyImport(buy) | currency('EUR', $i18n.locale)}}</td>
                         </tr>
                         <tr class="description font light-gray">
@@ -103,6 +102,27 @@
                     </tfoot>
                 </table>
             </div>
+
+            <div id="signature" class="size50 pull-left no-page-break">
+                <div class="size100">
+                    <div class="panel">
+                        <div class="header">{{$t('observations')}}</div>
+                        <div class="body">
+                            <div>{{$t('payMethod')}}</div>
+                            <div>{{invoice.payMethod}}</div>
+                        </div>
+                    </div>
+                </div>
+                <div class="size100">
+                    <div class="panel">
+                        <div class="header">{{invoice.name}}</div>
+                        <div class="body">
+                            <td>{{$t('signer.received')}}:</td>
+                            <td>{{$t('signer.signed')}}:</td>
+                        </div>
+                    </div>
+                </div>
+            </div>
             <div class="columns vn-mt-xl">
                 <div id="taxes" class="size50 pull-right no-page-break" v-if="taxes">
                     <table class="column-oriented">
@@ -150,17 +170,7 @@
                         </div>
                     </div>
                 </div>
-                <div class="columns vn-mt-xl">
+
-                    <div class="size50 pull-left no-page-break">
-                        <div class="panel">
-                            <div class="header">{{$t('observations')}}</div>
-                            <div class="body">
-                                <div>{{$t('payMethod')}}</div>
-                                <div>{{invoice.payMethod}}</div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
             </div>
         </div>
     </div>

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

print/templates/reports/invoiceIn/locale/es.yml

@@ -1,6 +1,6 @@
-reportName: factura
+reportName: recibo agrícola
-title: Factura Agrícola
+title: Recibo Agrícola
-invoiceId: Factura 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

print/templates/reports/invoiceIn/sql/invoice.sql

@@ -1,5 +1,5 @@
 SELECT
-        i.id,
+        i.supplierRef ,
         s.id supplierId,
         i.created,
         s.name,