Fix: suppression de la fonction select_YesNo qui faisait doublon avec selectyesno
This commit is contained in:
parent
92daa245c2
commit
e644ba7454
@ -643,7 +643,7 @@ if ($action == 'edit')
|
||||
|
||||
// Profil public
|
||||
print "<tr><td>".$langs->trans("Public")."</td><td>\n";
|
||||
print $htmls->select_YesNo($adh->public,"public");
|
||||
print $htmls->selectyesno("public",$adh->public,1);
|
||||
print "</td></tr>\n";
|
||||
|
||||
// Attributs supplémentaires
|
||||
@ -768,7 +768,7 @@ if ($action == 'create')
|
||||
|
||||
// Profil public
|
||||
print "<tr><td>".$langs->trans("Public")."</td><td>\n";
|
||||
print $htmls->select_YesNo($adh->public,"public");
|
||||
print $htmls->selectyesno("public",$adh->public,1);
|
||||
print "</td></tr>\n";
|
||||
|
||||
|
||||
|
||||
@ -1193,36 +1193,6 @@ class Form
|
||||
print '</select>';
|
||||
}
|
||||
|
||||
/**
|
||||
* \brief Selection oui ou non
|
||||
* \param selected Id présélectionné
|
||||
* \param htmlname Nom de la zone select
|
||||
*/
|
||||
function select_YesNo($selected='',$htmlname='yesno')
|
||||
{
|
||||
global $langs;
|
||||
$resultyesno = '<select class="flat" name="'.$htmlname.'">';
|
||||
$options = array(
|
||||
'-1'=>' ',
|
||||
'0'=>$langs->trans("No"),
|
||||
'1'=>$langs->trans("Yes")
|
||||
);
|
||||
foreach($options as $id => $value)
|
||||
{
|
||||
if ($selected == $id)
|
||||
{
|
||||
$resultyesno .= '<option value="'.$id.'" selected="true">'.$value;
|
||||
}
|
||||
else
|
||||
{
|
||||
$resultyesno .= '<option value="'.$id.'">'.$value;
|
||||
}
|
||||
$resultyesno .= '</option>';
|
||||
}
|
||||
$resultyesno .= '</select>';
|
||||
return $resultyesno;
|
||||
}
|
||||
|
||||
/**
|
||||
* \brief Selection HT ou TTC
|
||||
* \param selected Id présélectionné
|
||||
|
||||
@ -203,7 +203,7 @@ class FormMail
|
||||
}
|
||||
else
|
||||
{
|
||||
print $form->select_YesNo(0,'deliveryreceipt');
|
||||
print $form->selectyesno('deliveryreceipt',0,1);
|
||||
}
|
||||
|
||||
print "</td></tr>\n";
|
||||
|
||||
@ -527,7 +527,7 @@ if ($_POST["getcustomercode"] || $_POST["getsuppliercode"] ||
|
||||
$html = new Form($db);
|
||||
print '<tr><td>'.$langs->trans('VATIsUsed').'</td>';
|
||||
print '<td>';
|
||||
print $html->select_YesNo("1",'assujtva_value'); // Assujeti par défaut en creation
|
||||
print $html->selectyesno('assujtva_value',1,1); // Assujeti par défaut en creation
|
||||
print '</td>';
|
||||
|
||||
// Code TVA intra
|
||||
@ -818,7 +818,7 @@ elseif ($_GET["action"] == 'edit' || $_POST["action"] == 'edit')
|
||||
|
||||
// Assujeti TVA
|
||||
print '<tr><td>'.$langs->trans('VATIsUsed').'</td><td>';
|
||||
print $form->select_YesNo($soc->tva_assuj,'assujtva_value');
|
||||
print $form->selectyesno('assujtva_value',$soc->tva_assuj,1);
|
||||
print '</td>';
|
||||
|
||||
// Code TVA intra
|
||||
|
||||
Loading…
Reference in New Issue
Block a user