slapos_cloud&slapos_erp5: New security with security_uids

  slapos_erp5: release new security with local_role_group_id
  slapos_cloud: include more security_uids columns
  slapos_cloud: set extra security_uids configuration.
  slapos_erp5: Remove duplicated entry on roles
  slapos_erp5: Assignee on [Software/Slave] Instance comes from the Hosting Subscription
  slapos_configurator: erp5_security_uid_innodb_catalog is installed now.
  slapos_erp5: Software Installation, Owner shoulnd't be the Assignee but the Requester.
  slapos_erp5: Update RoleSecurity Tests
  slapos_cloud: testSlapOSCloudWorkflow, New security requires Slave Instance be linked to a HS
  slapos_erp5: R-SHADOW-PERSON is only present on Payments w/o Destination Section

master/bt5/slapos_accounting/TestTemplateItem/portal_components/test.erp5.testSlapOSContractAlarm.py

@@ -78,6 +78,7 @@ portal_workflow.doActionFor(context, action='edit_action', comment='Visited by S
     preference =  self.portal.portal_preferences.getActiveSystemPreference()
     preference.setPreferredCloudContractEnabled(False)
     self.tic()
+    self.clearCache()
 
     self._simulateSoftwareInstance_requestValidationPayment()
     try:

master/bt5/slapos_cloud/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_no_workflow_date_object_list.sql

 REPLACE INTO
   catalog
-  (`uid`, `security_uid`, `owner`, `viewable_owner`, `path`, `relative_url`, `parent_uid`, `id`, `description`, `title`, `meta_type`,
+  (`uid`, `security_uid`, `group_security_uid`, `shadow_security_uid`, `computer_security_uid`,`user_security_uid`, `subscription_security_uid`, `owner`, `viewable_owner`, `path`, `relative_url`, `parent_uid`, `id`, `description`, `title`, `meta_type`,
    `portal_type`, `opportunity_state`, `corporate_registration_code`, `ean13_code`, `validation_state`, `simulation_state`,
    `causality_state`, `invoice_state`, `payment_state`, `event_state`, `immobilisation_state`, `reference`, `grouping_reference`,
    `source_reference`, `destination_reference`, `string_index`, `int_index`, `float_index`, `has_cell_content`, `modification_date`)
 VALUES
 <dtml-in prefix="loop" expr="_.range(_.len(uid))">
 (
-  <dtml-sqlvar expr="uid[loop_item]" type="int">,  
+  <dtml-sqlvar expr="uid[loop_item]" type="int">,
   <dtml-sqlvar expr="security_uid[loop_item]" type="int">,
+  <dtml-sqlvar expr="group_security_uid[loop_item]" type="int" optional>,
+  <dtml-sqlvar expr="shadow_security_uid[loop_item]" type="int" optional>,
+  <dtml-sqlvar expr="computer_security_uid[loop_item]" type="int" optional>,
+  <dtml-sqlvar expr="user_security_uid[loop_item]" type="int" optional>,
+  <dtml-sqlvar expr="subscription_security_uid[loop_item]" type="int" optional>,
   <dtml-sqlvar expr="getOwnerInfo[loop_item]['id']" type="string">,
   <dtml-sqlvar expr="(getViewPermissionOwner[loop_item] is not None) and getViewPermissionOwner[loop_item] or ''" type="string" optional>,
   <dtml-sqlvar expr="getPath[loop_item]" type="string">,

master/bt5/slapos_cloud/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_no_workflow_date_object_list.xml

@@ -8,42 +8,45 @@
       <dictionary>
         <item>
             <key> <string>allow_simple_one_argument_traversal</string> </key>
-            <value>
-              <none/>
-            </value>
+            <value> <int>0</int> </value>
         </item>
         <item>
             <key> <string>arguments_src</string> </key>
-            <value> <string>uid\r\n
-security_uid\r\n
-getOwnerInfo\r\n
-getViewPermissionOwner\r\n
-getPath\r\n
-getRelativeUrl\r\n
-getParentUid\r\n
-id\r\n
-getDescription\r\n
-getTitle\r\n
-meta_type\r\n
-getPortalType\r\n
-getOpportunityState\r\n
-getCorporateRegistrationCode\r\n
-getEan13Code\r\n
-getSimulationState\r\n
-getCausalityState\r\n
-getInvoiceState\r\n
-getValidationState\r\n
-getPaymentState\r\n
-getEventState\r\n
-getImmobilisationState\r\n
-getReference\r\n
-getGroupingReference\r\n
-getSourceReference\r\n
-getDestinationReference\r\n
-getStringIndex\r\n
-getIntIndex\r\n
-getFloatIndex\r\n
-hasCellContent\r\n
+            <value> <string>uid\n
+security_uid\n
+group_security_uid\n
+shadow_security_uid\n
+computer_security_uid\n
+subscription_security_uid\n
+user_security_uid\n
+getOwnerInfo\n
+getViewPermissionOwner\n
+getPath\n
+getRelativeUrl\n
+getParentUid\n
+id\n
+getDescription\n
+getTitle\n
+meta_type\n
+getPortalType\n
+getOpportunityState\n
+getCorporateRegistrationCode\n
+getEan13Code\n
+getSimulationState\n
+getCausalityState\n
+getInvoiceState\n
+getValidationState\n
+getPaymentState\n
+getEventState\n
+getImmobilisationState\n
+getReference\n
+getGroupingReference\n
+getSourceReference\n
+getDestinationReference\n
+getStringIndex\n
+getIntIndex\n
+getFloatIndex\n
+hasCellContent\n
 getModificationDate</string> </value>
         </item>
         <item>
@@ -52,11 +55,15 @@ getModificationDate</string> </value>
         </item>
         <item>
             <key> <string>class_file_</string> </key>
-            <value> <string></string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>class_name_</string> </key>
-            <value> <string></string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>connection_hook</string> </key>
@@ -108,7 +115,7 @@ getModificationDate</string> </value>
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string></string> </value>
+            <value> <string>z_catalog_no_workflow_date_object_list</string> </value>
         </item>
         <item>
             <key> <string>type</string> </key>

master/bt5/slapos_cloud/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_object_list.sql

 REPLACE INTO
   catalog
-  (`uid`, `security_uid`, `owner`, `viewable_owner`, `path`, `relative_url`, `parent_uid`, `id`, `description`, `title`, `meta_type`,
+  (`uid`, `security_uid`, `group_security_uid`, `shadow_security_uid`, `computer_security_uid`,`user_security_uid`, `subscription_security_uid`, `owner`, `viewable_owner`, `path`, `relative_url`, `parent_uid`, `id`, `description`, `title`, `meta_type`,
    `portal_type`, `opportunity_state`, `corporate_registration_code`, `ean13_code`, `validation_state`, `simulation_state`,
    `causality_state`, `invoice_state`, `payment_state`, `event_state`, `immobilisation_state`, `reference`, `grouping_reference`, `grouping_date`,
    `source_reference`, `destination_reference`, `string_index`, `int_index`, `float_index`, `has_cell_content`, `creation_date`,
@@ -8,8 +8,13 @@ REPLACE INTO
 VALUES
 <dtml-in prefix="loop" expr="_.range(_.len(uid))">
 (
-  <dtml-sqlvar expr="uid[loop_item]" type="int">,  
+  <dtml-sqlvar expr="uid[loop_item]" type="int">,
   <dtml-sqlvar expr="security_uid[loop_item]" type="int">,
+  <dtml-sqlvar expr="group_security_uid[loop_item]" type="int" optional>,
+  <dtml-sqlvar expr="shadow_security_uid[loop_item]" type="int" optional>,
+  <dtml-sqlvar expr="computer_security_uid[loop_item]" type="int" optional>,
+  <dtml-sqlvar expr="user_security_uid[loop_item]" type="int" optional>,
+  <dtml-sqlvar expr="subscription_security_uid[loop_item]" type="int" optional>,
   <dtml-sqlvar expr="getOwnerInfo[loop_item]['id']" type="string">,
   <dtml-sqlvar expr="(getViewPermissionOwner[loop_item] is not None) and getViewPermissionOwner[loop_item] or ''" type="string" optional>,
   <dtml-sqlvar expr="getPath[loop_item]" type="string">,

master/bt5/slapos_cloud/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_object_list.xml

@@ -8,44 +8,47 @@
       <dictionary>
         <item>
             <key> <string>allow_simple_one_argument_traversal</string> </key>
-            <value>
-              <none/>
-            </value>
+            <value> <int>0</int> </value>
         </item>
         <item>
             <key> <string>arguments_src</string> </key>
-            <value> <string>uid\r\n
-security_uid\r\n
-getOwnerInfo\r\n
-getViewPermissionOwner\r\n
-getPath\r\n
-getRelativeUrl\r\n
-getParentUid\r\n
-id\r\n
-getDescription\r\n
-getTitle\r\n
-meta_type\r\n
-getPortalType\r\n
-getOpportunityState\r\n
-getCorporateRegistrationCode\r\n
-getEan13Code\r\n
-getSimulationState\r\n
-getCausalityState\r\n
-getInvoiceState\r\n
-getValidationState\r\n
-getPaymentState\r\n
-getEventState\r\n
-getImmobilisationState\r\n
-getReference\r\n
-getGroupingReference\r\n
-getGroupingDate\r\n
-getSourceReference\r\n
-getDestinationReference\r\n
-getStringIndex\r\n
-getIntIndex\r\n
-getFloatIndex\r\n
-hasCellContent\r\n
-getCreationDate\r\n
+            <value> <string>uid\n
+security_uid\n
+group_security_uid\n
+shadow_security_uid\n
+computer_security_uid\n
+user_security_uid\n
+subscription_security_uid\n
+getOwnerInfo\n
+getViewPermissionOwner\n
+getPath\n
+getRelativeUrl\n
+getParentUid\n
+id\n
+getDescription\n
+getTitle\n
+meta_type\n
+getPortalType\n
+getOpportunityState\n
+getCorporateRegistrationCode\n
+getEan13Code\n
+getSimulationState\n
+getCausalityState\n
+getInvoiceState\n
+getValidationState\n
+getPaymentState\n
+getEventState\n
+getImmobilisationState\n
+getReference\n
+getGroupingReference\n
+getGroupingDate\n
+getSourceReference\n
+getDestinationReference\n
+getStringIndex\n
+getIntIndex\n
+getFloatIndex\n
+hasCellContent\n
+getCreationDate\n
 getModificationDate</string> </value>
         </item>
         <item>
@@ -54,11 +57,15 @@ getModificationDate</string> </value>
         </item>
         <item>
             <key> <string>class_file_</string> </key>
-            <value> <string></string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>class_name_</string> </key>
-            <value> <string></string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>connection_hook</string> </key>
@@ -72,20 +79,12 @@ getModificationDate</string> </value>
         </item>
         <item>
             <key> <string>expression</string> </key>
-            <value> <string>python: context.getPortalType() not in (\'Software Instance\', \'Slave Instance\', \'Computer\', \'Computer Partition\', \'Sale Order\')</string> </value>
+            <value> <string>python: context.getPortalType() not in (\'Software Instance\', \'Slave Instance\', \'Computer\', \'Computer Partition\', \'Sale Order\') </string> </value>
         </item>
         <item>
             <key> <string>expression_cache_key</string> </key>
             <value>
-              <tuple>
-                <string>portal_type</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>expression_instance</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+              <tuple/>
             </value>
         </item>
         <item>
@@ -110,26 +109,7 @@ getModificationDate</string> </value>
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>type</string> </key>
-            <value>
-              <tuple/>
-            </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="2" aka="AAAAAAAAAAI=">
-    <pickle>
-      <global name="Expression" module="Products.CMFCore.Expression"/>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>text</string> </key>
-            <value> <string>python: context.getPortalType() not in (\'Software Instance\', \'Slave Instance\', \'Computer\', \'Computer Partition\', \'Sale Order\')</string> </value>
+            <value> <string>z_catalog_object_list</string> </value>
         </item>
       </dictionary>
     </pickle>

master/bt5/slapos_cloud/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_catalog.catalog_keys.xml

+<catalog_method>
+ <item key="sql_clear_catalog" type="int">
+  <value>1</value>
+ </item>
+</catalog_method>

master/bt5/slapos_cloud/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_catalog.sql

+# Host:
+# Database: test
+# Table: 'catalog'
+#
+CREATE TABLE `catalog` (
+  `uid` BIGINT UNSIGNED NOT NULL,
+  `security_uid` INT UNSIGNED,
+  `group_security_uid` INT UNSIGNED,
+  `shadow_security_uid` INT UNSIGNED,
+  `computer_security_uid` INT UNSIGNED,
+  `user_security_uid` INT UNSIGNED,
+  `subscription_security_uid` INT UNSIGNED,
+  `owner` varbinary(255) NOT NULL default '',
+  `viewable_owner` varbinary(255) NOT NULL default '',
+  `path` varchar(255) NOT NULL default '',
+  `relative_url` varchar(255) NOT NULL default '',
+  `parent_uid` BIGINT UNSIGNED default '0',
+  `id` varchar(255) default '',
+  `description` text,
+  `title` varchar(255) default '',
+  `meta_type` varchar(255) default '',
+  `portal_type` varchar(255) default '',
+  `opportunity_state` varchar(255) default '',
+  `corporate_registration_code` varchar(255),
+  `ean13_code` varchar(255),
+  `validation_state` varchar(255) default '',
+  `simulation_state` varchar(255) default '',
+  `causality_state` varchar(255) default '',
+  `invoice_state` varchar(255) default '',
+  `payment_state` varchar(255) default '',
+  `event_state` varchar(255) default '',
+  `immobilisation_state` varchar(255) default '',
+  `reference` varchar(255) binary default '',
+  `grouping_reference` varchar(255) default '',
+  `grouping_date` datetime,
+  `source_reference` varchar(255) default '',
+  `destination_reference` varchar(255) default '',
+  `string_index` varchar(255),
+  `int_index` INT,
+  `float_index` real,
+  `has_cell_content` bool,
+  `creation_date` datetime,
+  `modification_date` datetime,
+  `indexation_timestamp` TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  PRIMARY KEY  (`uid`),
+  KEY `security_uid` (`security_uid`),
+  KEY `group_security_uid` (`group_security_uid`),
+  KEY `shadow_security_uid` (`shadow_security_uid`),
+  KEY `computer_security_uid` (`computer_security_uid`),
+  KEY `user_security_uid` (`user_security_uid`),
+  KEY `subscription_security_uid` (`subscription_security_uid`),
+  KEY `owner` (`owner`),
+  KEY `viewable_owner` (`viewable_owner`),
+  KEY `Parent` (`parent_uid`),
+  KEY `Path` (`path`),
+  KEY `Title` (`title`),
+  KEY `Reference` (`reference`),
+  KEY `relative_url` (`relative_url`),
+  KEY `Portal Type` (`portal_type`, `reference`),
+  KEY `opportunity_state` (`opportunity_state`),
+  KEY `validation_state_portal_type` (`validation_state`, `portal_type`),
+  KEY `simulation_state_portal_type` (`simulation_state`, `portal_type`),
+  KEY `causality_state_portal_type` (`causality_state`, `portal_type`),
+  KEY `invoice_state` (`invoice_state`),
+  KEY `payment_state` (`payment_state`),
+  KEY `event_state` (`event_state`)
+) ENGINE=InnoDB;

master/bt5/slapos_cloud/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_catalog.xml

+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="SQL Method" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_col</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>allow_simple_one_argument_traversal</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>arguments_src</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>cache_time_</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>class_file_</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>class_name_</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>connection_hook</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>connection_id</string> </key>
+            <value> <string>erp5_sql_connection</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>z_create_catalog</string> </value>
+        </item>
+        <item>
+            <key> <string>max_cache_</string> </key>
+            <value> <int>100</int> </value>
+        </item>
+        <item>
+            <key> <string>max_rows_</string> </key>
+            <value> <int>1000</int> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>SQL Method</string> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>z_create_catalog</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

master/bt5/slapos_cloud/CatalogSecurityUidColumnTemplateItem/security_uid_column_list.xml

+<key_list>
+ <key>computer | computer_security_uid</key>
+ <key>group | group_security_uid</key>
+ <key>shadow | shadow_security_uid</key>
+ <key>subscription | subscription_security_uid</key>
+ <key>user | user_security_uid</key>
+</key_list>
\ No newline at end of file

master/bt5/slapos_cloud/TestTemplateItem/portal_components/test.erp5.testSlapOSCloudWorkflow.py

@@ -2676,12 +2676,20 @@ class TestSlapOSCoreSlapOSCloudInteractionWorkflow(SlapOSTestCaseMixin):
     self.person_user = self.makePerson()
     self.login(self.person_user.getUserId())
 
-    new_id = self.generateNewId()
+    # Hosting Subscription required for security.
+    hs = self.portal.hosting_subscription_module.newContent(
+      portal_type='Hosting Subscription',
+      title="HS %s for %s" % (self.new_id, self.person_user.getReference()),
+      reference="TESTHS-%s" % self.new_id,
+      destination_reference="TESTHS-%s" % self.new_id,
+      destination_section=self.person_user.getRelativeUrl()
+      )
 
     instance = self.portal.software_instance_module.newContent(
       portal_type=portal_type,
-      title="Instance %s for %s" % (new_id, self.person_user.getReference()),
-      reference="TESTINST-%s" % new_id)
+      title="Instance %s for %s" % (self.new_id, self.person_user.getReference()),
+      reference="TESTINST-%s" % self.new_id,
+      specialise_value=hs)
 
     if portal_type == "Software Instance":
       self._addERP5Login(instance)
@@ -2717,11 +2725,22 @@ class TestSlapOSCoreSlapOSCloudInteractionWorkflow(SlapOSTestCaseMixin):
     self.person_user = self.makePerson()
     self.login(self.person_user.getUserId())
 
+    # Hosting Subscription required for security.
+    hs = self.portal.hosting_subscription_module.newContent(
+      portal_type='Hosting Subscription',
+      title="HS %s for %s" % (self.new_id, self.person_user.getReference()),
+      reference="TESTHS-%s" % self.new_id,
+      destination_reference="TESTHS-%s" % self.new_id,
+      destination_section=self.person_user.getRelativeUrl()
+      )
+
     instance = self.portal.software_instance_module.newContent(
       portal_type='Slave Instance',
       title="Instance %s for %s" % (self.new_id, self.person_user.getReference()),
       reference="TESTINST-%s" % self.new_id,
       destination_reference="TESTINST-%s" % self.new_id,
+      destination_section=self.person_user.getRelativeUrl(),
+      specialise_value=hs
       )
     request_kw = dict(
       software_release='http://example.org',

master/bt5/slapos_cloud/bt/dependency_list

 erp5_item
 erp5_computer_immobilisation
-erp5_software_pdm
+erp5_software_pdm
\ No newline at end of file
+erp5_security_uid_innodb_catalog
\ No newline at end of file

master/bt5/slapos_cloud/bt/template_catalog_method_id_list

@@ -12,6 +12,7 @@ erp5_mysql_innodb/z_catalog_no_workflow_date_object_list
 erp5_mysql_innodb/z_catalog_object_list
 erp5_mysql_innodb/z_catalog_slapos_item_list
 erp5_mysql_innodb/z_catalog_software_instance_list
+erp5_mysql_innodb/z_create_catalog
 erp5_mysql_innodb/z_create_computer_partition
 erp5_mysql_innodb/z_create_item
 erp5_mysql_innodb/z_create_slapos_item

master/bt5/slapos_cloud/bt/template_catalog_security_uid_column_list

+group | group_security_uid
+shadow | shadow_security_uid
+computer | computer_security_uid
+user | user_security_uid
+subscription | subscription_security_uid
\ No newline at end of file

master/bt5/slapos_configurator/TestTemplateItem/portal_components/test.erp5.testSlapOSConfigurator.py

@@ -246,6 +246,7 @@ class TestSlapOSConfigurator(SlapOSTestCaseMixin):
       'erp5_crm',
       'erp5_system_event',
       'erp5_secure_payment',
+      'erp5_security_uid_innodb_catalog',
       'erp5_payzen_secure_payment',
       'erp5_ooo_import',
       'erp5_odt_style',
@@ -312,4 +313,4 @@ class TestSlapOSConfigurator(SlapOSTestCaseMixin):
       'slapos_erp5',
     ]
     self.assertSameSet(expected_business_template_list,
-      self.portal.portal_templates.getInstalledBusinessTemplateTitleList())
+      self.portal.portal_templates.getInstalledBusinessTemplateTitleList())
\ No newline at end of file

master/bt5/slapos_erp5/LocalRolesTemplateItem/access_token_module.xml

@@ -8,4 +8,13 @@
    <item>Author</item>
   </role>
  </local_roles>
+ <local_role_group_ids>
+  <local_role_group_id id='group'>
+    <principal id='G-COMPANY'>Auditor</principal>
+    <principal id='G-COMPANY'>Author</principal>
+  </local_role_group_id>
+  <local_role_group_id id='user'>
+    <principal id='R-MEMBER'>Author</principal>
+  </local_role_group_id>
+ </local_role_group_ids>
 </local_roles_item>
\ No newline at end of file

master/bt5/slapos_erp5/LocalRolesTemplateItem/account_module.xml

@@ -11,4 +11,16 @@
    <item>Auditor</item>
   </role>
  </local_roles>
+ <local_role_group_ids>
+  <local_role_group_id id='group'>
+    <principal id='G-COMPANY'>Auditor</principal>
+    <principal id='G-COMPANY'>Author</principal>
+  </local_role_group_id>
+  <local_role_group_id id='shadow'>
+    <principal id='R-SHADOW-PERSON'>Auditor</principal>
+  </local_role_group_id>
+  <local_role_group_id id='user'>
+    <principal id='R-MEMBER'>Auditor</principal>
+  </local_role_group_id>
+ </local_role_group_ids>
 </local_roles_item>
\ No newline at end of file

master/bt5/slapos_erp5/LocalRolesTemplateItem/account_module/bank.xml

@@ -10,4 +10,15 @@
    <item>Auditor</item>
   </role>
  </local_roles>
+ <local_role_group_ids>
+  <local_role_group_id id='group'>
+    <principal id='G-COMPANY'>Assignor</principal>
+  </local_role_group_id>
+  <local_role_group_id id='shadow'>
+    <principal id='R-SHADOW-PERSON'>Auditor</principal>
+  </local_role_group_id>
+  <local_role_group_id id='user'>
+    <principal id='R-MEMBER'>Auditor</principal>
+  </local_role_group_id>
+ </local_role_group_ids>
 </local_roles_item>
\ No newline at end of file

master/bt5/slapos_erp5/LocalRolesTemplateItem/account_module/capital.xml

@@ -10,4 +10,15 @@
    <item>Auditor</item>
   </role>
  </local_roles>
+ <local_role_group_ids>
+  <local_role_group_id id='group'>
+    <principal id='G-COMPANY'>Assignor</principal>
+  </local_role_group_id>
+  <local_role_group_id id='shadow'>
+    <principal id='R-SHADOW-PERSON'>Auditor</principal>
+  </local_role_group_id>
+  <local_role_group_id id='user'>
+    <principal id='R-MEMBER'>Auditor</principal>
+  </local_role_group_id>
+ </local_role_group_ids>
 </local_roles_item>
\ No newline at end of file

master/bt5/slapos_erp5/LocalRolesTemplateItem/account_module/coll_vat.xml

@@ -10,4 +10,15 @@
    <item>Auditor</item>
   </role>
  </local_roles>
+ <local_role_group_ids>
+  <local_role_group_id id='group'>
+    <principal id='G-COMPANY'>Assignor</principal>
+  </local_role_group_id>
+  <local_role_group_id id='shadow'>
+    <principal id='R-SHADOW-PERSON'>Auditor</principal>
+  </local_role_group_id>
+  <local_role_group_id id='user'>
+    <principal id='R-MEMBER'>Auditor</principal>
+  </local_role_group_id>
+ </local_role_group_ids>
 </local_roles_item>
\ No newline at end of file

master/bt5/slapos_erp5/LocalRolesTemplateItem/account_module/equipments.xml

@@ -10,4 +10,15 @@
    <item>Auditor</item>
   </role>
  </local_roles>
+ <local_role_group_ids>
+  <local_role_group_id id='group'>
+    <principal id='G-COMPANY'>Assignor</principal>
+  </local_role_group_id>
+  <local_role_group_id id='shadow'>
+    <principal id='R-SHADOW-PERSON'>Auditor</principal>
+  </local_role_group_id>
+  <local_role_group_id id='user'>
+    <principal id='R-MEMBER'>Auditor</principal>
+  </local_role_group_id>
+ </local_role_group_ids>
 </local_roles_item>
\ No newline at end of file

master/bt5/slapos_erp5/LocalRolesTemplateItem/account_module/inventories.xml

@@ -10,4 +10,15 @@
    <item>Auditor</item>
   </role>
  </local_roles>
+ <local_role_group_ids>
+  <local_role_group_id id='group'>
+    <principal id='G-COMPANY'>Assignor</principal>
+  </local_role_group_id>
+  <local_role_group_id id='shadow'>
+    <principal id='R-SHADOW-PERSON'>Auditor</principal>
+  </local_role_group_id>
+  <local_role_group_id id='user'>
+    <principal id='R-MEMBER'>Auditor</principal>
+  </local_role_group_id>
+ </local_role_group_ids>
 </local_roles_item>
\ No newline at end of file

master/bt5/slapos_erp5/LocalRolesTemplateItem/account_module/payable.xml

@@ -10,4 +10,15 @@
    <item>Auditor</item>
   </role>
  </local_roles>
+ <local_role_group_ids>
+  <local_role_group_id id='group'>
+    <principal id='G-COMPANY'>Assignor</principal>
+  </local_role_group_id>
+  <local_role_group_id id='shadow'>
+    <principal id='R-SHADOW-PERSON'>Auditor</principal>
+  </local_role_group_id>
+  <local_role_group_id id='user'>
+    <principal id='R-MEMBER'>Auditor</principal>
+  </local_role_group_id>
+ </local_role_group_ids>
 </local_roles_item>
\ No newline at end of file

master/bt5/slapos_erp5/LocalRolesTemplateItem/account_module/profit_loss.xml

@@ -10,4 +10,15 @@
    <item>Auditor</item>
   </role>
  </local_roles>
+ <local_role_group_ids>
+  <local_role_group_id id='group'>
+    <principal id='G-COMPANY'>Assignor</principal>
+  </local_role_group_id>
+  <local_role_group_id id='shadow'>
+    <principal id='R-SHADOW-PERSON'>Auditor</principal>
+  </local_role_group_id>
+  <local_role_group_id id='user'>
+    <principal id='R-MEMBER'>Auditor</principal>
+  </local_role_group_id>
+ </local_role_group_ids>
 </local_roles_item>
\ No newline at end of file

master/bt5/slapos_erp5/LocalRolesTemplateItem/account_module/purchase.xml

@@ -10,4 +10,15 @@
    <item>Auditor</item>
   </role>
  </local_roles>
+ <local_role_group_ids>
+  <local_role_group_id id='group'>
+    <principal id='G-COMPANY'>Assignor</principal>
+  </local_role_group_id>
+  <local_role_group_id id='shadow'>
+    <principal id='R-SHADOW-PERSON'>Auditor</principal>
+  </local_role_group_id>
+  <local_role_group_id id='user'>
+    <principal id='R-MEMBER'>Auditor</principal>
+  </local_role_group_id>
+ </local_role_group_ids>
 </local_roles_item>
\ No newline at end of file

master/bt5/slapos_erp5/LocalRolesTemplateItem/account_module/receivable.xml

@@ -10,4 +10,15 @@
    <item>Auditor</item>
   </role>
  </local_roles>
+ <local_role_group_ids>
+  <local_role_group_id id='group'>
+    <principal id='G-COMPANY'>Assignor</principal>
+  </local_role_group_id>
+  <local_role_group_id id='shadow'>
+    <principal id='R-SHADOW-PERSON'>Auditor</principal>
+  </local_role_group_id>
+  <local_role_group_id id='user'>
+    <principal id='R-MEMBER'>Auditor</principal>
+  </local_role_group_id>
+ </local_role_group_ids>
 </local_roles_item>
\ No newline at end of file

master/bt5/slapos_erp5/LocalRolesTemplateItem/account_module/refundable_vat.xml

@@ -10,4 +10,15 @@
    <item>Auditor</item>
   </role>
  </local_roles>
+ <local_role_group_ids>
+  <local_role_group_id id='group'>
+    <principal id='G-COMPANY'>Assignor</principal>
+  </local_role_group_id>
+  <local_role_group_id id='shadow'>
+    <principal id='R-SHADOW-PERSON'>Auditor</principal>
+  </local_role_group_id>
+  <local_role_group_id id='user'>
+    <principal id='R-MEMBER'>Auditor</principal>
+  </local_role_group_id>
+ </local_role_group_ids>
 </local_roles_item>
\ No newline at end of file

master/bt5/slapos_erp5/LocalRolesTemplateItem/account_module/sales.xml

@@ -10,4 +10,15 @@
    <item>Auditor</item>
   </role>
  </local_roles>
+ <local_role_group_ids>
+  <local_role_group_id id='group'>
+    <principal id='G-COMPANY'>Assignor</principal>
+  </local_role_group_id>
+  <local_role_group_id id='shadow'>
+    <principal id='R-SHADOW-PERSON'>Auditor</principal>
+  </local_role_group_id>
+  <local_role_group_id id='user'>
+    <principal id='R-MEMBER'>Auditor</principal>
+  </local_role_group_id>
+ </local_role_group_ids>
 </local_roles_item>
\ No newline at end of file

master/bt5/slapos_erp5/LocalRolesTemplateItem/accounting_module.xml

@@ -12,8 +12,15 @@
   </role>
  </local_roles>
  <local_role_group_ids>
+  <local_role_group_id id='group'>
+    <principal id='G-COMPANY'>Auditor</principal>
+    <principal id='G-COMPANY'>Author</principal>
+  </local_role_group_id>
   <local_role_group_id id='shadow'>
     <principal id='R-SHADOW-PERSON'>Assignor</principal>
   </local_role_group_id>
+  <local_role_group_id id='user'>
+    <principal id='R-MEMBER'>Auditor</principal>
+  </local_role_group_id>
  </local_role_group_ids>
 </local_roles_item>
\ No newline at end of file

master/bt5/slapos_erp5/LocalRolesTemplateItem/business_process_module.xml

@@ -7,4 +7,12 @@
    <item>Auditor</item>
   </role>
  </local_roles>
+ <local_role_group_ids>
+  <local_role_group_id id='group'>
+    <principal id='G-COMPANY'>Auditor</principal>
+  </local_role_group_id>
+  <local_role_group_id id='user'>
+    <principal id='R-MEMBER'>Auditor</principal>
+  </local_role_group_id>
+ </local_role_group_ids>
 </local_roles_item>
\ No newline at end of file

master/bt5/slapos_erp5/LocalRolesTemplateItem/business_process_module/slapos_aggregated_business_process.xml

@@ -7,4 +7,12 @@
    <item>Auditor</item>
   </role>
  </local_roles>
+ <local_role_group_ids>
+  <local_role_group_id id='group'>
+    <principal id='G-COMPANY'>Auditor</principal>
+  </local_role_group_id>
+  <local_role_group_id id='user'>
+    <principal id='R-MEMBER'>Auditor</principal>
+  </local_role_group_id>
+ </local_role_group_ids>
 </local_roles_item>
\ No newline at end of file

master/bt5/slapos_erp5/LocalRolesTemplateItem/business_process_module/slapos_consumption_business_process.xml

@@ -7,4 +7,12 @@
    <item>Auditor</item>
   </role>
  </local_roles>
+ <local_role_group_ids>
+  <local_role_group_id id='group'>
+    <principal id='G-COMPANY'>Auditor</principal>
+  </local_role_group_id>
+  <local_role_group_id id='user'>
+    <principal id='R-MEMBER'>Auditor</principal>
+  </local_role_group_id>
+ </local_role_group_ids>
 </local_roles_item>
\ No newline at end of file

master/bt5/slapos_erp5/LocalRolesTemplateItem/business_process_module/slapos_subscription_business_process.xml

@@ -7,4 +7,12 @@
    <item>Auditor</item>
   </role>
  </local_roles>
+ <local_role_group_ids>
+  <local_role_group_id id='group'>
+    <principal id='G-COMPANY'>Auditor</principal>
+  </local_role_group_id>
+  <local_role_group_id id='user'>
+    <principal id='R-MEMBER'>Auditor</principal>
+  </local_role_group_id>
+ </local_role_group_ids>
 </local_roles_item>
\ No newline at end of file

master/bt5/slapos_erp5/LocalRolesTemplateItem/campaign_module.xml

@@ -5,4 +5,10 @@
    <item>Author</item>
   </role>
  </local_roles>
+ <local_role_group_ids>
+  <local_role_group_id id='group'>
+    <principal id='G-COMPANY'>Auditor</principal>
+    <principal id='G-COMPANY'>Author</principal>
+  </local_role_group_id>
+ </local_role_group_ids>
 </local_roles_item>
\ No newline at end of file

master/bt5/slapos_erp5/LocalRolesTemplateItem/cloud_contract_module.xml

@@ -5,4 +5,10 @@
    <item>Author</item>
   </role>
  </local_roles>
+ <local_role_group_ids>
+  <local_role_group_id id='group'>
+    <principal id='G-COMPANY'>Auditor</principal>
+    <principal id='G-COMPANY'>Author</principal>
+  </local_role_group_id>
+ </local_role_group_ids>
 </local_roles_item>
\ No newline at end of file

master/bt5/slapos_erp5/LocalRolesTemplateItem/component_module.xml

@@ -5,4 +5,10 @@
    <item>Author</item>
   </role>
  </local_roles>
+ <local_role_group_ids>
+  <local_role_group_id id='group'>
+    <principal id='G-COMPANY'>Auditor</principal>
+    <principal id='G-COMPANY'>Author</principal>
+  </local_role_group_id>
+ </local_role_group_ids>
 </local_roles_item>
\ No newline at end of file

master/bt5/slapos_erp5/LocalRolesTemplateItem/computer_model_module.xml

@@ -9,4 +9,14 @@
    <item>Author</item>
   </role>
  </local_roles>
+ <local_role_group_ids>
+  <local_role_group_id id='group'>
+    <principal id='G-COMPANY'>Auditor</principal>
+    <principal id='G-COMPANY'>Author</principal>
+  </local_role_group_id>
+  <local_role_group_id id='user'>
+    <principal id='R-MEMBER'>Auditor</principal>
+    <principal id='R-MEMBER'>Author</principal>
+  </local_role_group_id>
+ </local_role_group_ids>
 </local_roles_item>
\ No newline at end of file

master/bt5/slapos_erp5/LocalRolesTemplateItem/computer_module.xml

@@ -15,4 +15,20 @@
    <item>Auditor</item>
   </role>
  </local_roles>
+ <local_role_group_ids>
+  <local_role_group_id id='computer'>
+    <principal id='R-COMPUTER'>Auditor</principal>
+  </local_role_group_id>
+  <local_role_group_id id='group'>
+    <principal id='G-COMPANY'>Auditor</principal>
+    <principal id='G-COMPANY'>Author</principal>
+  </local_role_group_id>
+  <local_role_group_id id='shadow'>
+    <principal id='R-SHADOW-PERSON'>Auditor</principal>
+  </local_role_group_id>
+  <local_role_group_id id='user'>
+    <principal id='R-MEMBER'>Auditor</principal>
+    <principal id='R-MEMBER'>Author</principal>
+  </local_role_group_id>
+ </local_role_group_ids>
 </local_roles_item>
\ No newline at end of file

master/bt5/slapos_erp5/LocalRolesTemplateItem/computer_network_module.xml

@@ -12,4 +12,17 @@
    <item>Auditor</item>
   </role>
  </local_roles>
+ <local_role_group_ids>
+  <local_role_group_id id='group'>
+    <principal id='G-COMPANY'>Auditor</principal>
+    <principal id='G-COMPANY'>Author</principal>
+  </local_role_group_id>
+  <local_role_group_id id='shadow'>
+    <principal id='R-SHADOW-PERSON'>Auditor</principal>
+  </local_role_group_id>
+  <local_role_group_id id='user'>
+    <principal id='R-MEMBER'>Auditor</principal>
+    <principal id='R-MEMBER'>Author</principal>
+  </local_role_group_id>
+ </local_role_group_ids>
 </local_roles_item>
\ No newline at end of file

master/bt5/slapos_erp5/LocalRolesTemplateItem/consumption_document_module.xml

@@ -12,4 +12,14 @@
    <item>Author</item>
   </role>
  </local_roles>
+ <local_role_group_ids>
+  <local_role_group_id id='group'>
+    <principal id='G-COMPANY'>Auditor</principal>
+    <principal id='G-COMPANY'>Author</principal>
+  </local_role_group_id>
+  <local_role_group_id id='user'>
+    <principal id='R-MEMBER'>Auditor</principal>
+    <principal id='R-MEMBER'>Author</principal>
+  </local_role_group_id>
+ </local_role_group_ids>
 </local_roles_item>
\ No newline at end of file

master/bt5/slapos_erp5/LocalRolesTemplateItem/credential_update_module.xml

@@ -9,4 +9,14 @@
    <item>Author</item>
   </role>
  </local_roles>
+ <local_role_group_ids>
+  <local_role_group_id id='group'>
+    <principal id='G-COMPANY'>Auditor</principal>
+    <principal id='G-COMPANY'>Author</principal>
+  </local_role_group_id>
+  <local_role_group_id id='user'>
+    <principal id='R-MEMBER'>Auditor</principal>
+    <principal id='R-MEMBER'>Author</principal>
+  </local_role_group_id>
+ </local_role_group_ids>
 </local_roles_item>
\ No newline at end of file

master/bt5/slapos_erp5/LocalRolesTemplateItem/currency_module.xml

@@ -11,4 +11,16 @@
    <item>Auditor</item>
   </role>
  </local_roles>
+ <local_role_group_ids>
+  <local_role_group_id id='group'>
+    <principal id='G-COMPANY'>Auditor</principal>
+    <principal id='G-COMPANY'>Author</principal>
+  </local_role_group_id>
+  <local_role_group_id id='shadow'>
+    <principal id='R-SHADOW-PERSON'>Auditor</principal>
+  </local_role_group_id>
+  <local_role_group_id id='user'>
+    <principal id='R-MEMBER'>Auditor</principal>
+  </local_role_group_id>
+ </local_role_group_ids>
 </local_roles_item>
\ No newline at end of file

master/bt5/slapos_erp5/LocalRolesTemplateItem/currency_module/EUR.xml

@@ -10,4 +10,15 @@
    <item>Auditor</item>
   </role>
  </local_roles>
+ <local_role_group_ids>
+  <local_role_group_id id='group'>
+    <principal id='G-COMPANY'>Assignor</principal>
+  </local_role_group_id>
+  <local_role_group_id id='shadow'>
+    <principal id='R-SHADOW-PERSON'>Auditor</principal>
+  </local_role_group_id>
+  <local_role_group_id id='user'>
+    <principal id='R-MEMBER'>Auditor</principal>
+  </local_role_group_id>
+ </local_role_group_ids>
 </local_roles_item>
\ No newline at end of file

master/bt5/slapos_erp5/LocalRolesTemplateItem/data_set_module.xml

@@ -14,4 +14,15 @@
    <item>Author</item>
   </role>
  </local_roles>
+ <local_role_group_ids>
+  <local_role_group_id id='group'>
+    <principal id='G-COMPANY'>Auditor</principal>
+    <principal id='G-COMPANY'>Author</principal>
+  </local_role_group_id>
+  <local_role_group_id id='user'>
+    <principal id='R-COMPUTER'>Author</principal>
+    <principal id='R-INSTANCE'>Author</principal>
+    <principal id='R-MEMBER'>Author</principal>
+  </local_role_group_id>
+ </local_role_group_ids>
 </local_roles_item>
\ No newline at end of file

master/bt5/slapos_erp5/LocalRolesTemplateItem/document_ingestion_module.xml

@@ -5,4 +5,10 @@
    <item>Author</item>
   </role>
  </local_roles>
+ <local_role_group_ids>
+  <local_role_group_id id='group'>
+    <principal id='G-COMPANY'>Auditor</principal>
+    <principal id='G-COMPANY'>Author</principal>
+  </local_role_group_id>
+ </local_role_group_ids>
 </local_roles_item>
\ No newline at end of file

master/bt5/slapos_erp5/LocalRolesTemplateItem/document_module.xml

@@ -14,4 +14,15 @@
    <item>Author</item>
   </role>
  </local_roles>
+ <local_role_group_ids>
+  <local_role_group_id id='group'>
+    <principal id='G-COMPANY'>Auditor</principal>
+    <principal id='G-COMPANY'>Author</principal>
+  </local_role_group_id>
+  <local_role_group_id id='user'>
+    <principal id='R-COMPUTER'>Author</principal>
+    <principal id='R-INSTANCE'>Author</principal>
+    <principal id='R-MEMBER'>Author</principal>
+  </local_role_group_id>
+ </local_role_group_ids>
 </local_roles_item>
\ No newline at end of file

master/bt5/slapos_erp5/LocalRolesTemplateItem/event_module.xml

@@ -9,4 +9,14 @@
    <item>Author</item>
   </role>
  </local_roles>
+ <local_role_group_ids>
+  <local_role_group_id id='group'>
+    <principal id='G-COMPANY'>Auditor</principal>
+    <principal id='G-COMPANY'>Author</principal>
+  </local_role_group_id>
+  <local_role_group_id id='user'>
+    <principal id='R-MEMBER'>Auditor</principal>
+    <principal id='R-MEMBER'>Author</principal>
+  </local_role_group_id>
+ </local_role_group_ids>
 </local_roles_item>
\ No newline at end of file

master/bt5/slapos_erp5/LocalRolesTemplateItem/event_module/slapos_crm_web_message_template.xml

@@ -7,4 +7,12 @@
    <item>Auditor</item>
   </role>
  </local_roles>
+ <local_role_group_ids>
+  <local_role_group_id id='group'>
+    <principal id='G-COMPANY'>Assignor</principal>
+  </local_role_group_id>
+  <local_role_group_id id='user'>
+    <principal id='R-MEMBER'>Auditor</principal>
+  </local_role_group_id>
+ </local_role_group_ids>
 </local_roles_item>
\ No newline at end of file

master/bt5/slapos_erp5/LocalRolesTemplateItem/hosting_subscription_module.xml

@@ -15,4 +15,14 @@
    <item>Author</item>
   </role>
  </local_roles>
+ <local_role_group_ids>
+  <local_role_group_id id='group'>
+    <principal id='G-COMPANY'>Auditor</principal>
+    <principal id='G-COMPANY'>Author</principal>
+  </local_role_group_id>
+  <local_role_group_id id='user'>
+    <principal id='R-MEMBER'>Auditor</principal>
+    <principal id='R-MEMBER'>Author</principal>
+  </local_role_group_id>
+ </local_role_group_ids>
 </local_roles_item>
\ No newline at end of file

master/bt5/slapos_erp5/LocalRolesTemplateItem/image_module.xml

@@ -14,4 +14,15 @@
    <item>Author</item>
   </role>
  </local_roles>
+ <local_role_group_ids>
+  <local_role_group_id id='group'>
+    <principal id='G-COMPANY'>Auditor</principal>
+    <principal id='G-COMPANY'>Author</principal>
+  </local_role_group_id>
+  <local_role_group_id id='user'>
+    <principal id='R-COMPUTER'>Author</principal>
+    <principal id='R-INSTANCE'>Author</principal>
+    <principal id='R-MEMBER'>Author</principal>
+  </local_role_group_id>
+ </local_role_group_ids>
 </local_roles_item>
\ No newline at end of file

master/bt5/slapos_erp5/LocalRolesTemplateItem/inventory_module.xml

@@ -5,4 +5,10 @@
    <item>Author</item>
   </role>
  </local_roles>
+ <local_role_group_ids>
+  <local_role_group_id id='group'>
+    <principal id='G-COMPANY'>Auditor</principal>
+    <principal id='G-COMPANY'>Author</principal>
+  </local_role_group_id>
+ </local_role_group_ids>
 </local_roles_item>
\ No newline at end of file

master/bt5/slapos_erp5/LocalRolesTemplateItem/knowledge_pad_module.xml

@@ -5,4 +5,10 @@
    <item>Author</item>
   </role>
  </local_roles>
+ <local_role_group_ids>
+  <local_role_group_id id='group'>
+    <principal id='G-COMPANY'>Auditor</principal>
+    <principal id='G-COMPANY'>Author</principal>
+  </local_role_group_id>
+ </local_role_group_ids>
 </local_roles_item>
\ No newline at end of file

master/bt5/slapos_erp5/LocalRolesTemplateItem/meeting_module.xml

@@ -5,4 +5,10 @@
    <item>Author</item>
   </role>
  </local_roles>
+ <local_role_group_ids>
+  <local_role_group_id id='group'>
+    <principal id='G-COMPANY'>Auditor</principal>
+    <principal id='G-COMPANY'>Author</principal>
+  </local_role_group_id>
+ </local_role_group_ids>
 </local_roles_item>
\ No newline at end of file

master/bt5/slapos_erp5/LocalRolesTemplateItem/notification_message_module.xml

@@ -5,4 +5,10 @@
    <item>Author</item>
   </role>
  </local_roles>
+ <local_role_group_ids>
+  <local_role_group_id id='group'>
+    <principal id='G-COMPANY'>Auditor</principal>
+    <principal id='G-COMPANY'>Author</principal>
+  </local_role_group_id>
+ </local_role_group_ids>
 </local_roles_item>
\ No newline at end of file

master/bt5/slapos_erp5/LocalRolesTemplateItem/open_sale_order_module.xml

@@ -5,4 +5,10 @@
    <item>Author</item>
   </role>
  </local_roles>
+ <local_role_group_ids>
+  <local_role_group_id id='group'>
+    <principal id='G-COMPANY'>Auditor</principal>
+    <principal id='G-COMPANY'>Author</principal>
+  </local_role_group_id>
+ </local_role_group_ids>
 </local_roles_item>
\ No newline at end of file

master/bt5/slapos_erp5/LocalRolesTemplateItem/organisation_module.xml

@@ -23,5 +23,9 @@
   <local_role_group_id id='shadow'>
     <principal id='R-SHADOW-PERSON'>Auditor</principal>
   </local_role_group_id>
+  <local_role_group_id id='user'>
+    <principal id='R-MEMBER'>Auditor</principal>
+    <principal id='R-MEMBER'>Author</principal>
+  </local_role_group_id>
  </local_role_group_ids>
 </local_roles_item>
\ No newline at end of file

master/bt5/slapos_erp5/LocalRolesTemplateItem/organisation_module/slapos.xml

 <local_roles_item>
  <local_roles>
+  <role id='ERP5TypeTestCase'>
+   <item>Assignee</item>
+  </role>
   <role id='G-COMPANY'>
    <item>Assignor</item>
   </role>
@@ -10,4 +13,15 @@
    <item>Auditor</item>
   </role>
  </local_roles>
+ <local_role_group_ids>
+  <local_role_group_id id='group'>
+    <principal id='G-COMPANY'>Assignor</principal>
+  </local_role_group_id>
+  <local_role_group_id id='shadow'>
+    <principal id='R-SHADOW-PERSON'>Auditor</principal>
+  </local_role_group_id>
+  <local_role_group_id id='user'>
+    <principal id='ERP5TypeTestCase'>Assignee</principal>
+  </local_role_group_id>
+ </local_role_group_ids>
 </local_roles_item>
\ No newline at end of file

master/bt5/slapos_erp5/LocalRolesTemplateItem/organisation_module/slapos/bank_account.xml

@@ -4,4 +4,9 @@
    <item>Assignor</item>
   </role>
  </local_roles>
+ <local_role_group_ids>
+  <local_role_group_id id='group'>
+    <principal id='G-COMPANY'>Assignor</principal>
+  </local_role_group_id>
+ </local_role_group_ids>
 </local_roles_item>
\ No newline at end of file

master/bt5/slapos_erp5/LocalRolesTemplateItem/person_module.xml

@@ -11,4 +11,16 @@
    <item>Auditor</item>
   </role>
  </local_roles>
+ <local_role_group_ids>
+  <local_role_group_id id='group'>
+    <principal id='G-COMPANY'>Auditor</principal>
+    <principal id='G-COMPANY'>Author</principal>
+  </local_role_group_id>
+  <local_role_group_id id='shadow'>
+    <principal id='R-SHADOW-PERSON'>Auditor</principal>
+  </local_role_group_id>
+  <local_role_group_id id='user'>
+    <principal id='R-MEMBER'>Auditor</principal>
+  </local_role_group_id>
+ </local_role_group_ids>
 </local_roles_item>
\ No newline at end of file

master/bt5/slapos_erp5/LocalRolesTemplateItem/portal_contributions.xml

@@ -14,4 +14,15 @@
    <item>Author</item>
   </role>
  </local_roles>
+ <local_role_group_ids>
+  <local_role_group_id id='group'>
+    <principal id='G-COMPANY'>Auditor</principal>
+    <principal id='G-COMPANY'>Author</principal>
+  </local_role_group_id>
+  <local_role_group_id id='user'>
+    <principal id='R-COMPUTER'>Author</principal>
+    <principal id='R-INSTANCE'>Author</principal>
+    <principal id='R-MEMBER'>Author</principal>
+  </local_role_group_id>
+ </local_role_group_ids>
 </local_roles_item>
\ No newline at end of file

master/bt5/slapos_erp5/LocalRolesTemplateItem/portal_gadgets.xml

@@ -5,4 +5,10 @@
    <item>Author</item>
   </role>
  </local_roles>
+ <local_role_group_ids>
+  <local_role_group_id id='group'>
+    <principal id='G-COMPANY'>Auditor</principal>
+    <principal id='G-COMPANY'>Author</principal>
+  </local_role_group_id>
+ </local_role_group_ids>
 </local_roles_item>
\ No newline at end of file

master/bt5/slapos_erp5/LocalRolesTemplateItem/portal_integrations.xml

@@ -8,4 +8,13 @@
    <item>Auditor</item>
   </role>
  </local_roles>
+ <local_role_group_ids>
+  <local_role_group_id id='group'>
+    <principal id='G-COMPANY'>Auditor</principal>
+    <principal id='G-COMPANY'>Author</principal>
+  </local_role_group_id>
+  <local_role_group_id id='shadow'>
+    <principal id='R-SHADOW-PERSON'>Auditor</principal>
+  </local_role_group_id>
+ </local_role_group_ids>
 </local_roles_item>
\ No newline at end of file

master/bt5/slapos_erp5/LocalRolesTemplateItem/portal_integrations/slapos_payzen_test_integration.xml

@@ -8,4 +8,13 @@
    <item>Author</item>
   </role>
  </local_roles>
+ <local_role_group_ids>
+  <local_role_group_id id='group'>
+    <principal id='G-COMPANY'>Assignor</principal>
+  </local_role_group_id>
+  <local_role_group_id id='shadow'>
+    <principal id='R-SHADOW-PERSON'>Auditor</principal>
+    <principal id='R-SHADOW-PERSON'>Author</principal>
+  </local_role_group_id>
+ </local_role_group_ids>
 </local_roles_item>
\ No newline at end of file

master/bt5/slapos_erp5/LocalRolesTemplateItem/product_module.xml

@@ -5,4 +5,10 @@
    <item>Author</item>
   </role>
  </local_roles>
+ <local_role_group_ids>
+  <local_role_group_id id='group'>
+    <principal id='G-COMPANY'>Auditor</principal>
+    <principal id='G-COMPANY'>Author</principal>
+  </local_role_group_id>
+ </local_role_group_ids>
 </local_roles_item>
\ No newline at end of file

master/bt5/slapos_erp5/LocalRolesTemplateItem/project_module.xml

@@ -15,4 +15,17 @@
    <item>Auditor</item>
   </role>
  </local_roles>
+ <local_role_group_ids>
+  <local_role_group_id id='group'>
+    <principal id='G-COMPANY'>Auditor</principal>
+    <principal id='G-COMPANY'>Author</principal>
+  </local_role_group_id>
+  <local_role_group_id id='shadow'>
+    <principal id='R-SHADOW-PERSON'>Auditor</principal>
+  </local_role_group_id>
+  <local_role_group_id id='user'>
+    <principal id='R-MEMBER'>Auditor</principal>
+    <principal id='R-MEMBER'>Author</principal>
+  </local_role_group_id>
+ </local_role_group_ids>
 </local_roles_item>
\ No newline at end of file

master/bt5/slapos_erp5/LocalRolesTemplateItem/purchase_order_module.xml

@@ -5,4 +5,10 @@
    <item>Author</item>
   </role>
  </local_roles>
+ <local_role_group_ids>
+  <local_role_group_id id='group'>
+    <principal id='G-COMPANY'>Auditor</principal>
+    <principal id='G-COMPANY'>Author</principal>
+  </local_role_group_id>
+ </local_role_group_ids>
 </local_roles_item>
\ No newline at end of file

master/bt5/slapos_erp5/LocalRolesTemplateItem/purchase_trade_condition_module.xml

@@ -5,4 +5,10 @@
    <item>Author</item>
   </role>
  </local_roles>
+ <local_role_group_ids>
+  <local_role_group_id id='group'>
+    <principal id='G-COMPANY'>Auditor</principal>
+    <principal id='G-COMPANY'>Author</principal>
+  </local_role_group_id>
+ </local_role_group_ids>
 </local_roles_item>
\ No newline at end of file

master/bt5/slapos_erp5/LocalRolesTemplateItem/query_module.xml

@@ -5,4 +5,10 @@
    <item>Author</item>
   </role>
  </local_roles>
+ <local_role_group_ids>
+  <local_role_group_id id='group'>
+    <principal id='G-COMPANY'>Auditor</principal>
+    <principal id='G-COMPANY'>Author</principal>
+  </local_role_group_id>
+ </local_role_group_ids>
 </local_roles_item>
\ No newline at end of file

master/bt5/slapos_erp5/LocalRolesTemplateItem/regularisation_request_module.xml

@@ -8,4 +8,13 @@
    <item>Auditor</item>
   </role>
  </local_roles>
+ <local_role_group_ids>
+  <local_role_group_id id='group'>
+    <principal id='G-COMPANY'>Auditor</principal>
+    <principal id='G-COMPANY'>Author</principal>
+  </local_role_group_id>
+  <local_role_group_id id='user'>
+    <principal id='R-MEMBER'>Auditor</principal>
+  </local_role_group_id>
+ </local_role_group_ids>
 </local_roles_item>
\ No newline at end of file

master/bt5/slapos_erp5/LocalRolesTemplateItem/regularisation_request_module/slapos_crm_regularisation_request_template.xml

@@ -7,4 +7,12 @@
    <item>Auditor</item>
   </role>
  </local_roles>
+ <local_role_group_ids>
+  <local_role_group_id id='group'>
+    <principal id='G-COMPANY'>Assignor</principal>
+  </local_role_group_id>
+  <local_role_group_id id='user'>
+    <principal id='R-MEMBER'>Auditor</principal>
+  </local_role_group_id>
+ </local_role_group_ids>
 </local_roles_item>
\ No newline at end of file

master/bt5/slapos_erp5/LocalRolesTemplateItem/sale_opportunity_module.xml

@@ -5,4 +5,10 @@
    <item>Author</item>
   </role>
  </local_roles>
+ <local_role_group_ids>
+  <local_role_group_id id='group'>
+    <principal id='G-COMPANY'>Auditor</principal>
+    <principal id='G-COMPANY'>Author</principal>
+  </local_role_group_id>
+ </local_role_group_ids>
 </local_roles_item>
\ No newline at end of file

master/bt5/slapos_erp5/LocalRolesTemplateItem/sale_order_module.xml

@@ -5,4 +5,10 @@
    <item>Author</item>
   </role>
  </local_roles>
+ <local_role_group_ids>
+  <local_role_group_id id='group'>
+    <principal id='G-COMPANY'>Auditor</principal>
+    <principal id='G-COMPANY'>Author</principal>
+  </local_role_group_id>
+ </local_role_group_ids>
 </local_roles_item>
\ No newline at end of file

master/bt5/slapos_erp5/LocalRolesTemplateItem/sale_packing_list_module.xml

@@ -8,4 +8,13 @@
    <item>Auditor</item>
   </role>
  </local_roles>
+ <local_role_group_ids>
+  <local_role_group_id id='group'>
+    <principal id='G-COMPANY'>Auditor</principal>
+    <principal id='G-COMPANY'>Author</principal>
+  </local_role_group_id>
+  <local_role_group_id id='user'>
+    <principal id='R-MEMBER'>Auditor</principal>
+  </local_role_group_id>
+ </local_role_group_ids>
 </local_roles_item>
\ No newline at end of file

master/bt5/slapos_erp5/LocalRolesTemplateItem/sale_trade_condition_module.xml

@@ -8,4 +8,13 @@
    <item>Auditor</item>
   </role>
  </local_roles>
+ <local_role_group_ids>
+  <local_role_group_id id='group'>
+    <principal id='G-COMPANY'>Auditor</principal>
+    <principal id='G-COMPANY'>Author</principal>
+  </local_role_group_id>
+  <local_role_group_id id='user'>
+    <principal id='R-MEMBER'>Auditor</principal>
+  </local_role_group_id>
+ </local_role_group_ids>
 </local_roles_item>
\ No newline at end of file

master/bt5/slapos_erp5/LocalRolesTemplateItem/service_module.xml

@@ -8,4 +8,13 @@
    <item>Auditor</item>
   </role>
  </local_roles>
+ <local_role_group_ids>
+  <local_role_group_id id='group'>
+    <principal id='G-COMPANY'>Auditor</principal>
+    <principal id='G-COMPANY'>Author</principal>
+  </local_role_group_id>
+  <local_role_group_id id='user'>
+    <principal id='R-MEMBER'>Auditor</principal>
+  </local_role_group_id>
+ </local_role_group_ids>
 </local_roles_item>
\ No newline at end of file

master/bt5/slapos_erp5/LocalRolesTemplateItem/service_module/cpu_load_percent.xml

@@ -7,4 +7,12 @@
    <item>Auditor</item>
   </role>
  </local_roles>
+ <local_role_group_ids>
+  <local_role_group_id id='group'>
+    <principal id='G-COMPANY'>Assignor</principal>
+  </local_role_group_id>
+  <local_role_group_id id='user'>
+    <principal id='R-MEMBER'>Auditor</principal>
+  </local_role_group_id>
+ </local_role_group_ids>
 </local_roles_item>
\ No newline at end of file

master/bt5/slapos_erp5/LocalRolesTemplateItem/service_module/memory_used.xml

@@ -7,4 +7,12 @@
    <item>Auditor</item>
   </role>
  </local_roles>
+ <local_role_group_ids>
+  <local_role_group_id id='group'>
+    <principal id='G-COMPANY'>Assignor</principal>
+  </local_role_group_id>
+  <local_role_group_id id='user'>
+    <principal id='R-MEMBER'>Auditor</principal>
+  </local_role_group_id>
+ </local_role_group_ids>
 </local_roles_item>
\ No newline at end of file

master/bt5/slapos_erp5/LocalRolesTemplateItem/service_module/slapos_account_validation.xml

@@ -7,4 +7,12 @@
    <item>Auditor</item>
   </role>
  </local_roles>
+ <local_role_group_ids>
+  <local_role_group_id id='group'>
+    <principal id='G-COMPANY'>Assignor</principal>
+  </local_role_group_id>
+  <local_role_group_id id='user'>
+    <principal id='R-MEMBER'>Auditor</principal>
+  </local_role_group_id>
+ </local_role_group_ids>
 </local_roles_item>
\ No newline at end of file

master/bt5/slapos_erp5/LocalRolesTemplateItem/service_module/slapos_crm_acknowledgement.xml

@@ -7,4 +7,12 @@
    <item>Auditor</item>
   </role>
  </local_roles>
+ <local_role_group_ids>
+  <local_role_group_id id='group'>
+    <principal id='G-COMPANY'>Assignor</principal>
+  </local_role_group_id>
+  <local_role_group_id id='user'>
+    <principal id='R-MEMBER'>Auditor</principal>
+  </local_role_group_id>
+ </local_role_group_ids>
 </local_roles_item>
\ No newline at end of file

master/bt5/slapos_erp5/LocalRolesTemplateItem/service_module/slapos_crm_complaint.xml

@@ -7,4 +7,12 @@
    <item>Auditor</item>
   </role>
  </local_roles>
+ <local_role_group_ids>
+  <local_role_group_id id='group'>
+    <principal id='G-COMPANY'>Assignor</principal>
+  </local_role_group_id>
+  <local_role_group_id id='user'>
+    <principal id='R-MEMBER'>Auditor</principal>
+  </local_role_group_id>
+ </local_role_group_ids>
 </local_roles_item>
\ No newline at end of file

master/bt5/slapos_erp5/LocalRolesTemplateItem/service_module/slapos_crm_delete_acknowledgement.xml

@@ -7,4 +7,12 @@
    <item>Auditor</item>
   </role>
  </local_roles>
+ <local_role_group_ids>
+  <local_role_group_id id='group'>
+    <principal id='G-COMPANY'>Assignor</principal>
+  </local_role_group_id>
+  <local_role_group_id id='user'>
+    <principal id='R-MEMBER'>Auditor</principal>
+  </local_role_group_id>
+ </local_role_group_ids>
 </local_roles_item>
\ No newline at end of file

master/bt5/slapos_erp5/LocalRolesTemplateItem/service_module/slapos_crm_delete_reminder.xml

@@ -7,4 +7,12 @@
    <item>Auditor</item>
   </role>
  </local_roles>
+ <local_role_group_ids>
+  <local_role_group_id id='group'>
+    <principal id='G-COMPANY'>Assignor</principal>
+  </local_role_group_id>
+  <local_role_group_id id='user'>
+    <principal id='R-MEMBER'>Auditor</principal>
+  </local_role_group_id>
+ </local_role_group_ids>
 </local_roles_item>
\ No newline at end of file

master/bt5/slapos_erp5/LocalRolesTemplateItem/service_module/slapos_crm_information.xml

@@ -7,4 +7,12 @@
    <item>Auditor</item>
   </role>
  </local_roles>
+ <local_role_group_ids>
+  <local_role_group_id id='group'>
+    <principal id='G-COMPANY'>Assignor</principal>
+  </local_role_group_id>
+  <local_role_group_id id='user'>
+    <principal id='R-MEMBER'>Auditor</principal>
+  </local_role_group_id>
+ </local_role_group_ids>
 </local_roles_item>
\ No newline at end of file

master/bt5/slapos_erp5/LocalRolesTemplateItem/service_module/slapos_crm_invoice_cancellation.xml

@@ -7,4 +7,12 @@
    <item>Auditor</item>
   </role>
  </local_roles>
+ <local_role_group_ids>
+  <local_role_group_id id='group'>
+    <principal id='G-COMPANY'>Assignor</principal>
+  </local_role_group_id>
+  <local_role_group_id id='user'>
+    <principal id='R-MEMBER'>Auditor</principal>
+  </local_role_group_id>
+ </local_role_group_ids>
 </local_roles_item>
\ No newline at end of file

master/bt5/slapos_erp5/LocalRolesTemplateItem/service_module/slapos_crm_monitoring.xml

@@ -7,4 +7,12 @@
    <item>Auditor</item>
   </role>
  </local_roles>
+ <local_role_group_ids>
+  <local_role_group_id id='group'>
+    <principal id='G-COMPANY'>Assignor</principal>
+  </local_role_group_id>
+  <local_role_group_id id='user'>
+    <principal id='R-MEMBER'>Auditor</principal>
+  </local_role_group_id>
+ </local_role_group_ids>
 </local_roles_item>
\ No newline at end of file

master/bt5/slapos_erp5/LocalRolesTemplateItem/service_module/slapos_crm_spam.xml

@@ -7,4 +7,12 @@
    <item>Auditor</item>
   </role>
  </local_roles>
+ <local_role_group_ids>
+  <local_role_group_id id='group'>
+    <principal id='G-COMPANY'>Assignor</principal>
+  </local_role_group_id>
+  <local_role_group_id id='user'>
+    <principal id='R-MEMBER'>Auditor</principal>
+  </local_role_group_id>
+ </local_role_group_ids>
 </local_roles_item>
\ No newline at end of file

master/bt5/slapos_erp5/LocalRolesTemplateItem/service_module/slapos_crm_stop_acknowledgement.xml

@@ -7,4 +7,12 @@
    <item>Auditor</item>
   </role>
  </local_roles>
+ <local_role_group_ids>
+  <local_role_group_id id='group'>
+    <principal id='G-COMPANY'>Assignor</principal>
+  </local_role_group_id>
+  <local_role_group_id id='user'>
+    <principal id='R-MEMBER'>Auditor</principal>
+  </local_role_group_id>
+ </local_role_group_ids>
 </local_roles_item>
\ No newline at end of file

master/bt5/slapos_erp5/LocalRolesTemplateItem/service_module/slapos_crm_stop_reminder.xml

@@ -7,4 +7,12 @@
    <item>Auditor</item>
   </role>
  </local_roles>
+ <local_role_group_ids>
+  <local_role_group_id id='group'>
+    <principal id='G-COMPANY'>Assignor</principal>
+  </local_role_group_id>
+  <local_role_group_id id='user'>
+    <principal id='R-MEMBER'>Auditor</principal>
+  </local_role_group_id>
+ </local_role_group_ids>
 </local_roles_item>
\ No newline at end of file

master/bt5/slapos_erp5/LocalRolesTemplateItem/service_module/slapos_crm_upgrade.xml

@@ -7,4 +7,12 @@
    <item>Auditor</item>
   </role>
  </local_roles>
+ <local_role_group_ids>
+  <local_role_group_id id='group'>
+    <principal id='G-COMPANY'>Assignor</principal>
+  </local_role_group_id>
+  <local_role_group_id id='user'>
+    <principal id='R-MEMBER'>Auditor</principal>
+  </local_role_group_id>
+ </local_role_group_ids>
 </local_roles_item>
\ No newline at end of file

master/bt5/slapos_erp5/LocalRolesTemplateItem/service_module/slapos_discount.xml

@@ -7,4 +7,12 @@
    <item>Auditor</item>
   </role>
  </local_roles>
+ <local_role_group_ids>
+  <local_role_group_id id='group'>
+    <principal id='G-COMPANY'>Assignor</principal>
+  </local_role_group_id>
+  <local_role_group_id id='user'>
+    <principal id='R-MEMBER'>Auditor</principal>
+  </local_role_group_id>
+ </local_role_group_ids>
 </local_roles_item>
\ No newline at end of file

master/bt5/slapos_erp5/LocalRolesTemplateItem/service_module/slapos_instance_cleanup.xml

@@ -7,4 +7,12 @@
    <item>Auditor</item>
   </role>
  </local_roles>
+ <local_role_group_ids>
+  <local_role_group_id id='group'>
+    <principal id='G-COMPANY'>Assignor</principal>
+  </local_role_group_id>
+  <local_role_group_id id='user'>
+    <principal id='R-MEMBER'>Auditor</principal>
+  </local_role_group_id>
+ </local_role_group_ids>
 </local_roles_item>
\ No newline at end of file

master/bt5/slapos_erp5/LocalRolesTemplateItem/service_module/slapos_instance_hosting.xml

@@ -7,4 +7,12 @@
    <item>Auditor</item>
   </role>
  </local_roles>
+ <local_role_group_ids>
+  <local_role_group_id id='group'>
+    <principal id='G-COMPANY'>Assignor</principal>
+  </local_role_group_id>
+  <local_role_group_id id='user'>
+    <principal id='R-MEMBER'>Auditor</principal>
+  </local_role_group_id>
+ </local_role_group_ids>
 </local_roles_item>
\ No newline at end of file

master/bt5/slapos_erp5/LocalRolesTemplateItem/service_module/slapos_instance_setup.xml

@@ -7,4 +7,12 @@
    <item>Auditor</item>
   </role>
  </local_roles>
+ <local_role_group_ids>
+  <local_role_group_id id='group'>
+    <principal id='G-COMPANY'>Assignor</principal>
+  </local_role_group_id>
+  <local_role_group_id id='user'>
+    <principal id='R-MEMBER'>Auditor</principal>
+  </local_role_group_id>
+ </local_role_group_ids>
 </local_roles_item>
\ No newline at end of file

master/bt5/slapos_erp5/LocalRolesTemplateItem/service_module/slapos_instance_subscription.xml

@@ -7,4 +7,12 @@
    <item>Auditor</item>
   </role>
  </local_roles>
+ <local_role_group_ids>
+  <local_role_group_id id='group'>
+    <principal id='G-COMPANY'>Assignor</principal>
+  </local_role_group_id>
+  <local_role_group_id id='user'>
+    <principal id='R-MEMBER'>Auditor</principal>
+  </local_role_group_id>
+ </local_role_group_ids>
 </local_roles_item>
\ No newline at end of file

master/bt5/slapos_erp5/LocalRolesTemplateItem/service_module/slapos_instance_update.xml

@@ -7,4 +7,12 @@
    <item>Auditor</item>
   </role>
  </local_roles>
+ <local_role_group_ids>
+  <local_role_group_id id='group'>
+    <principal id='G-COMPANY'>Assignor</principal>
+  </local_role_group_id>
+  <local_role_group_id id='user'>
+    <principal id='R-MEMBER'>Auditor</principal>
+  </local_role_group_id>
+ </local_role_group_ids>
 </local_roles_item>
\ No newline at end of file

master/bt5/slapos_erp5/LocalRolesTemplateItem/service_module/slapos_netdrive_consumption.xml

@@ -7,4 +7,12 @@
    <item>Auditor</item>
   </role>
  </local_roles>
+ <local_role_group_ids>
+  <local_role_group_id id='group'>
+    <principal id='G-COMPANY'>Assignor</principal>
+  </local_role_group_id>
+  <local_role_group_id id='user'>
+    <principal id='R-MEMBER'>Auditor</principal>
+  </local_role_group_id>
+ </local_role_group_ids>
 </local_roles_item>
\ No newline at end of file

master/bt5/slapos_erp5/LocalRolesTemplateItem/service_module/slapos_tax.xml

@@ -7,4 +7,12 @@
    <item>Auditor</item>
   </role>
  </local_roles>
+ <local_role_group_ids>
+  <local_role_group_id id='group'>
+    <principal id='G-COMPANY'>Assignor</principal>
+  </local_role_group_id>
+  <local_role_group_id id='user'>
+    <principal id='R-MEMBER'>Auditor</principal>
+  </local_role_group_id>
+ </local_role_group_ids>
 </local_roles_item>
\ No newline at end of file

master/bt5/slapos_erp5/LocalRolesTemplateItem/service_module/zero_emission_ratio.xml

@@ -7,4 +7,12 @@
    <item>Auditor</item>
   </role>
  </local_roles>
+ <local_role_group_ids>
+  <local_role_group_id id='group'>
+    <principal id='G-COMPANY'>Assignor</principal>
+  </local_role_group_id>
+  <local_role_group_id id='user'>
+    <principal id='R-MEMBER'>Auditor</principal>
+  </local_role_group_id>
+ </local_role_group_ids>
 </local_roles_item>
\ No newline at end of file

master/bt5/slapos_erp5/LocalRolesTemplateItem/software_installation_module.xml

@@ -12,4 +12,17 @@
    <item>Author</item>
   </role>
  </local_roles>
+ <local_role_group_ids>
+  <local_role_group_id id='computer'>
+    <principal id='R-COMPUTER'>Auditor</principal>
+  </local_role_group_id>
+  <local_role_group_id id='group'>
+    <principal id='G-COMPANY'>Auditor</principal>
+    <principal id='G-COMPANY'>Author</principal>
+  </local_role_group_id>
+  <local_role_group_id id='user'>
+    <principal id='R-MEMBER'>Auditor</principal>
+    <principal id='R-MEMBER'>Author</principal>
+  </local_role_group_id>
+ </local_role_group_ids>
 </local_roles_item>
\ No newline at end of file

master/bt5/slapos_erp5/LocalRolesTemplateItem/software_instance_module.xml

@@ -16,4 +16,14 @@
    <item>Author</item>
   </role>
  </local_roles>
+ <local_role_group_ids>
+  <local_role_group_id id='group'>
+    <principal id='G-COMPANY'>Auditor</principal>
+    <principal id='G-COMPANY'>Author</principal>
+  </local_role_group_id>
+  <local_role_group_id id='user'>
+    <principal id='R-MEMBER'>Auditor</principal>
+    <principal id='R-MEMBER'>Author</principal>
+  </local_role_group_id>
+ </local_role_group_ids>
 </local_roles_item>
\ No newline at end of file

master/bt5/slapos_erp5/LocalRolesTemplateItem/software_product_module.xml

@@ -8,4 +8,13 @@
    <item>Auditor</item>
   </role>
  </local_roles>
+ <local_role_group_ids>
+  <local_role_group_id id='group'>
+    <principal id='G-COMPANY'>Auditor</principal>
+    <principal id='G-COMPANY'>Author</principal>
+  </local_role_group_id>
+  <local_role_group_id id='user'>
+    <principal id='R-MEMBER'>Auditor</principal>
+  </local_role_group_id>
+ </local_role_group_ids>
 </local_roles_item>
\ No newline at end of file

master/bt5/slapos_erp5/LocalRolesTemplateItem/software_release_module.xml

@@ -9,4 +9,14 @@
    <item>Author</item>
   </role>
  </local_roles>
+ <local_role_group_ids>
+  <local_role_group_id id='group'>
+    <principal id='G-COMPANY'>Auditor</principal>
+    <principal id='G-COMPANY'>Author</principal>
+  </local_role_group_id>
+  <local_role_group_id id='user'>
+    <principal id='R-MEMBER'>Auditor</principal>
+    <principal id='R-MEMBER'>Author</principal>
+  </local_role_group_id>
+ </local_role_group_ids>
 </local_roles_item>
\ No newline at end of file

master/bt5/slapos_erp5/LocalRolesTemplateItem/support_request_module.xml

@@ -9,4 +9,14 @@
    <item>Author</item>
   </role>
  </local_roles>
+ <local_role_group_ids>
+  <local_role_group_id id='group'>
+    <principal id='G-COMPANY'>Auditor</principal>
+    <principal id='G-COMPANY'>Author</principal>
+  </local_role_group_id>
+  <local_role_group_id id='user'>
+    <principal id='R-MEMBER'>Auditor</principal>
+    <principal id='R-MEMBER'>Author</principal>
+  </local_role_group_id>
+ </local_role_group_ids>
 </local_roles_item>
\ No newline at end of file

master/bt5/slapos_erp5/LocalRolesTemplateItem/support_request_module/slapos_crm_support_request_template.xml

@@ -7,4 +7,12 @@
    <item>Auditor</item>
   </role>
  </local_roles>
+ <local_role_group_ids>
+  <local_role_group_id id='group'>
+    <principal id='G-COMPANY'>Assignor</principal>
+  </local_role_group_id>
+  <local_role_group_id id='user'>
+    <principal id='R-MEMBER'>Auditor</principal>
+  </local_role_group_id>
+ </local_role_group_ids>
 </local_roles_item>
\ No newline at end of file

master/bt5/slapos_erp5/LocalRolesTemplateItem/system_event_module.xml

@@ -8,4 +8,13 @@
    <item>Author</item>
   </role>
  </local_roles>
+ <local_role_group_ids>
+  <local_role_group_id id='group'>
+    <principal id='G-COMPANY'>Auditor</principal>
+    <principal id='G-COMPANY'>Author</principal>
+  </local_role_group_id>
+  <local_role_group_id id='shadow'>
+    <principal id='R-SHADOW-PERSON'>Author</principal>
+  </local_role_group_id>
+ </local_role_group_ids>
 </local_roles_item>
\ No newline at end of file

master/bt5/slapos_erp5/LocalRolesTemplateItem/transformation_module.xml

@@ -5,4 +5,10 @@
    <item>Author</item>
   </role>
  </local_roles>
+ <local_role_group_ids>
+  <local_role_group_id id='group'>
+    <principal id='G-COMPANY'>Auditor</principal>
+    <principal id='G-COMPANY'>Author</principal>
+  </local_role_group_id>
+ </local_role_group_ids>
 </local_roles_item>
\ No newline at end of file

master/bt5/slapos_erp5/LocalRolesTemplateItem/upgrade_decision_module.xml

@@ -9,4 +9,14 @@
    <item>Author</item>
   </role>
  </local_roles>
+ <local_role_group_ids>
+  <local_role_group_id id='group'>
+    <principal id='G-COMPANY'>Auditor</principal>
+    <principal id='G-COMPANY'>Author</principal>
+  </local_role_group_id>
+  <local_role_group_id id='user'>
+    <principal id='R-MEMBER'>Auditor</principal>
+    <principal id='R-MEMBER'>Author</principal>
+  </local_role_group_id>
+ </local_role_group_ids>
 </local_roles_item>
\ No newline at end of file

master/bt5/slapos_erp5/LocalRolesTemplateItem/web_page_module.xml

@@ -5,4 +5,10 @@
    <item>Author</item>
   </role>
  </local_roles>
+ <local_role_group_ids>
+  <local_role_group_id id='group'>
+    <principal id='G-COMPANY'>Auditor</principal>
+    <principal id='G-COMPANY'>Author</principal>
+  </local_role_group_id>
+ </local_role_group_ids>
 </local_roles_item>
\ No newline at end of file

master/bt5/slapos_erp5/PathTemplateItem/portal_categories/local_role_group/computer.xml

+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Category" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_Add_portal_content_Permission</string> </key>
+            <value>
+              <tuple>
+                <string>Assignor</string>
+                <string>Manager</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>_Add_portal_folders_Permission</string> </key>
+            <value>
+              <tuple>
+                <string>Assignor</string>
+                <string>Manager</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>_Copy_or_Move_Permission</string> </key>
+            <value>
+              <tuple>
+                <string>Assignor</string>
+                <string>Manager</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>_Delete_objects_Permission</string> </key>
+            <value>
+              <tuple>
+                <string>Assignor</string>
+                <string>Manager</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>_Modify_portal_content_Permission</string> </key>
+            <value>
+              <tuple>
+                <string>Assignee</string>
+                <string>Assignor</string>
+                <string>Manager</string>
+                <string>Owner</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>categories</string> </key>
+            <value>
+              <tuple>
+                <string>local_role_group/computer</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>computer</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Category</string> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>computer</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

master/bt5/slapos_erp5/PathTemplateItem/portal_categories/local_role_group/subscription.xml

+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Category" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_Add_portal_content_Permission</string> </key>
+            <value>
+              <tuple>
+                <string>Assignor</string>
+                <string>Manager</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>_Add_portal_folders_Permission</string> </key>
+            <value>
+              <tuple>
+                <string>Assignor</string>
+                <string>Manager</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>_Copy_or_Move_Permission</string> </key>
+            <value>
+              <tuple>
+                <string>Assignor</string>
+                <string>Manager</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>_Delete_objects_Permission</string> </key>
+            <value>
+              <tuple>
+                <string>Assignor</string>
+                <string>Manager</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>_Modify_portal_content_Permission</string> </key>
+            <value>
+              <tuple>
+                <string>Assignee</string>
+                <string>Assignor</string>
+                <string>Manager</string>
+                <string>Owner</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>categories</string> </key>
+            <value>
+              <tuple>
+                <string>local_role_group/subscription</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>subscription</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Category</string> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>subscription</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

master/bt5/slapos_erp5/PathTemplateItem/portal_categories/local_role_group/user.xml

+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Category" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_Add_portal_content_Permission</string> </key>
+            <value>
+              <tuple>
+                <string>Assignor</string>
+                <string>Manager</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>_Add_portal_folders_Permission</string> </key>
+            <value>
+              <tuple>
+                <string>Assignor</string>
+                <string>Manager</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>_Copy_or_Move_Permission</string> </key>
+            <value>
+              <tuple>
+                <string>Assignor</string>
+                <string>Manager</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>_Delete_objects_Permission</string> </key>
+            <value>
+              <tuple>
+                <string>Assignor</string>
+                <string>Manager</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>_Modify_portal_content_Permission</string> </key>
+            <value>
+              <tuple>
+                <string>Assignee</string>
+                <string>Assignor</string>
+                <string>Manager</string>
+                <string>Owner</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>categories</string> </key>
+            <value>
+              <tuple>
+                <string>local_role_group/user</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>user</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Category</string> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>user</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Access%20Token%20Module.xml

 <type_roles>
   <role id='Author; Auditor'>
    <property id='title'>Group company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>
   <role id='Author'>
    <property id='title'>Member</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>
   </role>

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Account%20Module.xml

 <type_roles>
   <role id='Author; Auditor'>
    <property id='title'>Group company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>
   <role id='Auditor'>
    <property id='title'>Member</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>
   </role>
   <role id='Auditor'>
    <property id='title'>Person Shadow</property>
+   <multi_property id='categories'>local_role_group/shadow</multi_property>
    <multi_property id='category'>role/shadow/person</multi_property>
    <multi_property id='base_category'>role</multi_property>
   </role>

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Account.xml

 <type_roles>
   <role id='Assignor'>
    <property id='title'>Group company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>
   <role id='Auditor'>
    <property id='title'>Member</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>
   </role>
   <role id='Auditor'>
    <property id='title'>Person Shadow</property>
+   <multi_property id='categories'>local_role_group/shadow</multi_property>
    <multi_property id='category'>role/shadow/person</multi_property>
    <multi_property id='base_category'>role</multi_property>
   </role>

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Accounting%20Period.xml

 <type_roles>
   <role id='Assignor'>
    <property id='title'>Company group</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Accounting%20Transaction%20Module.xml

 <type_roles>
   <role id='Author; Auditor'>
    <property id='title'>Group company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>
   <role id='Auditor'>
    <property id='title'>Member</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>
   </role>
   <role id='Assignor'>
    <property id='title'>Person Shadow</property>
+   <multi_property id='categories'>local_role_group/shadow</multi_property>
    <multi_property id='category'>role/shadow/person</multi_property>
    <multi_property id='base_category'>role</multi_property>
   </role>

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Accounting%20Transaction.xml

 <type_roles>
   <role id='Assignor'>
    <property id='title'>Group company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Acknowledgement.xml

@@ -4,6 +4,7 @@
    <property id='description'>Monovalued role</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'>destination</multi_property>
   </role>
   <role id='Auditor'>
@@ -11,10 +12,12 @@
    <property id='description'>Monovalued role</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'>source</multi_property>
   </role>
   <role id='Assignor'>
    <property id='title'>Group company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Assignment.xml

 <type_roles>
   <role id='Auditor; Assignor'>
    <property id='title'>Company group</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Balance%20Transaction.xml

 <type_roles>
   <role id='Assignor'>
    <property id='title'>Group company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Bank%20Account.xml

 <type_roles>
   <role id='Assignor'>
    <property id='title'>Group company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Business%20Process%20Module.xml

 <type_roles>
   <role id='Auditor'>
    <property id='title'>Group company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>
   <role id='Auditor'>
    <property id='title'>Member</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>
   </role>

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Business%20Process.xml

 <type_roles>
   <role id='Auditor'>
    <property id='title'>Group company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>
   <role id='Auditor'>
    <property id='title'>Member</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>
   </role>

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Campaign%20Module.xml

 <type_roles>
   <role id='Auditor; Author'>
    <property id='title'>Company group</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Campaign.xml

 <type_roles>
   <role id='Assignor'>
    <property id='title'>Company group</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Cash%20Register.xml

 <type_roles>
   <role id='Assignor'>
    <property id='title'>Group company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Cloud%20Contract%20Module.xml

 <type_roles>
   <role id='Author; Auditor'>
    <property id='title'>Group company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Cloud%20Contract.xml

 <type_roles>
   <role id='Assignor'>
    <property id='title'>Group company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Component%20Module.xml

 <type_roles>
   <role id='Author; Auditor'>
    <property id='title'>Group company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Component.xml

 <type_roles>
   <role id='Assignor'>
    <property id='title'>Group company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Computer%20Consumption%20TioXML%20File.xml

 <type_roles>
   <role id='Assignor'>
    <property id='title'>Group company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Computer%20Model%20Module.xml

 <type_roles>
   <role id='Auditor; Author'>
    <property id='title'>Group Company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>
   <role id='Auditor; Author'>
    <property id='title'>Member</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>
   </role>

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Computer%20Model.xml

@@ -3,10 +3,12 @@
    <property id='title'>Computer Agent</property>
    <property id='description'>Monovalued role</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_administration</multi_property>
   </role>
   <role id='Assignor'>
    <property id='title'>Group company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Computer%20Module.xml

 <type_roles>
   <role id='Auditor'>
    <property id='title'>Computer</property>
+   <multi_property id='categories'>local_role_group/computer</multi_property>
    <multi_property id='category'>role/computer</multi_property>
    <multi_property id='base_category'>role</multi_property>
   </role>
   <role id='Author; Auditor'>
    <property id='title'>Group company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>
   <role id='Auditor; Author'>
    <property id='title'>Member</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>
   </role>
   <role id='Auditor'>
    <property id='title'>Person Shadow</property>
+   <multi_property id='categories'>local_role_group/shadow</multi_property>
    <multi_property id='category'>role/shadow/person</multi_property>
    <multi_property id='base_category'>role</multi_property>
   </role>

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Computer%20Network%20Module.xml

 <type_roles>
   <role id='Auditor; Author'>
    <property id='title'>Group company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>
   <role id='Auditor; Author'>
    <property id='title'>Member</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>
   </role>
   <role id='Auditor'>
    <property id='title'>Person Shadow</property>
+   <multi_property id='categories'>local_role_group/shadow</multi_property>
    <multi_property id='category'>role/shadow/person</multi_property>
    <multi_property id='base_category'>role</multi_property>
   </role>

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Computer%20Network.xml

@@ -3,10 +3,12 @@
    <property id='title'>Computer Agent</property>
    <property id='description'>Monovalued role</property>
    <property id='base_category_script'>ERP5Type_getSecurityCategoryFromContent</property>
+   <multi_property id='categories'>local_role_group/computer</multi_property>
    <multi_property id='base_category'>source_administration</multi_property>
   </role>
   <role id='Assignor'>
    <property id='title'>Group company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>
@@ -14,10 +16,12 @@
    <property id='title'>Person Owner</property>
    <property id='description'>XXX Review this</property>
    <property id='base_category_script'>ERP5Type_acquireSecurityFromOwner</property>
+   <multi_property id='categories'>local_role_group/user</multi_property>
    <multi_property id='base_category'>source</multi_property>
   </role>
   <role id='Auditor'>
    <property id='title'>Person Shadow</property>
+   <multi_property id='categories'>local_role_group/shadow</multi_property>
    <multi_property id='category'>role/shadow/person</multi_property>
    <multi_property id='base_category'>role</multi_property>
   </role>

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Computer%20Partition.xml

@@ -3,12 +3,14 @@
    <property id='title'>Customer of the partition</property>
    <property id='condition'>python: here.getSlapState() == "busy"</property>
    <property id='base_category_script'>PartitionType_getSecurityCategoryFromUser</property>
+   <multi_property id='categories'>local_role_group/user</multi_property>
    <multi_property id='base_category'>destination_section</multi_property>
   </role>
   <role id='Auditor'>
    <property id='title'>Software Instance group related to Computer Partition</property>
    <property id='condition'>python: here.getSlapState() == "busy"</property>
    <property id='base_category_script'>ERP5Type_getSecurityCategoryFromAggregateRelatedSoftwareInstanceHostingSubscription</property>
+   <multi_property id='categories'>local_role_group/subscription</multi_property>
    <multi_property id='base_category'>aggregate</multi_property>
   </role>
 </type_roles>
\ No newline at end of file

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Computer.xml

@@ -3,16 +3,19 @@
    <property id='title'>Allocation scope</property>
    <property id='condition'>python: here.getAllocationScope('').startswith('open')</property>
    <property id='base_category_script'>ComputerType_getSecurityCategoryFromAllocationScope</property>
+   <multi_property id='categories'>local_role_group/shadow</multi_property>
    <multi_property id='base_category'>aggregate</multi_property>
   </role>
   <role id='Assignee'>
    <property id='title'>Computer Agent</property>
    <property id='description'>Monovalued role</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_administration</multi_property>
   </role>
   <role id='Assignor'>
    <property id='title'>Group company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>
@@ -20,6 +23,7 @@
    <property id='title'>Self Computer</property>
    <property id='condition'>python: context.getUserId("") != ""</property>
    <property id='base_category_script'>ERP5Type_getSecurityCategoryFromSelf</property>
+   <multi_property id='categories'>local_role_group/computer</multi_property>
    <multi_property id='base_category'>destination_decision</multi_property>
   </role>
 </type_roles>
\ No newline at end of file

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Consumption%20Document%20Module.xml

@@ -5,11 +5,13 @@
   </role>
   <role id='Author; Auditor'>
    <property id='title'>Group company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>
   <role id='Auditor; Author'>
    <property id='title'>Member</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>
   </role>

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Contribution%20Tool.xml

 <type_roles>
   <role id='Author; Auditor'>
    <property id='title'>Group company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>
   <role id='Author'>
    <property id='title'>Security for Shacache (Author)</property>
+   <multi_property id='categories'>local_role_group/user</multi_property>
    <multi_property id='category'>role/member</multi_property>
    <multi_property id='category'>role/computer</multi_property>
    <multi_property id='category'>role/instance</multi_property>

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Credential%20Update%20Module.xml

 <type_roles>
   <role id='Auditor; Author'>
    <property id='title'>Group company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>
   <role id='Auditor; Author'>
    <property id='title'>Member</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>
   </role>

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Credit%20Card.xml

 <type_roles>
   <role id='Assignor'>
    <property id='title'>Group company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Currency%20Module.xml

 <type_roles>
   <role id='Author; Auditor'>
    <property id='title'>Group company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>
   <role id='Auditor'>
    <property id='title'>Member</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>
   </role>
   <role id='Auditor'>
    <property id='title'>Person Shadow</property>
+   <multi_property id='categories'>local_role_group/shadow</multi_property>
    <multi_property id='category'>role/shadow/person</multi_property>
    <multi_property id='base_category'>role</multi_property>
   </role>

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Currency.xml

 <type_roles>
   <role id='Assignor'>
    <property id='title'>Group company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>
   <role id='Auditor'>
    <property id='title'>Member</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>
   </role>
   <role id='Auditor'>
    <property id='title'>Person Shadow</property>
+   <multi_property id='categories'>local_role_group/shadow</multi_property>
    <multi_property id='category'>role/shadow/person</multi_property>
    <multi_property id='base_category'>role</multi_property>
   </role>

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Data%20Set%20Module.xml

 <type_roles>
   <role id='Author; Auditor'>
    <property id='title'>Group company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>
   <role id='Author'>
    <property id='title'>Security for Shacache (Author)</property>
+   <multi_property id='categories'>local_role_group/user</multi_property>
    <multi_property id='category'>role/member</multi_property>
    <multi_property id='category'>role/computer</multi_property>
    <multi_property id='category'>role/instance</multi_property>

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Data%20Set.xml

 <type_roles>
   <role id='Assignor'>
    <property id='title'>Group company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>
   <role id='Auditor'>
    <property id='title'>Security for Shacache (Auditor)</property>
+   <multi_property id='categories'>local_role_group/user</multi_property>
    <multi_property id='category'>role/member</multi_property>
    <multi_property id='category'>role/computer</multi_property>
    <multi_property id='category'>role/instance</multi_property>

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Document%20Ingestion%20Module.xml

 <type_roles>
   <role id='Author; Auditor'>
    <property id='title'>Group company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Document%20Module.xml

 <type_roles>
   <role id='Author; Auditor'>
    <property id='title'>Group company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>
   <role id='Author'>
    <property id='title'>Security for Shacache (Author)</property>
+   <multi_property id='categories'>local_role_group/user</multi_property>
    <multi_property id='category'>role/member</multi_property>
    <multi_property id='category'>role/computer</multi_property>
    <multi_property id='category'>role/instance</multi_property>

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Drawing.xml

 <type_roles>
   <role id='Assignor'>
    <property id='title'>Group company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>
   <role id='Auditor'>
    <property id='title'>Security for Shacache</property>
+   <multi_property id='categories'>local_role_group/user</multi_property>
    <multi_property id='category'>role/member</multi_property>
    <multi_property id='category'>role/computer</multi_property>
    <multi_property id='category'>role/instance</multi_property>

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Event%20Module.xml

 <type_roles>
   <role id='Auditor; Author'>
    <property id='title'>Group company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>
   <role id='Auditor; Author'>
    <property id='title'>Member</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>
   </role>

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

@@ -4,6 +4,7 @@
    <property id='description'>Monovalued role</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'>destination</multi_property>
   </role>
   <role id='Auditor'>
@@ -11,10 +12,12 @@
    <property id='description'>Monovalued role</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'>source</multi_property>
   </role>
   <role id='Assignor'>
    <property id='title'>Group company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/File.xml

 <type_roles>
   <role id='Assignor'>
    <property id='title'>Group company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Gadget%20Tool.xml

 <type_roles>
   <role id='Author; Auditor'>
    <property id='title'>Group company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Gadget.xml

 <type_roles>
   <role id='Assignor'>
    <property id='title'>Group company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Hosting%20Subscription%20Module.xml

@@ -6,6 +6,7 @@
   </role>
   <role id='Author; Auditor'>
    <property id='title'>Group Company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>
@@ -16,6 +17,7 @@
   </role>
   <role id='Auditor; Author'>
    <property id='title'>Member</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>
   </role>

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Hosting%20Subscription.xml

@@ -2,16 +2,19 @@
   <role id='Assignee'>
    <property id='title'>Customer of the Hosting Subscription</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_section</multi_property>
   </role>
   <role id='Assignor'>
    <property id='title'>Group Company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>
-  <role id='Assignor'>
+  <role id='Assignee'>
    <property id='title'>Related Software Instance Group</property>
    <property id='base_category_script'>ERP5Type_getSecurityCategoryFromSelf</property>
+   <multi_property id='categories'>local_role_group/subscription</multi_property>
    <multi_property id='base_category'>aggregate</multi_property>
   </role>
 </type_roles>
\ No newline at end of file

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Image%20Module.xml

 <type_roles>
   <role id='Author; Auditor'>
    <property id='title'>Group company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>
   <role id='Author'>
    <property id='title'>Security for Shacache (Author)</property>
+   <multi_property id='categories'>local_role_group/user</multi_property>
    <multi_property id='category'>role/member</multi_property>
    <multi_property id='category'>role/computer</multi_property>
    <multi_property id='category'>role/instance</multi_property>

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Image.xml

 <type_roles>
   <role id='Assignor'>
    <property id='title'>Group company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>
   <role id='Auditor'>
    <property id='title'>Security for Shacache (Auditor)</property>
+   <multi_property id='categories'>local_role_group/user</multi_property>
    <multi_property id='category'>role/member</multi_property>
    <multi_property id='category'>role/computer</multi_property>
    <multi_property id='category'>role/instance</multi_property>

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

 <type_roles>
   <role id='Assignor'>
    <property id='title'>Group Company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>
   <role id='Auditor; Author'>
    <property id='title'>Person Shadow</property>
+   <multi_property id='categories'>local_role_group/shadow</multi_property>
    <multi_property id='category'>role/shadow/person</multi_property>
    <multi_property id='base_category'>role</multi_property>
   </role>

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Integration%20Tool.xml

 <type_roles>
   <role id='Author; Auditor'>
    <property id='title'>Group Company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>
   <role id='Auditor'>
    <property id='title'>Person Shadow</property>
+   <multi_property id='categories'>local_role_group/shadow</multi_property>
    <multi_property id='category'>role/shadow/person</multi_property>
    <multi_property id='base_category'>role</multi_property>
   </role>

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Inventory%20Module.xml

 <type_roles>
   <role id='Author; Auditor'>
    <property id='title'>Group company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Inventory.xml

 <type_roles>
   <role id='Assignor'>
    <property id='title'>Group company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Knowledge%20Box.xml

 <type_roles>
   <role id='Assignor'>
    <property id='title'>Group company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Knowledge%20Pad%20Module.xml

 <type_roles>
   <role id='Author; Auditor'>
    <property id='title'>Group company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Knowledge%20Pad.xml

 <type_roles>
   <role id='Assignor'>
    <property id='title'>Group company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Letter.xml

@@ -4,6 +4,7 @@
    <property id='description'>Monovalued role</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'>destination</multi_property>
   </role>
   <role id='Auditor'>
@@ -11,10 +12,12 @@
    <property id='description'>Monovalued role</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'>source</multi_property>
   </role>
   <role id='Assignor'>
    <property id='title'>Group company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>

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

@@ -4,6 +4,7 @@
    <property id='description'>Monovalued role</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'>destination</multi_property>
   </role>
   <role id='Auditor'>
@@ -11,10 +12,12 @@
    <property id='description'>Monovalued role</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'>source</multi_property>
   </role>
   <role id='Assignor'>
    <property id='title'>Group company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Meeting%20Module.xml

 <type_roles>
   <role id='Author; Auditor'>
    <property id='title'>Group company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Meeting.xml

 <type_roles>
   <role id='Assignor'>
    <property id='title'>Group company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Note.xml

@@ -4,6 +4,7 @@
    <property id='description'>Monovalued role</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'>destination</multi_property>
   </role>
   <role id='Auditor'>
@@ -11,10 +12,12 @@
    <property id='description'>Monovalued role</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'>source</multi_property>
   </role>
   <role id='Assignor'>
    <property id='title'>Group company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Notification%20Message%20Module.xml

 <type_roles>
   <role id='Author; Auditor'>
    <property id='title'>Group company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>

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

 <type_roles>
   <role id='Assignor'>
    <property id='title'>Group company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/One%20Time%20Restricted%20Access%20Token.xml

 <type_roles>
   <role id='Assignor'>
    <property id='title'>Group company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Open%20Sale%20Order%20Module.xml

 <type_roles>
   <role id='Author; Auditor'>
    <property id='title'>Group company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Open%20Sale%20Order.xml

 <type_roles>
   <role id='Assignor'>
    <property id='title'>Group company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Organisation%20Module.xml

@@ -6,16 +6,19 @@
   </role>
   <role id='Auditor; Author'>
    <property id='title'>Customer</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>
   </role>
   <role id='Author; Auditor'>
    <property id='title'>Group company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>
   <role id='Auditor'>
    <property id='title'>Person Shadow</property>
+   <multi_property id='categories'>local_role_group/shadow</multi_property>
    <multi_property id='category'>role/shadow/person</multi_property>
    <multi_property id='base_category'>role</multi_property>
   </role>

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Organisation.xml

 <type_roles>
   <role id='Assignor'>
    <property id='title'>Group company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>
@@ -13,10 +14,12 @@
    <property id='title'>Person Owner</property>
    <property id='description'>XXXX Review this later</property>
    <property id='base_category_script'>ERP5Type_acquireSecurityFromOwner</property>
+   <multi_property id='categories'>local_role_group/user</multi_property>
    <multi_property id='base_category'>source</multi_property>
   </role>
   <role id='Auditor'>
    <property id='title'>Person Shadow</property>
+   <multi_property id='categories'>local_role_group/shadow</multi_property>
    <multi_property id='category'>role/shadow/person</multi_property>
    <multi_property id='base_category'>role</multi_property>
   </role>

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/PDF.xml

 <type_roles>
   <role id='Assignor'>
    <property id='title'>Group company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>
   <role id='Auditor'>
    <property id='title'>Security for Shacache (Auditor)</property>
+   <multi_property id='categories'>local_role_group/user</multi_property>
    <multi_property id='category'>role/member</multi_property>
    <multi_property id='category'>role/computer</multi_property>
    <multi_property id='category'>role/instance</multi_property>

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Payment%20Transaction.xml

 <type_roles>
   <role id='Assignor'>
    <property id='title'>Group company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>
-  <role id='Auditor'>
+  <role id='Assignee'>
    <property id='title'>Person Shadow</property>
+   <property id='condition'>python: here.getDestinationSection('', portal_type='Person') == ""</property>
+   <multi_property id='categories'>local_role_group/shadow</multi_property>
    <multi_property id='category'>role/shadow/person</multi_property>
    <multi_property id='base_category'>role</multi_property>
   </role>
@@ -13,12 +16,14 @@
    <property id='title'>Shadow User</property>
    <property id='condition'>python: here.getDestinationSection('', portal_type='Person') != ''</property>
    <property id='base_category_script'>PaymentTransactionType_getSecurityCategoryFromUser</property>
+   <multi_property id='categories'>local_role_group/shadow</multi_property>
    <multi_property id='base_category'>aggregate</multi_property>
   </role>
   <role id='Auditor'>
    <property id='title'>User</property>
    <property id='condition'>python: here.getDestinationSection('', portal_type='Person') != ''</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_section</multi_property>
   </role>
 </type_roles>
\ No newline at end of file

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Payzen%20Event.xml

 <type_roles>
   <role id='Assignor'>
    <property id='title'>Group company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>
@@ -8,6 +9,7 @@
    <property id='title'>Shadow User</property>
    <property id='condition'>python: here.getDestinationSection('', portal_type='Person') != ''</property>
    <property id='base_category_script'>PayzenEventType_getSecurityCategoryFromUser</property>
+   <multi_property id='categories'>local_role_group/shadow</multi_property>
    <multi_property id='base_category'>aggregate</multi_property>
   </role>
 </type_roles>
\ No newline at end of file

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Person%20Module.xml

 <type_roles>
   <role id='Author; Auditor'>
    <property id='title'>Group company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>
   <role id='Auditor'>
    <property id='title'>Member</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>
   </role>
   <role id='Auditor'>
    <property id='title'>Person Shadow</property>
+   <multi_property id='categories'>local_role_group/shadow</multi_property>
    <multi_property id='category'>role/shadow/person</multi_property>
    <multi_property id='base_category'>role</multi_property>
   </role>

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Person.xml

 <type_roles>
   <role id='Assignor'>
    <property id='title'>Group company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>
@@ -9,13 +10,15 @@
    <property id='description'>Monovalued role</property>
    <property id='condition'>python: here.objectValues(portal_type=["ERP5 Login", "Google Login", "Facebook Login"])</property>
    <property id='base_category_script'>PersonType_getSecurityCategoryFromSelfShadow</property>
+   <multi_property id='categories'>local_role_group/shadow</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>
-  <role id='Associate'>
+  <role id='Assignee'>
    <property id='title'>The User Himself</property>
    <property id='description'>Monovalued role</property>
    <property id='condition'>python: here.objectValues(portal_type=["ERP5 Login", "Google Login", "Facebook Login"])</property>
    <property id='base_category_script'>ERP5Type_getSecurityCategoryFromSelf</property>
+   <multi_property id='categories'>local_role_group/user</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>
-</type_roles>
+</type_roles>
\ No newline at end of file

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

@@ -4,6 +4,7 @@
    <property id='description'>Monovalued role</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'>destination</multi_property>
   </role>
   <role id='Auditor'>
@@ -11,10 +12,12 @@
    <property id='description'>Monovalued role</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'>source</multi_property>
   </role>
   <role id='Assignor'>
    <property id='title'>Group company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Presentation.xml

 <type_roles>
   <role id='Assignor'>
    <property id='title'>Group company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>
   <role id='Auditor'>
    <property id='title'>Security for Shacache</property>
+   <multi_property id='categories'>local_role_group/user</multi_property>
    <multi_property id='category'>role/member</multi_property>
    <multi_property id='category'>role/computer</multi_property>
    <multi_property id='category'>role/instance</multi_property>

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Product%20Module.xml

 <type_roles>
   <role id='Author; Auditor'>
    <property id='title'>Group company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Product.xml

 <type_roles>
   <role id='Assignor'>
    <property id='title'>Group company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Project%20Module.xml

@@ -6,16 +6,19 @@
   </role>
   <role id='Auditor; Author'>
    <property id='title'>Customer</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>
   </role>
   <role id='Author; Auditor'>
    <property id='title'>Group company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>
   <role id='Auditor'>
    <property id='title'>Person Shadow</property>
+   <multi_property id='categories'>local_role_group/shadow</multi_property>
    <multi_property id='category'>role/shadow/person</multi_property>
    <multi_property id='base_category'>role</multi_property>
   </role>

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Project.xml

 <type_roles>
   <role id='Assignor'>
    <property id='title'>Group company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>
@@ -13,10 +14,12 @@
    <property id='title'>Person Owner</property>
    <property id='description'>XXXX Review this later</property>
    <property id='base_category_script'>ERP5Type_acquireSecurityFromOwner</property>
+   <multi_property id='categories'>local_role_group/user</multi_property>
    <multi_property id='base_category'>source</multi_property>
   </role>
   <role id='Auditor'>
    <property id='title'>Person Shadow</property>
+   <multi_property id='categories'>local_role_group/shadow</multi_property>
    <multi_property id='category'>role/shadow/person</multi_property>
    <multi_property id='base_category'>role</multi_property>
   </role>

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Purchase%20Invoice%20Transaction.xml

 <type_roles>
   <role id='Assignor'>
    <property id='title'>Group company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Purchase%20Order%20Module.xml

 <type_roles>
   <role id='Author; Auditor'>
    <property id='title'>Group company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Purchase%20Order.xml

 <type_roles>
   <role id='Assignor'>
    <property id='title'>Group company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Purchase%20Trade%20Condition%20Module.xml

 <type_roles>
   <role id='Author; Auditor'>
    <property id='title'>Group company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Purchase%20Trade%20Condition.xml

 <type_roles>
   <role id='Assignor'>
    <property id='title'>Group company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Query%20Module.xml

 <type_roles>
   <role id='Author; Auditor'>
    <property id='title'>Group company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Query.xml

 <type_roles>
   <role id='Assignor'>
    <property id='title'>Group company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Regularisation%20Request%20Module.xml

 <type_roles>
   <role id='Author; Auditor'>
    <property id='title'>Group company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>
   <role id='Auditor'>
    <property id='title'>Member</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>
   </role>

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Regularisation%20Request.xml

@@ -3,16 +3,19 @@
    <property id='title'>Customer</property>
    <property id='description'>Monovalued role</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_decision</multi_property>
   </role>
   <role id='Assignor'>
    <property id='title'>Group company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <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.getPreferredRegularisationRequestTemplate()</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>
   </role>

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Restricted%20Access%20Token.xml

@@ -6,6 +6,7 @@
   </role>
   <role id='Assignor'>
    <property id='title'>Group company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Sale%20Invoice%20Transaction.xml

 <type_roles>
   <role id='Assignor'>
    <property id='title'>Group company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>
   <role id='Assignee'>
    <property id='title'>Person Shadow</property>
+   <multi_property id='categories'>local_role_group/shadow</multi_property>
    <multi_property id='category'>role/shadow/person</multi_property>
    <multi_property id='base_category'>role</multi_property>
   </role>
@@ -13,6 +15,7 @@
    <property id='title'>User</property>
    <property id='condition'>python: here.getDestinationSection('', portal_type='Person') != ''</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_section</multi_property>
   </role>
 </type_roles>
\ No newline at end of file

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Sale%20Opportunity%20Module.xml

 <type_roles>
   <role id='Author; Auditor'>
    <property id='title'>Group company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Sale%20Opportunity.xml

 <type_roles>
   <role id='Assignor'>
    <property id='title'>Group company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Sale%20Order%20Module.xml

 <type_roles>
   <role id='Author; Auditor'>
    <property id='title'>Group company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Sale%20Order.xml

 <type_roles>
   <role id='Assignor'>
    <property id='title'>Group company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Sale%20Packing%20List%20Module.xml

 <type_roles>
   <role id='Author; Auditor'>
    <property id='title'>Group company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>
   <role id='Auditor'>
    <property id='title'>Member</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>
   </role>

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Sale%20Packing%20List.xml

 <type_roles>
   <role id='Assignor'>
    <property id='title'>Group company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>
@@ -8,6 +9,7 @@
    <property id='title'>Subscription Customer</property>
    <property id='condition'>python: here.getSpecialise() in ('sale_trade_condition_module/slapos_subscription_trade_condition', 'sale_trade_condition_module/slapos_aggregated_trade_condition')</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_decision</multi_property>
   </role>
 </type_roles>
\ No newline at end of file

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Sale%20Trade%20Condition%20Module.xml

 <type_roles>
   <role id='Author; Auditor'>
    <property id='title'>Group company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>
   <role id='Auditor'>
    <property id='title'>Member</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>
   </role>

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Sale%20Trade%20Condition.xml

 <type_roles>
   <role id='Assignor'>
    <property id='title'>Group company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>
   <role id='Auditor'>
    <property id='title'>Member</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>
   </role>

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Service%20Module.xml

 <type_roles>
   <role id='Author; Auditor'>
    <property id='title'>Group company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>
   <role id='Auditor'>
    <property id='title'>Member</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>
   </role>

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Service.xml

 <type_roles>
   <role id='Assignor'>
    <property id='title'>Group company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>
   <role id='Auditor'>
    <property id='title'>Member</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>
   </role>

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

@@ -4,6 +4,7 @@
    <property id='description'>Monovalued role</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'>destination</multi_property>
   </role>
   <role id='Auditor'>
@@ -11,10 +12,12 @@
    <property id='description'>Monovalued role</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'>source</multi_property>
   </role>
   <role id='Assignor'>
    <property id='title'>Group company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>

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

@@ -4,6 +4,7 @@
    <property id='description'>Monovalued role</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'>destination</multi_property>
   </role>
   <role id='Auditor'>
@@ -11,10 +12,12 @@
    <property id='description'>Monovalued role</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'>source</multi_property>
   </role>
   <role id='Assignor'>
    <property id='title'>Group company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Slave%20Instance.xml

@@ -2,29 +2,27 @@
   <role id='Assignor'>
    <property id='title'>Computer</property>
    <property id='base_category_script'>ERP5Type_getSecurityCategoryFromContentParent</property>
+   <multi_property id='categories'>local_role_group/computer</multi_property>
    <multi_property id='base_category'>aggregate</multi_property>
   </role>
   <role id='Assignee'>
    <property id='title'>Customer of the Instance</property>
    <property id='base_category_script'>InstanceType_getSecurityCategoryFromUser</property>
+   <multi_property id='categories'>local_role_group/user</multi_property>
    <multi_property id='base_category'>destination_section</multi_property>
   </role>
   <role id='Assignor'>
    <property id='title'>Group company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>
-  <role id='Assignor'>
+  <role id='Assignee'>
    <property id='title'>Instance related by Hosting Subscription</property>
    <property id='base_category_script'>ERP5Type_getSecurityCategoryFromContent</property>
+   <multi_property id='categories'>local_role_group/subscription</multi_property>
    <multi_property id='base_category'>specialise</multi_property>
   </role>
-  <role id='Assignee'>
-   <property id='title'>Owner become Assignee</property>
-   <property id='description'>XXX Needed to allow doActionFor while creating the document</property>
-   <property id='base_category_script'>ERP5Type_acquireSecurityFromOwner</property>
-   <multi_property id='base_category'>source</multi_property>
-  </role>
   <role id='Assignor'>
    <property id='title'>Software Instance which provides this Slave Instance</property>
    <property id='base_category_script'>SlaveInstanceType_getSecurityCategoryFromSoftwareInstance</property>

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Software%20Installation%20Module.xml

 <type_roles>
   <role id='Auditor'>
    <property id='title'>Computer</property>
+   <multi_property id='categories'>local_role_group/computer</multi_property>
    <multi_property id='category'>role/computer</multi_property>
    <multi_property id='base_category'>role</multi_property>
   </role>
   <role id='Author; Auditor'>
    <property id='title'>Group company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>
   <role id='Auditor; Author'>
    <property id='title'>Member</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>
   </role>

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Software%20Installation.xml

@@ -2,22 +2,19 @@
   <role id='Assignor'>
    <property id='title'>Computer</property>
    <property id='base_category_script'>ERP5Type_getSecurityCategoryFromContent</property>
+   <multi_property id='categories'>local_role_group/computer</multi_property>
    <multi_property id='base_category'>aggregate</multi_property>
   </role>
   <role id='Assignor'>
    <property id='title'>Group company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>
-  <role id='Assignee'>
-   <property id='title'>Owner become Assignee</property>
-   <property id='description'>XXX Needed to allow doActionFor while creating the document</property>
-   <property id='base_category_script'>ERP5Type_acquireSecurityFromOwner</property>
-   <multi_property id='base_category'>source</multi_property>
-  </role>
   <role id='Assignee'>
    <property id='title'>Provider of the Installation</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_section</multi_property>
   </role>
 </type_roles>
\ No newline at end of file

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Software%20Instance%20Module.xml

@@ -6,6 +6,7 @@
   </role>
   <role id='Author; Auditor'>
    <property id='title'>Group company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>
@@ -16,6 +17,7 @@
   </role>
   <role id='Auditor; Author'>
    <property id='title'>Member</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>
   </role>

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Software%20Instance.xml

@@ -2,27 +2,25 @@
   <role id='Assignor'>
    <property id='title'>Computer</property>
    <property id='base_category_script'>ERP5Type_getSecurityCategoryFromContentParent</property>
+   <multi_property id='categories'>local_role_group/computer</multi_property>
    <multi_property id='base_category'>aggregate</multi_property>
   </role>
   <role id='Assignee'>
    <property id='title'>Customer of the Instance</property>
    <property id='base_category_script'>InstanceType_getSecurityCategoryFromUser</property>
+   <multi_property id='categories'>local_role_group/user</multi_property>
    <multi_property id='base_category'>destination_section</multi_property>
   </role>
   <role id='Assignor'>
    <property id='title'>Group company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>
-  <role id='Assignor'>
+  <role id='Assignee'>
    <property id='title'>Instance related by Hosting Subscription</property>
    <property id='base_category_script'>ERP5Type_getSecurityCategoryFromContent</property>
+   <multi_property id='categories'>local_role_group/subscription</multi_property>
    <multi_property id='base_category'>specialise</multi_property>
   </role>
-  <role id='Assignee'>
-   <property id='title'>Owner become Assignee</property>
-   <property id='description'>XXX Needed to allow doActionFor while creating the document</property>
-   <property id='base_category_script'>ERP5Type_acquireSecurityFromOwner</property>
-   <multi_property id='base_category'>source</multi_property>
-  </role>
 </type_roles>
\ No newline at end of file

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Software%20Product%20Module.xml

 <type_roles>
   <role id='Author; Auditor'>
    <property id='title'>Group company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>
   <role id='Auditor'>
    <property id='title'>Member</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>
   </role>

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Software%20Product.xml

 <type_roles>
   <role id='Assignor'>
    <property id='title'>Group company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>
   <role id='Auditor'>
    <property id='title'>Member</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>
   </role>

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Software%20Release%20Module.xml

 <type_roles>
   <role id='Author; Auditor'>
    <property id='title'>Group company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>
   <role id='Auditor; Author'>
    <property id='title'>Member</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>
   </role>

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Software%20Release.xml

 <type_roles>
   <role id='Assignor'>
    <property id='title'>Group company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>
   <role id='Auditor'>
    <property id='title'>Member</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>
   </role>

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Spreadsheet.xml

 <type_roles>
   <role id='Assignor'>
    <property id='title'>Group company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>
   <role id='Auditor'>
    <property id='title'>Security for Shacache (Auditor)</property>
+   <multi_property id='categories'>local_role_group/user</multi_property>
    <multi_property id='category'>role/member</multi_property>
    <multi_property id='category'>role/computer</multi_property>
    <multi_property id='category'>role/instance</multi_property>

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Support%20Request%20Module.xml

 <type_roles>
   <role id='Author; Auditor'>
    <property id='title'>Group company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>
   <role id='Auditor; Author'>
    <property id='title'>Member</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>
   </role>

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Support%20Request.xml

@@ -3,16 +3,19 @@
    <property id='title'>Customer</property>
    <property id='description'>Monovalued role</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_decision</multi_property>
   </role>
   <role id='Assignor'>
    <property id='title'>Group company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <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.getPreferredSupportRequestTemplate()</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>
   </role>

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/System%20Event%20Module.xml

 <type_roles>
   <role id='Author; Auditor'>
    <property id='title'>Group company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>
   <role id='Author'>
    <property id='title'>Person Shadow</property>
+   <multi_property id='categories'>local_role_group/shadow</multi_property>
    <multi_property id='category'>role/shadow/person</multi_property>
    <multi_property id='base_category'>role</multi_property>
   </role>

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Text.xml

 <type_roles>
   <role id='Assignor'>
    <property id='title'>Group company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>
   <role id='Auditor'>
    <property id='title'>Security for Shacache</property>
+   <multi_property id='categories'>local_role_group/user</multi_property>
    <multi_property id='category'>role/member</multi_property>
    <multi_property id='category'>role/computer</multi_property>
    <multi_property id='category'>role/instance</multi_property>

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Transformation%20Module.xml

 <type_roles>
   <role id='Author; Auditor'>
    <property id='title'>Group company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Transformation.xml

 <type_roles>
   <role id='Assignor'>
    <property id='title'>Group company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Upgrade%20Decision%20Module.xml

 <type_roles>
   <role id='Author; Auditor'>
    <property id='title'>Group company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>
   <role id='Auditor; Author'>
    <property id='title'>Member</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>
   </role>

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Upgrade%20Decision.xml

 <type_roles>
   <role id='Assignor'>
    <property id='title'>Group company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>
@@ -8,6 +9,7 @@
    <property id='title'>User</property>
    <property id='description'>Monovalued role</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_decision</multi_property>
   </role>
 </type_roles>
\ No newline at end of file

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/User%20Consumption%20HTML%20File.xml

 <type_roles>
   <role id='Assignor'>
    <property id='title'>Group company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>
   <role id='Assignee'>
    <property id='title'>User</property>
    <property id='base_category_script'>ERP5Type_getSecurityCategoryFromContent</property>
+   <multi_property id='categories'>local_role_group/user</multi_property>
    <multi_property id='base_category'>contributor</multi_property>
   </role>
 </type_roles>
\ No newline at end of file

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Visit.xml

@@ -4,6 +4,7 @@
    <property id='description'>Monovalued role</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'>destination</multi_property>
   </role>
   <role id='Auditor'>
@@ -11,10 +12,12 @@
    <property id='description'>Monovalued role</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'>source</multi_property>
   </role>
   <role id='Assignor'>
    <property id='title'>Group company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>

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

@@ -4,6 +4,7 @@
    <property id='description'>Monovalued role</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'>destination</multi_property>
   </role>
   <role id='Auditor'>
@@ -11,16 +12,19 @@
    <property id='description'>Monovalued role</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'>source</multi_property>
   </role>
   <role id='Assignor'>
    <property id='title'>Group company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <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>
   </role>

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Web%20Page%20Module.xml

 <type_roles>
   <role id='Author; Auditor'>
    <property id='title'>Group company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>

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

 <type_roles>
   <role id='Assignor'>
    <property id='title'>Group company</property>
+   <multi_property id='categories'>local_role_group/group</multi_property>
    <multi_property id='category'>group/company</multi_property>
    <multi_property id='base_category'>group</multi_property>
   </role>

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

@@ -360,7 +360,7 @@ class TestHostingSubscription(TestSlapOSGroupRoleSecurityMixin):
 
     self.assertSecurityGroup(subscription, [self.user_id, reference,
         'G-COMPANY'], False)
-    self.assertRoles(subscription, reference, ['Assignor'])
+    self.assertRoles(subscription, reference, ['Assignee'])
     self.assertRoles(subscription, self.user_id, ['Owner'])
     self.assertRoles(subscription, 'G-COMPANY', ['Assignor'])
 
@@ -376,7 +376,7 @@ class TestHostingSubscription(TestSlapOSGroupRoleSecurityMixin):
 
     self.assertSecurityGroup(subscription, [self.user_id, reference,
         customer.getUserId(), 'G-COMPANY'], False)
-    self.assertRoles(subscription, reference, ['Assignor'])
+    self.assertRoles(subscription, reference, ['Assignee'])
     self.assertRoles(subscription, customer.getUserId(), ['Assignee'])
     self.assertRoles(subscription, self.user_id, ['Owner'])
     self.assertRoles(subscription, 'G-COMPANY', ['Assignor'])
@@ -506,7 +506,7 @@ class TestPerson(TestSlapOSGroupRoleSecurityMixin):
     self.assertSecurityGroup(person,
         ['G-COMPANY', self.user_id, person.getUserId(), shadow_reference], False)
     self.assertRoles(person, 'G-COMPANY', ['Assignor'])
-    self.assertRoles(person, person.getUserId(), ['Associate'])
+    self.assertRoles(person, person.getUserId(), ['Assignee'])
     self.assertRoles(person, shadow_reference, ['Auditor'])
     self.assertRoles(person, self.user_id, ['Owner'])
 
@@ -553,7 +553,7 @@ class TestSlaveInstance(TestSlapOSGroupRoleSecurityMixin):
 
     self.assertSecurityGroup(instance, ['G-COMPANY', self.user_id], False)
     self.assertRoles(instance, 'G-COMPANY', ['Assignor'])
-    self.assertRoles(instance, self.user_id, ['Owner', 'Assignee'])
+    self.assertRoles(instance, self.user_id, ['Owner'])
 
   test_OwnerBecomeAssignee = test_GroupCompany
 
@@ -576,8 +576,8 @@ class TestSlaveInstance(TestSlapOSGroupRoleSecurityMixin):
         subscription_reference, self.user_id], False)
     self.assertRoles(instance, 'G-COMPANY', ['Assignor'])
     self.assertRoles(instance, customer.getUserId(), ['Assignee'])
-    self.assertRoles(instance, subscription_reference, ['Assignor'])
-    self.assertRoles(instance, self.user_id, ['Owner', 'Assignee'])
+    self.assertRoles(instance, subscription_reference, ['Assignee'])
+    self.assertRoles(instance, self.user_id, ['Owner'])
 
   test_InstanceRelatedByHostingSubscription = test_CustomerOfTheInstance
 
@@ -609,7 +609,7 @@ class TestSlaveInstance(TestSlapOSGroupRoleSecurityMixin):
     self.assertRoles(instance, 'G-COMPANY', ['Assignor'])
     self.assertRoles(instance, provider.getUserId(), ['Assignor'])
     self.assertRoles(instance, computer.getUserId(), ['Assignor'])
-    self.assertRoles(instance, self.user_id, ['Owner', 'Assignee'])
+    self.assertRoles(instance, self.user_id, ['Owner'])
 
   test_Computer = test_SoftwareInstanceWhichProvidesThisSlaveInstance
 
@@ -622,7 +622,7 @@ class TestSoftwareInstallation(TestSlapOSGroupRoleSecurityMixin):
     self.assertSecurityGroup(installation, [self.user_id,
         'G-COMPANY'], False)
     self.assertRoles(installation, 'G-COMPANY', ['Assignor'])
-    self.assertRoles(installation, self.user_id, ['Owner', 'Assignee'])
+    self.assertRoles(installation, self.user_id, ['Owner'])
 
   test_OwnerBecomeAssignee = test_GroupCompany
 
@@ -641,7 +641,7 @@ class TestSoftwareInstallation(TestSlapOSGroupRoleSecurityMixin):
         'G-COMPANY', computer.getUserId()], False)
     self.assertRoles(installation, 'G-COMPANY', ['Assignor'])
     self.assertRoles(installation, computer.getUserId(), ['Assignor'])
-    self.assertRoles(installation, self.user_id, ['Owner', 'Assignee'])
+    self.assertRoles(installation, self.user_id, ['Owner'])
 
   def test_ProviderOfTheInstallation(self):
     provider_reference = 'TESTPERSON-%s' % self.generateNewId()
@@ -657,7 +657,7 @@ class TestSoftwareInstallation(TestSlapOSGroupRoleSecurityMixin):
         'G-COMPANY', provider.getUserId()], False)
     self.assertRoles(installation, 'G-COMPANY', ['Assignor'])
     self.assertRoles(installation, provider.getUserId(), ['Assignee'])
-    self.assertRoles(installation, self.user_id, ['Owner', 'Assignee'])
+    self.assertRoles(installation, self.user_id, ['Owner'])
 
 class TestSoftwareInstallationModule(TestSlapOSGroupRoleSecurityMixin):
   def test(self):
@@ -678,7 +678,7 @@ class TestSoftwareInstance(TestSlapOSGroupRoleSecurityMixin):
 
     self.assertSecurityGroup(instance, ['G-COMPANY', self.user_id], False)
     self.assertRoles(instance, 'G-COMPANY', ['Assignor'])
-    self.assertRoles(instance, self.user_id, ['Owner', 'Assignee'])
+    self.assertRoles(instance, self.user_id, ['Owner'])
 
   test_OwnerBecomeAssignee = test_GroupCompany
 
@@ -701,8 +701,8 @@ class TestSoftwareInstance(TestSlapOSGroupRoleSecurityMixin):
         subscription_reference, self.user_id], False)
     self.assertRoles(instance, 'G-COMPANY', ['Assignor'])
     self.assertRoles(instance, customer.getUserId(), ['Assignee'])
-    self.assertRoles(instance, subscription_reference, ['Assignor'])
-    self.assertRoles(instance, self.user_id, ['Owner', 'Assignee'])
+    self.assertRoles(instance, subscription_reference, ['Assignee'])
+    self.assertRoles(instance, self.user_id, ['Owner'])
 
   test_InstanceRelatedByHostingSubscription = test_CustomerOfTheInstance
 
@@ -723,7 +723,7 @@ class TestSoftwareInstance(TestSlapOSGroupRoleSecurityMixin):
         self.user_id], False)
     self.assertRoles(instance, 'G-COMPANY', ['Assignor'])
     self.assertRoles(instance, computer.getUserId(), ['Assignor'])
-    self.assertRoles(instance, self.user_id, ['Owner', 'Assignee'])
+    self.assertRoles(instance, self.user_id, ['Owner'])
 
 class TestSoftwareInstanceModule(TestSlapOSGroupRoleSecurityMixin):
   def test(self):
@@ -974,8 +974,7 @@ class TestPaymentTransaction(TestSlapOSGroupRoleSecurityMixin):
     product.updateLocalRolesOnSecurityGroups()
     shadow_user_id = 'SHADOW-%s' % person.getUserId()
     self.assertSecurityGroup(product,
-        ['G-COMPANY', self.user_id, person.getUserId(), shadow_user_id, 
-         'R-SHADOW-PERSON'], False)
+        ['G-COMPANY', self.user_id, person.getUserId(), shadow_user_id], False)
     self.assertRoles(product, 'G-COMPANY', ['Assignor'])
     self.assertRoles(product, shadow_user_id, ['Auditor'])
     self.assertRoles(product, person.getUserId(), ['Auditor'])
@@ -994,12 +993,21 @@ class TestPaymentTransaction(TestSlapOSGroupRoleSecurityMixin):
     shadow_user_id = 'SHADOW-%s' % person.getUserId()
     self.assertSecurityGroup(product,
         ['G-COMPANY', self.user_id, person.getUserId(),
-         shadow_user_id, 'R-SHADOW-PERSON'], False)
+         shadow_user_id], False)
     self.assertRoles(product, 'G-COMPANY', ['Assignor'])
     self.assertRoles(product, shadow_user_id, ['Auditor'])
     self.assertRoles(product, person.getUserId(), ['Auditor'])
     self.assertRoles(product, self.user_id, ['Owner'])
 
+  def test_User_without_destination_section(self):
+    product = self.portal.accounting_module.newContent(
+        portal_type='Payment Transaction')
+    product.updateLocalRolesOnSecurityGroups()
+    self.assertSecurityGroup(product,
+        ['G-COMPANY', self.user_id, 'R-SHADOW-PERSON'], False)
+    self.assertRoles(product, 'G-COMPANY', ['Assignor'])
+    self.assertRoles(product, self.user_id, ['Owner'])
+
 class TestPurchaseInvoiceTransaction(TestSlapOSGroupRoleSecurityMixin):
   def test_GroupCompany(self):
     product = self.portal.accounting_module.newContent(

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

@@ -290,7 +290,7 @@ class TestSlapOSLocalPermissionSlapOSInteractionWorkflow(
 
     self.assertSecurityGroup(payment_transaction, [self.user_id,
         'G-COMPANY', 'SHADOW-%s' % self.person_user.getUserId(),
-        self.person_user.getUserId(), 'R-SHADOW-PERSON'],
+        self.person_user.getUserId()],
         False)
 
   def test_PayzenEvent_setDestinationSection(self):