From 8c2cdf05e71c15cd6f6f3d73f6c3137851cf2df4 Mon Sep 17 00:00:00 2001 From: Thomas Mudrunka Date: Thu, 19 Jul 2012 20:08:40 +0200 Subject: [PATCH] Vylepseni soupiska --- assistants/stats/roster.inc.php | 8 ++++---- locale/cs/messages.inc.php | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/assistants/stats/roster.inc.php b/assistants/stats/roster.inc.php index a1e501d..8f5e4d5 100644 --- a/assistants/stats/roster.inc.php +++ b/assistants/stats/roster.inc.php @@ -1,7 +1,7 @@ - "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 64ac5db..9e17745 100644 --- 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', -- 2.30.2