From fc98407b42e0159c417f425ff2a163ab7756a967 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Sun, 14 Oct 2007 20:56:19 +0000
Subject: [PATCH] =?UTF-8?q?d=E9but=20ajout=20module=20import=20de=20donn?=
 =?UTF-8?q?=E9es=20et=20possibilit=E9=20de=20traduire=20la=20valeur=20dans?=
 =?UTF-8?q?=20la=20fonction=20select=5Farray?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/html.form.class.php                   | 10 +++++++---
 htdocs/includes/modules/modProduit.class.php | 13 +++++++++++++
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/htdocs/html.form.class.php b/htdocs/html.form.class.php
index f8e3a953491..e51f3d97450 100644
--- a/htdocs/html.form.class.php
+++ b/htdocs/html.form.class.php
@@ -2935,9 +2935,13 @@ class Form
         \param	show_empty      1 si il faut ajouter une valeur vide dans la liste, 0 sinon
         \param	key_in_label    1 pour afficher la key dans la valeur "[key] value"
         \param	value_as_key    1 pour utiliser la valeur comme clé
+        \param	$use_java       1 pour utiliser des fonctions javascript
+        \param  $fonction       Fonction javascript
+        \param  $translate      Traduire la valeur
     */
-    function select_array($htmlname, $array, $id='', $show_empty=0, $key_in_label=0, $value_as_key=0, $use_java=0, $fonction='')
+    function select_array($htmlname, $array, $id='', $show_empty=0, $key_in_label=0, $value_as_key=0, $use_java=0, $fonction='', $translate=0)
     {
+        global $langs;
         if ($use_java == 1 && $fonction != '')
         {
         	print '<select class="flat" name="'.$htmlname.'" '.$fonction.'>';
@@ -2963,12 +2967,12 @@ class Form
     
             if ($key_in_label)
             {
-                print '>'.$key.' - '.$value."</option>\n";
+                print '>'.$key.' - '.($translate?$langs->trans($value):$value)."</option>\n";
             }
             else
             {
                 if ($value == '' || $value == '-') { $value='&nbsp;'; }
-                print ">".$value."</option>\n";
+                print ">".($translate?$langs->trans($value):$value)."</option>\n";
             }
         }
     
diff --git a/htdocs/includes/modules/modProduit.class.php b/htdocs/includes/modules/modProduit.class.php
index b7fd9a8111c..e51616ee9c3 100644
--- a/htdocs/includes/modules/modProduit.class.php
+++ b/htdocs/includes/modules/modProduit.class.php
@@ -159,6 +159,19 @@ class modProduit extends DolibarrModules
     }
     $this->export_sql[$r].=' from '.MAIN_DB_PREFIX.'product as p';
     $this->export_permission[$r]=array(array("produit","export"));
+    
+    
+    // Imports
+    //--------
+    $r=0;
+
+    $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_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");
+    
 
 	}