verdnatura/salix
verdnatura
/
salix
3
5
Fork 2
Code Issues Pull Requests 70 Releases Wiki Activity

refs #4764 hotfix #1780

Merged
pablone merged 4 commits from 4764-ticketRefundhotFix into master 2023-10-05 13:46:30 +00:00
Conversation 0 Commits 4 Files Changed 3 +4 -3
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f52a6cb0c7 - Show all commits

2
print/templates/reports/delivery-note/delivery-note.html
View File

@ -117,7 +117,7 @@
<td class="number">{{service.price | currency('EUR', $i18n.locale)}}</td> <td class="number">{{service.price | currency('EUR', $i18n.locale)}}</td>
<td class="centered" width="5%"></td> <td class="centered" width="5%"></td>
<td class="centered">{{service.taxDescription}}</td> <td class="centered">{{service.taxDescription}}</td>
<td class="number">{{service.price | currency('EUR', $i18n.locale)}}</td> <td class="number">{{service.total | currency('EUR', $i18n.locale)}}</td>
</tr> </tr>
</tbody> </tbody>
<tfoot> <tfoot>

3
print/templates/reports/delivery-note/sql/services.sql
View File

@ -2,7 +2,8 @@ SELECT
tc.code taxDescription, tc.code taxDescription,
ts.description, ts.description,
ts.quantity, ts.quantity,
ts.price ts.price,
ts.quantity * ts.price total
FROM ticketService ts FROM ticketService ts
JOIN taxClass tc ON tc.id = ts.taxClassFk JOIN taxClass tc ON tc.id = ts.taxClassFk
WHERE ts.ticketFk = ? WHERE ts.ticketFk = ?