Changes

print/templates/reports/invoice/invoice.html

@@ -40,10 +40,13 @@
                                             <div class="body">
                                                 <h3 class="uppercase">{{client.socialName}}</h3>
                                                 <div>
-                                                    {{client.street}}
+                                                    {{client.postalAddress}}
                                                 </div>
                                                 <div>
-                                                    {{client.fi}}
+                                                    {{client.postcodeCity}}
+                                                </div>
+                                                <div>
+                                                    {{$t('fiscalId')}}: {{client.fi}}
                                                 </div>
                                             </div>
                                         </div>

print/templates/reports/invoice/invoice.js

@@ -9,7 +9,7 @@ module.exports = {
     name: 'invoice',
     async serverPrefetch() {
         this.invoice = await this.fetchInvoice(this.invoiceId);
-        this.client = {};
+        this.client = await this.fetchClient(this.invoiceId);
         this.address = {};
         this.sales = [];
         this.services = [];

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

@@ -1,8 +1,9 @@
 title: Factura
 invoice: Factura
 clientId: Cliente
-deliveryAddress: Dirección de entrega
+invoiceData: Datos de facturación
-fiscalData: Datos fiscales
+fiscalId: CIF / NIF
+invoiceRef: Factura {0}
 saleLines: Líneas de pedido
 date: Fecha
 reference: Ref.
@@ -21,7 +22,4 @@ subtotal: Subtotal
 taxBreakdown: Desglose impositivo
 packagings: Cubos y embalajes
 services: Servicios
-vatType: Tipo de IVA
-digitalSignature: Firma digital
-invoiceRef: Factura {0}
 plantPassport: Pasaporte fitosanitario

print/templates/reports/invoice/sql/client.sql

@@ -1,8 +1,12 @@
 SELECT
     c.id,
     c.socialName, 
-        c.street,
+    c.street AS postalAddress,
-        c.fi
+    IF (ios.taxAreaFk IS NOT NULL, CONCAT(cty.code, c.fi), c.fi) fi, 
-FROM ticket t
+    CONCAT(c.postcode, ' - ', c.city) postcodeCity
-    JOIN client c ON c.id = t.clientFk
+FROM vn.invoiceOut io
-WHERE t.id = ?
+    JOIN vn.client c ON c.id = io.clientFk
+    JOIN vn.country cty ON cty.id = c.countryFk
+    LEFT JOIN vn.invoiceOutSerial ios ON ios.code = io.serial 
+        AND ios.taxAreaFk = 'CEE'
+WHERE io.id =  ?

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

@@ -3,15 +3,8 @@ SELECT
     io.clientFk,
     io.companyFk,
     io.ref,
-    c.socialName, 
+    cny.code companyCode
-    c.street postalAddress,
-    cny.code companyCode,
-    IF (ios.taxAreaFk IS NOT NULL, CONCAT(cty.code, c.fi), c.fi) fi, 
-    CONCAT(c.postcode,' - ',c.city) postcodeCity
 FROM vn.invoiceOut io
     JOIN vn.client c ON c.id = io.clientFk
-    JOIN vn.country cty ON cty.id = c.countryFk
     JOIN company cny ON cny.id = io.companyFk
-    LEFT JOIN vn.invoiceOutSerial ios ON ios.code = io.serial 
-        AND ios.taxAreaFk = 'CEE'
 WHERE io.id =  ?