From 363374ebcfaf045b97e480f2e59516e0f37b4d06 Mon Sep 17 00:00:00 2001
From: Rodolphe Quiedeville <rodolphe@quiedeville.org>
Date: Tue, 13 Sep 2005 15:30:10 +0000
Subject: [PATCH] Bugfix sur les calculs de consos

---
 htdocs/telephonie/script/commission.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/telephonie/script/commission.php b/htdocs/telephonie/script/commission.php
index 044b7dbb95a..f95d226f9aa 100644
--- a/htdocs/telephonie/script/commission.php
+++ b/htdocs/telephonie/script/commission.php
@@ -38,8 +38,6 @@ if ($opt['m'] > 0)
   $datetime = mktime(10,10,10,$opt['m'],10,2005);
 }
 
-
-
 $date = strftime("%d%h%Y%Hh%Mm%S",$datetime);
 
 /*
@@ -108,7 +106,7 @@ else
  *
  *
  *********************************************************/
-
+dolibarr_syslog("Calcul avance");
 $sql = "SELECT rowid, fk_distributeur, fk_contrat, datepo, montant";
 $sql .= " , avance_pourcent, rem_pour_prev";
 $sql .= " FROM ".MAIN_DB_PREFIX."telephonie_contrat_priseordre";
@@ -204,7 +202,7 @@ if ( $resql )
       
       $sqli = "INSERT INTO ".MAIN_DB_PREFIX."telephonie_commission_conso";
       $sqli .= " (date, fk_distributeur, fk_contrat, fk_ligne, montant, pourcentage)";
-      $sqli .= " VALUES ('".$year_prev.$month_prev."'";
+      $sqli .= " VALUES ('".$year.$month."'";
       $sqli .= ",".$obj->fk_distributeur.",".$obj->fk_contrat.",".$obj->ligne;
       $sqli .= ",".ereg_replace(",",".",$comm);
       $sqli .= ",".ereg_replace(",",".",$pourcent);
@@ -216,7 +214,7 @@ if ( $resql )
 	  dolibarr_syslog("Calcul conso Erreur ".$db->error());
 	}
 
-      dolibarr_syslog("Conso po : ".$obj->rowid . " ".$comm);
+      //dolibarr_syslog("Conso po : ".$obj->rowid . " ".$comm);
               
       $i++;
     }
@@ -566,6 +564,7 @@ foreach ($distributeurs as $distributeur_id)
 	  if (! $db->query($sqli))
 	    {
 	      $error++;
+	      dolibarr_syslog("Erreur insertion Commission finale");
 	    }
 
 	  dolibarr_syslog("Commission finale ".$amount);
@@ -584,6 +583,7 @@ foreach ($distributeurs as $distributeur_id)
 if ($error == 0)
 {
   $db->commit();
+  dolibarr_syslog("Commit");
 }
 else
 {