|
@@ -42,11 +42,11 @@ discard block |
|
|
block discarded – undo |
|
42
|
42
|
$langs->loadLangs(array("users", "companies", "agenda", "commercial", "other", "orders", "bills")); |
|
43
|
43
|
|
|
44
|
44
|
// Get Parameters |
|
45
|
|
-$action = GETPOST('action', 'aZ09'); |
|
|
45
|
+$action = GETPOST('action', 'aZ09'); |
|
46
|
46
|
$massaction = GETPOST('massaction', 'alpha'); |
|
47
|
|
-$confirm = GETPOST('confirm', 'alpha'); |
|
|
47
|
+$confirm = GETPOST('confirm', 'alpha'); |
|
48
|
48
|
$cancel = GETPOST('cancel', 'alpha'); |
|
49
|
|
-$toselect = GETPOST('toselect', 'array'); |
|
|
49
|
+$toselect = GETPOST('toselect', 'array'); |
|
50
|
50
|
$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'actioncommlist'; // To manage different context of search |
|
51
|
51
|
$optioncss = GETPOST('optioncss', 'alpha'); |
|
52
|
52
|
|
|
@@ -55,7 +55,7 @@ discard block |
|
|
block discarded – undo |
|
55
|
55
|
|
|
56
|
56
|
$mode = GETPOST('mode', 'aZ09'); |
|
57
|
57
|
if (empty($mode) && preg_match('/show_/', $action)) { |
|
58
|
|
- $mode = $action; // For backward compatibility |
|
|
58
|
+ $mode = $action; // For backward compatibility |
|
59
|
59
|
} |
|
60
|
60
|
$resourceid = GETPOSTINT("search_resourceid") ? GETPOSTINT("search_resourceid") : GETPOSTINT("resourceid"); |
|
61
|
61
|
$pid = GETPOSTINT("search_projectid", 3) ? GETPOSTINT("search_projectid", 3) : GETPOSTINT("projectid", 3); |
|
@@ -177,7 +177,7 @@ discard block |
|
|
block discarded – undo |
|
177
|
177
|
|
|
178
|
178
|
$object->fields = dol_sort_array($object->fields, 'position'); |
|
179
|
179
|
$arrayfields = dol_sort_array($arrayfields, 'position'); |
|
180
|
|
-'@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields'; // dol_sort_array looses type for Phan |
|
|
180
|
+'@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields'; // dol_sort_array looses type for Phan |
|
181
|
181
|
|
|
182
|
182
|
$result = restrictedArea($user, 'agenda', 0, '', 'myactions'); |
|
183
|
183
|
if ($user->socid && $socid) { |
|
@@ -412,7 +412,7 @@ discard block |
|
|
block discarded – undo |
|
412
|
412
|
if (isModEnabled('category') && $user->hasRight('agenda', 'myactions', 'create')) { |
|
413
|
413
|
$arrayofmassactions['preaffecttag'] = img_picto('', 'category', 'class="pictofixedwidth"').$langs->trans("AffectTag"); |
|
414
|
414
|
} |
|
415
|
|
-if (GETPOSTINT('nomassaction') || in_array($massaction, array('presend', 'predelete','preaffecttag'))) { |
|
|
415
|
+if (GETPOSTINT('nomassaction') || in_array($massaction, array('presend', 'predelete', 'preaffecttag'))) { |
|
416
|
416
|
$arrayofmassactions = array(); |
|
417
|
417
|
} |
|
418
|
418
|
$massactionbutton = $form->selectMassAction('', $arrayofmassactions); |
|
@@ -979,7 +979,7 @@ discard block |
|
|
block discarded – undo |
|
979
|
979
|
$event_owner_style = ''; |
|
980
|
980
|
// We decide to choose color of owner of event (event->userownerid is user id of owner, event->userassigned contains all users assigned to event) |
|
981
|
981
|
if ($obj->fk_user_action > 0 && $cache_user_list[$obj->fk_user_action]->color != '') { |
|
982
|
|
- $event_owner_style .= 'border-left: #' . $cache_user_list[$obj->fk_user_action]->color . ' 5px solid;'; |
|
|
982
|
+ $event_owner_style .= 'border-left: #'.$cache_user_list[$obj->fk_user_action]->color.' 5px solid;'; |
|
983
|
983
|
} |
|
984
|
984
|
|
|
985
|
985
|
// get event style for start and end date |
|
@@ -1014,7 +1014,7 @@ discard block |
|
|
block discarded – undo |
|
1014
|
1014
|
} |
|
1015
|
1015
|
$event_start_date_css = $event_end_date_css = $event_more_class; |
|
1016
|
1016
|
|
|
1017
|
|
- print '<tr class="oddeven' . ($event_more_class != '' ? ' '.$event_more_class : '') . '">'; |
|
|
1017
|
+ print '<tr class="oddeven'.($event_more_class != '' ? ' '.$event_more_class : '').'">'; |
|
1018
|
1018
|
// Action column |
|
1019
|
1019
|
if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) { |
|
1020
|
1020
|
print '<td class="nowrap center">'; |
Dolibarr /
dolibarr
