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

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

Browse Source
This commit is contained in:
Regis Houssin 2011-10-29 23:42:40 +02:00
commit 2c5410fff3
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/main.inc.php
View File

@ -1015,7 +1015,7 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
); );
print 'var tradMonths = '.json_encode($tradMonths).';'."\n"; print 'var tradMonths = '.json_encode($tradMonths).';'."\n";
print '</script>'."\n"; print '</script>'."\n";
// Add datepicker default options // Add datepicker default options
print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/datepicker.js"></script>'."\n"; print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/datepicker.js"></script>'."\n";
// Add datepicker i18n for current language // Add datepicker i18n for current language
@ -1439,7 +1439,7 @@ function left_menu($menu_array_before, $helppagename='', $moresearchform='', $me
// Execute hook printLeftBlock // Execute hook printLeftBlock
$parameters=array(); $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; print $leftblock;
if ($conf->use_javascript_ajax && $conf->global->MAIN_MENU_USE_JQUERY_LAYOUT) print '</div> <!-- End left layout -->'."\n"; 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"))
} }
} }
?> ?>