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

Merge pull request #1862 from FHenry/3.5

Fix: list event view lost type event filter
parents 576512e3 911aca39
No related branches found
No related tags found
No related merge requests found
...@@ -22,6 +22,8 @@ Fix: Missing include files.lib.php in some pages to use dol_delete_recursive. ...@@ -22,6 +22,8 @@ Fix: Missing include files.lib.php in some pages to use dol_delete_recursive.
Fix: [ bug #1558 ] Product/service edit page title shows new Ref instead of old ref. Fix: [ bug #1558 ] Product/service edit page title shows new Ref instead of old ref.
Fix: [ bug #1553 ] Saving User displays setup removes menu. Fix: [ bug #1553 ] Saving User displays setup removes menu.
Fix: [ bug #1544 ] Can remove date from invoice Fix: [ bug #1544 ] Can remove date from invoice
Fix: list event view lost type event filter
Fix: Add code save on create event
***** ChangeLog for 3.5.4 compared to 3.5.3 ***** ***** ChangeLog for 3.5.4 compared to 3.5.3 *****
Fix: Hide title of event when agenda module disabled. Fix: Hide title of event when agenda module disabled.
......
...@@ -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)
{ {
......
...@@ -211,7 +211,7 @@ if ($resql) ...@@ -211,7 +211,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