Merge pull request #10344 from grandoc/new_branch_16_01_2019

Clean code and add translation
This commit is contained in:
Laurent Destailleur 2019-01-16 13:17:05 +01:00 committed by GitHub
commit 1f9d0799b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -221,8 +221,6 @@ foreach ($dirmodels as $reldir)
$handle = opendir($dir); $handle = opendir($dir);
if (is_resource($handle)) if (is_resource($handle))
{ {
$var=true;
while (($file = readdir($handle))!==false) while (($file = readdir($handle))!==false)
{ {
if (substr($file, 0, 12) == 'mod_holiday_' && substr($file, dol_strlen($file)-3, 3) == 'php') if (substr($file, 0, 12) == 'mod_holiday_' && substr($file, dol_strlen($file)-3, 3) == 'php')
@ -309,7 +307,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
print load_fiche_titre($langs->trans("TemplatePDFHolidays"),'',''); print load_fiche_titre($langs->trans("TemplatePDFHolidays"),'','');
// Defini tableau def des modeles // Defined model definition table
$def = array(); $def = array();
$sql = "SELECT nom"; $sql = "SELECT nom";
$sql.= " FROM ".MAIN_DB_PREFIX."document_model"; $sql.= " FROM ".MAIN_DB_PREFIX."document_model";
@ -405,7 +403,7 @@ foreach ($dirmodels as $reldir)
print "</td>"; print "</td>";
} }
// Defaut // Default
print '<td align="center">'; print '<td align="center">';
if ($conf->global->HOLIDAY_ADDON_PDF == $name) if ($conf->global->HOLIDAY_ADDON_PDF == $name)
{ {