diff --git a/htdocs/admin/events.php b/htdocs/admin/events.php
index 59205dcdbab..d5562248c55 100644
--- a/htdocs/admin/events.php
+++ b/htdocs/admin/events.php
@@ -78,15 +78,16 @@ print_fiche_titre($langs->trans("SecuritySetup"),'','setup');
 print $langs->trans("LogEventDesc")."<br>\n";
 print "<br>\n";
 
-$head=security_prepare_head();
-
-dol_fiche_head($head, 'audit', $langs->trans("Security"));
-
 
 print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="action" value="save">';
 
+$head=security_prepare_head();
+
+dol_fiche_head($head, 'audit', $langs->trans("Security"));
+
+
 $var=true;
 print "<table class=\"noborder\" width=\"100%\">";
 print "<tr class=\"liste_titre\">";
@@ -109,14 +110,14 @@ foreach ($eventstolog as $key => $arr)
 }
 print '</table>';
 
-print '<br><center>';
+dol_fiche_end();
+
+print '<div class="center">';
 print "<input type=\"submit\" name=\"save\" class=\"button\" value=\"".$langs->trans("Save")."\">";
-print "</center>";
+print "</div>";
 
 print "</form>\n";
 
-print '</div>';
-
-$db->close();
 
 llxFooter();
+$db->close();
diff --git a/htdocs/admin/proxy.php b/htdocs/admin/proxy.php
index 050c92fd188..2e9d1f49169 100644
--- a/htdocs/admin/proxy.php
+++ b/htdocs/admin/proxy.php
@@ -86,6 +86,13 @@ print_fiche_titre($langs->trans("SecuritySetup"),'','setup');
 print $langs->trans("ProxyDesc")."<br>\n";
 print "<br>\n";
 
+
+
+print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+print '<input type="hidden" name="action" value="set_proxy">';
+
+
 $head=security_prepare_head();
 
 dol_fiche_head($head, 'proxy', $langs->trans("Security"));
@@ -118,10 +125,6 @@ if ($conf->use_javascript_ajax)
 // Timeout
 $var=true;
 
-print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-print '<input type="hidden" name="action" value="set_proxy">';
-
 print '<table width="100%" class="noborder">';
 
 print '<tr class="liste_titre">';
@@ -196,14 +199,13 @@ print '</tr>';
 
 print '</table>';
 
-print '<br><center>';
-print '<input type="submit" class="button" name="button" value="'.$langs->trans("Modify").'">';
-print '</center>';
-
-print '</form>';
-
 dol_fiche_end();
 
+print '<div class="center">';
+print '<input type="submit" class="button" name="button" value="'.$langs->trans("Modify").'">';
+print '</div>';
+
+print '</form>';
 
 $db->close();
 
diff --git a/htdocs/admin/security_other.php b/htdocs/admin/security_other.php
index 6cbbe9185a0..c72ff392b28 100644
--- a/htdocs/admin/security_other.php
+++ b/htdocs/admin/security_other.php
@@ -80,35 +80,15 @@ else if (preg_match('/del_(.*)/',$action,$reg))
 	}
 }
 
-else if ($action == 'MAIN_SESSION_TIMEOUT')
+else if ($action == 'updateform')
 {
-    if (! dolibarr_set_const($db, "MAIN_SESSION_TIMEOUT", $_POST["MAIN_SESSION_TIMEOUT"],'chaine',0,'',$conf->entity)) dol_print_error($db);
-    else setEventMessage($langs->trans("RecordModifiedSuccessfully"));
-}
-else if ($action == 'MAIN_UPLOAD_DOC')
-{
-    if (! dolibarr_set_const($db, 'MAIN_UPLOAD_DOC',$_POST["MAIN_UPLOAD_DOC"],'chaine',0,'',$conf->entity)) dol_print_error($db);
-    else setEventMessage($langs->trans("RecordModifiedSuccessfully"));
-}
-else if ($action == 'MAIN_UMASK')
-{
-    if (! dolibarr_set_const($db, "MAIN_UMASK", $_POST["MAIN_UMASK"],'chaine',0,'',$conf->entity)) dol_print_error($db);
-    else setEventMessage($langs->trans("RecordModifiedSuccessfully"));
-}
-else if ($action == 'MAIN_ANTIVIRUS_COMMAND')
-{
-    if (! dolibarr_set_const($db, "MAIN_ANTIVIRUS_COMMAND", $_POST["MAIN_ANTIVIRUS_COMMAND"],'chaine',0,'',$conf->entity)) dol_print_error($db);
-    else setEventMessage($langs->trans("RecordModifiedSuccessfully"));
-}
-else if ($action == 'MAIN_ANTIVIRUS_PARAM')
-{
-    if (! dolibarr_set_const($db, "MAIN_ANTIVIRUS_PARAM", $_POST["MAIN_ANTIVIRUS_PARAM"],'chaine',0,'',$conf->entity)) dol_print_error($db);
-    else setEventMessage($langs->trans("RecordModifiedSuccessfully"));
-}
-else if ($action == 'MAIN_APPLICATION_TITLE')
-{
-	if (! dolibarr_set_const($db, "MAIN_APPLICATION_TITLE", $_POST["MAIN_APPLICATION_TITLE"],'chaine',0,'',$conf->entity)) dol_print_error($db);
-	else setEventMessage($langs->trans("RecordModifiedSuccessfully"));
+	$res1=dolibarr_set_const($db, "MAIN_APPLICATION_TITLE", $_POST["MAIN_APPLICATION_TITLE"],'chaine',0,'',$conf->entity);
+    $res2=dolibarr_set_const($db, "MAIN_SESSION_TIMEOUT", $_POST["MAIN_SESSION_TIMEOUT"],'chaine',0,'',$conf->entity);
+	$res3=dolibarr_set_const($db, 'MAIN_UPLOAD_DOC',$_POST["MAIN_UPLOAD_DOC"],'chaine',0,'',$conf->entity);
+    $res4=dolibarr_set_const($db, "MAIN_UMASK", $_POST["MAIN_UMASK"],'chaine',0,'',$conf->entity);
+    $res5=dolibarr_set_const($db, "MAIN_ANTIVIRUS_COMMAND", $_POST["MAIN_ANTIVIRUS_COMMAND"],'chaine',0,'',$conf->entity);
+    $res6=dolibarr_set_const($db, "MAIN_ANTIVIRUS_PARAM", $_POST["MAIN_ANTIVIRUS_PARAM"],'chaine',0,'',$conf->entity);
+	if ($res1 && $res2 && $res3 && $res4 && $res5 && $res6) setEventMessage($langs->trans("RecordModifiedSuccessfully"));
 }
 
 
@@ -138,11 +118,16 @@ print_fiche_titre($langs->trans("SecuritySetup"),'','setup');
 print $langs->trans("MiscellaneousDesc")."<br>\n";
 print "<br>\n";
 
+
+
+print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+print '<input type="hidden" name="action" value="updateform">';
+
 $head=security_prepare_head();
 
 dol_fiche_head($head, 'misc', $langs->trans("Security"));
 
-
 // Timeout
 $var=true;
 
@@ -253,6 +238,44 @@ print "</td></tr>";
 
 print '</table>';
 
+
+print '<br>';
+
+
+// Timeout
+$var=true;
+
+print '<table width="100%" class="noborder">';
+print '<tr class="liste_titre">';
+print '<td colspan="2">'.$langs->trans("Parameters").'</td>';
+print '<td>'.$langs->trans("Value").'</td>';
+print "</tr>\n";
+
+$var=!$var;
+$sessiontimeout=ini_get("session.gc_maxlifetime");
+if (empty($conf->global->MAIN_SESSION_TIMEOUT)) $conf->global->MAIN_SESSION_TIMEOUT=$sessiontimeout;
+print '<tr '.$bc[$var].'>';
+print '<td>'.$langs->trans("SessionTimeOut").'</td><td align="right">';
+print $form->textwithpicto('',$langs->trans("SessionExplanation",ini_get("session.gc_probability"),ini_get("session.gc_divisor")));
+print '</td>';
+print '<td class="nowrap">';
+print '<input class="flat" name="MAIN_SESSION_TIMEOUT" type="text" size="6" value="'.htmlentities($conf->global->MAIN_SESSION_TIMEOUT).'"> '.strtolower($langs->trans("Seconds"));
+print '</td>';
+print '</tr>';
+
+$var=!$var;
+$sessiontimeout=ini_get("session.gc_maxlifetime");
+if (empty($conf->global->MAIN_APPLICATION_TITLE)) $conf->global->MAIN_APPLICATION_TITLE="";
+print '<tr '.$bc[$var].'>';
+print '<td>'.$langs->trans("MAIN_APPLICATION_TITLE").'</td><td align="right">';
+print '</td>';
+print '<td class="nowrap">';
+print '<input class="flat" name="MAIN_APPLICATION_TITLE" type="text" size="20" value="'.htmlentities($conf->global->MAIN_APPLICATION_TITLE).'"> ';
+print '</td>';
+print '</tr>';
+
+print '</table>';
+
 print '<br>';
 
 // Upload options
@@ -262,11 +285,8 @@ print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
 print '<td colspan="2">'.$langs->trans("Parameters").'</td>';
 print '<td>'.$langs->trans("Value").'</td>';
-print '<td width="100">&nbsp;</td>';
 print '</tr>';
 
-print '<form action="'.$_SERVER["PHP_SELF"].'?action=MAIN_UPLOAD_DOC" method="POST">';
-print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<tr '.$bc[$var].'>';
 print '<td colspan="2">'.$langs->trans("MaxSizeForUploadedFiles").'.';
 $max=@ini_get('upload_max_filesize');
@@ -276,14 +296,9 @@ print '</td>';
 print '<td class="nowrap">';
 print '<input class="flat" name="MAIN_UPLOAD_DOC" type="text" size="6" value="'.htmlentities($conf->global->MAIN_UPLOAD_DOC).'"> '.$langs->trans("Kb");
 print '</td>';
-print '<td align="right">';
-print '<input type="submit" class="button" name="button" value="'.$langs->trans("Modify").'">';
-print '</td>';
-print '</tr></form>';
+print '</tr>';
 
 $var=!$var;
-print '<form action="'.$_SERVER["PHP_SELF"].'?action=MAIN_UMASK" method="POST">';
-print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<tr '.$bc[$var].'>';
 print '<td>'.$langs->trans("UMask").'</td><td align="right">';
 print $form->textwithpicto('',$langs->trans("UMaskExplanation"));
@@ -291,15 +306,10 @@ print '</td>';
 print '<td class="nowrap">';
 print '<input class="flat" name="MAIN_UMASK" type="text" size="6" value="'.htmlentities($conf->global->MAIN_UMASK).'">';
 print '</td>';
-print '<td align="right">';
-print '<input type="submit" class="button" name="button" value="'.$langs->trans("Modify").'">';
-print '</td>';
-print '</tr></form>';
+print '</tr>';
 
 // Use anti virus
 $var=!$var;
-print '<form action="'.$_SERVER["PHP_SELF"].'?action=MAIN_ANTIVIRUS_COMMAND" method="POST">';
-print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print "<tr ".$bc[$var].">";
 print '<td colspan="2">'.$langs->trans("AntiVirusCommand").'<br>';
 print $langs->trans("AntiVirusCommandExample");
@@ -319,16 +329,10 @@ if (ini_get('safe_mode') && ! empty($conf->global->MAIN_ANTIVIRUS_COMMAND))
 }
 print '<input type="text" name="MAIN_ANTIVIRUS_COMMAND" size="72" value="'.(! empty($conf->global->MAIN_ANTIVIRUS_COMMAND)?dol_htmlentities($conf->global->MAIN_ANTIVIRUS_COMMAND):'').'">';
 print "</td>";
-print '<td align="right">';
-print '<input type="submit" class="button" name="button" value="'.$langs->trans("Modify").'">';
-print '</td>';
 print '</tr>';
-print '</form>';
 
 // Use anti virus
 $var=!$var;
-print '<form action="'.$_SERVER["PHP_SELF"].'?action=MAIN_ANTIVIRUS_PARAM" method="POST">';
-print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print "<tr ".$bc[$var].">";
 print '<td colspan="2">'.$langs->trans("AntiVirusParam").'<br>';
 print $langs->trans("AntiVirusParamExample");
@@ -336,16 +340,18 @@ print '</td>';
 print '<td>';
 print '<input type="text" name="MAIN_ANTIVIRUS_PARAM" size="72" value="'.(! empty($conf->global->MAIN_ANTIVIRUS_PARAM)?dol_htmlentities($conf->global->MAIN_ANTIVIRUS_PARAM):'').'">';
 print "</td>";
-print '<td align="right">';
-print '<input type="submit" class="button" name="button" value="'.$langs->trans("Modify").'">';
-print '</td>';
 print '</tr>';
-print '</form>';
 
 print '</table>';
 
 dol_fiche_end();
 
+print '<div class="center"><input type="submit" class="button" name="button" value="'.$langs->trans("Modify").'"></div>';
+
+print '</form>';
+
+
+
 // Form to test upload
 print '<br>';
 $formfile=new FormFile($db);
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 16d2edd0e96..12dbbe7d1c1 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -651,7 +651,7 @@ class Propal extends CommonObject
      * 	@param		int		$notrigger	1=Does not execute triggers, 0= execuete triggers
      *  @return     int     			<0 if KO, >=0 if OK
      */
-    function create($user='', $notrigger=0)
+    function create($user, $notrigger=0)
     {
         global $langs,$conf,$mysoc,$hookmanager;
         $error=0;
@@ -919,7 +919,7 @@ class Propal extends CommonObject
     {
         $this->products=$this->lines;
 
-        return $this->create();
+        return $this->create($user);
     }
 
     /**
diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index 3502736fca6..20fd6939f5d 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -935,8 +935,8 @@ if ($action == 'create')
     }
 	print '<tr><td class="fieldrequired">'.$langs->trans('Ref').'</td><td colspan="2">'.$tmpcode.'</td></tr>';
 
-	// Ref Int
-	print '<tr><td>'.$langs->trans('RefCustomer').'</td>';
+	// Ref supplier
+	print '<tr><td>'.$langs->trans('RefSupplier').'</td>';
 	print '<td colspan="2"><input type="text" size="5" name="ref_supplier" id="ref_supplier" value="'.GETPOST('ref_supplier','alpha').'"></td></tr>';
 
     // Customer
@@ -1134,9 +1134,9 @@ else
 
         print '<tr>';
 		print '<td  width="20%">';
-		print $form->editfieldkey("RefCustomer",'ref_supplier',$object->ref_supplier,$object,$user->rights->contrat->creer);
+		print $form->editfieldkey("RefSupplier",'ref_supplier',$object->ref_supplier,$object,$user->rights->contrat->creer);
 		print '</td><td>';
-		print $form->editfieldval("RefCustomer",'ref_supplier',$object->ref_supplier,$object,$user->rights->contrat->creer);
+		print $form->editfieldval("RefSupplier",'ref_supplier',$object->ref_supplier,$object,$user->rights->contrat->creer);
 		print '</td>';
 		print '</tr>';
 
@@ -1290,7 +1290,7 @@ else
                         	$productstatic->ref=$objp->label;
                         	print $productstatic->getNomUrl(0,'',16);
                         }
-                        if (! empty($conf->global->PRODUIT_DESC_IN_FORM) and $objp->description) 
+                        if (! empty($conf->global->PRODUIT_DESC_IN_FORM) and $objp->description)
                             print '<br>'.dol_nl2br($objp->description);
                         print '</td>';
                     }
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index a075f99cd06..720da83ccfd 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1540,6 +1540,12 @@ Opened=Opened
 Closed=Closed
 AlwaysEditable=Can always be edited
 MAIN_APPLICATION_TITLE=Force visible name of application
+NbMajMin=Minimum number of uppercase characters
+NbNumMin=Minimum number of numeric characters
+NbSpeMin=Minimum number of special characters
+NbSpeMin=Minimum number of special characters
+NbIteConsecutive=Maximum number of repeating same characters
+NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation
 
 Format=Format
 TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type 
diff --git a/htdocs/opensurvey/class/opensurveysondage.class.php b/htdocs/opensurvey/class/opensurveysondage.class.php
index 48119a7f16f..fa506285cc8 100644
--- a/htdocs/opensurvey/class/opensurveysondage.class.php
+++ b/htdocs/opensurvey/class/opensurveysondage.class.php
@@ -392,6 +392,7 @@ class Opensurveysondage extends CommonObject
 	function fetch_lines()
 	{
 		$ret=array();
+
 		$sql = "SELECT id_users, nom as name, reponses FROM ".MAIN_DB_PREFIX."opensurvey_user_studs";
 		$sql.= " WHERE id_sondage = '".$this->db->escape($this->id_sondage)."'";
 		$resql=$this->db->query($sql);
@@ -441,7 +442,9 @@ class Opensurveysondage extends CommonObject
 	 *
 	 * @return Object[]
 	 */
-	public function getComments() {
+	public function getComments()
+	{
+		$comments = array();
 
 		$sql = 'SELECT id_comment, usercomment, comment';
 		$sql.= ' FROM '.MAIN_DB_PREFIX.'opensurvey_comments';
@@ -449,13 +452,16 @@ class Opensurveysondage extends CommonObject
 		$sql.= " ORDER BY id_comment";
 		$resql = $this->db->query($sql);
 
-		$num_rows=$this->db->num_rows($resql);
+		if ($resql)
+		{
+			$num_rows=$this->db->num_rows($resql);
 
-		$comments = array();
-
-		if ($num_rows > 0) {
-			while ($obj = $this->db->fetch_object($resql)) {
-				$comments[] = $obj;
+			if ($num_rows > 0)
+			{
+				while ($obj = $this->db->fetch_object($resql))
+				{
+					$comments[] = $obj;
+				}
 			}
 		}
 
@@ -469,8 +475,8 @@ class Opensurveysondage extends CommonObject
 	 * @param string $comment_user Comment author
 	 * @return boolean False in case of the query fails, true if it was successful
 	 */
-	public function addComment($comment, $comment_user) {
-
+	public function addComment($comment, $comment_user)
+	{
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."opensurvey_comments (id_sondage, comment, usercomment)";
 		$sql.= " VALUES ('".$this->db->escape($this->id_sondage)."','".$this->db->escape($comment)."','".$this->db->escape($comment_user)."')";
 		$resql = $this->db->query($sql);
@@ -488,7 +494,8 @@ class Opensurveysondage extends CommonObject
 	 * @param int $id_comment Id of the comment
 	 * @return boolean False in case of the query fails, true if it was successful
 	 */
-	public function deleteComment($id_comment) {
+	public function deleteComment($id_comment)
+	{
 		$sql = 'DELETE FROM '.MAIN_DB_PREFIX.'opensurvey_comments WHERE id_comment = '.$id_comment.' AND id_sondage = '.$this->id_sondage;
 		$resql = $this->db->query($sql);
 
@@ -504,8 +511,8 @@ class Opensurveysondage extends CommonObject
 	 *
 	 * @return void
 	 */
-	private function cleanParameters() {
-
+	private function cleanParameters()
+	{
 		$this->id_sondage = trim($this->id_sondage);
 		$this->commentaires = trim($this->commentaires);
 		$this->mail_admin = trim($this->mail_admin);