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

Merge pull request #1564 from marcosgdf/minor

Browse Source 
Fixed problem with non existing variable $db and removed not used variab...
This commit is contained in:
Laurent Destailleur 2014-05-04 17:46:18 +02:00
commit 4e590e0c5e
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/societe/class/societe.class.php
View File

@ -156,8 +156,6 @@ class Societe extends CommonObject
*/ */
public function __construct($db) public function __construct($db)
{ {
global $conf;
$this->db = $db; $this->db = $db;
$this->client = 0; $this->client = 0;
@ -2553,8 +2551,8 @@ class Societe extends CommonObject
{ {
dol_syslog("Your country setup use an old syntax. Reedit it using setup area.", LOG_WARNING); dol_syslog("Your country setup use an old syntax. Reedit it using setup area.", LOG_WARNING);
include_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; include_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
$country_code=getCountry($country_id,2,$db); // This need a SQL request, but it's the old feature $country_code=getCountry($country_id,2,$this->db); // This need a SQL request, but it's the old feature
$country_label=getCountry($country_id,0,$db); // This need a SQL request, but it's the old feature $country_label=getCountry($country_id,0,$this->db); // This need a SQL request, but it's the old feature
} }
} }
$this->country_id=$country_id; $this->country_id=$country_id;