From b87e948f41de09b112c0a3784198c114f2ec01dd Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Wed, 28 Jan 2004 21:02:39 +0000
Subject: [PATCH] =?UTF-8?q?L'ordre=20du=20cumul=20est=20l'ordre=20chronolo?=
 =?UTF-8?q?gique=20car=20un=20cumul=20sur=20un=20ordre=20chronologique=20i?=
 =?UTF-8?q?nverse=20a=20peu=20d'int=E9r=EAt.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/compta/stats/cumul.php | 36 +++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/htdocs/compta/stats/cumul.php b/htdocs/compta/stats/cumul.php
index 10c505f20e1..d7a9bbc0628 100644
--- a/htdocs/compta/stats/cumul.php
+++ b/htdocs/compta/stats/cumul.php
@@ -36,24 +36,12 @@ if ($user->societe_id > 0)
   $socidp = $user->societe_id;
 }
 
-print_titre("Chiffres d'affaires en euros HT");
+print_titre("Chiffres d'affaires (euros HT)");
 
 print '<table width="100%"><tr><td valign="top">';
 
 $sql = "SELECT sum(f.total) as amount , date_format(f.datef,'%Y-%m') as dm";
-$sql .= " FROM llx_facture as f WHERE f.paye = 1";
-if ($socidp)
-{
-  $sql .= " AND f.fk_soc = $socidp";
-}
-$sql .= " GROUP BY dm DESC";
-
-pt($db, $sql,"Par mois");
-
-print "</td><td valign=\"top\">";
-
-$sql = "SELECT sum(f.total) as amount, month(f.datef) as dm";
-$sql .= " FROM llx_facture as f WHERE f.paye = 1";
+$sql .= " FROM llx_facture as f WHERE fk_user_valid is not NULL and f.paye = 1";
 if ($socidp)
 {
   $sql .= " AND f.fk_soc = $socidp";
@@ -62,18 +50,30 @@ $sql .= " GROUP BY dm";
 
 pt($db, $sql,"Suivi cumul par mois");
 
-
-print "<br>"; 
+print "</td><td valign=\"top\">";
 
 $sql = "SELECT sum(f.total) as amount, year(f.datef) as dm";
-$sql .= " FROM llx_facture as f WHERE f.paye = 1";
+$sql .= " FROM llx_facture as f WHERE fk_user_valid is not NULL and f.paye = 1";
 if ($socidp)
 {
   $sql .= " AND f.fk_soc = $socidp";
 }
-$sql .= " GROUP BY dm DESC";
+$sql .= " GROUP BY dm";
 
 pt($db, $sql,"Suivi cumul par année");
+
+print "<br>"; 
+
+$sql = "SELECT sum(f.total) as amount, month(f.datef) as dm";
+$sql .= " FROM llx_facture as f WHERE fk_user_valid is not NULL and f.paye = 1";
+if ($socidp)
+{
+  $sql .= " AND f.fk_soc = $socidp";
+}
+$sql .= " GROUP BY dm";
+
+pt($db, $sql,"Cumul sur les mois");
+
 
 print "</td></tr></table>";