7773-testToMaster_2430 #2774

Merged
alexm merged 368 commits from 7773-testToMaster_2430 into master 2024-07-23 06:21:03 +00:00
4 changed files with 7 additions and 4 deletions
Showing only changes of commit b25cf67036 - Show all commits

View File

@ -104,7 +104,7 @@
<tr>
<td width="5%">{{sale.itemFk}}</td>
<td class="number">{{sale.quantity}}</td>
<td width="50%">{{sale.concept}}</td>
<td width="50%">{{sale.concept}} <span class="font light-gray">{{sale.subName}}</span></td>
<td class="number">{{sale.price | currency('EUR', $i18n.locale)}}</td>
<td class="centered" width="5%">{{(sale.discount / 100) | percentage}}</td>
<td class="centered">{{sale.vatType}}</td>

View File

@ -34,4 +34,4 @@ plantPassport: Plant passport
observations: Observations
wireTransfer: "Pay method: Transferencia"
accountNumber: "Account number: {0}"
services: Services
services: Services

View File

@ -34,4 +34,5 @@ plantPassport: Pasaporte fitosanitario
observations: Observaciones
wireTransfer: "Forma de pago: Transferencia"
accountNumber: "Número de cuenta: {0}"
services: Servicios
services: Servicios

View File

@ -8,7 +8,8 @@ SELECT
s.itemFk,
s.concept,
tc.code vatType,
it.isPackaging
it.isPackaging,
i.subName
FROM vn.invoiceOut io
JOIN vn.ticket t ON t.refFk = io.ref
JOIN vn.supplier su ON su.id = io.companyFk
@ -38,6 +39,7 @@ SELECT
NULL,
ts.description,
tc.code,
NULL,
NULL
FROM vn.invoiceOut io
JOIN vn.ticket t ON t.refFk = io.ref