From c44819e30650979975d83bf6358a1faaa610a707 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Aubort <jean-baptiste.aubort@camptocamp.com>
Date: Tue, 19 Aug 2008 10:54:12 +0200
Subject: [PATCH] Tweaks on base security

bzr revid: jean-baptiste.aubort@camptocamp.com-20080819085412-8781cwtd2k9jr15u
---
 bin/addons/base/__terp__.py          |  2 +-
 bin/addons/base/base_security.xml    | 62 +++++++++++-----------------
 bin/addons/base/ir/ir.xml            |  1 -
 bin/addons/base/res/res_security.xml | 37 ++++++++++++++---
 4 files changed, 55 insertions(+), 47 deletions(-)

diff --git a/bin/addons/base/__terp__.py b/bin/addons/base/__terp__.py
index 14c91fe7975..62a65f75174 100644
--- a/bin/addons/base/__terp__.py
+++ b/bin/addons/base/__terp__.py
@@ -48,9 +48,9 @@
 	],
 	"update_xml" : [
 		"base_update.xml",
-		"ir/ir.xml",
 		"ir/wizard/wizard_menu_view.xml",
 		"ir/workflow/workflow_view.xml",
+		"ir/ir.xml",
 		"res/ir_property_view.xml",
 		"res/partner/partner_report.xml",
 		"res/partner/partner_view.xml",
diff --git a/bin/addons/base/base_security.xml b/bin/addons/base/base_security.xml
index 7e573b5fecb..e4c9a121c2e 100644
--- a/bin/addons/base/base_security.xml
+++ b/bin/addons/base/base_security.xml
@@ -24,10 +24,6 @@
     <record model="res.groups" id="group_extended">
         <field name="name">Extended View</field>
     </record>
-    
-    <!--<record model="res.groups" id="group_partner">-->
-    <!--    <field name="name">Partner </field>-->
-    <!--</record>-->
 
 <!--
  Users
@@ -80,13 +76,7 @@
 
 <!--
  Objects Groups
--->
-    
-<!-- System -->
-    <!--<record model="ir.model" id=".model_ir_actions">-->
-    <!--    <field name="type">system</field>-->
-    <!--</record>-->
-    
+-->  
     <record model="ir.model" id="base.model_ir_act_report_custom">
         <field name="type">system</field>
     </record>
@@ -134,14 +124,6 @@
     <record model="ir.model" id="base.model_ir_report_custom_fields">
         <field name="type">system</field>
     </record>
-
-    <record model="ir.model" id="base.model_res_lang">
-        <field name="type">system</field>
-    </record>
-
-    <record model="ir.model" id="base.model_res_request">
-        <field name="type">system</field>
-    </record>
     
     <record model="ir.model" id="base.model_ir_sequence">
         <field name="type">system</field>
@@ -271,26 +253,6 @@
         <field name="type">system</field>
     </record>
     
-    <record model="ir.model" id="base.model_res_country">
-        <field name="type">system</field>
-    </record>
-    
-    <record model="ir.model" id="base.model_res_country_state">
-        <field name="type">system</field>
-    </record>
-    
-    <record model="ir.model" id="base.model_res_config_view">
-        <field name="type">system</field>
-    </record>
-    
-    <record model="ir.model" id="base.model_res_request_link">
-        <field name="type">system</field>
-    </record>
-    
-    <record model="ir.model" id="base.model_res_request_history">
-        <field name="type">system</field>
-    </record>
-    
     <record model="ir.model" id="base.model_ir_property">
         <field name="type">system</field>
     </record>
@@ -299,6 +261,28 @@
 <!--
  Access
 -->
+<!--Don't remove after-->
+    <record model="ir.model.access" id="access_ir_actions_employee">
+        <field name="name">ir.actions.actions Employee</field>
+        <field model="ir.model" name="model_id" search="[('model', '=', 'ir.actions.actions')]"/>
+        <field name="group_id" ref="group_employee"/>
+        <field name="perm_read" eval="1"/>
+        <field name="perm_write" eval="0"/>
+        <field name="perm_create" eval="0"/>
+        <field name="perm_unlink" eval="0"/>
+    </record>
+    
+    <record model="ir.model.access" id="access_ir_actions_act_window_employee">
+        <field name="name">ir.actions.act_window Employee</field>
+        <field model="ir.model" name="model_id" search="[('model', '=', 'ir.actions.act_window')]"/>
+        <field name="group_id" ref="group_employee"/>
+        <field name="perm_read" eval="1"/>
+        <field name="perm_write" eval="0"/>
+        <field name="perm_create" eval="0"/>
+        <field name="perm_unlink" eval="0"/>
+    </record>
+<!--Don't remove before-->
+
     <record model="ir.model.access" id="access_ir_act_window_group_employee">
         <field name="name">ir_act_window group_employee</field>
         <field name="model_id" model="ir.model" ref="model_ir_act_window"/>
diff --git a/bin/addons/base/ir/ir.xml b/bin/addons/base/ir/ir.xml
index 64f66cabc3a..b63ba6f71c2 100644
--- a/bin/addons/base/ir/ir.xml
+++ b/bin/addons/base/ir/ir.xml
@@ -643,7 +643,6 @@
             <tree string="Model Description">
                 <field name="name"/>
                 <field name="model"/>
-                <!--<field name="type"/>-->
             </tree>
         </field>
     </record>
diff --git a/bin/addons/base/res/res_security.xml b/bin/addons/base/res/res_security.xml
index cb2be2a3d71..639e24e69dc 100644
--- a/bin/addons/base/res/res_security.xml
+++ b/bin/addons/base/res/res_security.xml
@@ -20,21 +20,46 @@
 <!--
  Objects Groups
 -->
+    <record model="ir.model" id="base.model_res_lang">
+        <field name="type">base</field>
+    </record>
 
-<!-- System -->
+    <record model="ir.model" id="base.model_res_request">
+        <field name="type">base</field>
+    </record>
+    
     <record model="ir.model" id="base.model_res_users">
-        <field name="type">system</field>
+        <field name="type">base</field>
     </record>
     
     <record model="ir.model" id="base.model_res_groups">
-        <field name="type">system</field>
+        <field name="type">base</field>
     </record>
     
     <record model="ir.model" id="base.model_res_roles">
-        <field name="type">system</field>
+        <field name="type">base</field>
+    </record>
+    
+    <record model="ir.model" id="base.model_res_country_state">
+        <field name="type">base</field>
+    </record>
+    
+    <record model="ir.model" id="base.model_res_config_view">
+        <field name="type">base</field>
+    </record>
+    
+    <record model="ir.model" id="base.model_res_request_link">
+        <field name="type">base</field>
+    </record>
+    
+    <record model="ir.model" id="base.model_res_request_history">
+        <field name="type">base</field>
     </record>
 
-<!-- Base -->
+    <record model="ir.model" id="base.model_res_country">
+        <field name="type">base</field>
+    </record>
+    
     <record model="ir.model" id="base.model_res_bank">
         <field name="type">base</field>
     </record>
@@ -367,7 +392,7 @@
         <field name="model_id" model="ir.model" ref="model_res_users"/>
         <field name="group_id" ref="group_employee"/>
         <field name="perm_read" eval="1"/>
-        <field name="perm_write" eval="0"/>
+        <field name="perm_write" eval="1"/>
         <field name="perm_create" eval="0"/>
         <field name="perm_unlink" eval="0"/>
     </record>