slapos_erp5: (wip) Allow user to see events from shared via Project/Organisation

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Acknowledgement.xml

@@ -21,4 +21,10 @@
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>
+  <role id='Auditor'>
+   <property id='title'>Project Member</property>
+   <property id='base_category_script'>Event_getSecurityCategoryFromMovementFollowUpAggregateDestinationProject</property>
+   <multi_property id='categories'>local_role_group/project</multi_property>
+   <multi_property id='base_category'>destination_project</multi_property>
+  </role>
 </type_roles>
\ No newline at end of file

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Fax%20Message.xml

@@ -2,18 +2,18 @@
   <role id='Auditor'>
    <property id='title'>Customer</property>
    <property id='description'>Monovalued role</property>
-   <property id='condition'>python: here.getSourceValue(portal_type='Person') is not None</property>
+   <property id='condition'>python: here.getDestinationValue(portal_type='Person') is not None</property>
    <property id='base_category_script'>ERP5Type_getSecurityCategoryFromContent</property>
    <multi_property id='categories'>local_role_group/user</multi_property>
-   <multi_property id='base_category'>source</multi_property>
+   <multi_property id='base_category'>destination</multi_property>
   </role>
   <role id='Auditor'>
-   <property id='title'>Customer Destination</property>
+   <property id='title'>Customer</property>
    <property id='description'>Monovalued role</property>
-   <property id='condition'>python: here.getDestinationValue(portal_type='Person') is not None</property>
+   <property id='condition'>python: here.getSourceValue(portal_type='Person') is not None</property>
    <property id='base_category_script'>ERP5Type_getSecurityCategoryFromContent</property>
    <multi_property id='categories'>local_role_group/user</multi_property>
-   <multi_property id='base_category'>destination</multi_property>
+   <multi_property id='base_category'>source</multi_property>
   </role>
   <role id='Assignor'>
    <property id='title'>Group company</property>
@@ -21,4 +21,10 @@
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>
+  <role id='Auditor'>
+   <property id='title'>Project Member</property>
+   <property id='base_category_script'>Event_getSecurityCategoryFromMovementFollowUpAggregateDestinationProject</property>
+   <multi_property id='categories'>local_role_group/project</multi_property>
+   <multi_property id='base_category'>destination_project</multi_property>
+  </role>
 </type_roles>
\ No newline at end of file

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Letter.xml

@@ -2,18 +2,18 @@
   <role id='Auditor'>
    <property id='title'>Customer</property>
    <property id='description'>Monovalued role</property>
-   <property id='condition'>python: here.getSourceValue(portal_type='Person') is not None</property>
+   <property id='condition'>python: here.getDestinationValue(portal_type='Person') is not None</property>
    <property id='base_category_script'>ERP5Type_getSecurityCategoryFromContent</property>
    <multi_property id='categories'>local_role_group/user</multi_property>
-   <multi_property id='base_category'>source</multi_property>
+   <multi_property id='base_category'>destination</multi_property>
   </role>
   <role id='Auditor'>
-   <property id='title'>Customer Destination</property>
+   <property id='title'>Customer</property>
    <property id='description'>Monovalued role</property>
-   <property id='condition'>python: here.getDestinationValue(portal_type='Person') is not None</property>
+   <property id='condition'>python: here.getSourceValue(portal_type='Person') is not None</property>
    <property id='base_category_script'>ERP5Type_getSecurityCategoryFromContent</property>
    <multi_property id='categories'>local_role_group/user</multi_property>
-   <multi_property id='base_category'>destination</multi_property>
+   <multi_property id='base_category'>source</multi_property>
   </role>
   <role id='Assignor'>
    <property id='title'>Group company</property>
@@ -21,4 +21,10 @@
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>
+  <role id='Auditor'>
+   <property id='title'>Project Member</property>
+   <property id='base_category_script'>Event_getSecurityCategoryFromMovementFollowUpAggregateDestinationProject</property>
+   <multi_property id='categories'>local_role_group/project</multi_property>
+   <multi_property id='base_category'>destination_project</multi_property>
+  </role>
 </type_roles>
\ No newline at end of file

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Mail%20Message.xml

@@ -21,4 +21,10 @@
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>
+  <role id='Auditor'>
+   <property id='title'>Project Member</property>
+   <property id='base_category_script'>Event_getSecurityCategoryFromMovementFollowUpAggregateDestinationProject</property>
+   <multi_property id='categories'>local_role_group/project</multi_property>
+   <multi_property id='base_category'>destination_project</multi_property>
+  </role>
 </type_roles>
\ No newline at end of file

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Note.xml

@@ -2,18 +2,18 @@
   <role id='Auditor'>
    <property id='title'>Customer</property>
    <property id='description'>Monovalued role</property>
-   <property id='condition'>python: here.getSourceValue(portal_type='Person') is not None</property>
+   <property id='condition'>python: here.getDestinationValue(portal_type='Person') is not None</property>
    <property id='base_category_script'>ERP5Type_getSecurityCategoryFromContent</property>
    <multi_property id='categories'>local_role_group/user</multi_property>
-   <multi_property id='base_category'>source</multi_property>
+   <multi_property id='base_category'>destination</multi_property>
   </role>
   <role id='Auditor'>
-   <property id='title'>Customer Destination</property>
+   <property id='title'>Customer</property>
    <property id='description'>Monovalued role</property>
-   <property id='condition'>python: here.getDestinationValue(portal_type='Person') is not None</property>
+   <property id='condition'>python: here.getSourceValue(portal_type='Person') is not None</property>
    <property id='base_category_script'>ERP5Type_getSecurityCategoryFromContent</property>
    <multi_property id='categories'>local_role_group/user</multi_property>
-   <multi_property id='base_category'>destination</multi_property>
+   <multi_property id='base_category'>source</multi_property>
   </role>
   <role id='Assignor'>
    <property id='title'>Group company</property>
@@ -21,4 +21,10 @@
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>
+  <role id='Auditor'>
+   <property id='title'>Project Member</property>
+   <property id='base_category_script'>Event_getSecurityCategoryFromMovementFollowUpAggregateDestinationProject</property>
+   <multi_property id='categories'>local_role_group/project</multi_property>
+   <multi_property id='base_category'>destination_project</multi_property>
+  </role>
 </type_roles>
\ No newline at end of file

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Phone%20Call.xml

@@ -2,18 +2,18 @@
   <role id='Auditor'>
    <property id='title'>Customer</property>
    <property id='description'>Monovalued role</property>
-   <property id='condition'>python: here.getSourceValue(portal_type='Person') is not None</property>
+   <property id='condition'>python: here.getDestinationValue(portal_type='Person') is not None</property>
    <property id='base_category_script'>ERP5Type_getSecurityCategoryFromContent</property>
    <multi_property id='categories'>local_role_group/user</multi_property>
-   <multi_property id='base_category'>source</multi_property>
+   <multi_property id='base_category'>destination</multi_property>
   </role>
   <role id='Auditor'>
-   <property id='title'>Customer Destination</property>
+   <property id='title'>Customer</property>
    <property id='description'>Monovalued role</property>
-   <property id='condition'>python: here.getDestinationValue(portal_type='Person') is not None</property>
+   <property id='condition'>python: here.getSourceValue(portal_type='Person') is not None</property>
    <property id='base_category_script'>ERP5Type_getSecurityCategoryFromContent</property>
    <multi_property id='categories'>local_role_group/user</multi_property>
-   <multi_property id='base_category'>destination</multi_property>
+   <multi_property id='base_category'>source</multi_property>
   </role>
   <role id='Assignor'>
    <property id='title'>Group company</property>
@@ -21,4 +21,10 @@
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>
+  <role id='Auditor'>
+   <property id='title'>Project Member</property>
+   <property id='base_category_script'>Event_getSecurityCategoryFromMovementFollowUpAggregateDestinationProject</property>
+   <multi_property id='categories'>local_role_group/project</multi_property>
+   <multi_property id='base_category'>destination_project</multi_property>
+  </role>
 </type_roles>
\ No newline at end of file

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Short%20Message.xml

@@ -2,18 +2,18 @@
   <role id='Auditor'>
    <property id='title'>Customer</property>
    <property id='description'>Monovalued role</property>
-   <property id='condition'>python: here.getSourceValue(portal_type='Person') is not None</property>
+   <property id='condition'>python: here.getDestinationValue(portal_type='Person') is not None</property>
    <property id='base_category_script'>ERP5Type_getSecurityCategoryFromContent</property>
    <multi_property id='categories'>local_role_group/user</multi_property>
-   <multi_property id='base_category'>source</multi_property>
+   <multi_property id='base_category'>destination</multi_property>
   </role>
   <role id='Auditor'>
-   <property id='title'>Customer Destination</property>
+   <property id='title'>Customer</property>
    <property id='description'>Monovalued role</property>
-   <property id='condition'>python: here.getDestinationValue(portal_type='Person') is not None</property>
+   <property id='condition'>python: here.getSourceValue(portal_type='Person') is not None</property>
    <property id='base_category_script'>ERP5Type_getSecurityCategoryFromContent</property>
    <multi_property id='categories'>local_role_group/user</multi_property>
-   <multi_property id='base_category'>destination</multi_property>
+   <multi_property id='base_category'>source</multi_property>
   </role>
   <role id='Assignor'>
    <property id='title'>Group company</property>
@@ -21,4 +21,10 @@
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>
+  <role id='Auditor'>
+   <property id='title'>Project Member</property>
+   <property id='base_category_script'>Event_getSecurityCategoryFromMovementFollowUpAggregateDestinationProject</property>
+   <multi_property id='categories'>local_role_group/project</multi_property>
+   <multi_property id='base_category'>destination_project</multi_property>
+  </role>
 </type_roles>
\ No newline at end of file

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Site%20Message.xml

@@ -21,4 +21,10 @@
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>
+  <role id='Auditor'>
+   <property id='title'>Project Member</property>
+   <property id='base_category_script'>Event_getSecurityCategoryFromMovementFollowUpAggregateDestinationProject</property>
+   <multi_property id='categories'>local_role_group/project</multi_property>
+   <multi_property id='base_category'>destination_project</multi_property>
+  </role>
 </type_roles>
\ No newline at end of file

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Visit.xml

@@ -2,18 +2,18 @@
   <role id='Auditor'>
    <property id='title'>Customer</property>
    <property id='description'>Monovalued role</property>
-   <property id='condition'>python: here.getSourceValue(portal_type='Person') is not None</property>
+   <property id='condition'>python: here.getDestinationValue(portal_type='Person') is not None</property>
    <property id='base_category_script'>ERP5Type_getSecurityCategoryFromContent</property>
    <multi_property id='categories'>local_role_group/user</multi_property>
-   <multi_property id='base_category'>source</multi_property>
+   <multi_property id='base_category'>destination</multi_property>
   </role>
   <role id='Auditor'>
-   <property id='title'>Customer Destination</property>
+   <property id='title'>Customer</property>
    <property id='description'>Monovalued role</property>
-   <property id='condition'>python: here.getDestinationValue(portal_type='Person') is not None</property>
+   <property id='condition'>python: here.getSourceValue(portal_type='Person') is not None</property>
    <property id='base_category_script'>ERP5Type_getSecurityCategoryFromContent</property>
    <multi_property id='categories'>local_role_group/user</multi_property>
-   <multi_property id='base_category'>destination</multi_property>
+   <multi_property id='base_category'>source</multi_property>
   </role>
   <role id='Assignor'>
    <property id='title'>Group company</property>
@@ -21,4 +21,10 @@
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>
+  <role id='Auditor'>
+   <property id='title'>Project Member</property>
+   <property id='base_category_script'>Event_getSecurityCategoryFromMovementFollowUpAggregateDestinationProject</property>
+   <multi_property id='categories'>local_role_group/project</multi_property>
+   <multi_property id='base_category'>destination_project</multi_property>
+  </role>
 </type_roles>
\ No newline at end of file

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Web%20Message.xml

@@ -2,18 +2,18 @@
   <role id='Auditor'>
    <property id='title'>Customer</property>
    <property id='description'>Monovalued role</property>
-   <property id='condition'>python: here.getSourceValue(portal_type='Person') is not None</property>
+   <property id='condition'>python: here.getDestinationValue(portal_type='Person') is not None</property>
    <property id='base_category_script'>ERP5Type_getSecurityCategoryFromContent</property>
    <multi_property id='categories'>local_role_group/user</multi_property>
-   <multi_property id='base_category'>source</multi_property>
+   <multi_property id='base_category'>destination</multi_property>
   </role>
   <role id='Auditor'>
-   <property id='title'>Customer (Destination)</property>
+   <property id='title'>Customer</property>
    <property id='description'>Monovalued role</property>
-   <property id='condition'>python: here.getDestinationValue(portal_type='Person') is not None</property>
+   <property id='condition'>python: here.getSourceValue(portal_type='Person') is not None</property>
    <property id='base_category_script'>ERP5Type_getSecurityCategoryFromContent</property>
    <multi_property id='categories'>local_role_group/user</multi_property>
-   <multi_property id='base_category'>destination</multi_property>
+   <multi_property id='base_category'>source</multi_property>
   </role>
   <role id='Assignor'>
    <property id='title'>Group company</property>
@@ -22,10 +22,9 @@
    <multi_property id='base_category'>group</multi_property>
   </role>
   <role id='Auditor'>
-   <property id='title'>Member can see template</property>
-   <property id='condition'>python: here.getRelativeUrl() == here.getPortalObject().portal_preferences.getPreferredWebMessageTemplate()</property>
-   <multi_property id='categories'>local_role_group/user</multi_property>
-   <multi_property id='category'>role/member</multi_property>
-   <multi_property id='base_category'>role</multi_property>
+   <property id='title'>Project Member</property>
+   <property id='base_category_script'>Event_getSecurityCategoryFromMovementFollowUpAggregateDestinationProject</property>
+   <multi_property id='categories'>local_role_group/project</multi_property>
+   <multi_property id='base_category'>destination_project</multi_property>
   </role>
 </type_roles>
\ No newline at end of file

master/bt5/slapos_erp5/SkinTemplateItem/portal_skins/slapos_core/Event_getSecurityCategoryFromMovementFollowUpAggregateDestinationProject.py

+"""
+This script returns a list of dictionaries which represent
+the security groups which a person is member of. It extracts
+the categories from the current content. It is useful in the
+following cases:
+
+- calculate a security group based on a given
+  category of the current object (ex. group). This
+  is used for example in ERP5 DMS to calculate
+  document security.
+
+- assign local roles to a document based on
+  the person which the object related to through
+  a given base category (ex. destination). This
+  is used for example in ERP5 Project to calculate
+  Task / Task Report security.
+
+The parameters are
+
+  base_category_list -- list of category values we need to retrieve
+  user_name          -- string obtained from getSecurityManager().getUser().getId()
+  object             -- object which we want to assign roles to
+  portal_type        -- portal type of object
+
+NOTE: for now, this script requires proxy manager
+"""
+
+category_list = []
+
+if obj is None:
+  return []
+
+# Object here is a event
+ticket = obj.getFollowUpValue()
+if ticket is None:
+  return []
+
+aggregate_value = ticket.getAggregateValue()
+if aggregate_value is None:
+  return []
+
+# Object on this case can be Hosting Subscription, Computer, or Computer Network
+project = aggregate_value.Item_getCurrentProjectValue()
+if project is not None:
+  category_list.append({'destination_project': [project.getRelativeUrl()]})
+
+return category_list

master/bt5/slapos_erp5/SkinTemplateItem/portal_skins/slapos_core/Event_getSecurityCategoryFromMovementFollowUpAggregateDestinationProject.xml

+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>Script_magic</string> </key>
+            <value> <int>3</int> </value>
+        </item>
+        <item>
+            <key> <string>_bind_names</string> </key>
+            <value>
+              <object>
+                <klass>
+                  <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
+                </klass>
+                <tuple/>
+                <state>
+                  <dictionary>
+                    <item>
+                        <key> <string>_asgns</string> </key>
+                        <value>
+                          <dictionary>
+                            <item>
+                                <key> <string>name_container</string> </key>
+                                <value> <string>container</string> </value>
+                            </item>
+                            <item>
+                                <key> <string>name_context</string> </key>
+                                <value> <string>context</string> </value>
+                            </item>
+                            <item>
+                                <key> <string>name_m_self</string> </key>
+                                <value> <string>script</string> </value>
+                            </item>
+                            <item>
+                                <key> <string>name_subpath</string> </key>
+                                <value> <string>traverse_subpath</string> </value>
+                            </item>
+                          </dictionary>
+                        </value>
+                    </item>
+                  </dictionary>
+                </state>
+              </object>
+            </value>
+        </item>
+        <item>
+            <key> <string>_params</string> </key>
+            <value> <string>base_category_list, user_name, obj, portal_type</string> </value>
+        </item>
+        <item>
+            <key> <string>_proxy_roles</string> </key>
+            <value>
+              <tuple>
+                <string>Manager</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>Event_getSecurityCategoryFromMovementFollowUpAggregateDestinationProject</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

master/bt5/slapos_erp5/TestTemplateItem/portal_components/test.erp5.testSlapOSERP5GroupRoleSecurity.py

@@ -1755,46 +1755,6 @@ class TestEventModule(TestSlapOSGroupRoleSecurityMixin):
     self.assertRoles(module, 'R-MEMBER', ['Auditor', 'Author'])
     self.assertRoles(module, self.user_id, ['Owner'])
 
-class TestFaxMessage(TestSlapOSGroupRoleSecurityMixin):
-  def test_GroupCompany(self):
-    product = self.portal.event_module.newContent(
-        portal_type='Fax Message')
-    product.updateLocalRolesOnSecurityGroups()
-    self.assertSecurityGroup(product,
-        ['G-COMPANY', self.user_id], False)
-    self.assertRoles(product, 'G-COMPANY', ['Assignor'])
-    self.assertRoles(product, self.user_id, ['Owner'])
-
-  def test_SourceCustomer(self):
-    reference = 'TESTPERSON-%s' % self.generateNewId()
-    person = self.portal.person_module.newContent(portal_type='Person',
-        reference=reference)
-    product = self.portal.event_module.newContent(
-        portal_type='Fax Message',
-        source_value=person,
-        )
-    product.updateLocalRolesOnSecurityGroups()
-    self.assertSecurityGroup(product,
-        ['G-COMPANY', person.getUserId(), self.user_id], False)
-    self.assertRoles(product, 'G-COMPANY', ['Assignor'])
-    self.assertRoles(product, person.getUserId(), ['Auditor'])
-    self.assertRoles(product, self.user_id, ['Owner'])
-
-  def test_DestinationCustomer(self):
-    reference = 'TESTPERSON-%s' % self.generateNewId()
-    person = self.portal.person_module.newContent(portal_type='Person',
-        reference=reference)
-    product = self.portal.event_module.newContent(
-        portal_type='Fax Message',
-        destination_value=person,
-        )
-    product.updateLocalRolesOnSecurityGroups()
-    self.assertSecurityGroup(product,
-        ['G-COMPANY', person.getUserId(), self.user_id], False)
-    self.assertRoles(product, 'G-COMPANY', ['Assignor'])
-    self.assertRoles(product, person.getUserId(), ['Auditor'])
-    self.assertRoles(product, self.user_id, ['Owner'])
-
 class TestGadget(TestSlapOSGroupRoleSecurityMixin):
   def test_GroupCompany(self):
     product = self.portal.portal_gadgets.newContent(
@@ -1863,10 +1823,11 @@ class TestKnowledgePadModule(TestSlapOSGroupRoleSecurityMixin):
     self.assertRoles(module, 'G-COMPANY', ['Auditor', 'Author'])
     self.assertRoles(module, self.user_id, ['Owner'])
 
-class TestLetter(TestSlapOSGroupRoleSecurityMixin):
+class TestMailMessage(TestSlapOSGroupRoleSecurityMixin):
+  event_portal_type = 'Mail Message'
   def test_GroupCompany(self):
     product = self.portal.event_module.newContent(
-        portal_type='Letter')
+        portal_type=self.event_portal_type)
     product.updateLocalRolesOnSecurityGroups()
     self.assertSecurityGroup(product,
         ['G-COMPANY', self.user_id], False)
@@ -1878,7 +1839,7 @@ class TestLetter(TestSlapOSGroupRoleSecurityMixin):
     person = self.portal.person_module.newContent(portal_type='Person',
         reference=reference)
     product = self.portal.event_module.newContent(
-        portal_type='Letter',
+        portal_type=self.event_portal_type,
         source_value=person,
         )
     product.updateLocalRolesOnSecurityGroups()
@@ -1893,7 +1854,7 @@ class TestLetter(TestSlapOSGroupRoleSecurityMixin):
     person = self.portal.person_module.newContent(portal_type='Person',
         reference=reference)
     product = self.portal.event_module.newContent(
-        portal_type='Letter',
+        portal_type=self.event_portal_type,
         destination_value=person,
         )
     product.updateLocalRolesOnSecurityGroups()
@@ -1903,184 +1864,120 @@ class TestLetter(TestSlapOSGroupRoleSecurityMixin):
     self.assertRoles(product, person.getUserId(), ['Auditor'])
     self.assertRoles(product, self.user_id, ['Owner'])
 
-class TestMailMessage(TestSlapOSGroupRoleSecurityMixin):
-  def test_GroupCompany(self):
-    product = self.portal.event_module.newContent(
-        portal_type='Mail Message')
-    product.updateLocalRolesOnSecurityGroups()
-    self.assertSecurityGroup(product,
-        ['G-COMPANY', self.user_id], False)
-    self.assertRoles(product, 'G-COMPANY', ['Assignor'])
-    self.assertRoles(product, self.user_id, ['Owner'])
+  def test_xProjectMember(self):
+    person = self.makePerson(user=1)
+    computer = self.portal.computer_module.newContent(
+        portal_type='Computer',
+        source_administration=person.getRelativeUrl())
+    project = self.portal.project_module.newContent(
+        portal_type='Project')
 
-  def test_SourceCustomer(self):
-    reference = 'TESTPERSON-%s' % self.generateNewId()
-    person = self.portal.person_module.newContent(portal_type='Person',
-        reference=reference)
-    product = self.portal.event_module.newContent(
-        portal_type='Mail Message',
-        source_value=person,
+    self.tic()
+    self.login(person.getUserId())
+    computer.Computer_createMovement(
+      destination=person.getRelativeUrl(),
+      destination_project=project.getRelativeUrl())
+    self.login()
+    self.tic()
+
+    support_request = self.portal.support_request_module.newContent(
+        portal_type='Support Request',
+        destination_decision_value=person,
+        aggregate=computer.getRelativeUrl()
         )
-    product.updateLocalRolesOnSecurityGroups()
-    self.assertSecurityGroup(product,
-        ['G-COMPANY', person.getUserId(), self.user_id], False)
-    self.assertRoles(product, 'G-COMPANY', ['Assignor'])
-    self.assertRoles(product, person.getUserId(), ['Auditor'])
-    self.assertRoles(product, self.user_id, ['Owner'])
 
-  def test_DestinationCustomer(self):
-    reference = 'TESTPERSON-%s' % self.generateNewId()
-    person = self.portal.person_module.newContent(portal_type='Person',
-        reference=reference)
-    product = self.portal.event_module.newContent(
-        portal_type='Mail Message',
+    event = self.portal.event_module.newContent(
+        portal_type=self.event_portal_type,
         destination_value=person,
+        follow_up=support_request.getRelativeUrl()
         )
-    product.updateLocalRolesOnSecurityGroups()
-    self.assertSecurityGroup(product,
-        ['G-COMPANY', person.getUserId(), self.user_id], False)
-    self.assertRoles(product, 'G-COMPANY', ['Assignor'])
-    self.assertRoles(product, person.getUserId(), ['Auditor'])
-    self.assertRoles(product, self.user_id, ['Owner'])
 
-class TestMeeting(TestSlapOSGroupRoleSecurityMixin):
-  def test_GroupCompany(self):
-    product = self.portal.meeting_module.newContent(
-        portal_type='Meeting')
-    product.updateLocalRolesOnSecurityGroups()
-    self.assertSecurityGroup(product,
-        ['G-COMPANY', self.user_id], False)
-    self.assertRoles(product, 'G-COMPANY', ['Assignor'])
-    self.assertRoles(product, self.user_id, ['Owner'])
+    event.updateLocalRolesOnSecurityGroups()
+    self.assertSecurityGroup(event,
+        ['G-COMPANY', person.getUserId(),
+         self.user_id, project.getReference()], False)
+    self.assertRoles(event, 'G-COMPANY', ['Assignor'])
+    self.assertRoles(event, person.getUserId(), ['Auditor'])
+    self.assertRoles(event, self.user_id, ['Owner'])
 
-class TestMeetingModule(TestSlapOSGroupRoleSecurityMixin):
-  def test(self):
-    module = self.portal.meeting_module
-    self.changeOwnership(module)
-    self.assertSecurityGroup(module,
-        ['G-COMPANY', self.user_id], True)
-    self.assertRoles(module, 'G-COMPANY', ['Auditor', 'Author'])
-    self.assertRoles(module, self.user_id, ['Owner'])
+  def test_xProjectMember_HostingSubscriptionRequest(self):
 
-class TestNote(TestSlapOSGroupRoleSecurityMixin):
-  def test_GroupCompany(self):
-    product = self.portal.event_module.newContent(
-        portal_type='Note')
-    product.updateLocalRolesOnSecurityGroups()
-    self.assertSecurityGroup(product,
-        ['G-COMPANY', self.user_id], False)
-    self.assertRoles(product, 'G-COMPANY', ['Assignor'])
-    self.assertRoles(product, self.user_id, ['Owner'])
+    person = self.makePerson(user=1)
+    hosting_subscription = self.portal.hosting_subscription_module.newContent(
+        portal_type='Hosting Subscription',
+        destination_section=person.getRelativeUrl())
+    project = self.portal.project_module.newContent(
+        portal_type='Project')
 
-  def test_SourceCustomer(self):
-    reference = 'TESTPERSON-%s' % self.generateNewId()
-    person = self.portal.person_module.newContent(portal_type='Person',
-        reference=reference)
-    product = self.portal.event_module.newContent(
-        portal_type='Note',
-        source_value=person,
+    self.tic()
+    self.login(person.getUserId())
+    hosting_subscription.HostingSubscription_createMovement(
+      destination_project=project.getRelativeUrl())
+    self.login()
+    self.tic()
+
+    support_request = self.portal.support_request_module.newContent(
+        portal_type='Support Request',
+        destination_decision_value=person,
+        aggregate=hosting_subscription.getRelativeUrl()
         )
-    product.updateLocalRolesOnSecurityGroups()
-    self.assertSecurityGroup(product,
-        ['G-COMPANY', person.getUserId(), self.user_id], False)
-    self.assertRoles(product, 'G-COMPANY', ['Assignor'])
-    self.assertRoles(product, person.getUserId(), ['Auditor'])
-    self.assertRoles(product, self.user_id, ['Owner'])
 
-  def test_DestinationCustomer(self):
-    reference = 'TESTPERSON-%s' % self.generateNewId()
-    person = self.portal.person_module.newContent(portal_type='Person',
-        reference=reference)
-    product = self.portal.event_module.newContent(
-        portal_type='Note',
+    event = self.portal.event_module.newContent(
+        portal_type=self.event_portal_type,
         destination_value=person,
+        follow_up=support_request.getRelativeUrl()
         )
-    product.updateLocalRolesOnSecurityGroups()
-    self.assertSecurityGroup(product,
-        ['G-COMPANY', person.getUserId(), self.user_id], False)
-    self.assertRoles(product, 'G-COMPANY', ['Assignor'])
-    self.assertRoles(product, person.getUserId(), ['Auditor'])
-    self.assertRoles(product, self.user_id, ['Owner'])
 
-class TestPhoneCall(TestSlapOSGroupRoleSecurityMixin):
-  def test_GroupCompany(self):
-    product = self.portal.event_module.newContent(
-        portal_type='Phone Call')
-    product.updateLocalRolesOnSecurityGroups()
-    self.assertSecurityGroup(product,
-        ['G-COMPANY', self.user_id], False)
-    self.assertRoles(product, 'G-COMPANY', ['Assignor'])
-    self.assertRoles(product, self.user_id, ['Owner'])
+    event.updateLocalRolesOnSecurityGroups()
+    self.assertSecurityGroup(event,
+        ['G-COMPANY', person.getUserId(),
+         self.user_id, project.getReference()], False)
+    self.assertRoles(event, 'G-COMPANY', ['Assignor'])
+    self.assertRoles(event, person.getUserId(), ['Auditor'])
+    self.assertRoles(event, self.user_id, ['Owner'])
 
-  def test_SourceCustomer(self):
-    reference = 'TESTPERSON-%s' % self.generateNewId()
-    person = self.portal.person_module.newContent(portal_type='Person',
-        reference=reference)
-    product = self.portal.event_module.newContent(
-        portal_type='Phone Call',
-        source_value=person,
-        )
-    product.updateLocalRolesOnSecurityGroups()
-    self.assertSecurityGroup(product,
-        ['G-COMPANY', person.getUserId(), self.user_id], False)
-    self.assertRoles(product, 'G-COMPANY', ['Assignor'])
-    self.assertRoles(product, person.getUserId(), ['Auditor'])
-    self.assertRoles(product, self.user_id, ['Owner'])
+class TestShortMessage(TestMailMessage):
+  event_portal_type = 'Short Message'
 
-  def test_DestinationCustomer(self):
-    reference = 'TESTPERSON-%s' % self.generateNewId()
-    person = self.portal.person_module.newContent(portal_type='Person',
-        reference=reference)
-    product = self.portal.event_module.newContent(
-        portal_type='Phone Call',
-        destination_value=person,
-        )
-    product.updateLocalRolesOnSecurityGroups()
-    self.assertSecurityGroup(product,
-        ['G-COMPANY', person.getUserId(), self.user_id], False)
-    self.assertRoles(product, 'G-COMPANY', ['Assignor'])
-    self.assertRoles(product, person.getUserId(), ['Auditor'])
-    self.assertRoles(product, self.user_id, ['Owner'])
+class TestSiteMessage(TestMailMessage):
+  event_portal_type = 'Site Message'
+
+class TestWebMessage(TestMailMessage):
+  event_portal_type = 'Web Message'
 
-class TestVisit(TestSlapOSGroupRoleSecurityMixin):
+class TestNote(TestMailMessage):
+  event_portal_type = 'Note'
+
+class TestPhoneCall(TestMailMessage):
+  event_portal_type = 'Phone Call'
+
+class TestVisit(TestMailMessage):
+  event_portal_type = 'Visit'
+
+class TestFaxMessage(TestMailMessage):
+  event_portal_type = 'Fax Message'
+
+class TestLetter(TestMailMessage):
+  event_portal_type = 'Letter'
+
+class TestMeeting(TestSlapOSGroupRoleSecurityMixin):
   def test_GroupCompany(self):
-    product = self.portal.event_module.newContent(
-        portal_type='Visit')
+    product = self.portal.meeting_module.newContent(
+        portal_type='Meeting')
     product.updateLocalRolesOnSecurityGroups()
     self.assertSecurityGroup(product,
         ['G-COMPANY', self.user_id], False)
     self.assertRoles(product, 'G-COMPANY', ['Assignor'])
     self.assertRoles(product, self.user_id, ['Owner'])
 
-  def test_SourceCustomer(self):
-    reference = 'TESTPERSON-%s' % self.generateNewId()
-    person = self.portal.person_module.newContent(portal_type='Person',
-        reference=reference)
-    product = self.portal.event_module.newContent(
-        portal_type='Visit',
-        source_value=person,
-        )
-    product.updateLocalRolesOnSecurityGroups()
-    self.assertSecurityGroup(product,
-        ['G-COMPANY', person.getUserId(), self.user_id], False)
-    self.assertRoles(product, 'G-COMPANY', ['Assignor'])
-    self.assertRoles(product, person.getUserId(), ['Auditor'])
-    self.assertRoles(product, self.user_id, ['Owner'])
-
-  def test_DestinationCustomer(self):
-    reference = 'TESTPERSON-%s' % self.generateNewId()
-    person = self.portal.person_module.newContent(portal_type='Person',
-        reference=reference)
-    product = self.portal.event_module.newContent(
-        portal_type='Visit',
-        destination_value=person,
-        )
-    product.updateLocalRolesOnSecurityGroups()
-    self.assertSecurityGroup(product,
-        ['G-COMPANY', person.getUserId(), self.user_id], False)
-    self.assertRoles(product, 'G-COMPANY', ['Assignor'])
-    self.assertRoles(product, person.getUserId(), ['Auditor'])
-    self.assertRoles(product, self.user_id, ['Owner'])
+class TestMeetingModule(TestSlapOSGroupRoleSecurityMixin):
+  def test(self):
+    module = self.portal.meeting_module
+    self.changeOwnership(module)
+    self.assertSecurityGroup(module,
+        ['G-COMPANY', self.user_id], True)
+    self.assertRoles(module, 'G-COMPANY', ['Auditor', 'Author'])
+    self.assertRoles(module, self.user_id, ['Owner'])
 
 class TestNotificationMessageModule(TestSlapOSGroupRoleSecurityMixin):
   def test(self):
@@ -2195,140 +2092,7 @@ class TestSaleOpportunity(TestSlapOSGroupRoleSecurityMixin):
         ['G-COMPANY', self.user_id], False)
     self.assertRoles(product, 'G-COMPANY', ['Assignor'])
     self.assertRoles(product, self.user_id, ['Owner'])
-
-class TestShortMessage(TestSlapOSGroupRoleSecurityMixin):
-  def test_GroupCompany(self):
-    product = self.portal.event_module.newContent(
-        portal_type='Short Message')
-    product.updateLocalRolesOnSecurityGroups()
-    self.assertSecurityGroup(product,
-        ['G-COMPANY', self.user_id], False)
-    self.assertRoles(product, 'G-COMPANY', ['Assignor'])
-    self.assertRoles(product, self.user_id, ['Owner'])
-
-  def test_SourceCustomer(self):
-    reference = 'TESTPERSON-%s' % self.generateNewId()
-    person = self.portal.person_module.newContent(portal_type='Person',
-        reference=reference)
-    product = self.portal.event_module.newContent(
-        portal_type='Short Message',
-        source_value=person,
-        )
-    product.updateLocalRolesOnSecurityGroups()
-    self.assertSecurityGroup(product,
-        ['G-COMPANY', person.getUserId(), self.user_id], False)
-    self.assertRoles(product, 'G-COMPANY', ['Assignor'])
-    self.assertRoles(product, person.getUserId(), ['Auditor'])
-    self.assertRoles(product, self.user_id, ['Owner'])
-
-  def test_DestinationCustomer(self):
-    reference = 'TESTPERSON-%s' % self.generateNewId()
-    person = self.portal.person_module.newContent(portal_type='Person',
-        reference=reference)
-    product = self.portal.event_module.newContent(
-        portal_type='Short Message',
-        destination_value=person,
-        )
-    product.updateLocalRolesOnSecurityGroups()
-    self.assertSecurityGroup(product,
-        ['G-COMPANY', person.getUserId(), self.user_id], False)
-    self.assertRoles(product, 'G-COMPANY', ['Assignor'])
-    self.assertRoles(product, person.getUserId(), ['Auditor'])
-    self.assertRoles(product, self.user_id, ['Owner'])
-
-class TestSiteMessage(TestSlapOSGroupRoleSecurityMixin):
-  def test_GroupCompany(self):
-    product = self.portal.event_module.newContent(
-        portal_type='Site Message')
-    product.updateLocalRolesOnSecurityGroups()
-    self.assertSecurityGroup(product,
-        ['G-COMPANY', self.user_id], False)
-    self.assertRoles(product, 'G-COMPANY', ['Assignor'])
-    self.assertRoles(product, self.user_id, ['Owner'])
-
-  def test_SourceCustomer(self):
-    reference = 'TESTPERSON-%s' % self.generateNewId()
-    person = self.portal.person_module.newContent(portal_type='Person',
-        reference=reference)
-    product = self.portal.event_module.newContent(
-        portal_type='Site Message',
-        source_value=person,
-        )
-    product.updateLocalRolesOnSecurityGroups()
-    self.assertSecurityGroup(product,
-        ['G-COMPANY', person.getUserId(), self.user_id], False)
-    self.assertRoles(product, 'G-COMPANY', ['Assignor'])
-    self.assertRoles(product, person.getUserId(), ['Auditor'])
-    self.assertRoles(product, self.user_id, ['Owner'])
-
-  def test_DestinationCustomer(self):
-    reference = 'TESTPERSON-%s' % self.generateNewId()
-    person = self.portal.person_module.newContent(portal_type='Person',
-        reference=reference)
-    product = self.portal.event_module.newContent(
-        portal_type='Site Message',
-        destination_value=person,
-        )
-    product.updateLocalRolesOnSecurityGroups()
-    self.assertSecurityGroup(product,
-        ['G-COMPANY', person.getUserId(), self.user_id], False)
-    self.assertRoles(product, 'G-COMPANY', ['Assignor'])
-    self.assertRoles(product, person.getUserId(), ['Auditor'])
-    self.assertRoles(product, self.user_id, ['Owner'])
-
-class TestWebMessage(TestSlapOSGroupRoleSecurityMixin):
-  def test_GroupCompany(self):
-    product = self.portal.event_module.newContent(
-        portal_type='Web Message')
-    product.updateLocalRolesOnSecurityGroups()
-    self.assertSecurityGroup(product,
-        ['G-COMPANY', self.user_id], False)
-    self.assertRoles(product, 'G-COMPANY', ['Assignor'])
-    self.assertRoles(product, self.user_id, ['Owner'])
-
-  def test_SourceCustomer(self):
-    reference = 'TESTPERSON-%s' % self.generateNewId()
-    person = self.portal.person_module.newContent(portal_type='Person',
-        reference=reference)
-    product = self.portal.event_module.newContent(
-        portal_type='Web Message',
-        source_value=person,
-        )
-    product.updateLocalRolesOnSecurityGroups()
-    self.assertSecurityGroup(product,
-        ['G-COMPANY', person.getUserId(), self.user_id], False)
-    self.assertRoles(product, 'G-COMPANY', ['Assignor'])
-    self.assertRoles(product, person.getUserId(), ['Auditor'])
-    self.assertRoles(product, self.user_id, ['Owner'])
-
-  def test_DestinationCustomer(self):
-    reference = 'TESTPERSON-%s' % self.generateNewId()
-    person = self.portal.person_module.newContent(portal_type='Person',
-        reference=reference)
-    product = self.portal.event_module.newContent(
-        portal_type='Web Message',
-        destination_value=person,
-        )
-    product.updateLocalRolesOnSecurityGroups()
-    self.assertSecurityGroup(product,
-        ['G-COMPANY', person.getUserId(), self.user_id], False)
-    self.assertRoles(product, 'G-COMPANY', ['Assignor'])
-    self.assertRoles(product, person.getUserId(), ['Auditor'])
-    self.assertRoles(product, self.user_id, ['Owner'])
-
-  def test_Template(self):
-    product = self.portal.restrictedTraverse(
-        self.portal.portal_preferences.getPreferredWebMessageTemplate())
-    assert product.getPortalType() == 'Web Message'
-    product.updateLocalRolesOnSecurityGroups()
-    self.assertSecurityGroup(product,
-        ['G-COMPANY', product.Base_getOwnerId(), 'R-MEMBER'], False)
-    self.assertRoles(product, 'G-COMPANY', ['Assignor'])
-    self.assertRoles(product, product.Base_getOwnerId(), ['Owner'])
-    self.assertRoles(product, 'R-MEMBER', ['Auditor'])
-    self.assertPermissionsOfRole(product, 'Auditor',
-        ['Access contents information', 'View'])
-
+  
 class TestSupportRequestModule(TestSlapOSGroupRoleSecurityMixin):
   def test(self):
     module = self.portal.support_request_module