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

Fix: Bug sur recup liste droulante des codes tva dispo

Browse Source
This commit is contained in:
Laurent Destailleur 2006-06-16 00:31:33 +00:00
parent f2eee434b2
commit 6d09c5a35e
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
htdocs/html.form.class.php
View File

@ -549,7 +549,7 @@ class Form
* \param htmlname Nom champ formulaire ('none' pour champ non editable) * \param htmlname Nom champ formulaire ('none' pour champ non editable)
* \return int <0 si ko, >=0 si ok * \return int <0 si ko, >=0 si ok
*/ */
function select_contacts($socid,$selected='',$htmlname='contactid') function select_contacts($socid,$selected='',$htmlname='contactid',$showempty=0)
{ {
// On recherche les societes // On recherche les societes
$sql = "SELECT s.idp, s.name, s.firstname FROM"; $sql = "SELECT s.idp, s.name, s.firstname FROM";
@ -564,6 +564,7 @@ class Form
if ($num==0) return 0; if ($num==0) return 0;
if ($htmlname != 'none') print '<select class="flat" name="'.$htmlname.'">'; if ($htmlname != 'none') print '<select class="flat" name="'.$htmlname.'">';
if ($showempty) print '<option value="1">&nbsp;</option>';
$num = $this->db->num_rows(); $num = $this->db->num_rows();
$i = 0; $i = 0;
if ($num) if ($num)
@ -1867,13 +1868,13 @@ class Form
} }
else else
{ {
$code_pays=$mysoc->pays_code; $code_pays=$mysoc->pays_code; // Pour compatibilite ascendente
} }
// Recherche liste des codes TVA du pays vendeur // Recherche liste des codes TVA du pays vendeur
$sql = "SELECT t.taux,t.recuperableonly"; $sql = "SELECT t.taux,t.recuperableonly";
$sql .= " FROM ".MAIN_DB_PREFIX."c_tva AS t"; $sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_pays as p";
$sql .= " WHERE t.fk_pays = '".$code_pays."'"; $sql .= " WHERE t.fk_pays = p.rowid AND p.code = '".$code_pays."'";
$sql .= " AND t.active = 1"; $sql .= " AND t.active = 1";
$sql .= " ORDER BY t.taux ASC, t.recuperableonly ASC"; $sql .= " ORDER BY t.taux ASC, t.recuperableonly ASC";