lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: regression

Browse Source
This commit is contained in:
Regis Houssin 2010-04-30 07:57:19 +00:00
parent 39701fc5e6
commit 6d469ba2f0
3 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/admin/modules.php
View File

@ -98,7 +98,7 @@ function Activate($value,$withdeps=1)
}
// Test if Dolibarr version ok
$verdol=versiondolibarrarray(1);
$verdol=versiondolibarrarray();
$vermin=$objMod->need_dolibarr_version;
//print 'eee'.versioncompare($verdol,$vermin).join(',',$verdol).' - '.join(',',$vermin);exit;
if (is_array($vermin) && versioncompare($verdol,$vermin) < 0)

2
htdocs/includes/modules/modMultiCompany.class.php
View File

@ -80,7 +80,7 @@ class modMultiCompany extends DolibarrModules
$this->depends = array(); // List of modules id that must be enabled if this module is enabled
$this->requiredby = array(); // List of modules id to disable if this one is disabled
$this->phpmin = array(4,3); // Minimum version of PHP required by module
$this->need_dolibarr_version = array(2,9); // Minimum version of Dolibarr required by module
$this->need_dolibarr_version = array(2,9,'0-dev'); // Minimum version of Dolibarr required by module
$this->langfiles = array("multicompany");
// Constants

9
htdocs/lib/admin.lib.php
View File

@ -83,13 +83,8 @@ function versionphparray()
* \return array Tableau de version (vermajeur,vermineur,autre)
*/
function versiondolibarrarray($fortest=0)
{
$dol_version = DOL_VERSION;
// Used for development version
if ($fortest) $dol_version = preg_replace('/([A-Z\-]+)$/i','',DOL_VERSION);
return explode('.',$dol_version);
{
return explode('.',DOL_VERSION);
}