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

Fix: en multicompany, un user pourra tre commun toutes les entits, on laisse donc le rep "users" la racine

Browse Source
This commit is contained in:
Regis Houssin 2009-05-06 14:02:39 +00:00
parent 2f2a2d9746
commit 88f5802487
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -165,6 +165,7 @@ class Conf
if (empty($this->global->MAIN_LANG_DEFAULT)) $this->global->MAIN_LANG_DEFAULT="en_US"; if (empty($this->global->MAIN_LANG_DEFAULT)) $this->global->MAIN_LANG_DEFAULT="en_US";
$rootfordata = DOL_DATA_ROOT; $rootfordata = DOL_DATA_ROOT;
$rootforuser = DOL_DATA_ROOT;
// If multicompany module is enabled, we redefine the root of data // If multicompany module is enabled, we redefine the root of data
if (! empty($this->global->MAIN_MODULE_MULTICOMPANY) && ! empty($this->entity) && $this->entity > 1) $rootfordata.='/'.$this->entity; if (! empty($this->global->MAIN_MODULE_MULTICOMPANY) && ! empty($this->entity) && $this->entity > 1) $rootfordata.='/'.$this->entity;
@ -188,8 +189,8 @@ class Conf
// for backward compatibility. // for backward compatibility.
// Module user // Module user
$this->user->dir_output=$rootfordata."/users"; $this->user->dir_output=$rootforuser."/users";
$this->user->dir_temp=$rootfordata."/users/temp"; $this->user->dir_temp=$rootforuser."/users/temp";
// Module RSS // Module RSS
$this->externalrss->dir_output=$rootfordata."/rss"; $this->externalrss->dir_output=$rootfordata."/rss";