slapos_erp5:

* drop project creation/deletion pages
* configure Sale Supply like Sale Trade Condition
  Sale people manage Sale Supply
* drop support request template local roles
* getPreferredSupportRequestTemplate has been dropped
* sale agent will manage support request unrelated to any project
* customer is destination_decision on the Subscription Request
* source/destination project have been inverted
* customer will be Associate on Subscription Request
  In order to provid worklist for money deposit
* Accountant will be Assign** on Currency
* slapos_panel: allow to enter the API url on the web site panel
* test: remove deleted script from coverage
* xml update
* system preference can not be fixed by the upgrader
* drop Cloud Contract role definitions
* fixup rebase
* test: disable 2 tests
* test: update Currency check
* test: generate the compute node certificate
* Sale person can be Assign* on Event
* test: use source_project on the Sale Supply
* test: use the same Sale Supply for Computer and Software
* drop tests for dropped scripts
* test: sale agent/manager can access Events
* sale agt/manager can handle Regularisation/Support Request
* drop slapos_crm_regularisation_request_template
* drop regularisation request template
* test: dropped script
* drop testSlapOSERP5DefaultScenario
* give read access to sale packing list to accountant and sale people
* test: drop test_InternalPackingListLine*
* drop code related to unused Trade Condition
* test: noallocation compute node are still monitored
* test: dropped scripts
* drop slapos_crm_web_message_template local roles
* fixup rebase
* drop template_compute_node
* drop template_software_instance
* drop template_member
* fixup rebase
* drop ComputeNode_getSecurityCategoryFromValidationState
* test: Assignment local roles
* test Sale Supply local roles
* test project local roles
* nobody have to access Hosting Subscription for now
* test Sale Packing List local roles
* give read access to Open Order to sale/accountant people
* test Sale Trade Condition local roles
* update Subscription Request local roles
* test Organisation local roles
* drop Product local roles
  Unused for now
* drop Campaign local roles
  Unused
* fix Business Process local roles
  Accounting people can view the business process
* fixup Bank Account local roles
* test Instance/Remote Nodes local roles
* fixup Service local roles
* test Person local roles
* test Login local roles
* test PDF and Document Module local roles
* test Query local roles
* test Notification Message local roles
* drop Incident Response roles
  Will be done later, as not critical.
* test Credential Update Module local roles
* test Access Token local roles
* test Document Ingestion Module local roles
* test Cash Register local roles
* Contract Invitation Token does not seem to be used
* drop Invitation Token Module local roles
* drop User Consumption HTML File local roles
  Seems not used
* drop Computer Consumption TioXML File local roles
* only provide Author access to computer on Consumption Document Module
* test Integration Site/Tool local roles
* test: G-COMPAGNY group was dropped
* test: skip coding style for some scripts
* test: not existing script
* test: skip some coding style
* test: check that destroying a remote instance also destroy propagated instance
* fixup rebase

master/bt5/slapos_erp5/LocalRolesTemplateItem/business_process_module.xml

 <local_roles_item>
  <local_roles>
+  <role id='F-ACCOUNTING*'>
+   <item>Auditor</item>
+  </role>
   <role id='F-SALE*'>
    <item>Auditor</item>
   </role>
  </local_roles>
  <local_role_group_ids>
   <local_role_group_id id='function'>
+    <principal id='F-ACCOUNTING*'>Auditor</principal>
     <principal id='F-SALE*'>Auditor</principal>
   </local_role_group_id>
  </local_role_group_ids>

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

 <local_roles_item>
  <local_roles>
+  <role id='F-ACCOUNTING*'>
+   <item>Auditor</item>
+  </role>
   <role id='F-SALE*'>
    <item>Auditor</item>
   </role>
  </local_roles>
  <local_role_group_ids>
   <local_role_group_id id='function'>
+    <principal id='F-ACCOUNTING*'>Auditor</principal>
     <principal id='F-SALE*'>Auditor</principal>
   </local_role_group_id>
  </local_role_group_ids>

master/bt5/slapos_erp5/LocalRolesTemplateItem/campaign_module.xml

-<local_roles_item>
- <local_roles>
-  <role id='G-COMPANY'>
-   <item>Auditor</item>
-   <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

 <local_roles_item>
  <local_roles>
-  <role id='G-COMPANY'>
-   <item>Auditor</item>
-   <item>Author</item>
-  </role>
-  <role id='R-MEMBER'>
-   <item>Auditor</item>
-  </role>
-  <role id='R-SHADOW-PERSON'>
-   <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/consumption_document_module.xml

 <local_roles_item>
  <local_roles>
-  <role id='G-COMPANY'>
-   <item>Auditor</item>
-   <item>Author</item>
-  </role>
   <role id='R-COMPUTER'>
    <item>Author</item>
   </role>
-  <role id='R-MEMBER'>
-   <item>Auditor</item>
-   <item>Author</item>
-  </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>
-  </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

 <local_roles_item>
  <local_roles>
-  <role id='G-COMPANY'>
+  <role id='F-ACCOUNTING*'>
    <item>Auditor</item>
    <item>Author</item>
   </role>
-  <role id='R-MEMBER'>
+  <role id='F-CUSTOMER'>
+   <item>Auditor</item>
+   <item>Author</item>
+  </role>
+  <role id='F-PRODUCTION*'>
+   <item>Auditor</item>
+   <item>Author</item>
+  </role>
+  <role id='F-SALE*'>
    <item>Auditor</item>
    <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 id='function'>
+    <principal id='F-ACCOUNTING*'>Auditor</principal>
+    <principal id='F-ACCOUNTING*'>Author</principal>
+    <principal id='F-CUSTOMER'>Auditor</principal>
+    <principal id='F-CUSTOMER'>Author</principal>
+    <principal id='F-SALE*'>Auditor</principal>
+    <principal id='F-SALE*'>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/CNY.xml

 <local_roles_item>
  <local_roles>
-  <role id='F-ACCOUNTING*'>
-   <item>Auditor</item>
-   <item>Author</item>
+  <role id='F-ACCAGT'>
+   <item>Assignee</item>
+  </role>
+  <role id='F-ACCMAN'>
+   <item>Assignor</item>
   </role>
   <role id='F-CUSTOMER'>
    <item>Auditor</item>
@@ -18,6 +20,10 @@
   </role>
  </local_roles>
  <local_role_group_ids>
+  <local_role_group_id id='function'>
+    <principal id='F-ACCAGT'>Assignee</principal>
+    <principal id='F-ACCMAN'>Assignor</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/currency_module/EUR.xml

 <local_roles_item>
  <local_roles>
-  <role id='F-ACCOUNTING*'>
-   <item>Auditor</item>
-   <item>Author</item>
+  <role id='F-ACCAGT'>
+   <item>Assignee</item>
+  </role>
+  <role id='F-ACCMAN'>
+   <item>Assignor</item>
   </role>
   <role id='F-CUSTOMER'>
    <item>Auditor</item>
@@ -18,6 +20,10 @@
   </role>
  </local_roles>
  <local_role_group_ids>
+  <local_role_group_id id='function'>
+    <principal id='F-ACCAGT'>Assignee</principal>
+    <principal id='F-ACCMAN'>Assignor</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/document_ingestion_module.xml

 <local_roles_item>
  <local_roles>
-  <role id='G-COMPANY'>
+  <role id='F-ACCOUNTING*'>
    <item>Auditor</item>
    <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 id='function'>
+    <principal id='F-ACCOUNTING*'>Auditor</principal>
+    <principal id='F-ACCOUNTING*'>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

 <local_roles_item>
  <local_roles>
+  <role id='F-ACCOUNTING*'>
+   <item>Auditor</item>
+   <item>Author</item>
+  </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>
+  </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

-<local_roles_item>
- <local_roles>
-  <role id='G-COMPANY'>
-   <item>Assignor</item>
-  </role>
-  <role id='R-MEMBER'>
-   <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

 <local_roles_item>
  <local_roles>
-  <role id='F-CUSTOMER'>
-   <item>Auditor</item>
-  </role>
-  <role id='F-PRODUCTION*'>
-   <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/incident_response_module.xml

 <local_roles_item>
  <local_roles>
-  <role id='G-COMPANY'>
-   <item>Auditor</item>
-   <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/invitation_token_module.xml

 <local_roles_item>
  <local_roles>
-  <role id='G-COMPANY'>
-   <item>Auditor</item>
-   <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

 <local_roles_item>
  <local_roles>
-  <role id='G-COMPANY'>
+  <role id='F-SALE*'>
    <item>Auditor</item>
    <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 id='function'>
+    <principal id='F-SALE*'>Auditor</principal>
+    <principal id='F-SALE*'>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

 <local_roles_item>
  <local_roles>
-  <role id='G-COMPANY'>
+  <role id='F-ACCOUNTING*'>
+   <item>Auditor</item>
+  </role>
+  <role id='F-SALE*'>
    <item>Auditor</item>
-   <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 id='function'>
+    <principal id='F-ACCOUNTING*'>Auditor</principal>
+    <principal id='F-SALE*'>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.xml

 <local_roles_item>
  <local_roles>
-  <role id='G-COMPANY'>
-   <item>Auditor</item>
-   <item>Author</item>
-  </role>
   <role id='R-SHADOW-PERSON'>
    <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>

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

 <local_roles_item>
  <local_roles>
-  <role id='G-COMPANY'>
-   <item>Assignor</item>
-  </role>
   <role id='R-SHADOW-PERSON'>
    <item>Auditor</item>
    <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>

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

 <local_roles_item>
  <local_roles>
-  <role id='G-COMPANY'>
-   <item>Assignor</item>
-  </role>
   <role id='R-SHADOW-PERSON'>
    <item>Auditor</item>
    <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>

master/bt5/slapos_erp5/LocalRolesTemplateItem/product_module.xml

-<local_roles_item>
- <local_roles>
-  <role id='G-COMPANY'>
-   <item>Auditor</item>
-   <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/slapos_crm_regularisation_request_template.xml

-<local_roles_item>
- <local_roles>
-  <role id='R-MEMBER'>
-   <item>Auditor</item>
-  </role>
- </local_roles>
- <local_role_group_ids>
-  <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_packing_list_module.xml

 <local_roles_item>
  <local_roles>
-  <role id='G-COMPANY'>
+  <role id='F-ACCOUNTING*'>
    <item>Auditor</item>
-   <item>Author</item>
   </role>
-  <role id='R-MEMBER'>
+  <role id='F-SALE*'>
    <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 id='function'>
+    <principal id='F-ACCOUNTING*'>Auditor</principal>
+    <principal id='F-SALE*'>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

@@ -3,9 +3,6 @@
   <role id='F-CUSTOMER'>
    <item>Auditor</item>
   </role>
-  <role id='F-PRODUCTION*'>
-   <item>Auditor</item>
-  </role>
   <role id='F-SALE*'>
    <item>Auditor</item>
    <item>Author</item>
@@ -14,6 +11,8 @@
  <local_role_group_ids>
   <local_role_group_id id='function'>
     <principal id='F-CUSTOMER'>Auditor</principal>
+    <principal id='F-SALE*'>Auditor</principal>
+    <principal id='F-SALE*'>Author</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

 <local_roles_item>
  <local_roles>
+  <role id='F-ACCOUNTING*'>
+   <item>Auditor</item>
+  </role>
   <role id='F-CUSTOMER'>
    <item>Auditor</item>
   </role>

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

 <local_roles_item>
  <local_roles>
+  <role id='F-ACCOUNTING*'>
+   <item>Auditor</item>
+  </role>
   <role id='F-CUSTOMER'>
    <item>Auditor</item>
   </role>

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

 <local_roles_item>
  <local_roles>
+  <role id='F-ACCOUNTING*'>
+   <item>Auditor</item>
+  </role>
   <role id='F-CUSTOMER'>
    <item>Auditor</item>
   </role>

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

 <local_roles_item>
  <local_roles>
+  <role id='F-ACCOUNTING*'>
+   <item>Auditor</item>
+  </role>
   <role id='F-CUSTOMER'>
    <item>Auditor</item>
   </role>

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

 <local_roles_item>
  <local_roles>
+  <role id='F-ACCOUNTING*'>
+   <item>Auditor</item>
+  </role>
   <role id='F-CUSTOMER'>
    <item>Auditor</item>
   </role>

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

 <local_roles_item>
  <local_roles>
+  <role id='F-ACCOUNTING*'>
+   <item>Auditor</item>
+  </role>
   <role id='F-CUSTOMER'>
    <item>Auditor</item>
   </role>

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

 <local_roles_item>
  <local_roles>
+  <role id='F-ACCOUNTING*'>
+   <item>Auditor</item>
+  </role>
   <role id='F-CUSTOMER'>
    <item>Auditor</item>
   </role>

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

 <local_roles_item>
  <local_roles>
+  <role id='F-ACCOUNTING*'>
+   <item>Auditor</item>
+  </role>
   <role id='F-CUSTOMER'>
    <item>Auditor</item>
   </role>

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

 <local_roles_item>
  <local_roles>
+  <role id='F-ACCOUNTING*'>
+   <item>Auditor</item>
+  </role>
   <role id='F-CUSTOMER'>
    <item>Auditor</item>
   </role>

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

 <local_roles_item>
  <local_roles>
+  <role id='F-ACCOUNTING*'>
+   <item>Auditor</item>
+  </role>
   <role id='F-CUSTOMER'>
    <item>Auditor</item>
   </role>

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

 <local_roles_item>
  <local_roles>
+  <role id='F-ACCOUNTING*'>
+   <item>Auditor</item>
+  </role>
   <role id='F-CUSTOMER'>
    <item>Auditor</item>
   </role>

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

 <local_roles_item>
  <local_roles>
+  <role id='F-ACCOUNTING*'>
+   <item>Auditor</item>
+  </role>
   <role id='F-CUSTOMER'>
    <item>Auditor</item>
   </role>

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

 <local_roles_item>
  <local_roles>
+  <role id='F-ACCOUNTING*'>
+   <item>Auditor</item>
+  </role>
   <role id='F-CUSTOMER'>
    <item>Auditor</item>
   </role>

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

 <local_roles_item>
  <local_roles>
+  <role id='F-ACCOUNTING*'>
+   <item>Auditor</item>
+  </role>
   <role id='F-CUSTOMER'>
    <item>Auditor</item>
   </role>

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

 <local_roles_item>
  <local_roles>
+  <role id='F-ACCOUNTING*'>
+   <item>Auditor</item>
+  </role>
   <role id='F-CUSTOMER'>
    <item>Auditor</item>
   </role>

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

 <local_roles_item>
  <local_roles>
+  <role id='F-ACCOUNTING*'>
+   <item>Auditor</item>
+  </role>
   <role id='F-CUSTOMER'>
    <item>Auditor</item>
   </role>

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

 <local_roles_item>
  <local_roles>
+  <role id='F-ACCOUNTING*'>
+   <item>Auditor</item>
+  </role>
   <role id='F-CUSTOMER'>
    <item>Auditor</item>
   </role>

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

 <local_roles_item>
  <local_roles>
+  <role id='F-ACCOUNTING*'>
+   <item>Auditor</item>
+  </role>
   <role id='F-CUSTOMER'>
    <item>Auditor</item>
   </role>

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

 <local_roles_item>
  <local_roles>
+  <role id='F-ACCOUNTING*'>
+   <item>Auditor</item>
+  </role>
   <role id='F-CUSTOMER'>
    <item>Auditor</item>
   </role>

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

 <local_roles_item>
  <local_roles>
+  <role id='F-ACCOUNTING*'>
+   <item>Auditor</item>
+  </role>
   <role id='F-CUSTOMER'>
    <item>Auditor</item>
   </role>

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

 <local_roles_item>
  <local_roles>
+  <role id='F-ACCOUNTING*'>
+   <item>Auditor</item>
+  </role>
   <role id='F-CUSTOMER'>
    <item>Auditor</item>
   </role>

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

 <local_roles_item>
  <local_roles>
+  <role id='F-ACCOUNTING*'>
+   <item>Auditor</item>
+  </role>
   <role id='F-CUSTOMER'>
    <item>Auditor</item>
   </role>

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

 <local_roles_item>
  <local_roles>
+  <role id='F-ACCOUNTING*'>
+   <item>Auditor</item>
+  </role>
   <role id='F-CUSTOMER'>
    <item>Auditor</item>
   </role>

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

 <local_roles_item>
  <local_roles>
+  <role id='F-ACCOUNTING*'>
+   <item>Auditor</item>
+  </role>
   <role id='F-CUSTOMER'>
    <item>Auditor</item>
   </role>

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

 <local_roles_item>
  <local_roles>
+  <role id='F-ACCOUNTING*'>
+   <item>Auditor</item>
+  </role>
   <role id='F-CUSTOMER'>
    <item>Auditor</item>
   </role>

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

 <local_roles_item>
  <local_roles>
+  <role id='F-ACCOUNTING*'>
+   <item>Auditor</item>
+  </role>
   <role id='F-CUSTOMER'>
    <item>Auditor</item>
   </role>

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

 <local_roles_item>
  <local_roles>
+  <role id='F-ACCOUNTING*'>
+   <item>Auditor</item>
+  </role>
   <role id='F-CUSTOMER'>
    <item>Auditor</item>
   </role>

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

 <local_roles_item>
  <local_roles>
+  <role id='F-ACCOUNTING*'>
+   <item>Auditor</item>
+  </role>
   <role id='F-CUSTOMER'>
    <item>Auditor</item>
   </role>

master/bt5/slapos_erp5/LocalRolesTemplateItem/subscription_request_module.xml

@@ -2,10 +2,6 @@
  <local_roles>
   <role id='F-CUSTOMER'>
    <item>Auditor</item>
-   <item>Author</item>
-  </role>
-  <role id='F-PRODUCTION*'>
-   <item>Auditor</item>
   </role>
   <role id='F-SALE*'>
    <item>Auditor</item>
@@ -15,8 +11,6 @@
  <local_role_group_ids>
   <local_role_group_id id='function'>
     <principal id='F-CUSTOMER'>Auditor</principal>
-    <principal id='F-CUSTOMER'>Author</principal>
-    <principal id='F-PRODUCTION*'>Auditor</principal>
     <principal id='F-SALE*'>Auditor</principal>
     <principal id='F-SALE*'>Author</principal>
   </local_role_group_id>

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

-<local_roles_item>
- <local_roles>
-  <role id='R-MEMBER'>
-   <item>Auditor</item>
-  </role>
- </local_roles>
- <local_role_group_ids>
-  <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/ModuleTemplateItem/invitation_token_module.xml

 <module>
  <category_list>
-  <category>business_application/base</category>
+  <category>business_application/slapos</category>
  </category_list>
  <id>invitation_token_module</id>
  <permission_list>

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Acknowledgement.xml

@@ -31,6 +31,20 @@
    <multi_property id='category'>function/production/manager</multi_property>
    <multi_property id='base_category'>destination_project</multi_property>
   </role>
+  <role id='Assignee'>
+   <property id='title'>Sale Agent</property>
+   <property id='condition'>python: (context.getDestinationProject('', portal_type='Project') == "") and (context.getSourceProject('', portal_type='Project') == "")</property>
+   <multi_property id='categories'>local_role_group/function</multi_property>
+   <multi_property id='category'>function/sale/agent</multi_property>
+   <multi_property id='base_category'>function</multi_property>
+  </role>
+  <role id='Assignor'>
+   <property id='title'>Sale Manager</property>
+   <property id='condition'>python: (context.getDestinationProject('', portal_type='Project') == "") and (context.getSourceProject('', portal_type='Project') == "")</property>
+   <multi_property id='categories'>local_role_group/function</multi_property>
+   <multi_property id='category'>function/sale/manager</multi_property>
+   <multi_property id='base_category'>function</multi_property>
+  </role>
   <role id='Assignee'>
    <property id='title'>Source Project Production Agent</property>
    <property id='description'>XXX add local role group</property>

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

 <type_roles>
+  <role id='Assignee'>
+   <property id='title'>Accountant Agent</property>
+   <multi_property id='categories'>local_role_group/function</multi_property>
+   <multi_property id='category'>function/accounting/agent</multi_property>
+   <multi_property id='base_category'>function</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>
+   <property id='title'>Accountant Manager</property>
+   <multi_property id='categories'>local_role_group/function</multi_property>
+   <multi_property id='category'>function/accounting/manager</multi_property>
+   <multi_property id='base_category'>function</multi_property>
   </role>
 </type_roles>
\ No newline at end of file

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

 <type_roles>
+  <role id='Auditor'>
+   <property id='title'>Accounting</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'>Sale</property>
    <multi_property id='categories'>local_role_group/function</multi_property>

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

 <type_roles>
+  <role id='Auditor'>
+   <property id='title'>Accounting</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'>Sale</property>
    <multi_property id='categories'>local_role_group/function</multi_property>

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>
-</type_roles>
\ No newline at end of file

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>
-</type_roles>
\ No newline at end of file

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

 <type_roles>
+  <role id='Assignee'>
+   <property id='title'>Accountant Agent</property>
+   <multi_property id='categories'>local_role_group/function</multi_property>
+   <multi_property id='category'>function/accounting/agent</multi_property>
+   <multi_property id='base_category'>function</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>
+   <property id='title'>Accountant Manager</property>
+   <multi_property id='categories'>local_role_group/function</multi_property>
+   <multi_property id='category'>function/accounting/manager</multi_property>
+   <multi_property id='base_category'>function</multi_property>
   </role>
 </type_roles>
\ No newline at end of file

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Certificate%20Login.xml

@@ -7,10 +7,18 @@
    <multi_property id='base_category'>aggregate</multi_property>
   </role>
   <role id='Assignee'>
-   <property id='title'>Compute Node Agent</property>
+   <property id='title'>Project Production Agent</property>
+   <property id='condition'>python: (here.getParentValue().getPortalType() == 'Compute Node') and (here.getParentValue().getFollowUp(None) is not None)</property>
    <property id='base_category_script'>ERP5Type_getSecurityCategoryFromParentContent</property>
-   <multi_property id='categories'>local_role_group/user</multi_property>
-   <multi_property id='base_category'>source_administration</multi_property>
+   <multi_property id='category'>function/production/agent</multi_property>
+   <multi_property id='base_category'>follow_up</multi_property>
+  </role>
+  <role id='Assignor'>
+   <property id='title'>Project Production Manager</property>
+   <property id='condition'>python: (here.getParentValue().getPortalType() == 'Compute Node') and (here.getParentValue().getFollowUp(None) is not None)</property>
+   <property id='base_category_script'>ERP5Type_getSecurityCategoryFromParentContent</property>
+   <multi_property id='category'>function/production/manager</multi_property>
+   <multi_property id='base_category'>follow_up</multi_property>
   </role>
   <role id='Assignee'>
    <property id='title'>The User Himself (Compute Node)</property>

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>
-  <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>
 </type_roles>
\ No newline at end of file

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

 <type_roles>
-  <role id='Auditor'>
-   <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_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='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>
 </type_roles>
\ No newline at end of file

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>
 </type_roles>
\ No newline at end of file

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

@@ -5,16 +5,4 @@
    <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>
 </type_roles>
\ No newline at end of file

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Contract%20Invitation%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>
 </type_roles>
\ No newline at end of file

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 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; Author'>
+  <role id='Author; 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='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='Author; Auditor'>
+   <property id='title'>Production</property>
+   <multi_property id='category'>function/production*</multi_property>
+   <multi_property id='base_category'>function</multi_property>
+  </role>
+  <role id='Author; Auditor'>
+   <property id='title'>Sale</property>
+   <multi_property id='categories'>local_role_group/function</multi_property>
+   <multi_property id='category'>function/sale*</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='Author; Auditor'>
-   <property id='title'>Accountant</property>
-   <multi_property id='category'>function/accounting*</multi_property>
+  <role id='Assignee'>
+   <property id='title'>Accountant Agent</property>
+   <multi_property id='categories'>local_role_group/function</multi_property>
+   <multi_property id='category'>function/accounting/agent</multi_property>
+   <multi_property id='base_category'>function</multi_property>
+  </role>
+  <role id='Assignor'>
+   <property id='title'>Accountant Manager</property>
+   <property id='description'>Only the accountant can validate new accounts.</property>
+   <multi_property id='categories'>local_role_group/function</multi_property>
+   <multi_property id='category'>function/accounting/manager</multi_property>
    <multi_property id='base_category'>function</multi_property>
   </role>
   <role id='Auditor'>

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>
+   <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>
 </type_roles>
\ No newline at end of file

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>
+   <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>
 </type_roles>
\ No newline at end of file

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

@@ -31,6 +31,20 @@
    <multi_property id='category'>function/production/manager</multi_property>
    <multi_property id='base_category'>destination_project</multi_property>
   </role>
+  <role id='Assignee'>
+   <property id='title'>Sale Agent</property>
+   <property id='condition'>python: (context.getDestinationProject('', portal_type='Project') == "") and (context.getSourceProject('', portal_type='Project') == "")</property>
+   <multi_property id='categories'>local_role_group/function</multi_property>
+   <multi_property id='category'>function/sale/agent</multi_property>
+   <multi_property id='base_category'>function</multi_property>
+  </role>
+  <role id='Assignor'>
+   <property id='title'>Sale Manager</property>
+   <property id='condition'>python: (context.getDestinationProject('', portal_type='Project') == "") and (context.getSourceProject('', portal_type='Project') == "")</property>
+   <multi_property id='categories'>local_role_group/function</multi_property>
+   <multi_property id='category'>function/sale/manager</multi_property>
+   <multi_property id='base_category'>function</multi_property>
+  </role>
   <role id='Assignee'>
    <property id='title'>Source Project Production Agent</property>
    <property id='description'>XXX add local role group</property>

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>
-  <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/Hosting%20Subscription.xml

 <type_roles>
-  <role id='Auditor'>
-   <property id='title'>Project Production Agent</property>
-   <property id='description'>XXX add local role group</property>
-   <property id='condition'>python: context.getFollowUp("") != ""</property>
-   <property id='base_category_script'>ERP5Type_getSecurityCategoryFromContent</property>
-   <multi_property id='category'>function/production/agent</multi_property>
-   <multi_property id='base_category'>follow_up</multi_property>
-  </role>
-  <role id='Auditor'>
-   <property id='title'>Project Production Manager</property>
-   <property id='description'>XXX add local role group</property>
-   <property id='condition'>python: context.getFollowUp("") != ""</property>
-   <property id='base_category_script'>ERP5Type_getSecurityCategoryFromContent</property>
-   <multi_property id='category'>function/production/manager</multi_property>
-   <multi_property id='base_category'>follow_up</multi_property>
-  </role>
 </type_roles>
\ No newline at end of file

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Incident%20Response%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>
 </type_roles>
\ No newline at end of file

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Incident%20Response.xml

 <type_roles>
-  <role id='Assignor'>
-   <property id='title'>Project Compute Node Manager</property>
-   <property id='description'>XXX project local role group</property>
-   <property id='condition'>python: context.getSourceProject("", portal_type='Project') != ""</property>
-   <property id='base_category_script'>ERP5Type_getSecurityCategoryFromContent</property>
-   <multi_property id='category'>function/computer/manager</multi_property>
-   <multi_property id='base_category'>source_project</multi_property>
-  </role>
 </type_roles>
\ No newline at end of file

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>

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>

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Invitation%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>
 </type_roles>
\ No newline at end of file

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Letter.xml

@@ -31,6 +31,20 @@
    <multi_property id='category'>function/production/manager</multi_property>
    <multi_property id='base_category'>destination_project</multi_property>
   </role>
+  <role id='Assignee'>
+   <property id='title'>Sale Agent</property>
+   <property id='condition'>python: (context.getDestinationProject('', portal_type='Project') == "") and (context.getSourceProject('', portal_type='Project') == "")</property>
+   <multi_property id='categories'>local_role_group/function</multi_property>
+   <multi_property id='category'>function/sale/agent</multi_property>
+   <multi_property id='base_category'>function</multi_property>
+  </role>
+  <role id='Assignor'>
+   <property id='title'>Sale Manager</property>
+   <property id='condition'>python: (context.getDestinationProject('', portal_type='Project') == "") and (context.getSourceProject('', portal_type='Project') == "")</property>
+   <multi_property id='categories'>local_role_group/function</multi_property>
+   <multi_property id='category'>function/sale/manager</multi_property>
+   <multi_property id='base_category'>function</multi_property>
+  </role>
   <role id='Assignee'>
    <property id='title'>Source Project Production Agent</property>
    <property id='description'>XXX add local role group</property>

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

@@ -31,6 +31,20 @@
    <multi_property id='category'>function/production/manager</multi_property>
    <multi_property id='base_category'>destination_project</multi_property>
   </role>
+  <role id='Assignee'>
+   <property id='title'>Sale Agent</property>
+   <property id='condition'>python: (context.getDestinationProject('', portal_type='Project') == "") and (context.getSourceProject('', portal_type='Project') == "")</property>
+   <multi_property id='categories'>local_role_group/function</multi_property>
+   <multi_property id='category'>function/sale/agent</multi_property>
+   <multi_property id='base_category'>function</multi_property>
+  </role>
+  <role id='Assignor'>
+   <property id='title'>Sale Manager</property>
+   <property id='condition'>python: (context.getDestinationProject('', portal_type='Project') == "") and (context.getSourceProject('', portal_type='Project') == "")</property>
+   <multi_property id='categories'>local_role_group/function</multi_property>
+   <multi_property id='category'>function/sale/manager</multi_property>
+   <multi_property id='base_category'>function</multi_property>
+  </role>
   <role id='Assignee'>
    <property id='title'>Source Project Production Agent</property>
    <property id='description'>XXX add local role group</property>

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Note.xml

@@ -31,6 +31,20 @@
    <multi_property id='category'>function/production/manager</multi_property>
    <multi_property id='base_category'>destination_project</multi_property>
   </role>
+  <role id='Assignee'>
+   <property id='title'>Sale Agent</property>
+   <property id='condition'>python: (context.getDestinationProject('', portal_type='Project') == "") and (context.getSourceProject('', portal_type='Project') == "")</property>
+   <multi_property id='categories'>local_role_group/function</multi_property>
+   <multi_property id='category'>function/sale/agent</multi_property>
+   <multi_property id='base_category'>function</multi_property>
+  </role>
+  <role id='Assignor'>
+   <property id='title'>Sale Manager</property>
+   <property id='condition'>python: (context.getDestinationProject('', portal_type='Project') == "") and (context.getSourceProject('', portal_type='Project') == "")</property>
+   <multi_property id='categories'>local_role_group/function</multi_property>
+   <multi_property id='category'>function/sale/manager</multi_property>
+   <multi_property id='base_category'>function</multi_property>
+  </role>
   <role id='Assignee'>
    <property id='title'>Source Project Production Agent</property>
    <property id='description'>XXX add local role group</property>

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>
+   <property id='title'>Sale</property>
+   <multi_property id='categories'>local_role_group/function</multi_property>
+   <multi_property id='category'>function/sale*</multi_property>
+   <multi_property id='base_category'>function</multi_property>
   </role>
 </type_roles>
\ No newline at end of file

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

 <type_roles>
+  <role id='Assignee'>
+   <property id='title'>Sale Agent</property>
+   <multi_property id='categories'>local_role_group/function</multi_property>
+   <multi_property id='category'>function/sale/agent</multi_property>
+   <multi_property id='base_category'>function</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>
+   <property id='title'>Sale Manager</property>
+   <multi_property id='categories'>local_role_group/function</multi_property>
+   <multi_property id='category'>function/sale/manager</multi_property>
+   <multi_property id='base_category'>function</multi_property>
   </role>
 </type_roles>
\ No newline at end of file

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 id='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'>Sale</property>
+   <multi_property id='categories'>local_role_group/function</multi_property>
+   <multi_property id='category'>function/sale*</multi_property>
+   <multi_property id='base_category'>function</multi_property>
   </role>
 </type_roles>
\ No newline at end of file

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

 <type_roles>
+  <role id='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'>Sale</property>
+   <multi_property id='categories'>local_role_group/function</multi_property>
+   <multi_property id='category'>function/sale*</multi_property>
+   <multi_property id='base_category'>function</multi_property>
+  </role>
   <role id='Auditor'>
    <property id='title'>User</property>
    <property id='condition'>python: (here.getDestinationSection('', portal_type='Person') != '') and (context.getLedger("") == "automated")</property>

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/PDF.xml

 <type_roles>
+  <role id='Assignee'>
+   <property id='title'>Accountant Agent</property>
+   <multi_property id='categories'>local_role_group/function</multi_property>
+   <multi_property id='category'>function/accounting/agent</multi_property>
+   <multi_property id='base_category'>function</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>
+   <property id='title'>Accountant Manager</property>
+   <multi_property id='categories'>local_role_group/function</multi_property>
+   <multi_property id='category'>function/accounting/manager</multi_property>
+   <multi_property id='base_category'>function</multi_property>
   </role>
 </type_roles>
\ No newline at end of file

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

@@ -31,6 +31,20 @@
    <multi_property id='category'>function/production/manager</multi_property>
    <multi_property id='base_category'>destination_project</multi_property>
   </role>
+  <role id='Assignee'>
+   <property id='title'>Sale Agent</property>
+   <property id='condition'>python: (context.getDestinationProject('', portal_type='Project') == "") and (context.getSourceProject('', portal_type='Project') == "")</property>
+   <multi_property id='categories'>local_role_group/function</multi_property>
+   <multi_property id='category'>function/sale/agent</multi_property>
+   <multi_property id='base_category'>function</multi_property>
+  </role>
+  <role id='Assignor'>
+   <property id='title'>Sale Manager</property>
+   <property id='condition'>python: (context.getDestinationProject('', portal_type='Project') == "") and (context.getSourceProject('', portal_type='Project') == "")</property>
+   <multi_property id='categories'>local_role_group/function</multi_property>
+   <multi_property id='category'>function/sale/manager</multi_property>
+   <multi_property id='base_category'>function</multi_property>
+  </role>
   <role id='Assignee'>
    <property id='title'>Source Project Production Agent</property>
    <property id='description'>XXX add local role group</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>
-</type_roles>
\ No newline at end of file

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>
-</type_roles>
\ No newline at end of file

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

@@ -22,12 +22,17 @@
    <multi_property id='category'>function/production/manager</multi_property>
    <multi_property id='base_category'>destination_project</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 id='Assignee'>
+   <property id='title'>Sale Agent</property>
+   <multi_property id='categories'>local_role_group/function</multi_property>
+   <multi_property id='category'>function/sale/agent</multi_property>
+   <multi_property id='base_category'>function</multi_property>
+  </role>
+  <role id='Assignor'>
+   <property id='title'>Sale Manager</property>
+   <multi_property id='categories'>local_role_group/function</multi_property>
+   <multi_property id='category'>function/sale/manager</multi_property>
+   <multi_property id='base_category'>function</multi_property>
   </role>
   <role id='Assignee'>
    <property id='title'>Source Project Production Agent</property>

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

@@ -5,10 +5,4 @@
    <multi_property id='categories'>local_role_group/user</multi_property>
    <multi_property id='base_category'>agent</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>
 </type_roles>
\ No newline at end of file

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 id='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/user</multi_property>
-   <multi_property id='category'>role/member</multi_property>
-   <multi_property id='base_category'>role</multi_property>
+   <property id='title'>Sale</property>
+   <multi_property id='categories'>local_role_group/function</multi_property>
+   <multi_property id='category'>function/sale*</multi_property>
+   <multi_property id='base_category'>function</multi_property>
   </role>
 </type_roles>
\ No newline at end of file

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Sale%20Packing%20List.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>
+   <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'>Subscription Customer</property>
-   <property id='description'>python: here.Base_useSaleTradeConditionReference(('slapos_subscription_trade_condition', 'slapos_aggregated_trade_condition', 'slapos_aggregated_subscription_trade_condition'))</property>
-   <property id='condition'>python: False</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>
+   <property id='title'>Sale</property>
+   <multi_property id='categories'>local_role_group/function</multi_property>
+   <multi_property id='category'>function/sale*</multi_property>
+   <multi_property id='base_category'>function</multi_property>
   </role>
 </type_roles>
\ No newline at end of file

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

 <type_roles>
   <role id='Auditor'>
-   <property id='title'>Member</property>
+   <property id='title'>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>
-  <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>
-  <role id='Auditor; Author'>
+  <role id='Author; Auditor'>
    <property id='title'>Sale</property>
+   <multi_property id='categories'>local_role_group/function</multi_property>
    <multi_property id='category'>function/sale*</multi_property>
    <multi_property id='base_category'>function</multi_property>
   </role>

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

 <type_roles>
   <role id='Auditor'>
-   <property id='title'>Customer</property>
-   <property id='description'>Monovalued role</property>
-   <property id='condition'>python: (here.getDestinationValue(portal_type='Person') is not None) and (here.getValidationState() == 'validated')</property>
+   <property id='title'>Destination Member</property>
+   <property id='condition'>python: (context.getValidationState() == 'validated') and (context.getDestination('', 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</multi_property>
   </role>
   <role id='Auditor'>
-   <property id='title'>Destination Project Customer</property>
-   <property id='description'>XXX add local role group
-
-Only show to all project customer if it is not specific to a dedicated user</property>
-   <property id='condition'>python: (context.getDestinationProject("") != "") and (context.getDestination(None) is None) and (context.getValidationState() == 'validated')</property>
+   <property id='title'>Destination Project Member</property>
+   <property id='condition'>python: (context.getValidationState() == 'validated') and (context.getDestination('') == "") and (context.getDestinationProject('') != "")
+</property>
    <property id='base_category_script'>ERP5Type_getSecurityCategoryFromContent</property>
-   <multi_property id='category'>function/customer</multi_property>
+   <multi_property id='categories'>local_role_group/project</multi_property>
    <multi_property id='base_category'>destination_project</multi_property>
   </role>
   <role id='Assignee'>
-   <property id='title'>Destination Project Production Agent</property>
-   <property id='description'>XXX add local role group</property>
-   <property id='condition'>python: context.getDestinationProject("") != ""</property>
-   <property id='base_category_script'>ERP5Type_getSecurityCategoryFromContent</property>
-   <multi_property id='category'>function/production/agent</multi_property>
-   <multi_property id='base_category'>destination_project</multi_property>
+   <property id='title'>Sale Agent</property>
+   <multi_property id='categories'>local_role_group/function</multi_property>
+   <multi_property id='category'>function/sale/agent</multi_property>
+   <multi_property id='base_category'>function</multi_property>
   </role>
   <role id='Assignor'>
-   <property id='title'>Destination Project Production Manager</property>
-   <property id='description'>XXX add local role group</property>
-   <property id='condition'>python: context.getDestinationProject("") != ""</property>
-   <property id='base_category_script'>ERP5Type_getSecurityCategoryFromContent</property>
-   <multi_property id='category'>function/production/manager</multi_property>
-   <multi_property id='base_category'>destination_project</multi_property>
-  </role>
-  <role id='Auditor'>
-   <property id='title'>Source Project Customer</property>
-   <property id='description'>XXX add local role group
-
-Only show to all project customer if it is not specific to a dedicated user</property>
-   <property id='condition'>python: (context.getSourceProject("") != "") and (context.getSource(None) is None) and (context.getValidationState() == 'validated')</property>
-   <property id='base_category_script'>ERP5Type_getSecurityCategoryFromContent</property>
-   <multi_property id='category'>function/customer</multi_property>
-   <multi_property id='base_category'>source_project</multi_property>
-  </role>
-  <role id='Assignee'>
-   <property id='title'>Source Project Production Agent</property>
-   <property id='description'>XXX add local role group</property>
-   <property id='condition'>python: context.getSourceProject("") != ""</property>
-   <property id='base_category_script'>ERP5Type_getSecurityCategoryFromContent</property>
-   <multi_property id='category'>function/production/agent</multi_property>
-   <multi_property id='base_category'>source_project</multi_property>
-  </role>
-  <role id='Assignor'>
-   <property id='title'>Source Project Production Manager</property>
-   <property id='description'>XXX add local role group</property>
-   <property id='condition'>python: context.getSourceProject("") != ""</property>
-   <property id='base_category_script'>ERP5Type_getSecurityCategoryFromContent</property>
-   <multi_property id='category'>function/production/manager</multi_property>
-   <multi_property id='base_category'>source_project</multi_property>
+   <property id='title'>Sale Manager</property>
+   <multi_property id='categories'>local_role_group/function</multi_property>
+   <multi_property id='category'>function/sale/manager</multi_property>
+   <multi_property id='base_category'>function</multi_property>
   </role>
 </type_roles>
\ No newline at end of file

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

 <type_roles>
+  <role id='Auditor'>
+   <property id='title'>Accounting</property>
+   <property id='description'>`Sale` people can NOT create/modify `Service`. This comes from the `bt5`, and can be really fragile to change for now.</property>
+   <multi_property id='category'>function/accounting*</multi_property>
+   <multi_property id='base_category'>function</multi_property>
+  </role>
   <role id='Auditor'>
    <property id='title'>Project Compute Node Manager</property>
    <property id='description'>XXX TODO

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Service.xml

 <type_roles>
+  <role id='Auditor'>
+   <property id='title'>Accounting</property>
+   <property id='description'>`Sale` people can NOT create/modify `Service`. This comes from the `bt5`, and can be really fragile to change for now.
+
+XXX TODO
+add local roles group</property>
+   <multi_property id='category'>function/accounting*</multi_property>
+   <multi_property id='base_category'>function</multi_property>
+  </role>
   <role id='Auditor'>
    <property id='title'>Project Compute Node Manager</property>
    <property id='description'>XXX TODO

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

@@ -31,6 +31,20 @@
    <multi_property id='category'>function/production/manager</multi_property>
    <multi_property id='base_category'>destination_project</multi_property>
   </role>
+  <role id='Assignee'>
+   <property id='title'>Sale Agent</property>
+   <property id='condition'>python: (context.getDestinationProject('', portal_type='Project') == "") and (context.getSourceProject('', portal_type='Project') == "")</property>
+   <multi_property id='categories'>local_role_group/function</multi_property>
+   <multi_property id='category'>function/sale/agent</multi_property>
+   <multi_property id='base_category'>function</multi_property>
+  </role>
+  <role id='Assignor'>
+   <property id='title'>Sale Manager</property>
+   <property id='condition'>python: (context.getDestinationProject('', portal_type='Project') == "") and (context.getSourceProject('', portal_type='Project') == "")</property>
+   <multi_property id='categories'>local_role_group/function</multi_property>
+   <multi_property id='category'>function/sale/manager</multi_property>
+   <multi_property id='base_category'>function</multi_property>
+  </role>
   <role id='Assignee'>
    <property id='title'>Source Project Production Agent</property>
    <property id='description'>XXX add local role group</property>

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

@@ -31,6 +31,20 @@
    <multi_property id='category'>function/production/manager</multi_property>
    <multi_property id='base_category'>destination_project</multi_property>
   </role>
+  <role id='Assignee'>
+   <property id='title'>Sale Agent</property>
+   <property id='condition'>python: (context.getDestinationProject('', portal_type='Project') == "") and (context.getSourceProject('', portal_type='Project') == "")</property>
+   <multi_property id='categories'>local_role_group/function</multi_property>
+   <multi_property id='category'>function/sale/agent</multi_property>
+   <multi_property id='base_category'>function</multi_property>
+  </role>
+  <role id='Assignor'>
+   <property id='title'>Sale Manager</property>
+   <property id='condition'>python: (context.getDestinationProject('', portal_type='Project') == "") and (context.getSourceProject('', portal_type='Project') == "")</property>
+   <multi_property id='categories'>local_role_group/function</multi_property>
+   <multi_property id='category'>function/sale/manager</multi_property>
+   <multi_property id='base_category'>function</multi_property>
+  </role>
   <role id='Assignee'>
    <property id='title'>Source Project Production Agent</property>
    <property id='description'>XXX add local role group</property>