From 986ac9207ab41d9aa73ddc82f8ab9bc71c6dd9a0 Mon Sep 17 00:00:00 2001
From: Aubort Jean-Baptiste <jean-baptiste.aubort@camptocamp.com>
Date: Wed, 23 Jul 2008 12:25:20 +0200
Subject: [PATCH] * Configuration wizard to define root password * Base
 security in XML * Group of objet

bzr revid: jean-baptiste.aubort@camptocamp.com-20080723102520-idmifh14v9dtt5s3
---
 bin/addons/base/base_security.xml | 1009 ++++++-----------------------
 bin/addons/base/ir/ir.xml         |    2 +
 bin/addons/base/ir/ir_model.py    |   88 ++-
 bin/addons/base/res/res_user.py   |  413 ++++++------
 4 files changed, 476 insertions(+), 1036 deletions(-)

diff --git a/bin/addons/base/base_security.xml b/bin/addons/base/base_security.xml
index 273058b6800..54547bdb8fb 100644
--- a/bin/addons/base/base_security.xml
+++ b/bin/addons/base/base_security.xml
@@ -2,37 +2,6 @@
 <terp>
 <data noupdate="1">
 
-<!--
- Groups
--->
-    <!--<record model="res.groups" id="group_admin">-->
-    <!--    <field name="name">Administrator</field>-->
-    <!--</record>-->
-    
-    <record model="res.groups" id="group_erp_manager">
-        <field name="name">ERP Manager</field>
-    </record>
-    
-    <record model="res.groups" id="group_employee">
-        <field name="name">Employee</field>
-    </record>
-
-    <record model="res.groups" id="group_res_config_view">
-        <field name="name">Res Config View</field>
-    </record>
-    
-    <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 Contact</field>
-    </record>
-
-    <record model="res.groups" id="group_partner_manager">
-        <field name="name">Partner Manager</field>
-    </record>
-
 <!--
  Users
 -->
@@ -45,836 +14,278 @@
     </record>
 
 <!--
- Tree
+ Redefine Root Password
 -->
-    <!--<record id="base.model_ir_act_report_custom" model="ir.model">-->
-    <!--    <field name="parent_id" search="[('model', '=', 'ir.actions.actions')]"/>-->
-    <!--</record>-->
-    <!---->
-    <!--<record id="base.model_ir_act_report_xml" model="ir.model">-->
-    <!--    <field name="parent_id" search="[('model', '=', 'ir.actions.actions')]"/>-->
-    <!--</record>-->
-    <!---->
-    <!--<record id="base.model_ir_sequence_type" model="ir.model">-->
-    <!--    <field name="parent_id" search="[('model', '=', 'ir.actions.actions')]"/>-->
-    <!--</record>-->
-    <!---->
-    <!--<record id="base.model_ir_act_report_custom" model="ir.model">-->
-    <!--    <field name="parent_id" search="[('model', '=', 'ir.actions.actions')]"/>-->
-    <!--</record>-->
-    <!---->
-    <!--<record id="base.model_ir_act_report_xml" model="ir.model">-->
-    <!--    <field name="parent_id" search="[('model', '=', 'ir.actions.actions')]"/>-->
-    <!--</record>-->
-    <!---->
-    <!--<record id="base.model_ir_act_wizard" model="ir.model">-->
-    <!--    <field name="parent_id" search="[('model', '=', 'ir.actions.actions')]"/>-->
-    <!--</record>-->
-    <!---->
-    <!--<record id="base.model_ir_act_url" model="ir.model">-->
-    <!--    <field name="parent_id" search="[('model', '=', 'ir.actions.actions')]"/>-->
-    <!--</record>-->
-    <!---->
-    <!--<record id="base.model_ir_act_server" model="ir.model">-->
-    <!--    <field name="parent_id" search="[('model', '=', 'ir.actions.actions')]"/>-->
-    <!--</record>-->
-    <!---->
-    <!--<record id="base.model_ir_act_window" model="ir.model">-->
-    <!--    <field name="parent_id" search="[('model', '=', 'ir.actions.actions')]"/>-->
-    <!--</record>-->
-    <!---->
-    <!--<record id="base.model_ir_act_window_view" model="ir.model">-->
-    <!--    <field name="parent_id" search="[('model', '=', 'ir.actions.act_window')]"/>-->
-    <!--</record>-->
-    <!---->
-    <!--<record id="base.model_ir_model_view" model="ir.model">-->
-    <!--    <field name="parent_id" search="[('model', '=', 'ir.model')]"/>-->
-    <!--</record>-->
-    <!---->
-    <!--<record id="base.model_ir_model_fields" model="ir.model">-->
-    <!--    <field name="parent_id" search="[('model', '=', 'ir.model')]"/>-->
-    <!--</record>-->
-    <!---->
-    <!--<record id="base.model_ir_model_access" model="ir.model">-->
-    <!--    <field name="parent_id" search="[('model', '=', 'ir.model')]"/>-->
-    <!--</record>-->
-    <!---->
-    <!--<record id="base.model_ir_model_data" model="ir.model">-->
-    <!--    <field name="parent_id" search="[('model', '=', 'ir.model')]"/>-->
-    <!--</record>-->
-    <!---->
-    <!--<record id="base.model_ir_exports_line" model="ir.model">-->
-    <!--    <field name="parent_id" search="[('model', '=', 'ir.exports')]"/>-->
-    <!--</record>-->
-    <!---->
-    <!--<record id="base.model_ir_module_category" model="ir.model">-->
-    <!--    <field name="parent_id" search="[('model', '=', 'ir.module.module')]"/>-->
-    <!--</record>-->
-    <!---->
-    <!--<record id="base.model_ir_module_module_configuration_step" model="ir.model">-->
-    <!--    <field name="parent_id" search="[('model', '=', 'ir.module.module')]"/>-->
-    <!--</record>-->
-    <!---->
-    <!--<record id="base.model_ir_module_module_configuration_wizard" model="ir.model">-->
-    <!--    <field name="parent_id" search="[('model', '=', 'ir.module.module')]"/>-->
-    <!--</record>-->
-    <!---->
-    <!--<record id="base.model_ir_module_module_dependency" model="ir.model">-->
-    <!--    <field name="parent_id" search="[('model', '=', 'ir.module.module')]"/>-->
-    <!--</record>-->
-    <!---->
-    <!--<record id="base.model_ir_module_repository" model="ir.model">-->
-    <!--    <field name="parent_id" search="[('model', '=', 'ir.module.module')]"/>-->
-    <!--</record>-->
-    <!---->
-    <!--<record id="base.model_ir_report_custom_fields" model="ir.model">-->
-    <!--    <field name="parent_id" search="[('model', '=', 'ir.report.custom')]"/>-->
-    <!--</record>-->
-    <!---->
-    <!--<record id="base.model_ir_rule_group" model="ir.model">-->
-    <!--    <field name="parent_id" search="[('model', '=', 'ir.rule')]"/>-->
-    <!--</record>-->
-    <!---->
-    <!--<record id="base.model_ir_ui_view_sc" model="ir.model">-->
-    <!--    <field name="parent_id" search="[('model', '=', 'ir.ui.view')]"/>-->
-    <!--</record>-->
-    <!---->
-    <!--<record id="base.model_res_partner_address" model="ir.model">-->
-    <!--    <field name="parent_id" search="[('model', '=', 'res.partner')]"/>-->
-    <!--</record>-->
-    <!---->
-    <!--<record id="base.model_res_partner_bank" model="ir.model">-->
-    <!--    <field name="parent_id" search="[('model', '=', 'res.partner')]"/>-->
-    <!--</record>-->
-    <!---->
-    <!--<record id="base.model_res_partner_bank_type" model="ir.model">-->
-    <!--    <field name="parent_id" search="[('model', '=', 'res.partner.bank')]"/>-->
-    <!--</record>-->
-    <!---->
-    <!--<record id="base.model_res_partner_bank_type_field" model="ir.model">-->
-    <!--    <field name="parent_id" search="[('model', '=', 'res.partner.bank.type')]"/>-->
-    <!--</record>-->
-    <!---->
-    <!--<record id="base.model_res_partner_canal" model="ir.model">-->
-    <!--    <field name="parent_id" search="[('model', '=', 'res.partner')]"/>-->
-    <!--</record>-->
-    <!---->
-    <!--<record id="base.model_res_partner_category" model="ir.model">-->
-    <!--    <field name="parent_id" search="[('model', '=', 'res.partner')]"/>-->
-    <!--</record>-->
-    <!---->
-    <!--<record id="base.model_res_partner_event" model="ir.model">-->
-    <!--    <field name="parent_id" search="[('model', '=', 'res.partner')]"/>-->
-    <!--</record>-->
-    <!---->
-    <!--<record id="base.model_res_partner_event_type" model="ir.model">-->
-    <!--    <field name="parent_id" search="[('model', '=', 'res.partner.event')]"/>-->
-    <!--</record>-->
-    <!---->
-    <!--<record id="base.model_res_partner_function" model="ir.model">-->
-    <!--    <field name="parent_id" search="[('model', '=', 'res.partner')]"/>-->
-    <!--</record>-->
-    <!---->
-    <!--<record id="base.model_res_partner_som" model="ir.model">-->
-    <!--    <field name="parent_id" search="[('model', '=', 'res.partner')]"/>-->
-    <!--</record>-->
-    <!---->
-    <!--<record id="base.model_res_partner_title" model="ir.model">-->
-    <!--    <field name="parent_id" search="[('model', '=', 'res.partner')]"/>-->
-    <!--</record>-->
-    <!---->
-    <!--<record id="base.model_res_request_history" model="ir.model">-->
-    <!--    <field name="parent_id" search="[('model', '=', 'res.request')]"/>-->
-    <!--</record>-->
-    <!---->
-    <!--<record id="base.model_res_request_link" model="ir.model">-->
-    <!--    <field name="parent_id" search="[('model', '=', 'res.request')]"/>-->
-    <!--</record>-->
-    <!---->
-    <!--<record id="base.model_wizard_ir_model_menu_create_line" model="ir.model">-->
-    <!--    <field name="parent_id" search="[('model', '=', 'wizard.ir.model.menu.create')]"/>-->
-    <!--</record>-->
-    <!---->
-    <!--<record id="base.model_wkf_activity" model="ir.model">-->
-    <!--    <field name="parent_id" search="[('model', '=', 'workflow')]"/>-->
-    <!--</record>-->
-    <!---->
-    <!--<record id="base.model_wkf_instance" model="ir.model">-->
-    <!--    <field name="parent_id" search="[('model', '=', 'workflow')]"/>-->
-    <!--</record>-->
-    <!---->
-    <!--<record id="base.model_wkf_transition" model="ir.model">-->
-    <!--    <field name="parent_id" search="[('model', '=', 'workflow')]"/>-->
-    <!--</record>-->
-    <!---->
-    <!--<record id="base.model_wkf_triggers" model="ir.model">-->
-    <!--    <field name="parent_id" search="[('model', '=', 'workflow')]"/>-->
-    <!--</record>-->
-    <!---->
-    <!--<record id="base.model_wkf_workitem" model="ir.model">-->
-    <!--    <field name="parent_id" search="[('model', '=', 'workflow')]"/>-->
-    <!--</record>-->
-    <!---->
-    <!--<record id="base.model_res_country_state" model="ir.model">-->
-    <!--    <field name="parent_id" search="[('model', '=', 'res.country')]"/>-->
-    <!--</record>-->
-    <!---->
-    <!--<record id="base.model_res_currency_rate" model="ir.model">-->
-    <!--    <field name="parent_id" search="[('model', '=', 'res.currency')]"/>-->
-    <!--</record>-->
+    <record id="view_config_root_pw" model="ir.ui.view">
+        <field name="name">Define password for Root user</field>
+        <field name="model">ir.model.security</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Define password for Root user">
+                <separator col="4" colspan="4" string="Set password to the root user"/>
+                <newline/>
+                <field name="password"/>
+                <group col="4" colspan="4">
+                    <button icon="gtk-cancel" name="action_cancel" type="object" string="Cancel" special="cancel"/>
+                    <button icon="gtk-ok" name="action_update_pw" type="object" string="Update"/>
+                </group>
+            </form>
+        </field>
+    </record>
+
+    <record id="action_config_root_pw" model="ir.actions.act_window">
+        <field name="name">Define password for Root user</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">ir.model.security</field>
+        <field name="view_type">form</field>
+        <field name="view_id" ref="view_config_root_pw"/>
+        <field name="target">new</field>
+     </record>
+
+    <record id="config_root_pw" model="ir.module.module.configuration.step">
+       <field name="name">Define password for Root user</field>
+       <field name="note">You must define a password for the root user !</field>
+       <field name="action_id" ref="action_config_root_pw"/>
+       <field name="state">open</field>
+    </record>
+
+<!--
+ Groups
+-->
+    <record model="res.groups" id="group_erp_manager">
+        <field name="name">ERP Manager</field>
+    </record>
     
+    <record model="res.groups" id="group_employee">
+        <field name="name">Employee</field>
+    </record>
     
+    <record model="res.groups" id="group_partner">
+        <field name="name">Partner </field>
+    </record>
+
+    <record model="res.groups" id="group_partner_manager">
+        <field name="name">Partner Manager</field>
+    </record>
     
-    
-    
-<!--    <record id="base.model_ir_act_report_custom" model="ir.model">-->
-<!--        <field name="parent_id" ref="base.model_ir_actions_actions"/>-->
-<!--    </record>-->
-<!---->
-<!--    <record id="base.model_ir_act_report_xml" model="ir.model">-->
-<!--        <field name="parent_id" ref="base.model_ir_actions_actions"/>-->
-<!--    </record>-->
-<!--    -->
-<!--    <record id="base.model_ir_sequence_type" model="ir.model">-->
-<!--        <field name="parent_id" ref="base.model_ir_actions_actions"/>-->
-<!--    </record>-->
-<!---->
-<!--    <record id="base.model_ir_act_report_custom" model="ir.model">-->
-<!--        <field name="parent_id" ref="base.model_ir_actions_actions"/>-->
-<!--    </record>-->
-<!---->
-<!--    <record id="base.model_ir_act_report_xml" model="ir.model">-->
-<!--        <field name="parent_id" ref="base.model_ir_actions_actions"/>-->
-<!--    </record>-->
-<!---->
-<!--    <record id="base.model_ir_act_wizard" model="ir.model">-->
-<!--        <field name="parent_id" ref="base.model_ir_actions_actions"/>-->
-<!--    </record>-->
-<!---->
-<!--    <record id="base.model_ir_act_url" model="ir.model">-->
-<!--        <field name="parent_id" ref="base.model_ir_actions_actions"/>-->
-<!--    </record>-->
-<!---->
-<!--    <record id="base.model_ir_act_server" model="ir.model">-->
-<!--        <field name="parent_id" ref="base.model_ir_actions_actions"/>-->
-<!--    </record>-->
-<!---->
-<!--    <record id="base.model_ir_act_window" model="ir.model">-->
-<!--        <field name="parent_id" ref="base.model_ir_actions_actions"/>-->
-<!--    </record>-->
-<!---->
-<!--    <record id="base.model_ir_act_window_view" model="ir.model">-->
-<!--        <field name="parent_id" ref="base.model_ir_actions_act_window"/>-->
-<!--    </record>-->
-<!---->
-<!--    <record id="base.model_ir_model_view" model="ir.model">-->
-<!--        <field name="parent_id" ref="base.model_ir_model"/>-->
-<!--    </record>-->
-<!---->
-<!--    <record id="base.model_ir_model_fields" model="ir.model">-->
-<!--        <field name="parent_id" ref="base.model_ir_model"/>-->
-<!--    </record>-->
-<!---->
-<!--    <record id="base.model_ir_model_access" model="ir.model">-->
-<!--        <field name="parent_id" ref="base.model_ir_model"/>-->
-<!--    </record>-->
-<!---->
-<!--    <record id="base.model_ir_model_data" model="ir.model">-->
-<!--        <field name="parent_id" ref="base.model_ir_model"/>-->
-<!--    </record>-->
-<!---->
-<!--    <record id="base.model_ir_exports_line" model="ir.model">-->
-<!--        <field name="parent_id" ref="base.model_ir_exports"/>-->
-<!--    </record>-->
-<!---->
-<!--    <record id="base.model_ir_module_category" model="ir.model">-->
-<!--        <field name="parent_id" ref="base.model_ir_module_module"/>-->
-<!--    </record>-->
-<!---->
-<!--    <record id="base.model_ir_module_module_configuration_step" model="ir.model">-->
-<!--        <field name="parent_id" ref="base.model_ir_module_module"/>-->
-<!--    </record>-->
-<!---->
-<!--    <record id="base.model_ir_module_module_configuration_wizard" model="ir.model">-->
-<!--        <field name="parent_id" ref="base.model_ir_module_module"/>-->
-<!--    </record>-->
-<!---->
-<!--    <record id="base.model_ir_module_module_dependency" model="ir.model">-->
-<!--        <field name="parent_id" ref="base.model_ir_module_module"/>-->
-<!--    </record>-->
-<!---->
-<!--    <record id="base.model_ir_module_repository" model="ir.model">-->
-<!--        <field name="parent_id" ref="base.model_ir_module_module"/>-->
-<!--    </record>-->
-<!---->
-<!--    <record id="base.model_ir_report_custom_fields" model="ir.model">-->
-<!--        <field name="parent_id" ref="base.model_ir_report_custom"/>-->
-<!--    </record>-->
-<!---->
-<!--    <record id="base.model_ir_rule_group" model="ir.model">-->
-<!--        <field name="parent_id" ref="base.model_ir_rule"/>-->
-<!--    </record>-->
-<!---->
-<!--    <record id="base.model_ir_ui_view_sc" model="ir.model">-->
-<!--        <field name="parent_id" ref="base.model_ir_ui_view"/>-->
-<!--    </record>-->
-<!---->
-<!--    <record id="base.model_res_partner_address" model="ir.model">-->
-<!--        <field name="parent_id" ref="base.model_res_partner"/>-->
-<!--    </record>-->
-<!---->
-<!--    <record id="base.model_res_partner_bank" model="ir.model">-->
-<!--        <field name="parent_id" ref="base.model_res_partner"/>-->
-<!--    </record>-->
-<!---->
-<!--    <record id="base.model_res_partner_bank_type" model="ir.model">-->
-<!--        <field name="parent_id" ref="base.model_res_partner_bank"/>-->
-<!--    </record>-->
-<!---->
-<!--    <record id="base.model_res_partner_bank_type_field" model="ir.model">-->
-<!--        <field name="parent_id" ref="base.model_res_partner_bank_type"/>-->
-<!--    </record>-->
-<!---->
-<!--    <record id="base.model_res_partner_canal" model="ir.model">-->
-<!--        <field name="parent_id" ref="base.model_res_partner"/>-->
-<!--    </record>-->
-<!---->
-<!--    <record id="base.model_res_partner_category" model="ir.model">-->
-<!--        <field name="parent_id" ref="base.model_res_partner"/>-->
-<!--    </record>-->
-<!---->
-<!--    <record id="base.model_res_partner_event" model="ir.model">-->
-<!--        <field name="parent_id" ref="base.model_res_partner"/>-->
-<!--    </record>-->
-<!---->
-<!--    <record id="base.model_res_partner_event_type" model="ir.model">-->
-<!--        <field name="parent_id" ref="base.model_res_partner_event"/>-->
-<!--    </record>-->
-<!---->
-<!--    <record id="base.model_res_partner_function" model="ir.model">-->
-<!--        <field name="parent_id" ref="base.model_res_partner"/>-->
-<!--    </record>-->
-<!---->
-<!--    <record id="base.model_res_partner_som" model="ir.model">-->
-<!--        <field name="parent_id" ref="base.model_res_partner"/>-->
-<!--    </record>-->
-<!---->
-<!--    <record id="base.model_res_partner_title" model="ir.model">-->
-<!--        <field name="parent_id" ref="base.model_res_partner"/>-->
-<!--    </record>-->
-<!---->
-<!--    <record id="base.model_res_request_history" model="ir.model">-->
-<!--        <field name="parent_id" ref="base.model_res_request"/>-->
-<!--    </record>-->
-<!---->
-<!--    <record id="base.model_res_request_link" model="ir.model">-->
-<!--        <field name="parent_id" ref="base.model_res_request"/>-->
-<!--    </record>-->
-<!---->
-<!--    <record id="base.model_wizard_ir_model_menu_create_line" model="ir.model">-->
-<!--        <field name="parent_id" ref="base.model_wizard_ir_model_menu_create"/>-->
-<!--    </record>-->
-<!---->
-<!--    <record id="base.model_wkf_activity" model="ir.model">-->
-<!--        <field name="parent_id" ref="base.model_workflow"/>-->
-<!--    </record>-->
-<!---->
-<!--    <record id="base.model_wkf_instance" model="ir.model">-->
-<!--        <field name="parent_id" ref="base.model_workflow"/>-->
-<!--    </record>-->
-<!---->
-<!--    <record id="base.model_wkf_transition" model="ir.model">-->
-<!--        <field name="parent_id" ref="base.model_workflow"/>-->
-<!--    </record>-->
-<!---->
-<!--    <record id="base.model_wkf_triggers" model="ir.model">-->
-<!--        <field name="parent_id" ref="base.model_workflow"/>-->
-<!--    </record>-->
-<!---->
-<!--    <record id="base.model_wkf_workitem" model="ir.model">-->
-<!--        <field name="parent_id" ref="base.model_workflow"/>-->
-<!--    </record>-->
-<!---->
-<!--    <record id="base.model_res_country_state" model="ir.model">-->
-<!--        <field name="parent_id" ref="base.model_res_country"/>-->
-<!--    </record>-->
-<!---->
-<!--    <record id="base.model_res_currency_rate" model="ir.model">-->
-<!--        <field name="parent_id" ref="base.model_res_currency"/>-->
-<!--    </record>-->
+    <record model="res.groups" id="group_extended">
+        <field name="name">Extended View</field>
+    </record>
 
 <!--
  Access
 -->
-    <record model="ir.model.access" id="access_values">
-        <field name="name">Ir Values</field>
-        <field name="model_id" model="ir.model" search="[('model', '=', 'ir.values')]"/>
+    <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="True"/>
-        <field name="perm_write" eval="False"/>
-        <field name="perm_create" eval="False"/>
-        <field name="perm_unlink" eval="False"/>
+        <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_values_admin">
-        <field name="name">Ir Values Admin</field>
-        <field name="model_id" model="ir.model" search="[('model', '=', 'ir.values')]"/>
-        <field name="group_id" ref="group_erp_manager"/>
-        <field name="perm_read" eval="True"/>
-        <field name="perm_write" eval="True"/>
-        <field name="perm_create" eval="True"/>
-        <field name="perm_unlink" eval="True"/>
-    </record>
-    
-    <record model="ir.model.access" id="access_view">
-        <field name="name">View</field>
-        <field name="model_id" model="ir.model" search="[('model', '=', 'ir.ui.view')]"/>
+    <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="True"/>
-        <field name="perm_write" eval="False"/>
-        <field name="perm_create" eval="False"/>
-        <field name="perm_unlink" eval="False"/>
+        <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_view_admin">
-        <field name="name">View Admin</field>
-        <field name="model_id" model="ir.model" search="[('model', '=', 'ir.ui.view')]"/>
-        <field name="group_id" ref="group_erp_manager"/>
-        <field name="perm_read" eval="True"/>
-        <field name="perm_write" eval="True"/>
-        <field name="perm_create" eval="True"/>
-        <field name="perm_unlink" eval="True"/>
-    </record>
-    
-    <record model="ir.model.access" id="access_ui_sc_employee">
-        <field name="name">UI Shortcut</field>
-        <field name="model_id" model="ir.model" search="[('model', '=', 'ir.ui.view_sc')]"/>
+    <record model="ir.model.access" id="access_ir_ui_view_employee">
+        <field name="name">ir.ui.view Employee</field>
+        <field model="ir.model" name="model_id" ref="model_ir_ui_view"/>
         <field name="group_id" ref="group_employee"/>
-        <field name="perm_read" eval="True"/>
-        <field name="perm_write" eval="False"/>
-        <field name="perm_create" eval="False"/>
-        <field name="perm_unlink" eval="False"/>
+        <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_ui_sc_admin">
-        <field name="name">UI Shortcut Admin</field>
-        <field name="model_id" model="ir.model" search="[('model', '=', 'ir.ui.view_sc')]"/>
-        <field name="group_id" ref="group_erp_manager"/>
-        <field name="perm_read" eval="True"/>
-        <field name="perm_write" eval="True"/>
-        <field name="perm_create" eval="True"/>
-        <field name="perm_unlink" eval="True"/>
-    </record>
-
-    <record model="ir.model.access" id="access_ir_ui_menu">
-        <field name="name">IR UI Menu</field>
-        <field name="model_id" model="ir.model" search="[('model', '=', 'ir.ui.menu')]"/>
+    <record model="ir.model.access" id="access_ir_ui_view_sc_employee">
+        <field name="name">ir.ui.view_sc Employee</field>
+        <field model="ir.model" name="model_id" ref="model_ir_ui_view_sc"/>
         <field name="group_id" ref="group_employee"/>
-        <field name="perm_read" eval="True"/>
-        <field name="perm_write" eval="False"/>
-        <field name="perm_create" eval="False"/>
-        <field name="perm_unlink" eval="False"/>
+        <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_ui_menu_erpmanager">
-        <field name="name">IR UI Menu Admin</field>
-        <field name="model_id" model="ir.model" search="[('model', '=', 'ir.ui.menu')]"/>
-        <field name="group_id" ref="group_erp_manager"/>
-        <field name="perm_read" eval="True"/>
-        <field name="perm_write" eval="True"/>
-        <field name="perm_create" eval="True"/>
-        <field name="perm_unlink" eval="True"/>
-    </record>
-    
-    <record model="ir.model.access" id="access_module">
-        <field name="name">Module</field>
-        <field name="model_id" model="ir.model" search="[('model', '=', 'ir.module.module')]"/>
+    <record model="ir.model.access" id="access_ir_ui_menu_employee">
+        <field name="name">ir.ui.menu Employee</field>
+        <field model="ir.model" name="model_id" ref="model_ir_ui_menu"/>
         <field name="group_id" ref="group_employee"/>
-        <field name="perm_read" eval="True"/>
-        <field name="perm_write" eval="False"/>
-        <field name="perm_create" eval="False"/>
-        <field name="perm_unlink" eval="False"/>
+        <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_module_admin">
-        <field name="name">Module Admin</field>
-        <field name="model_id" model="ir.model" search="[('model', '=', 'ir.module.module')]"/>
-        <field name="group_id" ref="group_erp_manager"/>
-        <field name="perm_read" eval="True"/>
-        <field name="perm_write" eval="True"/>
-        <field name="perm_create" eval="True"/>
-        <field name="perm_unlink" eval="True"/>
-    </record>
-    
-    <record model="ir.model.access" id="access_actions_employee">
-        <field name="name">Actions</field>
-        <field name="model_id" model="ir.model" search="[('model', '=', 'ir.actions.actions')]"/>
+    <record model="ir.model.access" id="access_res_users_employee">
+        <field name="name">res.users Employee</field>
+        <field model="ir.model" name="model_id" ref="model_res_users"/>
         <field name="group_id" ref="group_employee"/>
-        <field name="perm_read" eval="True"/>
-        <field name="perm_write" eval="False"/>
-        <field name="perm_create" eval="False"/>
-        <field name="perm_unlink" eval="False"/>
+        <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_actions_admin">
-        <field name="name">Actions Admin</field>
-        <field name="model_id" model="ir.model" search="[('model', '=', 'ir.actions.actions')]"/>
+    <record model="ir.model.access" id="access_res_users_erp_manager">
+        <field name="name">res.users ERP Manager</field>
+        <field model="ir.model" name="model_id" ref="model_res_users"/>
         <field name="group_id" ref="group_erp_manager"/>
-        <field name="perm_read" eval="True"/>
-        <field name="perm_write" eval="True"/>
-        <field name="perm_create" eval="True"/>
-        <field name="perm_unlink" eval="True"/>
-    </record>
-    
-    <record model="ir.model.access" id="access_res_groups_employee">
-        <field name="name">Groups</field>
-        <field name="model_id" model="ir.model" search="[('model', '=', 'res.groups')]"/>
-        <field name="group_id" ref="group_employee"/>
-        <field name="perm_read" eval="True"/>
-        <field name="perm_write" eval="False"/>
-        <field name="perm_create" eval="False"/>
-        <field name="perm_unlink" eval="False"/>
-    </record>
-    
-    <record model="ir.model.access" id="access_res_groups_admin">
-        <field name="name">Groups Admin</field>
-        <field name="model_id" model="ir.model" search="[('model', '=', 'res.groups')]"/>
-        <field name="group_id" ref="group_erp_manager"/>
-        <field name="perm_read" eval="True"/>
-        <field name="perm_write" eval="True"/>
-        <field name="perm_create" eval="True"/>
-        <field name="perm_unlink" eval="True"/>
-    </record>
-    
-    <record model="ir.model.access" id="access_res_roles_employee">
-        <field name="name">Roles</field>
-        <field name="model_id" model="ir.model" search="[('model', '=', 'res.roles')]"/>
-        <field name="group_id" ref="group_employee"/>
-        <field name="perm_read" eval="True"/>
-        <field name="perm_write" eval="False"/>
-        <field name="perm_create" eval="False"/>
-        <field name="perm_unlink" eval="False"/>
-    </record>
-    
-    <record model="ir.model.access" id="access_res_roles_admin">
-        <field name="name">Roles Admin</field>
-        <field name="model_id" model="ir.model" search="[('model', '=', 'res.roles')]"/>
-        <field name="group_id" ref="group_erp_manager"/>
-        <field name="perm_read" eval="True"/>
-        <field name="perm_write" eval="True"/>
-        <field name="perm_create" eval="True"/>
-        <field name="perm_unlink" eval="True"/>
+        <field name="perm_read" eval="1"/>
+        <field name="perm_write" eval="1"/>
+        <field name="perm_create" eval="1"/>
+        <field name="perm_unlink" eval="1"/>
     </record>
     
     <record model="ir.model.access" id="access_res_lang_employee">
-        <field name="name">Lang</field>
-        <field name="model_id" model="ir.model" search="[('model', '=', 'res.lang')]"/>
+        <field name="name">res.lang Employee</field>
+        <field model="ir.model" name="model_id" ref="model_res_lang"/>
         <field name="group_id" ref="group_employee"/>
-        <field name="perm_read" eval="True"/>
-        <field name="perm_write" eval="False"/>
-        <field name="perm_create" eval="False"/>
-        <field name="perm_unlink" eval="False"/>
+        <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_res_lang_admin">
-        <field name="name">Lang Admin</field>
-        <field name="model_id" model="ir.model" search="[('model', '=', 'res.lang')]"/>
-        <field name="group_id" ref="group_erp_manager"/>
-        <field name="perm_read" eval="True"/>
-        <field name="perm_write" eval="True"/>
-        <field name="perm_create" eval="True"/>
-        <field name="perm_unlink" eval="True"/>
+    <record model="ir.model.access" id="access_res_bank_account_type_manager">
+        <field name="name">Bank Account Type Partner Manager</field>
+        <field model="ir.model" name="model_id" ref="model_res_partner_bank_type"/>
+        <field name="group_id" ref="group_partner_manager"/>
+        <field name="perm_read" eval="1"/>
+        <field name="perm_write" eval="1"/>
+        <field name="perm_create" eval="1"/>
+        <field name="perm_unlink" eval="1"/>
     </record>
     
-    <record model="ir.model.access" id="access_res_country_employee">
-        <field name="name">Country</field>
-        <field name="model_id" model="ir.model" search="[('model', '=', 'res.country')]"/>
-        <field name="group_id" ref="group_employee"/>
-        <field name="perm_read" eval="True"/>
-        <field name="perm_write" eval="False"/>
-        <field name="perm_create" eval="False"/>
-        <field name="perm_unlink" eval="False"/>
+    <record model="ir.model.access" id="access_res_bank_type_fields_manager">
+        <field name="name">Bank type fields Partner Manager</field>
+        <field model="ir.model" name="model_id" ref="model_res_partner_bank_type_field"/>
+        <field name="group_id" ref="group_partner_manager"/>
+        <field name="perm_read" eval="1"/>
+        <field name="perm_write" eval="1"/>
+        <field name="perm_create" eval="1"/>
+        <field name="perm_unlink" eval="1"/>
     </record>
     
-    <record model="ir.model.access" id="access_res_country_admin">
-        <field name="name">Country Admin</field>
-        <field name="model_id" model="ir.model" search="[('model', '=', 'res.country')]"/>
-        <field name="group_id" ref="group_erp_manager"/>
-        <field name="perm_read" eval="True"/>
-        <field name="perm_write" eval="True"/>
-        <field name="perm_create" eval="True"/>
-        <field name="perm_unlink" eval="True"/>
+    <record model="ir.model.access" id="access_res_bank_accounts_managere">
+        <field name="name">Bank Accounts Partner Manager</field>
+        <field model="ir.model" name="model_id" ref="model_res_partner_bank"/>
+        <field name="group_id" ref="group_partner_manager"/>
+        <field name="perm_read" eval="1"/>
+        <field name="perm_write" eval="1"/>
+        <field name="perm_create" eval="1"/>
+        <field name="perm_unlink" eval="1"/>
     </record>
     
-    <record model="ir.model.access" id="access_res_currency_employee">
-        <field name="name">Currency</field>
-        <field name="model_id" model="ir.model" search="[('model', '=', 'res.currency')]"/>
-        <field name="group_id" ref="group_employee"/>
-        <field name="perm_read" eval="True"/>
-        <field name="perm_write" eval="False"/>
-        <field name="perm_create" eval="False"/>
-        <field name="perm_unlink" eval="False"/>
+    <record model="ir.model.access" id="access_res_partner_manager">
+        <field name="name">Partner Partner Manager</field>
+        <field model="ir.model" name="model_id" ref="model_res_partner"/>
+        <field name="group_id" ref="group_partner_manager"/>
+        <field name="perm_read" eval="1"/>
+        <field name="perm_write" eval="1"/>
+        <field name="perm_create" eval="1"/>
+        <field name="perm_unlink" eval="1"/>
     </record>
     
-    <record model="ir.model.access" id="access_res_currency_admin">
-        <field name="name">Currency Admin</field>
-        <field name="model_id" model="ir.model" search="[('model', '=', 'res.currency')]"/>
-        <field name="group_id" ref="group_erp_manager"/>
-        <field name="perm_read" eval="True"/>
-        <field name="perm_write" eval="True"/>
-        <field name="perm_create" eval="True"/>
-        <field name="perm_unlink" eval="True"/>
+    <record model="ir.model.access" id="access_res_partner_channels_manager">
+        <field name="name">Channels Partner Manager</field>
+        <field model="ir.model" name="model_id" ref="model_res_partner_canal"/>
+        <field name="group_id" ref="group_partner_manager"/>
+        <field name="perm_read" eval="1"/>
+        <field name="perm_write" eval="1"/>
+        <field name="perm_create" eval="1"/>
+        <field name="perm_unlink" eval="1"/>
     </record>
     
-    <record model="ir.model.access" id="access_res_company_employee">
-        <field name="name">Company</field>
-        <field name="model_id" model="ir.model" search="[('model', '=', 'res.company')]"/>
-        <field name="group_id" ref="group_employee"/>
-        <field name="perm_read" eval="True"/>
-        <field name="perm_write" eval="False"/>
-        <field name="perm_create" eval="False"/>
-        <field name="perm_unlink" eval="False"/>
+    <record model="ir.model.access" id="access_res_partner_som_manager">
+        <field name="name">model_res_partner.som Partner Manager</field>
+        <field model="ir.model" name="model_id" ref="model_res_partner_som"/>
+        <field name="group_id" ref="group_partner_manager"/>
+        <field name="perm_read" eval="1"/>
+        <field name="perm_write" eval="1"/>
+        <field name="perm_create" eval="1"/>
+        <field name="perm_unlink" eval="1"/>
     </record>
     
-    <record model="ir.model.access" id="access_res_company_admin">
-        <field name="name">Company Admin</field>
-        <field name="model_id" model="ir.model" search="[('model', '=', 'res.company')]"/>
-        <field name="group_id" ref="group_erp_manager"/>
-        <field name="perm_read" eval="True"/>
-        <field name="perm_write" eval="True"/>
-        <field name="perm_create" eval="True"/>
-        <field name="perm_unlink" eval="True"/>
+    <record model="ir.model.access" id="access_res_partner_event_manager">
+        <field name="name">model_res_partner.event Partner Manager</field>
+        <field model="ir.model" name="model_id" ref="model_res_partner_event"/>
+        <field name="group_id" ref="group_partner_manager"/>
+        <field name="perm_read" eval="1"/>
+        <field name="perm_write" eval="1"/>
+        <field name="perm_create" eval="1"/>
+        <field name="perm_unlink" eval="1"/>
     </record>
     
-    <record model="ir.model.access" id="access_res_users_employee">
-        <field name="name">Users</field>
-        <field name="model_id" model="ir.model" search="[('model', '=', 'res.users')]"/>
-        <field name="group_id" ref="group_employee"/>
-        <field name="perm_read" eval="True"/>
-        <field name="perm_write" eval="False"/>
-        <field name="perm_create" eval="False"/>
-        <field name="perm_unlink" eval="False"/>
+    <record model="ir.model.access" id="access_res_partner_function_manager">
+        <field name="name">Function of the contact Partner Manager</field>
+        <field model="ir.model" name="model_id" ref="model_res_partner_function"/>
+        <field name="group_id" ref="group_partner_manager"/>
+        <field name="perm_read" eval="1"/>
+        <field name="perm_write" eval="1"/>
+        <field name="perm_create" eval="1"/>
+        <field name="perm_unlink" eval="1"/>
     </record>
     
-    <record model="ir.model.access" id="access_res_users_admin">
-        <field name="name">Users Admin</field>
-        <field name="model_id" model="ir.model" search="[('model', '=', 'res.users')]"/>
-        <field name="group_id" ref="group_erp_manager"/>
-        <field name="perm_read" eval="True"/>
-        <field name="perm_write" eval="True"/>
-        <field name="perm_create" eval="True"/>
-        <field name="perm_unlink" eval="True"/>
+    <record model="ir.model.access" id="access_res_partner_categories_manager">
+        <field name="name">Partner Categories Partner Manager</field>
+        <field model="ir.model" name="model_id" ref="model_res_partner_category"/>
+        <field name="group_id" ref="group_partner_manager"/>
+        <field name="perm_read" eval="1"/>
+        <field name="perm_write" eval="1"/>
+        <field name="perm_create" eval="1"/>
+        <field name="perm_unlink" eval="1"/>
     </record>
     
-    <record model="ir.model.access" id="access_cron_employee">
-        <field name="name">Cron</field>
-        <field name="model_id" model="ir.model" search="[('model', '=', 'ir.cron')]"/>
-        <field name="group_id" ref="group_employee"/>
-        <field name="perm_read" eval="True"/>
-        <field name="perm_write" eval="False"/>
-        <field name="perm_create" eval="False"/>
-        <field name="perm_unlink" eval="False"/>
+    <record model="ir.model.access" id="access_res_partner_title_manager">
+        <field name="name">model_res_partner.title Partner Manager</field>
+        <field model="ir.model" name="model_id" ref="model_res_partner_title"/>
+        <field name="group_id" ref="group_partner_manager"/>
+        <field name="perm_read" eval="1"/>
+        <field name="perm_write" eval="1"/>
+        <field name="perm_create" eval="1"/>
+        <field name="perm_unlink" eval="1"/>
     </record>
     
-    <record model="ir.model.access" id="access_cron_admin">
-        <field name="name">Cron Admin</field>
-        <field name="model_id" model="ir.model" search="[('model', '=', 'ir.cron')]"/>
-        <field name="group_id" ref="group_erp_manager"/>
-        <field name="perm_read" eval="True"/>
-        <field name="perm_write" eval="True"/>
-        <field name="perm_create" eval="True"/>
-        <field name="perm_unlink" eval="True"/>
+    <record model="ir.model.access" id="access_res_parnter_events_manager">
+        <field name="name">Partner Events Partner Manager</field>
+        <field model="ir.model" name="model_id" ref="model_res_partner_event_type"/>
+        <field name="group_id" ref="group_partner_manager"/>
+        <field name="perm_read" eval="1"/>
+        <field name="perm_write" eval="1"/>
+        <field name="perm_create" eval="1"/>
+        <field name="perm_unlink" eval="1"/>
     </record>
     
-    <record model="ir.model.access" id="access_model_employee">
-        <field name="name">Model</field>
-        <field name="model_id" model="ir.model" search="[('model', '=', 'ir.model')]"/>
-        <field name="group_id" ref="group_employee"/>
-        <field name="perm_read" eval="True"/>
-        <field name="perm_write" eval="False"/>
-        <field name="perm_create" eval="False"/>
-        <field name="perm_unlink" eval="False"/>
-    </record>
-    
-    <record model="ir.model.access" id="access_model_admin">
-        <field name="name">Model Admin</field>
-        <field name="model_id" model="ir.model" search="[('model', '=', 'ir.model')]"/>
-        <field name="group_id" ref="group_erp_manager"/>
-        <field name="perm_read" eval="True"/>
-        <field name="perm_write" eval="True"/>
-        <field name="perm_create" eval="True"/>
-        <field name="perm_unlink" eval="True"/>
-    </record>
-    
-    <record model="ir.model.access" id="access_report_custom_employee">
-        <field name="name">Report Custom</field>
-        <field name="model_id" model="ir.model" search="[('model', '=', 'ir.report.custom')]"/>
-        <field name="group_id" ref="group_employee"/>
-        <field name="perm_read" eval="True"/>
-        <field name="perm_write" eval="False"/>
-        <field name="perm_create" eval="False"/>
-        <field name="perm_unlink" eval="False"/>
-    </record>
-    
-    <record model="ir.model.access" id="access_report_custom_admin">
-        <field name="name">Report Custom Admin</field>
-        <field name="model_id" model="ir.model" search="[('model', '=', 'ir.report.custom')]"/>
-        <field name="group_id" ref="group_erp_manager"/>
-        <field name="perm_read" eval="True"/>
-        <field name="perm_write" eval="True"/>
-        <field name="perm_create" eval="True"/>
-        <field name="perm_unlink" eval="True"/>
-    </record>
-    
-    <record model="ir.model.access" id="access_rule_employee">
-        <field name="name">Rule</field>
-        <field name="model_id" model="ir.model" search="[('model', '=', 'ir.rule')]"/>
-        <field name="group_id" ref="group_employee"/>
-        <field name="perm_read" eval="True"/>
-        <field name="perm_write" eval="False"/>
-        <field name="perm_create" eval="False"/>
-        <field name="perm_unlink" eval="False"/>
-    </record>
-    
-    <record model="ir.model.access" id="access_rule_admin">
-        <field name="name">Rule Admin</field>
-        <field name="model_id" model="ir.model" search="[('model', '=', 'ir.rule')]"/>
-        <field name="group_id" ref="group_erp_manager"/>
-        <field name="perm_read" eval="True"/>
-        <field name="perm_write" eval="True"/>
-        <field name="perm_create" eval="True"/>
-        <field name="perm_unlink" eval="True"/>
-    </record>
-    
-    <record model="ir.model.access" id="access_sequence_employee">
-        <field name="name">Sequence</field>
-        <field name="model_id" model="ir.model" search="[('model', '=', 'ir.sequence')]"/>
-        <field name="group_id" ref="group_employee"/>
-        <field name="perm_read" eval="True"/>
-        <field name="perm_write" eval="False"/>
-        <field name="perm_create" eval="False"/>
-        <field name="perm_unlink" eval="False"/>
-    </record>
-    
-    <record model="ir.model.access" id="access_sequence_admin">
-        <field name="name">Sequence Admin</field>
-        <field name="model_id" model="ir.model" search="[('model', '=', 'ir.sequence')]"/>
-        <field name="group_id" ref="group_erp_manager"/>
-        <field name="perm_read" eval="True"/>
-        <field name="perm_write" eval="True"/>
-        <field name="perm_create" eval="True"/>
-        <field name="perm_unlink" eval="True"/>
-    </record>
-    
-    <record model="ir.model.access" id="access_workflow_employee">
-        <field name="name">Workflow</field>
-        <field name="model_id" model="ir.model" search="[('model', '=', 'workflow')]"/>
-        <field name="group_id" ref="group_employee"/>
-        <field name="perm_read" eval="True"/>
-        <field name="perm_write" eval="False"/>
-        <field name="perm_create" eval="False"/>
-        <field name="perm_unlink" eval="False"/>
-    </record>
-    
-    <record model="ir.model.access" id="access_workflow_admin">
-        <field name="name">Workflow Admin</field>
-        <field name="model_id" model="ir.model" search="[('model', '=', 'workflow')]"/>
-        <field name="group_id" ref="group_erp_manager"/>
-        <field name="perm_read" eval="True"/>
-        <field name="perm_write" eval="True"/>
-        <field name="perm_create" eval="True"/>
-        <field name="perm_unlink" eval="True"/>
-    </record>
-    
-    <record model="ir.model.access" id="access_res_partner_employee">
-        <field name="name">Res Partner Employee</field>
-        <field name="model_id" model="ir.model" search="[('model', '=', 'res.partner')]"/>
-        <field name="group_id" ref="group_employee"/>
-        <field name="perm_read" eval="True"/>
-        <field name="perm_write" eval="False"/>
-        <field name="perm_create" eval="False"/>
-        <field name="perm_unlink" eval="False"/>
+    <record model="ir.model.access" id="access_res_partner_contact_manager">
+        <field name="name">Partner Contact Partner Manager</field>
+        <field model="ir.model" name="model_id" ref="model_res_partner_address"/>
+        <field name="group_id" ref="group_partner_manager"/>
+        <field name="perm_read" eval="1"/>
+        <field name="perm_write" eval="1"/>
+        <field name="perm_create" eval="1"/>
+        <field name="perm_unlink" eval="1"/>
     </record>
     
     <record model="ir.model.access" id="access_res_partner">
-        <field name="name">Res Partner User</field>
-        <field name="model_id" model="ir.model" search="[('model', '=', 'res.partner')]"/>
+        <field name="name">Partner Partner</field>
+        <field model="ir.model" name="model_id" ref="model_res_partner"/>
         <field name="group_id" ref="group_partner"/>
-        <field name="perm_read" eval="True"/>
-        <field name="perm_write" eval="True"/>
-        <field name="perm_create" eval="True"/>
-        <field name="perm_unlink" eval="True"/>
-    </record>
-    
-    <record model="ir.model.access" id="access_res_partner_admin">
-        <field name="name">Res Partner Admin</field>
-        <field name="model_id" model="ir.model" search="[('model', '=', 'res.partner')]"/>
-        <field name="group_id" ref="group_partner_manager"/>
-        <field name="perm_read" eval="True"/>
-        <field name="perm_write" eval="True"/>
-        <field name="perm_create" eval="True"/>
-        <field name="perm_unlink" eval="True"/>
-    </record>
-    
-    <record model="ir.model.access" id="access_res_request">
-        <field name="name">Res Partner User</field>
-        <field name="model_id" model="ir.model" search="[('model', '=', 'res.request')]"/>
-        <field name="group_id" ref="group_employee"/>
-        <field name="perm_read" eval="True"/>
-        <field name="perm_write" eval="False"/>
-        <field name="perm_create" eval="True"/>
-        <field name="perm_unlink" eval="True"/>
-    </record>
-    
-    <record model="ir.model.access" id="access_res_request_admin">
-        <field name="name">Res Partner Admin</field>
-        <field name="model_id" model="ir.model" search="[('model', '=', 'res.request')]"/>
-        <field name="group_id" ref="group_erp_manager"/>
-        <field name="perm_read" eval="True"/>
-        <field name="perm_write" eval="True"/>
-        <field name="perm_create" eval="True"/>
-        <field name="perm_unlink" eval="True"/>
-    </record>
-    
-    <record model="ir.model.access" id="access_res_config_view">
-        <field name="name">Res Config View Admin</field>
-        <field name="model_id" model="ir.model" search="[('model', '=', 'res.config.view')]"/>
-        <field name="group_id" ref="group_erp_manager"/>
-        <field name="perm_read" eval="True"/>
-        <field name="perm_write" eval="True"/>
-        <field name="perm_create" eval="True"/>
-        <field name="perm_unlink" eval="True"/>
+        <field name="perm_read" eval="1"/>
+        <field name="perm_write" eval="1"/>
+        <field name="perm_create" eval="1"/>
+        <field name="perm_unlink" eval="1"/>
     </record>
 
-    <record model="ir.model.access" id="access_res_users_employee">
-        <field name="name">Res Users</field>
-        <field name="model_id" model="ir.model" search="[('model', '=', 'res.users')]"/>
-        <field name="group_id" ref="group_employee"/>
-        <field name="perm_read" eval="True"/>
-        <field name="perm_write" eval="False"/>
-        <field name="perm_create" eval="False"/>
-        <field name="perm_unlink" eval="False"/>
-    </record>
-    
-    <record model="ir.model.access" id="access_res_users_manager">
-        <field name="name">Res Users Manager</field>
-        <field name="model_id" model="ir.model" search="[('model', '=', 'res.users')]"/>
-        <field name="group_id" ref="group_erp_manager"/>
-        <field name="perm_read" eval="True"/>
-        <field name="perm_write" eval="True"/>
-        <field name="perm_create" eval="True"/>
-        <field name="perm_unlink" eval="True"/>
-    </record>
 
-    <record model="ir.model.access" id="access_ir_property">
-        <field name="name">IR Property</field>
-        <field name="model_id" model="ir.model" search="[('model', '=', 'ir.property')]"/>
-        <field name="group_id" ref="group_employee"/>
-        <field name="perm_read" eval="True"/>
-        <field name="perm_write" eval="True"/>
-        <field name="perm_create" eval="True"/>
-        <field name="perm_unlink" eval="True"/>
-    </record>
 
 </data>
 </terp>
diff --git a/bin/addons/base/ir/ir.xml b/bin/addons/base/ir/ir.xml
index a421f2e9d40..0f2e8ec2b08 100644
--- a/bin/addons/base/ir/ir.xml
+++ b/bin/addons/base/ir/ir.xml
@@ -620,6 +620,7 @@
                         <page string="Object">
                             <field name="name" select="1"/>
                             <field name="model" select="1"/>
+                            <field name="type_id" select="1"/>
                             <separator colspan="4" string="Fields"/>
                             <field colspan="4" context="{'manual':True}" name="field_id" nolabel="1">
                                 <tree string="Fields Description">
@@ -672,6 +673,7 @@
                 <tree string="Model Description">
                     <field name="name"/>
                     <field name="model"/>
+                    <field name="type_id"/>
                 </tree>
             </field>
         </record>
diff --git a/bin/addons/base/ir/ir_model.py b/bin/addons/base/ir/ir_model.py
index 30e106b4a5f..991550602cd 100644
--- a/bin/addons/base/ir/ir_model.py
+++ b/bin/addons/base/ir/ir_model.py
@@ -43,13 +43,13 @@ def _get_fields_type(self, cr, uid, context=None):
     return cr.fetchall()
 
 
-class ir_model_type(osv.osv):
-    _name = 'ir.model.type'
-    _columns = {
-        'name': fields.char('Name', size=64, required=True),
-        #'model_id': fields.many2one('ir.model', 'Models'),
-    }
-ir_model_type()
+#class ir_model_type(osv.osv):
+#    _name = 'ir.model.type'
+#    _columns = {
+#        'name': fields.char('Name', size=64, required=True),
+#        'model_id': fields.one2many('ir.model', 'type_id', 'Models'),
+#    }
+#ir_model_type()
 
 class ir_model(osv.osv):
     _name = 'ir.model'
@@ -60,8 +60,8 @@ class ir_model(osv.osv):
         'model': fields.char('Object Name', size=64, required=True, search=1),
         'info': fields.text('Information'),
         'field_id': fields.one2many('ir.model.fields', 'model_id', 'Fields', required=True),
-        #'type_id': fields.one2many('ir.model.type', 'model_id', 'Type'),
-        #'type_id': fields.many2many('ir.model.type', 'ir_model_type_rel', 'model_id', 'type_id', 'Types'),
+        #'type_id': fields.many2one('ir.model.type', 'Type'),
+        'type_id': fields.selection([('system','System'),('base','Base'),('addons','Addons')],'Type'),
         'state': fields.selection([('manual','Custom Object'),('base','Base Field')],'Manualy Created',readonly=1),
     }
     _defaults = {
@@ -98,19 +98,21 @@ class ir_model(osv.osv):
         #TODO Advanced
         for model in self.browse(cr, user, ids, context):
             if model.state <> 'manual':
-                raise except_orm(_('Error'), _("You can not remove the model '%s' !") %(field.name,))
+                raise except_orm(_('Error'), _("You can not remove the model '%s' !") %(model.name,))
         res = super(ir_model, self).unlink(cr, user, ids, context)
         pooler.restart_pool(cr.dbname)
         return res
 
     def create(self, cr, user, vals, context=None):
-        #TODO Advanced
-        if context and context.get('manual',False):
-            vals['state']='manual'
-        res = super(ir_model,self).create(cr, user, vals, context)
-        if vals.get('state','base')=='manual':
-            pooler.restart_pool(cr.dbname)
-        return res
+        if 'advanced' in context:
+            raise osv.except_osv('Error !', 'You cannot add an entry to this view !')
+        else:
+            if context.get('manual',False):
+                vals['state']='manual'
+            res = super(ir_model,self).create(cr, user, vals, context)
+            if vals.get('state','base')=='manual':
+                pooler.restart_pool(cr.dbname)
+            return res
     
     def read(self, cr, user, ids, fields=None, context=None, load='_classic_read'):
         result = super(osv.osv, self).read(cr, user, ids, fields, context, load)
@@ -133,14 +135,14 @@ class ir_model(osv.osv):
         return result
 
     def write(self, cr, user, ids, vals, context=None):
+        vals_new = vals.copy()
         if 'advanced' in context:
             perms_rel = ['create','read','unlink','write']
             perms_all = ['c','r','u','w']
             perms = []
-            vals_new = vals.copy()
             
             for val in vals:
-                if val[:6]=='group_':
+                if len(val)>5 and val[:6]=='group_':
                     #Values
                     group_id = int(val[6:])
                     model_id = ids[0]
@@ -152,15 +154,11 @@ class ir_model(osv.osv):
                         if perm not in perms_all:
                             model_name = self.pool.get('ir.model').browse(cr, user, [model_id])[0].model
                             group_name = self.pool.get('res.groups').browse(cr, user, [group_id])[0].name
-                            raise osv.except_osv('Error !', 'There is an invalid rule in "%s" for "Group %s". Valid rules are:\r\tc=create\r\tr=read\r\tu=unlink\r\tw=write\rYou must separate them by a coma, example: r,w'%(model_name, group_name))
+                            raise osv.except_osv('Error !', _('There is an invalid rule in "%s" for "Group %s". Valid rules are:\r\tc=create\r\tr=read\r\tu=unlink\r\tw=write\rYou must separate them by a coma, example: r,w')%(model_name, group_name))
                     
                     #Assign rights
                     req = {}
                     for i,perm in enumerate(perms_all):
-                        #if perm in perms:
-                        #    req['perm_%s'%perms_rel[i]] = True
-                        #else:
-                        #    req['perm_%s'%perms_rel[i]] = False
                         req['perm_%s'%perms_rel[i]] = perm in perms and 'True' or 'False'
                     
                     #Apply rule
@@ -190,25 +188,15 @@ class ir_model(osv.osv):
                 result['group_%i'%group.id] = {'string': 'Group %s'%group.name,'type': 'char','size': 7}
         return result
     
-    def on_change_write(self, cr, user, ids, vals, context=None):
-        print 'prout'
-    
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context={}, toolbar=False):
         result = super(osv.osv, self).fields_view_get(cr, uid, view_id,view_type,context)
         if view_type=='tree' and 'advanced' in context:
             groups = self.pool.get('res.groups').search(cr, uid, [])
             groups_br = self.pool.get('res.groups').browse(cr, uid, groups)
             
-            #state = ''
-            #TODO: qqch du genre si un object n'a pas de secu
-            #for field in journal.view_id.columns_id:
-            #    if field.field=='state':
-            #        state = ' colors="red:state==\'draft\'"'
-            
             cols = ['model']
             xml = '''<?xml version="1.0"?><tree editable="top"><field name="model" readonly="1"/>'''
             for group in groups_br:
-                #xml += '''<field name="group_%i" sum="%s" on_change="on_change_write()"/>''' % (group.id, group.name) #TODO: on_change
                 xml += '''<field name="group_%i" sum="%s"/>''' % (group.id, group.name)
             xml += '''</tree>'''
             
@@ -538,3 +526,35 @@ class ir_model_data(osv.osv):
         return True
 ir_model_data()
 
+
+
+class ir_model_security(osv.osv):
+    _name = 'ir.model.security'
+    _columns = {
+        'password': fields.char('Password', size=64, invisible=True),
+    }
+
+    def action_cancel(self, cr, uid, ids, context={}):
+        return {
+            'view_type': 'form',
+            "view_mode": 'form',
+            'res_model': 'ir.module.module.configuration.wizard',
+            'type': 'ir.actions.act_window',
+            'target':'new',
+        }
+    
+    def action_update_pw(self, cr, uid, ids, context={}):
+        from pprint import pprint
+        res = self.read(cr,uid,ids)[0]
+        root = self.pool.get('res.users').browse(cr, uid, [1])[0]
+        self.unlink(cr, uid, [res['id']])
+        self.pool.get('res.users').write(cr, uid, [root.id], {'password':res['password']})
+        return {
+            'view_type': 'form',
+            "view_mode": 'form',
+            'res_model': 'ir.module.module.configuration.wizard',
+            'type': 'ir.actions.act_window',
+            'target':'new',
+        }
+ir_model_security()
+
diff --git a/bin/addons/base/res/res_user.py b/bin/addons/base/res/res_user.py
index 24e16e6a03a..8cf25c21cf3 100644
--- a/bin/addons/base/res/res_user.py
+++ b/bin/addons/base/res/res_user.py
@@ -32,244 +32,251 @@ import tools
 import pytz
 
 class groups(osv.osv):
-	_name = "res.groups"
-	_columns = {
-		'name': fields.char('Group Name', size=64, required=True),
-		'model_access': fields.one2many('ir.model.access', 'group_id', 'Access Controls'),
-		'rule_groups': fields.many2many('ir.rule.group', 'group_rule_group_rel',
-			'group_id', 'rule_group_id', 'Rules', domain="[('global', '<>', True)]"),
-		'menu_access': fields.many2many('ir.ui.menu', 'ir_ui_menu_group_rel', 'gid', 'menu_id', 'Access Menu'),
-		'comment' : fields.text('Comment',size=250),
-	}
-	_sql_constraints = [
-		('name_uniq', 'unique (name)', 'The name of the group must be unique !')
-	]
+    _name = "res.groups"
+    _columns = {
+        'name': fields.char('Group Name', size=64, required=True),
+        'model_access': fields.one2many('ir.model.access', 'group_id', 'Access Controls'),
+        'rule_groups': fields.many2many('ir.rule.group', 'group_rule_group_rel',
+            'group_id', 'rule_group_id', 'Rules', domain="[('global', '<>', True)]"),
+        'menu_access': fields.many2many('ir.ui.menu', 'ir_ui_menu_group_rel', 'gid', 'menu_id', 'Access Menu'),
+        'comment' : fields.text('Comment',size=250),
+    }
+    _sql_constraints = [
+        ('name_uniq', 'unique (name)', 'The name of the group must be unique !')
+    ]
 
-	def write(self, cr, uid, ids, vals, context=None):
-		if 'name' in vals:
-			if vals['name'].startswith('-'):
-				raise osv.except_osv(_('Error'),
-						_('The name of the group can not start with "-"'))
-		res = super(groups, self).write(cr, uid, ids, vals, context=context)
-		# Restart the cache on the company_get method
-		self.pool.get('ir.rule').domain_get()
-		return res
+    def write(self, cr, uid, ids, vals, context=None):
+        if 'name' in vals:
+            if vals['name'].startswith('-'):
+                raise osv.except_osv(_('Error'),
+                        _('The name of the group can not start with "-"'))
+        res = super(groups, self).write(cr, uid, ids, vals, context=context)
+        # Restart the cache on the company_get method
+        self.pool.get('ir.rule').domain_get()
+        return res
 
-	def create(self, cr, uid, vals, context=None):
-		if 'name' in vals:
-			if vals['name'].startswith('-'):
-				raise osv.except_osv(_('Error'),
-						_('The name of the group can not start with "-"'))
-		return super(groups, self).create(cr, uid, vals, context=context)
+    def create(self, cr, uid, vals, context=None):
+        if 'name' in vals:
+            if vals['name'].startswith('-'):
+                raise osv.except_osv(_('Error'),
+                        _('The name of the group can not start with "-"'))
+        return super(groups, self).create(cr, uid, vals, context=context)
 
 groups()
 
 
 class roles(osv.osv):
-	_name = "res.roles"
-	_columns = {
-		'name': fields.char('Role Name', size=64, required=True),
-		'parent_id': fields.many2one('res.roles', 'Parent', select=True),
-		'child_id': fields.one2many('res.roles', 'parent_id', 'Childs')
-	}
-	_defaults = {
-	}
-	def check(self, cr, uid, ids, role_id):
-		if role_id in ids:
-			return True
-		cr.execute('select parent_id from res_roles where id=%d', (role_id,))
-		roles = cr.fetchone()[0]
-		if roles:
-			return self.check(cr, uid, ids, roles)
-		return False
+    _name = "res.roles"
+    _columns = {
+        'name': fields.char('Role Name', size=64, required=True),
+        'parent_id': fields.many2one('res.roles', 'Parent', select=True),
+        'child_id': fields.one2many('res.roles', 'parent_id', 'Childs')
+    }
+    _defaults = {
+    }
+    def check(self, cr, uid, ids, role_id):
+        if role_id in ids:
+            return True
+        cr.execute('select parent_id from res_roles where id=%d', (role_id,))
+        roles = cr.fetchone()[0]
+        if roles:
+            return self.check(cr, uid, ids, roles)
+        return False
 roles()
 
 def _lang_get(self, cr, uid, context={}):
-	obj = self.pool.get('res.lang')
-	ids = obj.search(cr, uid, [])
-	res = obj.read(cr, uid, ids, ['code', 'name'], context)
-	res = [(r['code'], r['name']) for r in res]
-	return res
+    obj = self.pool.get('res.lang')
+    ids = obj.search(cr, uid, [])
+    res = obj.read(cr, uid, ids, ['code', 'name'], context)
+    res = [(r['code'], r['name']) for r in res]
+    return res
 def _tz_get(self,cr,uid, context={}):
-	return [(x, x) for x in pytz.all_timezones]
+    return [(x, x) for x in pytz.all_timezones]
 
 class users(osv.osv):
-	_name = "res.users"
-	_log_access = False
-	_columns = {
-		'name': fields.char('Name', size=64, required=True, select=True),
-		'login': fields.char('Login', size=64, required=True),
-		'password': fields.char('Password', size=64, invisible=True),
-		'signature': fields.text('Signature', size=64),
-		'address_id': fields.many2one('res.partner.address', 'Address'),
-		'active': fields.boolean('Active'),
-		'action_id': fields.many2one('ir.actions.actions', 'Home Action'),
-		'menu_id': fields.many2one('ir.actions.actions', 'Menu Action'),
-		'groups_id': fields.many2many('res.groups', 'res_groups_users_rel', 'uid', 'gid', 'Groups'),
-		'roles_id': fields.many2many('res.roles', 'res_roles_users_rel', 'uid', 'rid', 'Roles'),
-		'company_id': fields.many2one('res.company', 'Company'),
-		'context_lang': fields.selection(_lang_get, 'Language', required=True),
-		'context_tz': fields.selection(_tz_get,  'Timezone', size=64)
-	}
-	def read(self,cr, uid, ids, fields=None, context=None, load='_classic_read'):
-		result = super(users, self).read(cr, uid, ids, fields, context, load)
-		canwrite = self.pool.get('ir.model.access').check(cr, uid, 'res.users', 'write', raise_exception=False)
-		if not canwrite:
-			for r in result:
-				if 'password' in r:
-					r['password'] = '********'
-		return result
+    _name = "res.users"
+    _log_access = False
+    _columns = {
+        'name': fields.char('Name', size=64, required=True, select=True),
+        'login': fields.char('Login', size=64, required=True),
+        'password': fields.char('Password', size=64, invisible=True),
+        'signature': fields.text('Signature', size=64),
+        'address_id': fields.many2one('res.partner.address', 'Address'),
+        'active': fields.boolean('Active'),
+        'action_id': fields.many2one('ir.actions.actions', 'Home Action'),
+        'menu_id': fields.many2one('ir.actions.actions', 'Menu Action'),
+        'groups_id': fields.many2many('res.groups', 'res_groups_users_rel', 'uid', 'gid', 'Groups'),
+        'roles_id': fields.many2many('res.roles', 'res_roles_users_rel', 'uid', 'rid', 'Roles'),
+        'company_id': fields.many2one('res.company', 'Company'),
+        'context_lang': fields.selection(_lang_get, 'Language', required=True),
+        'context_tz': fields.selection(_tz_get,  'Timezone', size=64)
+    }
+    def read(self,cr, uid, ids, fields=None, context=None, load='_classic_read'):
+        result = super(users, self).read(cr, uid, ids, fields, context, load)
+        canwrite = self.pool.get('ir.model.access').check(cr, uid, 'res.users', 'write', raise_exception=False)
+        if not canwrite:
+            for r in result:
+                if 'password' in r:
+                    r['password'] = '********'
+        return result
 
-	_sql_constraints = [
-		('login_key', 'UNIQUE (login)', 'You can not have two users with the same login !')
-	]
-	def _get_action(self,cr, uid, context={}):
-		ids = self.pool.get('ir.ui.menu').search(cr, uid, [('usage','=','menu')])
-		return ids and ids[0] or False
+    _sql_constraints = [
+        ('login_key', 'UNIQUE (login)', 'You can not have two users with the same login !')
+    ]
+    def _get_action(self,cr, uid, context={}):
+        ids = self.pool.get('ir.ui.menu').search(cr, uid, [('usage','=','menu')])
+        return ids and ids[0] or False
 
-	def _get_company(self,cr, uid, context={}):
-		return self.pool.get('res.users').browse(cr, uid, uid, context).company_id.id
+    def _get_company(self,cr, uid, context={}):
+        return self.pool.get('res.users').browse(cr, uid, uid, context).company_id.id
 
-	def _get_menu(self,cr, uid, context={}):
-		ids = self.pool.get('ir.actions.act_window').search(cr, uid, [('usage','=','menu')])
-		return ids and ids[0] or False
+    def _get_menu(self,cr, uid, context={}):
+        ids = self.pool.get('ir.actions.act_window').search(cr, uid, [('usage','=','menu')])
+        return ids and ids[0] or False
 
-	_defaults = {
-		'password' : lambda obj,cr,uid,context={} : '',
-		'context_lang': lambda *args: 'en_US',
-		'active' : lambda obj,cr,uid,context={} : True,
-		'menu_id': _get_menu,
-		'action_id': _get_menu,
-		'company_id': _get_company,
-	}
-	def company_get(self, cr, uid, uid2):
-		company_id = self.pool.get('res.users').browse(cr, uid, uid).company_id.id
-		return company_id
-	company_get = tools.cache()(company_get)
+    _defaults = {
+        'password' : lambda obj,cr,uid,context={} : '',
+        'context_lang': lambda *args: 'en_US',
+        'active' : lambda obj,cr,uid,context={} : True,
+        'menu_id': _get_menu,
+        'action_id': _get_menu,
+        'company_id': _get_company,
+    }
+    def company_get(self, cr, uid, uid2):
+        company_id = self.pool.get('res.users').browse(cr, uid, uid).company_id.id
+        return company_id
+    company_get = tools.cache()(company_get)
 
-	def write(self, cr, uid, ids, values, *args, **argv):
-		if (ids == [uid]):
-			ok = True
-			for k in values.keys():
-				if k not in ('password','signature','action_id', 'context_lang', 'context_tz'):
-					ok=False
-			if ok:
-				uid = 1
-		res = super(users, self).write(cr, uid, ids, values, *args, **argv)
-		self.company_get()
-		# Restart the cache on the company_get method
-		self.pool.get('ir.rule').domain_get()
-		return res
+    def write(self, cr, uid, ids, values, *args, **argv):
+        if (ids == [uid]):
+            ok = True
+            for k in values.keys():
+                if k not in ('password','signature','action_id', 'context_lang', 'context_tz'):
+                    ok=False
+            if ok:
+                uid = 1
+        res = super(users, self).write(cr, uid, ids, values, *args, **argv)
+        self.company_get()
+        # Restart the cache on the company_get method
+        self.pool.get('ir.rule').domain_get()
+        return res
 
-	def unlink(self, cr, uid, ids):
-		if 1 in ids:
-			raise osv.except_osv(_('Can not remove root user!'), _('You can not remove the root user as it is used internally for resources created by Tiny ERP (updates, module installation, ...)'))
-		return super(users, self).unlink(cr, uid, ids)
+    def unlink(self, cr, uid, ids):
+        if 1 in ids:
+            raise osv.except_osv(_('Can not remove root user!'), _('You can not remove the root user as it is used internally for resources created by Tiny ERP (updates, module installation, ...)'))
+        return super(users, self).unlink(cr, uid, ids)
 
-	def name_search(self, cr, user, name='', args=None, operator='ilike', context=None, limit=80):
-		if not args:
-			args=[]
-		if not context:
-			context={}
-		ids = []
-		if name:
-			ids = self.search(cr, user, [('login','=',name)]+ args, limit=limit)
-		if not ids:
-			ids = self.search(cr, user, [('name',operator,name)]+ args, limit=limit)
-		return self.name_get(cr, user, ids)
+    def name_search(self, cr, user, name='', args=None, operator='ilike', context=None, limit=80):
+        if not args:
+            args=[]
+        if not context:
+            context={}
+        ids = []
+        if name:
+            ids = self.search(cr, user, [('login','=',name)]+ args, limit=limit)
+        if not ids:
+            ids = self.search(cr, user, [('name',operator,name)]+ args, limit=limit)
+        return self.name_get(cr, user, ids)
 
-	def copy(self, cr, uid, id, default=None, context={}):
-		login = self.read(cr, uid, [id], ['login'])[0]['login']
-		default.update({'login': login+' (copy)'})
-		return super(users, self).copy(cr, uid, id, default, context)
+    def copy(self, cr, uid, id, default=None, context={}):
+        login = self.read(cr, uid, [id], ['login'])[0]['login']
+        default.update({'login': login+' (copy)'})
+        return super(users, self).copy(cr, uid, id, default, context)
 
-	def context_get(self, cr, uid, context={}):
-		user = self.browse(cr, uid, uid, context)
-		result = {}
-		for k in self._columns.keys():
-			if k.startswith('context_'):
-				result[k[8:]] = getattr(user,k)
-		return result
+    def context_get(self, cr, uid, context={}):
+        user = self.browse(cr, uid, uid, context)
+        result = {}
+        for k in self._columns.keys():
+            if k.startswith('context_'):
+                result[k[8:]] = getattr(user,k)
+        return result
 
-	def action_get(self, cr, uid, context={}):
-		dataobj = self.pool.get('ir.model.data')
-		data_id = dataobj._get_id(cr, 1, 'base', 'action_res_users_my')
-		return dataobj.browse(cr, uid, data_id, context).res_id
+    def action_get(self, cr, uid, context={}):
+        dataobj = self.pool.get('ir.model.data')
+        data_id = dataobj._get_id(cr, 1, 'base', 'action_res_users_my')
+        return dataobj.browse(cr, uid, data_id, context).res_id
 
-	def action_next(self,cr,uid,ids,context=None):
-		return{
-				'view_type': 'form',
-				"view_mode": 'form',
-				'res_model': 'ir.module.module.configuration.wizard',
-				'type': 'ir.actions.act_window',
-				'target':'new',
-		}
+    def action_next(self,cr,uid,ids,context=None):
+        return{
+                'view_type': 'form',
+                "view_mode": 'form',
+                'res_model': 'ir.module.module.configuration.wizard',
+                'type': 'ir.actions.act_window',
+                'target':'new',
+        }
 
-	def action_continue(self,cr,uid,ids,context={}):
-		return {
-			    'view_type': 'form',
-			    "view_mode": 'form',
-			    'res_model': 'ir.module.module.configuration.wizard',
-			    'type': 'ir.actions.act_window',
-			    'target':'new',
-			   }
-	def action_new(self,cr,uid,ids,context={}):
-		return {
-			    'view_type': 'form',
-			    "view_mode": 'form',
-			    'res_model': 'res.users',
-			    'view_id':self.pool.get('ir.ui.view').search(cr,uid,[('name','=','res.users.confirm.form')]),
-			    'type': 'ir.actions.act_window',
-			    'target':'new',
-			   }
+    def action_continue(self,cr,uid,ids,context={}):
+        return {
+                'view_type': 'form',
+                "view_mode": 'form',
+                'res_model': 'ir.module.module.configuration.wizard',
+                'type': 'ir.actions.act_window',
+                'target':'new',
+               }
+    def action_new(self,cr,uid,ids,context={}):
+        return {
+                'view_type': 'form',
+                "view_mode": 'form',
+                'res_model': 'res.users',
+                'view_id':self.pool.get('ir.ui.view').search(cr,uid,[('name','=','res.users.confirm.form')]),
+                'type': 'ir.actions.act_window',
+                'target':'new',
+               }
+    
+    def action_cancel(self,cr,uid,ids,conect={}):
+        return {
+            'view_type': 'form',
+            "view_mode": 'form',
+            'res_model': 'ir.module.module.configuration.wizard',
+            'type': 'ir.actions.act_window',
+            'target':'new',
+        }
 users()
 
 class groups2(osv.osv):
-	_inherit = 'res.groups'
-	_columns = {
-		'users': fields.many2many('res.users', 'res_groups_users_rel', 'gid', 'uid', 'Users'),
-	}
+    _inherit = 'res.groups'
+    _columns = {
+        'users': fields.many2many('res.users', 'res_groups_users_rel', 'gid', 'uid', 'Users'),
+    }
 groups2()
 
 
 class res_config_view(osv.osv_memory):
-	_name='res.config.view'
-	_columns = {
-		'name':fields.char('Name', size=64),
-		'view': fields.selection([('simple','Simple'),('extended','Extended')], 'View', required=True ),
+    _name='res.config.view'
+    _columns = {
+        'name':fields.char('Name', size=64),
+        'view': fields.selection([('simple','Simple'),('extended','Extended')], 'View', required=True ),
 
     }
-	_defaults={
-		'view':lambda *args: 'simple',
-		}
+    _defaults={
+        'view':lambda *args: 'simple',
+        }
 
-	def action_cancel(self,cr,uid,ids,conect=None):
-		print ' Cancel  action'
-		return {
-			    'view_type': 'form',
-			    "view_mode": 'form',
-				'res_model': 'ir.module.module.configuration.wizard',
-				'type': 'ir.actions.act_window',
-				'target':'new',
+    def action_cancel(self,cr,uid,ids,conect=None):
+        print ' Cancel  action'
+        return {
+                'view_type': 'form',
+                "view_mode": 'form',
+                'res_model': 'ir.module.module.configuration.wizard',
+                'type': 'ir.actions.act_window',
+                'target':'new',
          }
-	def action_set(self, cr, uid, ids, context=None):
-		res=self.read(cr,uid,ids)[0]
-		users_obj = self.pool.get('res.users')
-		group_obj=self.pool.get('res.groups')
-		if 'view' in res and res['view'] and res['view']=='extended':
-			group_ids=group_obj.search(cr,uid,[('name','=','Extended View')])
-			if group_ids and len(group_ids):
-				users_obj.write(cr, uid, [3],{
-								'groups_id':[(4,group_ids[0])]
-							}, context=context)
-		return {
-				'view_type': 'form',
-				"view_mode": 'form',
-			    'res_model': 'ir.module.module.configuration.wizard',
-			    'type': 'ir.actions.act_window',
-			    'target':'new',
-			}
+    def action_set(self, cr, uid, ids, context=None):
+        res=self.read(cr,uid,ids)[0]
+        users_obj = self.pool.get('res.users')
+        group_obj=self.pool.get('res.groups')
+        if 'view' in res and res['view'] and res['view']=='extended':
+            group_ids=group_obj.search(cr,uid,[('name','=','Extended View')])
+            if group_ids and len(group_ids):
+                users_obj.write(cr, uid, [3],{
+                                'groups_id':[(4,group_ids[0])]
+                            }, context=context)
+        return {
+                'view_type': 'form',
+                "view_mode": 'form',
+                'res_model': 'ir.module.module.configuration.wizard',
+                'type': 'ir.actions.act_window',
+                'target':'new',
+            }
 
 res_config_view()
-
-