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

Fix: Country label

Browse Source
This commit is contained in:
Laurent Destailleur 2010-06-23 01:03:42 +00:00
parent 6b3f9c47cc
commit bcf2852e5a
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
htdocs/admin/company.php
View File

@ -270,7 +270,8 @@ if ((isset($_GET["action"]) && $_GET["action"] == 'edit')
$var=!$var; $var=!$var;
print '<tr '.$bc[$var].'><td>'.$langs->trans("State").'</td><td>'; print '<tr '.$bc[$var].'><td>'.$langs->trans("State").'</td><td>';
$pays_code=getCountry($conf->global->MAIN_INFO_SOCIETE_PAYS,2); $pays_code='';
if ($conf->global->MAIN_INFO_SOCIETE_PAYS) $pays_code=getCountry($conf->global->MAIN_INFO_SOCIETE_PAYS,2);
$formcompany->select_departement($conf->global->MAIN_INFO_SOCIETE_DEPARTEMENT,$pays_code,'departement_id'); $formcompany->select_departement($conf->global->MAIN_INFO_SOCIETE_DEPARTEMENT,$pays_code,'departement_id');
print '</td></tr>'."\n"; print '</td></tr>'."\n";
@ -601,7 +602,7 @@ else
$var=!$var; $var=!$var;
print '<tr '.$bc[$var].'><td>'.$langs->trans("CompanyCountry").'</td><td>'; print '<tr '.$bc[$var].'><td>'.$langs->trans("CompanyCountry").'</td><td>';
print getCountry($conf->global->MAIN_INFO_SOCIETE_PAYS,1); if ($conf->global->MAIN_INFO_SOCIETE_PAYS) print getCountry($conf->global->MAIN_INFO_SOCIETE_PAYS,1);
print '</td></tr>'; print '</td></tr>';
$var=!$var; $var=!$var;

7
htdocs/lib/company.lib.php
View File

@ -199,9 +199,10 @@ function getCountry($id,$withcode=0)
$obj = $db->fetch_object($resql); $obj = $db->fetch_object($resql);
if ($obj) if ($obj)
{ {
$label=($obj->code && $langs->trans("Country".$obj->code)!="Country".$obj->code)?$langs->trans("Country".$obj->code):($obj->libelle!='-'?$obj->libelle:''); $langs->load("dict");
if ($withcode == 1) return $label=$obj->code?"$obj->code":"$obj->code - $label"; $label=($obj->code && ($langs->trans("Country".$obj->code)!="Country".$obj->code))?$langs->trans("Country".$obj->code):($obj->libelle!='-'?$obj->libelle:'');
else if ($withcode == 2) return $label=$obj->code; if ($withcode == 1) return $label?"$obj->code - $label":"$obj->code";
else if ($withcode == 2) return $obj->code;
else return $label; else return $label;
} }
else else