Skip to content
Snippets Groups Projects
Commit 2c5410ff authored by Regis Houssin's avatar Regis Houssin
Browse files

Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop

parents 8dc1a204 60963224
No related branches found
No related tags found
No related merge requests found
......@@ -1015,7 +1015,7 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
);
print 'var tradMonths = '.json_encode($tradMonths).';'."\n";
print '</script>'."\n";
// Add datepicker default options
print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/datepicker.js"></script>'."\n";
// Add datepicker i18n for current language
......@@ -1439,7 +1439,7 @@ function left_menu($menu_array_before, $helppagename='', $moresearchform='', $me
// Execute hook printLeftBlock
$parameters=array();
$leftblock.=$hookmanager->executeHooks('printLeftBlock',$parameters); // Note that $action and $object may have been modified by some hooks
$leftblock=$hookmanager->executeHooks('printLeftBlock',$parameters); // Note that $action and $object may have been modified by some hooks
print $leftblock;
if ($conf->use_javascript_ajax && $conf->global->MAIN_MENU_USE_JQUERY_LAYOUT) print '</div> <!-- End left layout -->'."\n";
......@@ -1622,4 +1622,4 @@ if (! function_exists("llxFooter"))
}
}
?>
\ No newline at end of file
?>
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment