Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-15 22:11:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into extrafields_object_filter

Browse Source
This commit is contained in:
Frédéric FRANCE
2024-12-08 12:08:24 +01:00
committed by GitHub
parent 9773604ebf 09e0f83848
commit 34517f7a5b
19 changed files with 138 additions and 347 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
htdocs/core/lib/functions.lib.php
View File

@@ -163,12 +163,23 @@ function getMultidirOutput($object, $module = '', $forobject = 0, $mode = 'outpu
$s .= ($mode != 'outputrel' ? '/' : '').get_exdir(0, 0, 0, 0, $object);
}
return $s;
} elseif (isset($conf->$module) && property_exists($conf->$module, 'dir_output')) {
$s = '';
if ($mode != 'outputrel') {
$s = $conf->$module->dir_output;
}
if ($forobject && $object->id > 0) {
$s .= ($mode != 'outputrel' ? '/' : '').get_exdir(0, 0, 0, 0, $object);
}
return $s;
} else {
return 'error-diroutput-not-defined-for-this-object='.$module;
}
} elseif ($mode == 'temp') {
if (isset($conf->$module) && property_exists($conf->$module, 'multidir_temp')) {
return $conf->$module->multidir_temp[(empty($object->entity) ? $conf->entity : $object->entity)];
} elseif (isset($conf->$module) && property_exists($conf->$module, 'dir_temp')) {
return $conf->$module->dir_temp;
} else {
return 'error-dirtemp-not-defined-for-this-object='.$module;
}