diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php index b78b2790889..f85c0054c0c 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
"; diff --git a/htdocs/admin/system/dolibarr.php b/htdocs/admin/system/dolibarr.php index 3ed2f00f325..c4624f2c253 100644 --- a/htdocs/admin/system/dolibarr.php +++ b/htdocs/admin/system/dolibarr.php @@ -47,7 +47,11 @@ $var=true; print ''; print ''."\n"; $var=!$var; -print "\n"; +print "\n"; +$var=!$var; +print "\n"; +$var=!$var; +print "\n"; print '
'.$langs->trans("Version").''.$langs->trans("Value").'
".$langs->trans("Version")."".DOL_VERSION."
".$langs->trans("VersionProgram")."".DOL_VERSION."
".$langs->trans("VersionLastInstall")."".$conf->global->MAIN_VERSION_LAST_INSTALL."
".$langs->trans("VersionLastUpgrade")."".$conf->global->MAIN_VERSION_LAST_UPGRADE."
'; print '
'; diff --git a/htdocs/includes/modules/modBarcode.class.php b/htdocs/includes/modules/modBarcode.class.php index da5e39be0f5..69ef2bb54f5 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 2ea04d83023..b24f7fa8c79 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 3afa76bbfd3..b3ad816f057 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 5af1188e44b..307b627b5eb 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 c3da9175588..0c96330058d 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 f69747be23c..4aa163af518 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 4cc6270f432..d1cb48a48e1 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 ebd3598480b..7addf7e0ca3 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 c99cb162cc4..19ec17aa422 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 a4938a48e10..51f84113aac 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 5aec4dcd170..290551ff514 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