X-Git-Url: https://git.harvie.cz/?a=blobdiff_plain;f=assistants%2Fstats%2Froster.inc.php;h=6b525e4001bbc3620ebaaf013bc87ed3f265e152;hb=51d3b8cf0914068fe60538aea0471d1ec623dd1e;hp=7452231c2eab52308cfa5608f47e08c8d07ac0a8;hpb=acb09ed65891a25d8163b92fe17db5bc78e601b1;p=mirrors%2FSokoMan.git

diff --git a/assistants/stats/roster.inc.php b/assistants/stats/roster.inc.php
index 7452231..6b525e4 100644
--- a/assistants/stats/roster.inc.php
+++ b/assistants/stats/roster.inc.php
@@ -1,7 +1,7 @@
 <?php
 $queries += array(
 	"Inventurni soupiska věcí se seriáky (Warehouse roster countable)"=>
-		"select model_id, model_name, model_barcode, COUNT(item_serial), GROUP_CONCAT(item_serial separator ', ') from item LEFT JOIN model USING(model_id) WHERE item_valid_till=0 AND status_id=1 AND model_countable=1 GROUP BY model_id ORDER BY model_name",
+		"select model_id, model_name, barcode_name, COUNT(item_serial), GROUP_CONCAT(item_serial separator ', ') from item LEFT JOIN barcode USING(barcode_id) LEFT JOIN model USING(model_id) WHERE item_valid_till=0 AND status_id=1 AND model_countable=1 GROUP BY model_id ORDER BY model_name",
 	"Inventurni soupiska věcí na počet (Warehouse roster uncountable)"=>
-		"select model_id, model_name, model_barcode, SUM(item_quantity) from item LEFT JOIN model USING(model_id) WHERE item_valid_till=0 AND status_id=1 AND model_countable=0 GROUP BY model_id ORDER BY model_name"
+		"select model_id, model_name, barcode_name, SUM(item_quantity) from item LEFT JOIN barcode USING(barcode_id) LEFT JOIN model USING(model_id) WHERE item_valid_till=0 AND status_id=1 AND model_countable=0 AND item_quantity>0 GROUP BY model_id ORDER BY model_name"
 );