From a1677baab823daa6f543ddb5c5236ca6ae5cb3ce Mon Sep 17 00:00:00 2001
From: Rodolphe Quiedeville <rodolphe@quiedeville.org>
Date: Thu, 10 Nov 2005 10:57:45 +0000
Subject: [PATCH] Bugfix

---
 htdocs/telephonie/script/commission.php | 22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/htdocs/telephonie/script/commission.php b/htdocs/telephonie/script/commission.php
index 2e31f417f36..752c16dba3d 100644
--- a/htdocs/telephonie/script/commission.php
+++ b/htdocs/telephonie/script/commission.php
@@ -198,7 +198,7 @@ $sql .= " AND date_format(p.datepo, '%Y%m') <= '".$year_prev.$month_prev."'";
 $sql .= " AND fk_distributeur > 0";
 
 $resql = $db->query($sql);
-print $sql;
+//print $sql;
 if ( $resql )
 {
   $num = $db->num_rows($resql);
@@ -318,7 +318,7 @@ foreach ($distri_av as $distributeur_id)
       while ($ia < $numa)
 	{
 	  $rowa = $db->fetch_row($resqla);
- 	  dolibarr_syslog("* Régul des avances de la po " .$rowa[0] . " ".strftime("%Y%m",$rowa[1]));
+ 	  dolibarr_syslog("* Regul des avances de la po " .$rowa[0] . " ".strftime("%Y%m",$rowa[1]));
 	  $ia++;
 
 	  /* Calcul des sommes avancées */
@@ -334,8 +334,8 @@ foreach ($distri_av as $distributeur_id)
 	  if ( $resql )
 	    {
 	      $num = $db->num_rows($resql);
-	      $i = 0;
-	      
+	      dolibarr_syslog("* Regul des avances de la po ".$rowa[0]." ".strftime("%Y%m",$rowa[1]).", $num avances");
+	      $i = 0;	      
 	      while ($i < $num)
 		{
 		  $row = $db->fetch_row($resql);
@@ -349,29 +349,21 @@ foreach ($distri_av as $distributeur_id)
 		  $datdo = strftime("%Y%m",$rowa[1]);
 		  if ($row[2] <> 6)
 		    {
+		      dolibarr_syslog("* Communications <= $datup >= $datdo ");
 		      $sqlc = "SELECT sum(montant)";
 		      $sqlc .= " FROM ".MAIN_DB_PREFIX."telephonie_commission_conso";
-		  
-		      dolibarr_syslog("* Communications <= $datup >= $datdo ");
-
 		      $sqlc .= " WHERE fk_contrat = ". $row[1];
 		      $sqlc .= " AND date <= '".$datup."' AND date >= '".$datdo."'";
 		      
 		      $resqlc = $db->query($sqlc);
 		      
 		      if ( $resqlc )
-			{
-			  $numc = $db->num_rows($resqlc);
-			  $ic = 0;
-		      
-			  while ($ic < $numc)
+			{		      
+			  while ($rowc = $db->fetch_row($resqlc))
 			    {
-			      $rowc = $db->fetch_row($resqlc);
-			      
 			      $comm_regul[$distributeur_id] = $comm_regul[$distributeur_id] + $rowc[0];
 			      
 			      dolibarr_syslog("* Conso générée ".$rowc[0]);
-			      $ic++;
 			    }
 			  $db->free($resqlc);
 			}