diff --git a/print/templates/reports/item-label/item-label.html b/print/templates/reports/item-label/item-label.html index 49593f7dd..b6b78fc81 100644 --- a/print/templates/reports/item-label/item-label.html +++ b/print/templates/reports/item-label/item-label.html @@ -12,7 +12,7 @@
{{item.name}}
{{tags.color}}
-
{{tags.producer}}
+
{{tags.provider}}
{{packing()}}
diff --git a/print/templates/reports/item-label/sql/item.sql b/print/templates/reports/item-label/sql/item.sql index 4b042c320..46aacc2fa 100644 --- a/print/templates/reports/item-label/sql/item.sql +++ b/print/templates/reports/item-label/sql/item.sql @@ -3,9 +3,12 @@ SELECT i.name, i.stems, i.size, - b.packing + b.packing, + p.name as 'producer' FROM vn.item i JOIN cache.last_buy clb ON clb.item_id = i.id JOIN vn.buy b ON b.id = clb.buy_id JOIN vn.entry e ON e.id = b.entryFk + JOIN vn.producer p ON p.id = i.producerFk + WHERE i.id = ? AND clb.warehouse_id = ? \ No newline at end of file