Merge branch 'master' into test

print/templates/reports/buy-label/buy-label.js

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

print/templates/reports/buy-label/sql/buys.sql

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