X-Git-Url: https://git.harvie.cz/?a=blobdiff_plain;f=assistants%2Fstats%2Froster.inc.php;h=5bf6c801936d3cb817dddac10d9e659ce2cfe37e;hb=eca3fc1db94c023c08354046b96cca0401fc49fc;hp=d4b4d6ce26a9dd8ee8e1e4013edd352b84371731;hpb=301e9536557644c6b895e109c2d285443459d4bc;p=mirrors%2FSokoMan.git

diff --git a/assistants/stats/roster.inc.php b/assistants/stats/roster.inc.php
index d4b4d6c..5bf6c80 100644
--- a/assistants/stats/roster.inc.php
+++ b/assistants/stats/roster.inc.php
@@ -1,5 +1,7 @@
 <?php
 $queries += array(
-	"Skladová soupiska (Warehouse roster)"=>
-		"select model_id, model_name, group_concat(item_serial separator ', ') from item LEFT JOIN model USING(model_id) WHERE item_valid_till=0 AND status_id=1 GROUP BY model_id",
+	"Inventurni soupiska věcí se seriáky (Warehouse roster countable)"=>
+		"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, 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"
 );