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

Fix: Possibilit d'avoir des codes dpartements alpha

Browse Source
This commit is contained in:
Laurent Destailleur 2006-04-20 23:33:40 +00:00
parent ba102a9699
commit 8b8ab2dc04
1 changed files with 66 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -104,6 +104,8 @@ class Form
*/ */
function select_departement($selected='',$pays_code=0) function select_departement($selected='',$pays_code=0)
{ {
dolibarr_syslog("html.form.class::select_departement selected=$selected, pays_code=$pays_code");
global $conf,$langs; global $conf,$langs;
$langs->load("dict"); $langs->load("dict");
@ -116,6 +118,7 @@ class Form
$sql .= " AND d.active = 1 AND r.active = 1 AND p.active = 1"; $sql .= " AND d.active = 1 AND r.active = 1 AND p.active = 1";
if ($pays_code) $sql .= " AND p.code = '".$pays_code."'"; if ($pays_code) $sql .= " AND p.code = '".$pays_code."'";
$sql .= " ORDER BY p.code, d.code_departement"; $sql .= " ORDER BY p.code, d.code_departement";
dolibarr_syslog("html.form.class::select_departement sql=$sql");
$result=$this->db->query($sql); $result=$this->db->query($sql);
if ($result) if ($result)
@ -124,19 +127,23 @@ class Form
if ($pays_code) print '<option value="0">&nbsp;</option>'; if ($pays_code) print '<option value="0">&nbsp;</option>';
$num = $this->db->num_rows($result); $num = $this->db->num_rows($result);
$i = 0; $i = 0;
dolibarr_syslog("html.form.class::select_departement num=$num");
if ($num) if ($num)
{ {
$pays=''; $pays='';
while ($i < $num) while ($i < $num)
{ {
$obj = $this->db->fetch_object($result); $obj = $this->db->fetch_object($result);
if ($obj->code == 0) { if ($obj->code == '0') // Le code peut etre une chaine
{
print '<option value="0">&nbsp;</option>'; print '<option value="0">&nbsp;</option>';
} }
else { else {
if (! $pays || $pays != $obj->libelle_pays) { if (! $pays || $pays != $obj->libelle_pays)
{
// Affiche la rupture si on est en mode liste multipays // Affiche la rupture si on est en mode liste multipays
if (! $pays_code && $obj->code_pays) { if (! $pays_code && $obj->code_pays)
{
print '<option value="-1">----- '.$obj->libelle_pays." -----</option>\n"; print '<option value="-1">----- '.$obj->libelle_pays." -----</option>\n";
$pays=$obj->libelle_pays; $pays=$obj->libelle_pays;
} }