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

Fix: Fix another regression due to multicompany changements

Browse Source
This commit is contained in:
Laurent Destailleur 2009-04-20 15:39:36 +00:00
parent 16e2890da8
commit d00ebb8de0
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
htdocs/core/conf.class.php
View File

@ -50,6 +50,8 @@ class Conf
var $top_menu; var $top_menu;
var $left_menu; var $left_menu;
var $entity=1; // By default
var $css_modules=array(); var $css_modules=array();
var $tabs_modules=array(); var $tabs_modules=array();
@ -66,8 +68,7 @@ class Conf
{ {
dol_syslog("Conf::setValues"); dol_syslog("Conf::setValues");
// Par defaut, a oui $this->global->PRODUIT_CONFIRM_DELETE_LINE=1; // Par defaut, a oui
$this->global->PRODUIT_CONFIRM_DELETE_LINE=1;
$this->entity = $entity; $this->entity = $entity;

12
htdocs/includes/modules/DolibarrModules.class.php
View File

@ -394,9 +394,9 @@ class DolibarrModules
$err = 0; $err = 0;
$sql = "DELETE FROM ".MAIN_DB_PREFIX."const "; $sql = "DELETE FROM ".MAIN_DB_PREFIX."const";
$sql.= "WHERE name = '".$this->const_name."' "; $sql.= " WHERE name = '".$this->const_name."'";
$sql.= "AND entity = ".$conf->entity; $sql.= " AND entity = ".$conf->entity;
dol_syslog("DolibarrModules::_active sql=".$sql, LOG_DEBUG); dol_syslog("DolibarrModules::_active sql=".$sql, LOG_DEBUG);
$this->db->query($sql); $this->db->query($sql);
@ -422,9 +422,9 @@ class DolibarrModules
$err = 0; $err = 0;
$sql = "DELETE FROM ".MAIN_DB_PREFIX."const "; $sql = "DELETE FROM ".MAIN_DB_PREFIX."const";
$sql.= "WHERE name = '".$this->const_name."'"; $sql.= " WHERE name = '".$this->const_name."'";
$sql.= "AND entity = ".$conf->entity; $sql.= " AND entity = ".$conf->entity;
dol_syslog("DolibarrModules::_unactive sql=".$sql); dol_syslog("DolibarrModules::_unactive sql=".$sql);
$this->db->query($sql); $this->db->query($sql);