From 764b9f251e9841be43db4879d4596c2d7741fd50 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Sun, 14 Nov 2010 19:18:21 +0530
Subject: [PATCH] [FIX] correct regression on intalling module without demo
 data

bzr revid: hmo@tinyerp.com-20101114134821-7djwpr6nmmxu584q
---
 addons/account_accountant/__openerp__.py                 | 2 +-
 addons/account_accountant/account_accountant_demo.xml    | 8 ++++++++
 addons/account_accountant/security/account_security.xml  | 3 ---
 addons/crm/crm_demo.xml                                  | 3 +++
 addons/crm/security/crm_security.xml                     | 4 ----
 addons/event/event_demo.xml                              | 4 +++-
 addons/event/security/event_security.xml                 | 3 ---
 addons/hr/hr_demo.xml                                    | 3 +++
 addons/hr/security/hr_security.xml                       | 3 ---
 addons/idea/idea_data.xml                                | 4 ++++
 addons/idea/security/idea_security.xml                   | 4 ----
 addons/knowledge/__openerp__.py                          | 2 +-
 addons/knowledge/knowledge_demo.xml                      | 8 ++++++++
 addons/knowledge/security/knowledge_security.xml         | 4 ----
 addons/lunch/lunch_demo.xml                              | 5 +++++
 addons/lunch/security/lunch_security.xml                 | 6 +-----
 addons/point_of_sale/point_of_sale_demo.xml              | 4 +++-
 addons/point_of_sale/security/point_of_sale_security.xml | 3 ---
 addons/project/project_demo.xml                          | 3 +++
 addons/project/security/project_security.xml             | 5 -----
 addons/sale/sale_demo.xml                                | 6 ++++--
 addons/sale/security/sale_security.xml                   | 6 +-----
 addons/survey/security/survey_security.xml               | 4 ----
 addons/survey/survey_demo.xml                            | 4 +++-
 24 files changed, 51 insertions(+), 50 deletions(-)
 create mode 100644 addons/account_accountant/account_accountant_demo.xml
 create mode 100644 addons/knowledge/knowledge_demo.xml

diff --git a/addons/account_accountant/__openerp__.py b/addons/account_accountant/__openerp__.py
index 43320836fd4..41dc6c130a8 100644
--- a/addons/account_accountant/__openerp__.py
+++ b/addons/account_accountant/__openerp__.py
@@ -33,7 +33,7 @@ items and the chart of accounts.
     'update_xml': [
         'security/account_security.xml',
     ],
-    'demo_xml': [],
+    'demo_xml': ['account_accountant_demo.xml'],
     'test': [],
     'installable': True,
     'active': False,
diff --git a/addons/account_accountant/account_accountant_demo.xml b/addons/account_accountant/account_accountant_demo.xml
new file mode 100644
index 00000000000..5944209e9b4
--- /dev/null
+++ b/addons/account_accountant/account_accountant_demo.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+		<record id="base.user_demo" model="res.users">
+            <field name="groups_id" eval="[(4, ref('account.group_account_user'))]"/>
+        </record>
+    </data>
+</openerp>
diff --git a/addons/account_accountant/security/account_security.xml b/addons/account_accountant/security/account_security.xml
index df2291446c8..0d6006fd9b0 100644
--- a/addons/account_accountant/security/account_security.xml
+++ b/addons/account_accountant/security/account_security.xml
@@ -6,8 +6,5 @@
             <field name="groups_id" eval="[(4, ref('account.group_account_manager')),(4, ref('account.group_account_user'))]"/>
         </record>
 
-		<record id="base.user_demo" model="res.users">
-            <field name="groups_id" eval="[(4, ref('account.group_account_user'))]"/>
-        </record>
     </data>
 </openerp>
diff --git a/addons/crm/crm_demo.xml b/addons/crm/crm_demo.xml
index d356810e31c..9ae60b11a70 100644
--- a/addons/crm/crm_demo.xml
+++ b/addons/crm/crm_demo.xml
@@ -1,6 +1,9 @@
 <?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('base.group_sale_salesman'))]"/> 
+        </record>
 
 
     </data>
diff --git a/addons/crm/security/crm_security.xml b/addons/crm/security/crm_security.xml
index ab29f28d89b..78018a4031b 100644
--- a/addons/crm/security/crm_security.xml
+++ b/addons/crm/security/crm_security.xml
@@ -35,9 +35,5 @@
         <field eval="[(4, ref('base.group_sale_manager'))]" name="groups_id"/>
     </record>
     
-    <record id="base.user_demo" model="res.users">
-        <field name="groups_id" eval="[(4,ref('base.group_sale_salesman'))]"/> 
-    </record>
-
     </data>
 </openerp>
diff --git a/addons/event/event_demo.xml b/addons/event/event_demo.xml
index 5cbfecde4eb..8e8764ca1a7 100644
--- a/addons/event/event_demo.xml
+++ b/addons/event/event_demo.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0"?>
 <openerp>
 	<data>
-
+    <record id="base.user_demo" model="res.users">
+             <field name="groups_id" eval="[(4, ref('marketing.group_marketing_user')),(4, ref('base.group_sale_salesman'))]"/>
+     </record>
 <!-- Demo Data for Product -->
 	<record id="event_product_0" model="product.product">
 		<field name="list_price">68.00</field>
diff --git a/addons/event/security/event_security.xml b/addons/event/security/event_security.xml
index d98202c2aea..8aba5863e22 100644
--- a/addons/event/security/event_security.xml
+++ b/addons/event/security/event_security.xml
@@ -17,9 +17,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 name="groups_id" eval="[(4, ref('marketing.group_marketing_user')),(4, ref('base.group_sale_salesman'))]"/>
-     </record>
   </data>
 </openerp>
 
diff --git a/addons/hr/hr_demo.xml b/addons/hr/hr_demo.xml
index 0d41ff1a4c9..43bd88312f1 100644
--- a/addons/hr/hr_demo.xml
+++ b/addons/hr/hr_demo.xml
@@ -1,6 +1,9 @@
 <?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('base.group_hr_user'))]"/>
+        </record>
 
         <!-- Employee Category -->
 
diff --git a/addons/hr/security/hr_security.xml b/addons/hr/security/hr_security.xml
index b9df79abdd9..61aa5a93b12 100644
--- a/addons/hr/security/hr_security.xml
+++ b/addons/hr/security/hr_security.xml
@@ -9,8 +9,5 @@
     <record id="base.group_hr_user" model="res.groups">
         <field name="name">Human Resources / User</field>
     </record>
-	<record id="base.user_demo" model="res.users">
-            <field name="groups_id" eval="[(4, ref('base.group_hr_user'))]"/>
-     </record>
 </data>
 </openerp>
diff --git a/addons/idea/idea_data.xml b/addons/idea/idea_data.xml
index 6d5bda20de4..713ba4493f2 100644
--- a/addons/idea/idea_data.xml
+++ b/addons/idea/idea_data.xml
@@ -14,6 +14,10 @@
             <field name="category_id" ref="idea_category_general"/>
             <field name="visibility">True</field>
         </record>
+
+        <record id="base.user_demo" model="res.users">
+            <field name="groups_id" eval="[(4,ref('base.group_tool_user'))]"/> 
+        </record>
     </data>
 </openerp>
 
diff --git a/addons/idea/security/idea_security.xml b/addons/idea/security/idea_security.xml
index 40e16cc2b17..4b060c51e6c 100644
--- a/addons/idea/security/idea_security.xml
+++ b/addons/idea/security/idea_security.xml
@@ -8,10 +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 name="groups_id" eval="[(4,ref('base.group_tool_user'))]"/> 
-    </record>
 
 	</data>
 </openerp>
diff --git a/addons/knowledge/__openerp__.py b/addons/knowledge/__openerp__.py
index e56c35fdd66..58ccecfa375 100644
--- a/addons/knowledge/__openerp__.py
+++ b/addons/knowledge/__openerp__.py
@@ -35,7 +35,7 @@
         'knowledge_installer.xml',
         'knowledge_view.xml',
     ],
-    'demo_xml': [],
+    'demo_xml': ['knowledge_demo.xml'],
     'installable': True,
     'active': False,
 }
diff --git a/addons/knowledge/knowledge_demo.xml b/addons/knowledge/knowledge_demo.xml
new file mode 100644
index 00000000000..93b2413bbd2
--- /dev/null
+++ b/addons/knowledge/knowledge_demo.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data noupdate="0">
+        <record id="base.user_demo" model="res.users">
+                <field name="groups_id" eval="[(4,ref('base.group_document_user'))]"/> 
+        </record>
+</data>
+</openerp>
diff --git a/addons/knowledge/security/knowledge_security.xml b/addons/knowledge/security/knowledge_security.xml
index d0afba371a9..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 name="groups_id" eval="[(4,ref('base.group_document_user'))]"/> 
-            </record>
 
 </data>
 </openerp>
diff --git a/addons/lunch/lunch_demo.xml b/addons/lunch/lunch_demo.xml
index 30172b9e0a2..543086d6620 100644
--- a/addons/lunch/lunch_demo.xml
+++ b/addons/lunch/lunch_demo.xml
@@ -16,5 +16,10 @@
             <field name="name">Cashbox</field>
             <field name="manager" ref="base.user_root"/>
         </record>
+
+        <record id="base.user_demo" model="res.users">
+            <field name="groups_id" eval="[(4,ref('base.group_tool_user'))]"/> 
+        </record>
+
     </data>
 </openerp>
diff --git a/addons/lunch/security/lunch_security.xml b/addons/lunch/security/lunch_security.xml
index b4c184b3482..e042ac0c594 100644
--- a/addons/lunch/security/lunch_security.xml
+++ b/addons/lunch/security/lunch_security.xml
@@ -8,10 +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 name="groups_id" eval="[(4,ref('base.group_tool_user'))]"/> 
-    </record>
-
+    
 </data>
 </openerp>
diff --git a/addons/point_of_sale/point_of_sale_demo.xml b/addons/point_of_sale/point_of_sale_demo.xml
index aa76e3e9976..03d04d83f70 100644
--- a/addons/point_of_sale/point_of_sale_demo.xml
+++ b/addons/point_of_sale/point_of_sale_demo.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
-
+        <record id="base.user_demo" model="res.users">
+            <field name="groups_id" eval="[(4,ref('group_pos_user'))]"/>
+        </record>
     	<record id="account.cash_journal" model="account.journal">
             <field eval="[(6, 0, [ref('base.user_root')])]" name="journal_users"/>
         </record>
diff --git a/addons/point_of_sale/security/point_of_sale_security.xml b/addons/point_of_sale/security/point_of_sale_security.xml
index 56e92a468e7..9a90b4d4b6f 100644
--- a/addons/point_of_sale/security/point_of_sale_security.xml
+++ b/addons/point_of_sale/security/point_of_sale_security.xml
@@ -8,8 +8,5 @@
     <record id="group_pos_user" model="res.groups">
         <field name="name">Point of Sale / User</field>
     </record>
-	<record id="base.user_demo" model="res.users">
-            <field name="groups_id" eval="[(4,ref('group_pos_user'))]"/>
-     </record>
 </data>
 </openerp>
diff --git a/addons/project/project_demo.xml b/addons/project/project_demo.xml
index 3f2d9bad868..b0cfc8c716b 100644
--- a/addons/project/project_demo.xml
+++ b/addons/project/project_demo.xml
@@ -3,6 +3,9 @@
     <data noupdate="1">
 
          <!-- Users -->
+        <record id="base.user_demo" model="res.users">
+            <field name="groups_id" eval="[(4,ref('group_project_user'))]"/> 
+        </record>
 
         <record id="res_users_analyst" model="res.users">
             <field name="name">Phuong</field>
diff --git a/addons/project/security/project_security.xml b/addons/project/security/project_security.xml
index 8acdc210090..b51a5a9c89a 100644
--- a/addons/project/security/project_security.xml
+++ b/addons/project/security/project_security.xml
@@ -46,10 +46,5 @@
         <field name="domain_force">[(1,'=',1)]</field>
         <field name="groups" eval="[(4,ref('project.group_project_manager'))]"/>
     </record>
-    
-    <record id="base.user_demo" model="res.users">
-        <field name="groups_id" eval="[(4,ref('group_project_user'))]"/> 
-    </record>
-
 </data>
 </openerp>
diff --git a/addons/sale/sale_demo.xml b/addons/sale/sale_demo.xml
index a6cfc961600..e0ac09c7421 100644
--- a/addons/sale/sale_demo.xml
+++ b/addons/sale/sale_demo.xml
@@ -235,6 +235,8 @@ Returning customers (0.00) : 0.99'" name="pricelist_sale"/>
 One-shot customers (0.00) : 1.00
 Returning customers (0.00) : 0.99'" name="pricelist_sale"/>
     </record>
-    
+    <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
+</openerp>
diff --git a/addons/sale/security/sale_security.xml b/addons/sale/security/sale_security.xml
index 5d422a3b879..e4a8a880e9c 100644
--- a/addons/sale/security/sale_security.xml
+++ b/addons/sale/security/sale_security.xml
@@ -17,10 +17,6 @@
         <field eval="[(4, ref('base.group_sale_manager'))]" name="groups_id"/>
     </record>
 
-	<record id="base.user_demo" model="res.users">
-            <field eval="[(4, ref('base.group_sale_salesman'))]" name="groups_id"/>
-        </record>
-
     <record model="ir.rule" id="sale_order_comp_rule">
         <field name="name">Sale Order multi-company</field>
         <field name="model_id" ref="model_sale_order"/>
@@ -57,4 +53,4 @@
     </record>
 
 </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/survey/security/survey_security.xml b/addons/survey/security/survey_security.xml
index 598e3930f7f..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 name="groups_id" eval="[(4,ref('group_survey_user'))]"/> 
-    </record>
 
 </data>
 </openerp>
diff --git a/addons/survey/survey_demo.xml b/addons/survey/survey_demo.xml
index a4ae0d44be3..56e20746ac2 100644
--- a/addons/survey/survey_demo.xml
+++ b/addons/survey/survey_demo.xml
@@ -1,7 +1,9 @@
 <?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'))]"/> 
+        </record>
         <record model="survey.type" id="survey_type1">
             <field name="name">Human Resources</field>
             <field name="code">Human Resources</field>