Modif syslogs et autres

htdocs/telephonie/script/facture-detail-tableur-one.class.php

@@ -30,17 +30,53 @@ class FactureDetailTableurOne {
     $this->db = $DB;
   }
 
-  Function GenerateFile($ligne, $year, $month)
+  Function GenerateFile($ligne_id, $year, $month)
   {
-    $this->ligne = $ligne;
+    $this->ligne = new LigneTel($db);
+    $this->ligne->id = $ligne_id;
 
     $dir = "/tmp";
     $error = 0;
 
-    $dir = FAC_OUTPUTDIR . "/" . $fac->ref . "/" ;
-    $fname = $dir . $fac->ref . "-$ligne-$objlignetel->code_analytique-detail.xls";
+    $sql = "SELECT rowid";
+    $sql .= " FROM ".MAIN_DB_PREFIX."telephonie_facture";
+    $sql .= " WHERE fk_ligne = '".$this->ligne->id."'";
+    $sql .= " AND date = '".$year."-".$month."-01';";
 
-    dolibarr_syslog("Open $fname");
+    $resql = $this->db->query($sql);
+    
+    if ($resql)
+      {
+	if ($row = $this->db->fetch_row($resql))
+	  {
+	    $facid = substr('0000'.$row[0], -4);
+	  }
+	else
+	  {
+	    //dolibarr_syslog("Pas de facture pour ".$this->ligne->id);
+	  }
+      }
+    else
+      {
+	dolibarr_syslog("Error");
+      }
+
+
+    if ($facid > 0)
+      {
+
+	$dir = DOL_DATA_ROOT.'/telephonie/facture/';
+
+	$dir .= substr($facid,0,1)."/";
+	$dir .= substr($facid,1,1)."/";
+	$dir .= substr($facid,2,1)."/";
+	$dir .= substr($facid,3,1)."/";
+	
+	create_exdir($dir);
+
+	$fname = $dir . $facid . "-detail.xls";
+	
+	dolibarr_syslog("Open ".$facid."-detail.xls");
 	
 	$workbook = &new writeexcel_workbook($fname);
 	
@@ -71,12 +107,13 @@ class FactureDetailTableurOne {
 	$page->write(0, 1,  "Date", $format_titre);
 	$page->write(0, 2,  "Numero", $format_titre);
 	$page->write(0, 3,  "Destination", $format_titre);
-    $page->write(0, 4,  "Dure", $format_titre);
+	$page->write(0, 4,  "Duree", $format_titre);
 	$page->write(0, 5,  "Cout", $format_titre);
 	
 	$sql = "SELECT ligne, date, numero, dest, dureetext, duree, cout_vente";
 	$sql .= " FROM ".MAIN_DB_PREFIX."telephonie_communications_details";
-    $sql .= " WHERE ligne = '".$this->ligne."'";
+	$sql .= " WHERE fk_ligne = '".$this->ligne->id."'";
+	$sql .= " AND fk_telephonie_facture = ".$facid;
 	$sql .= " ORDER BY date ASC";
 	
 	$resql = $this->db->query($sql);
@@ -86,7 +123,7 @@ class FactureDetailTableurOne {
 	    $i = 0;
 	    $numsql = $this->db->num_rows($resql);
 	    
-	dolibarr_syslog($this->ligne . " : ".$numsql);
+	    dolibarr_syslog("Ligne : ".$this->ligne->id . " : ".$numsql);
 	    
 	    while ($i < $numsql)
 	      {
@@ -101,7 +138,6 @@ class FactureDetailTableurOne {
 		$page->write($xx, 4,  $obj->duree, $fnb);
 		$page->write($xx, 5,  $obj->cout_vente, $fp);
 		
-	    
 		$i++;
 	      }
 	    $this->db->free($resql);
@@ -112,10 +148,10 @@ class FactureDetailTableurOne {
 	  }
 	
 	$workbook->close();
-    dolibarr_syslog("Close $fname");
+	//dolibarr_syslog("Close $fname");
+      }
     
     return $error;
-
   }
 }
 ?>