Vylepseni soupiska

diff --git a/assistants/stats/roster.inc.php b/assistants/stats/roster.inc.php
index a1e501dce84dc373646c350dd1bebac92a5790d8..8f5e4d5e25888677c20ce4bcfd54a393e57d0218 100644 (file)
--- a/assistants/stats/roster.inc.php
+++ b/assistants/stats/roster.inc.php
@@ -1,7 +1,7 @@
 <?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 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",
+       "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"
 );

diff --git a/locale/cs/messages.inc.php b/locale/cs/messages.inc.php
index 64ac5dbdcd016555befa57101578b7bcaf5b3d71..9e177457e1e2290e7c39be601377cea4d719b70f 100644 (file)
--- a/locale/cs/messages.inc.php
+++ b/locale/cs/messages.inc.php
@@ -91,7 +91,7 @@ $LOCALE_MESSAGES = array(
                'dispose' => 'vyskladnit',
                'sell' => 'prodat',
                'stats' => 'statistiky',
-               'roster' => 'skladová soupiska',
+               'roster' => 'Inventurni soupiska',
                'set-margin' => 'nastavit přirážku',
                'store' => 'naskladnit',
                'store-single' => 'pridat model a naskladnit',