diff --git a/htdocs/admin/expensereport.php b/htdocs/admin/expensereport.php index cce9f65dd8b..a752b631292 100644 --- a/htdocs/admin/expensereport.php +++ b/htdocs/admin/expensereport.php @@ -398,13 +398,13 @@ foreach ($dirmodels as $reldir) { // Active if (in_array($name, $def)) { print ''."\n"; - print 'scandir).'&label='.urlencode($module->name).'">'; + print 'scandir).'&label='.urlencode($module->name).'">'; print img_picto($langs->trans("Enabled"), 'switch_on'); print ''; print ""; } else { print ''."\n"; - print 'scandir).'&label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').''; + print 'scandir).'&label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').''; print ""; } diff --git a/htdocs/admin/holiday.php b/htdocs/admin/holiday.php index 12cbf3ff27c..9d53cd651d7 100644 --- a/htdocs/admin/holiday.php +++ b/htdocs/admin/holiday.php @@ -198,7 +198,7 @@ print ''.$langs->trans("Description").''; print ''.$langs->trans("Example").''; print ''.$langs->trans("Status").''; print ''.$langs->trans("ShortInfo").''; -print "\n"; +print ''."\n"; clearstatcache(); @@ -227,7 +227,7 @@ foreach ($dirmodels as $reldir) { } if ($module->isEnabled()) { - print ''.$module->name."\n"; + print ''.$module->getName($langs)."\n"; print $module->info($langs); print ''; diff --git a/htdocs/core/modules/holiday/mod_holiday_immaculate.php b/htdocs/core/modules/holiday/mod_holiday_immaculate.php index 83cb9ce17e8..c4fb76d384b 100644 --- a/htdocs/core/modules/holiday/mod_holiday_immaculate.php +++ b/htdocs/core/modules/holiday/mod_holiday_immaculate.php @@ -36,6 +36,9 @@ class mod_holiday_immaculate extends ModelNumRefHolidays public $name = 'Immaculate'; public $version = 'dolibarr'; + public $position = 100; + + /** * Constructor */ diff --git a/htdocs/core/modules/holiday/mod_holiday_madonna.php b/htdocs/core/modules/holiday/mod_holiday_madonna.php index a20eebdc1f3..2f40ffd4fc9 100644 --- a/htdocs/core/modules/holiday/mod_holiday_madonna.php +++ b/htdocs/core/modules/holiday/mod_holiday_madonna.php @@ -35,6 +35,9 @@ class mod_holiday_madonna extends ModelNumRefHolidays public $name = 'Madonna'; public $version = 'dolibarr'; + public $position = 10; + + // variables not inherited /**