Paramètre sur select_tva pour proposer valeur "defaut" dans liste.

This commit is contained in:
Laurent Destailleur 2005-07-03 13:11:23 +00:00
parent 3d30860b5f
commit e2381d70ad

View File

@ -446,14 +446,14 @@ class Form
$sql.= " WHERE p.envente = 1"; $sql.= " WHERE p.envente = 1";
if ($filtretype && $filtretype != '') $sql.=" AND p.fk_product_type=".$filtretype; if ($filtretype && $filtretype != '') $sql.=" AND p.fk_product_type=".$filtretype;
$sql.= " ORDER BY p.nbvente DESC"; $sql.= " ORDER BY p.nbvente DESC";
$sql.= " LIMIT $limit"; if ($limit) $sql.= " LIMIT $limit";
$result=$this->db->query($sql); $result=$this->db->query($sql);
if ($result) if ($result)
{ {
print '<select class="flat" name="'.$htmlname.'">'; print '<select class="flat" name="'.$htmlname.'">';
print "<option value=\"0\" selected>&nbsp;</option>"; print "<option value=\"0\" selected>&nbsp;</option>";
$num = $this->db->num_rows($result); $num = $this->db->num_rows($result);
$i = 0; $i = 0;
while ($i < $num) while ($i < $num)
@ -735,53 +735,52 @@ class Form
} }
/** /**
* \brief Selection du taux de tva * \brief Selection du taux de tva
* * \param name Nom champ html
*/ * \param defaulttx Taux tva présélectionné
* \param empy Proposer ligne "Defaut"
function select_tva($name='', $defaulttx = '') */
{ function select_tva($name='tauxtva', $defaulttx='', $default=0)
if (! strlen(trim($name))) {
{ global $langs;
$name = "tauxtva";
} $file = DOL_DOCUMENT_ROOT . "/conf/tva.local.php";
if (is_readable($file))
$file = DOL_DOCUMENT_ROOT . "/conf/tva.local.php"; {
if (is_readable($file)) include $file;
{ }
include $file; else
} {
else $txtva[0] = '19.6';
{ $txtva[1] = '5.5';
$txtva[0] = '19.6'; $txtva[2] = '0';
$txtva[1] = '5.5'; }
$txtva[2] = '0';
} if ($defaulttx == '')
{
if ($defaulttx == '') $defaulttx = $txtva[0];
{ }
$defaulttx = $txtva[0];
} $taille = sizeof($txtva);
$taille = sizeof($txtva); print '<select class="flat" name="'.$name.'">';
if ($default) print '<option value="0">'.$langs->trans("Default").'</option>';
print '<select class="flat" name="'.$name.'">';
for ($i = 0 ; $i < $taille ; $i++)
for ($i = 0 ; $i < $taille ; $i++) {
{ print '<option value="'.$txtva[$i].'"';
print '<option value="'.$txtva[$i].'"'; if ($txtva[$i] == $defaulttx)
if ($txtva[$i] == $defaulttx) {
{ print ' selected>'.$txtva[$i].' %</option>';
print ' selected>'.$txtva[$i].' %</option>'; }
} else
else {
{ print '>'.$txtva[$i].' %</option>';
print '>'.$txtva[$i].' %</option>'; }
} }
} print '</select>';
print '</select>'; }
}
/** /**