diff --git a/master/bt5/vifib_erp5/LocalRolesTemplateItem/data_set_module.xml b/master/bt5/vifib_erp5/LocalRolesTemplateItem/data_set_module.xml
new file mode 100644
index 0000000000000000000000000000000000000000..b67a27cb27401a02d6c4d640a65921a77af42744
--- /dev/null
+++ b/master/bt5/vifib_erp5/LocalRolesTemplateItem/data_set_module.xml
@@ -0,0 +1,13 @@
+<local_roles_item>
+ <local_roles>
+ <role id='R-COMPUTER'>
+ <item>Author</item>
+ </role>
+ <role id='R-INSTANCE'>
+ <item>Author</item>
+ </role>
+ <role id='R-MEMBER'>
+ <item>Author</item>
+ </role>
+ </local_roles>
+</local_roles_item>
\ No newline at end of file
diff --git a/master/bt5/vifib_erp5/LocalRolesTemplateItem/document_module.xml b/master/bt5/vifib_erp5/LocalRolesTemplateItem/document_module.xml
index df658de14e267092b5f189e91d245895741d9656..3d8de58900f1209599eff449deefb2f4693b92f7 100644
--- a/master/bt5/vifib_erp5/LocalRolesTemplateItem/document_module.xml
+++ b/master/bt5/vifib_erp5/LocalRolesTemplateItem/document_module.xml
@@ -4,6 +4,15 @@
<item>Auditor</item>
<item>Author</item>
</role>
+ <role id='R-COMPUTER'>
+ <item>Author</item>
+ </role>
+ <role id='R-INSTANCE'>
+ <item>Author</item>
+ </role>
+ <role id='R-MEMBER'>
+ <item>Author</item>
+ </role>
<role id='zope'>
<item>Owner</item>
</role>
diff --git a/master/bt5/vifib_erp5/LocalRolesTemplateItem/image_module.xml b/master/bt5/vifib_erp5/LocalRolesTemplateItem/image_module.xml
index df658de14e267092b5f189e91d245895741d9656..3d8de58900f1209599eff449deefb2f4693b92f7 100644
--- a/master/bt5/vifib_erp5/LocalRolesTemplateItem/image_module.xml
+++ b/master/bt5/vifib_erp5/LocalRolesTemplateItem/image_module.xml
@@ -4,6 +4,15 @@
<item>Auditor</item>
<item>Author</item>
</role>
+ <role id='R-COMPUTER'>
+ <item>Author</item>
+ </role>
+ <role id='R-INSTANCE'>
+ <item>Author</item>
+ </role>
+ <role id='R-MEMBER'>
+ <item>Author</item>
+ </role>
<role id='zope'>
<item>Owner</item>
</role>
diff --git a/master/bt5/vifib_erp5/LocalRolesTemplateItem/portal_contributions.xml b/master/bt5/vifib_erp5/LocalRolesTemplateItem/portal_contributions.xml
index 422c3dfbbed4b996c041adaec1fdc2daa3f16b06..3d8de58900f1209599eff449deefb2f4693b92f7 100644
--- a/master/bt5/vifib_erp5/LocalRolesTemplateItem/portal_contributions.xml
+++ b/master/bt5/vifib_erp5/LocalRolesTemplateItem/portal_contributions.xml
@@ -1,5 +1,18 @@
<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-INSTANCE'>
+ <item>Author</item>
+ </role>
+ <role id='R-MEMBER'>
+ <item>Author</item>
+ </role>
<role id='zope'>
<item>Owner</item>
</role>
diff --git a/master/bt5/vifib_erp5/PortalTypeRolesTemplateItem/Contribution%20Tool.xml b/master/bt5/vifib_erp5/PortalTypeRolesTemplateItem/Contribution%20Tool.xml
index 9e167176ea7c34a24a8dd866a7c89f724f8d95dc..c2da5ae811c91bc2929231d4a255a49a0cbd5d1a 100644
--- a/master/bt5/vifib_erp5/PortalTypeRolesTemplateItem/Contribution%20Tool.xml
+++ b/master/bt5/vifib_erp5/PortalTypeRolesTemplateItem/Contribution%20Tool.xml
@@ -4,4 +4,10 @@
<multi_property id='category'>group/company</multi_property>
<multi_property id='base_category'>group</multi_property>
</role>
+ <role id='Author'>
+ <property id='title'>Security for Shacache (Author)</property>
+ <multi_property id='category'>role/member</multi_property>
+ <multi_property id='category'>role/computer</multi_property>
+ <multi_property id='category'>role/instance</multi_property>
+ </role>
</type_roles>
\ No newline at end of file
diff --git a/master/bt5/vifib_erp5/PortalTypeRolesTemplateItem/Data%20Set%20Module.xml b/master/bt5/vifib_erp5/PortalTypeRolesTemplateItem/Data%20Set%20Module.xml
new file mode 100644
index 0000000000000000000000000000000000000000..68f82943f8a2dabb61cbf9fa14608a155049135c
--- /dev/null
+++ b/master/bt5/vifib_erp5/PortalTypeRolesTemplateItem/Data%20Set%20Module.xml
@@ -0,0 +1,8 @@
+<type_roles>
+ <role id='Author'>
+ <property id='title'>Security for Shacache (Author)</property>
+ <multi_property id='category'>role/member</multi_property>
+ <multi_property id='category'>role/computer</multi_property>
+ <multi_property id='category'>role/instance</multi_property>
+ </role>
+</type_roles>
\ No newline at end of file
diff --git a/master/bt5/vifib_erp5/PortalTypeRolesTemplateItem/Data%20Set.xml b/master/bt5/vifib_erp5/PortalTypeRolesTemplateItem/Data%20Set.xml
new file mode 100644
index 0000000000000000000000000000000000000000..787a4343bc3b63b92faf57a6034fe99ffc550600
--- /dev/null
+++ b/master/bt5/vifib_erp5/PortalTypeRolesTemplateItem/Data%20Set.xml
@@ -0,0 +1,13 @@
+<type_roles>
+ <role id='Auditor'>
+ <property id='title'>Any From Shadir Group</property>
+ <property id='description'>Any user which has a valid assignment where the group is shadir* must have Auditor role.</property>
+ <multi_property id='category'>group/shadir</multi_property>
+ </role>
+ <role id='Auditor'>
+ <property id='title'>Security for Shacache (Auditor)</property>
+ <multi_property id='category'>role/member</multi_property>
+ <multi_property id='category'>role/computer</multi_property>
+ <multi_property id='category'>role/instance</multi_property>
+ </role>
+</type_roles>
\ No newline at end of file
diff --git a/master/bt5/vifib_erp5/PortalTypeRolesTemplateItem/Document%20Module.xml b/master/bt5/vifib_erp5/PortalTypeRolesTemplateItem/Document%20Module.xml
index 9e167176ea7c34a24a8dd866a7c89f724f8d95dc..c2da5ae811c91bc2929231d4a255a49a0cbd5d1a 100644
--- a/master/bt5/vifib_erp5/PortalTypeRolesTemplateItem/Document%20Module.xml
+++ b/master/bt5/vifib_erp5/PortalTypeRolesTemplateItem/Document%20Module.xml
@@ -4,4 +4,10 @@
<multi_property id='category'>group/company</multi_property>
<multi_property id='base_category'>group</multi_property>
</role>
+ <role id='Author'>
+ <property id='title'>Security for Shacache (Author)</property>
+ <multi_property id='category'>role/member</multi_property>
+ <multi_property id='category'>role/computer</multi_property>
+ <multi_property id='category'>role/instance</multi_property>
+ </role>
</type_roles>
\ No newline at end of file
diff --git a/master/bt5/vifib_erp5/PortalTypeRolesTemplateItem/Drawing.xml b/master/bt5/vifib_erp5/PortalTypeRolesTemplateItem/Drawing.xml
index ce63301e9b215d4dae0c4c1d82f263765e8339dd..0464744ffdbd6bbf55be921aae70647269382ac1 100644
--- a/master/bt5/vifib_erp5/PortalTypeRolesTemplateItem/Drawing.xml
+++ b/master/bt5/vifib_erp5/PortalTypeRolesTemplateItem/Drawing.xml
@@ -4,4 +4,10 @@
<multi_property id='category'>group/company</multi_property>
<multi_property id='base_category'>group</multi_property>
</role>
+ <role id='Auditor'>
+ <property id='title'>Security for Shacache</property>
+ <multi_property id='category'>role/member</multi_property>
+ <multi_property id='category'>role/computer</multi_property>
+ <multi_property id='category'>role/instance</multi_property>
+ </role>
</type_roles>
\ No newline at end of file
diff --git a/master/bt5/vifib_erp5/PortalTypeRolesTemplateItem/File.xml b/master/bt5/vifib_erp5/PortalTypeRolesTemplateItem/File.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8e8f58b6ebbb599dce4ad4c57428133bd30eec82
--- /dev/null
+++ b/master/bt5/vifib_erp5/PortalTypeRolesTemplateItem/File.xml
@@ -0,0 +1,9 @@
+<type_roles>
+ <role id='Auditor'>
+ <property id='title'>Shacache Security (Auditor)</property>
+ <property id='description'>Any user which has a valid assignment where the role is instance must have Auditor role.</property>
+ <multi_property id='category'>role/computer</multi_property>
+ <multi_property id='category'>role/member</multi_property>
+ <multi_property id='category'>role/instance</multi_property>
+ </role>
+</type_roles>
\ No newline at end of file
diff --git a/master/bt5/vifib_erp5/PortalTypeRolesTemplateItem/Image%20Module.xml b/master/bt5/vifib_erp5/PortalTypeRolesTemplateItem/Image%20Module.xml
index 9e167176ea7c34a24a8dd866a7c89f724f8d95dc..c2da5ae811c91bc2929231d4a255a49a0cbd5d1a 100644
--- a/master/bt5/vifib_erp5/PortalTypeRolesTemplateItem/Image%20Module.xml
+++ b/master/bt5/vifib_erp5/PortalTypeRolesTemplateItem/Image%20Module.xml
@@ -4,4 +4,10 @@
<multi_property id='category'>group/company</multi_property>
<multi_property id='base_category'>group</multi_property>
</role>
+ <role id='Author'>
+ <property id='title'>Security for Shacache (Author)</property>
+ <multi_property id='category'>role/member</multi_property>
+ <multi_property id='category'>role/computer</multi_property>
+ <multi_property id='category'>role/instance</multi_property>
+ </role>
</type_roles>
\ No newline at end of file
diff --git a/master/bt5/vifib_erp5/PortalTypeRolesTemplateItem/Image.xml b/master/bt5/vifib_erp5/PortalTypeRolesTemplateItem/Image.xml
new file mode 100644
index 0000000000000000000000000000000000000000..e6cef8b023db97ae46d9119fe3eedd32f7596bdc
--- /dev/null
+++ b/master/bt5/vifib_erp5/PortalTypeRolesTemplateItem/Image.xml
@@ -0,0 +1,8 @@
+<type_roles>
+ <role id='Auditor'>
+ <property id='title'>Security for Shacache (Auditor)</property>
+ <multi_property id='category'>role/member</multi_property>
+ <multi_property id='category'>role/computer</multi_property>
+ <multi_property id='category'>role/instance</multi_property>
+ </role>
+</type_roles>
\ No newline at end of file
diff --git a/master/bt5/vifib_erp5/PortalTypeRolesTemplateItem/PDF.xml b/master/bt5/vifib_erp5/PortalTypeRolesTemplateItem/PDF.xml
index ce63301e9b215d4dae0c4c1d82f263765e8339dd..3ed94c32b6a11eede3c50065b852758e92208b49 100644
--- a/master/bt5/vifib_erp5/PortalTypeRolesTemplateItem/PDF.xml
+++ b/master/bt5/vifib_erp5/PortalTypeRolesTemplateItem/PDF.xml
@@ -4,4 +4,10 @@
<multi_property id='category'>group/company</multi_property>
<multi_property id='base_category'>group</multi_property>
</role>
+ <role id='Auditor'>
+ <property id='title'>Security for Shacache (Auditor)</property>
+ <multi_property id='category'>role/member</multi_property>
+ <multi_property id='category'>role/computer</multi_property>
+ <multi_property id='category'>role/instance</multi_property>
+ </role>
</type_roles>
\ No newline at end of file
diff --git a/master/bt5/vifib_erp5/PortalTypeRolesTemplateItem/Presentation.xml b/master/bt5/vifib_erp5/PortalTypeRolesTemplateItem/Presentation.xml
index ce63301e9b215d4dae0c4c1d82f263765e8339dd..3ed94c32b6a11eede3c50065b852758e92208b49 100644
--- a/master/bt5/vifib_erp5/PortalTypeRolesTemplateItem/Presentation.xml
+++ b/master/bt5/vifib_erp5/PortalTypeRolesTemplateItem/Presentation.xml
@@ -4,4 +4,10 @@
<multi_property id='category'>group/company</multi_property>
<multi_property id='base_category'>group</multi_property>
</role>
+ <role id='Auditor'>
+ <property id='title'>Security for Shacache (Auditor)</property>
+ <multi_property id='category'>role/member</multi_property>
+ <multi_property id='category'>role/computer</multi_property>
+ <multi_property id='category'>role/instance</multi_property>
+ </role>
</type_roles>
\ No newline at end of file
diff --git a/master/bt5/vifib_erp5/PortalTypeRolesTemplateItem/Spreadsheet.xml b/master/bt5/vifib_erp5/PortalTypeRolesTemplateItem/Spreadsheet.xml
index ce63301e9b215d4dae0c4c1d82f263765e8339dd..3ed94c32b6a11eede3c50065b852758e92208b49 100644
--- a/master/bt5/vifib_erp5/PortalTypeRolesTemplateItem/Spreadsheet.xml
+++ b/master/bt5/vifib_erp5/PortalTypeRolesTemplateItem/Spreadsheet.xml
@@ -4,4 +4,10 @@
<multi_property id='category'>group/company</multi_property>
<multi_property id='base_category'>group</multi_property>
</role>
+ <role id='Auditor'>
+ <property id='title'>Security for Shacache (Auditor)</property>
+ <multi_property id='category'>role/member</multi_property>
+ <multi_property id='category'>role/computer</multi_property>
+ <multi_property id='category'>role/instance</multi_property>
+ </role>
</type_roles>
\ No newline at end of file
diff --git a/master/bt5/vifib_erp5/PortalTypeRolesTemplateItem/Text.xml b/master/bt5/vifib_erp5/PortalTypeRolesTemplateItem/Text.xml
index ce63301e9b215d4dae0c4c1d82f263765e8339dd..0464744ffdbd6bbf55be921aae70647269382ac1 100644
--- a/master/bt5/vifib_erp5/PortalTypeRolesTemplateItem/Text.xml
+++ b/master/bt5/vifib_erp5/PortalTypeRolesTemplateItem/Text.xml
@@ -4,4 +4,10 @@
<multi_property id='category'>group/company</multi_property>
<multi_property id='base_category'>group</multi_property>
</role>
+ <role id='Auditor'>
+ <property id='title'>Security for Shacache</property>
+ <multi_property id='category'>role/member</multi_property>
+ <multi_property id='category'>role/computer</multi_property>
+ <multi_property id='category'>role/instance</multi_property>
+ </role>
</type_roles>
\ No newline at end of file
diff --git a/master/bt5/vifib_erp5/bt/dependency_list b/master/bt5/vifib_erp5/bt/dependency_list
index daf76af8cdc785485e036e7853c76b5c6635deb2..4e3471639ade95d05065a44df32f5aecde1c9309 100644
--- a/master/bt5/vifib_erp5/bt/dependency_list
+++ b/master/bt5/vifib_erp5/bt/dependency_list
@@ -9,6 +9,8 @@ erp5_tiosafe_core
erp5_ui_test
erp5_ui_test_core
erp5_web
+erp5_web_shacache
+erp5_web_shadir
vifib_agent
vifib_base
vifib_configurator
diff --git a/master/bt5/vifib_erp5/bt/revision b/master/bt5/vifib_erp5/bt/revision
index ec52cb80b9b9cef0839254b8e8d1412ed04924dd..5da127eea415025aa9bc10424531ced8f40ae638 100644
--- a/master/bt5/vifib_erp5/bt/revision
+++ b/master/bt5/vifib_erp5/bt/revision
@@ -1 +1 @@
-501
\ No newline at end of file
+507
\ No newline at end of file
diff --git a/master/bt5/vifib_erp5/bt/template_local_role_list b/master/bt5/vifib_erp5/bt/template_local_role_list
index 3a5dc9f0e03f3d541258479009128b7d5a90eeb8..8d906ef68efb728506f2c94e9406581cde99dc2d 100644
--- a/master/bt5/vifib_erp5/bt/template_local_role_list
+++ b/master/bt5/vifib_erp5/bt/template_local_role_list
@@ -18,6 +18,7 @@ campaign_module
component_module
currency_module
currency_module/EUR
+data_set_module
document_ingestion_module
document_module
event_module
diff --git a/master/bt5/vifib_erp5/bt/template_local_roles_list b/master/bt5/vifib_erp5/bt/template_local_roles_list
index 3a5dc9f0e03f3d541258479009128b7d5a90eeb8..8d906ef68efb728506f2c94e9406581cde99dc2d 100644
--- a/master/bt5/vifib_erp5/bt/template_local_roles_list
+++ b/master/bt5/vifib_erp5/bt/template_local_roles_list
@@ -18,6 +18,7 @@ campaign_module
component_module
currency_module
currency_module/EUR
+data_set_module
document_ingestion_module
document_module
event_module
diff --git a/master/bt5/vifib_erp5/bt/template_portal_type_role_list b/master/bt5/vifib_erp5/bt/template_portal_type_role_list
index 9c09468a40f9741b6120f61f794c00c9b8a84454..17dd9ef5cbb42bd25f38d6bec1384c4a77b08170 100644
--- a/master/bt5/vifib_erp5/bt/template_portal_type_role_list
+++ b/master/bt5/vifib_erp5/bt/template_portal_type_role_list
@@ -17,13 +17,17 @@ Contribution Tool
Credit Card
Currency
Currency Module
+Data Set
+Data Set Module
Document Ingestion Module
Document Module
Drawing
Event Module
Fax Message
+File
Gadget
Gadget Tool
+Image
Image Module
Integration Site
Integration Tool
diff --git a/master/bt5/vifib_erp5/bt/template_portal_type_roles_list b/master/bt5/vifib_erp5/bt/template_portal_type_roles_list
index 9c09468a40f9741b6120f61f794c00c9b8a84454..17dd9ef5cbb42bd25f38d6bec1384c4a77b08170 100644
--- a/master/bt5/vifib_erp5/bt/template_portal_type_roles_list
+++ b/master/bt5/vifib_erp5/bt/template_portal_type_roles_list
@@ -17,13 +17,17 @@ Contribution Tool
Credit Card
Currency
Currency Module
+Data Set
+Data Set Module
Document Ingestion Module
Document Module
Drawing
Event Module
Fax Message
+File
Gadget
Gadget Tool
+Image
Image Module
Integration Site
Integration Tool