From 6caca89f8794fb85ba381cc0755e71d63a9fbbc1 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Fri, 19 Nov 2010 15:55:25 +0530
Subject: [PATCH] [IMP]: Moved reference of demo user from *_security.xml to
 demo file

bzr revid: rpa@tinyerp.com-20101119102525-8gyj1gmm1w29rwxu
---
 addons/auction/auction_demo.xml                  |  4 ++++
 addons/auction/security/auction_security.xml     |  5 +----
 addons/base_contact/base_contact_demo.xml        |  4 ++++
 .../security/base_contact_security.xml           |  4 ----
 addons/board/__openerp__.py                      |  2 +-
 addons/board/board_demo.xml                      |  8 ++++++++
 addons/board/security/board_security.xml         |  4 ----
 addons/crm/crm_demo.xml                          |  1 -
 addons/crm/security/crm_security.xml             |  4 ----
 addons/document/document_demo.xml                |  4 +++-
 addons/document/security/document_security.xml   |  4 ----
 .../report/report_event_registration_view.xml    |  2 +-
 addons/event/security/event_security.xml         |  2 +-
 addons/event/security/ir.model.access.csv        | 16 ++++++++--------
 addons/idea/security/idea_security.xml           |  5 -----
 addons/knowledge/security/knowledge_security.xml |  4 ----
 addons/marketing/__openerp__.py                  |  2 +-
 addons/marketing/marketing_demo.xml              |  8 ++++++++
 addons/marketing/security/marketing_security.xml |  5 -----
 addons/mrp/mrp_demo.xml                          |  5 +++++
 addons/mrp/security/mrp_security.xml             | 10 ----------
 addons/product/product_demo.xml                  |  5 +++++
 addons/product/security/product_security.xml     |  4 ----
 addons/project/project_demo.xml                  |  2 +-
 addons/project/security/project_security.xml     |  4 ----
 addons/purchase/purchase_demo.xml                |  4 ++++
 addons/purchase/security/purchase_security.xml   |  8 --------
 .../purchase_requisition_demo.xml                |  4 ++++
 .../security/purchase_tender.xml                 |  4 ----
 addons/sale/security/sale_security.xml           |  4 ----
 addons/sale_mrp/security/sale_mrp_security.xml   |  4 ----
 addons/share/__openerp__.py                      |  1 +
 addons/share/security/share_security.xml         |  6 +-----
 addons/share/share_demo.xml                      |  8 ++++++++
 addons/stock/security/stock_security.xml         |  4 ----
 addons/stock/stock_demo.xml                      |  4 ++++
 .../security/subcription_security.xml            |  4 ----
 addons/subscription/subscription_demo.xml        |  4 ++++
 addons/survey/security/survey_security.xml       |  4 ----
 addons/survey/survey_demo.xml                    |  4 +++-
 addons/wiki/__openerp__.py                       |  2 +-
 addons/wiki/security/wiki_security.xml           |  4 ----
 addons/wiki/wiki_demo.xml                        |  8 ++++++++
 43 files changed, 89 insertions(+), 110 deletions(-)
 create mode 100644 addons/board/board_demo.xml
 create mode 100644 addons/marketing/marketing_demo.xml
 create mode 100644 addons/share/share_demo.xml
 create mode 100644 addons/wiki/wiki_demo.xml

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 @@
 <openerp>
 <data noupdate="1">
 
+    <record id="base.user_demo" model="res.users">
+        <field eval="[(4, ref('group_auction_user'))]" name="groups_id"/>
+    </record>
+
     <!-- demo data for Account -->
     <record model="account.account.type" id="account.account_type_tax">
           <field name="name">Tax</field>
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 @@
     <record id="group_auction_user" model="res.groups">
         <field name="name">Auction / User</field>
     </record>
-    <record id="base.user_demo" model="res.users">
-        <field eval="[(4, ref('group_auction_user'))]" name="groups_id"/>
-    </record>
-    
+
 </data>
 </openerp>
\ 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 @@
 <openerp>
     <data>
 
+        <record id="base.user_demo" model="res.users">
+            <field eval="[(4, ref('base.group_sale_salesman'))]" name="groups_id"/>
+        </record>
+
         <!-- Create the contacts -->
         <record id="res_partner_contact_mortier0" model="res.partner.contact">
             <field eval="&quot;&quot;&quot;Benoit&quot;&quot;&quot;" name="first_name"/>
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 @@
     <record id="base.group_sale_salesman" model="res.groups">
         <field name="name">Sales / User</field>
     </record>
-    
-    <record id="base.user_demo" model="res.users">
-        <field eval="[(4, ref('base.group_sale_salesman'))]" name="groups_id"/>
-    </record>
 
     <record id="base.group_sale_manager" model="res.groups">
         <field name="name">Sales / Manager</field>
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 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record id="base.user_demo" model="res.users">
+            <field eval="[(4, ref('base.group_sale_salesman'))]" name="groups_id"/>
+        </record>
+    </data>
+</openerp>
\ 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 @@
     <record id="base.group_sale_salesman" model="res.groups">
         <field name="name">Sales / User</field>
     </record>
-    
-    <record id="base.user_demo" model="res.users">
-        <field eval="[(4, ref('base.group_sale_salesman'))]" name="groups_id"/>
-    </record>
 
 </data>
 </openerp>
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 @@
             <field name="groups_id" eval="[(4,ref('base.group_sale_salesman'))]"/> 
         </record>
 
-
     </data>
 </openerp>
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 @@
     <record id="base.group_sale_salesman" model="res.groups">
         <field name="name">Sales / User</field>
     </record>
-    
-    <record id="base.user_demo" model="res.users">
-        <field eval="[(4, ref('base.group_sale_salesman'))]" name="groups_id"/>
-    </record>
 
     <record id="base.group_sale_salesman_all_leads" model="res.groups">
         <field name="name">Sales / User - See All Leads</field>
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 @@
 <?xml version="1.0"?>
 <openerp>
 <data noupdate="1">
-
+    <record id="base.user_demo" model="res.users">
+        <field eval="[(4, ref('base.group_document_user'))]" name="groups_id"/>
+    </record>
 
 </data>
 </openerp>
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 @@
     <record id="base.group_document_user" model="res.groups">
         <field name="name">Knowledge / User</field>
     </record>
-    
-    <record id="base.user_demo" model="res.users">
-        <field eval="[(4, ref('base.group_document_user'))]" name="groups_id"/>
-    </record>
 
 <!--    <record id="group_document_manager" model="res.groups">-->
 <!--        <field name="name">Document / Manager</field>-->
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 @@
             <field name="act_window_id" ref="action_report_event_registration"/>
        </record>
 
-        <menuitem parent="base.menu_report_association" action="action_report_event_registration" id="menu_report_event_registration" sequence="3" groups="base.group_marketing_manager"/>
+        <menuitem parent="base.menu_report_association" action="action_report_event_registration" id="menu_report_event_registration" sequence="3" groups="marketing.group_marketing_manager"/>
 
     </data>
 </openerp>
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 @@
 <openerp>
   <data>
 
-    <record id="base.group_marketing_manager" model="res.groups">
+    <record id="marketing.group_marketing_manager" model="res.groups">
         <field name="name">Marketing / Manager</field>
     </record>
 
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 @@
    	<record model="res.groups" id="base.group_tool_user">
         	<field name="name">Tools / User</field>
    	</record>
-   	
-   	 <record id="base.user_demo" model="res.users">
-        <field eval="[(4, ref('base.group_tool_user'))]" name="groups_id"/>
-    </record>
-   	
 
 	</data>
 </openerp>
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 @@
             <record id="base.group_document_user" model="res.groups">
                 <field name="name">Knowledge / User</field>
             </record>
-            
-            <record id="base.user_demo" model="res.users">
-                <field eval="[(4, ref('base.group_document_user'))]" name="groups_id"/>
-            </record>
 
 </data>
 </openerp>
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 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data> 
+        <record id="base.user_demo" model="res.users">
+            <field eval="[(4, ref('marketing.group_marketing_user'))]" name="groups_id"/>
+        </record>
+    </data>
+</openerp>
\ 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 @@
         <field name="name">Marketing / User</field>
     </record>
     
-   <record id="base.user_demo" model="res.users">
-        <field eval="[(4, ref('marketing.group_marketing_user'))]" name="groups_id"/>
-   </record>
-    
-    
     <record id="marketing.group_marketing_manager" model="res.groups">
         <field name="name">Marketing / Manager</field>
     </record>
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 @@
 <openerp>
     <data noupdate="1">
 
+        <record id="base.user_demo" model="res.users">
+            <field eval="[(4, ref('group_mrp_user'))]" name="groups_id"/>
+        </record>
+        
+        
         <!--
     Resource: mrp.workcenter
     -->
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 @@
     <record id="group_mrp_user" model="res.groups">
         <field name="name">Manufacturing / User</field>
     </record>
-    
-    <record id="base.user_demo" model="res.users">
-        <field eval="[(4, ref('group_mrp_user'))]" name="groups_id"/>
-    </record>
-    
-    
-    <record id="base.user_demo" model="res.users">
-        <field eval="[(4, ref('group_mrp_user'))]" name="groups_id"/>
-    </record>
-
 
     <!-- restrict access to menu -->
     <record model='ir.ui.menu' id="mrp_Sched_all">
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 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="1">
+            
+        <record id="base.user_demo" model="res.users">
+            <field eval="[(4, ref('base.group_sale_salesman'))]" name="groups_id"/>
+        </record>
+        
         <!--
     Resource: product.category
     -->
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 @@
     <record id="base.group_sale_salesman" model="res.groups">
         <field name="name">Sales / User</field>
     </record>
-    
-     <record id="base.user_demo" model="res.users">
-        <field eval="[(4, ref('base.group_sale_salesman'))]" name="groups_id"/>
-    </record>
 
     <record id="product_comp_rule" model="ir.rule">
         <field name="name" >Product multi-company</field>
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 @@
 
          <!-- Users -->
         <record id="base.user_demo" model="res.users">
-            <field name="groups_id" eval="[(4,ref('group_project_user'))]"/> 
+            <field eval="[(4, ref('base.group_sale_salesman')),(4, ref('group_project_user'))]" name="groups_id"/>
         </record>
 
         <record id="res_users_analyst" model="res.users">
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 @@
     <record id="base.group_sale_salesman" model="res.groups">
         <field name="name">Sales / User</field>
     </record>
-    
-     <record id="base.user_demo" model="res.users">
-        <field eval="[(4, ref('base.group_sale_salesman')),(4, ref('group_project_user'))]" name="groups_id"/>
-    </record>
 
     <record model="ir.ui.menu" id="menu_definitions">
         <field name="groups_id" eval="[(6,0,[ref('group_project_manager')])]"/>
diff --git a/addons/purchase/purchase_demo.xml b/addons/purchase/purchase_demo.xml
index 938bbd7bb57..f95009aae9d 100644
--- a/addons/purchase/purchase_demo.xml
+++ b/addons/purchase/purchase_demo.xml
@@ -2,6 +2,10 @@
 <openerp>
     <data noupdate="1">
 
+        <record id="base.user_demo" model="res.users">
+            <field eval="[(4, ref('group_purchase_user'))]" name="groups_id"/>
+        </record>
+    
     <!--Resource: purchase.order-->
 
         <record id="order_purchase1" model="purchase.order">
diff --git a/addons/purchase/security/purchase_security.xml b/addons/purchase/security/purchase_security.xml
index 13adc9bacd0..e1149c91466 100644
--- a/addons/purchase/security/purchase_security.xml
+++ b/addons/purchase/security/purchase_security.xml
@@ -8,14 +8,6 @@
     <record id="group_purchase_user" model="res.groups">
         <field name="name">Purchase / User</field>
     </record>
-    
-    <record id="base.user_demo" model="res.users">
-        <field eval="[(4, ref('group_purchase_user'))]" name="groups_id"/>
-    </record>
-
-    <record id="base.user_demo" model="res.users">
-        <field eval="[(4, ref('group_purchase_user'))]" name="groups_id"/>
-    </record>
 
     <record model="ir.rule" id="purchase_order_comp_rule">
         <field name="name">Purchase Order multi-company</field>
diff --git a/addons/purchase_requisition/purchase_requisition_demo.xml b/addons/purchase_requisition/purchase_requisition_demo.xml
index ee12ac76c9a..225137416bf 100644
--- a/addons/purchase_requisition/purchase_requisition_demo.xml
+++ b/addons/purchase_requisition/purchase_requisition_demo.xml
@@ -2,6 +2,10 @@
 <openerp>
     <data noupdate="1">
 
+        <record id="base.user_demo" model="res.users">
+            <field eval="[(4, ref('group_purchase_requisition_user'))]" name="groups_id"/>
+        </record>
+
     <!--Resource: purchase.requisition-->
 
 		<record id="order_purchase_requisition1" model="purchase.requisition">
diff --git a/addons/purchase_requisition/security/purchase_tender.xml b/addons/purchase_requisition/security/purchase_tender.xml
index 22c91d191cc..595b71008ef 100644
--- a/addons/purchase_requisition/security/purchase_tender.xml
+++ b/addons/purchase_requisition/security/purchase_tender.xml
@@ -9,10 +9,6 @@
     <record id="group_purchase_requisition_user" model="res.groups">
         <field name="name">Purchase Requisition / User</field>
     </record>
-    
-     <record id="base.user_demo" model="res.users">
-        <field eval="[(4, ref('group_purchase_requisition_user'))]" name="groups_id"/>
-    </record>
 
     <record model="ir.rule" id="purchase_requisition_comp_rule">
         <field name="name">Purchase Requisition multi-company</field>
diff --git a/addons/sale/security/sale_security.xml b/addons/sale/security/sale_security.xml
index c726f8d102a..e4a8a880e9c 100644
--- a/addons/sale/security/sale_security.xml
+++ b/addons/sale/security/sale_security.xml
@@ -9,10 +9,6 @@
         <field name="name">Sales / User</field>
     </record>
 
-    <record id="base.user_demo" model="res.users">
-        <field eval="[(4, ref('base.group_sale_salesman'))]" name="groups_id"/>
-    </record>
-    
     <record model="ir.ui.menu" id="base.menu_base_partner">
         <field eval="[(4, ref('base.group_sale_salesman'))]" name="groups_id"/>
     </record>
diff --git a/addons/sale_mrp/security/sale_mrp_security.xml b/addons/sale_mrp/security/sale_mrp_security.xml
index c8548e6a4e1..c0139329d1e 100644
--- a/addons/sale_mrp/security/sale_mrp_security.xml
+++ b/addons/sale_mrp/security/sale_mrp_security.xml
@@ -10,9 +10,5 @@
         <field name="name">Sales / User</field>
     </record>
 
-     <record id="base.user_demo" model="res.users">
-        <field eval="[(4, ref('base.group_sale_salesman'))]" name="groups_id"/>
-    </record>
-   
 </data>
 </openerp>
diff --git a/addons/share/__openerp__.py b/addons/share/__openerp__.py
index 21b63fd3bc1..43dc7d23d49 100644
--- a/addons/share/__openerp__.py
+++ b/addons/share/__openerp__.py
@@ -41,6 +41,7 @@
 
     """,
     'website': 'http://www.openerp.com',
+    'demo_xml': ['share_demo.xml'],
     'data': [
         'security/share_security.xml',
         'share_view.xml',
diff --git a/addons/share/security/share_security.xml b/addons/share/security/share_security.xml
index 1e98c40ab3b..ea27101fd53 100644
--- a/addons/share/security/share_security.xml
+++ b/addons/share/security/share_security.xml
@@ -4,10 +4,6 @@
         <record id="group_share_user" model="res.groups">
             <field name="name">Sharing / User</field>
         </record>
-        
-        <record id="base.user_demo" model="res.users">
-            <field eval="[(4, ref('group_share_user'))]" name="groups_id"/>
-        </record>
-    
+
     </data>
 </openerp>
diff --git a/addons/share/share_demo.xml b/addons/share/share_demo.xml
new file mode 100644
index 00000000000..139c81d4dd3
--- /dev/null
+++ b/addons/share/share_demo.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record id="base.user_demo" model="res.users">
+            <field eval="[(4, ref('group_share_user'))]" name="groups_id"/>
+        </record>
+    </data>
+</openerp>
diff --git a/addons/stock/security/stock_security.xml b/addons/stock/security/stock_security.xml
index 285c82532b8..717486413c6 100644
--- a/addons/stock/security/stock_security.xml
+++ b/addons/stock/security/stock_security.xml
@@ -9,10 +9,6 @@
         <field name="name">Warehouse / User</field>
     </record>
 
-    <record id="base.user_demo" model="res.users">
-        <field eval="[(4, ref('group_stock_user'))]" name="groups_id"/>
-    </record>
-
 <!-- multi -->
 
     <record model="ir.rule" id="stock_picking_rule">
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 @@
 <openerp>
     <data noupdate="1">
 
+        <record id="base.user_demo" model="res.users">
+            <field eval="[(4, ref('group_stock_user'))]" name="groups_id"/>
+        </record>
+    
         <!--
     Resource: stock.location
     -->
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 @@
         	<field name="name">Tools / User</field>
    	</record>
    	
-   	<record id="base.user_demo" model="res.users">
-            <field eval="[(4, ref('base.group_tool_user'))]" name="groups_id"/>
-    </record>
-
 </data>
 </openerp>
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 @@
 <?xml version="1.0" ?>
 <openerp>
     <data>
+        <record id="base.user_demo" model="res.users">
+            <field eval="[(4, ref('base.group_tool_user'))]" name="groups_id"/>
+        </record>
+    
         <record id="subscription_document_partner0" model="subscription.document">
             <field eval="1" name="active"/>
             <field name="model" ref="base.model_res_partner"/>
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 @@
    	<record model="res.groups" id="group_survey_user">
         	<field name="name">Survey / User</field>
    	</record>
-   	
-   	<record id="base.user_demo" model="res.users">
-            <field eval="[(4, ref('base.group_sale_salesman')),(4, ref('base.group_tool_user')),(4, ref('group_survey_user'))]" name="groups_id"/>
-    </record>
 
 </data>
 </openerp>
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 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="1">
+
         <record id="base.user_demo" model="res.users">
-            <field name="groups_id" eval="[(4,ref('group_survey_user'))]"/> 
+            <field eval="[(4, ref('base.group_sale_salesman')),(4, ref('base.group_tool_user')),(4, ref('group_survey_user'))]" name="groups_id"/>
         </record>
+
         <record model="survey.type" id="survey_type1">
             <field name="name">Human Resources</field>
             <field name="code">Human Resources</field>
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 @@
     <record id="base.group_document_user" model="res.groups">
         <field name="name">Knowledge / User</field>
     </record>
-
-    <record id="base.user_demo" model="res.users">
-        <field eval="[(4, ref('base.group_sale_salesman')),(4, ref('base.group_document_user'))]" name="groups_id"/>
-    </record>
     
 </data>
 </openerp>
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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data noupdate="1">
+        <record id="base.user_demo" model="res.users">
+            <field eval="[(4, ref('base.group_sale_salesman')),(4, ref('base.group_document_user'))]" name="groups_id"/>
+        </record>
+    </data>
+</openerp>
\ No newline at end of file