diff --git a/htdocs/admin/fichinter.php b/htdocs/admin/fichinter.php index 5202a00667d..dc24a1869b8 100644 --- a/htdocs/admin/fichinter.php +++ b/htdocs/admin/fichinter.php @@ -383,7 +383,7 @@ foreach ($conf->file->dol_document_root as $dirroot) echo "$name"; print "\n"; require_once($dir.$file); - $module = new $classname(); + $module = new $classname($db); print $module->description; print ''; @@ -391,16 +391,9 @@ foreach ($conf->file->dol_document_root as $dirroot) if (in_array($name, $def)) { print "\n"; - //if ($conf->global->FICHEINTER_ADDON_PDF != "$name") - //{ - print 'scandir.'&label='.urlencode($module->name).'">'; - print img_picto($langs->trans("Enabled"),'switch_on'); - print ''; - //} - //else - //{ - // print img_picto($langs->trans("Enabled"),'switch_on'); - //} + print 'scandir.'&label='.urlencode($module->name).'">'; + print img_picto($langs->trans("Enabled"),'switch_on'); + print ''; print ""; } else diff --git a/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php b/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php index 133e9124a57..015c1387405 100644 --- a/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php +++ b/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php @@ -37,13 +37,28 @@ require_once(DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'); */ class pdf_soleil extends ModelePDFFicheinter { + var $db; + var $name; + var $description; + var $type; + + var $phpmin = array(4,3,0); // Minimum version of PHP required by module + var $version = 'dolibarr'; + + var $page_largeur; + var $page_hauteur; + var $format; + var $marge_gauche; + var $marge_droite; + var $marge_haute; + var $marge_basse; /** * Constructor * * @param DoliDB $db Database handler */ - function pdf_soleil($db) + function __construct($db) { global $conf,$langs,$mysoc; diff --git a/htdocs/core/modules/fichinter/modules_fichinter.php b/htdocs/core/modules/fichinter/modules_fichinter.php index f7ebef61859..c2c030735db 100644 --- a/htdocs/core/modules/fichinter/modules_fichinter.php +++ b/htdocs/core/modules/fichinter/modules_fichinter.php @@ -38,8 +38,9 @@ abstract class ModelePDFFicheinter extends CommonDocGenerator /** - * \brief Return list of active generation modules - * \param $db Database handler + * Return list of active generation modules + * + * @param DoliDB $db Database handler */ function liste_modeles($db) {