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

Fix: Do not use global variable to fix pb with autoload

Browse Source
This commit is contained in:
Laurent Destailleur 2010-09-04 18:04:47 +00:00
parent 83d473f0d7
commit e78a9b8a01
4 changed files with 26 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/compta/bank/bankid_fr.php
View File

@ -215,7 +215,7 @@ if (($_GET["id"] || $_GET["ref"]) && $_GET["action"] != 'edit')
print '<tr><td valign="top">'.$langs->trans("BankAccountCountry").'</td><td colspan="3">'; print '<tr><td valign="top">'.$langs->trans("BankAccountCountry").'</td><td colspan="3">';
$img=picto_from_langcode($account->pays_code); $img=picto_from_langcode($account->pays_code);
print $img?$img.' ':''; print $img?$img.' ':'';
print getCountry($account->getCountryCode()); print getCountry($account->getCountryCode(),0,$db);
print "</td></tr>\n"; print "</td></tr>\n";
print '<tr><td valign="top">'.$langs->trans("BankAccountOwner").'</td><td colspan="3">'; print '<tr><td valign="top">'.$langs->trans("BankAccountOwner").'</td><td colspan="3">';

2
htdocs/compta/bank/fiche.php
View File

@ -371,7 +371,7 @@ else
{ {
$img=picto_from_langcode($account->pays_code); $img=picto_from_langcode($account->pays_code);
print $img?$img.' ':''; print $img?$img.' ':'';
print getCountry($account->getCountryCode()); print getCountry($account->getCountryCode(),0,$db);
} }
print '</td></tr>'; print '</td></tr>';

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

@ -179,24 +179,27 @@ function societe_prepare_head2($objsoc)
/** /**
* \brief Return country translated from an id or a code * Return country translated from an id or a code
* \param id id or code of country * @param id id or code of country
* \param withcode 0=Return label, 1=Return code + label, 2=Return code from id * @param withcode 0=Return label, 1=Return code + label, 2=Return code from id
* \return string String with country code or translated country name * @param dbtouse Database handler (using in global way may fail because of conflicts with some autoload features)
* @return string String with country code or translated country name
*/ */
function getCountry($id,$withcode=0) function getCountry($id,$withcode=0,$dbtouse=0)
{ {
global $db,$langs; global $db,$langs;
if (! is_object($dbtouse)) $dbtouse=$db;
$sql = "SELECT rowid, code, libelle FROM ".MAIN_DB_PREFIX."c_pays"; $sql = "SELECT rowid, code, libelle FROM ".MAIN_DB_PREFIX."c_pays";
if (is_numeric($id)) $sql.= " WHERE rowid=".$id; if (is_numeric($id)) $sql.= " WHERE rowid=".$id;
else $sql.= " WHERE code='".$id."'"; else $sql.= " WHERE code='".$id."'";
dol_syslog("Company.lib::getCountry sql=".$sql); dol_syslog("Company.lib::getCountry sql=".$sql);
$resql=$db->query($sql); $resql=$dbtouse->query($sql);
if ($resql) if ($resql)
{ {
$obj = $db->fetch_object($resql); $obj = $dbtouse->fetch_object($resql);
if ($obj) if ($obj)
{ {
$label=((! empty($obj->libelle) && $obj->libelle!='-')?$obj->libelle:''); $label=((! empty($obj->libelle) && $obj->libelle!='-')?$obj->libelle:'');
@ -214,27 +217,30 @@ function getCountry($id,$withcode=0)
return "NotDefined"; return "NotDefined";
} }
} }
else dol_print_error($db,''); else dol_print_error($dbtouse,'');
} }
/** /**
* \brief Return state translated from an id * Return state translated from an id
* \param id id of state (province/departement) * @param id id of state (province/departement)
* \param withcode 0=Return label, 1=Return code + label, 2=Return code * @param withcode 0=Return label, 1=Return code + label, 2=Return code
* \return string String with state code or translated state name * @param dbtouse Database handler (using in global way may fail because of conflicts with some autoload features)
* @return string String with state code or translated state name
*/ */
function getState($id,$withcode=0) function getState($id,$withcode=0,$dbtouse=0)
{ {
global $db,$langs; global $db,$langs;
if (! is_object($dbtouse)) $dbtouse=$db;
$sql = "SELECT rowid, code_departement as code, nom as label FROM ".MAIN_DB_PREFIX."c_departements"; $sql = "SELECT rowid, code_departement as code, nom as label FROM ".MAIN_DB_PREFIX."c_departements";
$sql.= " WHERE rowid=".$id; $sql.= " WHERE rowid=".$id;
dol_syslog("Company.lib::getState sql=".$sql); dol_syslog("Company.lib::getState sql=".$sql);
$resql=$db->query($sql); $resql=$dbtouse->query($sql);
if ($resql) if ($resql)
{ {
$obj = $db->fetch_object($resql); $obj = $dbtouse->fetch_object($resql);
if ($obj) if ($obj)
{ {
$label=$obj->label; $label=$obj->label;
@ -247,7 +253,7 @@ function getState($id,$withcode=0)
return $langs->trans("NotDefined"); return $langs->trans("NotDefined");
} }
} }
else dol_print_error($db,''); else dol_print_error($dbtouse,'');
} }
/** /**

4
htdocs/master.inc.php
View File

@ -363,8 +363,8 @@ if (! defined('NOREQUIREDB') && ! defined('NOREQUIRESOC'))
else // For backward compatibility else // For backward compatibility
{ {
include_once(DOL_DOCUMENT_ROOT.'/lib/company.lib.php'); include_once(DOL_DOCUMENT_ROOT.'/lib/company.lib.php');
$pays_code=getCountry($pays_id,2); // This need a SQL request, but it's the old feature $pays_code=getCountry($pays_id,2,$db); // This need a SQL request, but it's the old feature
$pays_label=getCountry($pays_id,0); // This need a SQL request, but it's the old feature $pays_label=getCountry($pays_id,0,$db); // This need a SQL request, but it's the old feature
} }
$mysoc->pays_id=$pays_id; $mysoc->pays_id=$pays_id;
$mysoc->pays_code=$pays_code; $mysoc->pays_code=$pays_code;