Merge branch 'dev' into test

print/report/rpt-claim-pickup-order/index.html

@@ -32,12 +32,12 @@
                         <section class="panel">
                             <section class="header">{{$t('clientData')}}</section>
                             <section class="body">
-                                <h3 class="uppercase">{{clientName}}</h3>
+                                <h3 class="uppercase">{{nickname}}</h3>
                                 <section>
                                     {{street}}
                                 </section>
                                 <section>
-                                    {{postcode}}, {{city}} ({{province}})
+                                    {{postalCode}}, {{city}} ({{province}})
                                 </section>
                                 <section>
                                     {{country}}

print/report/rpt-claim-pickup-order/index.js

@@ -43,16 +43,19 @@ module.exports = {
                         c.email AS recipient,
                         c.socialName,
                         c.name AS clientName,
-                        c.street,
-                        c.postcode,
-                        c.city,
                         c.fi,
+                        a.city,
+                        a.postalCode,
+                        a.street,
+                        a.nickname,
                         p.name AS province,
                         ct.country
                     FROM claim cl
                         JOIN client c ON c.id = cl.clientFk
                         JOIN account.user u ON u.id = c.id
                         JOIN country ct ON ct.id = c.countryFk
+                        JOIN ticket t ON t.id = cl.ticketFk
+                        JOIN address a ON a.id = t.addressFk
                         LEFT JOIN province p ON p.id = c.provinceFk
                     WHERE cl.id = ?`, [claimFk]);
         },

print/report/rpt-claim-pickup-order/locale.js

@@ -5,7 +5,7 @@ module.exports = {
             claimId: 'Reclamación',
             clientId: 'Cliente',
             date: 'Fecha',
-            clientData: 'Datos del cliente',
+            clientData: 'Dirección de recogida',
             quantity: 'Cantidad',
             claims: 'Reclama',
             reference: 'Referencia',