Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
This commit is contained in:
commit
bf15ff56e7
@ -381,7 +381,9 @@ foreach ($dirmodels as $reldir)
|
|||||||
print "<td>\n";
|
print "<td>\n";
|
||||||
require_once $dir.$file;
|
require_once $dir.$file;
|
||||||
$module = new $classname($db,$specimenthirdparty);
|
$module = new $classname($db,$specimenthirdparty);
|
||||||
print $module->description;
|
if (method_exists($module,'info')) print $module->info($langs);
|
||||||
|
else print $module->description;
|
||||||
|
|
||||||
print "</td>\n";
|
print "</td>\n";
|
||||||
|
|
||||||
// Active
|
// Active
|
||||||
|
|||||||
@ -392,7 +392,8 @@ foreach ($dirmodels as $reldir)
|
|||||||
print "<td>\n";
|
print "<td>\n";
|
||||||
require_once $dir.$file;
|
require_once $dir.$file;
|
||||||
$module = new $classname($db,$specimenthirdparty);
|
$module = new $classname($db,$specimenthirdparty);
|
||||||
print $module->description;
|
if (method_exists($module,'info')) print $module->info($langs);
|
||||||
|
else print $module->description;
|
||||||
print "</td>\n";
|
print "</td>\n";
|
||||||
|
|
||||||
// Active
|
// Active
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user