Merge pull request #1863 from FHenry/3.6
Fix: list event view lost type event filter
This commit is contained in:
commit
257d7c41d6
@ -11,6 +11,8 @@ For users:
|
||||
- Fix: Salary payments are not reflected on the reporting sheets
|
||||
- Fix: Unsubscribe emailing not working
|
||||
- Fix: Trigger on create category call failed because user is not passed on card
|
||||
- Fix: list event view lost type event filter
|
||||
- Fix: Save also code event
|
||||
|
||||
***** ChangeLog for 3.6 compared to 3.5.* *****
|
||||
For users:
|
||||
|
||||
@ -140,6 +140,7 @@ class ActionComm extends CommonObject
|
||||
if ($result > 0)
|
||||
{
|
||||
$this->type_id=$cactioncomm->id;
|
||||
$this->code=$cactioncomm->code;
|
||||
}
|
||||
else if ($result == 0)
|
||||
{
|
||||
|
||||
@ -195,7 +195,7 @@ if ($resql)
|
||||
$head = calendars_prepare_head('');
|
||||
|
||||
dol_fiche_head($head, 'card', $langs->trans('Events'), 0, 'list');
|
||||
print_actions_filter($form,$canedit,$status,$year,$month,$day,$showbirthday,$filtera,$filtert,$filterd,$pid,$socid,-1);
|
||||
print_actions_filter($form,$canedit,$status,$year,$month,$day,$showbirthday,$filtera,$filtert,$filterd,$pid,$socid,-1,$actioncode);
|
||||
dol_fiche_end();
|
||||
|
||||
// Add link to show birthdays
|
||||
|
||||
Loading…
Reference in New Issue
Block a user