diff --git a/ChangeLog b/ChangeLog index d2073f601e588507579ec907b34d12d653effc45..e060f84ad159e14bb26ba5f6c26f1fb0b9d0934d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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: diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php index ee9e4c032ee2509d5c4b65188499b8866e8e1bd0..e41e556f3d9a9a0d4fdc95dbca4eb5165a1b223a 100644 --- a/htdocs/comm/action/class/actioncomm.class.php +++ b/htdocs/comm/action/class/actioncomm.class.php @@ -140,6 +140,7 @@ class ActionComm extends CommonObject if ($result > 0) { $this->type_id=$cactioncomm->id; + $this->code=$cactioncomm->code; } else if ($result == 0) { diff --git a/htdocs/comm/action/listactions.php b/htdocs/comm/action/listactions.php index 48e21690d2a86d046591f2220849104c58e5c221..2c0c108b275b6308cab44a7c45d780f284ca39d0 100644 --- a/htdocs/comm/action/listactions.php +++ b/htdocs/comm/action/listactions.php @@ -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