lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: W3C

Browse Source
This commit is contained in:
Laurent Destailleur 2010-11-01 16:00:38 +00:00
parent 84f874c49a
commit dfbd72a76a
20 changed files with 136 additions and 140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/admin/facture.php
View File

@ -564,7 +564,7 @@ if ($conf->banque->enabled)
$row = $db->fetch_row($resql); $row = $db->fetch_row($resql);
print '<option value="'.$row[0].'"'; 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>'; print '>'.$row[1].'</option>';
$i++; $i++;
@ -586,7 +586,7 @@ print "<td>".$langs->trans("SuggestPaymentByChequeToAddress")."</td>";
print "<td>"; print "<td>";
print '<select name="chq">'; print '<select name="chq">';
print '<option value="0">'.$langs->trans("DoNotSuggestPaymentMode").'</option>'; 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 = "SELECT rowid, label";
$sql.= " FROM ".MAIN_DB_PREFIX."bank_account"; $sql.= " FROM ".MAIN_DB_PREFIX."bank_account";
@ -605,7 +605,7 @@ if ($resql)
$row = $db->fetch_row($resql); $row = $db->fetch_row($resql);
print '<option value="'.$row[0].'"'; 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>'; print '>'.$langs->trans("OwnerOfBankAccount",$row[1]).'</option>';
$i++; $i++;

4
htdocs/comm/prospect/prospects.php
View File

@ -313,7 +313,7 @@ if ($resql)
$options_from = '<option value="">&nbsp;</option>'; $options_from = '<option value="">&nbsp;</option>';
foreach ($tab_level as $tab_level_sortorder => $tab_level_label) 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 .= $langs->trans($tab_level_label);
$options_from .= '</option>'; $options_from .= '</option>';
} }
@ -325,7 +325,7 @@ if ($resql)
$options_to = '<option value="">&nbsp;</option>'; $options_to = '<option value="">&nbsp;</option>';
foreach ($tab_level as $tab_level_sortorder => $tab_level_label) 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 .= $langs->trans($tab_level_label);
$options_to .= '</option>'; $options_to .= '</option>';
} }

8
htdocs/compta/facture.php
View File

@ -1445,12 +1445,12 @@ if ($_GET['action'] == 'create')
{ {
print '<tr><td>'.$langs->trans('CreateFromRepeatableInvoice').'</td><td>'; print '<tr><td>'.$langs->trans('CreateFromRepeatableInvoice').'</td><td>';
print '<select class="flat" name="fac_rec">'; print '<select class="flat" name="fac_rec">';
print '<option value="0" selected="true"></option>'; print '<option value="0" selected="selected"></option>';
while ($i < $num) while ($i < $num)
{ {
$objp = $db->fetch_object($resql); $objp = $db->fetch_object($resql);
print '<option value="'.$objp->rowid.'"'; 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>'; print '>'.$objp->titre.' ('.price($objp->total_ttc).' '.$langs->trans("TTC").')</option>';
$i++; $i++;
} }
@ -1482,7 +1482,7 @@ if ($_GET['action'] == 'create')
foreach ($facids as $facparam) foreach ($facids as $facparam)
{ {
$options.='<option value="'.$facparam['id'].'"'; $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.='>'.$facparam['ref'];
$options.=' ('.$facturestatic->LibStatut(0,$facparam['status']).')'; $options.=' ('.$facturestatic->LibStatut(0,$facparam['status']).')';
$options.='</option>'; $options.='</option>';
@ -1500,7 +1500,7 @@ if ($_GET['action'] == 'create')
$newinvoice=new Facture($db); $newinvoice=new Facture($db);
$newinvoice->fetch($key); $newinvoice->fetch($key);
$optionsav.='<option value="'.$key.'"'; $optionsav.='<option value="'.$key.'"';
if ($key == $_POST['fac_avoir']) $optionsav.=' selected="true"'; if ($key == $_POST['fac_avoir']) $optionsav.=' selected="selected"';
$optionsav.='>'; $optionsav.='>';
$optionsav.=$newinvoice->ref; $optionsav.=$newinvoice->ref;
$optionsav.=' ('.$newinvoice->getLibStatut(1,$value).')'; $optionsav.=' ('.$newinvoice->getLibStatut(1,$value).')';

2
htdocs/compta/prelevement/ligne.php
View File

@ -176,7 +176,7 @@ if ($_GET["id"])
print '<td colspan="2" class="valid">'; print '<td colspan="2" class="valid">';
print '<select name="confirm">'; print '<select name="confirm">';
print '<option value="yes">'.$langs->trans("Yes").'</option>'; 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 '</select>';
print '</td></tr>'; print '</td></tr>';

86
htdocs/core/class/html.form.class.php
View File

@ -269,7 +269,7 @@ class Form
($selected == $obj->rowid || $selected == $obj->code || $selected == $obj->libelle) ) ($selected == $obj->rowid || $selected == $obj->code || $selected == $obj->libelle) )
{ {
$foundselected=true; $foundselected=true;
$out.= '<option value="'.$obj->rowid.'" selected="true">'; $out.= '<option value="'.$obj->rowid.'" selected="selected">';
} }
else else
{ {
@ -314,7 +314,7 @@ class Form
{ {
if ($selected == $type_available[$i]) 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 else
{ {
@ -378,7 +378,7 @@ class Form
{ {
$obj = $db->fetch_object($resql); $obj = $db->fetch_object($resql);
print '<option value="'.$obj->id.'"'; 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); print '>'.dol_trunc($obj->type,$maxlen);
$i++; $i++;
} }
@ -418,16 +418,16 @@ class Form
if ($showempty) if ($showempty)
{ {
print '<option value="-1"'; print '<option value="-1"';
if ($selected == -1) print ' selected="true"'; if ($selected == -1) print ' selected="selected"';
print '>&nbsp;</option>'; print '>&nbsp;</option>';
} }
print '<option value="0"'; print '<option value="0"';
if (0 == $selected) print ' selected="true"'; if (0 == $selected) print ' selected="selected"';
print '>'.$langs->trans("Product"); print '>'.$langs->trans("Product");
print '<option value="1"'; print '<option value="1"';
if (1 == $selected) print ' selected="true"'; if (1 == $selected) print ' selected="selected"';
print '>'.$langs->trans("Service"); print '>'.$langs->trans("Service");
print '</select>'; print '</select>';
@ -459,7 +459,7 @@ class Form
if ($showempty) if ($showempty)
{ {
print '<option value="-1"'; print '<option value="-1"';
if ($selected == -1) print ' selected="true"'; if ($selected == -1) print ' selected="selected"';
print '>&nbsp;</option>'; print '>&nbsp;</option>';
} }
@ -475,7 +475,7 @@ class Form
{ {
$obj = $db->fetch_object($resql); $obj = $db->fetch_object($resql);
print '<option value="'.$obj->code.'"'; print '<option value="'.$obj->code.'"';
if ($obj->code == $selected) print ' selected="true"'; if ($obj->code == $selected) print ' selected="selected"';
print '>'; print '>';
if ($obj->code != $langs->trans($obj->code)) print $langs->trans($obj->code); if ($obj->code != $langs->trans($obj->code)) print $langs->trans($obj->code);
else print $langs->trans($obj->type); else print $langs->trans($obj->type);
@ -562,7 +562,7 @@ class Form
} }
if ($selected > 0 && $selected == $obj->rowid) 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 else
{ {
@ -622,7 +622,7 @@ class Form
if ($desc=='(DEPOSIT)') $desc=$langs->trans("Deposit"); if ($desc=='(DEPOSIT)') $desc=$langs->trans("Deposit");
$selectstring=''; $selectstring='';
if ($selected > 0 && $selected == $obj->rowid) $selectstring=' selected="true"'; if ($selected > 0 && $selected == $obj->rowid) $selectstring=' selected="selected"';
$disabled=''; $disabled='';
if ($maxvalue && $obj->amount_ttc > $maxvalue) if ($maxvalue && $obj->amount_ttc > $maxvalue)
@ -695,7 +695,7 @@ class Form
{ {
print '<option value="'.$obj->rowid.'"'; print '<option value="'.$obj->rowid.'"';
if ($disabled) print ' disabled="true"'; if ($disabled) print ' disabled="true"';
print ' selected="true">'.$obj->name.' '.$obj->firstname.'</option>'; print ' selected="selected">'.$obj->name.' '.$obj->firstname.'</option>';
} }
else else
{ {
@ -773,7 +773,7 @@ class Form
if ($resql) if ($resql)
{ {
$out.= '<select class="flat" name="'.$htmlname.'"'.($disabled?' disabled="true"':'').'>'; $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); $num = $this->db->num_rows($resql);
$i = 0; $i = 0;
if ($num) if ($num)
@ -788,7 +788,7 @@ class Form
{ {
$out.= '<option value="'.$obj->rowid.'"'; $out.= '<option value="'.$obj->rowid.'"';
if ($disableline) $out.= ' disabled="true"'; if ($disableline) $out.= ' disabled="true"';
$out.= ' selected="true">'; $out.= ' selected="selected">';
} }
else else
{ {
@ -937,12 +937,12 @@ class Form
} }
else else
{ {
$outselect.='<option value="0" selected="true">-- '.$langs->trans("MatchingProducts").' --</option>'; $outselect.='<option value="0" selected="selected">-- '.$langs->trans("MatchingProducts").' --</option>';
} }
} }
else else
{ {
$outselect.='<option value="0" selected="true">&nbsp;</option>'; $outselect.='<option value="0" selected="selected">&nbsp;</option>';
} }
$i = 0; $i = 0;
@ -962,7 +962,7 @@ class Form
$outref=$objp->ref; $outref=$objp->ref;
$opt = '<option value="'.$objp->rowid.'"'; $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 ($conf->stock->enabled && $objp->fk_product_type == 0 && isset($objp->stock))
{ {
if ($objp->stock > 0) if ($objp->stock > 0)
@ -1173,12 +1173,12 @@ class Form
} }
else else
{ {
$outselect.='<option value="0" selected="true">-- '.$langs->trans("MatchingProducts").' --</option>'; $outselect.='<option value="0" selected="selected">-- '.$langs->trans("MatchingProducts").' --</option>';
} }
} }
else 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>'; else $outselect.='<option value="0">&nbsp;</option>';
} }
@ -1195,7 +1195,7 @@ class Form
$outref=$objp->ref; $outref=$objp->ref;
$opt = '<option value="'.$objp->idprodfournprice.'"'; $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"'; if ($objp->fprice == '') $opt.=' disabled="disabled"';
$opt.= '>'; $opt.= '>';
@ -1390,7 +1390,7 @@ class Form
if ($selected && $selected == $obj->rowid) 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 else
{ {
@ -1506,7 +1506,7 @@ class Form
{ {
if ($selected == $id) if ($selected == $id)
{ {
print '<option value="'.$id.'" selected="true">'; print '<option value="'.$id.'" selected="selected">';
} }
else else
{ {
@ -1556,8 +1556,8 @@ class Form
if ($format == 1) print '<option value="'.$arraytypes['code'].'"'; if ($format == 1) print '<option value="'.$arraytypes['code'].'"';
if ($format == 2) print '<option value="'.$arraytypes['code'].'"'; if ($format == 2) print '<option value="'.$arraytypes['code'].'"';
// Si selected est text, on compare avec code, sinon avec id // Si selected est text, on compare avec code, sinon avec id
if (preg_match('/[a-z]/i', $selected) && $selected == $arraytypes['code']) print ' selected="true"'; if (preg_match('/[a-z]/i', $selected) && $selected == $arraytypes['code']) print ' selected="selected"';
elseif ($selected == $id) print ' selected="true"'; elseif ($selected == $id) print ' selected="selected"';
print '>'; print '>';
if ($format == 0) $value=$arraytypes['label']; if ($format == 0) $value=$arraytypes['label'];
if ($format == 1) $value=$arraytypes['code']; if ($format == 1) $value=$arraytypes['code'];
@ -1599,7 +1599,7 @@ class Form
{ {
if ($selected == $id) if ($selected == $id)
{ {
$return.= '<option value="'.$id.'" selected="true">'.$value; $return.= '<option value="'.$id.'" selected="selected">'.$value;
} }
else else
{ {
@ -1637,7 +1637,7 @@ class Form
$obj = $this->db->fetch_object($resql); $obj = $this->db->fetch_object($resql);
if ($selected == $obj->id) if ($selected == $obj->id)
{ {
print '<option value="'.$obj->id.'" selected="true">'; print '<option value="'.$obj->id.'" selected="selected">';
} }
else else
{ {
@ -1697,7 +1697,7 @@ class Form
$obj = $this->db->fetch_object($result); $obj = $this->db->fetch_object($result);
if ($selected == $obj->rowid) if ($selected == $obj->rowid)
{ {
print '<option value="'.$obj->rowid.'" selected="true">'; print '<option value="'.$obj->rowid.'" selected="selected">';
} }
else else
{ {
@ -1748,7 +1748,7 @@ class Form
{ {
if ($cate_arbo[$key]['id'] == $selected) if ($cate_arbo[$key]['id'] == $selected)
{ {
$add = 'selected="true" '; $add = 'selected="selected" ';
} }
else else
{ {
@ -2299,7 +2299,7 @@ class Form
if ($selected && $selected == $obj->code_iso) if ($selected && $selected == $obj->code_iso)
{ {
$foundselected=true; $foundselected=true;
$out.= '<option value="'.$obj->code_iso.'" selected="true">'; $out.= '<option value="'.$obj->code_iso.'" selected="selected">';
} }
else else
{ {
@ -2485,7 +2485,7 @@ class Form
$return.= '"'; $return.= '"';
if ($txtva[$i] == $defaulttx && $nprtva[$i] == $defaultnpr) if ($txtva[$i] == $defaulttx && $nprtva[$i] == $defaultnpr)
{ {
$return.= ' selected="true"'; $return.= ' selected="selected"';
} }
$return.= '>'.vatrate($libtva[$i]); $return.= '>'.vatrate($libtva[$i]);
$return.= $nprtva[$i] ? ' *': ''; $return.= $nprtva[$i] ? ' *': '';
@ -2642,14 +2642,14 @@ class Form
if ($empty || $set_time == -1) 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++) for ($day = 1 ; $day <= 31; $day++)
{ {
if ($day == $sday) if ($day == $sday)
{ {
$retstring.="<option value=\"$day\" selected=\"true\">$day"; $retstring.="<option value=\"$day\" selected=\"selected\">$day";
} }
else else
{ {
@ -2663,13 +2663,13 @@ class Form
$retstring.='<select'.($disabled?' disabled="true"':'').' class="flat" name="'.$prefix.'month">'; $retstring.='<select'.($disabled?' disabled="true"':'').' class="flat" name="'.$prefix.'month">';
if ($empty || $set_time == -1) if ($empty || $set_time == -1)
{ {
$retstring.='<option value="0" selected="true">&nbsp;</option>'; $retstring.='<option value="0" selected="selected">&nbsp;</option>';
} }
// Month // Month
for ($month = 1 ; $month <= 12 ; $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.=dol_print_date(mktime(12,0,0,$month,1,2000),"%b");
$retstring.="</option>"; $retstring.="</option>";
} }
@ -2832,7 +2832,7 @@ class Form
for ($min = 0; $min <= 55; $min=$min+5) for ($min = 0; $min <= 55; $min=$min+5)
{ {
print '<option value="'.$min.'"'; print '<option value="'.$min.'"';
if ($minSelected == $min) print ' selected="true"'; if ($minSelected == $min) print ' selected="selected"';
print '>'.$min.'</option>'; print '>'.$min.'</option>';
} }
print "</select>"; print "</select>";
@ -2862,7 +2862,7 @@ class Form
if ($show_empty) 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)) if (is_array($array))
@ -2873,7 +2873,7 @@ class Form
// Si il faut pre-selectionner une valeur // Si il faut pre-selectionner une valeur
if ($id != '' && ($id == $key || $id == $value)) if ($id != '' && ($id == $key || $id == $value))
{ {
$out.=' selected="true"'; $out.=' selected="selected"';
} }
$out.='>'; $out.='>';
@ -2931,13 +2931,13 @@ class Form
$resultyesno = '<select class="flat" name="'.$htmlname.'">'."\n"; $resultyesno = '<select class="flat" name="'.$htmlname.'">'."\n";
if (("$value" == 'yes') || ($value == 1)) 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"; $resultyesno .= '<option value="'.$no.'">'.$langs->trans("No").'</option>'."\n";
} }
else else
{ {
$resultyesno .= '<option value="'.$yes.'">'.$langs->trans("Yes").'</option>'."\n"; $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"; $resultyesno .= '</select>'."\n";
return $resultyesno; return $resultyesno;
@ -2975,7 +2975,7 @@ class Form
$obj = $this->db->fetch_object($result); $obj = $this->db->fetch_object($result);
if ($selected == $obj->rowid) if ($selected == $obj->rowid)
{ {
print '<option value="'.$obj->rowid.'" selected="true">'; print '<option value="'.$obj->rowid.'" selected="selected">';
} }
else else
{ {
@ -3020,7 +3020,7 @@ class Form
{ {
if ($selected == $key) if ($selected == $key)
{ {
$select_week .= '<option value="'.$key.'" selected="true">'; $select_week .= '<option value="'.$key.'" selected="selected">';
} }
else else
{ {
@ -3052,7 +3052,7 @@ class Form
{ {
if ($selected == $key) if ($selected == $key)
{ {
$select_month .= '<option value="'.$key.'" selected="true">'; $select_month .= '<option value="'.$key.'" selected="selected">';
} }
else else
{ {
@ -3084,7 +3084,7 @@ class Form
if($useempty) if($useempty)
{ {
if($selected == '') if($selected == '')
$selected_html = 'selected="true"'; $selected_html = 'selected="selected"';
print '<option value="" ' . $selected_html . ' >&nbsp;</option>'; print '<option value="" ' . $selected_html . ' >&nbsp;</option>';
} }
for ($y = $max_year; $y >= $min_year; $y--) for ($y = $max_year; $y >= $min_year; $y--)
@ -3092,7 +3092,7 @@ class Form
$selected_html=''; $selected_html='';
if ($y == $selected) if ($y == $selected)
{ {
$selected_html = 'selected="true"'; $selected_html = 'selected="selected"';
} }
print "<option value=\"$y\" $selected_html >$y"; print "<option value=\"$y\" $selected_html >$y";
print "</option>"; print "</option>";

2
htdocs/core/class/html.formactions.class.php
View File

@ -72,7 +72,7 @@ class FormActions
print '<select '.($canedit?'':'disabled="true" ').'name="status" class="flat" onChange="select_status(document.'.$formname.'.status.value)">'; print '<select '.($canedit?'':'disabled="true" ').'name="status" class="flat" onChange="select_status(document.'.$formname.'.status.value)">';
foreach($listofstatus as $key => $val) 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>'; print '</select>';
if ($selected == 0 || $selected == 100) $canedit=0; if ($selected == 0 || $selected == 100) $canedit=0;

14
htdocs/core/class/html.formadmin.class.php
View File

@ -80,13 +80,13 @@ class FormAdmin
if ($showempty) if ($showempty)
{ {
$out.= '<option value=""'; $out.= '<option value=""';
if ($selected == '') $out.= ' selected="true"'; if ($selected == '') $out.= ' selected="selected"';
$out.= '>&nbsp;</option>'; $out.= '>&nbsp;</option>';
} }
if ($showauto) if ($showauto)
{ {
$out.= '<option value="auto"'; $out.= '<option value="auto"';
if ($selected == 'auto') $out.= ' selected="true"'; if ($selected == 'auto') $out.= ' selected="selected"';
$out.= '>'.$langs->trans("AutoDetectLang").'</option>'; $out.= '>'.$langs->trans("AutoDetectLang").'</option>';
} }
@ -108,7 +108,7 @@ class FormAdmin
} }
else if ($selected == $key) else if ($selected == $key)
{ {
$out.= '<option value="'.$key.'" selected="true">'.$value.'</option>'; $out.= '<option value="'.$key.'" selected="selected">'.$value.'</option>';
} }
else else
{ {
@ -146,7 +146,7 @@ class FormAdmin
if ($file == $selected) if ($file == $selected)
{ {
$menuarray[$prefix.'_'.$file]='<option value="'.$file.'" selected="true">'.$filelib.'</option>'; $menuarray[$prefix.'_'.$file]='<option value="'.$file.'" selected="selected">'.$filelib.'</option>';
} }
else else
{ {
@ -221,7 +221,7 @@ class FormAdmin
print '<option value="'.$key.'"'; print '<option value="'.$key.'"';
if ($key == $selected) if ($key == $selected)
{ {
print ' selected="true"'; print ' selected="selected"';
} }
//if ($key == 'rodolphe') print ' disabled="true"'; //if ($key == 'rodolphe') print ' disabled="true"';
print '>'; print '>';
@ -276,7 +276,7 @@ class FormAdmin
foreach ($arraytz as $lib => $gmt) foreach ($arraytz as $lib => $gmt)
{ {
print '<option value="'.$lib.'"'; 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 '>'.$gmt.'</option>'."\n";
} }
print '</select>'; print '</select>';
@ -302,7 +302,7 @@ class FormAdmin
foreach ($arrayofcolors as $val) foreach ($arrayofcolors as $val)
{ {
print '<option value="'.$val.'"'; print '<option value="'.$val.'"';
if ($selected == $val) print ' selected="true"'; if ($selected == $val) print ' selected="selected"';
print '>'.$val.'</option>'; print '>'.$val.'</option>';
} }
print '</select>'; print '</select>';

12
htdocs/core/class/html.formcompany.class.php
View File

@ -157,7 +157,7 @@ class FormCompany
$obj = $this->db->fetch_object($resql); $obj = $this->db->fetch_object($resql);
print '<option value="'.$obj->code.'"'; print '<option value="'.$obj->code.'"';
if ($selected == $obj->code) print ' selected="true"'; if ($selected == $obj->code) print ' selected="selected"';
print '>'; print '>';
$level=$langs->trans($obj->code); $level=$langs->trans($obj->code);
if ($level == $obj->code) $level=$langs->trans($obj->label); if ($level == $obj->code) $level=$langs->trans($obj->label);
@ -251,7 +251,7 @@ class FormCompany
if ($selected > 0 && $selected == $obj->rowid) if ($selected > 0 && $selected == $obj->rowid)
{ {
$out.= '<option value="'.$obj->rowid.'" selected="true">'; $out.= '<option value="'.$obj->rowid.'" selected="selected">';
} }
else else
{ {
@ -320,7 +320,7 @@ class FormCompany
if ($selected > 0 && $selected == $obj->code) 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 else
{ {
@ -378,7 +378,7 @@ class FormCompany
$obj = $this->db->fetch_object($resql); $obj = $this->db->fetch_object($resql);
if ($selected == $obj->code) if ($selected == $obj->code)
{ {
$out.= '<option value="'.$obj->code.'" selected="true">'; $out.= '<option value="'.$obj->code.'" selected="selected">';
} }
else else
{ {
@ -462,7 +462,7 @@ class FormCompany
if ($selected > 0 && $selected == $obj->code) if ($selected > 0 && $selected == $obj->code)
{ {
$out.= '<option value="'.$obj->code.'" selected="true">'; $out.= '<option value="'.$obj->code.'" selected="selected">';
} }
else else
{ {
@ -573,7 +573,7 @@ class FormCompany
{ {
print '<option value="'.$obj->rowid.'"'; print '<option value="'.$obj->rowid.'"';
if ($disabled) print ' disabled="true"'; 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; $firstCompany = $obj->rowid;
} }
else else

16
htdocs/core/class/html.formorder.class.php
View File

@ -58,16 +58,16 @@ class FormOrder
{ {
global $conf,$langs; global $conf,$langs;
print '<select class="flat" name="'.$htmlname.'" '.$htmloption.'>'; 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 // \TODO Aller chercher les sources dans dictionnaire
print '<option value="0"'.($selected=='0'?' selected="true"':'').'>'.$langs->trans('OrderSource0').'</option>'; print '<option value="0"'.($selected=='0'?' selected="selected"':'').'>'.$langs->trans('OrderSource0').'</option>';
print '<option value="1"'.($selected=='1'?' selected="true"':'').'>'.$langs->trans('OrderSource1').'</option>'; print '<option value="1"'.($selected=='1'?' selected="selected"':'').'>'.$langs->trans('OrderSource1').'</option>';
print '<option value="2"'.($selected=='2'?' selected="true"':'').'>'.$langs->trans('OrderSource2').'</option>'; print '<option value="2"'.($selected=='2'?' selected="selected"':'').'>'.$langs->trans('OrderSource2').'</option>';
print '<option value="3"'.($selected=='3'?' selected="true"':'').'>'.$langs->trans('OrderSource3').'</option>'; print '<option value="3"'.($selected=='3'?' selected="selected"':'').'>'.$langs->trans('OrderSource3').'</option>';
print '<option value="4"'.($selected=='4'?' selected="true"':'').'>'.$langs->trans('OrderSource4').'</option>'; print '<option value="4"'.($selected=='4'?' selected="selected"':'').'>'.$langs->trans('OrderSource4').'</option>';
print '<option value="5"'.($selected=='5'?' selected="true"':'').'>'.$langs->trans('OrderSource5').'</option>'; print '<option value="5"'.($selected=='5'?' selected="selected"':'').'>'.$langs->trans('OrderSource5').'</option>';
print '<option value="6"'.($selected=='6'?' selected="true"':'').'>'.$langs->trans('OrderSource6').'</option>'; print '<option value="6"'.($selected=='6'?' selected="selected"':'').'>'.$langs->trans('OrderSource6').'</option>';
print '</select>'; print '</select>';
} }

18
htdocs/core/class/html.formother.class.php
View File

@ -84,7 +84,7 @@ class FormOther
$obj = $this->db->fetch_object($result); $obj = $this->db->fetch_object($result);
if ($selected == $obj->rowid) if ($selected == $obj->rowid)
{ {
print '<option value="'.$obj->rowid.'" selected="true">'; print '<option value="'.$obj->rowid.'" selected="selected">';
} }
else else
{ {
@ -131,7 +131,7 @@ class FormOther
$obj = $this->db->fetch_object($result); $obj = $this->db->fetch_object($result);
if ($selected == $obj->rowid) if ($selected == $obj->rowid)
{ {
print '<option value="'.$obj->rowid.'" selected="true">'; print '<option value="'.$obj->rowid.'" selected="selected">';
} }
else else
{ {
@ -178,7 +178,7 @@ class FormOther
$obj = $this->db->fetch_object($resql); $obj = $this->db->fetch_object($resql);
if ($selected && $selected == $obj->rowid) if ($selected && $selected == $obj->rowid)
{ {
print '<option value="'.$obj->rowid.'" selected="true">'; print '<option value="'.$obj->rowid.'" selected="selected">';
} }
else else
{ {
@ -218,7 +218,7 @@ class FormOther
{ {
if ($selected == $i) if ($selected == $i)
{ {
$return.= '<option value="'.$i.'" selected="true">'; $return.= '<option value="'.$i.'" selected="selected">';
} }
else else
{ {
@ -258,7 +258,7 @@ class FormOther
foreach ($tab_categs as $categ) foreach ($tab_categs as $categ)
{ {
$moreforfilter.='<option value="'.$categ['id'].'"'; $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>'; $moreforfilter.='>'.dol_trunc($categ['fulllabel'],50,'middle').'</option>';
} }
} }
@ -307,7 +307,7 @@ class FormOther
{ {
$moreforfilter.='<option value="'.$obj_usr->rowid.'"'; $moreforfilter.='<option value="'.$obj_usr->rowid.'"';
if ($obj_usr->rowid == $selected) $moreforfilter.=' selected="true"'; if ($obj_usr->rowid == $selected) $moreforfilter.=' selected="selected"';
$moreforfilter.='>'; $moreforfilter.='>';
$moreforfilter.=$obj_usr->firstname." ".$obj_usr->name." (".$obj_usr->login.')'; $moreforfilter.=$obj_usr->firstname." ".$obj_usr->name." (".$obj_usr->login.')';
@ -416,7 +416,7 @@ class FormOther
foreach ($arrayofcolors as $val) foreach ($arrayofcolors as $val)
{ {
print '<option value="'.$val.'"'; print '<option value="'.$val.'"';
if ($set_color == $val) print ' selected="true"'; if ($set_color == $val) print ' selected="selected"';
print '>'.$val.'</option>'; print '>'.$val.'</option>';
} }
print '</select>'; 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>'; if ($i > 0 && $conf->browser->firefox) print '<option value="0" disabled="true">----------</option>';
print '<option value="'.$lines[$i]->fk_project.'_0"'; 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 '>'; // Project -> Task
print $langs->trans("Project").' '.$lines[$i]->projectref; print $langs->trans("Project").' '.$lines[$i]->projectref;
if (empty($lines[$i]->public)) if (empty($lines[$i]->public))
@ -524,7 +524,7 @@ function PLineSelect(&$inc, $parent, $lines, $level=0, $selectedtask=0, $selecte
if ($lines[$i]->id > 0) if ($lines[$i]->id > 0)
{ {
print '<option value="'.$lines[$i]->fk_project.'_'.$lines[$i]->id.'"'; 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 '>';
print $langs->trans("Project").' '.$lines[$i]->projectref; print $langs->trans("Project").' '.$lines[$i]->projectref;
if (empty($lines[$i]->public)) if (empty($lines[$i]->public))

2
htdocs/ecm/class/htmlecm.form.class.php
View File

@ -73,7 +73,7 @@ class FormEcm
{ {
if ($cate_arbo[$key]['id'] == $selected) if ($cate_arbo[$key]['id'] == $selected)
{ {
$add = 'selected="true" '; $add = 'selected="selected" ';
} }
else else
{ {

8
htdocs/includes/barcode/html.formbarcode.class.php
View File

@ -88,11 +88,11 @@ class FormBarCode
$select_encoder.= '<input type="hidden" name="action" value="update">'; $select_encoder.= '<input type="hidden" name="action" value="update">';
$select_encoder.= '<input type="hidden" name="code_id" value="'.$code_id.'">'; $select_encoder.= '<input type="hidden" name="code_id" value="'.$code_id.'">';
$select_encoder.= '<select id="select'.$idForm.'" class="flat" name="coder">'; $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>'; $select_encoder.= '<option value="-1" disabled="disabled">--------------------</option>';
foreach($barcodelist as $key => $value) 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>'; $select_encoder.= '</select></form>';
@ -129,7 +129,7 @@ class FormBarCode
else else
{ {
print '<select disabled="disabled" class="flat" name="'.$htmlname.'">'; 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) while ($i < $num)
@ -137,7 +137,7 @@ class FormBarCode
$obj = $this->db->fetch_object($result); $obj = $this->db->fetch_object($result);
if ($selected == $obj->rowid) if ($selected == $obj->rowid)
{ {
print '<option value="'.$obj->rowid.'" selected="true">'; print '<option value="'.$obj->rowid.'" selected="selected">';
} }
else else
{ {

2
htdocs/lib/project.lib.php
View File

@ -220,7 +220,7 @@ function select_projects($socid=-1, $selected='', $htmlname='projectid')
//else $labeltoshow.=' ('.$langs->trans("Private").')'; //else $labeltoshow.=' ('.$langs->trans("Private").')';
if (!empty($selected) && $selected == $obj->rowid && $obj->fk_statut > 0) 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 else
{ {

30
htdocs/main.inc.php
View File

@ -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 "\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 "</div><!-- End top layout -->\n";
else print '<table width="100%" class="notopnoleftnoright" summary="leftmenutable" id="undertopmenu"><tr>';
if (! $conf->use_javascript_ajax || ! $conf->global->MAIN_MENU_USE_JQUERY_LAYOUT)
{
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"; // 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 "\n".'<div class="ui-layout-west"> <!-- Begin left layout -->'."\n";
else print '<td class="vmenu" valign="top">';
if (! $conf->use_javascript_ajax || ! $conf->global->MAIN_MENU_USE_JQUERY_LAYOUT) print '<td class="vmenu" valign="top">';
print "\n"; print "\n";
@ -1316,9 +1311,8 @@ function left_menu($menu_array_before, $helppagename='', $moresearchform='', $me
print "\n"; print "\n";
if (! $conf->use_javascript_ajax || ! $conf->global->MAIN_MENU_USE_JQUERY_LAYOUT) print '</td>'; if ($conf->use_javascript_ajax && $conf->global->MAIN_MENU_USE_JQUERY_LAYOUT) print '</div> <!-- End left layout -->'."\n";
else print '</td>';
print '</div> <!-- End left layout -->'."\n";
print '<!-- End of left column, begin right area -->'."\n"; print '<!-- End of left column, begin right area -->'."\n";
// print '</div>'."\n"; // print '</div>'."\n";
@ -1332,11 +1326,12 @@ function main_area()
{ {
global $conf, $langs; 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)
{
if ($conf->use_javascript_ajax && $conf->global->MAIN_MENU_USE_JQUERY_LAYOUT) print '<table width="100%" class="notopnoleftnoright" summary="leftmenutable" id="undertopmenu"><tr>'; 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";
print '<td valign="top">'."\n"; }
else print '<td valign="top">'."\n";
print "\n"; print "\n";
@ -1496,7 +1491,8 @@ if (! function_exists("llxFooter"))
// print "\n".'</div> <!-- end div class="vmenuplusfiche" -->'."\n"; // print "\n".'</div> <!-- end div class="vmenuplusfiche" -->'."\n";
print "\n".'</td></tr></table> <!-- end right area -->'."\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'])) if (! empty($_SERVER['DOL_TUNING']))
{ {

4
htdocs/product/class/html.formproduct.class.php
View File

@ -123,7 +123,7 @@ class FormProduct
{ {
print '<option value="'.$id.'"'; print '<option value="'.$id.'"';
// Si selected est text, on compare avec code, sinon avec 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 '>';
print $arraytypes['label']; print $arraytypes['label'];
if ($fk_product) print ' ('.$langs->trans("Stock").': '.($arraytypes['stock']>0?$arraytypes['stock']:'?').')'; if ($fk_product) print ' ('.$langs->trans("Stock").': '.($arraytypes['stock']>0?$arraytypes['stock']:'?').')';
@ -177,7 +177,7 @@ class FormProduct
$return.= '<option value="'.$key.'"'; $return.= '<option value="'.$key.'"';
if ($key == $default) if ($key == $default)
{ {
$return.= ' selected="true"'; $return.= ' selected="selected"';
} }
//$return.= '>'.$value.'</option>'; //$return.= '>'.$value.'</option>';
$return.= '>'.measuring_units_string($key,$measuring_style).'</option>'; $return.= '>'.measuring_units_string($key,$measuring_style).'</option>';

8
htdocs/product/fiche.php
View File

@ -875,13 +875,13 @@ if ($_GET["id"] || $_GET["ref"])
print '<select class="flat" name="statut">'; print '<select class="flat" name="statut">';
if ($product->status) 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>'; print '<option value="0">'.$langs->trans("NotOnSell").'</option>';
} }
else else
{ {
print '<option value="1">'.$langs->trans("OnSell").'</option>'; 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 '</select>';
print '</td></tr>'; print '</td></tr>';
@ -891,13 +891,13 @@ if ($_GET["id"] || $_GET["ref"])
print '<select class="flat" name="statut_buy">'; print '<select class="flat" name="statut_buy">';
if ($product->status_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>'; print '<option value="0">'.$langs->trans("ProductStatusNotOnBuy").'</option>';
} }
else else
{ {
print '<option value="1">'.$langs->trans("ProductStatusOnBuy").'</option>'; 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 '</select>';
print '</td></tr>'; print '</td></tr>';

6
htdocs/product/stock/fiche.php
View File

@ -197,7 +197,7 @@ if ($_GET["action"] == 'create')
print '<tr><td>'.$langs->trans("Status").'</td><td colspan="3">'; print '<tr><td>'.$langs->trans("Status").'</td><td colspan="3">';
print '<select name="statut">'; print '<select name="statut">';
print '<option value="0">'.$langs->trans("WarehouseClosed").'</option>'; 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 '</select>';
print '</td></tr>'; print '</td></tr>';
@ -489,8 +489,8 @@ else
print '<tr><td width="20%">'.$langs->trans("Status").'</td><td colspan="3">'; print '<tr><td width="20%">'.$langs->trans("Status").'</td><td colspan="3">';
print '<select name="statut">'; print '<select name="statut">';
print '<option value="0" '.($entrepot->statut == 0?'selected="true"':'').'>'.$langs->trans("WarehouseClosed").'</option>'; print '<option value="0" '.($entrepot->statut == 0?'selected="selected"':'').'>'.$langs->trans("WarehouseClosed").'</option>';
print '<option value="1" '.($entrepot->statut == 0?'':'selected="true"').'>'.$langs->trans("WarehouseOpened").'</option>'; print '<option value="1" '.($entrepot->statut == 0?'':'selected="selected"').'>'.$langs->trans("WarehouseOpened").'</option>';
print '</select>'; print '</select>';
print '</td></tr>'; print '</td></tr>';

8
htdocs/societe/canvas/actions_card_common.class.php
View File

@ -99,10 +99,10 @@ class ActionsCardCommon
// TODO create a function // TODO create a function
$this->tpl['select_customertype'] = '<select class="flat" name="client">'; $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="2"'.($this->object->client==2?' selected="selected"':'').'>'.$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="3"'.($this->object->client==3?' selected="selected"':'').'>'.$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="1"'.($this->object->client==1?' selected="selected"':'').'>'.$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="0"'.($this->object->client==0?' selected="selected"':'').'>'.$langs->trans('NorProspectNorCustomer').'</option>';
$this->tpl['select_customertype'].= '</select>'; $this->tpl['select_customertype'].= '</select>';
// Customer // Customer

16
htdocs/societe/soc.php
View File

@ -708,10 +708,10 @@ else
// Prospect/Customer // Prospect/Customer
print '<tr><td width="25%"><span class="fieldrequired">'.$langs->trans('ProspectCustomer').'</span></td><td width="25%"><select class="flat" name="client">'; 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="2"'.($soc->client==2?' selected="selected"':'').'>'.$langs->trans('Prospect').'</option>';
print '<option value="3"'.($soc->client==3?' selected="true"':'').'>'.$langs->trans('ProspectCustomer').'</option>'; print '<option value="3"'.($soc->client==3?' selected="selected"':'').'>'.$langs->trans('ProspectCustomer').'</option>';
print '<option value="1"'.($soc->client==1?' selected="true"':'').'>'.$langs->trans('Customer').'</option>'; print '<option value="1"'.($soc->client==1?' selected="selected"':'').'>'.$langs->trans('Customer').'</option>';
print '<option value="0"'.($soc->client==0?' selected="true"':'').'>'.$langs->trans('NorProspectNorCustomer').'</option>'; print '<option value="0"'.($soc->client==0?' selected="selected"':'').'>'.$langs->trans('NorProspectNorCustomer').'</option>';
print '</select></td>'; print '</select></td>';
print '<td width="25%">'.$langs->trans('CustomerCode').'</td><td width="25%">'; print '<td width="25%">'.$langs->trans('CustomerCode').'</td><td width="25%">';
@ -1095,10 +1095,10 @@ else
// Prospect/Customer // Prospect/Customer
print '<tr><td width="25%"><span class="fieldrequired">'.$langs->trans('ProspectCustomer').'</span></td><td width="25%"><select class="flat" name="client">'; 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="2"'.($soc->client==2?' selected="selected"':'').'>'.$langs->trans('Prospect').'</option>';
print '<option value="3"'.($soc->client==3?' selected="true"':'').'>'.$langs->trans('ProspectCustomer').'</option>'; print '<option value="3"'.($soc->client==3?' selected="selected"':'').'>'.$langs->trans('ProspectCustomer').'</option>';
print '<option value="1"'.($soc->client==1?' selected="true"':'').'>'.$langs->trans('Customer').'</option>'; print '<option value="1"'.($soc->client==1?' selected="selected"':'').'>'.$langs->trans('Customer').'</option>';
print '<option value="0"'.($soc->client==0?' selected="true"':'').'>'.$langs->trans('NorProspectNorCustomer').'</option>'; print '<option value="0"'.($soc->client==0?' selected="selected"':'').'>'.$langs->trans('NorProspectNorCustomer').'</option>';
print '</select></td>'; print '</select></td>';
print '<td width="25%">'.$langs->trans('CustomerCode').'</td><td width="25%">'; print '<td width="25%">'.$langs->trans('CustomerCode').'</td><td width="25%">';

14
htdocs/webcalendar/admin/webcalendar.php
View File

@ -227,10 +227,10 @@ if ($conf->agenda->enabled)
print '<td>'.$langs->trans("WebCalAddEventOnCreateActions").'</td>'; print '<td>'.$langs->trans("WebCalAddEventOnCreateActions").'</td>';
print '<td>'; print '<td>';
print '<select name="phpwebcalendar_syncro" class="flat">'; 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="always"'.($conf->global->PHPWEBCALENDAR_SYNCRO=='always'?' selected="selected"':'').'>'.$langs->trans("WebCalAllways").'</option>';
print '<option value="yesbydefault"'.($conf->global->PHPWEBCALENDAR_SYNCRO=='yesbydefault'?' selected="true"':'').'>'.$langs->trans("WebCalYesByDefault").'</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="true"':'').'>'.$langs->trans("WebCalNoByDefault").'</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="true"':'').'>'.$langs->trans("WebCalNever").'</option>'; print '<option value="never"'.($conf->global->PHPWEBCALENDAR_SYNCRO=='never'?' selected="selected"':'').'>'.$langs->trans("WebCalNever").'</option>';
print '</select>'; print '</select>';
print '</td></tr>'; print '</td></tr>';
} }
@ -266,7 +266,7 @@ if ($conf->contrat->enabled)
print '<td>'; print '<td>';
print '<select name="phpwebcalendar_contractstatus" class="flat">'; 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="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 '</select>';
print '</td></tr>'; print '</td></tr>';
} }
@ -278,7 +278,7 @@ if ($conf->facture->enabled)
print '<td>'; print '<td>';
print '<select name="phpwebcalendar_billstatus" class="flat">'; 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="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 '</select>';
print '</td></tr>'; print '</td></tr>';
} }
@ -290,7 +290,7 @@ if ($conf->adherent->enabled)
print '<td>'; print '<td>';
print '<select name="phpwebcalendar_memberstatus" class="flat">'; 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="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 '</select>';
print '</td></tr>'; print '</td></tr>';
} }