diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index dd9e643e74c..8c1d0c486b1 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -5215,15 +5215,16 @@ class Form
      */
     static function selectArrayAjax($htmlname, $url, $id='', $moreparam='', $moreparamtourl='', $disabled=0, $minimumInputLength=1, $morecss='', $callurlonselect=0, $placeholder='', $acceptdelayedhtml=0)
     {
-        global $langs;
+        global $conf, $langs;
         global $delayedhtmlcontent;
 
-    	$tmpplugin='select2';
+    	// TODO Use an internal dolibarr component instead of select2
+        if (empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) && ! defined('REQUIRE_JQUERY_MULTISELECT')) return '';
 
     	$out='<input type="text" class="'.$htmlname.($morecss?' '.$morecss:'').'" '.($moreparam?$moreparam.' ':'').'name="'.$htmlname.'">';
 
-    	// TODO Use an internal dolibarr component instead of select2
-    	$outdelayed='<!-- JS CODE TO ENABLE '.$tmpplugin.' for id '.$htmlname.' -->
+    	$tmpplugin='select2';
+    	$outdelayed="\n".'<!-- JS CODE TO ENABLE '.$tmpplugin.' for id '.$htmlname.' -->
 	    	<script type="text/javascript">
 	    	$(document).ready(function () {
 
@@ -5325,7 +5326,7 @@ class Form
     	if (! empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) || defined('REQUIRE_JQUERY_MULTISELECT'))
     	{
     		$tmpplugin=empty($conf->global->MAIN_USE_JQUERY_MULTISELECT)?constant('REQUIRE_JQUERY_MULTISELECT'):$conf->global->MAIN_USE_JQUERY_MULTISELECT;
-   			$out.='<!-- JS CODE TO ENABLE '.$tmpplugin.' for id '.$htmlname.' -->
+   			$out.="\n".'<!-- JS CODE TO ENABLE '.$tmpplugin.' for id '.$htmlname.' -->
     			<script type="text/javascript">
 	    			function formatResult(record) {'."\n";
 						if ($elemtype == 'category')
diff --git a/htdocs/core/js/lib_head.js.php b/htdocs/core/js/lib_head.js.php
index 55055792510..7ed49d004d2 100644
--- a/htdocs/core/js/lib_head.js.php
+++ b/htdocs/core/js/lib_head.js.php
@@ -44,6 +44,35 @@ top_httphead('text/javascript; charset=UTF-8');
 if (empty($dolibarr_nocache)) header('Cache-Control: max-age=3600, public, must-revalidate');
 else header('Cache-Control: no-cache');
 ?>
+// Javascript libraries for Dolibarr ERP CRM (https://www.dolibarr.org)
+
+
+/**
+ * Set select2 translations (if module was loaded).
+ */
+(function ($) {
+    "use strict";
+
+    if (typeof $.fn.select2 != "undefined") {
+	/* console.log($.fn.select2);
+    console.log("ok"); */
+
+    $.fn.select2.locales['xx'] = {
+        formatMatches: function (matches) { return matches + " <?php echo dol_escape_js($langs->trans("Select2ResultFoundUseArrows")); ?>"; },
+        formatNoMatches: function () { return "<?php echo dol_escape_js($langs->trans("Select2NotFound")); ?>"; },
+        formatInputTooShort: function (input, min) { var n = min - input.length;
+        	if (n > 1) return "<?php echo dol_escape_js($langs->trans("Select2Enter")); ?> " + n + " <?php echo dol_escape_js($langs->trans("Select2MoreCharacters")); ?>";
+        	else return "<?php echo dol_escape_js($langs->trans("Select2Enter")); ?> " + n + " <?php echo dol_escape_js($langs->trans("Select2MoreCharacter")); ?>"
+        	},
+        formatLoadMore: function (pageNumber) { return "<?php echo dol_escape_js($langs->trans("Select2LoadingMoreResults")); ?>"; },
+        formatSearching: function () { return "<?php echo dol_escape_js($langs->trans("Select2SearchInProgress")); ?>"; }
+    };
+
+    $.extend($.fn.select2.defaults, $.fn.select2.locales['xx']);
+
+    }
+})(jQuery);
+
 
 /*
  * =================================================================
@@ -53,6 +82,7 @@ else header('Cache-Control: no-cache');
  * SimpleDateFormat a utiliser pour retour
  * ==================================================================
  */
+ /*
 function showDP(base,dateFieldID,format,codelang)
 {
 	// check to see if another box is already showing
@@ -136,7 +166,7 @@ function resetDP(base,dateFieldID,format,codelang)
 
 function loadMonth(base,month,year,ymd,codelang)
 {
-	/* showDP.box.innerHTML="Loading..."; */
+	// showDP.box.innerHTML="Loading...";
 	// alert(codelang);
 	var theURL=base+"datepicker.php?cm=shw&lang="+codelang;
 	theURL+="&m="+encodeURIComponent(month);
@@ -163,37 +193,6 @@ function closeDPBox()
 	showDP.datefieldID=null;
 }
 
-function dpChangeDay(dateFieldID,format)
-{
-	showDP.datefieldID=dateFieldID;
-	console.log("Call dpChangeDay, we save date into detailed fields.");
-
-	var thefield=getObjectFromID(showDP.datefieldID);
-	var thefieldday=getObjectFromID(showDP.datefieldID+"day");
-	var thefieldmonth=getObjectFromID(showDP.datefieldID+"month");
-	var thefieldyear=getObjectFromID(showDP.datefieldID+"year");
-
-	var date=getDateFromFormat(thefield.value,format);
-	if (date)
-	{
-		thefieldday.value=date.getDate();
-		if(thefieldday.onchange) thefieldday.onchange.call(thefieldday);
-		thefieldmonth.value=date.getMonth()+1;
-		if(thefieldmonth.onchange) thefieldmonth.onchange.call(thefieldmonth);
-		thefieldyear.value=date.getFullYear();
-		if(thefieldyear.onchange) thefieldyear.onchange.call(thefieldyear);
-	}
-	else
-	{
-		thefieldday.value='';
-		if(thefieldday.onchange) thefieldday.onchange.call(thefieldday);
-		thefieldmonth.value='';
-		if(thefieldmonth.onchange) thefieldmonth.onchange.call(thefieldmonth);
-		thefieldyear.value='';
-		if(thefieldyear.onchange) thefieldyear.onchange.call(thefieldyear);
-	}
-}
-
 function dpClickDay(year,month,day,format)
 {
 	var thefield=getObjectFromID(showDP.datefieldID);
@@ -221,16 +220,6 @@ function dpHighlightDay(year,month,day,months){
 	displayinfo.innerHTML=months[month-1]+" "+day+", "+year;
 }
 
-// Returns an object given an id
-function getObjectFromID(id){
-	var theObject;
-	if(document.getElementById)
-		theObject=document.getElementById(id);
-	else
-		theObject=document.all[id];
-	return theObject;
-}
-
 // This Function returns the top position of an object
 function getTop(theitem){
 	var offsetTrail = theitem;
@@ -257,6 +246,85 @@ function getLeft(theitem){
 	return offsetLeft;
 }
 
+// To hide/show select Boxes with IE6 (and only IE6 because IE6 has a bug and
+// not put popup completely on the front)
+// Used only bu popup calendar
+function hideSelectBoxes() {
+	var brsVersion = parseInt(window.navigator.appVersion.charAt(0), 10);
+	if (brsVersion <= 6 && window.navigator.userAgent.indexOf("MSIE 6") > -1)
+	{
+		for(var i = 0; i < document.all.length; i++)
+		{
+			if(document.all[i].tagName)
+				if(document.all[i].tagName == "SELECT")
+			  		document.all[i].style.visibility="hidden";
+		}
+	}
+}
+// To hide/show select Boxes with IE6 (and only IE6 because IE6 has a bug and
+// not put popup completely on the front)
+// Used only bu popup calendar
+function displaySelectBoxes() {
+	var brsVersion = parseInt(window.navigator.appVersion.charAt(0), 10);
+	if (brsVersion <= 6 && window.navigator.userAgent.indexOf("MSIE 6") > -1)
+	{
+	       for(var i = 0; i < document.all.length; i++)
+	       {
+	               if(document.all[i].tagName)
+	                       if(document.all[i].tagName == "SELECT")
+	                               document.all[i].style.visibility="visible";
+	       }
+	}
+}
+
+*/
+
+
+// Returns an object given an id
+function getObjectFromID(id){
+	var theObject;
+	if(document.getElementById)
+		theObject=document.getElementById(id);
+	else
+		theObject=document.all[id];
+	return theObject;
+}
+
+// Called after selection of a date to save details into detailed fields
+function dpChangeDay(dateFieldID,format)
+{
+	//showDP.datefieldID=dateFieldID;
+	console.log("Call dpChangeDay, we save date into detailed fields.");
+
+	var thefield=getObjectFromID(dateFieldID);
+	var thefieldday=getObjectFromID(dateFieldID+"day");
+	var thefieldmonth=getObjectFromID(dateFieldID+"month");
+	var thefieldyear=getObjectFromID(dateFieldID+"year");
+
+	var date=getDateFromFormat(thefield.value,format);
+	if (date)
+	{
+		thefieldday.value=date.getDate();
+		if(thefieldday.onchange) thefieldday.onchange.call(thefieldday);
+		thefieldmonth.value=date.getMonth()+1;
+		if(thefieldmonth.onchange) thefieldmonth.onchange.call(thefieldmonth);
+		thefieldyear.value=date.getFullYear();
+		if(thefieldyear.onchange) thefieldyear.onchange.call(thefieldyear);
+	}
+	else
+	{
+		thefieldday.value='';
+		if(thefieldday.onchange) thefieldday.onchange.call(thefieldday);
+		thefieldmonth.value='';
+		if(thefieldmonth.onchange) thefieldmonth.onchange.call(thefieldmonth);
+		thefieldyear.value='';
+		if(thefieldyear.onchange) thefieldyear.onchange.call(thefieldyear);
+	}
+}
+
+
+
+
 
 // Create XMLHttpRequest object and load url
 // Used by calendar or other ajax processes
@@ -316,40 +384,6 @@ function loadXMLDoc(url,readyStateFunction,async)
 	return req;
 }
 
-/* To hide/show select Boxes with IE6 (and only IE6 because IE6 has a bug and
- * not put popup completely on the front)
- * Used only bu popup calendar
- */
-function hideSelectBoxes() {
-	var brsVersion = parseInt(window.navigator.appVersion.charAt(0), 10);
-	if (brsVersion <= 6 && window.navigator.userAgent.indexOf("MSIE 6") > -1)
-	{
-		for(var i = 0; i < document.all.length; i++)
-		{
-			if(document.all[i].tagName)
-				if(document.all[i].tagName == "SELECT")
-			  		document.all[i].style.visibility="hidden";
-		}
-	}
-}
-/* To hide/show select Boxes with IE6 (and only IE6 because IE6 has a bug and
- * not put popup completely on the front)
- * Used only bu popup calendar
- */
-function displaySelectBoxes() {
-	var brsVersion = parseInt(window.navigator.appVersion.charAt(0), 10);
-	if (brsVersion <= 6 && window.navigator.userAgent.indexOf("MSIE 6") > -1)
-	{
-	       for(var i = 0; i < document.all.length; i++)
-	       {
-	               if(document.all[i].tagName)
-	                       if(document.all[i].tagName == "SELECT")
-	                               document.all[i].style.visibility="visible";
-	       }
-	}
-}
-
-
 
 /*
  * =================================================================
diff --git a/htdocs/core/js/select2_locale.js.php b/htdocs/core/js/select2_locale.js.php
deleted file mode 100644
index aa62b5a0ec1..00000000000
--- a/htdocs/core/js/select2_locale.js.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-/* Copyright (C) 2012	Regis Houssin		<regis.houssin@capnetworks.com>
- * Copyright (C) 2012	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/select2_locale.js.php
- * \brief      File that include javascript functions for timepicker
- */
-
-//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');
-?>
-
-/**
- * Select2 French translation
- */
-(function ($) {
-    "use strict";
-
-    $.fn.select2.locales['xx'] = {
-        formatMatches: function (matches) { return matches + " <?php echo dol_escape_js($langs->trans("Select2ResultFoundUseArrows")); ?>"; },
-        formatNoMatches: function () { return "<?php echo dol_escape_js($langs->trans("Select2NotFound")); ?>"; },
-        formatInputTooShort: function (input, min) { var n = min - input.length; 
-        	if (n > 1) return "<?php echo dol_escape_js($langs->trans("Select2Enter")); ?> " + n + " <?php echo dol_escape_js($langs->trans("Select2MoreCharacters")); ?>"; 
-        	else return "<?php echo dol_escape_js($langs->trans("Select2Enter")); ?> " + n + " <?php echo dol_escape_js($langs->trans("Select2MoreCharacter")); ?>"
-        	},
-        formatLoadMore: function (pageNumber) { return "<?php echo dol_escape_js($langs->trans("Select2LoadingMoreResults")); ?>"; },
-        formatSearching: function () { return "<?php echo dol_escape_js($langs->trans("Select2SearchInProgress")); ?>"; }
-    };
-
-    $.extend($.fn.select2.defaults, $.fn.select2.locales['xx']);
-})(jQuery);
-
-<?php
-if (is_object($db)) $db->close();
diff --git a/htdocs/core/lib/ajax.lib.php b/htdocs/core/lib/ajax.lib.php
index dc86a2ef9f3..3cc767c1592 100644
--- a/htdocs/core/lib/ajax.lib.php
+++ b/htdocs/core/lib/ajax.lib.php
@@ -396,14 +396,15 @@ function ajax_combobox($htmlname, $events=array(), $minLengthToAutocomplete=0, $
 	global $conf;
 
 	if (! empty($conf->browser->phone)) return '';	// select2 disabled for smartphones with standard browser (does not works, popup appears outside screen)
-	if (! empty($conf->dol_use_jmobile)) return '';	// select2 works with jmobile but it breaks the autosize feature of jmobile.
+	//if (! empty($conf->dol_use_jmobile)) return '';	// select2 works with jmobile but it breaks the autosize feature of jmobile.
 	if (! empty($conf->global->MAIN_DISABLE_AJAX_COMBOX)) return '';
 	if (empty($conf->use_javascript_ajax)) return '';
+	if (empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) && ! defined('REQUIRE_JQUERY_MULTISELECT')) return '';
 
 	if (empty($minLengthToAutocomplete)) $minLengthToAutocomplete=0;
 
     $tmpplugin='select2';
-    $msg='<!-- JS CODE TO ENABLE '.$tmpplugin.' for id = '.$htmlname.' -->
+    $msg="\n".'<!-- JS CODE TO ENABLE '.$tmpplugin.' for id = '.$htmlname.' -->
           <script type="text/javascript">
         	$(document).ready(function () {
         		$(\''.(preg_match('/^\./',$htmlname)?$htmlname:'#'.$htmlname).'\').'.$tmpplugin.'({
diff --git a/htdocs/core/lib/security2.lib.php b/htdocs/core/lib/security2.lib.php
index 3876dc0e2cd..4d79b87122e 100644
--- a/htdocs/core/lib/security2.lib.php
+++ b/htdocs/core/lib/security2.lib.php
@@ -184,7 +184,7 @@ function dol_loginfunction($langs,$conf,$mysoc)
 	// Set cookie for timeout management
 	$prefix=dol_getprefix();
 	$sessiontimeout='DOLSESSTIMEOUT_'.$prefix;
-	if (! empty($conf->global->MAIN_SESSION_TIMEOUT)) setcookie($sessiontimeout, $conf->global->MAIN_SESSION_TIMEOUT, 0, "/", '', 0);
+	if (! empty($conf->global->MAIN_SESSION_TIMEOUT)) setcookie($sessiontimeout, $conf->global->MAIN_SESSION_TIMEOUT, 0, "/", null, false, true);
 
 	if (GETPOST('urlfrom','alpha')) $_SESSION["urlfrom"]=GETPOST('urlfrom','alpha');
 	else unset($_SESSION["urlfrom"]);
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 675c82aa499..8f5c5fb11bd 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -179,7 +179,9 @@ if (! empty($_SERVER['DOCUMENT_ROOT']) && substr($_SERVER['DOCUMENT_ROOT'], -6)
 // Include the conf.php and functions.lib.php
 require_once 'filefunc.inc.php';
 
-// If there is a POST parameter to tell to save automatically some POST parameters into cookies, we do it
+// If there is a POST parameter to tell to save automatically some POST parameters into cookies, we do it.
+// This is used for example by form of boxes to save personalization of some options.
+// DOL_AUTOSET_COOKIE=cookiename:val1,val2 and  cookiename_val1=aaa cookiename_val2=bbb will set cookie_name with value json_encode(array('val1'=> , ))
 if (! empty($_POST["DOL_AUTOSET_COOKIE"]))
 {
 	$tmpautoset=explode(':',$_POST["DOL_AUTOSET_COOKIE"],2);
@@ -194,7 +196,7 @@ if (! empty($_POST["DOL_AUTOSET_COOKIE"]))
 	$cookiename=$tmpautoset[0];
 	$cookievalue=json_encode($cookiearrayvalue);
 	//var_dump('setcookie cookiename='.$cookiename.' cookievalue='.$cookievalue);
-	setcookie($cookiename, empty($cookievalue)?'':$cookievalue, empty($cookievalue)?0:(time()+(86400*354)), '/');	// keep cookie 1 year
+	setcookie($cookiename, empty($cookievalue)?'':$cookievalue, empty($cookievalue)?0:(time()+(86400*354)), '/', null, false, true);	// keep cookie 1 year and add tag httponly
 	if (empty($cookievalue)) unset($_COOKIE[$cookiename]);
 }
 
@@ -204,7 +206,7 @@ $sessionname='DOLSESSID_'.$prefix;
 $sessiontimeout='DOLSESSTIMEOUT_'.$prefix;
 if (! empty($_COOKIE[$sessiontimeout])) ini_set('session.gc_maxlifetime',$_COOKIE[$sessiontimeout]);
 session_name($sessionname);
-session_set_cookie_params(0, '/', null, false, true);   // Add tag httponly on session cookie
+session_set_cookie_params(0, '/', null, false, true);   // Add tag httponly on session cookie (same as setting session.cookie_httponly into php.ini). Must be called before the session_start.
 // This create lock released until session_write_close() or end of page.
 // We need this lock as long as we read/write $_SESSION ['vars']. We can close released when finished.
 if (! defined('NOSESSION'))
@@ -1279,7 +1281,6 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
             {
             	$tmpplugin=empty($conf->global->MAIN_USE_JQUERY_MULTISELECT)?constant('REQUIRE_JQUERY_MULTISELECT'):$conf->global->MAIN_USE_JQUERY_MULTISELECT;
             	print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/'.$tmpplugin.'/'.$tmpplugin.'.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-                print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/select2_locale.js.php?lang='.$langs->defaultlang.($ext?'&amp;'.$ext:'').'"></script>'."\n";
             }
         }
 
@@ -1319,7 +1320,7 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
 
             // Global js function
             print '<!-- Includes JS of Dolibarr -->'."\n";
-            print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/lib_head.js.php'.($ext?'?'.$ext:'').'"></script>'."\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'))
diff --git a/test/phpunit/AdherentTest.php b/test/phpunit/AdherentTest.php
index 34ec0a80917..b29f8508a8e 100644
--- a/test/phpunit/AdherentTest.php
+++ b/test/phpunit/AdherentTest.php
@@ -196,7 +196,6 @@ class AdherentTest extends PHPUnit_Framework_TestCase
         $result=$localobject->fetch($id);
         print __METHOD__." id=".$id." result=".$result."\n";
         $this->assertLessThan($result, 0);
-
         return $localobject;
     }
 
@@ -318,14 +317,13 @@ class AdherentTest extends PHPUnit_Framework_TestCase
         $langs=$this->savlangs;
         $db=$this->savdb;
 
-        $template = '%DOL_MAIN_URL_ROOT%,%ID%,%CIVILITY%,%FIRSTNAME%,%LASTNAME%,%FULLNAME%,%COMPANY%,'.
-                    '%ADDRESS%,%ZIP%,%TOWN%,%COUNTRY%,%EMAIL%,%BIRTH%,%PHOTO%,%LOGIN%,%PASSWORD%,%PRENOM%,'.
-                    '%NOM%,%SOCIETE%,%ADDRESS%,%ZIP%,%TOWN%,%COUNTRY%';
+        $template = '__CIVILITY__,__FIRSTNAME__,__LASTNAME__,__FULLNAME__,__COMPANY__,'.
+                    '__ADDRESS__,__ZIP__,__TOWN__,__COUNTRY__,__EMAIL__,__BIRTH__,__PHOTO__,__LOGIN__';
 
         // If option to store clear password has been set, we get 'dolibspec' into PASSWORD field.
-        $expected = DOL_MAIN_URL_ROOT.','.$localobject->id.',,New firstname,New name,New firstname New name,'.
+        $expected = ',New firstname,New name,New firstname New name,'.
                     'New company,New address,New zip,New town,Belgium,newemail@newemail.com,'.dol_print_date($localobject->birth,'day').',,'.
-                    'newlogin,dolibspec,New firstname,New name,New company,New address,New zip,New town,Belgium';
+                    'newlogin';
 
         $result = $localobject->makeSubstitution($template);
         print __METHOD__." result=".$result."\n";