From 283b95c6a5c8d8b4c1831b9c3b9871fa332f584b Mon Sep 17 00:00:00 2001
From: Aubort Jean-Baptiste <jean-baptiste.aubort@camptocamp.com>
Date: Fri, 18 Jul 2008 18:40:51 +0200
Subject: [PATCH] * Deleted user Admin * user R00T has now a password and is
 the only one to have acces to everything * No more admin group, ERP Manager
 is here for the client

bzr revid: jean-baptiste.aubort@camptocamp.com-20080718164051-axoezrrfn1yscncx
---
 bin/addons/base/base.sql                     |  7 +++----
 bin/addons/base/base_menu.xml                |  4 +---
 bin/addons/base/base_security.xml            | 13 ++++++-------
 bin/addons/base/ir/ir_model.py               |  4 ++--
 bin/addons/base/module/module_wizard.xml     |  2 +-
 bin/addons/base/res/country_view.xml         |  4 ++--
 bin/addons/base/res/partner/crm_view.xml     |  6 +++---
 bin/addons/base/res/partner/partner_view.xml |  6 +++---
 8 files changed, 21 insertions(+), 25 deletions(-)

diff --git a/bin/addons/base/base.sql b/bin/addons/base/base.sql
index 5441fd3e67d..133c7a50c84 100644
--- a/bin/addons/base/base.sql
+++ b/bin/addons/base/base.sql
@@ -336,7 +336,6 @@ CREATE TABLE ir_model_data (
 ---------------------------------
 -- Users
 ---------------------------------
-insert into res_users (id,login,password,name,action_id,active) values (1,'root',NULL,'Root',NULL,False);
-insert into res_users (id,login,password,name,action_id,active) values (2,'admin','admin','Administrator',NULL,True);
-insert into ir_model_data (name,module,model,noupdate,res_id) values ('user_admin','base','res.users',True,2);
-select setval('res_users_id_seq', 3);
\ No newline at end of file
+insert into res_users (id,login,password,name,action_id,active) values (1,'root','root','Root',NULL,True);
+insert into ir_model_data (name,module,model,noupdate,res_id) values ('user_root','base','res.users',True,1);
+select setval('res_users_id_seq', 2);
\ No newline at end of file
diff --git a/bin/addons/base/base_menu.xml b/bin/addons/base/base_menu.xml
index 41ca0d51f6c..aa1feb51e9c 100644
--- a/bin/addons/base/base_menu.xml
+++ b/bin/addons/base/base_menu.xml
@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
-        <menuitem groups="group_admin" icon="terp-administration" id="menu_administration" name="Administration" sequence="20"/>
+        <menuitem icon="terp-administration" id="menu_administration" name="Administration" sequence="20"/>
         <menuitem id="menu_custom" name="Custom" parent="base.menu_administration" sequence="2"/>
         <menuitem id="menu_translation" name="Translations" parent="base.menu_administration" sequence="4"/>
         <menuitem id="menu_users" name="Users" parent="base.menu_administration" sequence="6"/>
         <menuitem id="menu_security" name="Security" parent="base.menu_administration" sequence="8"/>
         <menuitem id="menu_management" name="Modules Management" parent="base.menu_administration" sequence="10"/>
-        
-        
     </data>
 </terp>
\ No newline at end of file
diff --git a/bin/addons/base/base_security.xml b/bin/addons/base/base_security.xml
index 339427582ec..273058b6800 100644
--- a/bin/addons/base/base_security.xml
+++ b/bin/addons/base/base_security.xml
@@ -5,9 +5,9 @@
 <!--
  Groups
 -->
-    <record model="res.groups" id="group_admin">
-        <field name="name">Administrator</field>
-    </record>
+    <!--<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>
@@ -36,13 +36,12 @@
 <!--
  Users
 -->
-    <record model="res.users" id="base.user_admin">
-        <field name="signature">Administrator</field>
+    <record model="res.users" id="base.user_root">
+        <field name="signature">Root</field>
         <field name="action_id" ref="action_menu_admin"/>
         <field name="menu_id" ref="action_menu_admin"/>
         <field name="address_id" ref="main_address"/>
         <field name="company_id" ref="main_company"/>
-        <field name="groups_id" eval="[(6,0,[group_admin])]"/>
     </record>
 
 <!--
@@ -660,7 +659,7 @@
     <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_admin"/>
+        <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"/>
diff --git a/bin/addons/base/ir/ir_model.py b/bin/addons/base/ir/ir_model.py
index b21e0aa42b4..30e106b4a5f 100644
--- a/bin/addons/base/ir/ir_model.py
+++ b/bin/addons/base/ir/ir_model.py
@@ -306,8 +306,8 @@ class ir_model_access(osv.osv):
     
     def check(self, cr, uid, model_name, mode='read',raise_exception=True):       
         assert mode in ['read','write','create','unlink'], 'Invalid access mode for security'
-        # Users root and admin have all access (Todo: exclude xml-rpc requests)
-        if uid==1 or uid==2:
+        # Users root have all access (Todo: exclude xml-rpc requests)
+        if uid==1:
             return True
         
         # We check if a specific rule exists
diff --git a/bin/addons/base/module/module_wizard.xml b/bin/addons/base/module/module_wizard.xml
index df18b709869..2c700b1e616 100644
--- a/bin/addons/base/module/module_wizard.xml
+++ b/bin/addons/base/module/module_wizard.xml
@@ -11,7 +11,7 @@
             <field name="name">Download module list</field>
             <field name="wiz_name">module.module.update</field>
         </record>
-        <menuitem action="wizard_update" groups="group_admin" icon="STOCK_CONVERT" id="menu_module_update" parent="base.menu_management" type="wizard"/>
+        <menuitem action="wizard_update" icon="STOCK_CONVERT" id="menu_module_update" parent="base.menu_management" type="wizard"/>
         
         <wizard id="wizard_upgrade" model="ir.module.module" name="module.upgrade" string="Apply upgrades"/>
         <menuitem action="wizard_upgrade" id="menu_wizard_upgrade" parent="base.menu_management" type="wizard"/>
diff --git a/bin/addons/base/res/country_view.xml b/bin/addons/base/res/country_view.xml
index 16a394b9e81..435bdef5e1e 100644
--- a/bin/addons/base/res/country_view.xml
+++ b/bin/addons/base/res/country_view.xml
@@ -38,7 +38,7 @@
         </record>
         
         <menuitem id="menu_localisation" name="Localisation" parent="menu_base_config"/>
-        <menuitem action="action_country" groups="group_admin" id="menu_country_partner" parent="menu_localisation"/>
+        <menuitem action="action_country" id="menu_country_partner" parent="menu_localisation"/>
         
         <!--
 		State
@@ -78,7 +78,7 @@
             <field name="view_id" ref="view_country_state_tree"/>
         </record>
         
-        <menuitem action="action_country_state" groups="group_admin" id="menu_country_state_partner" parent="menu_localisation"/>
+        <menuitem action="action_country_state" id="menu_country_state_partner" parent="menu_localisation"/>
         
     </data>
 </terp>
\ No newline at end of file
diff --git a/bin/addons/base/res/partner/crm_view.xml b/bin/addons/base/res/partner/crm_view.xml
index 09160fdbcfe..c9a2c2fcf2e 100644
--- a/bin/addons/base/res/partner/crm_view.xml
+++ b/bin/addons/base/res/partner/crm_view.xml
@@ -19,7 +19,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
-        <menuitem id="next_id_14" name="Partner Events" parent="base.menu_base_config"/><menuitem action="res_partner_canal-act" groups="group_admin" id="menu_res_partner_canal-act" parent="next_id_14"/>
+        <menuitem id="next_id_14" name="Partner Events" parent="base.menu_base_config"/><menuitem action="res_partner_canal-act" id="menu_res_partner_canal-act" parent="next_id_14"/>
         
         <record id="res_partner_event_type-view" model="ir.ui.view">
             <field name="name">res.partner.event.type.form</field>
@@ -53,7 +53,7 @@
             <field name="view_mode">tree,form</field>
             <field name="context">{'active_test': False}</field>
         </record>
-        <menuitem action="res_partner_event_type-act" groups="group_admin" id="menu_res_partner_event_type-act" parent="base.next_id_14"/>
+        <menuitem action="res_partner_event_type-act" id="menu_res_partner_event_type-act" parent="base.next_id_14"/>
         
         <record id="res_partner_som_tree-view" model="ir.ui.view">
             <field name="name">res.partner.som.tree</field>
@@ -84,7 +84,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
-        <menuitem action="res_partner_som-act" groups="group_admin" id="menu_res_partner_som-act" parent="base.next_id_14"/>
+        <menuitem action="res_partner_som-act" id="menu_res_partner_som-act" parent="base.next_id_14"/>
         
         <record id="res_partner_event-wopartner-view_form" model="ir.ui.view">
             <field name="name">res.partner.event.form</field>
diff --git a/bin/addons/base/res/partner/partner_view.xml b/bin/addons/base/res/partner/partner_view.xml
index 82fa9c6ff67..ef32b7a82b7 100644
--- a/bin/addons/base/res/partner/partner_view.xml
+++ b/bin/addons/base/res/partner/partner_view.xml
@@ -3,7 +3,7 @@
     <data>
         <menuitem icon="terp-partner" id="menu_base_partner" name="Partners" sequence="0"/>
         
-        <menuitem groups="group_admin" id="menu_base_config" name="Configuration" parent="menu_base_partner" sequence="1"/>
+        <menuitem id="menu_base_config" name="Configuration" parent="menu_base_partner" sequence="1"/>
         
         <!--
 	================================
@@ -27,7 +27,7 @@
             <field name="res_model">res.partner.function</field>
             <field name="view_type">form</field>
         </record>
-        <menuitem action="action_partner_function_form" groups="group_admin" id="menu_partner_function_form" parent="base.menu_base_config"/>
+        <menuitem action="action_partner_function_form" id="menu_partner_function_form" parent="base.menu_base_config"/>
         
         <!--
 	=====================
@@ -162,7 +162,7 @@
             <field name="res_model">res.partner.title</field>
             <field name="view_type">form</field>
         </record>
-        <menuitem action="action_partner_title" groups="group_admin" id="menu_partner_title" parent="base.menu_base_config"/>
+        <menuitem action="action_partner_title" id="menu_partner_title" parent="base.menu_base_config"/>
         
         <!--
 	=======================