X-Git-Url: https://git.harvie.cz/?a=blobdiff_plain;f=assistants%2Fstats%2Ffinancial.inc.php;h=e67e0676609067f91ffc8ef051cb777d4348af91;hb=f3fca77c92e403dfe746a72ab3d24ad326f96de9;hp=d06edba9a608c3798371c9eb6bb7aac2e00ea2db;hpb=c8fe68ff20c753edddd4379268612f5a41e2d7b8;p=mirrors%2FSokoMan.git

diff --git a/assistants/stats/financial.inc.php b/assistants/stats/financial.inc.php
index d06edba..e67e067 100644
--- a/assistants/stats/financial.inc.php
+++ b/assistants/stats/financial.inc.php
@@ -20,24 +20,17 @@ if($month_sql == '') $month='';
 $queries += array( //TODO: use build_query_select()!!!
 	"Nakoupeno celkem $month"
 		=> 'SELECT COUNT(item_id),SUM(item_price_in) FROM item WHERE item_valid_till=0'.$month_sql_bought,
-	"<strike>Nakoupeno celkem $month</strike>"
-		=> 'SELECT COUNT(item_id),SUM(item_price_in) FROM item WHERE item_valid_till=0'.$month_sql,
 	"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_sold,
 	"Prodáno celkem $month"
 		=> 'SELECT COUNT(item_id),SUM(item_price_out),SUM(item_price_in),(SUM(item_price_out)-SUM(item_price_in)) as sale_profit FROM item WHERE item_valid_till=0 AND status_id = 3'.$month_sql_sold,
-	"<strike>Prodáno celkem $month</strike>"
-		=> 'SELECT COUNT(item_id),SUM(item_price_out),SUM(item_price_in),(SUM(item_price_out)-SUM(item_price_in)) as sale_profit 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,
+	"Stavy (podrobně)"
+		=> 'SELECT status_id, status_name, SUM(item_price_in), SUM(item_price_out) FROM status LEFT JOIN item USING(status_id) WHERE item_valid_till=0 GROUP BY status_id;',
 	"Bilance celkem =(prodej - všechny nákupy) $month"
 		=> "SELECT (
 				SUM(item_price_out)
 				-(SELECT SUM(item_price_in) FROM item WHERE item_valid_till=0$month_sql_bought)
 			) FROM item WHERE item_valid_till=0 AND ( status_id = 3 )$month_sql_sold",
-	"<strike>Bilance celkem =(prodej - všechny nákupy) $month</strike>"
-		=> "SELECT (
-				SUM(item_price_out)
-				-(SELECT SUM(item_price_in) FROM item WHERE item_valid_till=0$month_sql)
-			) FROM item WHERE item_valid_till=0 AND ( status_id = 3 )$month_sql",
 );