diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index c29c0f9e924..faf26f7c111 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -4803,8 +4803,10 @@ class Form
 					{
 						$retstring.="<script type='text/javascript'>";
 						$retstring.="$(function(){ $('#".$prefix."').datepicker({
-                			autoclose: true,
+            				dateFormat: '".$langs->trans("FormatDateShortJQueryInput")."',
+							autoclose: true,
                 			todayHighlight: true,";
+							// Note: We don't need monthNames, monthNamesShort, dayNames, dayNamesShort, dayNamesMin, they are set globally on datepicker component in lib_head.js.php
 						if (empty($conf->global->MAIN_POPUP_CALENDAR_ON_FOCUS))
 						{
 						$retstring.="
diff --git a/htdocs/core/js/datepicker.js.php b/htdocs/core/js/datepicker.js.php
deleted file mode 100644
index 32b7ca43f5e..00000000000
--- a/htdocs/core/js/datepicker.js.php
+++ /dev/null
@@ -1,151 +0,0 @@
-<?php
-/* Copyright (C) 2011 Regis Houssin        <regis.houssin@capnetworks.com>
- * Copyright (C) 2011 Laurent Destailleur  <eldy@users.sourceforge.net>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- * \file       htdocs/core/js/datepicker.js.php
- * \brief      File that include javascript functions for datepickers
- */
-
-//if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1');	// Not disabled cause need to load personalized language
-//if (! defined('NOREQUIREDB'))   define('NOREQUIREDB','1');
-if (! defined('NOREQUIRESOC'))    define('NOREQUIRESOC','1');
-//if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1');	// Not disabled cause need to do translations
-if (! defined('NOCSRFCHECK'))     define('NOCSRFCHECK',1);
-if (! defined('NOTOKENRENEWAL'))  define('NOTOKENRENEWAL',1);
-if (! defined('NOLOGIN'))         define('NOLOGIN',1);
-if (! defined('NOREQUIREMENU'))   define('NOREQUIREMENU',1);
-if (! defined('NOREQUIREHTML'))   define('NOREQUIREHTML',1);
-if (! defined('NOREQUIREAJAX'))   define('NOREQUIREAJAX','1');
-
-session_cache_limiter(FALSE);
-
-require_once '../../main.inc.php';
-
-// Define javascript type
-top_httphead('text/javascript; charset=UTF-8');
-// Important: Following code is to avoid page request by browser and PHP CPU at each Dolibarr page access.
-if (empty($dolibarr_nocache)) header('Cache-Control: max-age=3600, public, must-revalidate');
-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"))
-);
-
-$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")
-);
-
-$tradDays=array(
-	$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")
-);
-
-$tradDaysMin=array(
-	$langs->trans("SundayMin"),
-	$langs->trans("MondayMin"),
-	$langs->trans("TuesdayMin"),
-	$langs->trans("WednesdayMin"),
-	$langs->trans("ThursdayMin"),
-	$langs->trans("FridayMin"),
-	$langs->trans("SaturdayMin")
-);
-?>
-
-
-// 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) ?>;
-var tradDaysShort = <?php echo json_encode($tradDaysShort) ?>;
-var tradDaysMin = <?php echo json_encode($tradDaysMin) ?>;
-
-
-// For JQuery date picker
-$(document).ready(function() {
-	$.datepicker.setDefaults({
-		autoSize: true,
-		changeMonth: true,
-		changeYear: true,
-		altField: '#timestamp',
-		altFormat: '@'			// Gives a timestamp dateformat
-	});
-});
-
-jQuery(function($){
-	$.datepicker.regional['<?php echo $langs->defaultlang ?>'] = {
-		closeText: '<?php echo $langs->trans("Close2") ?>',
-		prevText: '<?php echo $langs->trans("Previous") ?>',
-		nextText: '<?php echo $langs->trans("Next") ?>',
-		currentText: '<?php echo $langs->trans("Now") ?>',
-		monthNames: tradMonths,
-		monthNamesShort: tradMonthsShort,
-		dayNames: tradDays,
-		dayNamesShort: tradDaysShort,
-		dayNamesMin: tradDaysMin,
-		weekHeader: '<?php echo $langs->trans("Week"); ?>',
-		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 */
-	};
-	$.datepicker.setDefaults($.datepicker.regional['<?php echo $langs->defaultlang ?>']);
-});
-
-
-<?php
-if (is_object($db)) $db->close();
diff --git a/htdocs/core/js/lib_head.js.php b/htdocs/core/js/lib_head.js.php
index f725e23cad5..188c8dc193a 100644
--- a/htdocs/core/js/lib_head.js.php
+++ b/htdocs/core/js/lib_head.js.php
@@ -117,6 +117,39 @@ var tradDays = <?php echo json_encode($tradDays) ?>;
 var tradDaysShort = <?php echo json_encode($tradDaysShort) ?>;
 var tradDaysMin = <?php echo json_encode($tradDaysMin) ?>;
 
+// For JQuery date picker
+$(document).ready(function() {
+	$.datepicker.setDefaults({
+		autoSize: true,
+		changeMonth: true,
+		changeYear: true,
+		altField: '#timestamp',
+		altFormat: '@'			// Gives a timestamp dateformat
+	});
+});
+
+jQuery(function($){
+	$.datepicker.regional['<?php echo $langs->defaultlang ?>'] = {
+		closeText: '<?php echo $langs->trans("Close2") ?>',
+		prevText: '<?php echo $langs->trans("Previous") ?>',
+		nextText: '<?php echo $langs->trans("Next") ?>',
+		currentText: '<?php echo $langs->trans("Now") ?>',
+		monthNames: tradMonths,
+		monthNamesShort: tradMonthsShort,
+		dayNames: tradDays,
+		dayNamesShort: tradDaysShort,
+		dayNamesMin: tradDaysMin,
+		weekHeader: '<?php echo $langs->trans("Week"); ?>',
+		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 */
+	};
+	$.datepicker.setDefaults($.datepicker.regional['<?php echo $langs->defaultlang ?>']);
+});
+
+
 
 /**
  * Set select2 translations (if module was loaded).
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 6321856bfb3..973a7b95567 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1328,12 +1328,6 @@ 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 (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'))
         	{