Trad: Traduction des titres des lots d'export

htdocs/exports/export.class.php

@@ -104,19 +104,6 @@ class Export
                         // Permissions ok
                         if ($bool)
                         {
-                            // Nom module
-                            $this->array_export_module[$i]=$module;
-                            // Code du dataset export
-                            $this->array_export_code[$i]=$module->export_code[$r];
-                            // Libell<6C> du dataset export
-                            $this->array_export_label[$i]=$module->export_label[$r];
-                            // Requete sql du dataset
-                            $this->array_export_sql[$i]=$module->export_sql[$r];
-                            // Tableau des champ <20> exporter (cl<63>=champ, valeur=libell<6C>)
-                            $this->array_export_fields[$i]=$module->export_fields_array[$r];
-                            // Tableau des alias <20> exporter (cl<63>=champ, valeur=alias)
-                            $this->array_export_alias[$i]=$module->export_alias_array[$r];
-
                             // Charge fichier lang en rapport
                             $langtoload=$module->getLangFilesArray();
                             if (is_array($langtoload))
@@ -127,6 +114,19 @@ class Export
                                 }
                             }
 
+                            // Nom module
+                            $this->array_export_module[$i]=$module;
+                            // Code du dataset export
+                            $this->array_export_code[$i]=$module->export_code[$r];
+                            // Libell<6C> du dataset export
+                            $this->array_export_label[$i]=$module->getDatasetLabel($r);
+                            // Requete sql du dataset
+                            $this->array_export_sql[$i]=$module->export_sql[$r];
+                            // Tableau des champ <20> exporter (cl<63>=champ, valeur=libell<6C>)
+                            $this->array_export_fields[$i]=$module->export_fields_array[$r];
+                            // Tableau des alias <20> exporter (cl<63>=champ, valeur=alias)
+                            $this->array_export_alias[$i]=$module->export_alias_array[$r];
+
                             dolibarr_syslog("Export charg<72> pour le module ".$modulename." en index ".$i.", dataset=".$module->export_code[$r].", nbre de champs=".sizeof($module->export_fields_code[$r]));
                             $i++;
                         }
@@ -168,7 +168,7 @@ class Export
 		if ($resql)
 		{
             //$this->array_export_label[$indice]
-            $filename="export_set".$datatoexport;
+            $filename="export_".$datatoexport;
             $filename.='.'.$objmodel->getDriverExtension();
             $dirname=$conf->export->dir_ouput.'/'.$user->id;
 

htdocs/includes/modules/DolibarrModules.class.php

@@ -262,6 +262,27 @@ class DolibarrModules
         return $this->langfiles;
     }
     
+    /**
+            \brief      Retourne le libell<6C> d'un lot de donn<6E>es exportable
+            \return     string      Libell<6C> du lot de donn<6E>es
+     */
+    function getDatasetLabel($r)
+    {
+        global $langs;
+        
+        $langstring="ExportDataset_".$this->export_code[$r];
+        if ($langs->trans($langstring) == $langstring)
+        {
+            // Traduction non trouv<75>e
+            return $this->export_label[$r];
+        }
+        else
+        {
+            // Traduction trouv<75>e
+            return $langs->trans($langstring);
+        }
+    }
+    
     
     /**
             \brief      Ins<6E>re ligne module

htdocs/includes/modules/modAdherent.class.php

@@ -51,6 +51,7 @@ class modAdherent extends DolibarrModules
     function modAdherent($DB)
     {
         $this->db = $DB ;
+        $this->id = 'member';   // Same value xxx than in file modXxx.class.php file
         $this->numero = 310 ;
     
         $this->family = "hr";
@@ -194,7 +195,7 @@ class modAdherent extends DolibarrModules
         // $this->export_permission[$r]    Liste des codes permissions requis pour faire l'export
 
         $r++;
-        $this->export_code[$r]=$this->numero.'_'.$r;
+        $this->export_code[$r]=$this->id.'_'.$r;
         $this->export_label[$r]='Adh<64>rents et attributs';
         $this->export_fields_array[$r]=array('a.nom'=>"Lastname",'a.prenom'=>"Firstname",'a.adresse'=>"Address",'a.cp'=>"Zip",'a.ville'=>"Town",'a.pays'=>"Country",'a.email'=>"Email",'a.login'=>"Login",'a.naiss'=>"Birthday");
         $this->export_alias_array[$r]=array('a.nom'=>"lastname",'a.prenom'=>"firstname",'a.adresse'=>"address",'a.cp'=>"zip",'a.ville'=>"town",'a.pays'=>"country",'a.email'=>"email",'a.login'=>"login",'a.naiss'=>"birthday");

htdocs/includes/modules/modBanque.class.php

@@ -48,6 +48,7 @@ class modBanque extends DolibarrModules
   function modBanque($DB)
   {
     $this->db = $DB ;
+    $this->id = 'banque';   // Same value xxx than in file modXxx.class.php file
     $this->numero = 85 ;
 
     $this->family = "financial";

htdocs/includes/modules/modBarcode.class.php

@@ -19,7 +19,6 @@
  *
  * $Id$
  * $Source$
- *
  */
 
 /**
@@ -50,6 +49,7 @@ class modBarcode extends DolibarrModules
   function modBarcode($DB)
   {
     $this->db = $DB ;
+    $this->id = 'barcode';   // Same value xxx than in file modXxx.class.php file
     $this->numero = 55 ;
     
     $this->family = "products";

htdocs/includes/modules/modBookmark.class.php

@@ -48,6 +48,7 @@ class modBookmark extends DolibarrModules
   function modBookmark($DB)
   {
     $this->db = $DB ;
+    $this->id = 'bookmark';   // Same value xxx than in file modXxx.class.php file
     $this->numero = 330;
 
     $this->family = "technic";

htdocs/includes/modules/modBookmark4u.class.php

@@ -18,7 +18,6 @@
  *
  * $Id$
  * $Source$
- *
  */
 
 /**
@@ -49,6 +48,7 @@ class modBookmark4u extends DolibarrModules
   function modBookmark4u($DB)
   {
     $this->db = $DB ;
+    $this->id = 'bookmark4u';   // Same value xxx than in file modXxx.class.php file
     $this->numero = 59 ;
 
     $this->family = "technic";

htdocs/includes/modules/modBoutique.class.php

@@ -20,7 +20,6 @@
  *
  * $Id$
  * $Source$
- *
  */
 
 /**     \defgroup   boutique     Module boutique
@@ -49,6 +48,7 @@ class modBoutique extends DolibarrModules
   function modBoutique($DB)
   {
     $this->db = $DB ;
+    $this->id = 'boutique';   // Same value xxx than in file modXxx.class.php file
     $this->numero = 86 ;
 
     $this->family = "products";

htdocs/includes/modules/modCategorie.class.php

@@ -15,7 +15,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
  */
 
 /**
@@ -31,7 +30,8 @@
 
 include_once "DolibarrModules.class.php";
 
-/** \class modProduit
+/**
+        \class      modProduit
         \brief      Classe de description et activation du module Produit
 */
 
@@ -45,6 +45,7 @@ class modCategorie extends DolibarrModules
   function modCategorie ($DB)
   {
     $this->db = $DB;
+    $this->id = 'categorie';   // Same value xxx than in file modXxx.class.php file
     $this->numero = 1780;
 
     $this->family = "products";

htdocs/includes/modules/modClickToDial.class.php

@@ -18,7 +18,6 @@
  *
  * $Id$
  * $Source$
- *
  */
 
 /**
@@ -49,6 +48,7 @@ class modClickToDial extends DolibarrModules
   function modClickToDial($DB)
   {
     $this->db = $DB ;
+    $this->id = 'clicktodial';   // Same value xxx than in file modXxx.class.php file
     $this->numero = 58 ;
 
     $this->family = "technic";

htdocs/includes/modules/modCommande.class.php

@@ -21,7 +21,6 @@
  *
  * $Id$
  * $Source$
- *
  */
 
 /**     \defgroup   commande     Module commande
@@ -50,6 +49,7 @@ class modCommande extends DolibarrModules
   function modCommande($DB)
   {
     $this->db = $DB ;
+    $this->id = 'commande';   // Same value xxx than in file modXxx.class.php file
     $this->numero = 25 ;
 
     $this->family = "crm";

htdocs/includes/modules/modCommercial.class.php

@@ -20,7 +20,6 @@
  *
  * $Id$
  * $Source$
- *
  */
 
 /**     \defgroup   commercial     Module commercial
@@ -49,6 +48,7 @@ class modCommercial extends DolibarrModules
     function modCommercial($DB)
     {
         $this->db = $DB ;
+        $this->id = 'commercial';   // Same value xxx than in file modXxx.class.php file
         $this->numero = 2 ;
         
         $this->family = "crm";

htdocs/includes/modules/modComptabilite.class.php

@@ -20,7 +20,6 @@
  *
  * $Id$
  * $Source$
- *
  */
 
 /**     \defgroup   comptabilite     Module comptabilite
@@ -51,6 +50,7 @@ class modComptabilite extends DolibarrModules
     global $conf;
 
     $this->db = $DB ;
+    $this->id = 'comptabilite';   // Same value xxx than in file modXxx.class.php file
     $this->numero = 10 ;
     
     $this->family = "financial";

htdocs/includes/modules/modComptabiliteExpert.class.php

@@ -20,7 +20,6 @@
  *
  * $Id$
  * $Source$
- *
  */
 
 /**     \defgroup   comptabilite_expert     Module comptabilite expert
@@ -52,6 +51,7 @@ class modComptabiliteExpert extends DolibarrModules
     global $conf;
     
     $this->db = $DB ;
+    $this->id = 'comptabiliteexpert';   // Same value xxx than in file modXxx.class.php file
     $this->numero = 130 ;
     
     $this->family = "financial";

htdocs/includes/modules/modContrat.class.php

@@ -18,7 +18,6 @@
  *
  * $Id$
  * $Source$
- *
  */
 
 /**
@@ -50,6 +49,7 @@ class modContrat extends DolibarrModules
     function modcontrat($DB)
     {
         $this->db = $DB ;
+         $this->id = 'contrat';   // Same value xxx than in file modXxx.class.php file
         $this->numero = 54 ;
 
         $this->family = "crm";

htdocs/includes/modules/modDeplacement.class.php

@@ -47,6 +47,7 @@ class modDeplacement extends DolibarrModules
   function modDeplacement($DB)
   {
     $this->db = $DB ;
+    $this->id = 'deplacement';   // Same value xxx than in file modXxx.class.php file
     $this->numero = 75 ;
 
     $this->family = "crm";

htdocs/includes/modules/modDon.class.php

@@ -18,7 +18,6 @@
  *
  * $Id$
  * $Source$
- *
  */
 
 /**
@@ -49,6 +48,7 @@ class modDon  extends DolibarrModules
   function modDon($DB)
   {
     $this->db = $DB ;
+    $this->id = 'don';   // Same value xxx than in file modXxx.class.php file
     $this->numero = 700 ;
 
     $this->family = "financial";

htdocs/includes/modules/modEnergie.class.php

@@ -17,7 +17,6 @@
  *
  * $Id$
  * $Source$
- *
  */
 
 /** 
@@ -48,6 +47,7 @@ class modEnergie extends DolibarrModules
   function modEnergie($DB)
   {
     $this->db = $DB ;
+    $this->id = 'energie';   // Same value xxx than in file modXxx.class.php file
     $this->numero = 23 ;
     
     $this->family = "technic";

htdocs/includes/modules/modExpedition.class.php

@@ -18,7 +18,6 @@
  *
  * $Id$
  * $Source$
- *
  */
 
 /**
@@ -48,6 +47,7 @@ class modExpedition extends DolibarrModules
   function modExpedition($DB)
   {
     $this->db = $DB ;
+    $this->id = 'expedition';   // Same value xxx than in file modXxx.class.php file
     $this->numero = 80 ;
 
     $this->family = "crm";

htdocs/includes/modules/modExport.class.php

@@ -17,7 +17,6 @@
  *
  * $Id$
  * $Source$
- *
  */
 
 /**     \defgroup   export      Module export
@@ -46,6 +45,7 @@ class modExport extends DolibarrModules
   function modExport($DB)
   {
     $this->db = $DB ;
+    $this->id = 'export';   // Same value xxx than in file modXxx.class.php file
     $this->numero = 240;
 
     $this->family = "technic";

htdocs/includes/modules/modExternalRss.class.php

@@ -18,7 +18,6 @@
  *
  * $Id$
  * $Source$
- *
  */
 
 /**     \defgroup   externalrss     Module externalrss
@@ -47,6 +46,7 @@ class modExternalRss extends DolibarrModules
   function modExternalRss($DB)
   {
     $this->db = $DB ;
+    $this->id = 'externalrss';   // Same value xxx than in file modXxx.class.php file
     $this->numero = 320;
 
     $this->family = "technic";

htdocs/includes/modules/modFacture.class.php

@@ -51,6 +51,7 @@ class modFacture extends DolibarrModules
     function modFacture($DB)
     {
         $this->db = $DB ;
+        $this->id = 'invoice';   // Same value xxx than in file modXxx.class.php file
         $this->numero = 30 ;
     
         $this->family = "financial";
@@ -214,7 +215,7 @@ class modFacture extends DolibarrModules
         $r=0;
     
         $r++;
-        $this->export_code[$r]=$this->numero.'_'.$r;
+        $this->export_code[$r]=$this->id.'_'.$r;
         $this->export_label[$r]='Liste des factures clients et lignes de facture';
         $this->export_fields_array[$r]=array('f.rowid'=>"Id",'f.facnumber'=>"Ref",'f.fk_soc'=>"IdCompany",'f.datec'=>"DateCreation",'f.datef'=>"DateInvoice",'f.amount'=>"Amount",'f.remise_percent'=>"GlobalDiscount",'f.total'=>"TotalHT",'f.total_ttc'=>"TotalTTC",'f.paye'=>"Paid",'f.fk_statut'=>'Status','f.note'=>"Note",'fd.rowid'=>'LineId','fd.description'=>"LineDescription",'fd.tva_taux'=>"LineVATRate",'fd.qty'=>"LineQty",'fd.date_start'=>"DateStart",'fd.date_end'=>"DateEnd");
         $this->export_alias_array[$r]=array('f.rowid'=>"invoiceid",'f.facnumber'=>"ref",'f.fk_soc'=>"fk_soc",'f.datec'=>"datecreation",'f.datef'=>"dateinvoice",'f.amount'=>"amount",'f.remise_percent'=>"globaldiscount",'f.total'=>"totalht",'f.total_ttc'=>"totalttc",'f.paye'=>"paid",'f.fk_statut'=>'status','f.note'=>"note",'fd.rowid'=>'lineid','fd.description'=>"linedescription",'fd.tva_taux'=>"linevatrate",'fd.qty'=>"lineqty",'fd.date_start'=>"linedatestart",'fd.date_end'=>"linedateend");

htdocs/includes/modules/modFicheinter.class.php

@@ -20,7 +20,6 @@
  *
  * $Id$
  * $Source$
- *
  */
 
 /**
@@ -51,6 +50,7 @@ class modFicheinter  extends DolibarrModules
   function modFicheinter($DB)
   {
     $this->db = $DB ;
+    $this->id = 'ficheinter';   // Same value xxx than in file modXxx.class.php file
     $this->numero = 70 ;
     
     $this->family = "crm";

htdocs/includes/modules/modFournisseur.class.php

@@ -18,7 +18,6 @@
  *
  * $Id$
  * $Source$
- *
  */
 
 /**     \defgroup   fournisseur     Module fournisseur
@@ -48,6 +47,7 @@ class modFournisseur extends DolibarrModules
   function modFournisseur($DB)
   {
     $this->db = $DB ;
+    $this->id = 'fournisseur';   // Same value xxx than in file modXxx.class.php file
     $this->numero = 40 ;
 
     $this->family = "products";

htdocs/includes/modules/modLdap.class.php

@@ -19,7 +19,6 @@
  *
  * $Id$
  * $Source$
- *
  */
 
 /**     \defgroup   ldap     Module ldap
@@ -47,6 +46,7 @@ class modLdap extends DolibarrModules
   function modLdap($DB)
   {
     $this->db = $DB ;
+    $this->id = 'ldap';   // Same value xxx than in file modXxx.class.php file
     $this->numero = 200 ;
 
     $this->name = "Ldap";

htdocs/includes/modules/modMailing.class.php

@@ -18,7 +18,6 @@
  *
  * $Id$
  * $Source$
- *
  */
 
 /**
@@ -49,6 +48,7 @@ class modMailing extends DolibarrModules
   function modMailing($DB)
   {
     $this->db = $DB ;
+    $this->id = 'mailing';   // Same value xxx than in file modXxx.class.php file
     $this->numero = 22 ;
 
     $this->family = "technic";

htdocs/includes/modules/modPostnuke.class.php

@@ -18,7 +18,6 @@
  *
  * $Id$
  * $Source$
- *
  */
 
 /**     \defgroup   postnuke     Module postnuke
@@ -33,7 +32,8 @@
 
 include_once "DolibarrModules.class.php";
 
-/** \class modPostnuke
+/**
+        \class      modPostnuke
 		\brief      Classe de description et activation du module Postnuke
 */
 
@@ -47,6 +47,7 @@ class modPostnuke extends DolibarrModules
   function modPostnuke($DB)
   {
     $this->db = $DB ;
+    $this->id = 'postnuke';   // Same value xxx than in file modXxx.class.php file
     $this->numero = 210;
 
     $this->family = "technic";

htdocs/includes/modules/modPrelevement.class.php

@@ -18,7 +18,6 @@
  *
  * $Id$
  * $Source$
- *
  */
 
 /**
@@ -51,6 +50,7 @@ class modPrelevement extends DolibarrModules
     global $conf;
     
     $this->db = $DB ;
+    $this->id = 'prelevement';   // Same value xxx than in file modXxx.class.php file
     $this->numero = 57 ;
 
     $this->family = "financial";

htdocs/includes/modules/modProduit.class.php

@@ -50,6 +50,7 @@ class modProduit extends DolibarrModules
   function modProduit($DB)
   {
     $this->db = $DB ;
+    $this->id = 'produit';   // Same value xxx than in file modXxx.class.php file
     $this->numero = 50 ;
     
     $this->family = "products";

htdocs/includes/modules/modProjet.class.php

@@ -20,7 +20,6 @@
  *
  * $Id$
  * $Source$
- *
  */
 
 /**  \defgroup   projet     Module projet
@@ -34,7 +33,9 @@
 
 include_once "DolibarrModules.class.php";
 
-/**     \class      modProjet
+
+/**
+    \class      modProjet
 	\brief      Classe de description et activation du module Projet
 */
 
@@ -48,6 +49,7 @@ class modProjet extends DolibarrModules
   function modProjet($DB)
   {
     $this->db = $DB ;
+    $this->id = 'projet';   // Same value xxx than in file modXxx.class.php file
     $this->numero = 400 ;
 
     $this->family = "projects";

htdocs/includes/modules/modPropale.class.php

@@ -20,7 +20,6 @@
  *
  * $Id$
  * $Source$
- *
  */
 
 /**     \defgroup   propale     Module propale
@@ -49,6 +48,7 @@ class modPropale extends DolibarrModules
   function modPropale($DB)
   {
     $this->db = $DB ;
+    $this->id = 'propale';   // Same value xxx than in file modXxx.class.php file
     $this->numero = 20 ;
     
     $this->family = "crm";

htdocs/includes/modules/modService.class.php

@@ -20,7 +20,6 @@
  *
  * $Id$
  * $Source$
- *
  */
 
 /**
@@ -50,6 +49,7 @@ class modService extends DolibarrModules
   function modService($DB)
   {
     $this->db = $DB ;
+    $this->id = 'service';   // Same value xxx than in file modXxx.class.php file
     $this->numero = 53 ;
     
     $this->family = "products";

htdocs/includes/modules/modSociete.class.php

@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2003-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2005 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2006 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2004      Sebastien Di Cintio  <sdicintio@ressource-toi.org>
  * Copyright (C) 2004      Benoit Mortier       <benoit.mortier@opensides.be>
  * Copyright (C) 2005      Regis Houssin        <regis.houssin@cap-networks.com>
@@ -21,7 +21,6 @@
  *
  * $Id$
  * $Source$
- *
  */
 
 /** 
@@ -52,6 +51,7 @@ class modSociete extends DolibarrModules
   function modSociete($DB)
   {
     $this->db = $DB ;
+    $this->id = 'company';   // Same value xxx than in file modXxx.class.php file
     $this->numero = 1 ;
 
     $this->family = "crm";
@@ -151,7 +151,7 @@ class modSociete extends DolibarrModules
 
     // Export des liste des societes et attributs
     $r++;
-    $this->export_code[$r]=$this->numero.'_'.$r;
+    $this->export_code[$r]=$this->id.'_'.$r;
     $this->export_label[$r]='Liste des societes et attributs';
     $this->export_fields_array[$r]=array('s.idp'=>"Id",'s.nom'=>"Name",'s.prefix_comm'=>"Prefix",'s.client'=>"Customer",'s.fournisseur'=>"Supplier",'s.datec'=>"DateCreation",'s.tms'=>"DateLastModification",'s.code_client'=>"CustomerCode",'s.code_fournisseur'=>"SupplierCode",'s.address'=>"Address",'s.cp'=>"Zip",'s.ville'=>"Town",'p.libelle'=>"Country",'p.code'=>"CountryCode",'s.tel'=>"Phone",'s.fax'=>"Fax",'s.url'=>"Url",'s.siret'=>"IdProf1",'s.siren'=>"IdProf2",'s.ape'=>"IdProf3",'s.tva_intra'=>"VATIntraShort",'s.capital'=>"Capital",'s.note'=>"Note");
     $this->export_alias_array[$r]=array('s.idp'=>"idsoc",'s.nom'=>"name",'s.prefix_comm'=>"prefix",'s.client'=>"iscustomer",'s.fournisseur'=>"issupplier",'s.datec'=>"datecreation",'s.tms'=>"datelastmodification",'s.code_client'=>"customercode",'s.code_fournisseur'=>"suppliercode",'s.address'=>"address",'s.cp'=>"zip",'s.ville'=>"town",'p.libelle'=>"country",'p.code'=>"countrycode",'s.tel'=>"phone",'s.fax'=>"fax",'s.url'=>"url",'s.siret'=>"idprof1",'s.siren'=>"idprof2",'s.ape'=>"idprof3",'s.tva_intra'=>"vatintra",'s.capital'=>"capital",'s.note'=>"note");
@@ -168,7 +168,7 @@ class modSociete extends DolibarrModules
 
     // Export des liste des contacts et attributs
     $r++;
-    $this->export_code[$r]=$this->numero.'_'.$r;
+    $this->export_code[$r]=$this->id.'_'.$r;
     $this->export_label[$r]='Liste des contacts et attributs';
     $this->export_fields_array[$r]=array('c.civilite'=>"CivilityCode",'c.name'=>'Lastname','c.firstname'=>'Firstname','c.datec'=>"DateCreation",'c.tms'=>"DateLastModification",'c.address'=>"Address",'c.cp'=>"Zip",'c.ville'=>"Town",'c.phone'=>"Phone",'c.fax'=>"Fax",'c.email'=>"EMail",'p.libelle'=>"Country",'p.code'=>"CountryCode",'s.idp'=>"IdCompany",'s.nom'=>"CompanyName");
     $this->export_alias_array[$r]=array('c.civilite'=>"civilitycode",'c.name'=>'lastname','c.firstname'=>'firstname','c.datec'=>"datecreation",'c.tms'=>"datelastmodification",'c.address'=>"address",'c.cp'=>"zip",'c.ville'=>"town",'c.phone'=>"phone",'c.fax'=>"fax",'c.email'=>"email",'p.libelle'=>"country",'p.code'=>"countrycode",'s.idp'=>"idcompany",'s.nom'=>"companyname");

htdocs/includes/modules/modStock.class.php

@@ -18,7 +18,6 @@
  *
  * $Id$
  * $Source$
- *
  */
 
 /**
@@ -49,6 +48,7 @@ class modStock extends DolibarrModules
   function modStock($DB)
   {
     $this->db = $DB ;
+    $this->id = 'stock';   // Same value xxx than in file modXxx.class.php file
     $this->numero = 52 ;
 
     $this->family = "products";

htdocs/includes/modules/modSyslog.class.php

@@ -18,7 +18,6 @@
  *
  * $Id$
  * $Source$
- *
  */
 
 /**
@@ -49,6 +48,7 @@ class modSyslog extends DolibarrModules
   function modSyslog($DB)
   {
     $this->db = $DB ;
+    $this->id = 'syslog';   // Same value xxx than in file modXxx.class.php file
     $this->numero = 42 ;
     
     $this->family = "technic";

htdocs/includes/modules/modTelephonie.class.php

@@ -17,7 +17,6 @@
  *
  * $Id$
  * $Source$
- *
  */
 
 /**
@@ -48,6 +47,7 @@ class modTelephonie extends DolibarrModules
   function modTelephonie($DB)
   {
     $this->db = $DB ;
+    $this->id = 'telephonie';   // Same value xxx than in file modXxx.class.php file
     $this->numero = 56 ;
 
     $this->family = "technic";

htdocs/includes/modules/modUser.class.php

@@ -48,6 +48,7 @@ class modUser extends DolibarrModules
   function modUser($DB)
   {
     $this->db = $DB ;
+    $this->id = 'user';   // Same value xxx than in file modXxx.class.php file
     $this->numero = 0 ;
 
     $this->family = "base";
@@ -143,7 +144,7 @@ class modUser extends DolibarrModules
     $r=0;
 
     $r++;
-    $this->export_code[$r]=$this->numero.'_'.$r;
+    $this->export_code[$r]=$this->id.'_'.$r;
     $this->export_label[$r]='Liste des utilisateurs Dolibarr et attributs';
     $this->export_fields_array[$r]=array('u.rowid'=>"Id",'u.name'=>"Lastname",'u.firstname'=>"Firstname",'u.code'=>"Code",'u.login'=>"Login",'u.datec'=>"DateCreation",'u.tms'=>"DateLastModification",'u.admin'=>"Admin",'u.fk_socpeople'=>"IdContact",'u.note'=>"Note",'u.datelastaccess'=>'DateLastAccess');
     $this->export_alias_array[$r]=array('u.rowid'=>"rowid",'u.name'=>"name",'u.firstname'=>"firstname",'u.code'=>"code",'u.login'=>"login",'u.datec'=>"datecreation",'u.tms'=>"datelastmodification",'u.admin'=>"admin",'u.fk_socpeople'=>"idcontact",'u.note'=>"note",'u.datelastaccess'=>'datelastaccess');

htdocs/includes/modules/modWebcalendar.class.php

@@ -18,7 +18,6 @@
  *
  * $Id$
  * $Source$
- *
  */
 
 /**     \defgroup   webcalendar     Module webcalendar
@@ -48,6 +47,7 @@ class modWebcalendar extends DolibarrModules
   function modWebcalendar($DB)
   {
     $this->db = $DB ;
+    $this->id = 'webcalendar';   // Same value xxx than in file modXxx.class.php file
     $this->numero = 410 ;
 
     $this->family = "projects";

htdocs/langs/en_US/bills.lang

@@ -102,7 +102,10 @@ ClassifyBill=Classify invoice
 NoSupplierBillsUnpayed=No suppliers invoices unpayed
 SupplierBillsToPay=Suppliers invoices to pay
 CustomerBillsUnpayed=Unpayed customers invoices
+DispenseMontantLettres=Les factures r<>dig<69>es par proc<6F>d<EFBFBD>s m<>canographiques sont dispens<6E>es de l'arr<72>t<EFBFBD> en lettres
+NonPercuRecuperable=Non per<65>u r<>cup<75>rable
 SetConditions=Set payment conditions
 SetMode=Set payment mode
 Billed=Billed
 RecurringBills=Recurring invoices
+ExportDataset_invoice_1=Customer invoices list and invoices' lines

htdocs/langs/en_US/companies.lang

@@ -138,3 +138,5 @@ ExportCardToFormat=Export card to format
 ContactNotLinkedToCompany=Contact not linked to any company
 DolibarrLogin=Dolibarr login
 NoDolibarrAccess=No Dolibarr access
+ExportDataset_company_1=Companies/fundations and properties
+ExportDataset_company_2=Contacts and properties

htdocs/langs/en_US/members.lang

@@ -65,3 +65,4 @@ ConfirmDeleteMember=Are you sure you want to delete this member (Deleting a meme
 Filehtpasswd=htpasswd file
 ValidateMember=Validate a member
 ConfirmValidateMember=Are you sure you want to validate this member ?
+ExportDataset_member_1=Members and properties

htdocs/langs/en_US/users.lang

@@ -71,3 +71,4 @@ ErrorFailedToSaveFile=Error - Failed to save file
 GuiLanguage=Interface language
 InternalUser=Internal user
 MyInformations=My informations
+ExportDataset_user_1=Dolibarr's users and properties

htdocs/langs/fr_FR/bills.lang

@@ -103,8 +103,9 @@ NoSupplierBillsUnpayed=Aucune facture fournisseur impay
 SupplierBillsToPay=Factures fournisseurs <20> payer
 CustomerBillsUnpayed=Factures clients impay<61>es
 DispenseMontantLettres=Les factures r<>dig<69>es par proc<6F>d<EFBFBD>s m<>canographiques sont dispens<6E>es de l'arr<72>t<EFBFBD> en lettres
-NonPercuRecuperable=non per<65>u r<>cup<75>rable
+NonPercuRecuperable=Non per<65>u r<>cup<75>rable
 SetConditions=D<>finir conditions de r<>glement
 SetMode=D<>finir mode de r<>glement
 Billed=Factur<75>
 RecurringBills=Factures r<>currentes
+ExportDataset_invoice_1=Factures clients et lignes de facture

htdocs/langs/fr_FR/companies.lang

@@ -138,3 +138,5 @@ ExportCardToFormat=Exporter fiche au format
 ContactNotLinkedToCompany=Contact non li<6C> <20> une soci<63>t<EFBFBD>
 DolibarrLogin=Login Dolibarr
 NoDolibarrAccess=Pas d'acc<63>s Dolibarr
+ExportDataset_company_1=Soci<63>t<EFBFBD>s/associations et caract<63>ristiques
+ExportDataset_company_2=Contacts et caract<63>ristiques

htdocs/langs/fr_FR/members.lang

@@ -65,3 +65,4 @@ ConfirmDeleteMember=Etes-vous s
 Filehtpasswd=Fichier htpasswd
 ValidateMember=Valider un adh<64>rent
 ConfirmValidateMember=Etes-vous s<>r de vouloir valider cet adh<64>rent ?
+ExportDataset_member_1=Adh<64>rentes et caract<63>ristiques

htdocs/langs/fr_FR/users.lang

@@ -71,3 +71,4 @@ ErrorFailedToSaveFile=Erreur - l'enregistrement du fichier a
 GuiLanguage=Langage de l'interface
 InternalUser=Utilisateur interne
 MyInformations=Mes informations
+ExportDataset_user_1=Utilisateurs Dolibarr et attributs