verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 57 Releases Wiki Activity

refs #5971 change sql address #1882

Merged
carlossa merged 3 commits from 5971-addressInvoiceOut into dev 2023-12-12 10:41:58 +00:00
Conversation 0 Commits 3 Files Changed 2 +8 -1
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
print/templates/reports/invoice/invoice.html
View File

@ -16,6 +16,7 @@
<tr> <tr>
<td class="font gray uppercase">{{$t('clientId')}}</td> <td class="font gray uppercase">{{$t('clientId')}}</td>
<th>{{client.id}}</th> <th>{{client.id}}</th>
</tr> </tr>
<tr> <tr>
<td class="font gray uppercase">{{$t('invoice')}}</td> <td class="font gray uppercase">{{$t('invoice')}}</td>
@ -80,6 +81,9 @@
<span>{{formatDate(ticket.shipped, '%d-%m-%Y')}}</span> <span>{{formatDate(ticket.shipped, '%d-%m-%Y')}}</span>
</div> </div>
</div> </div>
<span class="pull-right">
<h2>{{ticket.street}}</h2>
</span>
<span id="nickname" class="pull-right"> <span id="nickname" class="pull-right">
<h2>{{ticket.nickname}}</h2> <h2>{{ticket.nickname}}</h2>
</span> </span>

5
print/templates/reports/invoice/sql/tickets.sql
View File

@ -2,9 +2,12 @@ SELECT
t.id, t.id,
t.shipped, t.shipped,
t.nickname, t.nickname,
tto.description tto.description,
t.addressFk,
a.street
FROM invoiceOut io FROM invoiceOut io
JOIN ticket t ON t.refFk = io.REF JOIN ticket t ON t.refFk = io.REF
JOIN `address` a ON a.id = t.addressFk
LEFT JOIN observationType ot ON ot.code = 'invoiceOut' LEFT JOIN observationType ot ON ot.code = 'invoiceOut'
LEFT JOIN ticketObservation tto ON tto.ticketFk = t.id LEFT JOIN ticketObservation tto ON tto.ticketFk = t.id
AND tto.observationTypeFk = ot.id AND tto.observationTypeFk = ot.id