slapos_erp5:

* update currency role definition
* stop hardcoding default quantity unit

master/bt5/slapos_erp5/LocalRolesTemplateItem/currency_module.xml

 <local_roles_item>
  <local_roles>
-  <role id='G-COMPANY'>
+  <role id='F-CUSTOMER'>
    <item>Auditor</item>
-   <item>Author</item>
   </role>
-  <role id='R-MEMBER'>
+  <role id='F-PRODUCTION*'>
    <item>Auditor</item>
   </role>
   <role id='R-SHADOW-PERSON'>
@@ -12,15 +11,8 @@
   </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/CNY.xml

 <local_roles_item>
  <local_roles>
-  <role id='G-COMPANY'>
-   <item>Assignor</item>
+  <role id='F-CUSTOMER'>
+   <item>Auditor</item>
   </role>
-  <role id='R-MEMBER'>
+  <role id='F-PRODUCTION*'>
    <item>Auditor</item>
   </role>
   <role id='R-SHADOW-PERSON'>
@@ -11,14 +11,8 @@
   </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/currency_module/EUR.xml

 <local_roles_item>
  <local_roles>
-  <role id='G-COMPANY'>
-   <item>Assignor</item>
+  <role id='F-CUSTOMER'>
+   <item>Auditor</item>
   </role>
-  <role id='R-MEMBER'>
+  <role id='F-PRODUCTION*'>
    <item>Auditor</item>
   </role>
   <role id='R-SHADOW-PERSON'>
@@ -11,14 +11,8 @@
   </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/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>
+   <multi_property id='category'>function/customer</multi_property>
+   <multi_property id='base_category'>function</multi_property>
   </role>
   <role id='Auditor'>
    <property id='title'>Person Shadow</property>
@@ -17,4 +10,9 @@
    <multi_property id='category'>role/shadow/person</multi_property>
    <multi_property id='base_category'>role</multi_property>
   </role>
+  <role id='Auditor'>
+   <property id='title'>Production</property>
+   <multi_property id='category'>function/production*</multi_property>
+   <multi_property id='base_category'>function</multi_property>
+  </role>
 </type_roles>
\ No newline at end of file

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 id='Auditor'>
+   <property id='title'>Member</property>
+   <multi_property id='category'>function/customer</multi_property>
+   <multi_property id='base_category'>function</multi_property>
   </role>
   <role id='Auditor'>
    <property id='title'>Person Shadow</property>
@@ -11,4 +10,9 @@
    <multi_property id='category'>role/shadow/person</multi_property>
    <multi_property id='base_category'>role</multi_property>
   </role>
+  <role id='Auditor'>
+   <property id='title'>Production</property>
+   <multi_property id='category'>function/production*</multi_property>
+   <multi_property id='base_category'>function</multi_property>
+  </role>
 </type_roles>
\ No newline at end of file

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

@@ -46,7 +46,6 @@ class TestSlapOSVirtualMasterScenario(DefaultScenarioMixin):
       portal_type="Software Product",
       title=title,
       follow_up_value=project,
-      quantity_unit='time/month',
     )
     software_product.newContent(
       portal_type="Software Product Release Variation",
@@ -774,7 +773,6 @@ class TestSlapOSVirtualMasterScenario(DefaultScenarioMixin):
       portal_type="Software Product",
       title="foo software product",
       follow_up_value=project,
-      quantity_unit='time/month',
     )
     software_product.newContent(
       portal_type="Software Product Release Variation",