From 863daee580da7bfeea4d8dda5fa4bef99dea1d36 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Mon, 3 Sep 2007 12:23:54 +0000
Subject: [PATCH] =?UTF-8?q?Fix:=20cr=E9ation=20du=20pdf?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/fichinter/fiche.php                    |  9 +--
 .../modules/fichinter/pdf_soleil.modules.php  | 56 +++++++++++--------
 htdocs/lib/databases/mssql.lib.php            |  1 +
 3 files changed, 38 insertions(+), 28 deletions(-)

diff --git a/htdocs/fichinter/fiche.php b/htdocs/fichinter/fiche.php
index 8450e061109..4234f469ec7 100644
--- a/htdocs/fichinter/fiche.php
+++ b/htdocs/fichinter/fiche.php
@@ -118,10 +118,11 @@ if ($_POST["action"] == 'update')
 if ($_REQUEST['action'] == 'builddoc')	// En get ou en post
 {
   if ($_REQUEST['lang_id'])
-    {
-      $outputlangs = new Translate(DOL_DOCUMENT_ROOT ."/langs",$conf);
-      $outputlangs->setDefaultLang($_REQUEST['lang_id']);
-    }
+  {
+  	$outputlangs = new Translate(DOL_DOCUMENT_ROOT ."/langs",$conf);
+    $outputlangs->setDefaultLang($_REQUEST['lang_id']);
+  }
+  
   $result=fichinter_pdf_create($db, $_REQUEST['id'], $_REQUEST['model'], $outputlangs);
   if ($result <= 0)
     {
diff --git a/htdocs/includes/modules/fichinter/pdf_soleil.modules.php b/htdocs/includes/modules/fichinter/pdf_soleil.modules.php
index e8507bcf2b5..ced7cefa4d8 100644
--- a/htdocs/includes/modules/fichinter/pdf_soleil.modules.php
+++ b/htdocs/includes/modules/fichinter/pdf_soleil.modules.php
@@ -79,26 +79,34 @@ class pdf_soleil extends ModelePDFFicheinter
             \param	    fich	Object fichinter
             \return	    int     1=ok, 0=ko
     */
-    function write_pdf_file($fich)
+    function write_pdf_file($fichinter,$outputlangs='')
     {
-        global $user,$langs,$conf,$mysoc;
+    	global $user,$langs,$conf,$mysoc;
+    	
+    	if (! is_object($outputlangs)) $outputlangs=$langs;
+    	$outputlangs->load("main");
+      $outputlangs->load("companies");
+      $outputlangs->load("interventions");
+      
+      $outputlangs->setPhpLang();
 
-        if ($conf->fichinter->dir_output)
-        {
-			// If $fich is id instead of object
-			if (! is_object($fich))
-			{
-				$fich = new Fichinter($this->db,"",$id);
-		        $result=$fich->fetch($id);
-	        	if ($result < 0)
-	        	{
-	        		dolibarr_print_error($db,$fich->error);
-	        	}
-			}
-			
-            $fichref = sanitize_string($fich->ref);
-            $dir = $conf->fichinter->dir_output;
-			if (! eregi('specimen',$fichref)) $dir.= "/" . $fichref;
+      if ($conf->fichinter->dir_output)
+      {
+      	// If $fich is id instead of object
+      	if (! is_object($fichinter))
+      	{
+      		$id = $fichinter;
+      		$fichinter = new Fichinter($this->db,"",$id);
+      		$result=$fichinter->fetch($id);
+      		if ($result < 0)
+      		{
+      			dolibarr_print_error($db,$fichinter->error);
+      		}
+      	}
+      	
+      	$fichref = sanitize_string($fichinter->ref);
+      	$dir = $conf->fichinter->dir_output;
+      	if (! eregi('specimen',$fichref)) $dir.= "/" . $fichref;
             $file = $dir . "/" . $fichref . ".pdf";
 
             if (! file_exists($dir))
@@ -179,19 +187,19 @@ class pdf_soleil extends ModelePDFFicheinter
                  */
                 $pdf->SetTextColor(0,0,0);
                 $pdf->SetFont('Arial','B',12);
-                $fich->fetch_client();
+                $fichinter->fetch_client();
                 $pdf->SetXY(102,42);
-                $pdf->MultiCell(66,5, $fich->client->nom);
+                $pdf->MultiCell(66,5, $fichinter->client->nom);
                 $pdf->SetFont('Arial','B',11);
                 $pdf->SetXY(102,47);
-                $pdf->MultiCell(66,5, $fich->client->adresse . "\n" . $fich->client->cp . " " . $fich->client->ville);
+                $pdf->MultiCell(66,5, $fichinter->client->adresse . "\n" . $fichinter->client->cp . " " . $fichinter->client->ville);
                 $pdf->rect(100, 40, 100, 40);
 
 
                 $pdf->SetTextColor(200,0,0);
                 $pdf->SetFont('Arial','B',14);
-                $pdf->Text(11, 88, "Date : " . dolibarr_print_date($fich->date,'day'));
-                $pdf->Text(11, 94, $langs->trans("InterventionCard")." : ".$fich->ref);
+                $pdf->Text(11, 88, "Date : " . dolibarr_print_date($fichinter->date,'day'));
+                $pdf->Text(11, 94, $langs->trans("InterventionCard")." : ".$fichinter->ref);
 
                 $pdf->SetFillColor(220,220,220);
                 $pdf->SetTextColor(0,0,0);
@@ -209,7 +217,7 @@ class pdf_soleil extends ModelePDFFicheinter
                 $pdf->SetFont('Arial','', 10);
 
                 $pdf->SetXY (10, $tab_top + 8 );
-                $pdf->MultiCell(190, 5, $fich->description, 0, 'J', 0);
+                $pdf->MultiCell(190, 5, $fichinter->description, 0, 'J', 0);
 
                 $pdf->Close();
 
diff --git a/htdocs/lib/databases/mssql.lib.php b/htdocs/lib/databases/mssql.lib.php
index a756cb00635..fe4a5a068f7 100644
--- a/htdocs/lib/databases/mssql.lib.php
+++ b/htdocs/lib/databases/mssql.lib.php
@@ -324,6 +324,7 @@ class DoliDb
     $query = str_ireplace(".percent", ".[percent]", $query);
     $query = str_ireplace(" percent ", " [percent] ", $query);
     $query = str_ireplace("percent,", "[percent],", $query);
+    $query = str_ireplace("percent=", "[percent]=", $query);
     $query = str_ireplace("\'", "''", $query);