Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

This commit is contained in:
Laurent Destailleur 2015-12-27 18:26:31 +01:00
commit bf15ff56e7
2 changed files with 5 additions and 2 deletions

View File

@ -381,7 +381,9 @@ foreach ($dirmodels as $reldir)
print "<td>\n";
require_once $dir.$file;
$module = new $classname($db,$specimenthirdparty);
print $module->description;
if (method_exists($module,'info')) print $module->info($langs);
else print $module->description;
print "</td>\n";
// Active

View File

@ -392,7 +392,8 @@ foreach ($dirmodels as $reldir)
print "<td>\n";
require_once $dir.$file;
$module = new $classname($db,$specimenthirdparty);
print $module->description;
if (method_exists($module,'info')) print $module->info($langs);
else print $module->description;
print "</td>\n";
// Active