diff --git a/ChangeLog b/ChangeLog
index 8a61005c097..8f2b10398e9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -119,6 +119,8 @@ For users:
 - New: [ task #823 ] Shipping_validate email notification.
 - New: [ task #900 ] Review code of ficheinter.class.php
 - Fix: [Bug #958] LocalTax2 for Spain fails on Suppliers
+- Fix: [ bug #972 ] Auto completion contact field do not take account the min caract number before search
+- Fix : [ bug #971 ] html.form.class.php select_contact with autocomplete do not exclude id from exclude array
 
 For translators:
 - Update language files.
diff --git a/build/debian/control b/build/debian/control
index d88e31cbc3f..8810a7d189c 100755
--- a/build/debian/control
+++ b/build/debian/control
@@ -59,4 +59,4 @@ Description: Web based software to manage a small company or foundation
  PDF exports,
  And a lot of more modules...
  .
- You can also add third parties external modules or develop yours.
\ No newline at end of file
+ You can also add third parties external modules or develop yours.
diff --git a/htdocs/admin/geoipmaxmind.php b/htdocs/admin/geoipmaxmind.php
index 2b72a4395ca..b06853b4383 100644
--- a/htdocs/admin/geoipmaxmind.php
+++ b/htdocs/admin/geoipmaxmind.php
@@ -126,12 +126,12 @@ print '<br>';
 
 print $langs->trans("NoteOnPathLocation").'<br>';
 
-$url1='http://www.maxmind.com/app/perl?rId=awstats';
+$url1='http://www.maxmind.com/en/city?rId=awstats';
 print $langs->trans("YouCanDownloadFreeDatFileTo",'<a href="'.$url1.'" target="_blank">'.$url1.'</a>');
 
 print '<br>';
 
-$url2='http://www.maxmind.com/app/perl?rId=awstats';
+$url2='http://www.maxmind.com/en/city?rId=awstats';
 print $langs->trans("YouCanDownloadAdvancedDatFileTo",'<a href="'.$url2.'" target="_blank">'.$url2.'</a>');
 
 if ($geoip)
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 62651cd4067..5a4ba72be04 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -639,9 +639,9 @@ class Commande extends CommonOrder
         $sql.= ", remise_absolue, remise_percent";
         $sql.= ", entity";
         $sql.= ")";
-        $sql.= " VALUES ('(PROV)',".$this->socid.", ".$this->db->idate($now).", ".$user->id;
+        $sql.= " VALUES ('(PROV)',".$this->socid.", '".$this->db->idate($now)."', ".$user->id;
         $sql.= ", ".($this->fk_project?$this->fk_project:"null");
-        $sql.= ", ".$this->db->idate($date);
+        $sql.= ", '".$this->db->idate($date)."'";
         $sql.= ", ".($this->source>=0 && $this->source != '' ?$this->source:'null');
         $sql.= ", '".$this->db->escape($this->note_private)."'";
         $sql.= ", '".$this->db->escape($this->note_public)."'";
@@ -991,7 +991,7 @@ class Commande extends CommonOrder
                         $this->fetch($ret);
                         $this->valid($user);
                     }
-                    return 1;
+                    return $ret;
                 }
                 else return -1;
             }
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 9a7d798cc4e..c913a06be06 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -971,7 +971,7 @@ class Form
 
             if ($conf->use_javascript_ajax && $conf->global->CONTACT_USE_SEARCH_TO_SELECT && ! $forcecombo && ! $options_only)
             {
-            	$out.= ajax_combobox($htmlname, $event);
+            	$out.= ajax_combobox($htmlname, $event, $conf->global->CONTACT_USE_SEARCH_TO_SELECT);
             }
 
             if ($htmlname != 'none' || $options_only) $out.= '<select class="flat'.($moreclass?' '.$moreclass:'').'" id="'.$htmlname.'" name="'.$htmlname.'">';
@@ -2590,6 +2590,7 @@ class Form
                          		$.each(inputok, function(i, inputname) {
                          			var more = "";
                          			if ($("#" + inputname).attr("type") == "checkbox") { more = ":checked"; }
+                         		    if ($("#" + inputname).attr("type") == "radio") { more = ":checked"; }
                          			var inputvalue = $("#" + inputname + more).val();
                          			if (typeof inputvalue == "undefined") { inputvalue=""; }
                          			options += "&" + inputname + "=" + inputvalue;
diff --git a/htdocs/core/js/lib_head.js b/htdocs/core/js/lib_head.js
index 071034b5fcc..4d088081725 100644
--- a/htdocs/core/js/lib_head.js
+++ b/htdocs/core/js/lib_head.js
@@ -810,7 +810,7 @@ function confirmConstantAction(action, url, code, input, box, entity, yesButton,
                     minLength: this.options.minLengthToAutocomplete,
                     source: function( request, response ) {
                         var matcher = new RegExp( $.ui.autocomplete.escapeRegex(request.term), "i" );
-                        response( select.children( "option" ).map(function() {
+                        response( select.children( "option:enabled" ).map(function() {
                             var text = $( this ).text();
                             if ( this.value && ( !request.term || matcher.test(text) ) )
                                 return {
diff --git a/htdocs/paypal/admin/paypal.php b/htdocs/paypal/admin/paypal.php
index c91e2ff0c80..322030e6e36 100644
--- a/htdocs/paypal/admin/paypal.php
+++ b/htdocs/paypal/admin/paypal.php
@@ -250,9 +250,9 @@ $sandboxpaypalurl='developer.paypal.com';
 
 print '<div id="apidoc">';
 print 'Your API authentication information can be found with following steps. We recommend that you open a separate Web browser session when carrying out this procedure.<br>
-1. Log in to your PayPal Premier or Business account (on real paypal <a href="https://'.$realpaypalurl.'" target="_blank">'.$realpaypalurl.'</a> (or sandbox <a href="https://'.$sandboxpaypalurl.'" target="_blank">'.$sandboxpaypalurl.'</a>).<br>
-2. Click the Profile subtab located under the My Account heading.<br>
-3. Click the API Access link under the Account Information header.<br>
+1. Log in to your PayPal account (on real paypal <a href="https://'.$realpaypalurl.'" target="_blank">'.$realpaypalurl.'</a> (or sandbox <a href="https://'.$sandboxpaypalurl.'" target="_blank">'.$sandboxpaypalurl.'</a>).<br>
+2. Click the "Profile" or "Preferencies" subtab located under the My Account heading.<br>
+3. Click the link "API Access".<br>
 4. Click the View API Certificate link in the right column.<br>
 5. Click the Request API signature radio button on the Request API Credentials page.<br>
 6. Complete the Request API Credential Request form by clicking the agreement checkbox and clicking Submit.<br>