From c8a9f4600c57d237c4f484b0922830fc7bc79de2 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Tue, 2 Sep 2014 11:20:57 +0200
Subject: [PATCH 1/2] Fix: list event view lost type event filter

---
 ChangeLog                          | 1 +
 htdocs/comm/action/listactions.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 53dde2583f0..57a9aef6c90 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,7 @@ 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
 
 ***** ChangeLog for 3.6 compared to 3.5.* *****
 For users:
diff --git a/htdocs/comm/action/listactions.php b/htdocs/comm/action/listactions.php
index 48e21690d2a..2c0c108b275 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

From 832d1b37c12709757a8c9ddca988ea862614820f Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Tue, 2 Sep 2014 11:32:38 +0200
Subject: [PATCH 2/2] Save also code of event

---
 ChangeLog                                     | 1 +
 htdocs/comm/action/class/actioncomm.class.php | 1 +
 2 files changed, 2 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 57a9aef6c90..d7ec265d040 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,7 @@ For users:
 - 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 ee9e4c032ee..e41e556f3d9 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)
             {