X-Git-Url: https://git.harvie.cz/?a=blobdiff_plain;f=assistants%2Fstats%2Ffinancial.inc.php;h=fe03f8bb731d1b2ddc6835d8c48f3a308a2c19d3;hb=2941184ccc84401b4c298e64cc793f2e67542396;hp=3f38df3c0a49cf0a878f917ecedf815d0efab156;hpb=bf9a965cbe1a779ffebbe2251c1ebb4690067e51;p=mirrors%2FSokoMan.git

diff --git a/assistants/stats/financial.inc.php b/assistants/stats/financial.inc.php
index 3f38df3..fe03f8b 100644
--- a/assistants/stats/financial.inc.php
+++ b/assistants/stats/financial.inc.php
@@ -1,9 +1,14 @@
 <?php
 $month=date('Y-m');
 $month_sql='';
+$month_sql_bought='';
+$month_sql_sold='';
 if(isset($_GET['month'])) {
 	$month = htmlspecialchars($_GET['month']);
-	$month_sql = " AND DATE_FORMAT(item_valid_from, '%Y-%m') = ".$this->db->quote($_GET['month']);
+	$month_q = $this->db->quote($_GET['month']);
+	$month_sql = " AND DATE_FORMAT(item_valid_from, '%Y-%m') = ".$month_q;
+	$month_sql_bought = " AND DATE_FORMAT(item_date_bought, '%Y-%m') = ".$month_q;
+	$month_sql_sold = " AND DATE_FORMAT(item_date_sold, '%Y-%m') = ".$month_q;
 }
 
 echo $this->html->form($URL, 'GET', array(
@@ -14,16 +19,16 @@ echo $this->html->form($URL, 'GET', array(
 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,
+		=> 'SELECT COUNT(item_id),SUM(item_price_in) FROM item WHERE item_valid_till=0'.$month_sql_bought,
 	"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,
+		=> '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,
+		=> '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,
 	"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 =(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)
-			) FROM item WHERE item_valid_till=0 AND ( status_id = 3 )$month_sql",
+				-(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",
 );