Merge branch 'dev' into 3295-claim_search-panel

modules/entry/front/descriptor/index.html

@@ -34,13 +34,20 @@
         </div>
         <div class="quicklinks">
             <div ng-transclude="btnOne">
+                <vn-quick-link
+                    tooltip="Supplier card"
+                    state="['supplier.card.summary', {id: $ctrl.entry.supplier.id}]"
+                    icon="icon-supplier">
+                </vn-quick-link>
+            </div>
+            <div ng-transclude="btnTwo">
                 <vn-quick-link
                     tooltip="All travels with current agency"
                     state="['travel.index', {q: $ctrl.travelFilter}]"
                     icon="local_airport">
                 </vn-quick-link>
             </div>
-            <div ng-transclude="btnTwo">
+            <div ng-transclude="btnThree">
                 <vn-quick-link
                     tooltip="All entries with current supplier"
                     state="['entry.index', {q: $ctrl.entryFilter}]"

modules/entry/front/descriptor/locale/es.yml

@@ -1,4 +1,5 @@
 Reference: Referencia
+Supplier card: Ficha del proveedor
 All travels with current agency: Todos los envios con la agencia actual
 All entries with current supplier: Todas las entradas con el proveedor actual
 Show entry report: Ver informe del pedido

print/templates/reports/claim-pickup-order/sql/client.sql

@@ -12,8 +12,9 @@ SELECT
 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
+    LEFT JOIN province p ON p.id = a.provinceFk
+    LEFT JOIN autonomy amy ON amy.id = p.autonomyFk
+    LEFT JOIN country ct ON ct.id = amy.countryFk
 WHERE cl.id = ?