diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 50833fc857c..99734a4541c 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -4750,7 +4750,9 @@ class Form
 
 		// You can set MAIN_POPUP_CALENDAR to 'eldy' or 'jquery'
 		$usecalendar='combo';
-		if (! empty($conf->use_javascript_ajax) && (empty($conf->global->MAIN_POPUP_CALENDAR) || $conf->global->MAIN_POPUP_CALENDAR != "none")) $usecalendar=empty($conf->global->MAIN_POPUP_CALENDAR)?'jquery':$conf->global->MAIN_POPUP_CALENDAR;
+		if (! empty($conf->use_javascript_ajax) && (empty($conf->global->MAIN_POPUP_CALENDAR) || $conf->global->MAIN_POPUP_CALENDAR != "none")) {
+			$usecalendar = ((empty($conf->global->MAIN_POPUP_CALENDAR) || $conf->global->MAIN_POPUP_CALENDAR == 'eldy')?'jquery':$conf->global->MAIN_POPUP_CALENDAR);
+		}
 		//if (! empty($conf->browser->phone)) $usecalendar='combo';
 
 		if ($d)
@@ -4795,7 +4797,6 @@ class Form
 					{
 						$retstring.="<script type='text/javascript'>";
 						$retstring.="$(function(){ $('#".$prefix."').datepicker({
-            				dateFormat: '".$langs->trans("FormatDateShortJQueryInput")."',
                 			autoclose: true,
                 			todayHighlight: true,";
 						if (empty($conf->global->MAIN_POPUP_CALENDAR_ON_FOCUS))
diff --git a/htdocs/core/js/datepicker.js.php b/htdocs/core/js/datepicker.js.php
index 50c140f6f82..32b7ca43f5e 100644
--- a/htdocs/core/js/datepicker.js.php
+++ b/htdocs/core/js/datepicker.js.php
@@ -45,68 +45,68 @@ else header('Cache-Control: no-cache');
 
 // Define tradMonths javascript array (we define this in datepicker AND in parent page to avoid errors with IE8)
 $tradMonths=array(
-dol_escape_js($langs->transnoentitiesnoconv("January")),
-dol_escape_js($langs->transnoentitiesnoconv("February")),
-dol_escape_js($langs->transnoentitiesnoconv("March")),
-dol_escape_js($langs->transnoentitiesnoconv("April")),
-dol_escape_js($langs->transnoentitiesnoconv("May")),
-dol_escape_js($langs->transnoentitiesnoconv("June")),
-dol_escape_js($langs->transnoentitiesnoconv("July")),
-dol_escape_js($langs->transnoentitiesnoconv("August")),
-dol_escape_js($langs->transnoentitiesnoconv("September")),
-dol_escape_js($langs->transnoentitiesnoconv("October")),
-dol_escape_js($langs->transnoentitiesnoconv("November")),
-dol_escape_js($langs->transnoentitiesnoconv("December"))
+	dol_escape_js($langs->transnoentitiesnoconv("January")),
+	dol_escape_js($langs->transnoentitiesnoconv("February")),
+	dol_escape_js($langs->transnoentitiesnoconv("March")),
+	dol_escape_js($langs->transnoentitiesnoconv("April")),
+	dol_escape_js($langs->transnoentitiesnoconv("May")),
+	dol_escape_js($langs->transnoentitiesnoconv("June")),
+	dol_escape_js($langs->transnoentitiesnoconv("July")),
+	dol_escape_js($langs->transnoentitiesnoconv("August")),
+	dol_escape_js($langs->transnoentitiesnoconv("September")),
+	dol_escape_js($langs->transnoentitiesnoconv("October")),
+	dol_escape_js($langs->transnoentitiesnoconv("November")),
+	dol_escape_js($langs->transnoentitiesnoconv("December"))
 );
 
 $tradMonthsShort=array(
-$langs->trans("JanuaryMin"),
-$langs->trans("FebruaryMin"),
-$langs->trans("MarchMin"),
-$langs->trans("AprilMin"),
-$langs->trans("MayMin"),
-$langs->trans("JuneMin"),
-$langs->trans("JulyMin"),
-$langs->trans("AugustMin"),
-$langs->trans("SeptemberMin"),
-$langs->trans("OctoberMin"),
-$langs->trans("NovemberMin"),
-$langs->trans("DecemberMin")
+	$langs->trans("JanuaryMin"),
+	$langs->trans("FebruaryMin"),
+	$langs->trans("MarchMin"),
+	$langs->trans("AprilMin"),
+	$langs->trans("MayMin"),
+	$langs->trans("JuneMin"),
+	$langs->trans("JulyMin"),
+	$langs->trans("AugustMin"),
+	$langs->trans("SeptemberMin"),
+	$langs->trans("OctoberMin"),
+	$langs->trans("NovemberMin"),
+	$langs->trans("DecemberMin")
 );
 
 $tradDays=array(
-$langs->trans("Sunday"),
-$langs->trans("Monday"),
-$langs->trans("Tuesday"),
-$langs->trans("Wednesday"),
-$langs->trans("Thursday"),
-$langs->trans("Friday"),
-$langs->trans("Saturday")
+	$langs->trans("Sunday"),
+	$langs->trans("Monday"),
+	$langs->trans("Tuesday"),
+	$langs->trans("Wednesday"),
+	$langs->trans("Thursday"),
+	$langs->trans("Friday"),
+	$langs->trans("Saturday")
 );
 
 $tradDaysShort=array(
-$langs->trans("ShortSunday"),
-$langs->trans("ShortMonday"),
-$langs->trans("ShortTuesday"),
-$langs->trans("ShortWednesday"),
-$langs->trans("ShortThursday"),
-$langs->trans("ShortFriday"),
-$langs->trans("ShortSaturday")
+	$langs->trans("ShortSunday"),
+	$langs->trans("ShortMonday"),
+	$langs->trans("ShortTuesday"),
+	$langs->trans("ShortWednesday"),
+	$langs->trans("ShortThursday"),
+	$langs->trans("ShortFriday"),
+	$langs->trans("ShortSaturday")
 );
 
 $tradDaysMin=array(
-$langs->trans("SundayMin"),
-$langs->trans("MondayMin"),
-$langs->trans("TuesdayMin"),
-$langs->trans("WednesdayMin"),
-$langs->trans("ThursdayMin"),
-$langs->trans("FridayMin"),
-$langs->trans("SaturdayMin")
+	$langs->trans("SundayMin"),
+	$langs->trans("MondayMin"),
+	$langs->trans("TuesdayMin"),
+	$langs->trans("WednesdayMin"),
+	$langs->trans("ThursdayMin"),
+	$langs->trans("FridayMin"),
+	$langs->trans("SaturdayMin")
 );
 ?>
 
 
-// For eldy and jQuery date picker
+// For jQuery date picker
 var tradMonths = <?php echo json_encode($tradMonths) ?>;
 var tradMonthsShort = <?php echo json_encode($tradMonthsShort) ?>;
 var tradDays = <?php echo json_encode($tradDays) ?>;
@@ -140,8 +140,8 @@ jQuery(function($){
 		dateFormat: '<?php echo $langs->trans("FormatDateShortJQuery"); ?>',
 		firstDay: <?php echo (isset($conf->global->MAIN_START_WEEK)?$conf->global->MAIN_START_WEEK:'1'); ?>,
 		isRTL: <?php echo ($langs->trans("DIRECTION")=='rtl'?'true':'false'); ?>,
-		showMonthAfterYear: false,  // TODO add specific to country
-		yearSuffix: ''				// TODO add specific to country
+		showMonthAfterYear: false,  	/* TODO add specific to country	*/
+ 		yearSuffix: ''			/* TODO add specific to country */
 	};
 	$.datepicker.setDefaults($.datepicker.regional['<?php echo $langs->defaultlang ?>']);
 });
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 8f5c5fb11bd..6aadcb7cd0a 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1322,11 +1322,11 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
             print '<!-- Includes JS of Dolibarr -->'."\n";
             print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/lib_head.js.php?lang='.$langs->defaultlang.($ext?'&amp;'.$ext:'').'"></script>'."\n";
 
-            // Add datepicker default options
-            /*if (! defined('DISABLE_DATE_PICKER'))
+            // Add datepicker default options (needed by jquery datepicker!)
+            if (! defined('DISABLE_DATE_PICKER'))
             {
                 print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/datepicker.js.php?lang='.$langs->defaultlang.($ext?'&'.$ext:'').'"></script>'."\n";
-            }*/
+            }
 
             // JS forced by modules (relative url starting with /)
             if (! empty($conf->modules_parts['js']))		// $conf->modules_parts['js'] is array('module'=>array('file1','file2'))