Odstraneni podpory veci na pocet z kodu (jeste je potreba odstranit podporu z modelu)

[mirrors/SokoMan.git] / assistants / stats / roster.inc.php

diff --git a/assistants/stats/roster.inc.php b/assistants/stats/roster.inc.php
index a1e501dce84dc373646c350dd1bebac92a5790d8..e7a3dd6315d5f5faac1eefd0b8dd68999e05c7b5 100644 (file)
--- a/assistants/stats/roster.inc.php
+++ b/assistants/stats/roster.inc.php
@@ -1,7 +1,5 @@
 <?php
 $queries += array(
-       "Skladová soupiska věcí se seriáky (Warehouse roster countable)"=>
-               "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 AND model_countable=1 GROUP BY model_id",
-       "Skladová soupiska věcí na počet (Warehouse roster uncountable)"=>
-               "select model_id, model_name, 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"
+       "Inventurni soupiska (Warehouse roster)"=>
+               "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 GROUP BY model_id ORDER BY model_name",
 );