verdnatura/salix
verdnatura
/
salix
3
5
Fork 0
Code Issues Pull Requests 62 Releases Wiki Activity

Merge branch 'dev' into 3295-claim_search-panel
gitea/salix/pipeline/head This commit looks good Details

This commit is contained in:
Carlos Jimenez Ruiz 2021-11-08 07:54:10 +00:00
parent bb0745532b e474f97aec
commit 8fff96ca05
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modules/entry/front/descriptor/index.html
View File

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

1
modules/entry/front/descriptor/locale/es.yml
View File

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

5
print/templates/reports/claim-pickup-order/sql/client.sql
View File

@ -12,8 +12,9 @@ SELECT
FROM claim cl FROM claim cl
JOIN client c ON c.id = cl.clientFk JOIN client c ON c.id = cl.clientFk
JOIN account.user u ON u.id = c.id 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 ticket t ON t.id = cl.ticketFk
JOIN address a ON a.id = t.addressFk 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 = ? WHERE cl.id = ?