From 27231e5917b55c2e8bffa71866b26bcafe82bcb7 Mon Sep 17 00:00:00 2001
From: Gabriel Monnerat <gabriel@tiolive.com>
Date: Tue, 30 Apr 2013 15:50:01 +0200
Subject: [PATCH] Add follow_up parameter on Base_addEvent script to be
 possible pass the follow up when the context is a person or organisation

---
 .../SkinTemplateItem/portal_skins/erp5_crm/Base_addEvent.xml   | 3 +--
 .../erp5_crm/Entity_createEventFromDefaultEventPath.xml        | 3 +--
 bt5/erp5_crm/bt/revision                                       | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Base_addEvent.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Base_addEvent.xml
index a2f7156005..150f236293 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Base_addEvent.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Base_addEvent.xml
@@ -75,7 +75,6 @@ if logged_in_user_value is not None:\n
 \n
 person_relative_url = None\n
 organisation_relative_url = None\n
-follow_up = None\n
 if context.getPortalType() in portal_entity_type_list:\n
   if context.getPortalType() == \'Person\':\n
     person_relative_url = context.getRelativeUrl()\n
@@ -140,7 +139,7 @@ event.Base_redirect(keep_items={\'portal_status_message\': message})\n
         </item>
         <item>
             <key> <string>_params</string> </key>
-            <value> <string>title, direction, portal_type, resource, text_content=None, notification_message=None, batch_mode=False, keep_draft=False, **kw</string> </value>
+            <value> <string>title, direction, portal_type, resource, text_content=None, notification_message=None, batch_mode=False, keep_draft=False, follow_up=None, **kw</string> </value>
         </item>
         <item>
             <key> <string>id</string> </key>
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Entity_createEventFromDefaultEventPath.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Entity_createEventFromDefaultEventPath.xml
index 3afe6a3d9d..bf9616d019 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Entity_createEventFromDefaultEventPath.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Entity_createEventFromDefaultEventPath.xml
@@ -70,10 +70,9 @@ event = context.Base_addEvent(title=\'\',\n
   resource=notification_message.getSpecialise(),\n
   notification_message=resource_reference,\n
   keep_draft=keep_draft,\n
+  follow_up=follow_up,\n
   batch_mode=True)\n
 \n
-event.setFollowUp(follow_up)\n
-\n
 if event.getSource() is None:\n
   event.setSource(source)\n
 </string> </value>
diff --git a/bt5/erp5_crm/bt/revision b/bt5/erp5_crm/bt/revision
index b0c703c41a..2df5e549ce 100644
--- a/bt5/erp5_crm/bt/revision
+++ b/bt5/erp5_crm/bt/revision
@@ -1 +1 @@
-628
\ No newline at end of file
+629
\ No newline at end of file
-- 
2.30.9