From 793939c71cbdacf33ce4e820d2819d0a56420f5f Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Mon, 30 Apr 2012 03:02:09 +0200
Subject: [PATCH] better preferences, remove base_update.xml move all company
 and user views/actions into the right files

bzr revid: al@openerp.com-20120430010209-fnmrh7q043qe0vbj
---
 openerp/addons/base/__openerp__.py            |   3 +-
 openerp/addons/base/ir/ir.xml                 |  85 +------
 openerp/addons/base/res/res_bank_view.xml     |  58 ++---
 openerp/addons/base/res/res_company_view.xml  | 119 ++++++++-
 .../res_users_view.xml}                       | 225 ++++++------------
 5 files changed, 215 insertions(+), 275 deletions(-)
 rename openerp/addons/base/{base_update.xml => res/res_users_view.xml} (55%)

diff --git a/openerp/addons/base/__openerp__.py b/openerp/addons/base/__openerp__.py
index 393e7651bda..862482736a0 100644
--- a/openerp/addons/base/__openerp__.py
+++ b/openerp/addons/base/__openerp__.py
@@ -39,7 +39,6 @@
         'data/res.country.state.csv'
     ],
     'update_xml': [
-        'base_update.xml',
         'ir/wizard/wizard_menu_view.xml',
         'ir/ir.xml',
         'ir/ir_config_parameter_view.xml',
@@ -56,6 +55,7 @@
         'module/wizard/base_module_configuration_view.xml',
         'module/wizard/base_export_language_view.xml',
         'module/wizard/base_update_translations_view.xml',
+        'res/res_company_view.xml',
         'res/res_request_view.xml',
         'res/res_lang_view.xml',
         'res/res_partner_report.xml',
@@ -65,6 +65,7 @@
         'res/res_country_view.xml',
         'res/res_currency_view.xml',
         'res/res_partner_event_view.xml',
+        'res/res_users_view.xml',
         'res/wizard/partner_sms_send_view.xml',
         'res/wizard/partner_wizard_massmail_view.xml',
         'res/wizard/partner_clear_ids_view.xml',
diff --git a/openerp/addons/base/ir/ir.xml b/openerp/addons/base/ir/ir.xml
index 81c7cade5d0..afd6e60847b 100644
--- a/openerp/addons/base/ir/ir.xml
+++ b/openerp/addons/base/ir/ir.xml
@@ -684,87 +684,7 @@
         </record>
 
         <menuitem id="menu_needaction_users_rel" name="Need actions" parent="base.menu_users" sequence="20" action="action_view_needaction_users_rel" groups="base.group_no_one"/>
-        
-        <!-- Companies -->
-        <menuitem id="menu_res_company_global"
-            parent="base.menu_administration"
-            name="Companies"
-            sequence="2"/>
 
-        <record id="action_res_company_tree" model="ir.actions.act_window">
-            <field name="name">Company's Structure</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">res.company</field>
-            <field name="domain">[('parent_id','=',False)]</field>
-            <field name="view_type">tree</field>
-        </record>
-        <menuitem action="action_res_company_tree"
-            groups="base.group_multi_company"
-            id="menu_action_res_company_tree" parent="base.menu_res_company_global"
-            sequence="16"/>
-        <record id="action_res_company_form" model="ir.actions.act_window">
-            <field name="name">Companies</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">res.company</field>
-            <field name="view_type">form</field>
-            <field name="help">Create and manage the companies that will be managed by OpenERP from here. Shops or subsidiaries can be created and maintained from here.</field>
-        </record>
-        <menuitem action="action_res_company_form" id="menu_action_res_company_form" parent="base.menu_res_company_global"/>
-
-        <!-- Users -->
-        <record id="action_res_users" model="ir.actions.act_window">
-            <field name="name">Users</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">res.users</field>
-            <field name="view_type">form</field>
-            <field name="view_id" ref="view_users_tree"/>
-            <field name="search_view_id" ref="view_users_search"/>
-            <field name="help">Create and manage users that will connect to the system. Users can be deactivated should there be a period of time during which they will/should not connect to the system. You can assign them groups in order to give them specific access to the applications they need to use in the system.</field>
-        </record>
-        <record id="action_res_users_view1" model="ir.actions.act_window.view">
-            <field eval="10" name="sequence"/>
-            <field name="view_mode">tree</field>
-            <field name="view_id" ref="view_users_tree"/>
-            <field name="act_window_id" ref="action_res_users"/>
-        </record>
-        <record id="action_res_users_view2" model="ir.actions.act_window.view">
-            <field eval="20" name="sequence"/>
-            <field name="view_mode">form</field>
-            <field name="view_id" ref="view_users_form"/>
-            <field name="act_window_id" ref="action_res_users"/>
-        </record>
-
-        <menuitem action="action_res_users" id="menu_action_res_users" parent="base.menu_users"/>
-
-        <record id="action_res_users_my" model="ir.actions.act_window">
-            <field name="name">Change My Preferences</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">res.users</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form,tree</field>
-            <field name="domain">[('id','=',uid)]</field>
-        </record>
-        <record id="action_res_users_my_view1" model="ir.actions.act_window.view">
-            <field eval="20" name="sequence"/>
-            <field name="view_mode">tree</field>
-            <field name="act_window_id" ref="action_res_users_my"/>
-        </record>
-        <record id="action_res_users_my_view2" model="ir.actions.act_window.view">
-            <field eval="10" name="sequence"/>
-            <field name="view_mode">form</field>
-            <field name="view_id" ref="view_users_form_simple_modif"/>
-            <field name="act_window_id" ref="action_res_users_my"/>
-        </record>
-
-        <record id="action_res_groups" model="ir.actions.act_window">
-            <field name="name">Groups</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">res.groups</field>
-            <field name="view_type">form</field>
-            <field name="help">A group is a set of functional areas that will be assigned to the user in order to give them access and rights to specific applications and tasks in the system. You can create custom groups or edit the ones existing by default in order to customize the view of the menu that users will be able to see. Whether they can have a read, write, create and delete access right can be managed from here.</field>
-        </record>
-        <menuitem action="action_res_groups" id="menu_action_res_groups" parent="base.menu_users"
-            groups="base.group_no_one"/>
 
         <!-- View -->
         <record id="view_view_form" model="ir.ui.view">
@@ -1992,6 +1912,11 @@
             </field>
         </record>
 
+        <record id="category_administration_config" model="ir.actions.todo.category">
+            <field name="name">Administration</field>
+            <field name="sequence">1</field>
+        </record>
+
         <record id="category_sales_management_config" model="ir.actions.todo.category">
             <field name="name">Sales Management</field>
             <field name="sequence">5</field>
diff --git a/openerp/addons/base/res/res_bank_view.xml b/openerp/addons/base/res/res_bank_view.xml
index 6f6fc663f1c..ecbf887acdf 100644
--- a/openerp/addons/base/res/res_bank_view.xml
+++ b/openerp/addons/base/res/res_bank_view.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-    <!-- Banks -->
-
+        <!-- res.bank -->
         <record id="view_res_bank_form" model="ir.ui.view">
             <field name="name">res.bank.form</field>
             <field name="model">res.bank</field>
@@ -33,7 +32,6 @@
                 </form>
             </field>
         </record>
-
         <record id="view_res_bank_tree" model="ir.ui.view">
             <field name="name">res.bank.tree</field>
             <field name="model">res.bank</field>
@@ -46,7 +44,6 @@
                 </tree>
             </field>
         </record>
-
         <record id="action_res_bank_form" model="ir.actions.act_window">
             <field name="name">Banks</field>
             <field name="res_model">res.bank</field>
@@ -54,11 +51,7 @@
             <field name="view_mode">tree,form</field>
             <field name="help">Manage bank records you want to be used in the system.</field>
         </record>
-
-        <menuitem action="action_res_bank_form" id="menu_action_res_bank_form"
-            parent="base.menu_config_address_book" sequence="11"
-	    groups="base.group_no_one"/>
-
+        <menuitem action="action_res_bank_form" id="menu_action_res_bank_form" parent="base.menu_config_address_book" sequence="11" groups="base.group_no_one"/>
 
 
         <record id="view_partner_bank_type_form" model="ir.ui.view">
@@ -74,7 +67,6 @@
                 </form>
             </field>
         </record>
-
         <record id="view_partner_bank_type_tree" model="ir.ui.view">
             <field name="name">res.partner.bank.type.tree</field>
             <field name="model">res.partner.bank.type</field>
@@ -87,7 +79,6 @@
             </field>
         </record>
 
-
         <record id="view_partner_bank_form" model="ir.ui.view">
             <field name="name">res.partner.bank.form</field>
             <field name="model">res.partner.bank</field>
@@ -97,7 +88,7 @@
                     <group colspan="4" col="6">
                         <field name="state"/>
                         <field name="company_id" on_change="onchange_company_id(company_id)" invisible="context.get('company_hide', True)" widget="selection"/>
-			<field name="footer" attrs="{'invisible': [('company_id','=',False)]}"/>
+                        <field name="footer" attrs="{'invisible': [('company_id','=',False)]}"/>
                         <newline/>
                         <field name="acc_number"/>
                     </group>
@@ -121,24 +112,6 @@
                 </form>
             </field>
         </record>
-
-        <record id="view_partner_bank_search" model="ir.ui.view">
-            <field name="name">res.partner.bank.search</field>
-            <field name="model">res.partner.bank</field>
-            <field name="type">search</field>
-            <field name="arch" type="xml">
-                <search string="Bank Accounts">
-		    <filter name="my_bank" icon="terp-check" string="My Banks" domain="[('company_id','&lt;&gt;',False)]" help="Bank accounts belonging to one of your companies"/>
-                    <separator orientation="vertical"/>
-                    <field name="acc_number"/>
-		    <field name="company_id" invisible="context.get('company_hide', True)"/>
-                    <field name="partner_id"/>
-                    <field name="bank_name"/>
-                </search>
-            </field>
-        </record>
-
-
         <record id="view_partner_bank_tree" model="ir.ui.view">
             <field name="name">res.partner.bank.tree</field>
             <field name="model">res.partner.bank</field>
@@ -148,20 +121,34 @@
                     <field name="sequence" invisible="1"/>
                     <field name="acc_number"/>
                     <field name="bank_name"/>
-		    <field name="company_id" invisible="context.get('company_hide', True)"/>
-		    <field name="footer" invisible="context.get('company_hide', True)"/>
+                    <field name="company_id" invisible="context.get('company_hide', True)"/>
+                    <field name="footer" invisible="context.get('company_hide', True)"/>
                     <field name="partner_id"/>
                 </tree>
             </field>
         </record>
-
+        <record id="view_partner_bank_search" model="ir.ui.view">
+            <field name="name">res.partner.bank.search</field>
+            <field name="model">res.partner.bank</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Bank Accounts">
+                    <filter name="my_bank" icon="terp-check" string="My Banks" domain="[('company_id','&lt;&gt;',False)]" help="Bank accounts belonging to one of your companies"/>
+                    <separator orientation="vertical"/>
+                    <field name="acc_number"/>
+                    <field name="company_id" invisible="context.get('company_hide', True)"/>
+                    <field name="partner_id"/>
+                    <field name="bank_name"/>
+                </search>
+            </field>
+        </record>
         <record id="action_res_partner_bank_account_form" model="ir.actions.act_window">
             <field name="name">Bank Accounts</field>
             <field name="res_model">res.partner.bank</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
+            <field name="help">Configure your company's bank accounts and select those that must appear on the report footer. You can reorder bank accounts from the list view. If you use the accounting application of OpenERP, journals and accounts will be created automatically based on these data.</field>
         </record>
-
         <menuitem action="action_res_partner_bank_account_form"
             id="menu_action_res_partner_bank_form"
             parent="base.menu_config_address_book"
@@ -175,11 +162,10 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
-
         <menuitem action="action_res_partner_bank_type_form"
             id="menu_action_res_partner_bank_typeform"
             parent="base.menu_config_address_book"
-	    groups="base.group_no_one"
+            groups="base.group_no_one"
             sequence="15"/>
 
 
diff --git a/openerp/addons/base/res/res_company_view.xml b/openerp/addons/base/res/res_company_view.xml
index 0d227e3265c..6c9d827101c 100644
--- a/openerp/addons/base/res/res_company_view.xml
+++ b/openerp/addons/base/res/res_company_view.xml
@@ -1,6 +1,114 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <openerp>
     <data>
+        <menuitem id="menu_res_company_global" parent="base.menu_administration" name="Companies" sequence="2"/>
+
+        <menuitem id="menu_custom_multicompany" parent="base.menu_custom" name="Multi-Companies" sequence="50"/>
+
+        <report id="preview_report" model="res.company" name="preview.report" multi="True" rml="base/report/preview_report.rml" string="Preview Report"/>
+        <record id="bank_account_update" model="ir.actions.act_window">
+            <field name="name">Company Bank Accounts</field>
+            <field name="res_model">res.partner.bank</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="context" eval="{'default_partner_id':ref('base.main_partner'), 'company_hide':False, 'default_company_id':ref('base.main_company'), 'search_default_my_bank':1}"/>
+        </record>
+        <record id="view_company_form" model="ir.ui.view">
+            <field name="name">res.company.form</field>
+            <field name="model">res.company</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Company">
+                    <group colspan="4" col="6">
+                        <group colspan="4" col="4">
+                            <field name="name"/>
+                            <field name="partner_id" readonly="1" required="0" groups="base.group_no_one"/>
+                            <field name="parent_id"  groups="base.group_multi_company"/>
+                        </group>
+                        <group colspan="2" col="2">
+                            <field name="logo" nolabel="1" widget="image"/>
+                        </group>
+                    </group>
+                    <notebook colspan="4">
+                        <page string="General Information">
+                            <separator string="Address Information" colspan="4"/>
+                            <field name="street" colspan="4"/>
+                            <field name="street2" invisible="1"/>
+                            <field name="zip"/>
+                            <field name="city"/>
+                            <field name="country_id"/>
+                            <field name="state_id"/>
+                            <field name="phone" on_change="on_change_header(phone, email, fax, website, vat, company_registry)"/>
+                            <field name="email" on_change="on_change_header(phone, email, fax, website, vat, company_registry)"/>
+                            <field name="fax" on_change="on_change_header(phone, email, fax, website, vat, company_registry)"/>
+                            <field name="website" on_change="on_change_header(phone, email, fax, website, vat, company_registry)"/>
+                            <field name="vat" on_change="on_change_header(phone, email, fax, website, vat, company_registry)"/>
+                            <field name="company_registry" on_change="on_change_header(phone, email, fax, website, vat, company_registry)"/>
+                            <separator string="Header/Footer of Reports" colspan="4"/>
+                            <group colspan="4" col="3">
+                                <field name="rml_header1" colspan="3"/>
+                                <newline/>
+                                <field name="rml_footer1" colspan="3" groups="base.group_no_one"/>
+                                <newline/>
+                                <field name="rml_footer2" colspan="2"/>
+                                <button name="%(bank_account_update)d" string="Set Bank Accounts" type="action" icon="gtk-go-forward"/>
+                                <newline/>
+                                <label string="" colspan="2"/>
+                                <button name="%(preview_report)d" string="Preview Header" type="action" icon="gtk-print"/>
+                            </group>
+                        </page>
+                        <page string="Header/Footer" groups="base.group_no_one">
+                            <group colspan="2" col="4">
+                               <field name="paper_format" on_change="onchange_paper_format(paper_format)"/>
+                            </group>
+                            <field colspan="4" name="rml_header" nolabel="1"/>
+                        </page>
+                        <page string="Internal Header/Footer" groups="base.group_no_one">
+                            <separator string="Portrait" colspan="2"/>
+                            <separator string="Landscape" colspan="2"/>
+                            <field colspan="2" name="rml_header2" nolabel="1"/>
+                            <field colspan="2" name="rml_header3" nolabel="1"/>
+                        </page>
+                        <page string="Configuration">
+                            <separator string="Accounting" colspan="4"/>
+                            <field name="currency_id" colspan="2"/>
+                            <newline/>
+                        </page>
+                        <page string="Bank Accounts">
+                          <field name="bank_ids" nolabel="1"/>
+                        </page>
+                    </notebook>
+                </form>
+            </field>
+        </record>
+        <record id="view_company_tree" model="ir.ui.view">
+            <field name="name">res.company.tree</field>
+            <field name="model">res.company</field>
+            <field name="type">tree</field>
+            <field name="field_parent">child_ids</field>
+            <field name="arch" type="xml">
+                <tree string="Companies">
+                    <field name="name"/>
+                    <field name="partner_id"/>
+                </tree>
+            </field>
+        </record>
+        <record id="action_res_company_form" model="ir.actions.act_window">
+            <field name="name">Companies</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">res.company</field>
+            <field name="view_type">form</field>
+            <field name="help">Create and manage the companies that will be managed by OpenERP from here. Shops or subsidiaries can be created and maintained from here.</field>
+        </record>
+        <menuitem action="action_res_company_form" id="menu_action_res_company_form" parent="base.menu_res_company_global"/>
+        <record id="action_res_company_tree" model="ir.actions.act_window">
+            <field name="name">Company's Structure</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">res.company</field>
+            <field name="domain">[('parent_id','=',False)]</field>
+            <field name="view_type">tree</field>
+        </record>
+        <menuitem action="action_res_company_tree" groups="base.group_multi_company" id="menu_action_res_company_tree" parent="base.menu_res_company_global" sequence="16"/>
 
         <record id="view_inventory_tree" model="ir.ui.view">
             <field name="name">multi_company.default.tree</field>
@@ -41,7 +149,6 @@
                 </form>
             </field>
         </record>
-
         <record id="view_inventory_search" model="ir.ui.view">
             <field name="name">multi_company.default.search</field>
             <field name="model">multi_company.default</field>
@@ -56,7 +163,6 @@
                 </search>
             </field>
         </record>
-
         <record id="action_inventory_form" model="ir.actions.act_window">
             <field name="name">Default Company per Object</field>
             <field name="type">ir.actions.act_window</field>
@@ -64,15 +170,8 @@
             <field name="view_type">form</field>
             <field name="search_view_id" ref="view_inventory_search"/>
         </record>
+        <menuitem id="menu_action_inventory_form"  parent="menu_custom_multicompany" action="action_inventory_form"/>
 
-        <menuitem id="menu_custom_multicompany"
-            name="Multi-Companies"
-            parent="base.menu_custom"
-            sequence="50"/>
-
-        <menuitem id="menu_action_inventory_form" 
-            action="action_inventory_form"
-            parent="menu_custom_multicompany"/>
     </data>
 </openerp>
 
diff --git a/openerp/addons/base/base_update.xml b/openerp/addons/base/res/res_users_view.xml
similarity index 55%
rename from openerp/addons/base/base_update.xml
rename to openerp/addons/base/res/res_users_view.xml
index fc3efe6f1d0..27feb1c9e8e 100644
--- a/openerp/addons/base/base_update.xml
+++ b/openerp/addons/base/res/res_users_view.xml
@@ -57,46 +57,16 @@
                 </form>
             </field>
         </record>
-
-        <!--
-    ======================
-    Users
-    ======================
-    -->
-
-        <record id="view_users_form_simple_modif" model="ir.ui.view">
-            <field name="name">res.users.preferences.form</field>
-            <field name="model">res.users</field>
-            <field name="type">form</field>
-            <field eval="18" name="priority"/>
-            <field name="arch" type="xml">
-                <form string="Users">
-                    <field name="name" readonly="1"/>
-                    <newline/>
-                    <group colspan="2" col="3">
-                        <group col="2" colspan="2" name="preferences">
-                            <separator string="Preferences" colspan="2"/>
-                            <field name="context_lang" readonly="0"/>
-                            <field name="context_tz" readonly="0"/>
-                            <field name="menu_tips" readonly="0" groups="base.group_no_one"/>
-                        </group>
-                        <group col="2" colspan="1">
-                            <separator string="Avatar" colspan="2"/>
-                            <field name="avatar" widget='image' nolabel="1" colspan="2" on_change="onchange_avatar(avatar)" readonly="0"/>
-                        </group>
-                    </group>
-                    <group name="default_filters" colspan="2" col="2">
-                        <separator string="Default Filters" colspan="2"/>
-                        <field name="company_id" widget="selection" readonly="0"
-                            groups="base.group_multi_company" on_change="on_change_company_id(company_id)"/>
-                    </group>
-                    <separator string="Email Preferences" colspan="4"/>
-                    <field colspan="4" name="user_email" widget="email" readonly="0"/>
-                    <field colspan="4" name="signature" readonly="0"/>
-                </form>
-            </field>
+        <record id="action_res_groups" model="ir.actions.act_window">
+            <field name="name">Groups</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">res.groups</field>
+            <field name="view_type">form</field>
+            <field name="help">A group is a set of functional areas that will be assigned to the user in order to give them access and rights to specific applications and tasks in the system. You can create custom groups or edit the ones existing by default in order to customize the view of the menu that users will be able to see. Whether they can have a read, write, create and delete access right can be managed from here.</field>
         </record>
+        <menuitem action="action_res_groups" id="menu_action_res_groups" parent="base.menu_users" groups="base.group_no_one"/>
 
+        <!-- res.users -->
         <record id="view_users_form" model="ir.ui.view">
             <field name="name">res.users.form</field>
             <field name="model">res.users</field>
@@ -153,17 +123,6 @@
                 </form>
             </field>
         </record>
-
-        <record id="user_groups_view" model="ir.ui.view">
-            <field name="name">res.users.groups</field>
-            <field name="model">res.users</field>
-            <field name="inherit_id" ref="view_users_form"/>
-            <field name="arch" type="xml">
-                <!-- dummy, will be modified by groups -->
-                <field name="groups_id" position="after"/>
-            </field>
-        </record>
-
         <record id="view_users_tree" model="ir.ui.view">
             <field name="name">res.users.tree</field>
             <field name="model">res.users</field>
@@ -177,7 +136,6 @@
                 </tree>
             </field>
         </record>
-
         <record id="view_users_search" model="ir.ui.view">
             <field name="name">res.users.search</field>
             <field name="model">res.users</field>
@@ -190,110 +148,81 @@
                 </search>
             </field>
         </record>
-
-        <!--
-    ======================
-    Company
-    ======================
-    -->
-
-        <report id="preview_report" model="res.company" name="preview.report" multi="True"
-            rml="base/report/preview_report.rml" string="Preview Report"/>
-
-        <record id="bank_account_update" model="ir.actions.act_window">
-            <field name="name">Company Bank Accounts</field>
-            <field name="res_model">res.partner.bank</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="context" eval="{'default_partner_id':ref('base.main_partner'), 'company_hide':False, 'default_company_id':ref('base.main_company'), 'search_default_my_bank':1}"/>
-            <field name="help">Configure your company's bank accounts and select those that must appear on the report footer. You can reorder bank accounts from the list view. If you use the accounting application of OpenERP, journals and accounts will be created automatically based on these data.</field>
-        </record>
-
-
-        <record id="view_company_form" model="ir.ui.view">
-            <field name="name">res.company.form</field>
-            <field name="model">res.company</field>
-            <field name="type">form</field>
+        <record id="user_groups_view" model="ir.ui.view">
+            <field name="name">res.users.groups</field>
+            <field name="model">res.users</field>
+            <field name="inherit_id" ref="view_users_form"/>
             <field name="arch" type="xml">
-                <form string="Company">
-                    <group colspan="4" col="6">
-                        <group colspan="4" col="4">
-                            <field name="name"/>
-                            <field name="partner_id" readonly="1" required="0" groups="base.group_no_one"/>
-                            <field name="parent_id"  groups="base.group_multi_company"/>
-                        </group>
-                        <group colspan="2" col="2">
-                            <field name="logo" nolabel="1" widget="image"/>
-                        </group>
+                <!-- dummy, will be modified by groups -->
+                <field name="groups_id" position="after"/>
+            </field>
+        </record>
+        <record id="action_res_users" model="ir.actions.act_window">
+            <field name="name">Users</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">res.users</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="view_users_tree"/>
+            <field name="search_view_id" ref="view_users_search"/>
+            <field name="help">Create and manage users that will connect to the system. Users can be deactivated should there be a period of time during which they will/should not connect to the system. You can assign them groups in order to give them specific access to the applications they need to use in the system.</field>
+        </record>
+        <record id="action_res_users_view1" model="ir.actions.act_window.view">
+            <field eval="10" name="sequence"/>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="view_users_tree"/>
+            <field name="act_window_id" ref="action_res_users"/>
+        </record>
+        <record id="action_res_users_view2" model="ir.actions.act_window.view">
+            <field eval="20" name="sequence"/>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="view_users_form"/>
+            <field name="act_window_id" ref="action_res_users"/>
+        </record>
+        <menuitem action="action_res_users" id="menu_action_res_users" parent="base.menu_users"/>
+
+        <record id="view_users_form_simple_modif" model="ir.ui.view">
+            <field name="name">res.users.preferences.form</field>
+            <field name="model">res.users</field>
+            <field name="type">form</field>
+            <field eval="18" name="priority"/>
+            <field name="arch" type="xml">
+                <form string="Users">
+                    <field name="avatar" widget='image' nolabel="1" colspan="2" on_change="onchange_avatar(avatar)" readonly="0"/>
+                    <group colspan="2" col="2">
+                        <field name="name" readonly="1"/>
+                        <field name="context_lang" readonly="0"/>
+                        <field name="context_tz" readonly="0"/>
+                        <field name="menu_tips" readonly="0" groups="base.group_no_one"/>
                     </group>
-                    <notebook colspan="4">
-                        <page string="General Information">
-                            <separator string="Address Information" colspan="4"/>
-                            <field name="street" colspan="4"/>
-                            <field name="street2" invisible="1"/>
-                            <field name="zip"/>
-                            <field name="city"/>
-                            <field name="country_id"/>
-                            <field name="state_id"/>
-                            <field name="phone" on_change="on_change_header(phone, email, fax, website, vat, company_registry)"/>
-                            <field name="email" on_change="on_change_header(phone, email, fax, website, vat, company_registry)"/>
-                            <field name="fax" on_change="on_change_header(phone, email, fax, website, vat, company_registry)"/>
-                            <field name="website" on_change="on_change_header(phone, email, fax, website, vat, company_registry)"/>
-                            <field name="vat" on_change="on_change_header(phone, email, fax, website, vat, company_registry)"/>
-                            <field name="company_registry" on_change="on_change_header(phone, email, fax, website, vat, company_registry)"/>
-                            <separator string="Header/Footer of Reports" colspan="4"/>
-                            <group colspan="4" col="3">
-                                <field name="rml_header1" colspan="3"/>
-                                <newline/>
-                                <field name="rml_footer1" colspan="3" groups="base.group_no_one"/>
-                                <newline/>
-                                <field name="rml_footer2" colspan="2"/>
-                                <button name="%(bank_account_update)d" string="Set Bank Accounts" type="action" icon="gtk-go-forward"/>
-                                <newline/>
-                                <label string="" colspan="2"/>
-                                <button name="%(preview_report)d" string="Preview Header" type="action" icon="gtk-print"/>
-                            </group>
-                        </page>
-                        <page string="Header/Footer" groups="base.group_no_one">
-                            <group colspan="2" col="4">
-                               <field name="paper_format" on_change="onchange_paper_format(paper_format)"/>
-                            </group>
-                            <field colspan="4" name="rml_header" nolabel="1"/>
-                        </page>
-                        <page string="Internal Header/Footer" groups="base.group_no_one">
-                            <separator string="Portrait" colspan="2"/>
-                            <separator string="Landscape" colspan="2"/>
-                            <field colspan="2" name="rml_header2" nolabel="1"/>
-                            <field colspan="2" name="rml_header3" nolabel="1"/>
-                        </page>
-                        <page string="Configuration">
-                            <separator string="Accounting" colspan="4"/>
-                            <field name="currency_id" colspan="2"/>
-                            <newline/>
-                        </page>
-                        <page string="Bank Accounts">
-                          <field name="bank_ids" nolabel="1"/>
-                        </page>
-                    </notebook>
+                    <group name="default_filters" colspan="4" col="2">
+                        <separator string="Default Filters" colspan="2"/>
+                        <field name="company_id" widget="selection" readonly="0" groups="base.group_multi_company" on_change="on_change_company_id(company_id)"/>
+                    </group>
+                    <separator string="Email Preferences" colspan="4"/>
+                    <field colspan="4" name="user_email" widget="email" readonly="0"/>
+                    <field colspan="4" name="signature" readonly="0"/>
                 </form>
             </field>
         </record>
-        <record id="view_company_tree" model="ir.ui.view">
-            <field name="name">res.company.tree</field>
-            <field name="model">res.company</field>
-            <field name="type">tree</field>
-            <field name="field_parent">child_ids</field>
-            <field name="arch" type="xml">
-                <tree string="Companies">
-                    <field name="name"/>
-                    <field name="partner_id"/>
-                </tree>
-            </field>
+        <record id="action_res_users_my" model="ir.actions.act_window">
+            <field name="name">Change My Preferences</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">res.users</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form,tree</field>
+            <field name="domain">[('id','=',uid)]</field>
         </record>
-        
-        <record id="category_administration_config" model="ir.actions.todo.category">
-            <field name="name">Administration</field>
-            <field name="sequence">1</field>
+        <record id="action_res_users_my_view1" model="ir.actions.act_window.view">
+            <field eval="20" name="sequence"/>
+            <field name="view_mode">tree</field>
+            <field name="act_window_id" ref="action_res_users_my"/>
         </record>
+        <record id="action_res_users_my_view2" model="ir.actions.act_window.view">
+            <field eval="10" name="sequence"/>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="view_users_form_simple_modif"/>
+            <field name="act_window_id" ref="action_res_users_my"/>
+        </record>
+
     </data>
 </openerp>