diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index b78b2790889c27330c2e31b025aef43bdcc90e39..f85c0054c0cd28d2a73c64a4c52d57e4774606f7 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -20,10 +20,10 @@
*/
/**
- \file htdocs/admin/modules.php
- \brief Page de configuration et activation des modules
- \version $Id$
-*/
+ * \file htdocs/admin/modules.php
+ * \brief Page de configuration et activation des modules
+ * \version $Id$
+ */
require("./pre.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
@@ -217,7 +217,7 @@ foreach ($dirlist as $dirroot)
if ($modulequalified)
{
- $modules[$i] = $objMod;
+ $modules[$i] = $objMod;
$filename[$i]= $modName;
$orders[$i] = "$objMod->family"."_".$j; // Tri par famille puis numero module
//print "x".$modName." ".$orders[$i]."\n<br>";
diff --git a/htdocs/admin/system/dolibarr.php b/htdocs/admin/system/dolibarr.php
index 3ed2f00f325c210014b23c187d8fc21b7f944115..c4624f2c253a275da69fb7d744c22b3c1390b0f1 100644
--- a/htdocs/admin/system/dolibarr.php
+++ b/htdocs/admin/system/dolibarr.php
@@ -47,7 +47,11 @@ $var=true;
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre"><td>'.$langs->trans("Version").'</td><td>'.$langs->trans("Value").'</td></tr>'."\n";
$var=!$var;
-print "<tr ".$bc[$var]."><td width=\"300\">".$langs->trans("Version")."</td><td>".DOL_VERSION."</td></tr>\n";
+print "<tr ".$bc[$var]."><td width=\"300\">".$langs->trans("VersionProgram")."</td><td>".DOL_VERSION."</td></tr>\n";
+$var=!$var;
+print "<tr ".$bc[$var]."><td width=\"300\">".$langs->trans("VersionLastInstall")."</td><td>".$conf->global->MAIN_VERSION_LAST_INSTALL."</td></tr>\n";
+$var=!$var;
+print "<tr ".$bc[$var]."><td width=\"300\">".$langs->trans("VersionLastUpgrade")."</td><td>".$conf->global->MAIN_VERSION_LAST_UPGRADE."</td></tr>\n";
print '</table>';
print '<br>';
diff --git a/htdocs/includes/modules/modBarcode.class.php b/htdocs/includes/modules/modBarcode.class.php
index da5e39be0f51ad0233aeadfec90c4ccab6037497..69ef2bb54f534222b879d47deef955f237fa9978 100644
--- a/htdocs/includes/modules/modBarcode.class.php
+++ b/htdocs/includes/modules/modBarcode.class.php
@@ -49,7 +49,7 @@ class modBarcode extends DolibarrModules
$this->db = $DB ;
$this->numero = 55 ;
- $this->family = "other";
+ $this->family = "technic";
$this->name = "Codes barres";
$this->description = "Gestion des codes barres";
$this->version = 'dolibarr'; // 'development' or 'experimental' or 'dolibarr' or version
diff --git a/htdocs/includes/modules/modBookmark.class.php b/htdocs/includes/modules/modBookmark.class.php
index 2ea04d830231dd9365e424789e2381c9afb68c74..b24f7fa8c79630efeede88d44ccbb10dae6056ab 100644
--- a/htdocs/includes/modules/modBookmark.class.php
+++ b/htdocs/includes/modules/modBookmark.class.php
@@ -49,7 +49,7 @@ class modBookmark extends DolibarrModules
$this->db = $DB ;
$this->numero = 330;
- $this->family = "other";
+ $this->family = "technic";
$this->name = "Bookmarks";
$this->description = "Gestion des Bookmarks";
$this->revision = explode(' ','$Revision$');
diff --git a/htdocs/includes/modules/modBoutique.class.php b/htdocs/includes/modules/modBoutique.class.php
index 3afa76bbfd385e485d0b719c365735a9a818a268..b3ad816f05754f1f5dc578dccfa889998d7a5fc4 100644
--- a/htdocs/includes/modules/modBoutique.class.php
+++ b/htdocs/includes/modules/modBoutique.class.php
@@ -53,7 +53,7 @@ class modBoutique extends DolibarrModules
$this->family = "products";
$this->name = "OSCommerce direct";
$this->description = "Interface de visualisation d'une boutique OSCommerce ou OSCSS";
- $this->version = 'experimental'; // 'experimental' or 'dolibarr' or version
+ $this->version = 'dolibarr'; // 'experimental' or 'dolibarr' or version
$this->const_name = 'MAIN_MODULE_BOUTIQUE';
$this->special = 1;
diff --git a/htdocs/includes/modules/modDocument.class.php b/htdocs/includes/modules/modDocument.class.php
index 5af1188e44b61b5e016af1904e37b7127264efd8..307b627b5eba4798cf81316d1ffac1330c990b35 100644
--- a/htdocs/includes/modules/modDocument.class.php
+++ b/htdocs/includes/modules/modDocument.class.php
@@ -48,7 +48,7 @@ class modDocument extends DolibarrModules
$this->db = $DB ;
$this->numero = 51 ;
- $this->family = "ecm";
+ $this->family = "other";
$this->name = "Document";
$this->description = "Gestion des documents";
$this->revision = explode(' ','$Revision$');
diff --git a/htdocs/includes/modules/modDroitPret.class.php b/htdocs/includes/modules/modDroitPret.class.php
index c3da9175588404acdfe2deb799e3110a044a7775..0c96330058d6490986c6b5851e1c9fa10d0b7998 100644
--- a/htdocs/includes/modules/modDroitPret.class.php
+++ b/htdocs/includes/modules/modDroitPret.class.php
@@ -49,8 +49,8 @@ class modDroitPret extends DolibarrModules
$this->numero = 2200 ;
$this->family = "other";
- $this->name = "Droit Pr�t";
- $this->description = "Gestion du droit de pr�ts";
+ $this->name = "Droit Pret";
+ $this->description = "Gestion du droit de prets";
$this->version = 'experimental'; // 'development' or 'experimental' or 'dolibarr' or version
$this->const_name = 'MAIN_MODULE_DROITPRET';
$this->special = 2;
diff --git a/htdocs/includes/modules/modECM.class.php b/htdocs/includes/modules/modECM.class.php
index f69747be23cdc88052e59fe74ad9981b88dad2ca..4aa163af518b50190701353cd4c4bd64a406a493 100644
--- a/htdocs/includes/modules/modECM.class.php
+++ b/htdocs/includes/modules/modECM.class.php
@@ -62,7 +62,7 @@ class modECM extends DolibarrModules
// Key used in llx_const table to save module status enabled/disabled (XXX is id value)
$this->const_name = 'MAIN_MODULE_ECM';
// Where to store the module in setup page (0=common,1=interface,2=other)
- $this->special = 2;
+ $this->special = 0;
// Name of png file (without png) used for this module
$this->picto='dir';
diff --git a/htdocs/includes/modules/modFckeditor.class.php b/htdocs/includes/modules/modFckeditor.class.php
index 4cc6270f432705c9c3d779af07a2e8136c789271..d1cb48a48e196730c3a2c6127cac8c5c66c317ff 100644
--- a/htdocs/includes/modules/modFckeditor.class.php
+++ b/htdocs/includes/modules/modFckeditor.class.php
@@ -16,13 +16,12 @@
* 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.
- *
- * $Id$
*/
/**
\defgroup fckeditor Module fckeditor
\brief Module pour mettre en page les zones de saisie de texte
+ \version $Id$
*/
/**
@@ -54,7 +53,7 @@ class modFckeditor extends DolibarrModules
$this->description = "Editeur WYSIWYG";
$this->version = 'dolibarr'; // 'experimental' or 'dolibarr' or version
$this->const_name = 'MAIN_MODULE_FCKEDITOR';
- $this->special = 0;
+ $this->special = 2;
// Dir
$this->dirs = array();
diff --git a/htdocs/includes/modules/modSyslog.class.php b/htdocs/includes/modules/modSyslog.class.php
index ebd3598480ba0cc056e76dd623c413d7a5cab621..7addf7e0ca3efdf6c09f7f0defd411b11a14d986 100644
--- a/htdocs/includes/modules/modSyslog.class.php
+++ b/htdocs/includes/modules/modSyslog.class.php
@@ -52,7 +52,7 @@ class modSyslog extends DolibarrModules
$this->description = "Activation des traces debug (syslog)";
$this->version = 'dolibarr'; // 'experimental' or 'dolibarr' or version
$this->const_name = 'MAIN_MODULE_SYSLOG';
- $this->special = 0;
+ $this->special = 2;
//$this->picto='phoning';
// Dir
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index c99cb162cc4a75e27c9e7241019564d6b95ed5d3..19ec17aa4220a7ee6286496215465dbfb712e232 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1,5 +1,8 @@
# Dolibarr language file - en_US - admin
Version=Version
+VersionProgram=Version program
+VersionLastInstall=Version initial install
+VersionLastUpgrade=Version last upgrade
VersionExperimental=Experimental
VersionDevelopment=Development
VersionUnknown=Unknown
diff --git a/htdocs/langs/fr_BE/admin.lang b/htdocs/langs/fr_BE/admin.lang
index a4938a48e10ae485b9205f0d0cd0d4508a7a06cb..51f84113aac5170ff55c2d44a7ceb1c073559713 100644
--- a/htdocs/langs/fr_BE/admin.lang
+++ b/htdocs/langs/fr_BE/admin.lang
@@ -84,7 +84,7 @@ OfficialWebSiteFr=Site web fran
ModuleSetup=Configuration du module
ModulesSetup=Configuration des modules
ModuleFamilyBase=Syst�me
-ModuleFamilyCrm=Gestion client (CRM)
+ModuleFamilyCrm=Gestion client
ModuleFamilyProducts=Gestion produits
ModuleFamilyHr=Ressources humaines
ModuleFamilyProjects=Projets/Travail collaboratif
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index 5aec4dcd1709b77f2e38f567acf8e8acc085a60a..290551ff514fbe919df2b013351e4042781727ba 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -1,5 +1,8 @@
# Dolibarr language file - fr_FR - admin
Version=Version
+VersionProgram=Version programmes
+VersionLastInstall=Version installation initiale
+VersionLastUpgrade=Version derni�re mise � jour
VersionExperimental=Exp�rimental
VersionDevelopment=D�veloppement
VersionUnknown=Inconnue
@@ -176,7 +179,7 @@ FeatureNotAvailableOnLinux=Fonctionnalit
ModuleSetup=Configuration du module
ModulesSetup=Configuration des modules
ModuleFamilyBase=Syst�me
-ModuleFamilyCrm=Gestion client (CRM)
+ModuleFamilyCrm=Gestion client
ModuleFamilyProducts=Gestion produits
ModuleFamilyHr=Ressources humaines
ModuleFamilyProjects=Projets/Travail collaboratif