slapos_erp5:

* improve consistency in the Role Definition
* improve Role Definition consistency
* XXX do not allow users to create Compute Node / Instance Tree
  Break everything, to investigate how we could integrate Open Order with Compute Node

master/bt5/slapos_erp5/LocalRolesTemplateItem/accounting_module.xml

@@ -15,6 +15,11 @@
   </role>
  </local_roles>
  <local_role_group_ids>
+  <local_role_group_id id='function'>
+    <principal id='F-ACCOUNTING*'>Auditor</principal>
+    <principal id='F-ACCOUNTING*'>Author</principal>
+    <principal id='F-CUSTOMER'>Auditor</principal>
+  </local_role_group_id>
   <local_role_group_id id='shadow'>
     <principal id='R-SHADOW-PERSON'>Assignor</principal>
   </local_role_group_id>

master/bt5/slapos_erp5/LocalRolesTemplateItem/allocation_supply_module.xml

@@ -8,4 +8,9 @@
    <item>Author</item>
   </role>
  </local_roles>
+ <local_role_group_ids>
+  <local_role_group_id id='function'>
+    <principal id='F-CUSTOMER'>Auditor</principal>
+  </local_role_group_id>
+ </local_role_group_ids>
 </local_roles_item>
\ No newline at end of file

master/bt5/slapos_erp5/LocalRolesTemplateItem/compute_node_module.xml

@@ -5,7 +5,6 @@
   </role>
   <role id='F-PRODUCTION*'>
    <item>Auditor</item>
-   <item>Author</item>
   </role>
   <role id='R-COMPUTER'>
    <item>Auditor</item>
@@ -18,5 +17,8 @@
   <local_role_group_id id='computer'>
     <principal id='R-COMPUTER'>Auditor</principal>
   </local_role_group_id>
+  <local_role_group_id id='function'>
+    <principal id='F-CUSTOMER'>Auditor</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

@@ -13,6 +13,9 @@
   </role>
  </local_roles>
  <local_role_group_ids>
+  <local_role_group_id id='computer'>
+    <principal id='R-COMPUTER'>Author</principal>
+  </local_role_group_id>
   <local_role_group_id id='group'>
     <principal id='G-COMPANY'>Auditor</principal>
     <principal id='G-COMPANY'>Author</principal>

master/bt5/slapos_erp5/LocalRolesTemplateItem/currency_module.xml

@@ -15,6 +15,11 @@
   </role>
  </local_roles>
  <local_role_group_ids>
+  <local_role_group_id id='function'>
+    <principal id='F-ACCOUNTING*'>Auditor</principal>
+    <principal id='F-ACCOUNTING*'>Author</principal>
+    <principal id='F-CUSTOMER'>Auditor</principal>
+  </local_role_group_id>
   <local_role_group_id id='shadow'>
     <principal id='R-SHADOW-PERSON'>Auditor</principal>
   </local_role_group_id>

master/bt5/slapos_erp5/LocalRolesTemplateItem/hosting_subscription_module.xml

@@ -7,4 +7,9 @@
    <item>Auditor</item>
   </role>
  </local_roles>
+ <local_role_group_ids>
+  <local_role_group_id id='function'>
+    <principal id='F-CUSTOMER'>Auditor</principal>
+  </local_role_group_id>
+ </local_role_group_ids>
 </local_roles_item>
\ No newline at end of file

master/bt5/slapos_erp5/LocalRolesTemplateItem/instance_tree_module.xml

@@ -2,7 +2,6 @@
  <local_roles>
   <role id='F-CUSTOMER'>
    <item>Auditor</item>
-   <item>Author</item>
   </role>
   <role id='F-PRODUCTION*'>
    <item>Auditor</item>
@@ -14,4 +13,12 @@
    <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='function'>
+    <principal id='F-CUSTOMER'>Auditor</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

@@ -16,6 +16,9 @@
   </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>

master/bt5/slapos_erp5/LocalRolesTemplateItem/person_module.xml

@@ -11,6 +11,9 @@
   </role>
  </local_roles>
  <local_role_group_ids>
+  <local_role_group_id id='function'>
+    <principal id='F-CUSTOMER'>Auditor</principal>
+  </local_role_group_id>
   <local_role_group_id id='shadow'>
     <principal id='R-SHADOW-PERSON'>Auditor</principal>
   </local_role_group_id>

master/bt5/slapos_erp5/LocalRolesTemplateItem/project_module.xml

@@ -13,4 +13,12 @@
    <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='function'>
+    <principal id='F-CUSTOMER'>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.xml

@@ -7,4 +7,9 @@
    <item>Auditor</item>
   </role>
  </local_roles>
+ <local_role_group_ids>
+  <local_role_group_id id='function'>
+    <principal id='F-CUSTOMER'>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_supply_module.xml

@@ -8,4 +8,9 @@
    <item>Author</item>
   </role>
  </local_roles>
+ <local_role_group_ids>
+  <local_role_group_id id='function'>
+    <principal id='F-CUSTOMER'>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

@@ -7,4 +7,9 @@
    <item>Auditor</item>
   </role>
  </local_roles>
+ <local_role_group_ids>
+  <local_role_group_id id='function'>
+    <principal id='F-CUSTOMER'>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

@@ -15,5 +15,8 @@
   <local_role_group_id id='computer'>
     <principal id='R-COMPUTER'>Auditor</principal>
   </local_role_group_id>
+  <local_role_group_id id='function'>
+    <principal id='F-CUSTOMER'>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_instance_module.xml

@@ -15,4 +15,13 @@
    <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='function'>
+    <principal id='F-CUSTOMER'>Auditor</principal>
+    <principal id='F-CUSTOMER'>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,9 @@
    <item>Author</item>
   </role>
  </local_roles>
+ <local_role_group_ids>
+  <local_role_group_id id='function'>
+    <principal id='F-CUSTOMER'>Auditor</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,10 @@
    <item>Author</item>
   </role>
  </local_roles>
+ <local_role_group_ids>
+  <local_role_group_id id='function'>
+    <principal id='F-CUSTOMER'>Auditor</principal>
+    <principal id='F-CUSTOMER'>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

@@ -7,4 +7,9 @@
    <item>Auditor</item>
   </role>
  </local_roles>
+ <local_role_group_ids>
+  <local_role_group_id id='function'>
+    <principal id='F-CUSTOMER'>Auditor</principal>
+  </local_role_group_id>
+ </local_role_group_ids>
 </local_roles_item>
\ No newline at end of file

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

 <type_roles>
   <role id='Author; Auditor'>
    <property id='title'>Accountant</property>
+   <multi_property id='categories'>local_role_group/function</multi_property>
    <multi_property id='category'>function/accounting*</multi_property>
    <multi_property id='base_category'>function</multi_property>
   </role>
   <role id='Auditor'>
    <property id='title'>Member</property>
+   <multi_property id='categories'>local_role_group/function</multi_property>
    <multi_property id='category'>function/customer</multi_property>
    <multi_property id='base_category'>function</multi_property>
   </role>

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Allocation%20Supply%20Module.xml

 <type_roles>
   <role id='Auditor'>
    <property id='title'>Member</property>
+   <multi_property id='categories'>local_role_group/function</multi_property>
    <multi_property id='category'>function/customer</multi_property>
    <multi_property id='base_category'>function</multi_property>
   </role>

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Compute%20Node%20Module.xml

@@ -12,10 +12,11 @@
   </role>
   <role id='Auditor'>
    <property id='title'>Member</property>
+   <multi_property id='categories'>local_role_group/function</multi_property>
    <multi_property id='category'>function/customer</multi_property>
    <multi_property id='base_category'>function</multi_property>
   </role>
-  <role id='Auditor; Author'>
+  <role id='Auditor'>
    <property id='title'>Production</property>
    <multi_property id='category'>function/production*</multi_property>
    <multi_property id='base_category'>function</multi_property>

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

 <type_roles>
   <role id='Author'>
    <property id='title'>Compute Node reports consumption</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>

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

 <type_roles>
   <role id='Author; Auditor'>
    <property id='title'>Accountant</property>
+   <multi_property id='categories'>local_role_group/function</multi_property>
    <multi_property id='category'>function/accounting*</multi_property>
    <multi_property id='base_category'>function</multi_property>
   </role>
   <role id='Auditor'>
    <property id='title'>Member</property>
+   <multi_property id='categories'>local_role_group/function</multi_property>
    <multi_property id='category'>function/customer</multi_property>
    <multi_property id='base_category'>function</multi_property>
   </role>

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

 <type_roles>
   <role id='Auditor'>
    <property id='title'>Member</property>
+   <multi_property id='categories'>local_role_group/function</multi_property>
    <multi_property id='category'>function/customer</multi_property>
    <multi_property id='base_category'>function</multi_property>
   </role>

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

 <type_roles>
   <role id='Auditor'>
    <property id='title'>Compute Node</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>
@@ -14,8 +15,9 @@
    <multi_property id='category'>function/production*</multi_property>
    <multi_property id='base_category'>function</multi_property>
   </role>
-  <role id='Auditor; Author'>
+  <role id='Auditor'>
    <property id='title'>Project Customer</property>
+   <multi_property id='categories'>local_role_group/function</multi_property>
    <multi_property id='category'>function/customer</multi_property>
    <multi_property id='base_category'>function</multi_property>
   </role>

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

 <type_roles>
   <role id='Auditor'>
    <property id='title'>Compute Node</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>

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

 <type_roles>
   <role id='Auditor'>
    <property id='title'>Member</property>
+   <multi_property id='categories'>local_role_group/function</multi_property>
    <multi_property id='category'>function/customer</multi_property>
    <multi_property id='base_category'>function</multi_property>
   </role>

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

 <type_roles>
   <role id='Auditor'>
    <property id='title'>Compute Node</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>
@@ -11,6 +12,7 @@
   </role>
   <role id='Auditor'>
    <property id='title'>Member</property>
+   <multi_property id='categories'>local_role_group/function</multi_property>
    <multi_property id='category'>function/customer</multi_property>
    <multi_property id='base_category'>function</multi_property>
   </role>

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

@@ -6,6 +6,7 @@
   </role>
   <role id='Auditor'>
    <property id='title'>Project Customer</property>
+   <multi_property id='categories'>local_role_group/function</multi_property>
    <multi_property id='category'>function/customer</multi_property>
    <multi_property id='base_category'>function</multi_property>
   </role>

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

 <type_roles>
   <role id='Auditor'>
    <property id='title'>Member</property>
+   <multi_property id='categories'>local_role_group/function</multi_property>
    <multi_property id='category'>function/customer</multi_property>
    <multi_property id='base_category'>function</multi_property>
   </role>

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

@@ -8,6 +8,7 @@ add local roles group</property>
   </role>
   <role id='Auditor'>
    <property id='title'>Project Customer</property>
+   <multi_property id='categories'>local_role_group/function</multi_property>
    <multi_property id='category'>function/customer</multi_property>
    <multi_property id='base_category'>function</multi_property>
   </role>

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

@@ -7,6 +7,7 @@
   </role>
   <role id='Auditor'>
    <property id='title'>Member</property>
+   <multi_property id='categories'>local_role_group/function</multi_property>
    <multi_property id='category'>function/customer</multi_property>
    <multi_property id='base_category'>function</multi_property>
   </role>

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

 <type_roles>
   <role id='Auditor'>
    <property id='title'>Compute Node</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>
@@ -16,6 +17,7 @@
   </role>
   <role id='Auditor; Author'>
    <property id='title'>Project Customer</property>
+   <multi_property id='categories'>local_role_group/function</multi_property>
    <multi_property id='category'>function/customer</multi_property>
    <multi_property id='base_category'>function</multi_property>
   </role>

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

 <type_roles>
   <role id='Auditor'>
    <property id='title'>Member</property>
+   <multi_property id='categories'>local_role_group/function</multi_property>
    <multi_property id='category'>function/customer</multi_property>
    <multi_property id='base_category'>function</multi_property>
   </role>

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

@@ -6,6 +6,7 @@
   </role>
   <role id='Auditor; Author'>
    <property id='title'>Project Customer</property>
+   <multi_property id='categories'>local_role_group/function</multi_property>
    <multi_property id='category'>function/customer</multi_property>
    <multi_property id='base_category'>function</multi_property>
   </role>

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

@@ -6,6 +6,7 @@
   </role>
   <role id='Auditor'>
    <property id='title'>Project Customer</property>
+   <multi_property id='categories'>local_role_group/function</multi_property>
    <multi_property id='category'>function/customer</multi_property>
    <multi_property id='base_category'>function</multi_property>
   </role>