From: Thomas Mudrunka Date: Thu, 19 Jul 2012 18:17:21 +0000 (+0200) Subject: Vylepseni prekladu X-Git-Url: http://git.harvie.cz/?p=mirrors%2FSokoMan.git;a=commitdiff_plain;h=acb09ed65891a25d8163b92fe17db5bc78e601b1 Vylepseni prekladu --- diff --git a/assistants/stats/roster.inc.php b/assistants/stats/roster.inc.php index 6940ce2..7452231 100644 --- a/assistants/stats/roster.inc.php +++ b/assistants/stats/roster.inc.php @@ -1,7 +1,7 @@ - "select model_id, model_name, model_barcode, count(item_serial), 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, model_barcode, COUNT(item_serial), 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" + "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 9e17745..f2a0b7b 100644 --- a/locale/cs/messages.inc.php +++ b/locale/cs/messages.inc.php @@ -86,6 +86,7 @@ $LOCALE_MESSAGES = array( 'SUM(' => 'SOUČET(', 'COUNT(' => 'POČET(', + 'GROUP_CONCAT(' => 'AGREGACE(', 'Assistants' => 'Průvodci', 'dispose' => 'vyskladnit',