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

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

@ -104,65 +104,72 @@ class Form
*/ */
function select_departement($selected='',$pays_code=0) function select_departement($selected='',$pays_code=0)
{ {
global $conf,$langs; dolibarr_syslog("html.form.class::select_departement selected=$selected, pays_code=$pays_code");
$langs->load("dict");
global $conf,$langs;
$htmlname='departement_id'; $langs->load("dict");
// On recherche les départements/cantons/province active d'une region et pays actif $htmlname='departement_id';
$sql = "SELECT d.rowid, d.code_departement as code , d.nom, d.active, p.libelle as libelle_pays, p.code as code_pays FROM";
$sql .= " ".MAIN_DB_PREFIX ."c_departements as d, ".MAIN_DB_PREFIX."c_regions as r,".MAIN_DB_PREFIX."c_pays as p"; // On recherche les départements/cantons/province active d'une region et pays actif
$sql .= " WHERE d.fk_region=r.code_region and r.fk_pays=p.rowid"; $sql = "SELECT d.rowid, d.code_departement as code , d.nom, d.active, p.libelle as libelle_pays, p.code as code_pays FROM";
$sql .= " AND d.active = 1 AND r.active = 1 AND p.active = 1"; $sql .= " ".MAIN_DB_PREFIX ."c_departements as d, ".MAIN_DB_PREFIX."c_regions as r,".MAIN_DB_PREFIX."c_pays as p";
if ($pays_code) $sql .= " AND p.code = '".$pays_code."'"; $sql .= " WHERE d.fk_region=r.code_region and r.fk_pays=p.rowid";
$sql .= " ORDER BY p.code, d.code_departement"; $sql .= " AND d.active = 1 AND r.active = 1 AND p.active = 1";
if ($pays_code) $sql .= " AND p.code = '".$pays_code."'";
$result=$this->db->query($sql); $sql .= " ORDER BY p.code, d.code_departement";
if ($result) dolibarr_syslog("html.form.class::select_departement sql=$sql");
{
print '<select class="flat" name="'.$htmlname.'">'; $result=$this->db->query($sql);
if ($pays_code) print '<option value="0">&nbsp;</option>'; if ($result)
$num = $this->db->num_rows($result); {
$i = 0; print '<select class="flat" name="'.$htmlname.'">';
if ($num) if ($pays_code) print '<option value="0">&nbsp;</option>';
{ $num = $this->db->num_rows($result);
$pays=''; $i = 0;
while ($i < $num) dolibarr_syslog("html.form.class::select_departement num=$num");
{ if ($num)
$obj = $this->db->fetch_object($result); {
if ($obj->code == 0) { $pays='';
print '<option value="0">&nbsp;</option>'; while ($i < $num)
} {
else { $obj = $this->db->fetch_object($result);
if (! $pays || $pays != $obj->libelle_pays) { if ($obj->code == '0') // Le code peut etre une chaine
// Affiche la rupture si on est en mode liste multipays {
if (! $pays_code && $obj->code_pays) { print '<option value="0">&nbsp;</option>';
print '<option value="-1">----- '.$obj->libelle_pays." -----</option>\n"; }
$pays=$obj->libelle_pays; else {
} if (! $pays || $pays != $obj->libelle_pays)
} {
// Affiche la rupture si on est en mode liste multipays
if ($selected > 0 && $selected == $obj->rowid) if (! $pays_code && $obj->code_pays)
{ {
print '<option value="'.$obj->rowid.'" selected="true">'; print '<option value="-1">----- '.$obj->libelle_pays." -----</option>\n";
} $pays=$obj->libelle_pays;
else }
{ }
print '<option value="'.$obj->rowid.'">';
} if ($selected > 0 && $selected == $obj->rowid)
// Si traduction existe, on l'utilise, sinon on prend le libellé par défaut {
print $obj->code . ' - ' . ($langs->trans($obj->code)!=$obj->code?$langs->trans($obj->code):($obj->nom!='-'?$obj->nom:'')); print '<option value="'.$obj->rowid.'" selected="true">';
print '</option>'; }
} else
$i++; {
} print '<option value="'.$obj->rowid.'">';
} }
print '</select>'; // Si traduction existe, on l'utilise, sinon on prend le libellé par défaut
} print $obj->code . ' - ' . ($langs->trans($obj->code)!=$obj->code?$langs->trans($obj->code):($obj->nom!='-'?$obj->nom:''));
else { print '</option>';
dolibarr_print_error($this->db); }
} $i++;
} }
}
print '</select>';
}
else {
dolibarr_print_error($this->db);
}
}
/** /**