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

Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7663-setWeight
gitea/salix/pipeline/pr-dev This commit looks good Details

This commit is contained in:
Jorge Penadés 2024-07-31 10:46:45 +02:00
parent 57f6c6d9a1 574529b920
commit 388ab80f46
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
print/templates/reports/buy-label/buy-label.js
View File

@ -15,7 +15,6 @@ module.exports = {
}, },
methods: { methods: {
getBarcode(id) { getBarcode(id) {
const xmlSerializer = new XMLSerializer();
const document = new DOMImplementation().createDocument('http://www.w3.org/1999/xhtml', 'html', null); const document = new DOMImplementation().createDocument('http://www.w3.org/1999/xhtml', 'html', null);
const svgNode = document.createElementNS('http://www.w3.org/2000/svg', 'svg'); const svgNode = document.createElementNS('http://www.w3.org/2000/svg', 'svg');
@ -26,7 +25,7 @@ module.exports = {
width: 3.8, width: 3.8,
height: 115, height: 115,
}); });
return xmlSerializer.serializeToString(svgNode); return new XMLSerializer().serializeToString(svgNode);
} }
}, },
props: { props: {

3
print/templates/reports/buy-label/sql/buys.sql
View File

@ -21,12 +21,13 @@ SELECT ROW_NUMBER() OVER(ORDER BY b.id, num.n) labelNum,
b.id, b.id,
b.itemFk, b.itemFk,
p.name producer, p.name producer,
i.comment IF(i2.id, i2.comment, i.comment) comment
FROM buy b FROM buy b
JOIN item i ON i.id = b.itemFk JOIN item i ON i.id = b.itemFk
LEFT JOIN producer p ON p.id = i.producerFk LEFT JOIN producer p ON p.id = i.producerFk
LEFT JOIN ink ON ink.id = i.inkFk LEFT JOIN ink ON ink.id = i.inkFk
LEFT JOIN origin o ON o.id = i.originFk LEFT JOIN origin o ON o.id = i.originFk
LEFT JOIN item i2 ON i2.id = b.itemOriginalFk
JOIN numbers num JOIN numbers num
WHERE b.entryFk = ? WHERE b.entryFk = ?
AND num.n <= b.stickers AND num.n <= b.stickers