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

Work on odt module. It works now !

Browse Source
This commit is contained in:
Laurent Destailleur 2010-03-10 21:59:34 +00:00
parent f0e95657d5
commit 7123a37db3
2 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
htdocs/admin/societe.php
View File

@ -363,20 +363,28 @@ foreach ($conf->file->dol_document_root as $dirroot)
else print $module->description; else print $module->description;
print '</td>'; print '</td>';
// Active // Activate / Disable
if (in_array($name, $def)) if (in_array($name, $def))
{ {
print "<td align=\"center\">\n"; 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&amp;value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'; print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&amp;value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'">';
print img_picto($langs->trans("Enabled"),'on'); print img_picto($langs->trans("Enabled"),'on');
print '</a>'; print '</a>';
//}
//else
//{
// print img_picto($langs->trans("Enabled"),'on');
//}
print "</td>";
} }
else else
{ {
print img_picto($langs->trans("Enabled"),'on'); 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>"; print "</td>";
} }
else else
@ -385,6 +393,7 @@ foreach ($conf->file->dol_document_root as $dirroot)
print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"),'off').'</a>'; print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"),'off').'</a>';
print "</td>"; print "</td>";
} }
}
// Info // Info
$htmltooltip = ''.$langs->trans("Name").': '.$module->name; $htmltooltip = ''.$langs->trans("Name").': '.$module->name;

2
htdocs/includes/modules/societe/doc/doc_generic_odt.modules.php
View File

@ -39,7 +39,7 @@ class doc_generic_odt extends ModeleThirdPartyDoc
{ {
var $emetteur; // Objet societe qui emet 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
/** /**