X-Git-Url: https://git.harvie.cz/?a=blobdiff_plain;f=assistants%2Fstats%2Froster.inc.php;h=5bf6c801936d3cb817dddac10d9e659ce2cfe37e;hb=0f5f15490aaefd530fc6ac935dfa627d3889ba1c;hp=8f5e4d5e25888677c20ce4bcfd54a393e57d0218;hpb=8c2cdf05e71c15cd6f6f3d73f6c3137851cf2df4;p=mirrors%2FSokoMan.git

diff --git a/assistants/stats/roster.inc.php b/assistants/stats/roster.inc.php
index 8f5e4d5..5bf6c80 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, 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 GROUP BY model_id ORDER BY model_name"
 );