diff --git a/htdocs/admin/societe.php b/htdocs/admin/societe.php index 379b22693436a1de5c73b73d5eae765527ffe028..f6852f1c7f7e13880eb2b9d9b73ecfb3292c34c6 100644 --- a/htdocs/admin/societe.php +++ b/htdocs/admin/societe.php @@ -363,27 +363,36 @@ foreach ($conf->file->dol_document_root as $dirroot) else print $module->description; print '</td>'; - // Active + // Activate / Disable if (in_array($name, $def)) { print "<td align=\"center\">\n"; - if ($conf->global->COMPANY_ADDON_PDF != "$name") - { + //if ($conf->global->COMPANY_ADDON_PDF != "$name") + //{ print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&value='.$name.'&scandir='.$module->scandir.'&label='.urlencode($module->name).'">'; print img_picto($langs->trans("Enabled"),'on'); print '</a>'; - } - else - { - print img_picto($langs->trans("Enabled"),'on'); - } + //} + //else + //{ + // print img_picto($langs->trans("Enabled"),'on'); + //} print "</td>"; } else { - print "<td align=\"center\">\n"; - print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&value='.$name.'&scandir='.$module->scandir.'&label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"),'off').'</a>'; - print "</td>"; + if (versioncompare($module->phpmin,versionphparray()) > 0) + { + print "<td align=\"center\">\n"; + print img_picto(dol_escape_htmltag($langs->trans("ErrorModuleRequirePHPVersion",join('.',$module->phpmin))),'off'); + print "</td>"; + } + else + { + print "<td align=\"center\">\n"; + print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&value='.$name.'&scandir='.$module->scandir.'&label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"),'off').'</a>'; + print "</td>"; + } } // Info diff --git a/htdocs/includes/modules/societe/doc/doc_generic_odt.modules.php b/htdocs/includes/modules/societe/doc/doc_generic_odt.modules.php index 9b7c0b5a44f2a8f29f0cbf121f8357bc05ab2a77..93fcdcb910299b1a8f406819b72f2a22ffec27db 100644 --- a/htdocs/includes/modules/societe/doc/doc_generic_odt.modules.php +++ b/htdocs/includes/modules/societe/doc/doc_generic_odt.modules.php @@ -39,7 +39,7 @@ class doc_generic_odt extends ModeleThirdPartyDoc { var $emetteur; // Objet societe qui emet - var $phpmin = array(5,2); // Minimum version of PHP required by module + var $phpmin = array(5,2,0); // Minimum version of PHP required by module /**