diff --git a/addons/auction/auction_demo.xml b/addons/auction/auction_demo.xml
index da4989756f9..cb8dfc45376 100644
--- a/addons/auction/auction_demo.xml
+++ b/addons/auction/auction_demo.xml
@@ -2,6 +2,10 @@
+
+
+
+
Tax
diff --git a/addons/auction/security/auction_security.xml b/addons/auction/security/auction_security.xml
index 7bf5901f5f0..1fc69bb314f 100644
--- a/addons/auction/security/auction_security.xml
+++ b/addons/auction/security/auction_security.xml
@@ -8,9 +8,6 @@
Auction / User
-
-
-
-
+
\ No newline at end of file
diff --git a/addons/base_contact/base_contact_demo.xml b/addons/base_contact/base_contact_demo.xml
index 40646d1f8eb..393c318015c 100644
--- a/addons/base_contact/base_contact_demo.xml
+++ b/addons/base_contact/base_contact_demo.xml
@@ -2,6 +2,10 @@
+
+
+
+
diff --git a/addons/base_contact/security/base_contact_security.xml b/addons/base_contact/security/base_contact_security.xml
index fba04ea8a13..56a995c76a8 100644
--- a/addons/base_contact/security/base_contact_security.xml
+++ b/addons/base_contact/security/base_contact_security.xml
@@ -5,10 +5,6 @@
Sales / User
-
-
-
-
Sales / Manager
diff --git a/addons/board/__openerp__.py b/addons/board/__openerp__.py
index 1c44dfe7955..770fc71777b 100644
--- a/addons/board/__openerp__.py
+++ b/addons/board/__openerp__.py
@@ -27,7 +27,7 @@
'author': 'OpenERP SA',
'depends': ['base'],
'update_xml': ['security/board_security.xml','security/ir.model.access.csv', 'wizard/board_menu_create_view.xml', 'board_view.xml','board_administration_view.xml'],
- 'demo_xml': [],
+ 'demo_xml': ['board_demo.xml'],
'installable': True,
'active': False,
'certificate': '0076912305725',
diff --git a/addons/board/board_demo.xml b/addons/board/board_demo.xml
new file mode 100644
index 00000000000..2f704e640bc
--- /dev/null
+++ b/addons/board/board_demo.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/addons/board/security/board_security.xml b/addons/board/security/board_security.xml
index a4c5b86bbd3..ee544e098cc 100644
--- a/addons/board/security/board_security.xml
+++ b/addons/board/security/board_security.xml
@@ -5,10 +5,6 @@
Sales / User
-
-
-
-
diff --git a/addons/crm/crm_demo.xml b/addons/crm/crm_demo.xml
index 9ae60b11a70..e629330751f 100644
--- a/addons/crm/crm_demo.xml
+++ b/addons/crm/crm_demo.xml
@@ -5,6 +5,5 @@
-
diff --git a/addons/crm/security/crm_security.xml b/addons/crm/security/crm_security.xml
index 4ea068f414f..78018a4031b 100644
--- a/addons/crm/security/crm_security.xml
+++ b/addons/crm/security/crm_security.xml
@@ -9,10 +9,6 @@
Sales / User
-
-
-
-
Sales / User - See All Leads
diff --git a/addons/document/document_demo.xml b/addons/document/document_demo.xml
index 1c757a73909..b94048ec13c 100644
--- a/addons/document/document_demo.xml
+++ b/addons/document/document_demo.xml
@@ -1,7 +1,9 @@
-
+
+
+
diff --git a/addons/document/security/document_security.xml b/addons/document/security/document_security.xml
index 452c992ed03..ca55a8219c1 100644
--- a/addons/document/security/document_security.xml
+++ b/addons/document/security/document_security.xml
@@ -5,10 +5,6 @@
Knowledge / User
-
-
-
-
diff --git a/addons/event/report/report_event_registration_view.xml b/addons/event/report/report_event_registration_view.xml
index 7b489775f25..7794843af40 100644
--- a/addons/event/report/report_event_registration_view.xml
+++ b/addons/event/report/report_event_registration_view.xml
@@ -141,7 +141,7 @@
-
+
diff --git a/addons/event/security/event_security.xml b/addons/event/security/event_security.xml
index 8aba5863e22..648662911d2 100644
--- a/addons/event/security/event_security.xml
+++ b/addons/event/security/event_security.xml
@@ -2,7 +2,7 @@
-
+
Marketing / Manager
diff --git a/addons/event/security/ir.model.access.csv b/addons/event/security/ir.model.access.csv
index a2e4b55bed5..59651dfa007 100644
--- a/addons/event/security/ir.model.access.csv
+++ b/addons/event/security/ir.model.access.csv
@@ -1,16 +1,16 @@
"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
"access_event_type","event.type","model_event_type","marketing.group_marketing_user",1,0,0,0
-"access_event_type_manager","event.type manager","model_event_type","base.group_marketing_manager",1,1,1,1
+"access_event_type_manager","event.type manager","model_event_type","marketing.group_marketing_manager",1,1,1,1
"access_event_event","event.event","model_event_event","marketing.group_marketing_user",1,1,1,0
"access_event_registration","event.registration","model_event_registration","marketing.group_marketing_user",1,1,1,0
"access_report_event_registration","report.event.registration","model_report_event_registration","marketing.group_marketing_user",1,1,1,1
-"access_event_event_manager","event.event manager","model_event_event","base.group_marketing_manager",1,0,0,0
-"access_event_registration_manager","event.registration manager","model_event_registration","base.group_marketing_manager",1,0,0,0
-"access_crm_case_section_manager","crm.case.section manager","crm.model_crm_case_section","base.group_marketing_manager",1,1,1,1
-"access_product_product","product.product.product manager","product.model_product_product","base.group_marketing_manager",1,1,1,1
-"access_report_event_registration","report.event.registration","model_report_event_registration","base.group_marketing_manager",1,1,1,1
-"access_event_registration_badge_manager","event.registration.badge manager","model_event_registration_badge","base.group_marketing_manager",1,1,1,1
+"access_event_event_manager","event.event manager","model_event_event","marketing.group_marketing_manager",1,0,0,0
+"access_event_registration_manager","event.registration manager","model_event_registration","marketing.group_marketing_manager",1,0,0,0
+"access_crm_case_section_manager","crm.case.section manager","crm.model_crm_case_section","marketing.group_marketing_manager",1,1,1,1
+"access_product_product","product.product.product manager","product.model_product_product","marketing.group_marketing_manager",1,1,1,1
+"access_report_event_registration","report.event.registration","model_report_event_registration","marketing.group_marketing_manager",1,1,1,1
+"access_event_registration_badge_manager","event.registration.badge manager","model_event_registration_badge","marketing.group_marketing_manager",1,1,1,1
"access_event_event_sale_salesman","event.event.sale","model_event_event","base.group_sale_salesman",1,0,0,0
-"access_account_account_invoice_manager","account.account.invoice","account.model_account_invoice","base.group_marketing_manager",1,0,0,0
+"access_account_account_invoice_manager","account.account.invoice","account.model_account_invoice","marketing.group_marketing_manager",1,0,0,0
"access_event_registration_badge","event.registration.badge","model_event_registration_badge","marketing.group_marketing_user",1,0,0,0
"access_event_registration_sale_user","event.registration.sale.user","model_event_registration","base.group_sale_salesman",1,0,0,0
diff --git a/addons/idea/security/idea_security.xml b/addons/idea/security/idea_security.xml
index 758997060e1..4b060c51e6c 100644
--- a/addons/idea/security/idea_security.xml
+++ b/addons/idea/security/idea_security.xml
@@ -8,11 +8,6 @@
Tools / User
-
-
-
-
-
diff --git a/addons/knowledge/security/knowledge_security.xml b/addons/knowledge/security/knowledge_security.xml
index 94ef433f7e0..b4c7bb99c1b 100644
--- a/addons/knowledge/security/knowledge_security.xml
+++ b/addons/knowledge/security/knowledge_security.xml
@@ -8,10 +8,6 @@
Knowledge / User
-
-
-
-
diff --git a/addons/marketing/__openerp__.py b/addons/marketing/__openerp__.py
index 16127d2d343..931ac38c4bb 100644
--- a/addons/marketing/__openerp__.py
+++ b/addons/marketing/__openerp__.py
@@ -34,7 +34,7 @@
'security/ir.model.access.csv',
'marketing_view.xml'
],
- 'demo_xml': [],
+ 'demo_xml': ['marketing_demo.xml'],
'installable': True,
'active': False,
}
diff --git a/addons/marketing/marketing_demo.xml b/addons/marketing/marketing_demo.xml
new file mode 100644
index 00000000000..904736ac5ec
--- /dev/null
+++ b/addons/marketing/marketing_demo.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/addons/marketing/security/marketing_security.xml b/addons/marketing/security/marketing_security.xml
index 5f85adc603a..06cf40772f4 100644
--- a/addons/marketing/security/marketing_security.xml
+++ b/addons/marketing/security/marketing_security.xml
@@ -5,11 +5,6 @@
Marketing / User
-
-
-
-
-
Marketing / Manager
diff --git a/addons/mrp/mrp_demo.xml b/addons/mrp/mrp_demo.xml
index cea5c60ee56..d19a99a12ca 100644
--- a/addons/mrp/mrp_demo.xml
+++ b/addons/mrp/mrp_demo.xml
@@ -2,6 +2,11 @@
+
+
+
+
+
diff --git a/addons/mrp/security/mrp_security.xml b/addons/mrp/security/mrp_security.xml
index a06aebf2ef4..1cc4c5cea9b 100644
--- a/addons/mrp/security/mrp_security.xml
+++ b/addons/mrp/security/mrp_security.xml
@@ -8,16 +8,6 @@
Manufacturing / User
-
-
-
-
-
-
-
-
-
-
diff --git a/addons/product/product_demo.xml b/addons/product/product_demo.xml
index 42fc157778e..65b27440c70 100644
--- a/addons/product/product_demo.xml
+++ b/addons/product/product_demo.xml
@@ -1,6 +1,11 @@
+
+
+
+
+
diff --git a/addons/product/security/product_security.xml b/addons/product/security/product_security.xml
index 532498ad966..32399358f68 100644
--- a/addons/product/security/product_security.xml
+++ b/addons/product/security/product_security.xml
@@ -15,10 +15,6 @@
Sales / User
-
-
-
-
Product multi-company
diff --git a/addons/project/project_demo.xml b/addons/project/project_demo.xml
index b0cfc8c716b..98efff361b3 100644
--- a/addons/project/project_demo.xml
+++ b/addons/project/project_demo.xml
@@ -4,7 +4,7 @@
-
+
diff --git a/addons/project/security/project_security.xml b/addons/project/security/project_security.xml
index 20ad61a4180..b51a5a9c89a 100644
--- a/addons/project/security/project_security.xml
+++ b/addons/project/security/project_security.xml
@@ -13,10 +13,6 @@
Sales / User
-
-
-
-
-
-
-
-
diff --git a/addons/stock/stock_demo.xml b/addons/stock/stock_demo.xml
index bdc11f208ca..d21f1523226 100644
--- a/addons/stock/stock_demo.xml
+++ b/addons/stock/stock_demo.xml
@@ -2,6 +2,10 @@
+
+
+
+
diff --git a/addons/subscription/security/subcription_security.xml b/addons/subscription/security/subcription_security.xml
index ec38d1e10ec..70c648380d5 100644
--- a/addons/subscription/security/subcription_security.xml
+++ b/addons/subscription/security/subcription_security.xml
@@ -9,9 +9,5 @@
Tools / User
-
-
-
-
diff --git a/addons/subscription/subscription_demo.xml b/addons/subscription/subscription_demo.xml
index bb8d61ef4b0..6f26cfde14d 100644
--- a/addons/subscription/subscription_demo.xml
+++ b/addons/subscription/subscription_demo.xml
@@ -1,6 +1,10 @@
+
+
+
+
diff --git a/addons/survey/security/survey_security.xml b/addons/survey/security/survey_security.xml
index cf465368546..1506fdaec1b 100644
--- a/addons/survey/security/survey_security.xml
+++ b/addons/survey/security/survey_security.xml
@@ -14,10 +14,6 @@
Survey / User
-
-
-
-
diff --git a/addons/survey/survey_demo.xml b/addons/survey/survey_demo.xml
index 56e20746ac2..9f0ba5f5326 100644
--- a/addons/survey/survey_demo.xml
+++ b/addons/survey/survey_demo.xml
@@ -1,9 +1,11 @@
+
-
+
+
Human Resources
Human Resources
diff --git a/addons/wiki/__openerp__.py b/addons/wiki/__openerp__.py
index f16347c4da9..5fb7b86b66b 100644
--- a/addons/wiki/__openerp__.py
+++ b/addons/wiki/__openerp__.py
@@ -44,7 +44,7 @@ keep track for the wiki groups, pages, and history
'security/wiki_security.xml',
'security/ir.model.access.csv'
],
- 'demo_xml': [],
+ 'demo_xml': ['wiki_demo.xml'],
'test': ['test/wiki_test00.yml'],
'installable': True,
'active': False,
diff --git a/addons/wiki/security/wiki_security.xml b/addons/wiki/security/wiki_security.xml
index b9c7af52ccd..98a8c03c177 100644
--- a/addons/wiki/security/wiki_security.xml
+++ b/addons/wiki/security/wiki_security.xml
@@ -11,10 +11,6 @@
Knowledge / User
-
-
-
-
diff --git a/addons/wiki/wiki_demo.xml b/addons/wiki/wiki_demo.xml
new file mode 100644
index 00000000000..66cd6c74c18
--- /dev/null
+++ b/addons/wiki/wiki_demo.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file