diff --git a/master/bt5/slapos_erp5/LocalRolesTemplateItem/assignment_request_module.xml b/master/bt5/slapos_erp5/LocalRolesTemplateItem/assignment_request_module.xml
deleted file mode 100644
index c20800c60597ed3e24331b17803c187d243a4d4d..0000000000000000000000000000000000000000
--- a/master/bt5/slapos_erp5/LocalRolesTemplateItem/assignment_request_module.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<local_roles_item>
- <local_roles>
- <role id='F-PRODUCTION*'>
- <item>Auditor</item>
- </role>
- </local_roles>
- <local_role_group_ids>
- <local_role_group_id id='function'>
- <principal id='F-PRODUCTION*'>Auditor</principal>
- </local_role_group_id>
- </local_role_group_ids>
-</local_roles_item>
\ No newline at end of file
diff --git a/master/bt5/slapos_erp5/LocalRolesTemplateItem/invitation_token_module.xml b/master/bt5/slapos_erp5/LocalRolesTemplateItem/invitation_token_module.xml
index 986ee0a1c23294124b2bc4f78218bd3d700b8217..ed9902d34c97653d887e77c8bedb6b1578637a16 100644
--- a/master/bt5/slapos_erp5/LocalRolesTemplateItem/invitation_token_module.xml
+++ b/master/bt5/slapos_erp5/LocalRolesTemplateItem/invitation_token_module.xml
@@ -1,14 +1,4 @@
<local_roles_item>
<local_roles>
- <role id='F-PRODUCTION*'>
- <item>Auditor</item>
- <item>Author</item>
- </role>
</local_roles>
- <local_role_group_ids>
- <local_role_group_id id='function'>
- <principal id='F-PRODUCTION*'>Auditor</principal>
- <principal id='F-PRODUCTION*'>Author</principal>
- </local_role_group_id>
- </local_role_group_ids>
</local_roles_item>
\ No newline at end of file
diff --git a/master/bt5/slapos_erp5/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml b/master/bt5/slapos_erp5/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
index ab5a13e41fa8c3b1a3e66c13937d06be94c8d44a..ddfc57b63b34bcc6d138af28ed48b8f8c559bfaf 100644
--- a/master/bt5/slapos_erp5/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
+++ b/master/bt5/slapos_erp5/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
@@ -3,6 +3,7 @@
<item>Cloud Contract Line</item>
</portal_type>
<portal_type id="Invitation Token Module">
+ <item>Contract Invitation Token</item>
<item>Invitation Token</item>
</portal_type>
<portal_type id="Organisation">
diff --git a/master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Assignment%20Request%20Module.xml b/master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Assignment%20Request%20Module.xml
deleted file mode 100644
index 8a6eb593209cdc2c728679e7111437142739728a..0000000000000000000000000000000000000000
--- a/master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Assignment%20Request%20Module.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<type_roles>
- <role id='Auditor'>
- <property id='title'>Production</property>
- <multi_property id='categories'>local_role_group/function</multi_property>
- <multi_property id='category'>function/production*</multi_property>
- <multi_property id='base_category'>function</multi_property>
- </role>
-</type_roles>
\ No newline at end of file
diff --git a/master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Assignment%20Request.xml b/master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Assignment%20Request.xml
deleted file mode 100644
index 600ebe860dd0f884a53c0e7a8e5bb4f3e5abf22f..0000000000000000000000000000000000000000
--- a/master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Assignment%20Request.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<type_roles>
-</type_roles>
\ No newline at end of file
diff --git a/master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Invitation%20Token%20Module.xml b/master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Invitation%20Token%20Module.xml
index 342641d5a755bdcc399b48595fa694ea2e07c56b..600ebe860dd0f884a53c0e7a8e5bb4f3e5abf22f 100644
--- a/master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Invitation%20Token%20Module.xml
+++ b/master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Invitation%20Token%20Module.xml
@@ -1,8 +1,2 @@
<type_roles>
- <role id='Auditor; Author'>
- <property id='title'>Production</property>
- <multi_property id='categories'>local_role_group/function</multi_property>
- <multi_property id='category'>function/production*</multi_property>
- <multi_property id='base_category'>function</multi_property>
- </role>
</type_roles>
\ No newline at end of file
diff --git a/master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Invitation%20Token.xml b/master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Invitation%20Token.xml
deleted file mode 100644
index 6273fe0f65e5359ed93ee713815daa5723ab6ce5..0000000000000000000000000000000000000000
--- a/master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Invitation%20Token.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<type_roles>
- <role id='Assignee'>
- <property id='title'>Destination Project Production Agent</property>
- <property id='description'>XXX add local role group</property>
- <property id='condition'>python: context.getDestinationProject('', portal_type='Project') != ""</property>
- <property id='base_category_script'>ERP5Type_getSecurityCategoryFromContent</property>
- <multi_property id='categories'>local_role_group/project</multi_property>
- <multi_property id='category'>function/production/agent</multi_property>
- <multi_property id='base_category'>destination_project</multi_property>
- </role>
- <role id='Assignor'>
- <property id='title'>Destination Project Production Manager</property>
- <property id='description'>XXX add local role group</property>
- <property id='condition'>python: context.getDestinationProject('', portal_type='Project') != ""</property>
- <property id='base_category_script'>ERP5Type_getSecurityCategoryFromContent</property>
- <multi_property id='categories'>local_role_group/project</multi_property>
- <multi_property id='category'>function/production/manager</multi_property>
- <multi_property id='base_category'>destination_project</multi_property>
- </role>
-</type_roles>
\ No newline at end of file
diff --git a/master/bt5/slapos_erp5/PortalTypeTemplateItem/portal_types/Invitation%20Token.xml b/master/bt5/slapos_erp5/PortalTypeTemplateItem/portal_types/Invitation%20Token.xml
index 1a2a153dadd5fb3b014258306eb993f8f5773219..6838116df63b30878d4d36da445272e207ec8997 100644
--- a/master/bt5/slapos_erp5/PortalTypeTemplateItem/portal_types/Invitation%20Token.xml
+++ b/master/bt5/slapos_erp5/PortalTypeTemplateItem/portal_types/Invitation%20Token.xml
@@ -42,15 +42,9 @@
<key> <string>portal_type</string> </key>
<value> <string>Base Type</string> </value>
</item>
- <item>
- <key> <string>short_title</string> </key>
- <value>
- <none/>
- </value>
- </item>
<item>
<key> <string>type_class</string> </key>
- <value> <string>Ticket</string> </value>
+ <value> <string>XMLObject</string> </value>
</item>
<item>
<key> <string>type_interface</string> </key>
diff --git a/master/bt5/slapos_erp5/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml b/master/bt5/slapos_erp5/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
index b0148aad1428657d2c554f7e42f53a16f137fcc1..4e5980743621d3c9c006cd31e3a62b943962b8f0 100644
--- a/master/bt5/slapos_erp5/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
+++ b/master/bt5/slapos_erp5/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
@@ -77,7 +77,7 @@
</chain>
<chain>
<type>Invitation Token</type>
- <workflow>edit_workflow, local_permission_slapos_interaction_workflow, validation_workflow</workflow>
+ <workflow>edit_workflow, validation_workflow</workflow>
</chain>
<chain>
<type>Mail Message</type>
diff --git a/master/bt5/slapos_erp5/TestTemplateItem/portal_components/test.erp5.testSlapOSERP5GroupRoleSecurity.py b/master/bt5/slapos_erp5/TestTemplateItem/portal_components/test.erp5.testSlapOSERP5GroupRoleSecurity.py
index eb28a8f9b6d6eb95c15ec784781395224c46ec8c..58e57193290d989ca5e2e55b6da74a36896d4e78 100644
--- a/master/bt5/slapos_erp5/TestTemplateItem/portal_components/test.erp5.testSlapOSERP5GroupRoleSecurity.py
+++ b/master/bt5/slapos_erp5/TestTemplateItem/portal_components/test.erp5.testSlapOSERP5GroupRoleSecurity.py
@@ -1015,15 +1015,6 @@ class TestSoftwareProduct(TestSlapOSGroupRoleSecurityMixin):
self.assertRoles(product, '%s_F-CUSTOMER' % project.getReference(), ['Auditor'])
-class TestInvitationTokenModule(TestSlapOSGroupRoleSecurityMixin):
- def test_InvitationTokenModule(self):
- module = self.portal.invitation_token_module
- self.assertSecurityGroup(module,
- ['F-PRODUCTION*', module.Base_getOwnerId()], False)
- self.assertRoles(module, 'F-PRODUCTION*', ['Auditor', 'Author'])
- self.assertRoles(module, module.Base_getOwnerId(), ['Owner'])
-
-
class TestSupportRequestModule(TestSlapOSGroupRoleSecurityMixin):
def test_SupportRequestModule(self):
module = self.portal.support_request_module
@@ -1035,30 +1026,6 @@ class TestSupportRequestModule(TestSlapOSGroupRoleSecurityMixin):
self.assertRoles(module, module.Base_getOwnerId(), ['Owner'])
-class TestInvitationToken(TestSlapOSGroupRoleSecurityMixin):
- ticket_portal_type = 'Invitation Token'
-
- def test_InvitationToken_default(self):
- support_request = self.portal.getDefaultModuleValue(self.ticket_portal_type).newContent(
- portal_type=self.ticket_portal_type)
- self.assertSecurityGroup(support_request,
- [self.user_id], False)
- self.assertRoles(support_request, self.user_id, ['Owner'])
-
- def test_InvitationToken_DestinationProject(self):
- project = self.addProject()
- support_request = self.portal.getDefaultModuleValue(self.ticket_portal_type).newContent(
- portal_type=self.ticket_portal_type)
- support_request.edit(
- destination_project_value=project)
- self.assertSecurityGroup(support_request, [self.user_id,
- '%s_F-PRODAGNT' % project.getReference(),
- '%s_F-PRODMAN' % project.getReference()], False)
- self.assertRoles(support_request, self.user_id, ['Owner'])
- self.assertRoles(support_request, '%s_F-PRODMAN' % project.getReference(), ['Assignor'])
- self.assertRoles(support_request, '%s_F-PRODAGNT' % project.getReference(), ['Assignee'])
-
-
class TestSupportRequest(TestSlapOSGroupRoleSecurityMixin):
ticket_portal_type = 'Support Request'
diff --git a/master/bt5/slapos_erp5/WorkflowTemplateItem/portal_workflow/local_permission_slapos_interaction_workflow/interaction_SupportRequest_edit.xml b/master/bt5/slapos_erp5/WorkflowTemplateItem/portal_workflow/local_permission_slapos_interaction_workflow/interaction_SupportRequest_edit.xml
index dadc23223d557bd31b73a69cfa4ec1f0d00ecc09..310c8b1084b1dcf4e9724d3e8d16deeceb3ee3e7 100644
--- a/master/bt5/slapos_erp5/WorkflowTemplateItem/portal_workflow/local_permission_slapos_interaction_workflow/interaction_SupportRequest_edit.xml
+++ b/master/bt5/slapos_erp5/WorkflowTemplateItem/portal_workflow/local_permission_slapos_interaction_workflow/interaction_SupportRequest_edit.xml
@@ -35,7 +35,6 @@
<string>Support Request</string>
<string>Upgrade Decision</string>
<string>Regularisation Request</string>
- <string>Invitation Token</string>
</tuple>
</value>
</item>
diff --git a/master/bt5/slapos_erp5/bt/template_local_role_list b/master/bt5/slapos_erp5/bt/template_local_role_list
index e3dc254a4db2e3c58d15e29480d0e093b9849bed..e51ba894683fa51084f58468464abe085d465a01 100644
--- a/master/bt5/slapos_erp5/bt/template_local_role_list
+++ b/master/bt5/slapos_erp5/bt/template_local_role_list
@@ -14,7 +14,6 @@ account_module/refundable_vat
account_module/sales
accounting_module
allocation_supply_module
-assignment_request_module
business_process_module
business_process_module/slapos_sale_subscription_business_process
cloud_contract_module
diff --git a/master/bt5/slapos_erp5/bt/template_portal_type_allowed_content_type_list b/master/bt5/slapos_erp5/bt/template_portal_type_allowed_content_type_list
index c30a93ed29892987ac6352db2c364c50dd2c4f06..201f3a28808792964381862c5dff65f3de220b1c 100644
--- a/master/bt5/slapos_erp5/bt/template_portal_type_allowed_content_type_list
+++ b/master/bt5/slapos_erp5/bt/template_portal_type_allowed_content_type_list
@@ -1,4 +1,5 @@
Contract Invitation Token | Cloud Contract Line
+Invitation Token Module | Contract Invitation Token
Invitation Token Module | Invitation Token
Organisation | Geographical Area
Organisation | Geographical Location
\ No newline at end of file
diff --git a/master/bt5/slapos_erp5/bt/template_portal_type_role_list b/master/bt5/slapos_erp5/bt/template_portal_type_role_list
index 5350588ab384f6204a8099f1cc7881588a063ac7..4ca286a21f2fc23dc7a2c38189bc6633240e5f69 100644
--- a/master/bt5/slapos_erp5/bt/template_portal_type_role_list
+++ b/master/bt5/slapos_erp5/bt/template_portal_type_role_list
@@ -8,8 +8,6 @@ Acknowledgement
Allocation Supply
Allocation Supply Module
Assignment
-Assignment Request
-Assignment Request Module
Balance Transaction
Bank Account
Business Process
@@ -47,7 +45,6 @@ Instance Tree
Instance Tree Module
Integration Site
Integration Tool
-Invitation Token
Invitation Token Module
Letter
Mail Message
diff --git a/master/bt5/slapos_erp5/bt/template_portal_type_workflow_chain_list b/master/bt5/slapos_erp5/bt/template_portal_type_workflow_chain_list
index aba7928c99e330f2fb3a0e176f00cdd8e43e41ec..a87d9e0bc3bd68d7082fcc8f5562d94154cba6a5 100644
--- a/master/bt5/slapos_erp5/bt/template_portal_type_workflow_chain_list
+++ b/master/bt5/slapos_erp5/bt/template_portal_type_workflow_chain_list
@@ -21,7 +21,6 @@ Inventory Cell | -immobilisation_movement_interaction_workflow
Inventory Line | -immobilisation_movement_interaction_workflow
Inventory | -immobilisation_movement_interaction_workflow
Invitation Token | edit_workflow
-Invitation Token | local_permission_slapos_interaction_workflow
Invitation Token | validation_workflow
Mail Message | local_permission_slapos_interaction_workflow
Open Sale Order | local_permission_slapos_interaction_workflow