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

FIX compatibility with multicompany

Browse Source
This commit is contained in:
Regis Houssin 2021-12-02 15:10:29 +01:00
parent bacf569e0b
commit 202b123aaa
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/societe/card.php
View File

@ -900,7 +900,7 @@ if (empty($reshook)) {
// Actions to build doc // Actions to build doc
$id = $socid; $id = $socid;
$upload_dir = $conf->societe->dir_output; $upload_dir = $conf->societe->multidir_output[$object->entity];
$permissiontoadd = $user->rights->societe->creer; $permissiontoadd = $user->rights->societe->creer;
include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php'; include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
} }
@ -3006,7 +3006,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
// Presend form // Presend form
$modelmail = 'thirdparty'; $modelmail = 'thirdparty';
$defaulttopic = 'Information'; $defaulttopic = 'Information';
$diroutput = $conf->societe->dir_output; $diroutput = $conf->societe->multidir_output[$object->entity];
$trackid = 'thi'.$object->id; $trackid = 'thi'.$object->id;
include DOL_DOCUMENT_ROOT.'/core/tpl/card_presend.tpl.php'; include DOL_DOCUMENT_ROOT.'/core/tpl/card_presend.tpl.php';

2
htdocs/societe/website.php
View File

@ -159,7 +159,7 @@ if (empty($reshook)) {
$objectlabel = 'WebsiteAccount'; $objectlabel = 'WebsiteAccount';
$permissiontoread = $user->rights->societe->lire; $permissiontoread = $user->rights->societe->lire;
$permissiontodelete = $user->rights->societe->supprimer; $permissiontodelete = $user->rights->societe->supprimer;
$uploaddir = $conf->societe->dir_output; $uploaddir = $conf->societe->multidir_output[$object->entity];
include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php'; include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
} }