Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
This commit is contained in:
parent
a8529cf1a2
commit
c471f6b900
1 changed files with 8 additions and 8 deletions
|
|
@ -213,14 +213,14 @@ if (!empty($hashp)) {
|
|||
$original_file = (($tmp[1] ? $tmp[1] . '/' : '') . $ecmfile->filename); // this is relative to module dir
|
||||
}
|
||||
|
||||
$entity = $ecmfile->entity;
|
||||
if (isModEnabled('multicompany') && !empty($ecmfile->src_object_type) && $ecmfile->src_object_id > 0) {
|
||||
$object = fetchObjectByElement($ecmfile->src_object_id, $ecmfile->src_object_type);
|
||||
if (is_object($object) && $object->id > 0) {
|
||||
$entity = $object->entity;
|
||||
}
|
||||
}
|
||||
|
||||
$entity = $ecmfile->entity;
|
||||
if (isModEnabled('multicompany') && !empty($ecmfile->src_object_type) && $ecmfile->src_object_id > 0) {
|
||||
$object = fetchObjectByElement($ecmfile->src_object_id, $ecmfile->src_object_type);
|
||||
if (is_object($object) && $object->id > 0) {
|
||||
$entity = $object->entity;
|
||||
}
|
||||
}
|
||||
|
||||
if ($entity != $conf->entity) {
|
||||
$conf->entity = $entity;
|
||||
$conf->setValues($db);
|
||||
|
|
|
|||
Loading…
Reference in a new issue