diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php
index fffc94b679f..510e9b8d3c4 100644
--- a/htdocs/admin/facture.php
+++ b/htdocs/admin/facture.php
@@ -564,7 +564,7 @@ if ($conf->banque->enabled)
 				$row = $db->fetch_row($resql);
 
 				print '<option value="'.$row[0].'"';
-				print $conf->global->FACTURE_RIB_NUMBER == $row[0] ? ' selected="true"':'';
+				print $conf->global->FACTURE_RIB_NUMBER == $row[0] ? ' selected="selected"':'';
 				print '>'.$row[1].'</option>';
 
 				$i++;
@@ -586,7 +586,7 @@ print "<td>".$langs->trans("SuggestPaymentByChequeToAddress")."</td>";
 print "<td>";
 print '<select name="chq">';
 print '<option value="0">'.$langs->trans("DoNotSuggestPaymentMode").'</option>';
-print '<option value="-1"'.($conf->global->FACTURE_CHQ_NUMBER?' selected="true"':'').'>'.$langs->trans("MenuCompanySetup").' ('.($mysoc->nom?$mysoc->nom:$langs->trans("NotDefined")).')</option>';
+print '<option value="-1"'.($conf->global->FACTURE_CHQ_NUMBER?' selected="selected"':'').'>'.$langs->trans("MenuCompanySetup").' ('.($mysoc->nom?$mysoc->nom:$langs->trans("NotDefined")).')</option>';
 
 $sql = "SELECT rowid, label";
 $sql.= " FROM ".MAIN_DB_PREFIX."bank_account";
@@ -605,7 +605,7 @@ if ($resql)
 		$row = $db->fetch_row($resql);
 
 		print '<option value="'.$row[0].'"';
-		print $conf->global->FACTURE_CHQ_NUMBER == $row[0] ? ' selected="true"':'';
+		print $conf->global->FACTURE_CHQ_NUMBER == $row[0] ? ' selected="selected"':'';
 		print '>'.$langs->trans("OwnerOfBankAccount",$row[1]).'</option>';
 
 		$i++;
diff --git a/htdocs/comm/prospect/prospects.php b/htdocs/comm/prospect/prospects.php
index 27dc6dfc4cd..741bc4ef7be 100644
--- a/htdocs/comm/prospect/prospects.php
+++ b/htdocs/comm/prospect/prospects.php
@@ -313,7 +313,7 @@ if ($resql)
  	$options_from = '<option value="">&nbsp;</option>';
  	foreach ($tab_level as $tab_level_sortorder => $tab_level_label)
  	{
- 		$options_from .= '<option value="'.$tab_level_sortorder.'"'.($search_level_from == $tab_level_sortorder ? ' selected="true"':'').'>';
+ 		$options_from .= '<option value="'.$tab_level_sortorder.'"'.($search_level_from == $tab_level_sortorder ? ' selected="selected"':'').'>';
  		$options_from .= $langs->trans($tab_level_label);
  		$options_from .= '</option>';
  	}
@@ -325,7 +325,7 @@ if ($resql)
  	$options_to = '<option value="">&nbsp;</option>';
  	foreach ($tab_level as $tab_level_sortorder => $tab_level_label)
  	{
- 		$options_to .= '<option value="'.$tab_level_sortorder.'"'.($search_level_to == $tab_level_sortorder ? ' selected="true"':'').'>';
+ 		$options_to .= '<option value="'.$tab_level_sortorder.'"'.($search_level_to == $tab_level_sortorder ? ' selected="selected"':'').'>';
  		$options_to .= $langs->trans($tab_level_label);
  		$options_to .= '</option>';
  	}
diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index 05b97cddc32..ef899a4ca33 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -1445,12 +1445,12 @@ if ($_GET['action'] == 'create')
 			{
 				print '<tr><td>'.$langs->trans('CreateFromRepeatableInvoice').'</td><td>';
 				print '<select class="flat" name="fac_rec">';
-				print '<option value="0" selected="true"></option>';
+				print '<option value="0" selected="selected"></option>';
 				while ($i < $num)
 				{
 					$objp = $db->fetch_object($resql);
 					print '<option value="'.$objp->rowid.'"';
-					if ($_POST["fac_rec"] == $objp->rowid) print ' selected="true"';
+					if ($_POST["fac_rec"] == $objp->rowid) print ' selected="selected"';
 					print '>'.$objp->titre.' ('.price($objp->total_ttc).' '.$langs->trans("TTC").')</option>';
 					$i++;
 				}
@@ -1482,7 +1482,7 @@ if ($_GET['action'] == 'create')
 	foreach ($facids as $facparam)
 	{
 		$options.='<option value="'.$facparam['id'].'"';
-		if ($facparam['id'] == $_POST['fac_replacement']) $options.=' selected="true"';
+		if ($facparam['id'] == $_POST['fac_replacement']) $options.=' selected="selected"';
 		$options.='>'.$facparam['ref'];
 		$options.=' ('.$facturestatic->LibStatut(0,$facparam['status']).')';
 		$options.='</option>';
@@ -1500,7 +1500,7 @@ if ($_GET['action'] == 'create')
 		$newinvoice=new Facture($db);
 		$newinvoice->fetch($key);
 		$optionsav.='<option value="'.$key.'"';
-		if ($key == $_POST['fac_avoir']) $optionsav.=' selected="true"';
+		if ($key == $_POST['fac_avoir']) $optionsav.=' selected="selected"';
 		$optionsav.='>';
 		$optionsav.=$newinvoice->ref;
 		$optionsav.=' ('.$newinvoice->getLibStatut(1,$value).')';
diff --git a/htdocs/compta/prelevement/ligne.php b/htdocs/compta/prelevement/ligne.php
index 323f7ed9f34..8c855520145 100644
--- a/htdocs/compta/prelevement/ligne.php
+++ b/htdocs/compta/prelevement/ligne.php
@@ -176,7 +176,7 @@ if ($_GET["id"])
 		print '<td colspan="2" class="valid">';
 		print '<select name="confirm">';
 		print '<option value="yes">'.$langs->trans("Yes").'</option>';
-		print '<option value="no" selected="true">'.$langs->trans("No").'</option>';
+		print '<option value="no" selected="selected">'.$langs->trans("No").'</option>';
 		print '</select>';
 		print '</td></tr>';
 
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 162a4503ee2..ced87e8760e 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -269,7 +269,7 @@ class Form
                     ($selected == $obj->rowid || $selected == $obj->code || $selected == $obj->libelle) )
                     {
                         $foundselected=true;
-                        $out.= '<option value="'.$obj->rowid.'" selected="true">';
+                        $out.= '<option value="'.$obj->rowid.'" selected="selected">';
                     }
                     else
                     {
@@ -314,7 +314,7 @@ class Form
             {
                 if ($selected == $type_available[$i])
                 {
-                    print '<option value="'.$type_available[$i].'" selected="true">'.$langs->trans("BankType".$type_available[$i]).'</option>';
+                    print '<option value="'.$type_available[$i].'" selected="selected">'.$langs->trans("BankType".$type_available[$i]).'</option>';
                 }
                 else
                 {
@@ -378,7 +378,7 @@ class Form
                 {
                     $obj = $db->fetch_object($resql);
                     print '<option value="'.$obj->id.'"';
-                    if ($obj->id == $selected) print ' selected="true"';
+                    if ($obj->id == $selected) print ' selected="selected"';
                     print '>'.dol_trunc($obj->type,$maxlen);
                     $i++;
                 }
@@ -418,16 +418,16 @@ class Form
             if ($showempty)
             {
                 print '<option value="-1"';
-                if ($selected == -1) print ' selected="true"';
+                if ($selected == -1) print ' selected="selected"';
                 print '>&nbsp;</option>';
             }
 
             print '<option value="0"';
-            if (0 == $selected) print ' selected="true"';
+            if (0 == $selected) print ' selected="selected"';
             print '>'.$langs->trans("Product");
 
             print '<option value="1"';
-            if (1 == $selected) print ' selected="true"';
+            if (1 == $selected) print ' selected="selected"';
             print '>'.$langs->trans("Service");
 
             print '</select>';
@@ -459,7 +459,7 @@ class Form
         if ($showempty)
         {
             print '<option value="-1"';
-            if ($selected == -1) print ' selected="true"';
+            if ($selected == -1) print ' selected="selected"';
             print '>&nbsp;</option>';
         }
 
@@ -475,7 +475,7 @@ class Form
             {
                 $obj = $db->fetch_object($resql);
                 print '<option value="'.$obj->code.'"';
-                if ($obj->code == $selected) print ' selected="true"';
+                if ($obj->code == $selected) print ' selected="selected"';
                 print '>';
                 if ($obj->code != $langs->trans($obj->code)) print $langs->trans($obj->code);
                 else print $langs->trans($obj->type);
@@ -562,7 +562,7 @@ class Form
                         }
                         if ($selected > 0 && $selected == $obj->rowid)
                         {
-                            print '<option value="'.$obj->rowid.'" selected="true">'.$label.'</option>';
+                            print '<option value="'.$obj->rowid.'" selected="selected">'.$label.'</option>';
                         }
                         else
                         {
@@ -622,7 +622,7 @@ class Form
                     if ($desc=='(DEPOSIT)')     $desc=$langs->trans("Deposit");
 
                     $selectstring='';
-                    if ($selected > 0 && $selected == $obj->rowid) $selectstring=' selected="true"';
+                    if ($selected > 0 && $selected == $obj->rowid) $selectstring=' selected="selected"';
 
                     $disabled='';
                     if ($maxvalue && $obj->amount_ttc > $maxvalue)
@@ -695,7 +695,7 @@ class Form
                         {
                             print '<option value="'.$obj->rowid.'"';
                             if ($disabled) print ' disabled="true"';
-                            print ' selected="true">'.$obj->name.' '.$obj->firstname.'</option>';
+                            print ' selected="selected">'.$obj->name.' '.$obj->firstname.'</option>';
                         }
                         else
                         {
@@ -773,7 +773,7 @@ class Form
         if ($resql)
         {
             $out.= '<select class="flat" name="'.$htmlname.'"'.($disabled?' disabled="true"':'').'>';
-            if ($show_empty) $out.= '<option value="-1"'.($id==-1?' selected="true"':'').'>&nbsp;</option>'."\n";
+            if ($show_empty) $out.= '<option value="-1"'.($id==-1?' selected="selected"':'').'>&nbsp;</option>'."\n";
             $num = $this->db->num_rows($resql);
             $i = 0;
             if ($num)
@@ -788,7 +788,7 @@ class Form
                     {
                         $out.= '<option value="'.$obj->rowid.'"';
                         if ($disableline) $out.= ' disabled="true"';
-                        $out.= ' selected="true">';
+                        $out.= ' selected="selected">';
                     }
                     else
                     {
@@ -937,12 +937,12 @@ class Form
                 }
                 else
                 {
-                    $outselect.='<option value="0" selected="true">-- '.$langs->trans("MatchingProducts").' --</option>';
+                    $outselect.='<option value="0" selected="selected">-- '.$langs->trans("MatchingProducts").' --</option>';
                 }
             }
             else
             {
-                $outselect.='<option value="0" selected="true">&nbsp;</option>';
+                $outselect.='<option value="0" selected="selected">&nbsp;</option>';
             }
 
             $i = 0;
@@ -962,7 +962,7 @@ class Form
                 $outref=$objp->ref;
 
                 $opt = '<option value="'.$objp->rowid.'"';
-                $opt.= ($objp->rowid == $selected)?' selected="true"':'';
+                $opt.= ($objp->rowid == $selected)?' selected="selected"':'';
                 if ($conf->stock->enabled && $objp->fk_product_type == 0 && isset($objp->stock))
                 {
                     if ($objp->stock > 0)
@@ -1173,12 +1173,12 @@ class Form
                 }
                 else
                 {
-                    $outselect.='<option value="0" selected="true">-- '.$langs->trans("MatchingProducts").' --</option>';
+                    $outselect.='<option value="0" selected="selected">-- '.$langs->trans("MatchingProducts").' --</option>';
                 }
             }
             else
             {
-                if (! $selected) $outselect.='<option value="0" selected="true">&nbsp;</option>';
+                if (! $selected) $outselect.='<option value="0" selected="selected">&nbsp;</option>';
                 else $outselect.='<option value="0">&nbsp;</option>';
             }
 
@@ -1195,7 +1195,7 @@ class Form
                 $outref=$objp->ref;
 
                 $opt = '<option value="'.$objp->idprodfournprice.'"';
-                if ($selected == $objp->idprodfournprice) $opt.= ' selected="true"';
+                if ($selected == $objp->idprodfournprice) $opt.= ' selected="selected"';
                 if ($objp->fprice == '') $opt.=' disabled="disabled"';
                 $opt.= '>';
 
@@ -1390,7 +1390,7 @@ class Form
 
                     if ($selected && $selected == $obj->rowid)
                     {
-                        print '<option value="'.$obj->rowid.'" selected="true">'.$obj->label.'</option>';
+                        print '<option value="'.$obj->rowid.'" selected="selected">'.$obj->label.'</option>';
                     }
                     else
                     {
@@ -1506,7 +1506,7 @@ class Form
         {
             if ($selected == $id)
             {
-                print '<option value="'.$id.'" selected="true">';
+                print '<option value="'.$id.'" selected="selected">';
             }
             else
             {
@@ -1556,8 +1556,8 @@ class Form
             if ($format == 1) print '<option value="'.$arraytypes['code'].'"';
             if ($format == 2) print '<option value="'.$arraytypes['code'].'"';
             // Si selected est text, on compare avec code, sinon avec id
-            if (preg_match('/[a-z]/i', $selected) && $selected == $arraytypes['code']) print ' selected="true"';
-            elseif ($selected == $id) print ' selected="true"';
+            if (preg_match('/[a-z]/i', $selected) && $selected == $arraytypes['code']) print ' selected="selected"';
+            elseif ($selected == $id) print ' selected="selected"';
             print '>';
             if ($format == 0) $value=$arraytypes['label'];
             if ($format == 1) $value=$arraytypes['code'];
@@ -1599,7 +1599,7 @@ class Form
         {
             if ($selected == $id)
             {
-                $return.= '<option value="'.$id.'" selected="true">'.$value;
+                $return.= '<option value="'.$id.'" selected="selected">'.$value;
             }
             else
             {
@@ -1637,7 +1637,7 @@ class Form
                     $obj = $this->db->fetch_object($resql);
                     if ($selected == $obj->id)
                     {
-                        print '<option value="'.$obj->id.'" selected="true">';
+                        print '<option value="'.$obj->id.'" selected="selected">';
                     }
                     else
                     {
@@ -1697,7 +1697,7 @@ class Form
                     $obj = $this->db->fetch_object($result);
                     if ($selected == $obj->rowid)
                     {
-                        print '<option value="'.$obj->rowid.'" selected="true">';
+                        print '<option value="'.$obj->rowid.'" selected="selected">';
                     }
                     else
                     {
@@ -1748,7 +1748,7 @@ class Form
                 {
                     if ($cate_arbo[$key]['id'] == $selected)
                     {
-                        $add = 'selected="true" ';
+                        $add = 'selected="selected" ';
                     }
                     else
                     {
@@ -2299,7 +2299,7 @@ class Form
                     if ($selected && $selected == $obj->code_iso)
                     {
                         $foundselected=true;
-                        $out.= '<option value="'.$obj->code_iso.'" selected="true">';
+                        $out.= '<option value="'.$obj->code_iso.'" selected="selected">';
                     }
                     else
                     {
@@ -2485,7 +2485,7 @@ class Form
                 $return.= '"';
                 if ($txtva[$i] == $defaulttx && $nprtva[$i] == $defaultnpr)
                 {
-                    $return.= ' selected="true"';
+                    $return.= ' selected="selected"';
                 }
                 $return.= '>'.vatrate($libtva[$i]);
                 $return.= $nprtva[$i] ? ' *': '';
@@ -2642,14 +2642,14 @@ class Form
 
                 if ($empty || $set_time == -1)
                 {
-                    $retstring.='<option value="0" selected="true">&nbsp;</option>';
+                    $retstring.='<option value="0" selected="selected">&nbsp;</option>';
                 }
 
                 for ($day = 1 ; $day <= 31; $day++)
                 {
                     if ($day == $sday)
                     {
-                        $retstring.="<option value=\"$day\" selected=\"true\">$day";
+                        $retstring.="<option value=\"$day\" selected=\"selected\">$day";
                     }
                     else
                     {
@@ -2663,13 +2663,13 @@ class Form
                 $retstring.='<select'.($disabled?' disabled="true"':'').' class="flat" name="'.$prefix.'month">';
                 if ($empty || $set_time == -1)
                 {
-                    $retstring.='<option value="0" selected="true">&nbsp;</option>';
+                    $retstring.='<option value="0" selected="selected">&nbsp;</option>';
                 }
 
                 // Month
                 for ($month = 1 ; $month <= 12 ; $month++)
                 {
-                    $retstring.='<option value="'.$month.'"'.($month == $smonth?' selected="true"':'').'>';
+                    $retstring.='<option value="'.$month.'"'.($month == $smonth?' selected="selected"':'').'>';
                     $retstring.=dol_print_date(mktime(12,0,0,$month,1,2000),"%b");
                     $retstring.="</option>";
                 }
@@ -2832,7 +2832,7 @@ class Form
         for ($min = 0; $min <= 55; $min=$min+5)
         {
             print '<option value="'.$min.'"';
-            if ($minSelected == $min) print ' selected="true"';
+            if ($minSelected == $min) print ' selected="selected"';
             print '>'.$min.'</option>';
         }
         print "</select>";
@@ -2862,7 +2862,7 @@ class Form
 
         if ($show_empty)
         {
-            $out.='<option value="-1"'.($id==-1?' selected="true"':'').'>&nbsp;</option>'."\n";
+            $out.='<option value="-1"'.($id==-1?' selected="selected"':'').'>&nbsp;</option>'."\n";
         }
 
         if (is_array($array))
@@ -2873,7 +2873,7 @@ class Form
                 // Si il faut pre-selectionner une valeur
                 if ($id != '' && ($id == $key || $id == $value))
                 {
-                    $out.=' selected="true"';
+                    $out.=' selected="selected"';
                 }
 
                 $out.='>';
@@ -2931,13 +2931,13 @@ class Form
         $resultyesno = '<select class="flat" name="'.$htmlname.'">'."\n";
         if (("$value" == 'yes') || ($value == 1))
         {
-            $resultyesno .= '<option value="'.$yes.'" selected="true">'.$langs->trans("Yes").'</option>'."\n";
+            $resultyesno .= '<option value="'.$yes.'" selected="selected">'.$langs->trans("Yes").'</option>'."\n";
             $resultyesno .= '<option value="'.$no.'">'.$langs->trans("No").'</option>'."\n";
         }
         else
         {
             $resultyesno .= '<option value="'.$yes.'">'.$langs->trans("Yes").'</option>'."\n";
-            $resultyesno .= '<option value="'.$no.'" selected="true">'.$langs->trans("No").'</option>'."\n";
+            $resultyesno .= '<option value="'.$no.'" selected="selected">'.$langs->trans("No").'</option>'."\n";
         }
         $resultyesno .= '</select>'."\n";
         return $resultyesno;
@@ -2975,7 +2975,7 @@ class Form
                 $obj = $this->db->fetch_object($result);
                 if ($selected == $obj->rowid)
                 {
-                    print '<option value="'.$obj->rowid.'" selected="true">';
+                    print '<option value="'.$obj->rowid.'" selected="selected">';
                 }
                 else
                 {
@@ -3020,7 +3020,7 @@ class Form
         {
             if ($selected == $key)
             {
-                $select_week .= '<option value="'.$key.'" selected="true">';
+                $select_week .= '<option value="'.$key.'" selected="selected">';
             }
             else
             {
@@ -3052,7 +3052,7 @@ class Form
         {
             if ($selected == $key)
             {
-                $select_month .= '<option value="'.$key.'" selected="true">';
+                $select_month .= '<option value="'.$key.'" selected="selected">';
             }
             else
             {
@@ -3084,7 +3084,7 @@ class Form
         if($useempty)
         {
             if($selected == '')
-            $selected_html = 'selected="true"';
+            $selected_html = 'selected="selected"';
             print '<option value="" ' . $selected_html . ' >&nbsp;</option>';
         }
         for ($y = $max_year; $y >= $min_year; $y--)
@@ -3092,7 +3092,7 @@ class Form
             $selected_html='';
             if ($y == $selected)
             {
-                $selected_html = 'selected="true"';
+                $selected_html = 'selected="selected"';
             }
             print "<option value=\"$y\" $selected_html >$y";
             print "</option>";
diff --git a/htdocs/core/class/html.formactions.class.php b/htdocs/core/class/html.formactions.class.php
index 24a4db8657a..e90bdbdb36c 100644
--- a/htdocs/core/class/html.formactions.class.php
+++ b/htdocs/core/class/html.formactions.class.php
@@ -72,7 +72,7 @@ class FormActions
 			print '<select '.($canedit?'':'disabled="true" ').'name="status" class="flat" onChange="select_status(document.'.$formname.'.status.value)">';
 			foreach($listofstatus as $key => $val)
 			{
-				print '<option value="'.$key.'"'.($selected == $key?' selected="true"':'').'>'.$val.'</option>';
+				print '<option value="'.$key.'"'.($selected == $key?' selected="selected"':'').'>'.$val.'</option>';
 			}
 			print '</select>';
 			if ($selected == 0 || $selected == 100) $canedit=0;
diff --git a/htdocs/core/class/html.formadmin.class.php b/htdocs/core/class/html.formadmin.class.php
index add66c06491..ce22e062e88 100644
--- a/htdocs/core/class/html.formadmin.class.php
+++ b/htdocs/core/class/html.formadmin.class.php
@@ -80,13 +80,13 @@ class FormAdmin
 		if ($showempty)
 		{
 			$out.= '<option value=""';
-			if ($selected == '') $out.= ' selected="true"';
+			if ($selected == '') $out.= ' selected="selected"';
 			$out.= '>&nbsp;</option>';
 		}
 		if ($showauto)
 		{
 			$out.= '<option value="auto"';
-			if ($selected == 'auto') $out.= ' selected="true"';
+			if ($selected == 'auto') $out.= ' selected="selected"';
 			$out.= '>'.$langs->trans("AutoDetectLang").'</option>';
 		}
 
@@ -108,7 +108,7 @@ class FormAdmin
 			}
 			else if ($selected == $key)
 			{
-				$out.= '<option value="'.$key.'" selected="true">'.$value.'</option>';
+				$out.= '<option value="'.$key.'" selected="selected">'.$value.'</option>';
 			}
 			else
 			{
@@ -146,7 +146,7 @@ class FormAdmin
 
                 if ($file == $selected)
                 {
-					$menuarray[$prefix.'_'.$file]='<option value="'.$file.'" selected="true">'.$filelib.'</option>';
+					$menuarray[$prefix.'_'.$file]='<option value="'.$file.'" selected="selected">'.$filelib.'</option>';
                 }
                 else
                 {
@@ -189,7 +189,7 @@ class FormAdmin
 		global $langs,$conf;
 
 		$menuarray=array();
-		
+
 		foreach($dirmenuarray as $dirmenu)
 		{
 			$handle=opendir($dirmenu);
@@ -201,14 +201,14 @@ class FormAdmin
 					if (preg_match('/^default/i',$filelib)) continue;
 					if (preg_match('/^empty/i',$filelib)) continue;
 					if (preg_match('/\.lib/i',$filelib)) continue;
-					
+
 					$menuarray[$filelib]=1;
 				}
 				$menuarray['all']=1;
 			}
 			closedir($handle);
 		}
-        
+
 		ksort($menuarray);
 
 		// Affichage liste deroulante des menus
@@ -221,7 +221,7 @@ class FormAdmin
 			print '<option value="'.$key.'"';
             if ($key == $selected)
 			{
-				print '	selected="true"';
+				print '	selected="selected"';
 			}
             //if ($key == 'rodolphe') print ' disabled="true"';
 			print '>';
@@ -276,7 +276,7 @@ class FormAdmin
 		foreach ($arraytz as $lib => $gmt)
 		{
 			print '<option value="'.$lib.'"';
-			if ($selected == $lib || $selected == $gmt) print ' selected="true"';
+			if ($selected == $lib || $selected == $gmt) print ' selected="selected"';
 			print '>'.$gmt.'</option>'."\n";
 		}
 		print '</select>';
@@ -302,7 +302,7 @@ class FormAdmin
 		foreach ($arrayofcolors as $val)
 		{
 			print '<option value="'.$val.'"';
-			if ($selected == $val) print ' selected="true"';
+			if ($selected == $val) print ' selected="selected"';
 			print '>'.$val.'</option>';
 		}
 		print '</select>';
diff --git a/htdocs/core/class/html.formcompany.class.php b/htdocs/core/class/html.formcompany.class.php
index 6f83620fcf2..9243faf4797 100644
--- a/htdocs/core/class/html.formcompany.class.php
+++ b/htdocs/core/class/html.formcompany.class.php
@@ -157,7 +157,7 @@ class FormCompany
 				$obj = $this->db->fetch_object($resql);
 
 				print '<option value="'.$obj->code.'"';
-				if ($selected == $obj->code) print ' selected="true"';
+				if ($selected == $obj->code) print ' selected="selected"';
 				print '>';
 				$level=$langs->trans($obj->code);
 				if ($level == $obj->code) $level=$langs->trans($obj->label);
@@ -251,7 +251,7 @@ class FormCompany
 
 						if ($selected > 0 && $selected == $obj->rowid)
 						{
-							$out.= '<option value="'.$obj->rowid.'" selected="true">';
+							$out.= '<option value="'.$obj->rowid.'" selected="selected">';
 						}
 						else
 						{
@@ -320,7 +320,7 @@ class FormCompany
 
 						if ($selected > 0 && $selected == $obj->code)
 						{
-							print '<option value="'.$obj->code.'" selected="true">'.$obj->libelle.'</option>';
+							print '<option value="'.$obj->code.'" selected="selected">'.$obj->libelle.'</option>';
 						}
 						else
 						{
@@ -378,7 +378,7 @@ class FormCompany
 					$obj = $this->db->fetch_object($resql);
 					if ($selected == $obj->code)
 					{
-						$out.= '<option value="'.$obj->code.'" selected="true">';
+						$out.= '<option value="'.$obj->code.'" selected="selected">';
 					}
 					else
 					{
@@ -462,7 +462,7 @@ class FormCompany
 
 						if ($selected > 0 && $selected == $obj->code)
 						{
-							$out.= '<option value="'.$obj->code.'" selected="true">';
+							$out.= '<option value="'.$obj->code.'" selected="selected">';
 						}
 						else
 						{
@@ -573,7 +573,7 @@ class FormCompany
 						{
 							print '<option value="'.$obj->rowid.'"';
 							if ($disabled) print ' disabled="true"';
-							print ' selected="true">'.dol_trunc($obj->nom,24).'</option>';
+							print ' selected="selected">'.dol_trunc($obj->nom,24).'</option>';
 							$firstCompany = $obj->rowid;
 						}
 						else
diff --git a/htdocs/core/class/html.formorder.class.php b/htdocs/core/class/html.formorder.class.php
index 9a6d2db0e61..725a5aa815a 100644
--- a/htdocs/core/class/html.formorder.class.php
+++ b/htdocs/core/class/html.formorder.class.php
@@ -58,16 +58,16 @@ class FormOrder
 	{
 		global $conf,$langs;
 		print '<select class="flat" name="'.$htmlname.'" '.$htmloption.'>';
-		if ($addempty) print '<option value="-1" selected="true">&nbsp;</option>';
+		if ($addempty) print '<option value="-1" selected="selected">&nbsp;</option>';
 
 		// \TODO Aller chercher les sources dans dictionnaire
-		print '<option value="0"'.($selected=='0'?' selected="true"':'').'>'.$langs->trans('OrderSource0').'</option>';
-		print '<option value="1"'.($selected=='1'?' selected="true"':'').'>'.$langs->trans('OrderSource1').'</option>';
-		print '<option value="2"'.($selected=='2'?' selected="true"':'').'>'.$langs->trans('OrderSource2').'</option>';
-		print '<option value="3"'.($selected=='3'?' selected="true"':'').'>'.$langs->trans('OrderSource3').'</option>';
-		print '<option value="4"'.($selected=='4'?' selected="true"':'').'>'.$langs->trans('OrderSource4').'</option>';
-		print '<option value="5"'.($selected=='5'?' selected="true"':'').'>'.$langs->trans('OrderSource5').'</option>';
-		print '<option value="6"'.($selected=='6'?' selected="true"':'').'>'.$langs->trans('OrderSource6').'</option>';
+		print '<option value="0"'.($selected=='0'?' selected="selected"':'').'>'.$langs->trans('OrderSource0').'</option>';
+		print '<option value="1"'.($selected=='1'?' selected="selected"':'').'>'.$langs->trans('OrderSource1').'</option>';
+		print '<option value="2"'.($selected=='2'?' selected="selected"':'').'>'.$langs->trans('OrderSource2').'</option>';
+		print '<option value="3"'.($selected=='3'?' selected="selected"':'').'>'.$langs->trans('OrderSource3').'</option>';
+		print '<option value="4"'.($selected=='4'?' selected="selected"':'').'>'.$langs->trans('OrderSource4').'</option>';
+		print '<option value="5"'.($selected=='5'?' selected="selected"':'').'>'.$langs->trans('OrderSource5').'</option>';
+		print '<option value="6"'.($selected=='6'?' selected="selected"':'').'>'.$langs->trans('OrderSource6').'</option>';
 
 		print '</select>';
 	}
diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php
index bbb0b8bf4e2..129b4502f40 100644
--- a/htdocs/core/class/html.formother.class.php
+++ b/htdocs/core/class/html.formother.class.php
@@ -84,7 +84,7 @@ class FormOther
 				$obj = $this->db->fetch_object($result);
 				if ($selected == $obj->rowid)
 				{
-					print '<option value="'.$obj->rowid.'" selected="true">';
+					print '<option value="'.$obj->rowid.'" selected="selected">';
 				}
 				else
 				{
@@ -131,7 +131,7 @@ class FormOther
 				$obj = $this->db->fetch_object($result);
 				if ($selected == $obj->rowid)
 				{
-					print '<option value="'.$obj->rowid.'" selected="true">';
+					print '<option value="'.$obj->rowid.'" selected="selected">';
 				}
 				else
 				{
@@ -178,7 +178,7 @@ class FormOther
 					$obj = $this->db->fetch_object($resql);
 					if ($selected && $selected == $obj->rowid)
 					{
-						print '<option value="'.$obj->rowid.'" selected="true">';
+						print '<option value="'.$obj->rowid.'" selected="selected">';
 					}
 					else
 					{
@@ -218,7 +218,7 @@ class FormOther
 		{
 			if ($selected == $i)
 			{
-				$return.= '<option value="'.$i.'" selected="true">';
+				$return.= '<option value="'.$i.'" selected="selected">';
 			}
 			else
 			{
@@ -258,7 +258,7 @@ class FormOther
 	 		foreach ($tab_categs as $categ)
 	 		{
 	 			$moreforfilter.='<option value="'.$categ['id'].'"';
-	 			if ($categ['id'] == $selected) $moreforfilter.=' selected="true"';
+	 			if ($categ['id'] == $selected) $moreforfilter.=' selected="selected"';
 	 			$moreforfilter.='>'.dol_trunc($categ['fulllabel'],50,'middle').'</option>';
 	 		}
 	 	}
@@ -307,7 +307,7 @@ class FormOther
  			{
  				$moreforfilter.='<option value="'.$obj_usr->rowid.'"';
 
- 				if ($obj_usr->rowid == $selected) $moreforfilter.=' selected="true"';
+ 				if ($obj_usr->rowid == $selected) $moreforfilter.=' selected="selected"';
 
  				$moreforfilter.='>';
  				$moreforfilter.=$obj_usr->firstname." ".$obj_usr->name." (".$obj_usr->login.')';
@@ -416,7 +416,7 @@ class FormOther
 			foreach ($arrayofcolors as $val)
 			{
 				print '<option value="'.$val.'"';
-				if ($set_color == $val) print ' selected="true"';
+				if ($set_color == $val) print ' selected="selected"';
 				print '>'.$val.'</option>';
 			}
 			print '</select>';
@@ -501,7 +501,7 @@ function PLineSelect(&$inc, $parent, $lines, $level=0, $selectedtask=0, $selecte
 				{
 					if ($i > 0 && $conf->browser->firefox) print '<option value="0" disabled="true">----------</option>';
 					print '<option value="'.$lines[$i]->fk_project.'_0"';
-					if ($selectedproject == $lines[$i]->fk_project) print ' selected="true"';
+					if ($selectedproject == $lines[$i]->fk_project) print ' selected="selected"';
 					print '>';	// Project -> Task
 					print $langs->trans("Project").' '.$lines[$i]->projectref;
 					if (empty($lines[$i]->public))
@@ -524,7 +524,7 @@ function PLineSelect(&$inc, $parent, $lines, $level=0, $selectedtask=0, $selecte
 			if ($lines[$i]->id > 0)
 			{
 				print '<option value="'.$lines[$i]->fk_project.'_'.$lines[$i]->id.'"';
-				if ($lines[$i]->id == $selectedtask) print ' selected="true"';
+				if ($lines[$i]->id == $selectedtask) print ' selected="selected"';
 				print '>';
 				print $langs->trans("Project").' '.$lines[$i]->projectref;
 				if (empty($lines[$i]->public))
diff --git a/htdocs/ecm/class/htmlecm.form.class.php b/htdocs/ecm/class/htmlecm.form.class.php
index 5edd58df7c5..736d204e231 100644
--- a/htdocs/ecm/class/htmlecm.form.class.php
+++ b/htdocs/ecm/class/htmlecm.form.class.php
@@ -73,7 +73,7 @@ class FormEcm
 				{
 					if ($cate_arbo[$key]['id'] == $selected)
 					{
-						$add = 'selected="true" ';
+						$add = 'selected="selected" ';
 					}
 					else
 					{
diff --git a/htdocs/includes/barcode/html.formbarcode.class.php b/htdocs/includes/barcode/html.formbarcode.class.php
index 5ff233d6b41..253664281d9 100644
--- a/htdocs/includes/barcode/html.formbarcode.class.php
+++ b/htdocs/includes/barcode/html.formbarcode.class.php
@@ -88,11 +88,11 @@ class FormBarCode
 		$select_encoder.= '<input type="hidden" name="action" value="update">';
 		$select_encoder.= '<input type="hidden" name="code_id" value="'.$code_id.'">';
 		$select_encoder.= '<select id="select'.$idForm.'" class="flat" name="coder">';
-		$select_encoder.= '<option value="0"'.($selected==0?' selected="true"':'').' '.$disable.'>'.$langs->trans('Disable').'</option>';
+		$select_encoder.= '<option value="0"'.($selected==0?' selected="selected"':'').' '.$disable.'>'.$langs->trans('Disable').'</option>';
 		$select_encoder.= '<option value="-1" disabled="disabled">--------------------</option>';
 		foreach($barcodelist as $key => $value)
 		{
-			$select_encoder.= '<option value="'.$key.'"'.($selected==$key?' selected="true"':'').'>'.$value.'</option>';
+			$select_encoder.= '<option value="'.$key.'"'.($selected==$key?' selected="selected"':'').'>'.$value.'</option>';
 		}
 		$select_encoder.= '</select></form>';
 
@@ -129,7 +129,7 @@ class FormBarCode
             else
             {
             	print '<select disabled="disabled" class="flat" name="'.$htmlname.'">';
-            	print '<option value="0" selected="true">'.$langs->trans('NoActivatedBarcode').'</option>';
+            	print '<option value="0" selected="selected">'.$langs->trans('NoActivatedBarcode').'</option>';
             }
 
             while ($i < $num)
@@ -137,7 +137,7 @@ class FormBarCode
                 $obj = $this->db->fetch_object($result);
                 if ($selected == $obj->rowid)
                 {
-                    print '<option value="'.$obj->rowid.'" selected="true">';
+                    print '<option value="'.$obj->rowid.'" selected="selected">';
                 }
                 else
                 {
diff --git a/htdocs/lib/project.lib.php b/htdocs/lib/project.lib.php
index 109ef62671f..0eb44429f9b 100644
--- a/htdocs/lib/project.lib.php
+++ b/htdocs/lib/project.lib.php
@@ -220,7 +220,7 @@ function select_projects($socid=-1, $selected='', $htmlname='projectid')
 					//else $labeltoshow.=' ('.$langs->trans("Private").')';
 					if (!empty($selected) && $selected == $obj->rowid && $obj->fk_statut > 0)
 					{
-						print '<option value="'.$obj->rowid.'" selected="true">'.$labeltoshow.'</option>';
+						print '<option value="'.$obj->rowid.'" selected="selected">'.$labeltoshow.'</option>';
 					}
 					else
 					{
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index af14f4ee6f1..f8b2b4524b1 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1142,12 +1142,8 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a
 
 	print "\n</div>\n<!-- End top horizontal menu -->\n";
 
-	print "</div><!-- End top layout -->\n";
-
-	if (! $conf->use_javascript_ajax || ! $conf->global->MAIN_MENU_USE_JQUERY_LAYOUT)
-	{
-		print '<table width="100%" class="notopnoleftnoright" summary="leftmenutable" id="undertopmenu"><tr>';
-	}
+	if ($conf->use_javascript_ajax && $conf->global->MAIN_MENU_USE_JQUERY_LAYOUT) print "</div><!-- End top layout -->\n";
+    else print '<table width="100%" class="notopnoleftnoright" summary="leftmenutable" id="undertopmenu"><tr>';
 }
 
 
@@ -1170,8 +1166,7 @@ function left_menu($menu_array_before, $helppagename='', $moresearchform='', $me
 	//    print '<div class="vmenuplusfiche">'."\n";
 
 	if ($conf->use_javascript_ajax && $conf->global->MAIN_MENU_USE_JQUERY_LAYOUT) print "\n".'<div class="ui-layout-west"> <!-- Begin left layout -->'."\n";
-
-	if (! $conf->use_javascript_ajax || ! $conf->global->MAIN_MENU_USE_JQUERY_LAYOUT) print '<td class="vmenu" valign="top">';
+    else print '<td class="vmenu" valign="top">';
 
 	print "\n";
 
@@ -1316,9 +1311,8 @@ function left_menu($menu_array_before, $helppagename='', $moresearchform='', $me
 
 	print "\n";
 
-	if (! $conf->use_javascript_ajax || ! $conf->global->MAIN_MENU_USE_JQUERY_LAYOUT) print '</td>';
-
-	print '</div> <!-- End left layout -->'."\n";
+	if ($conf->use_javascript_ajax && $conf->global->MAIN_MENU_USE_JQUERY_LAYOUT) print '</div> <!-- End left layout -->'."\n";
+	else print '</td>';
 
 	print '<!-- End of left column, begin right area -->'."\n";
 	//	    print '</div>'."\n";
@@ -1332,11 +1326,12 @@ function main_area()
 {
 	global $conf, $langs;
 
-	if ($conf->use_javascript_ajax && $conf->global->MAIN_MENU_USE_JQUERY_LAYOUT) print '<div id="mainContent"><div class="ui-layout-center"> <!-- begin main layout -->'."\n";
-
-	if ($conf->use_javascript_ajax && $conf->global->MAIN_MENU_USE_JQUERY_LAYOUT) print '<table width="100%" class="notopnoleftnoright" summary="leftmenutable" id="undertopmenu"><tr>';
-
-	print '<td valign="top">'."\n";
+	if ($conf->use_javascript_ajax && $conf->global->MAIN_MENU_USE_JQUERY_LAYOUT)
+	{
+	    print '<div id="mainContent"><div class="ui-layout-center"> <!-- begin main layout -->'."\n";
+        print '<table width="100%" class="notopnoleftnoright" summary="leftmenutable" id="undertopmenu"><tr><td valign="top">'."\n";
+	}
+    else print '<td valign="top">'."\n";
 
 	print "\n";
 
@@ -1496,7 +1491,8 @@ if (! function_exists("llxFooter"))
 
 		//    print "\n".'</div> <!-- end div class="vmenuplusfiche" -->'."\n";
 		print "\n".'</td></tr></table> <!-- end right area -->'."\n";
-		print '</div></div> <!-- end main layout -->'."\n";
+
+		if ($conf->use_javascript_ajax && $conf->global->MAIN_MENU_USE_JQUERY_LAYOUT) print '</div></div> <!-- end main layout -->'."\n";
 
 		if (! empty($_SERVER['DOL_TUNING']))
 		{
diff --git a/htdocs/product/class/html.formproduct.class.php b/htdocs/product/class/html.formproduct.class.php
index a01dc04e588..feef65e034e 100644
--- a/htdocs/product/class/html.formproduct.class.php
+++ b/htdocs/product/class/html.formproduct.class.php
@@ -123,7 +123,7 @@ class FormProduct
 		{
 			print '<option value="'.$id.'"';
 			// Si selected est text, on compare avec code, sinon avec id
-			if ($selected == $id) print ' selected="true"';
+			if ($selected == $id) print ' selected="selected"';
 			print '>';
 			print $arraytypes['label'];
 			if ($fk_product) print ' ('.$langs->trans("Stock").': '.($arraytypes['stock']>0?$arraytypes['stock']:'?').')';
@@ -177,7 +177,7 @@ class FormProduct
 			$return.= '<option value="'.$key.'"';
 			if ($key == $default)
 			{
-				$return.= ' selected="true"';
+				$return.= ' selected="selected"';
 			}
 			//$return.= '>'.$value.'</option>';
 			$return.= '>'.measuring_units_string($key,$measuring_style).'</option>';
diff --git a/htdocs/product/fiche.php b/htdocs/product/fiche.php
index 1465062d9f1..cbd43079d0a 100644
--- a/htdocs/product/fiche.php
+++ b/htdocs/product/fiche.php
@@ -875,13 +875,13 @@ if ($_GET["id"] || $_GET["ref"])
 			print '<select class="flat" name="statut">';
 			if ($product->status)
 			{
-				print '<option value="1" selected="true">'.$langs->trans("OnSell").'</option>';
+				print '<option value="1" selected="selected">'.$langs->trans("OnSell").'</option>';
 				print '<option value="0">'.$langs->trans("NotOnSell").'</option>';
 			}
 			else
 			{
 				print '<option value="1">'.$langs->trans("OnSell").'</option>';
-				print '<option value="0" selected="true">'.$langs->trans("NotOnSell").'</option>';
+				print '<option value="0" selected="selected">'.$langs->trans("NotOnSell").'</option>';
 			}
 			print '</select>';
 			print '</td></tr>';
@@ -891,13 +891,13 @@ if ($_GET["id"] || $_GET["ref"])
 			print '<select class="flat" name="statut_buy">';
 			if ($product->status_buy)
 			{
-				print '<option value="1" selected="true">'.$langs->trans("ProductStatusOnBuy").'</option>';
+				print '<option value="1" selected="selected">'.$langs->trans("ProductStatusOnBuy").'</option>';
 				print '<option value="0">'.$langs->trans("ProductStatusNotOnBuy").'</option>';
 			}
 			else
 			{
 				print '<option value="1">'.$langs->trans("ProductStatusOnBuy").'</option>';
-				print '<option value="0" selected="true">'.$langs->trans("ProductStatusNotOnBuy").'</option>';
+				print '<option value="0" selected="selected">'.$langs->trans("ProductStatusNotOnBuy").'</option>';
 			}
 			print '</select>';
 			print '</td></tr>';
diff --git a/htdocs/product/stock/fiche.php b/htdocs/product/stock/fiche.php
index 87513f4b7c3..6e330fae629 100644
--- a/htdocs/product/stock/fiche.php
+++ b/htdocs/product/stock/fiche.php
@@ -197,7 +197,7 @@ if ($_GET["action"] == 'create')
 	print '<tr><td>'.$langs->trans("Status").'</td><td colspan="3">';
 	print '<select name="statut">';
 	print '<option value="0">'.$langs->trans("WarehouseClosed").'</option>';
-	print '<option value="1" selected="true">'.$langs->trans("WarehouseOpened").'</option>';
+	print '<option value="1" selected="selected">'.$langs->trans("WarehouseOpened").'</option>';
 	print '</select>';
 	print '</td></tr>';
 
@@ -489,8 +489,8 @@ else
 
 			print '<tr><td width="20%">'.$langs->trans("Status").'</td><td colspan="3">';
 			print '<select name="statut">';
-			print '<option value="0" '.($entrepot->statut == 0?'selected="true"':'').'>'.$langs->trans("WarehouseClosed").'</option>';
-			print '<option value="1" '.($entrepot->statut == 0?'':'selected="true"').'>'.$langs->trans("WarehouseOpened").'</option>';
+			print '<option value="0" '.($entrepot->statut == 0?'selected="selected"':'').'>'.$langs->trans("WarehouseClosed").'</option>';
+			print '<option value="1" '.($entrepot->statut == 0?'':'selected="selected"').'>'.$langs->trans("WarehouseOpened").'</option>';
 			print '</select>';
 			print '</td></tr>';
 
diff --git a/htdocs/societe/canvas/actions_card_common.class.php b/htdocs/societe/canvas/actions_card_common.class.php
index 4506c185bbb..8bdf74a5085 100644
--- a/htdocs/societe/canvas/actions_card_common.class.php
+++ b/htdocs/societe/canvas/actions_card_common.class.php
@@ -99,10 +99,10 @@ class ActionsCardCommon
 
             // TODO create a function
             $this->tpl['select_customertype'] = '<select class="flat" name="client">';
-            $this->tpl['select_customertype'].= '<option value="2"'.($this->object->client==2?' selected="true"':'').'>'.$langs->trans('Prospect').'</option>';
-            $this->tpl['select_customertype'].= '<option value="3"'.($this->object->client==3?' selected="true"':'').'>'.$langs->trans('ProspectCustomer').'</option>';
-            $this->tpl['select_customertype'].= '<option value="1"'.($this->object->client==1?' selected="true"':'').'>'.$langs->trans('Customer').'</option>';
-            $this->tpl['select_customertype'].= '<option value="0"'.($this->object->client==0?' selected="true"':'').'>'.$langs->trans('NorProspectNorCustomer').'</option>';
+            $this->tpl['select_customertype'].= '<option value="2"'.($this->object->client==2?' selected="selected"':'').'>'.$langs->trans('Prospect').'</option>';
+            $this->tpl['select_customertype'].= '<option value="3"'.($this->object->client==3?' selected="selected"':'').'>'.$langs->trans('ProspectCustomer').'</option>';
+            $this->tpl['select_customertype'].= '<option value="1"'.($this->object->client==1?' selected="selected"':'').'>'.$langs->trans('Customer').'</option>';
+            $this->tpl['select_customertype'].= '<option value="0"'.($this->object->client==0?' selected="selected"':'').'>'.$langs->trans('NorProspectNorCustomer').'</option>';
             $this->tpl['select_customertype'].= '</select>';
 
             // Customer
@@ -123,10 +123,10 @@ class ActionsCardCommon
             $this->object->LoadSupplierCateg();
             $this->tpl['suppliercategory'] = $this->object->SupplierCategories;
             $this->tpl['select_suppliercategory'] = $form->selectarray("fournisseur_categorie",$this->object->SupplierCategories,$_POST["fournisseur_categorie"],1);
-            
+
             // Zip
             $this->tpl['select_zip'] = $formcompany->select_ziptown($this->object->cp,'zipcode',array('town','selectpays_id','departement_id'),6);
-            
+
             // Town
             $this->tpl['select_town'] = $formcompany->select_ziptown($this->object->ville,'town',array('zipcode','selectpays_id','departement_id'));
 
diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php
index cdb5131586e..7327496a674 100644
--- a/htdocs/societe/soc.php
+++ b/htdocs/societe/soc.php
@@ -708,10 +708,10 @@ else
 
 		// Prospect/Customer
 		print '<tr><td width="25%"><span class="fieldrequired">'.$langs->trans('ProspectCustomer').'</span></td><td width="25%"><select class="flat" name="client">';
-		print '<option value="2"'.($soc->client==2?' selected="true"':'').'>'.$langs->trans('Prospect').'</option>';
-		print '<option value="3"'.($soc->client==3?' selected="true"':'').'>'.$langs->trans('ProspectCustomer').'</option>';
-		print '<option value="1"'.($soc->client==1?' selected="true"':'').'>'.$langs->trans('Customer').'</option>';
-		print '<option value="0"'.($soc->client==0?' selected="true"':'').'>'.$langs->trans('NorProspectNorCustomer').'</option>';
+		print '<option value="2"'.($soc->client==2?' selected="selected"':'').'>'.$langs->trans('Prospect').'</option>';
+		print '<option value="3"'.($soc->client==3?' selected="selected"':'').'>'.$langs->trans('ProspectCustomer').'</option>';
+		print '<option value="1"'.($soc->client==1?' selected="selected"':'').'>'.$langs->trans('Customer').'</option>';
+		print '<option value="0"'.($soc->client==0?' selected="selected"':'').'>'.$langs->trans('NorProspectNorCustomer').'</option>';
 		print '</select></td>';
 
 		print '<td width="25%">'.$langs->trans('CustomerCode').'</td><td width="25%">';
@@ -1095,10 +1095,10 @@ else
 
 			// Prospect/Customer
 			print '<tr><td width="25%"><span class="fieldrequired">'.$langs->trans('ProspectCustomer').'</span></td><td width="25%"><select class="flat" name="client">';
-			print '<option value="2"'.($soc->client==2?' selected="true"':'').'>'.$langs->trans('Prospect').'</option>';
-			print '<option value="3"'.($soc->client==3?' selected="true"':'').'>'.$langs->trans('ProspectCustomer').'</option>';
-			print '<option value="1"'.($soc->client==1?' selected="true"':'').'>'.$langs->trans('Customer').'</option>';
-			print '<option value="0"'.($soc->client==0?' selected="true"':'').'>'.$langs->trans('NorProspectNorCustomer').'</option>';
+			print '<option value="2"'.($soc->client==2?' selected="selected"':'').'>'.$langs->trans('Prospect').'</option>';
+			print '<option value="3"'.($soc->client==3?' selected="selected"':'').'>'.$langs->trans('ProspectCustomer').'</option>';
+			print '<option value="1"'.($soc->client==1?' selected="selected"':'').'>'.$langs->trans('Customer').'</option>';
+			print '<option value="0"'.($soc->client==0?' selected="selected"':'').'>'.$langs->trans('NorProspectNorCustomer').'</option>';
 			print '</select></td>';
 			print '<td width="25%">'.$langs->trans('CustomerCode').'</td><td width="25%">';
 
diff --git a/htdocs/webcalendar/admin/webcalendar.php b/htdocs/webcalendar/admin/webcalendar.php
index 90da83abd13..8cb5bbe8e91 100644
--- a/htdocs/webcalendar/admin/webcalendar.php
+++ b/htdocs/webcalendar/admin/webcalendar.php
@@ -227,10 +227,10 @@ if ($conf->agenda->enabled)
     print '<td>'.$langs->trans("WebCalAddEventOnCreateActions").'</td>';
     print '<td>';
     print '<select name="phpwebcalendar_syncro" class="flat">';
-    print '<option value="always"'.($conf->global->PHPWEBCALENDAR_SYNCRO=='always'?' selected="true"':'').'>'.$langs->trans("WebCalAllways").'</option>';
-    print '<option value="yesbydefault"'.($conf->global->PHPWEBCALENDAR_SYNCRO=='yesbydefault'?' selected="true"':'').'>'.$langs->trans("WebCalYesByDefault").'</option>';
-    print '<option value="nobydefault"'.((! $conf->global->PHPWEBCALENDAR_SYNCRO || $conf->global->PHPWEBCALENDAR_SYNCRO=='nobydefault')?' selected="true"':'').'>'.$langs->trans("WebCalNoByDefault").'</option>';
-    print '<option value="never"'.($conf->global->PHPWEBCALENDAR_SYNCRO=='never'?' selected="true"':'').'>'.$langs->trans("WebCalNever").'</option>';
+    print '<option value="always"'.($conf->global->PHPWEBCALENDAR_SYNCRO=='always'?' selected="selected"':'').'>'.$langs->trans("WebCalAllways").'</option>';
+    print '<option value="yesbydefault"'.($conf->global->PHPWEBCALENDAR_SYNCRO=='yesbydefault'?' selected="selected"':'').'>'.$langs->trans("WebCalYesByDefault").'</option>';
+    print '<option value="nobydefault"'.((! $conf->global->PHPWEBCALENDAR_SYNCRO || $conf->global->PHPWEBCALENDAR_SYNCRO=='nobydefault')?' selected="selected"':'').'>'.$langs->trans("WebCalNoByDefault").'</option>';
+    print '<option value="never"'.($conf->global->PHPWEBCALENDAR_SYNCRO=='never'?' selected="selected"':'').'>'.$langs->trans("WebCalNever").'</option>';
     print '</select>';
     print '</td></tr>';
 }
@@ -266,7 +266,7 @@ if ($conf->contrat->enabled)
     print '<td>';
     print '<select name="phpwebcalendar_contractstatus" class="flat">';
     print '<option value="always"'.($conf->global->PHPWEBCALENDAR_CONTRACTSTATUS=='always'?' selected="true"':'').'>'.$langs->trans("WebCalAllways").'</option>';
-    print '<option value="never"'.(! $conf->global->PHPWEBCALENDAR_CONTRACTSTATUS || $conf->global->PHPWEBCALENDAR_CONTRACTSTATUS=='never'?' selected="true"':'').'>'.$langs->trans("WebCalNever").'</option>';
+    print '<option value="never"'.(! $conf->global->PHPWEBCALENDAR_CONTRACTSTATUS || $conf->global->PHPWEBCALENDAR_CONTRACTSTATUS=='never'?' selected="selected"':'').'>'.$langs->trans("WebCalNever").'</option>';
     print '</select>';
     print '</td></tr>';
 }
@@ -278,7 +278,7 @@ if ($conf->facture->enabled)
     print '<td>';
     print '<select name="phpwebcalendar_billstatus" class="flat">';
     print '<option value="always"'.($conf->global->PHPWEBCALENDAR_BILLSTATUS=='always'?' selected="true"':'').'>'.$langs->trans("WebCalAllways").'</option>';
-    print '<option value="never"'.(! $conf->global->PHPWEBCALENDAR_BILLSTATUS || $conf->global->PHPWEBCALENDAR_BILLSTATUS=='never'?' selected="true"':'').'>'.$langs->trans("WebCalNever").'</option>';
+    print '<option value="never"'.(! $conf->global->PHPWEBCALENDAR_BILLSTATUS || $conf->global->PHPWEBCALENDAR_BILLSTATUS=='never'?' selected="selected"':'').'>'.$langs->trans("WebCalNever").'</option>';
     print '</select>';
     print '</td></tr>';
 }
@@ -290,7 +290,7 @@ if ($conf->adherent->enabled)
     print '<td>';
     print '<select name="phpwebcalendar_memberstatus" class="flat">';
     print '<option value="always"'.($conf->global->PHPWEBCALENDAR_MEMBERSTATUS=='always'?' selected="true"':'').'>'.$langs->trans("WebCalAllways").'</option>';
-    print '<option value="never"'.(! $conf->global->PHPWEBCALENDAR_MEMBERSTATUS || $conf->global->PHPWEBCALENDAR_MEMBERSTATUS=='never'?' selected="true"':'').'>'.$langs->trans("WebCalNever").'</option>';
+    print '<option value="never"'.(! $conf->global->PHPWEBCALENDAR_MEMBERSTATUS || $conf->global->PHPWEBCALENDAR_MEMBERSTATUS=='never'?' selected="selected"':'').'>'.$langs->trans("WebCalNever").'</option>';
     print '</select>';
     print '</td></tr>';
 }