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

Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details

This commit is contained in:
Joan Sanchez 2021-10-22 11:46:16 +02:00
parent c6d7ec8ec4 aa27ebffc9
commit 2cdc22bc4d
4 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/invoiceOut/front/descriptor/index.html
View File

@ -130,7 +130,7 @@
<!-- Create invoice PDF confirmation dialog --> <!-- Create invoice PDF confirmation dialog -->
<vn-confirm <vn-confirm
vn-id="createInvoicePdfConfirmation" vn-id="createInvoicePdfConfirmation"
on-accept="$ctrl.createInvoicePdf()" on-accept="$ctrl.createPdfInvoice()"
question="Are you sure you want to generate/regenerate the PDF invoice?" question="Are you sure you want to generate/regenerate the PDF invoice?"
message="Generate PDF invoice document"> message="Generate PDF invoice document">
</vn-confirm> </vn-confirm>

1
print/templates/reports/invoice-incoterms/invoice-incoterms.html
View File

@ -62,7 +62,6 @@
<tr> <tr>
<th> <th>
{{$t('incoterms')}} {{$t('incoterms')}}
<div class="description">asd</div>
</th> </th>
<td>{{incoterms.incotermsFk}} - {{incoterms.incotermsName}}</td> <td>{{incoterms.incotermsFk}} - {{incoterms.incotermsName}}</td>
</tr> </tr>

2
print/templates/reports/invoice-incoterms/invoice-incoterms.js
View File

@ -23,7 +23,7 @@ module.exports = {
return this.findOneFromDef('client', [invoiceId]); return this.findOneFromDef('client', [invoiceId]);
}, },
fetchIncoterms(invoiceId) { fetchIncoterms(invoiceId) {
return this.findOneFromDef('incoterms', {invoiceId}); return this.findOneFromDef('incoterms', [invoiceId, invoiceId, invoiceId]);
} }
}, },
components: { components: {

8
print/templates/reports/invoice-incoterms/sql/incoterms.sql
View File

@ -51,8 +51,8 @@ SELECT io.issued,
FROM vn.invoiceOut io FROM vn.invoiceOut io
JOIN vn.ticket t ON t.refFk = io.ref JOIN vn.ticket t ON t.refFk = io.ref
JOIN vn.saleVolume sv ON sv.ticketFk = t.id JOIN vn.saleVolume sv ON sv.ticketFk = t.id
WHERE io.id = :invoiceId WHERE io.id = ?
)sub2 ON TRUE ) sub2 ON TRUE
JOIN vn.itemTaxCountry itc ON itc.countryFk = su.countryFk AND itc.itemFk = s.itemFk JOIN vn.itemTaxCountry itc ON itc.countryFk = su.countryFk AND itc.itemFk = s.itemFk
JOIN vn.taxClass tc ON tc.id = itc.taxClassFk JOIN vn.taxClass tc ON tc.id = itc.taxClassFk
LEFT JOIN vn.invoiceOutSerial ios ON ios.code = io.serial AND ios.taxAreaFk = 'CEE' LEFT JOIN vn.invoiceOutSerial ios ON ios.code = io.serial AND ios.taxAreaFk = 'CEE'
@ -66,6 +66,6 @@ SELECT io.issued,
JOIN vn.sale s ON t.id = s.ticketFk JOIN vn.sale s ON t.id = s.ticketFk
JOIN vn.item i ON i.id = s.itemFk JOIN vn.item i ON i.id = s.itemFk
JOIN vn.intrastat ir ON ir.id = i.intrastatFk JOIN vn.intrastat ir ON ir.id = i.intrastatFk
WHERE io.id = :invoiceId WHERE io.id = ?
)sub3 ON TRUE )sub3 ON TRUE
WHERE io.id = :invoiceId WHERE io.id = ?