Skip to content
Snippets Groups Projects
Commit 257d7c41 authored by Laurent Destailleur's avatar Laurent Destailleur
Browse files

Merge pull request #1863 from FHenry/3.6

 Fix: list event view lost type event filter
parents 0bc511a6 832d1b37
No related branches found
No related tags found
No related merge requests found
...@@ -11,6 +11,8 @@ For users: ...@@ -11,6 +11,8 @@ For users:
- Fix: Salary payments are not reflected on the reporting sheets - Fix: Salary payments are not reflected on the reporting sheets
- Fix: Unsubscribe emailing not working - Fix: Unsubscribe emailing not working
- Fix: Trigger on create category call failed because user is not passed on card - 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.* ***** ***** ChangeLog for 3.6 compared to 3.5.* *****
For users: For users:
......
...@@ -140,6 +140,7 @@ class ActionComm extends CommonObject ...@@ -140,6 +140,7 @@ class ActionComm extends CommonObject
if ($result > 0) if ($result > 0)
{ {
$this->type_id=$cactioncomm->id; $this->type_id=$cactioncomm->id;
$this->code=$cactioncomm->code;
} }
else if ($result == 0) else if ($result == 0)
{ {
......
...@@ -195,7 +195,7 @@ if ($resql) ...@@ -195,7 +195,7 @@ if ($resql)
$head = calendars_prepare_head(''); $head = calendars_prepare_head('');
dol_fiche_head($head, 'card', $langs->trans('Events'), 0, 'list'); 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(); dol_fiche_end();
// Add link to show birthdays // Add link to show birthdays
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment