From 2b868859c92c9c64ca3156be69982ab1317d00f5 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Sat, 20 Oct 2007 21:46:32 +0000
Subject: [PATCH] Fix: traduction

---
 .../modules/commande/pdf_einstein.modules.php | 11 +--
 .../modules/facture/pdf_crabe.modules.php     | 68 ++++++++++---------
 htdocs/includes/modules/modProduit.class.php  | 15 +++-
 .../propale/pdf_propale_azur.modules.php      |  9 +--
 4 files changed, 60 insertions(+), 43 deletions(-)

diff --git a/htdocs/includes/modules/commande/pdf_einstein.modules.php b/htdocs/includes/modules/commande/pdf_einstein.modules.php
index 004cf1a7d17..650554948b7 100644
--- a/htdocs/includes/modules/commande/pdf_einstein.modules.php
+++ b/htdocs/includes/modules/commande/pdf_einstein.modules.php
@@ -107,14 +107,15 @@ class pdf_einstein extends ModelePDFCommandes
 
 		if (! is_object($outputlangs)) $outputlangs=$langs;
 		$outputlangs->load("main");
-        $outputlangs->load("companies");
-        $outputlangs->load("bills");
-        $outputlangs->load("products");
-        $outputlangs->load("orders");
+		$outputlangs->load("dict");
+    $outputlangs->load("companies");
+    $outputlangs->load("bills");
+    $outputlangs->load("products");
+    $outputlangs->load("orders");
 
 		$outputlangs->setPhpLang();
 
-        if ($conf->commande->dir_output)
+    if ($conf->commande->dir_output)
 		{
 			// Définition de l'objet $com (pour compatibilite ascendante)
 	    	if (! is_object($com))
diff --git a/htdocs/includes/modules/facture/pdf_crabe.modules.php b/htdocs/includes/modules/facture/pdf_crabe.modules.php
index 269452c3942..b6e0e68747f 100644
--- a/htdocs/includes/modules/facture/pdf_crabe.modules.php
+++ b/htdocs/includes/modules/facture/pdf_crabe.modules.php
@@ -49,12 +49,12 @@ class pdf_crabe extends ModelePDFFactures
     {
         global $conf,$langs,$mysoc;
 
-		$langs->load("main");
+        $langs->load("main");
         $langs->load("bills");
 
         $this->db = $db;
         $this->name = "crabe";
-		$this->description = $langs->trans('PDFCrabeDescription');
+        $this->description = $langs->trans('PDFCrabeDescription');
 
         // Dimension page pour format A4
         $this->type = 'pdf';
@@ -103,39 +103,41 @@ class pdf_crabe extends ModelePDFFactures
      */
     function write_pdf_file($fac,$outputlangs='')
     {
-        global $user,$langs,$conf;
+    	global $user,$langs,$conf;
+    	
+    	if (! is_object($outputlangs)) $outputlangs=$langs;
+    	$outputlangs->load("main");
+    	$outputlangs->load("dict");
+    	$outputlangs->load("companies");
+    	$outputlangs->load("bills");
+    	$outputlangs->load("products");
+    	
+    	$outputlangs->setPhpLang();
 
-		if (! is_object($outputlangs)) $outputlangs=$langs;
-		$outputlangs->load("main");
-        $outputlangs->load("companies");
-        $outputlangs->load("bills");
-        $outputlangs->load("products");
-
-		$outputlangs->setPhpLang();
-
-        if ($conf->facture->dir_output)
+      if ($conf->facture->dir_output)
+      {
+      	// Définition de l'objet $fac (pour compatibilite ascendante)
+      	if (! is_object($fac))
         {
-			// Définition de l'objet $fac (pour compatibilite ascendante)
-        	if (! is_object($fac))
-        	{
-	            $id = $fac;
-	            $fac = new Facture($this->db,"",$id);
-	            $ret=$fac->fetch($id);
-			}
-            $deja_regle = $fac->getSommePaiement();
-
-			// Définition de $dir et $file
-			if ($fac->specimen)
-			{
-				$dir = $conf->facture->dir_output;
-				$file = $dir . "/SPECIMEN.pdf";
-			}
-			else
-			{
-				$facref = sanitize_string($fac->ref);
-				$dir = $conf->facture->dir_output . "/" . $facref;
-				$file = $dir . "/" . $facref . ".pdf";
-			}
+	        $id = $fac;
+	        $fac = new Facture($this->db,"",$id);
+	        $ret=$fac->fetch($id);
+	      }
+	      
+	      $deja_regle = $fac->getSommePaiement();
+	      
+	      // Définition de $dir et $file
+	      if ($fac->specimen)
+	      {
+	      	$dir = $conf->facture->dir_output;
+	      	$file = $dir . "/SPECIMEN.pdf";
+	      }
+	      else
+	      {
+	      	$facref = sanitize_string($fac->ref);
+	      	$dir = $conf->facture->dir_output . "/" . $facref;
+	      	$file = $dir . "/" . $facref . ".pdf";
+	      }
 
             if (! file_exists($dir))
             {
diff --git a/htdocs/includes/modules/modProduit.class.php b/htdocs/includes/modules/modProduit.class.php
index e51616ee9c3..420d96ed3d3 100644
--- a/htdocs/includes/modules/modProduit.class.php
+++ b/htdocs/includes/modules/modProduit.class.php
@@ -49,6 +49,8 @@ class modProduit extends DolibarrModules
     */
   function modProduit($DB)
   {
+    global $conf;
+    
     $this->db = $DB ;
     $this->id = 'produit';   // Same value xxx than in file modXxx.class.php file
     $this->numero = 50 ;
@@ -168,9 +170,20 @@ class modProduit extends DolibarrModules
     $r++;
     $this->import_code[$r]=$this->id.'_'.$r;
     $this->import_label[$r]="ProductsOrServices";	// Translation key
-    $this->import_fields_array[$r]=array('p.rowid'=>"Id",'p.ref'=>"Ref",'p.fk_product_type'=>"Type",'p.label'=>"Label",'p.description'=>"Description",'p.note'=>"Note",'p.price'=>"PriceHT",'p.price_ttc'=>"PriceTTC",'p.tva_tx'=>'VAT','p.envente'=>"OnSell",'p.duration'=>"Duration");
+    $this->import_fields_array[$r]=array('p.rowid'=>"Id",'p.ref'=>"Ref",'p.fk_product_type'=>"Type",'p.label'=>"Label",'p.description'=>"Description",'p.note'=>"Note",'p.price'=>"SellingPriceHT",'p.price_ttc'=>"SellingPriceTTC",'p.tva_tx'=>'VAT','p.envente'=>"OnSell",'p.duration'=>"Duration");
     $this->import_entities_array[$r]=array('p.rowid'=>"product",'p.ref'=>"product",'p.fk_product_type'=>"product",'p.label'=>"product",'p.description'=>"product",'p.note'=>"product",'p.price'=>"product",'p.price_ttc'=>"product",'p.tva_tx'=>'product','p.envente'=>"product",'p.duration'=>"product");
     //$this->import_alias_array[$r]=array('p.rowid'=>"id",'p.ref'=>"ref",'p.fk_product_type'=>"type",'p.label'=>"label",'p.description'=>"description",'p.note'=>"note",'p.price'=>"price",'p.tva_tx'=>'vat','p.envente'=>"onsell",'p.duration'=>"duration");
+        
+    if($conf->global->PRODUIT_MULTIPRICES)
+    {
+    	$this->import_multiprices[$r]=array();
+    	
+    	for($i=1;$i<=$conf->global->PRODUIT_MULTIPRICES_LIMIT;$i++)
+    	{
+    		$this->import_multiprices[$r][$i]["price_ht"] = "SellingPriceHT ".$i;
+    		$this->import_multiprices[$r][$i]["price_ttc"] = "SellingPriceTTC ".$i;
+    	}
+    }
     
 
 	}
diff --git a/htdocs/includes/modules/propale/pdf_propale_azur.modules.php b/htdocs/includes/modules/propale/pdf_propale_azur.modules.php
index 90d2aba317c..115d1693a1a 100644
--- a/htdocs/includes/modules/propale/pdf_propale_azur.modules.php
+++ b/htdocs/includes/modules/propale/pdf_propale_azur.modules.php
@@ -105,10 +105,11 @@ class pdf_propale_azur extends ModelePDFPropales
 
 		if (! is_object($outputlangs)) $outputlangs=$langs;
 		$outputlangs->load("main");
-        $outputlangs->load("companies");
-        $outputlangs->load("bills");
-        $outputlangs->load("propal");
-        $outputlangs->load("products");
+		$outputlangs->load("dict");
+    $outputlangs->load("companies");
+    $outputlangs->load("bills");
+    $outputlangs->load("propal");
+    $outputlangs->load("products");
 
 		$outputlangs->setPhpLang();