X-Git-Url: http://git.harvie.cz/?a=blobdiff_plain;f=assistants%2Fstats.inc.php;h=bd7caf0d386978f8517f22e24b15d9180cd56c48;hb=aeed9d1069fe3e4ed94f798179b309a120d70cf5;hp=6ccfb9f693fefa61d6b689ba527477ff93d0e88f;hpb=35916247a3b7ed49d0dc758ebdf76cf636763d2c;p=mirrors%2FSokoMan.git

diff --git a/assistants/stats.inc.php b/assistants/stats.inc.php
index 6ccfb9f..bd7caf0 100644
--- a/assistants/stats.inc.php
+++ b/assistants/stats.inc.php
@@ -18,13 +18,20 @@ $queries = array( //TODO: use build_query_select()!!!
 	"Použito celkem $month"
 		=> 'SELECT COUNT(item_id),SUM(item_price_in) FROM item WHERE item_valid_till=0 AND status_id = 2'.$month_sql,
 	"Prodáno celkem $month"
-		=> 'SELECT COUNT(item_id),SUM(item_price_in) FROM item WHERE item_valid_till=0 AND status_id = 3'.$month_sql,
+		=> 'SELECT COUNT(item_id),SUM(item_price_out) FROM item WHERE item_valid_till=0 AND status_id = 3'.$month_sql,
+	"Skladem celkem $month"
+		=> 'SELECT COUNT(item_id),SUM(item_price_in) FROM item WHERE item_valid_till=0 AND status_id = 1'.$month_sql,
+	"Bilance celkem $month"
+		=> 'SELECT (
+				SUM(item_price_out)
+				-(SELECT SUM(item_price_in) FROM item WHERE item_valid_till=0)
+			) FROM item WHERE item_valid_till=0 AND ( status_id = 3 )',
 	"Počet kusů skladem"
-		=> 'SELECT room_id,room_name,model_id,model_name,model_barcode,COUNT(item_id)'.
+		=> 'SELECT room_id,room_name,model_id,model_name,model_barcode,COUNT(item_id),SUM(item_quantity)'.
 		' FROM item LEFT JOIN model USING(model_id) LEFT JOIN room USING(room_id)'.
 		' WHERE item_valid_till=0 AND status_id=1'.
 		' GROUP BY model_id,room_id'.
-		' ORDER BY room_id,model_id;'
+		' ORDER BY room_id,model_id;',
 );
 
 foreach($queries as $description => $sql) {