Qual: Simplify/Uniformize code

dev/skeletons/modMyModule.class.php

@@ -53,14 +53,14 @@ class modMyModule extends DolibarrModules
 		// Family can be 'crm','financial','hr','projects','products','ecm','technic','other'
 		// It is used to group modules in module setup page 
 		$this->family = "projects";		
-		// Module label (no space allowed) used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
-		$this->name = "MyModuleLabel";	
+		$this->name = eregi_replace('^mod','',get_class($this));
-		// Module description used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
+		// Module description, used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
 		$this->description = "Description of module MyModule";
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
 		$this->version = '1.0';    
 		// Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
-		$this->const_name = 'MAIN_MODULE_MYMODULE';
+		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
 		// Where to store the module in setup page (0=common,1=interface,2=other)
 		$this->special = 1;
 		// Name of png file (without png) used for this module.

htdocs/admin/fckeditor.php

@@ -90,19 +90,11 @@ foreach($modules as $const => $desc)
  * Affiche page
  */
 
-llxHeader("","");
+llxHeader();
-
-$html=new Form($db);
-
-$h = 0;
-
-$head[$h][0] = DOL_URL_ROOT."/admin/fckeditor.php";
-$head[$h][1] = $langs->trans("Activation");
-$hselected=$h;
-$h++;
-
-dolibarr_fiche_head($head, $hselected, $langs->trans("ModuleSetup"));
 
+$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
+print_fiche_titre($langs->trans("FCKEditor"),$linkback,'setup');
+print '<br>';
 /*
  * Activation/désactivation de FCKeditor
  */

htdocs/admin/modules.php

@@ -28,7 +28,7 @@
 require("./pre.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 
-$mode=isset($_GET["mode"])?$_GET["mode"]:0;
+$mode=isset($_GET["mode"])?$_GET["mode"]:(isset($_SESSION['mode'])?$_SESSION['mode']:0);
 $mesg=isset($_GET["mesg"])?urldecode($_GET["mesg"]):"";
 
 if (!$user->admin)
@@ -159,6 +159,7 @@ function UnActivate($value,$requiredby=1)
 /*
  * Affichage page
  */
+$_SESSION["mode"]=$mode;
 
 llxHeader("","");
 
@@ -210,8 +211,8 @@ foreach ($dirlist as $dirroot)
 				if ($objMod->needleftmenu && sizeof($objMod->needleftmenu) && ! in_array($conf->left_menu,$objMod->needleftmenu)) $modulequalified=0;
 				if ($objMod->needtopmenu  && sizeof($objMod->needtopmenu)  && ! in_array($conf->top_menu,$objMod->needtopmenu))   $modulequalified=0;
 
-				// We dsicard modules according to features level (if active we always show them)
+				// We discard modules according to features level (PS: if module is activated we always show it)
-				$const_name = $objMod->const_name;
+				$const_name = 'MAIN_MODULE_'.strtoupper(eregi_replace('^mod','',get_class($objMod)));
 				if ($objMod->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2 && ! $conf->global->$const_name) $modulequalified=0;
 				if ($objMod->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1 && ! $conf->global->$const_name) $modulequalified=0;
 
@@ -324,7 +325,7 @@ foreach ($orders as $key => $value)
     $modName = $filename[$key];
 	$objMod  = $modules[$key];
 
-    $const_name = $objMod->const_name;
+    $const_name = 'MAIN_MODULE_'.strtoupper(eregi_replace('^mod','',get_class($objMod)));
 
     // Load all lang files of module
     if (is_array($objMod->langfiles))

htdocs/admin/triggers.php

@@ -179,8 +179,6 @@ foreach ($orders as $key => $value)
         $objMod = new $modName($db);
     }
 
-    $const_name = $objMod->const_name;
-
     $var=!$var;
 
 	// Define disabledbyname and disabledbymodule

htdocs/includes/modules/DolibarrModules.class.php

@@ -226,7 +226,7 @@ class DolibarrModules
 		}
 		else
 		{
-			// Si traduction du nom du module n'existe pas, on prend definition en dur dans module
+			// If translation of module with its numero does not exists, we take its name
 			return $this->name;
 		}
 	}

htdocs/includes/modules/modAdherent.class.php

@@ -52,7 +52,8 @@ class modAdherent extends DolibarrModules
         $this->numero = 310 ;
     
         $this->family = "hr";
-        $this->name = "Adherents";
+		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+		$this->name = eregi_replace('^mod','',get_class($this));
         $this->description = "Gestion des adherents d'une association";
         $this->version = 'dolibarr';                        // 'experimental' or 'dolibarr' or version
         $this->const_name = 'MAIN_MODULE_ADHERENT';

htdocs/includes/modules/modAgenda.class.php

@@ -52,10 +52,12 @@ class modAgenda extends DolibarrModules
         $this->numero = 2400;
 
         $this->family = "projects";
-        $this->name = "Agenda";
+		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+		$this->name = eregi_replace('^mod','',get_class($this));
         $this->description = "Gestion de l'agenda et des actions";
         $this->version = 'dolibarr';                        // 'experimental' or 'dolibarr' or version
-        $this->const_name = 'MAIN_MODULE_AGENDA';
+		// Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
+		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
         $this->special = 0;
         $this->picto='calendar';
     

htdocs/includes/modules/modBanque.class.php

@@ -50,7 +50,8 @@ class modBanque extends DolibarrModules
 	    $this->numero = 85 ;
 
 	    $this->family = "financial";
-	    $this->name = "Banque";
+		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+		$this->name = eregi_replace('^mod','',get_class($this));
 	    $this->description = "Gestion des comptes financiers de type Comptes bancaires ou postaux";
 
 	    $this->revision = explode(' ','$Revision$');

htdocs/includes/modules/modBarcode.class.php

@@ -50,7 +50,8 @@ class modBarcode extends DolibarrModules
 		$this->numero = 55 ;
 
 		$this->family = "technic";
-    $this->name = "Codes barres";
+		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+		$this->name = eregi_replace('^mod','',get_class($this));
 		$this->description = "Gestion des codes barres";
 		$this->version = 'dolibarr';		// 'development' or 'experimental' or 'dolibarr' or version
 		$this->const_name = 'MAIN_MODULE_BARCODE';

htdocs/includes/modules/modBookmark.class.php

@@ -50,7 +50,8 @@ class modBookmark extends DolibarrModules
 		$this->numero = 330;
 
 		$this->family = "technic";
-    $this->name = "Bookmarks";
+		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+		$this->name = eregi_replace('^mod','',get_class($this));
 		$this->description = "Gestion des Bookmarks";
 		$this->revision = explode(' ','$Revision$');
 		$this->version = $this->revision[1];

htdocs/includes/modules/modBoutique.class.php

@@ -51,7 +51,8 @@ class modBoutique extends DolibarrModules
 		$this->numero = 800;
 
 		$this->family = "products";
-		$this->name = "OSCommerce direct";
+		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+		$this->name = eregi_replace('^mod','',get_class($this));
 		$this->description = "Interface de visualisation d'une boutique OSCommerce ou OSCSS";
 		$this->version = 'dolibarr';                        // 'experimental' or 'dolibarr' or version
 		$this->const_name = 'MAIN_MODULE_BOUTIQUE';

htdocs/includes/modules/modCashDesk.class.php

@@ -44,12 +44,16 @@ class modCashDesk extends DolibarrModules
 	function modCashDesk ($DB)
 	{
 		$this->db = $DB;
+		
+		// Id for module (must be unique).
+		// Use here a free id (See in Home -> System information -> Dolibarr for list of used module id).
 		$this->numero = 50100;
 		// Key text used to identify module (for permission, menus, etc...)
 		$this->rights_class = 'cashdesk';
 		
 		$this->family = "products";
-		$this->name = "CashDesk";
+		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+		$this->name = eregi_replace('^mod','',get_class($this));
 		$this->description = "CashDesk module";
 	
 		$this->revision = explode(' ','$Revision$');

htdocs/includes/modules/modCategorie.class.php

@@ -48,7 +48,8 @@ class modCategorie extends DolibarrModules
 		$this->numero = 1780;
 	
 		$this->family = "technic";
-		$this->name = "Catégories";
+		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+		$this->name = eregi_replace('^mod','',get_class($this));
 		$this->description = "Gestion des catégories (produits, clients, fournisseurs...)";
 	
 		$this->revision = explode(' ','$Revision$');

htdocs/includes/modules/modClickToDial.class.php

@@ -50,7 +50,8 @@ class modClickToDial extends DolibarrModules
 		$this->numero = 58 ;
 
 		$this->family = "technic";
-    $this->name = "ClickToDial";
+		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+		$this->name = eregi_replace('^mod','',get_class($this));
 		$this->description = "Gestion du Click To Dial";
 
 		$this->version = 'dolibarr';		// 'development' or 'experimental' or 'dolibarr' or version

htdocs/includes/modules/modCommande.class.php

@@ -51,7 +51,8 @@ class modCommande extends DolibarrModules
 		$this->numero = 25 ;
 
 		$this->family = "crm";
-		$this->name = "Commande";
+		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+		$this->name = eregi_replace('^mod','',get_class($this));
 		$this->description = "Gestion des commandes clients";
 		$this->revision = explode(' ','$Revision$');
 		$this->version = $this->revision[1];

htdocs/includes/modules/modCommercial.class.php

@@ -50,7 +50,8 @@ class modCommercial extends DolibarrModules
         $this->numero = 2 ;
         
         $this->family = "crm";
-        $this->name = "Commercial";
+		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+		$this->name = eregi_replace('^mod','',get_class($this));
         $this->description = "Gestion commercial";
         
         $this->revision = explode(' ','$Revision$');

htdocs/includes/modules/modComptabilite.class.php

@@ -52,8 +52,9 @@ class modComptabilite extends DolibarrModules
 		$this->numero = 10 ;
 	
 		$this->family = "financial";
-		$this->name = "Comptabilite";
+		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
-		$this->description = "Gestion sommaire de comptabilit<69>";
+		$this->name = eregi_replace('^mod','',get_class($this));
+		$this->description = "Gestion sommaire de comptabilite";
 	
 		$this->revision = explode(" ","$Revision$");
 		$this->version = $this->revision[1];

htdocs/includes/modules/modComptabiliteExpert.class.php

@@ -53,7 +53,8 @@ class modComptabiliteExpert extends DolibarrModules
 		$this->numero = 130 ;
 
 		$this->family = "financial";
-    $this->name = "ComptabiliteExpert";
+		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+		$this->name = eregi_replace('^mod','',get_class($this));
 		$this->description = "Gestion expert de comptabilite (doubles parties)";
 
 		//    $this->revision = explode(' ','$Revision$');

htdocs/includes/modules/modContrat.class.php

@@ -50,7 +50,8 @@ class modContrat extends DolibarrModules
         $this->numero = 54 ;
 
         $this->family = "crm";
-        $this->name = "Contrats";
+		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+		$this->name = eregi_replace('^mod','',get_class($this));
         $this->description = "Gestion des contrats de services";
 
         $this->revision = explode(' ','$Revision$');

htdocs/includes/modules/modDeplacement.class.php

@@ -49,8 +49,9 @@ class modDeplacement extends DolibarrModules
 		$this->numero = 75 ;
 
 		$this->family = "financial";
-    $this->name = "D<EFBFBD>placement et frais";                        			// Si traduction Module75Name non trouv<75>e
+		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
-    $this->description = "Gestion des notes de frais et d<>placements";		// Si traduction Module75Desc non trouv<75>e
+		$this->name = eregi_replace('^mod','',get_class($this));
+		$this->description = "Gestion des notes de frais et deplacements";		// Si traduction Module75Desc non trouvee
 
 		$this->revision = explode(' ','$Revision$');
 		$this->version = $this->revision[1];

htdocs/includes/modules/modDocument.class.php

@@ -49,7 +49,8 @@ class modDocument extends DolibarrModules
 		$this->numero = 51 ;
 
 		$this->family = "other";
-    $this->name = "Document";
+		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+		$this->name = eregi_replace('^mod','',get_class($this));
 		$this->description = "Gestion des documents";
 		$this->revision = explode(' ','$Revision$');
 		$this->version = $this->revision[1];

htdocs/includes/modules/modDomain.class.php

@@ -50,7 +50,8 @@ class modDomain extends DolibarrModules
         $this->numero = 1300 ;
     
         $this->family = "other";
-        $this->name = "Domains";
+		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+		$this->name = eregi_replace('^mod','',get_class($this));
         $this->description = "Gestion d'une base de noms de domaines";
         $this->version = 'development';			// 'development' or 'experimental' or 'dolibarr' or version
         $this->const_name = 'MAIN_MODULE_DOMAIN';

htdocs/includes/modules/modDon.class.php

@@ -51,7 +51,8 @@ class modDon  extends DolibarrModules
 		$this->numero = 700 ;
 
 		$this->family = "financial";
-    $this->name = "Don";
+		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+		$this->name = eregi_replace('^mod','',get_class($this));
 		$this->description = "Gestion des dons";
 		$this->version = 'dolibarr';    // 'experimental' or 'dolibarr' or version
 		$this->const_name = 'MAIN_MODULE_DON';

htdocs/includes/modules/modDroitPret.class.php

@@ -49,7 +49,8 @@ class modDroitPret  extends DolibarrModules
 		$this->numero = 2200 ;
 
 		$this->family = "other";
-    $this->name = "Droit Pret";
+		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+		$this->name = eregi_replace('^mod','',get_class($this));
 		$this->description = "Gestion du droit de prets";
 		$this->version = 'experimental';    // 'development' or 'experimental' or 'dolibarr' or version
 		$this->const_name = 'MAIN_MODULE_DROITPRET';

htdocs/includes/modules/modECM.class.php

@@ -53,8 +53,8 @@ class modECM extends DolibarrModules
 		// Family can be 'crm','financial','hr','projects','product','ecm','technic','other'
 		// It is used to sort modules in module setup page 
 		$this->family = "ecm";		
-		// Module title used if translation string 'ModuleXXXName' not found (XXX is id value)
+		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
-		$this->name = "ECM";	
+		$this->name = eregi_replace('^mod','',get_class($this));
 		// Module description used if translation string 'ModuleXXXDesc' not found (XXX is id value)
 		$this->description = "Electronic Content Management";
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version

htdocs/includes/modules/modEditeur.class.php

@@ -49,8 +49,9 @@ class modEditeur extends DolibarrModules
 		$this->numero = 49 ;
 
 		$this->family = "other";
-    $this->name = "Editeur";
+		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
-    $this->description = "Gestion des <20>diteurs";
+		$this->name = eregi_replace('^mod','',get_class($this));
+		$this->description = "Gestion des editeurs";
 		$this->revision = explode(' ','$Revision$');
 		$this->version = $this->revision[1];
 		$this->const_name = 'MAIN_MODULE_EDITEUR';

htdocs/includes/modules/modEnergie.class.php

@@ -51,7 +51,8 @@ class modEnergie extends DolibarrModules
 		$this->numero = 23 ;
 
 		$this->family = "other";
-    $this->name = "Energie";
+		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+		$this->name = eregi_replace('^mod','',get_class($this));
 		$this->description = "Suivi de la consommation des energies";
 
 		$this->revision = explode(' ','$Revision$');

htdocs/includes/modules/modExpedition.class.php

@@ -50,7 +50,8 @@ class modExpedition extends DolibarrModules
 		$this->numero = 80 ;
 
 		$this->family = "crm";
-    $this->name = "Expedition";
+		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+		$this->name = eregi_replace('^mod','',get_class($this));
 		$this->description = "Gestion des expeditions";
 		$this->revision = explode(' ','$Revision$');
 		$this->version = $this->revision[1];

htdocs/includes/modules/modExport.class.php

@@ -48,8 +48,9 @@ class modExport extends DolibarrModules
 		$this->numero = 240;
 
 		$this->family = "technic";
-    $this->name = "Exports";
+		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
-    $this->description = "Outils d'exports de donn<6E>es Dolibarr (via un assistant)";
+		$this->name = eregi_replace('^mod','',get_class($this));
+		$this->description = "Outils d'exports de donnees Dolibarr (via un assistant)";
 		$this->version = 'dolibarr';                        // 'experimental' or 'dolibarr' or version
 		$this->const_name = 'MAIN_MODULE_EXPORT';
 		$this->special = 0;

htdocs/includes/modules/modExternalRss.class.php

@@ -51,7 +51,8 @@ class modExternalRss extends DolibarrModules
 		$this->numero = 320;
 
 		$this->family = "technic";
-		$this->name = "Syndication RSS";
+		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+		$this->name = eregi_replace('^mod','',get_class($this));
 		$this->description = "Ajout de files d'informations RSS dans les <20>crans Dolibarr";
 		$this->version = 'dolibarr';                        // 'experimental' or 'dolibarr' or version
 		$this->const_name = 'MAIN_MODULE_EXTERNALRSS';

htdocs/includes/modules/modFacture.class.php

@@ -51,7 +51,8 @@ class modFacture extends DolibarrModules
         $this->numero = 30;
     
         $this->family = "financial";
-        $this->name = "Factures";
+		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+		$this->name = eregi_replace('^mod','',get_class($this));
         $this->description = "Gestion des factures";
     
         $this->revision = explode(' ','$Revision$');

htdocs/includes/modules/modFckeditor.class.php

@@ -48,8 +48,9 @@ class modFckeditor extends DolibarrModules
 		$this->db = $DB ;
 		$this->numero = 2000 ;
 
-    $this->name = "FCKeditor";
 		$this->family = "technic";
+		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+		$this->name = eregi_replace('^mod','',get_class($this));
 		$this->description = "Editeur WYSIWYG";
 		$this->version = 'dolibarr';    // 'experimental' or 'dolibarr' or version
 		$this->const_name = 'MAIN_MODULE_FCKEDITOR';

htdocs/includes/modules/modFicheinter.class.php

@@ -52,7 +52,8 @@ class modFicheinter  extends DolibarrModules
 		$this->numero = 70 ;
 
 		$this->family = "crm";
-    $this->name = "Fiche d'intervention";
+		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+		$this->name = eregi_replace('^mod','',get_class($this));
 		$this->description = "Gestion des fiches d'intervention";
 
 		$this->revision = explode(" ","$Revision$");

htdocs/includes/modules/modFournisseur.class.php

@@ -49,7 +49,8 @@ class modFournisseur extends DolibarrModules
 		$this->numero = 40 ;
 
 		$this->family = "products";
-		$this->name = "Fournisseur";
+		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+		$this->name = eregi_replace('^mod','',get_class($this));
 		$this->description = "Gestion des fournisseurs";
 
 		$this->revision = explode(' ','$Revision$');

htdocs/includes/modules/modImport.class.php

@@ -49,8 +49,9 @@ class modImport extends DolibarrModules
 		$this->numero = 250;
 
 		$this->family = "technic";
-    $this->name = "Imports";
+		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
-    $this->description = "Outils d'imports de donn<6E>es Dolibarr (via un assistant)";
+		$this->name = eregi_replace('^mod','',get_class($this));
+		$this->description = "Outils d'imports de donnees Dolibarr (via un assistant)";
 		$this->version = 'development';                        // 'experimental' or 'dolibarr' or version
 		$this->const_name = 'MAIN_MODULE_IMPORT';
 		$this->special = 0;

htdocs/includes/modules/modLabel.class.php

@@ -50,7 +50,8 @@ class modLabel extends DolibarrModules
 		$this->numero = 60 ;
 
 		$this->family = "other";
-    $this->name = "Etiquettes";
+		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+		$this->name = eregi_replace('^mod','',get_class($this));
 		$this->description = "Gestion des etiquettes";
 		$this->version = 'development';		// 'development' or 'experimental' or 'dolibarr' or version
 		$this->const_name = 'MAIN_MODULE_LABEL';

htdocs/includes/modules/modLdap.class.php

@@ -48,8 +48,9 @@ class modLdap extends DolibarrModules
 		$this->db = $DB ;
 		$this->numero = 200 ;
 
-		$this->name = "Ldap";
 		$this->family = "technic";
+		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+		$this->name = eregi_replace('^mod','',get_class($this));
 		$this->description = "Synchronisation Ldap";
 		$this->version = 'dolibarr';    // 'experimental' or 'dolibarr' or version
 		$this->const_name = 'MAIN_MODULE_LDAP';

htdocs/includes/modules/modMailing.class.php

@@ -49,7 +49,8 @@ class modMailing extends DolibarrModules
 		$this->numero = 22 ;
 
 		$this->family = "technic";
-    $this->name = "EMailings";
+		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+		$this->name = eregi_replace('^mod','',get_class($this));
 		$this->description = "Gestion des EMailings";
 		$this->version = 'dolibarr';    // 'experimental' or 'dolibarr' or version
 		$this->const_name = 'MAIN_MODULE_MAILING';

htdocs/includes/modules/modMantis.class.php

@@ -54,10 +54,10 @@ class modMantis extends DolibarrModules
 		// Family can be 'crm','financial','hr','projects','product','technic','other'
 		// It is used to sort modules in module setup page 
 		$this->family = "projects";		
-		// Module title used if translation string 'ModuleXXXName' not found (XXX is id value)
+		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
-		$this->name = "Mantis";	
+		$this->name = eregi_replace('^mod','',get_class($this));
-		// Module descriptoin used translation string 'ModuleXXXDesc' not found (XXX is id value)
+		// Module description used translation string 'ModuleXXXDesc' not found (XXX is id value)
-		$this->description = "Interfa<EFBFBD>age avec le bug tracking Mantis";
+		$this->description = "Interfacage avec le bug tracking Mantis";
 		// Possible values for version are: 'experimental' or 'dolibarr' or version
 		$this->version = 'dolibarr';    
 		// Id used in llx_const table to manage module status (enabled/disabled)	

htdocs/includes/modules/modNotification.class.php

@@ -51,7 +51,8 @@ class modNotification extends DolibarrModules
 		$this->numero = 600;
 
 		$this->family = "technic";
-    $this->name = "Notifications";
+		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+		$this->name = eregi_replace('^mod','',get_class($this));
 		$this->description = "Gestion des notifications (par mail) sur <20>v<EFBFBD>nement Dolibarr";
 		$this->version = 'dolibarr';	// 'experimental' or 'dolibarr' or version
 		$this->const_name = 'MAIN_MODULE_NOTIFICATION';

htdocs/includes/modules/modOSCommerce2.class.php

@@ -52,7 +52,8 @@ class modOSCommerce2 extends DolibarrModules
 		$this->numero = 900;
 
 		$this->family = "products";
-		$this->name = "OSCommerce by WS";
+		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+		$this->name = eregi_replace('^mod','',get_class($this));
 		$this->description = "Interface de visualisation d'une boutique OSCommerce via des Web services.\nCe module requiert d'installer les composants dans /oscommerce_ws/ws_server sur OSCommerce. Voir fichier README dans /oscommerce_ws/ws_server";
 		$this->version = 'experimental';	// 'development' or 'experimental' or 'dolibarr' or version
 		$this->const_name = 'MAIN_MODULE_OSCOMMERCEWS';

htdocs/includes/modules/modPhenix.class.php

@@ -53,8 +53,8 @@ class modPhenix extends DolibarrModules
 		// Family can be 'crm','financial','hr','projects','product','technic','other'
 		// It is used to sort modules in module setup page 
 		$this->family = "projects";		
-		// Module title used if translation string 'ModuleXXXName' not found (XXX is id value)
+		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
-		$this->name = "Phenix";	
+		$this->name = eregi_replace('^mod','',get_class($this));
 		// Module descriptoin used translation string 'ModuleXXXDesc' not found (XXX is id value)
 		$this->description = "Interface avec le calendrier Phenix";
 		// Possible values for version are: 'experimental' or 'dolibarr' or version

htdocs/includes/modules/modPostnuke.class.php

@@ -50,7 +50,8 @@ class modPostnuke extends DolibarrModules
 		$this->numero = 210;
 
 		$this->family = "technic";
-    $this->name = "Postnuke";
+		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+		$this->name = eregi_replace('^mod','',get_class($this));
 		$this->description = "Gestion de l'outil PostNuke";
 		$this->version = 'development';    // 'development' or 'experimental' or 'dolibarr' or version
 		$this->const_name = 'MAIN_MODULE_POSTNUKE';

htdocs/includes/modules/modPrelevement.class.php

@@ -51,8 +51,9 @@ class modPrelevement extends DolibarrModules
 		$this->numero = 57 ;
 
 		$this->family = "financial";
-		$this->name = "Prelevement";
+		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
-		$this->description = "Gestion des Pr<50>l<EFBFBD>vements";
+		$this->name = eregi_replace('^mod','',get_class($this));
+		$this->description = "Gestion des Prelevements";
 
 		$this->revision = explode(' ','$Revision$');
 		$this->version = $this->revision[1];

htdocs/includes/modules/modProduit.class.php

@@ -54,7 +54,8 @@ class modProduit extends DolibarrModules
 		$this->numero = 50 ;
 
 		$this->family = "products";
-    $this->name = "Produit";
+		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+		$this->name = eregi_replace('^mod','',get_class($this));
 		$this->description = "Gestion des produits";
 
 		$this->revision = explode(' ','$Revision$');

htdocs/includes/modules/modProjet.class.php

@@ -51,7 +51,8 @@ class modProjet extends DolibarrModules
 		$this->numero = 400 ;
 
 		$this->family = "projects";
-    $this->name = "Projets";
+		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+		$this->name = eregi_replace('^mod','',get_class($this));
 		$this->description = "Gestion des projets";
 		$this->revision = explode(" ","$Revision$");
 		$this->version = $this->revision[1];

htdocs/includes/modules/modPropale.class.php

@@ -51,7 +51,8 @@ class modPropale extends DolibarrModules
 		$this->numero = 20 ;
 
 		$this->family = "crm";
-    $this->name = "Propositions commerciales";
+		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+		$this->name = eregi_replace('^mod','',get_class($this));
 		$this->description = "Gestion des propositions commerciales";
 
 		$this->revision = explode(' ','$Revision$');

htdocs/includes/modules/modService.class.php

@@ -52,7 +52,8 @@ class modService extends DolibarrModules
 		$this->numero = 53 ;
 
 		$this->family = "products";
-    $this->name = "Service";
+		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+		$this->name = eregi_replace('^mod','',get_class($this));
 		$this->description = "Gestion des services";
 
 		$this->revision = explode(" ","$Revision$");

htdocs/includes/modules/modSociete.class.php

@@ -53,7 +53,8 @@ class modSociete extends DolibarrModules
 		$this->numero = 1 ;
 
 		$this->family = "crm";
-    $this->name = "Module societe";
+		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+		$this->name = eregi_replace('^mod','',get_class($this));
 		$this->description = "Gestion des societes et contacts";
 
 		$this->revision = explode(' ','$Revision$');

htdocs/includes/modules/modStock.class.php

@@ -50,7 +50,8 @@ class modStock extends DolibarrModules
 		$this->numero = 52 ;
 
 		$this->family = "products";
-    $this->name = "Stock produits";
+		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+		$this->name = eregi_replace('^mod','',get_class($this));
 		$this->description = "Gestion des stocks";
 
 		$this->revision = explode(' ','$Revision$');

htdocs/includes/modules/modSyslog.class.php

@@ -48,7 +48,8 @@ class modSyslog extends DolibarrModules
 		$this->numero = 42 ;
 
 		$this->family = "technic";
-    $this->name = "Syslog";
+		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+		$this->name = eregi_replace('^mod','',get_class($this));
 		$this->description = "Activation des traces debug (syslog)";
 		$this->version = 'dolibarr';    // 'experimental' or 'dolibarr' or version
 		$this->const_name = 'MAIN_MODULE_SYSLOG';

htdocs/includes/modules/modTax.class.php

@@ -52,8 +52,10 @@ class modTax extends DolibarrModules
 		$this->numero = 500 ;
 	
 		$this->family = "financial";
-		$this->name = "Taxes et charges sociales";
+		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
-		$this->description = "Gestion des taxes et charges sociales";
+		$this->name = eregi_replace('^mod','',get_class($this));
+		// Module description used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
+		$this->description = "Gestion des taxes, charges sociales et dividendes";
 	
 		$this->revision = explode(" ","$Revision$");
 		$this->version = $this->revision[1];

htdocs/includes/modules/modTelephonie.class.php

@@ -52,7 +52,8 @@ class modTelephonie extends DolibarrModules
 		$this->numero = 56 ;
 
 		$this->family = "other";
-    $this->name = "Telephonie";
+		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+		$this->name = eregi_replace('^mod','',get_class($this));
 		$this->description = "Gestion de la Telephonie";
 
 		$this->revision = explode(" ","$Revision$");

htdocs/includes/modules/modUser.class.php

@@ -50,7 +50,8 @@ class modUser extends DolibarrModules
 		$this->numero = 0;
 
 		$this->family = "base";		// Family for module (or "base" if core module)
-    $this->name = "User";
+		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+		$this->name = eregi_replace('^mod','',get_class($this));
 		$this->description = "Gestion des utilisateurs (requis)";
 		$this->always_enabled = 1;	// Can't be disabled
 

htdocs/includes/modules/modWebcalendar.class.php

@@ -54,8 +54,8 @@ class modWebcalendar extends DolibarrModules
 		// Family can be 'crm','financial','hr','projects','product','technic','other'
 		// It is used to sort modules in module setup page 
 		$this->family = "projects";		
-		// Module title used if translation string 'ModuleXXXName' not found (XXX is id value)
+		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
-		$this->name = "Webcalendar";	
+		$this->name = eregi_replace('^mod','',get_class($this));
 		// Module description used if translation string 'ModuleXXXDesc' not found (XXX is id value)
 		$this->description = "Interfacage avec le calendrier Webcalendar";
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version

htdocs/includes/triggers/README-FR

@@ -8,7 +8,7 @@ La syntaxe d'un fichier Trigger est:
 where:
 > modModule est la partie du nom du descripteur de module trouve dans le
             repertoire includes/modules pour lequel le trigger doit etre.
-            actiff ou la valeure 'all' si ne doit pas etre actif pour un
+            actif ou la valeur 'all' si ne doit pas etre actif pour un
 			module particulier.
 > Mytrigger est le nom du trigger. La classe PHP dans le fichier trigger
             aura pour nom InterfaceMytrigger.

htdocs/includes/triggers/interface_all_Demo.class.php-NORUN

@@ -48,7 +48,7 @@ class InterfaceDemo
     {
         $this->db = $DB ;
     
-        $this->name = "Demo";					// Put here same value than in file and class name
+        $this->name = eregi_replace('^Interface','',get_class($this));
         $this->family = "demo";
         $this->description = "Les triggers de ce composant sont des fonctions vierges. Elles n'ont aucun effet. Ce composant est fourni à des fins de tutorial.";
         $this->version = 'dolibarr';            // 'development', 'experimental', 'dolibarr' or version

htdocs/includes/triggers/interface_all_Logevents.class.php

@@ -47,7 +47,7 @@ class InterfaceLogevents
     {
         $this->db = $DB ;
     
-        $this->name = "Logevents";
+        $this->name = eregi_replace('^Interface','',get_class($this));
         $this->family = "core";
         $this->description = "Les triggers de ce composant permettent de logguer les evenements de securite Dolibarr.";
         $this->version = 'dolibarr';                        // 'experimental' or 'dolibarr' or version

htdocs/includes/triggers/interface_modAgenda_ActionsAuto.class.php

@@ -47,7 +47,7 @@ class InterfaceActionsAuto
     {
         $this->db = $DB ;
     
-        $this->name = "ActionsAuto";
+        $this->name = eregi_replace('^Interface','',get_class($this));
         $this->family = "agenda";
         $this->description = "Triggers of this module add actions in agenda according to setup made in agenda setup.";
         $this->version = 'dolibarr';                        // 'experimental' or 'dolibarr' or version

htdocs/includes/triggers/interface_modCommande_Ecotax.class.php-NORUN

@@ -43,7 +43,7 @@ class InterfaceEcotax
   {
     $this->db = $DB ;
     
-    $this->name = "Ecotax";
+    $this->name = eregi_replace('Interface','',get_class($this));
     $this->family = "facture";
     $this->description = "Les triggers de ce composant calculent le ecotax du produit si le produit est membre d'une categorie speciale (par default: 'Ecotax', change le valeur du variable \$ecotax dans le trigger pour accomoder votre choix).";
     $this->revision = explode(' ','$Revision$');

htdocs/includes/triggers/interface_modCommande_Fraisport.class.php-NORUN

@@ -43,7 +43,7 @@ class InterfaceFraisport
   {
     $this->db = $DB ;
     
-    $this->name = "Fraisport";
+    $this->name = eregi_replace('Interface','',get_class($this));
     $this->family = "facture";
     $this->description = "Les triggers de ce composant calculent les frais de port.";
     $this->revision = explode(' ','$Revision$');

htdocs/includes/triggers/interface_modEditeur_Editeur.class.php-NORUN

@@ -43,7 +43,7 @@ class InterfaceEditeur
   {
     $this->db = $DB ;
     
-    $this->name = "Editeur";
+    $this->name = eregi_replace('Interface','',get_class($this));
     $this->family = "editeur";
     $this->description = "Les triggers de ce composant tri les lignes commandes par stock_loc.";
     $this->revision = explode(' ','$Revision$');

htdocs/includes/triggers/interface_modLdap_Ldapsynchro.class.php

@@ -45,7 +45,7 @@ class InterfaceLdapsynchro
     {
         $this->db = $DB ;
     
-        $this->name = "Ldapsynchro";
+        $this->name = eregi_replace('Interface','',get_class($this));
         $this->family = "ldap";
         $this->description = "Les triggers de ce composant permettent d'effectuer les synchro de Dolibarr vers un annuaire LDAP.";
         $this->version = 'dolibarr';                        // 'experimental' or 'dolibarr' or version

htdocs/includes/triggers/interface_modNotification_Notification.class.php

@@ -42,7 +42,7 @@ class InterfaceNotification
     {
         $this->db = $DB ;
     
-        $this->name = "Notification";
+        $this->name = eregi_replace('Interface','',get_class($this));
         $this->family = "notification";
         $this->description = "Les triggers de ce composant envoie les notifications par mail selon configuration du module Notification.";
         $this->version = 'dolibarr';                        // 'experimental' or 'dolibarr' or version

htdocs/includes/triggers/interface_modPhenix_Phenixsynchro.class.php

@@ -51,7 +51,7 @@ class InterfacePhenixsynchro
     {
         $this->db = $DB ;
     
-        $this->name = "Phenixsynchro";
+        $this->name = eregi_replace('Interface','',get_class($this));
         $this->family = "phenix";
         $this->description = "Les triggers de ce composant permettent d'insérer un évênement dans le calendrier phenix pour chaque grand évênement Dolibarr.";
         $this->version = 'experimental';                        // 'experimental' or 'dolibarr' or version

htdocs/includes/triggers/interface_modWebcalendar_Webcalsynchro.class.php

@@ -49,7 +49,7 @@ class InterfaceWebcalsynchro
     {
         $this->db = $DB ;
     
-        $this->name = "Webcalsynchro";
+        $this->name = eregi_replace('Interface','',get_class($this));
         $this->family = "webcal";
         $this->description = "Les triggers de ce composant permettent d'insérer un évênement dans le calendrier webcalendar pour chaque grand évênement Dolibarr.";
         $this->version = 'dolibarr';                        // 'experimental' or 'dolibarr' or version

htdocs/langs/fr_FR/admin.lang

@@ -276,8 +276,8 @@ Module400Name=Projets
 Module400Desc=Gestion des projets au sein des autres modules
 Module410Name=Webcalendar
 Module410Desc=Interface avec le calendrier Webcalendar
-Module500Name=Taxes, charges sociales et dividendes
+Module500Name=Taxes et dividendes
-Module500Desc=Gestion des taxes et charges sociales
+Module500Desc=Gestion des taxes, charges sociales et dividendes
 Module600Name=Notifications
 Module600Desc=Envoi de notifications (par mail) sur les évênements métiers Dolibarr
 Module700Name=Dons