Skip to content

S
slapos.core
Commit abab5aaf authored by Romain Courteaud's avatar Romain Courteaud
Browse files
Options

slapos_erp5: 

* add slapos_virtual_master_subscription local roles
* only sort some properties
* Sale agent can access currencies
* restore Subscription Request local roles
* Sale agent can create Subscription Request
parent f3e6f135
Show whitespace changes
Inline Side-by-side
Showing with 98 additions and 12 deletions
master/bt5/slapos_erp5/LocalRolesTemplateItem/currency_module.xml
View file @ abab5aaf
...@@ -10,6 +10,9 @@ ...@@ -10,6 +10,9 @@
<role id='F-PRODUCTION*'> <role id='F-PRODUCTION*'>
<item>Auditor</item> <item>Auditor</item>
</role> </role>
<role id='F-SALE*'>
<item>Auditor</item>
</role>
<role id='R-SHADOW-PERSON'> <role id='R-SHADOW-PERSON'>
<item>Auditor</item> <item>Auditor</item>
</role> </role>
...@@ -19,6 +22,7 @@ ...@@ -19,6 +22,7 @@
<principal id='F-ACCOUNTING*'>Auditor</principal> <principal id='F-ACCOUNTING*'>Auditor</principal>
<principal id='F-ACCOUNTING*'>Author</principal> <principal id='F-ACCOUNTING*'>Author</principal>
<principal id='F-CUSTOMER'>Auditor</principal> <principal id='F-CUSTOMER'>Auditor</principal>
<principal id='F-SALE*'>Auditor</principal>
</local_role_group_id> </local_role_group_id>
<local_role_group_id id='shadow'> <local_role_group_id id='shadow'>
<principal id='R-SHADOW-PERSON'>Auditor</principal> <principal id='R-SHADOW-PERSON'>Auditor</principal>
......
master/bt5/slapos_erp5/LocalRolesTemplateItem/currency_module/CNY.xml
View file @ abab5aaf
...@@ -10,6 +10,9 @@ ...@@ -10,6 +10,9 @@
<role id='F-PRODUCTION*'> <role id='F-PRODUCTION*'>
<item>Auditor</item> <item>Auditor</item>
</role> </role>
<role id='F-SALE*'>
<item>Auditor</item>
</role>
<role id='R-SHADOW-PERSON'> <role id='R-SHADOW-PERSON'>
<item>Auditor</item> <item>Auditor</item>
</role> </role>
......
master/bt5/slapos_erp5/LocalRolesTemplateItem/currency_module/EUR.xml
View file @ abab5aaf
...@@ -10,6 +10,9 @@ ...@@ -10,6 +10,9 @@
<role id='F-PRODUCTION*'> <role id='F-PRODUCTION*'>
<item>Auditor</item> <item>Auditor</item>
</role> </role>
<role id='F-SALE*'>
<item>Auditor</item>
</role>
<role id='R-SHADOW-PERSON'> <role id='R-SHADOW-PERSON'>
<item>Auditor</item> <item>Auditor</item>
</role> </role>
......
master/bt5/slapos_erp5/LocalRolesTemplateItem/service_module/slapos_virtual_master_subscription.xml 0 → 100644
View file @ abab5aaf
<local_roles_item>
<local_roles>
<role id='F-CUSTOMER'>
<item>Auditor</item>
</role>
<role id='F-PRODUCTION*'>
<item>Auditor</item>
</role>
<role id='F-SALE*'>
<item>Auditor</item>
</role>
</local_roles>
</local_roles_item>
\ No newline at end of file
master/bt5/slapos_erp5/LocalRolesTemplateItem/subscription_request_module.xml 0 → 100644
View file @ abab5aaf
<local_roles_item>
<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>
<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>
<principal id='F-PRODUCTION*'>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/PortalTypeRolesTemplateItem/Currency%20Module.xml
View file @ abab5aaf
...@@ -22,4 +22,10 @@ ...@@ -22,4 +22,10 @@
<multi_property id='category'>function/production*</multi_property> <multi_property id='category'>function/production*</multi_property>
<multi_property id='base_category'>function</multi_property> <multi_property id='base_category'>function</multi_property>
</role> </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> </type_roles>
\ No newline at end of file
master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Currency.xml
View file @ abab5aaf
...@@ -20,4 +20,9 @@ ...@@ -20,4 +20,9 @@
<multi_property id='category'>function/production*</multi_property> <multi_property id='category'>function/production*</multi_property>
<multi_property id='base_category'>function</multi_property> <multi_property id='base_category'>function</multi_property>
</role> </role>
<role id='Auditor'>
<property id='title'>Sale</property>
<multi_property id='category'>function/sale*</multi_property>
<multi_property id='base_category'>function</multi_property>
</role>
</type_roles> </type_roles>
\ No newline at end of file
master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Subscription%20Request%20Module.xml 0 → 100644
View file @ abab5aaf
<type_roles>
<role id='Author; 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='categories'>local_role_group/function</multi_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/Subscription%20Request.xml 0 → 100644
View file @ abab5aaf
<type_roles>
</type_roles>
\ No newline at end of file
master/bt5/slapos_erp5/bt/template_keep_path_list
View file @ abab5aaf
notification_message_module/slapos_erp5_credential_recovery_password_expiration_link_en_001
notification_message_module/slapos_erp5_credential_recovery_password_expiration_link_en_001/**
portal_categories/group
portal_categories/region
portal_categories/subordination
portal_certificate_authority portal_certificate_authority
portal_certificate_authority/** portal_certificate_authority/**
software_product_module/frontend software_product_module/frontend
software_product_module/re6st software_product_module/re6st
software_release_module/frontend software_release_module/frontend
software_release_module/re6st software_release_module/re6st
\ No newline at end of file
portal_categories/region
portal_categories/group
portal_categories/subordination
notification_message_module/slapos_erp5_credential_recovery_password_expiration_link_en_001
notification_message_module/slapos_erp5_credential_recovery_password_expiration_link_en_001/**
\ No newline at end of file
master/bt5/slapos_erp5/bt/template_local_role_list
View file @ abab5aaf
...@@ -72,10 +72,12 @@ service_module/slapos_netdrive_consumption ...@@ -72,10 +72,12 @@ service_module/slapos_netdrive_consumption
service_module/slapos_reservation_fee service_module/slapos_reservation_fee
service_module/slapos_reservation_refund service_module/slapos_reservation_refund
service_module/slapos_tax service_module/slapos_tax
service_module/slapos_virtual_master_subscription
service_module/zero_emission_ratio service_module/zero_emission_ratio
software_installation_module software_installation_module
software_instance_module software_instance_module
software_product_module software_product_module
subscription_request_module
support_request_module support_request_module
support_request_module/slapos_crm_support_request_template support_request_module/slapos_crm_support_request_template
system_event_module system_event_module
......
master/bt5/slapos_erp5/bt/template_portal_type_role_list
View file @ abab5aaf
...@@ -91,6 +91,8 @@ Software Instance ...@@ -91,6 +91,8 @@ Software Instance
Software Instance Module Software Instance Module
Software Product Software Product
Software Product Module Software Product Module
Subscription Request
Subscription Request Module
Support Request Support Request
Support Request Module Support Request Module
System Event Module System Event Module
......
master/bt5/slapos_erp5/bt/template_property_sheet_id_list
View file @ abab5aaf
PreferenceSlapOSConstraintPreference CatalogToolNoneCreationDateConstraint
CertificateAuthorityToolConsistencyConstraint CertificateAuthorityToolConsistencyConstraint
SlapOSModuleIdGeneratorConstraint SlapOSModuleIdGeneratorConstraint
GeographicOrganisation GeographicOrganisation
WebSiteModuleShacacheConstraint MemcachedToolServerConstraint
ShacacheSystemPreference
OAuthToolDefaultSlapOSConnector OAuthToolDefaultSlapOSConnector
CatalogToolNoneCreationDateConstraint PreferenceSlapOSConstraintPreference
ShacacheSystemPreference
SlapOSModuleIdGeneratorConstraint
TemplateToolBusinessApplicationModuleCategoryConstraint TemplateToolBusinessApplicationModuleCategoryConstraint
WebSiteModuleShacacheConstraint
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7