|
@@ -416,11 +416,17 @@ abstract class DolibarrModules
|
|
|
global $langs;
|
|
|
$langs->load("admin");
|
|
|
|
|
|
- if ($this->version == 'experimental') return $langs->trans("VersionExperimental");
|
|
|
- elseif ($this->version == 'development') return $langs->trans("VersionDevelopment");
|
|
|
- elseif ($this->version == 'dolibarr') return DOL_VERSION;
|
|
|
- elseif ($this->version) return $this->version;
|
|
|
- else return $langs->trans("VersionUnknown");
|
|
|
+ $ret='';
|
|
|
+
|
|
|
+ $newversion=preg_replace('/_deprecated/','',$this->version);
|
|
|
+ if ($newversion == 'experimental') $ret=$langs->trans("VersionExperimental");
|
|
|
+ elseif ($newversion == 'development') $ret=$langs->trans("VersionDevelopment");
|
|
|
+ elseif ($newversion == 'dolibarr') $ret=DOL_VERSION;
|
|
|
+ elseif ($newversion) $ret=$newversion;
|
|
|
+ else $ret=$langs->trans("VersionUnknown");
|
|
|
+
|
|
|
+ if (preg_match('/_deprecated/',$this->version)) $ret.=' ('.$langs->trans("Deprecated").')';
|
|
|
+ return $ret;
|
|
|
}
|
|
|
|
|
|
|
|
@@ -431,7 +437,7 @@ abstract class DolibarrModules
|
|
|
*/
|
|
|
function isCoreOrExternalModule()
|
|
|
{
|
|
|
- if ($this->version == 'dolibarr') return 'core';
|
|
|
+ if ($this->version == 'dolibarr' || $this->version == 'dolibarr_deprecated') return 'core';
|
|
|
if (! empty($this->version) && ! in_array($this->version,array('experimental','development'))) return 'external';
|
|
|
if (! empty($this->editor_name) || ! empty($this->editor_web)) return 'external';
|
|
|
return 'unknown';
|