From 00db16e0deab03cb0fcf85458db42d6f7d1acfe4 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@capnetworks.com>
Date: Tue, 10 Oct 2017 08:49:00 +0200
Subject: [PATCH 1/6] Fix: force jquery cal if MAIN_POPUP_CALENDAR=eldy (showDP
 commented)

---
 htdocs/core/class/html.form.class.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 93c24990af0..7c4948789b1 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -4742,7 +4742,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)

From f51c0db7059862c78ecd5fb8d9e4941f9e19c732 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@capnetworks.com>
Date: Tue, 10 Oct 2017 09:16:14 +0200
Subject: [PATCH 2/6] NEW add translation and possibility to change month and
 year

---
 htdocs/core/class/html.form.class.php | 47 +++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 7c4948789b1..4af8364a751 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -4790,7 +4790,54 @@ class Form
 						$retstring.="<script type='text/javascript'>";
 						$retstring.="$(function(){ $('#".$prefix."').datepicker({
             				dateFormat: '".$langs->trans("FormatDateShortJQueryInput")."',
+						closeText: '".$langs->trans("Close")."',
+						prevText: '".$langs->trans("Previous")."',
+						nextText: '".$langs->trans("Next")."',
+						currentText: '".$langs->trans("Today")."',
+						monthNames: [
+							'".$langs->trans("Month01")."',
+							'".$langs->trans("Month02")."',
+							'".$langs->trans("Month03")."',
+							'".$langs->trans("Month04")."',
+							'".$langs->trans("Month05")."',
+							'".$langs->trans("Month06")."',
+							'".$langs->trans("Month07")."',
+							'".$langs->trans("Month08")."',
+							'".$langs->trans("Month09")."',
+							'".$langs->trans("Month10")."',
+							'".$langs->trans("Month11")."',
+							'".$langs->trans("Month12")."'
+						],
+						dayNames: [
+							'".$langs->trans("Sunday")."',
+							'".$langs->trans("Monday")."',
+							'".$langs->trans("Tuesday")."',
+							'".$langs->trans("Wednesday")."',
+							'".$langs->trans("Thursday")."',
+							'".$langs->trans("Friday")."',
+							'".$langs->trans("Saturday")."'
+						],
+						dayNamesShort: [
+							'".$langs->trans("SundayMin")."',
+							'".$langs->trans("MondayMin")."',
+							'".$langs->trans("TuesdayMin")."',
+							'".$langs->trans("WednesdayMin")."',
+							'".$langs->trans("ThursdayMin")."',
+							'".$langs->trans("FridayMin")."',
+							'".$langs->trans("SaturdayMin")."'
+						],
+						dayNamesMin: [
+							'".$langs->trans("ShortSunday")."',
+							'".$langs->trans("ShortMonday")."',
+							'".$langs->trans("ShortTuesday")."',
+							'".$langs->trans("ShortWednesday")."',
+							'".$langs->trans("ShortThursday")."',
+							'".$langs->trans("ShortFriday")."',
+							'".$langs->trans("ShortSaturday")."'
+						],
                 			autoclose: true,
+						changeMonth: true,
+						changeYear: true,
                 			todayHighlight: true,";
 						if (empty($conf->global->MAIN_POPUP_CALENDAR_ON_FOCUS))
 						{

From 88e700ae12e07589b1146d975656da2d541a1ea6 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@capnetworks.com>
Date: Tue, 10 Oct 2017 09:30:07 +0200
Subject: [PATCH 3/6] Fix: add month names short

---
 htdocs/core/class/html.form.class.php | 38 ++++++++++++++++++---------
 1 file changed, 26 insertions(+), 12 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 4af8364a751..72f5380507d 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -4795,18 +4795,32 @@ class Form
 						nextText: '".$langs->trans("Next")."',
 						currentText: '".$langs->trans("Today")."',
 						monthNames: [
-							'".$langs->trans("Month01")."',
-							'".$langs->trans("Month02")."',
-							'".$langs->trans("Month03")."',
-							'".$langs->trans("Month04")."',
-							'".$langs->trans("Month05")."',
-							'".$langs->trans("Month06")."',
-							'".$langs->trans("Month07")."',
-							'".$langs->trans("Month08")."',
-							'".$langs->trans("Month09")."',
-							'".$langs->trans("Month10")."',
-							'".$langs->trans("Month11")."',
-							'".$langs->trans("Month12")."'
+							'".$langs->trans("January")."',
+							'".$langs->trans("February")."',
+							'".$langs->trans("March")."',
+							'".$langs->trans("April")."',
+							'".$langs->trans("May")."',
+							'".$langs->trans("June")."',
+							'".$langs->trans("July")."',
+							'".$langs->trans("August")."',
+							'".$langs->trans("September")."',
+							'".$langs->trans("October")."',
+							'".$langs->trans("November")."',
+							'".$langs->trans("December")."'
+						],
+						monthNamesShort: [
+							'".$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")."'
 						],
 						dayNames: [
 							'".$langs->trans("Sunday")."',

From 9ff0855812ddcfd846e20a51a9e2e754d4b94f96 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@capnetworks.com>
Date: Tue, 10 Oct 2017 10:04:16 +0200
Subject: [PATCH 4/6] Fix: datepicker.js.php is needed for the translation !!

---
 htdocs/core/class/html.form.class.php |  62 ----------------
 htdocs/core/js/datepicker.js.php      | 100 +++++++++++++-------------
 htdocs/main.inc.php                   |   6 +-
 3 files changed, 51 insertions(+), 117 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 72f5380507d..365467082cb 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -4789,69 +4789,7 @@ class Form
 					{
 						$retstring.="<script type='text/javascript'>";
 						$retstring.="$(function(){ $('#".$prefix."').datepicker({
-            				dateFormat: '".$langs->trans("FormatDateShortJQueryInput")."',
-						closeText: '".$langs->trans("Close")."',
-						prevText: '".$langs->trans("Previous")."',
-						nextText: '".$langs->trans("Next")."',
-						currentText: '".$langs->trans("Today")."',
-						monthNames: [
-							'".$langs->trans("January")."',
-							'".$langs->trans("February")."',
-							'".$langs->trans("March")."',
-							'".$langs->trans("April")."',
-							'".$langs->trans("May")."',
-							'".$langs->trans("June")."',
-							'".$langs->trans("July")."',
-							'".$langs->trans("August")."',
-							'".$langs->trans("September")."',
-							'".$langs->trans("October")."',
-							'".$langs->trans("November")."',
-							'".$langs->trans("December")."'
-						],
-						monthNamesShort: [
-							'".$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")."'
-						],
-						dayNames: [
-							'".$langs->trans("Sunday")."',
-							'".$langs->trans("Monday")."',
-							'".$langs->trans("Tuesday")."',
-							'".$langs->trans("Wednesday")."',
-							'".$langs->trans("Thursday")."',
-							'".$langs->trans("Friday")."',
-							'".$langs->trans("Saturday")."'
-						],
-						dayNamesShort: [
-							'".$langs->trans("SundayMin")."',
-							'".$langs->trans("MondayMin")."',
-							'".$langs->trans("TuesdayMin")."',
-							'".$langs->trans("WednesdayMin")."',
-							'".$langs->trans("ThursdayMin")."',
-							'".$langs->trans("FridayMin")."',
-							'".$langs->trans("SaturdayMin")."'
-						],
-						dayNamesMin: [
-							'".$langs->trans("ShortSunday")."',
-							'".$langs->trans("ShortMonday")."',
-							'".$langs->trans("ShortTuesday")."',
-							'".$langs->trans("ShortWednesday")."',
-							'".$langs->trans("ShortThursday")."',
-							'".$langs->trans("ShortFriday")."',
-							'".$langs->trans("ShortSaturday")."'
-						],
                 			autoclose: true,
-						changeMonth: true,
-						changeYear: 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..a763533f9b3 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) ?>;
@@ -119,9 +119,7 @@ $(document).ready(function() {
 	$.datepicker.setDefaults({
 		autoSize: true,
 		changeMonth: true,
-		changeYear: true,
-		altField: '#timestamp',
-		altFormat: '@'			// Gives a timestamp dateformat
+		changeYear: true
 	});
 });
 
@@ -139,9 +137,7 @@ jQuery(function($){
 		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
+		isRTL: <?php echo ($langs->trans("DIRECTION")=='rtl'?'true':'false'); ?>
 	};
 	$.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'))

From 4530f94fa67b93675619a4903771a21c097c37ac Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@capnetworks.com>
Date: Tue, 10 Oct 2017 10:07:52 +0200
Subject: [PATCH 5/6] Fix: restore parameters, needed for save in place

---
 htdocs/core/js/datepicker.js.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/js/datepicker.js.php b/htdocs/core/js/datepicker.js.php
index a763533f9b3..3de57f0543f 100644
--- a/htdocs/core/js/datepicker.js.php
+++ b/htdocs/core/js/datepicker.js.php
@@ -119,7 +119,9 @@ $(document).ready(function() {
 	$.datepicker.setDefaults({
 		autoSize: true,
 		changeMonth: true,
-		changeYear: true
+		changeYear: true,
+		altField: '#timestamp',
+		altFormat: '@'			// Gives a timestamp dateformat
 	});
 });
 

From 5aa3352e58b1a29f8ad33e572a552cbffb4ea74a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 11 Oct 2017 11:48:38 +0200
Subject: [PATCH 6/6] Restore TODO for future feature

---
 htdocs/core/js/datepicker.js.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/js/datepicker.js.php b/htdocs/core/js/datepicker.js.php
index 3de57f0543f..32b7ca43f5e 100644
--- a/htdocs/core/js/datepicker.js.php
+++ b/htdocs/core/js/datepicker.js.php
@@ -139,7 +139,9 @@ jQuery(function($){
 		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'); ?>
+		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 ?>']);
 });