From e304169d1a513bca24691bc307631af1b25b8c71 Mon Sep 17 00:00:00 2001
From: Rodolphe Quiedeville <rodolphe@quiedeville.org>
Date: Thu, 1 Dec 2005 15:03:52 +0000
Subject: [PATCH] Bugfix

---
 htdocs/telephonie/stats/commerciaux/ca.php                  | 6 +++---
 htdocs/telephonie/stats/commerciaux/commercial.ca.class.php | 2 +-
 .../telephonie/stats/commerciaux/commercial.gain.class.php  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/htdocs/telephonie/stats/commerciaux/ca.php b/htdocs/telephonie/stats/commerciaux/ca.php
index 759dde51325..81a3dbb5b7e 100644
--- a/htdocs/telephonie/stats/commerciaux/ca.php
+++ b/htdocs/telephonie/stats/commerciaux/ca.php
@@ -56,7 +56,7 @@ print '<table class="noborder" width="100%" cellspacing="0" cellpadding="4">';
 print '<tr><td width="30%" valign="top">';
 
 $sql = "SELECT date_format(f.date,'%Y%m'), sum(f.cout_vente)";
-$sql .= ", c.name, c.firstname";
+$sql .= ", c.name, c.firstname, c.rowid";
 $sql .= " FROM ".MAIN_DB_PREFIX."telephonie_facture as f";
 $sql .= " , ".MAIN_DB_PREFIX."telephonie_societe_ligne as l";
 $sql .= " , ".MAIN_DB_PREFIX."user as c";
@@ -67,7 +67,7 @@ $sql .= " GROUP BY date_format(f.date,'%Y%m') DESC, c.rowid DESC";
 
 print '<table class="border" width="100%" cellspacing="0" cellpadding="4">';
 
-print '<tr class="liste_titre"><td width="50%" valign="top">Nom</td><td align="center">Nb Lignes</td><td>&nbsp;</td></tr>';
+print '<tr class="liste_titre"><td width="50%" valign="top">Nom</td><td align="center">Date</td><td>&nbsp;</td></tr>';
 
 $resql = $db->query($sql);
 if ($resql)
@@ -86,7 +86,7 @@ if ($resql)
       print "<tr $bc[$var]>";
 
       print '<td width="50%" valign="top">';
-      print '<a href="commercial.php?commid='.$row[3];
+      print '<a href="commercial.php?commid='.$row[4];
       print '">'.$row[3]." ". $row[2].'</a></td><td align="center">'.$row[0].'</td>';
       print '<td align="right">'.price($row[1]).'</td></tr>';
       $total += $row[1];
diff --git a/htdocs/telephonie/stats/commerciaux/commercial.ca.class.php b/htdocs/telephonie/stats/commerciaux/commercial.ca.class.php
index a3f7190c54e..1eedf789eb3 100644
--- a/htdocs/telephonie/stats/commerciaux/commercial.ca.class.php
+++ b/htdocs/telephonie/stats/commerciaux/commercial.ca.class.php
@@ -46,7 +46,7 @@ class GraphCommercialChiffreAffaire extends GraphBar {
     if ($commercial > 0)
       {
 	$sql = "DELETE FROM ".MAIN_DB_PREFIX."telephonie_stats";     
-	$sql .= " WHERE graph='commercial.ca.mensuel.".$commercial."';";
+	$sql .= " WHERE graph='commercial.ca.mensuel.".$commercial."'";
 	if ($this->year > 0)
 	  {
 	    $sql .= " AND legend like '".$this->year."%'";
diff --git a/htdocs/telephonie/stats/commerciaux/commercial.gain.class.php b/htdocs/telephonie/stats/commerciaux/commercial.gain.class.php
index 3a477313188..cdd412447ad 100644
--- a/htdocs/telephonie/stats/commerciaux/commercial.gain.class.php
+++ b/htdocs/telephonie/stats/commerciaux/commercial.gain.class.php
@@ -30,10 +30,10 @@ class GraphCommercialGain extends GraphBar {
     $this->file = $file;
     $this->year = $year;
     $this->client = 0;
-    $this->titre = "Gain mensuel";
+    $this->titre = "Marge mensuelle";
     if ($this->year > 0)
       {
-	$this->titre = "Gain mensuel ".$this->year;
+	$this->titre .= " ".$this->year;
       }
     $this->barcolor = "pink";
     $this->showframe = true;