5013-observaciones_facturas #1401

Merged
vicent merged 8 commits from 5013-observaciones_facturas into dev 2023-03-24 09:56:59 +00:00
3 changed files with 19 additions and 3 deletions
Showing only changes of commit 1d0024c538 - Show all commits

View File

@ -0,0 +1,2 @@
INSERT INTO `vn`.`observationType` (`description`, `code`, `hasNewBornMessage`)
VALUES ('Factura', 'invocieOut', '0');

View File

@ -119,6 +119,16 @@
</td>
<td class="number">{{ticketSubtotal(ticket) | currency('EUR', $i18n.locale)}}</td>
</tr>
<tr class="columns vn-mt-xl" v-if="ticket.description">
<div class="size50 pull-left no-page-break">
<div class="panel">
<div class="header">{{$t('observations')}}</div>
<div class="body">
<div>{{ticket.description}}</div>
</div>
</div>
</div>
</tr>
</tfoot>
</table>
</div>
@ -251,6 +261,7 @@
</div>
</div>
</div>
</div>
</div>
<template v-slot:footer>

View File

@ -1,8 +1,11 @@
SELECT
t.id,
t.shipped,
t.nickname
FROM invoiceOut io
t.nickname,
tto.description
FROM invoiceOut io
JOIN ticket t ON t.refFk = io.ref
LEFT JOIN ticketObservation tto ON tto.ticketFk = t.id
AND tto.observationTypeFk = (SELECT id FROM observationType WHERE code = 'invocieOut')
WHERE t.refFk = ?
ORDER BY t.shipped
ORDER BY t.shipped