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

Merge branch 'dev' into 6777-changeDependenciesVn2008toVnPart7
gitea/salix/pipeline/pr-dev There was a failure building this commit Details

This commit is contained in:
Robert Ferrús 2024-04-19 05:23:23 +00:00
parent 4f7d315719 08ca1a302b
commit c375223ae5
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
db/routines/vn/procedures/invoiceInTax_getFromEntries.sql
View File

@ -4,16 +4,9 @@ BEGIN
DECLARE vRate DOUBLE DEFAULT 1; DECLARE vRate DOUBLE DEFAULT 1;
DECLARE vDated DATE; DECLARE vDated DATE;
DECLARE vExpenseFk VARCHAR(10); DECLARE vExpenseFk VARCHAR(10);
DECLARE vIsBooked BOOLEAN DEFAULT FALSE;
SELECT isBooked INTO vIsBooked CALL invoiceIn_checkBooked(vInvoiceInFk);
FROM invoiceIn ii
WHERE id = vInvoiceInFk;
IF vIsBooked THEN
CALL util.throw('A booked invoice cannot be modified');
END IF;
SELECT MAX(rr.dated) INTO vDated SELECT MAX(rr.dated) INTO vDated
FROM referenceRate rr FROM referenceRate rr
JOIN invoiceIn ii ON ii.id = vInvoiceInFk JOIN invoiceIn ii ON ii.id = vInvoiceInFk

4
modules/route/front/summary/index.html
View File

@ -81,7 +81,7 @@
<vn-th>City</vn-th> <vn-th>City</vn-th>
<vn-th shrink>PC</vn-th> <vn-th shrink>PC</vn-th>
<vn-th>Client</vn-th> <vn-th>Client</vn-th>
<vn-th>Warehouse</vn-th> <vn-th>State</vn-th>
<vn-th number shrink>Packages</vn-th> <vn-th number shrink>Packages</vn-th>
<vn-th shrink>m³</vn-th> <vn-th shrink>m³</vn-th>
<vn-th shrink>Packaging</vn-th> <vn-th shrink>Packaging</vn-th>
@ -109,7 +109,7 @@
{{ticket.nickname}} {{ticket.nickname}}
</span> </span>
</vn-td> </vn-td>
<vn-td>{{ticket.warehouseName}}</vn-td> <vn-td>{{ticket.ticketStateName}}</vn-td>
<vn-td number shrink>{{ticket.packages}}</vn-td> <vn-td number shrink>{{ticket.packages}}</vn-td>
<vn-td shrink>{{ticket.volume}}</vn-td> <vn-td shrink>{{ticket.volume}}</vn-td>
<vn-td shrink>{{ticket.ipt}}</vn-td> <vn-td shrink>{{ticket.ipt}}</vn-td>