Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into develop
This commit is contained in:
commit
149d4974a9
2 changed files with 5 additions and 1 deletions
|
|
@ -1593,11 +1593,15 @@ class InterfaceActionsAuto extends DolibarrTriggers
|
|||
$elementid = $object->id; // id of object
|
||||
$elementtype = $object->element;
|
||||
$elementmodule = (empty($object->module) ? '' : $object->module);
|
||||
// Special cases to support old naming.
|
||||
if ($object->element == 'subscription') {
|
||||
'@phan-var-force Subscription $object';
|
||||
$elementid = $object->fk_adherent;
|
||||
$elementtype = 'member';
|
||||
}
|
||||
if ($elementmodule == 'product') {
|
||||
$elementmodule = '';
|
||||
}
|
||||
//var_dump($societeforaction);var_dump($contactforaction);var_dump($elementid);var_dump($elementtype);exit;
|
||||
|
||||
// Insertion action
|
||||
|
|
|
|||
|
|
@ -418,7 +418,7 @@ $search_options_pattern = 'search_task_options_';
|
|||
$extrafieldsobjectkey = 'projet_task';
|
||||
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
|
||||
|
||||
$tasksarray = $taskstatic->getTasksArray(null, null, ($project->id ? $project->id : 0), $socid, 0, $search_project_ref, (string) $onlyopenedproject, $morewherefilter, ($search_usertoprocessid ? $search_usertoprocessid : 0), 0, $extrafields); // We want to see all tasks of open project i am allowed to see and that match filter, not only my tasks. Later only mine will be editable later.
|
||||
$tasksarray = $taskstatic->getTasksArray(null, null, ($project->id ? $project->id : 0), $socid, 0, $search_project_ref, (string) $onlyopenedproject, $morewherefilter, ($search_usertoprocessid ? $search_usertoprocessid : 0), 0, $extrafields, 0, $search_array_options_task, 1);// We want to see all tasks of open project i am allowed to see and that match filter, not only my tasks. Later only mine will be editable later.
|
||||
$tasksarraywithoutfilter = array();
|
||||
if ($morewherefilter) { // Get all task without any filter, so we can show total of time spent for not visible tasks
|
||||
$tasksarraywithoutfilter = $taskstatic->getTasksArray(null, null, ($project->id ? $project->id : 0), $socid, 0, '', (string) $onlyopenedproject, '', ($search_usertoprocessid ? $search_usertoprocessid : 0)); // We want to see all tasks of open project i am allowed to see and that match filter, not only my tasks. Later only mine will be editable later.
|
||||
|
|
|
|||
Loading…
Reference in a new issue