[MERGE] Fixes some posting/email_template issues. Also cleans an old hack about res.users view redirected to its related res.partner.

Server-side:
- removed the hack about redirecting the user form view on its related partner form view
- added a simplified profile form view on the user, used for example to preview salesmen in opportunities

bzr revid: tde@openerp.com-20121115125124-rreg8bcim9nnauxr

2 files changed, 43 insertions, 11 deletions

diff --git a/openerp/addons/base/res/res_users.py b/openerp/addons/base/res/res_users.py
index f975d39b300..3aee2ed630b 100644
--- a/openerp/addons/base/res/res_users.py
+++ b/openerp/addons/base/res/res_users.py
@@ -250,17 +250,6 @@ class res_users(osv.osv):
         'image': lambda self, cr, uid, ctx={}: self.pool.get('res.partner')._get_default_image(cr, uid, False, ctx, colorize=True),
     }
 
-    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
-        """ Override of res.users fields_view_get.
-            - if the view is specified: resume with normal behavior
-            - else: the default view is overrided and redirected to the partner
-              view
-        """
-        #made a lot of views crash because methods of open chatter are not available on users
-        #if not view_id and view_type == 'form':
-        #    return self.pool.get('res.partner').fields_view_get(cr, uid, view_id, view_type, context, toolbar, submenu)
-        return super(res_users, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar, submenu)
-
     # User can write on a few of his own fields (but not his groups for example)
     SELF_WRITEABLE_FIELDS = ['password', 'signature', 'action_id', 'company_id', 'email', 'name', 'image', 'image_medium', 'image_small', 'lang', 'tz']
     # User can read a few of his own fields
diff --git a/openerp/addons/base/res/res_users_view.xml b/openerp/addons/base/res/res_users_view.xml
index cfab4b7d341..b5c88e4c24b 100644
--- a/openerp/addons/base/res/res_users_view.xml
+++ b/openerp/addons/base/res/res_users_view.xml
@@ -83,6 +83,49 @@
 
 
         <!-- res.users -->
+        <record id="view_users_simple_form" model="ir.ui.view">
+            <field name="name">res.users.simplified.form</field>
+            <field name="model">res.users</field>
+            <field name="priority">1</field>
+            <field name="arch" type="xml">
+                <form string="Contact" version="7.0">
+                    <sheet>
+                    <field name="image" widget='image' class="oe_left oe_avatar" options='{"preview_image": "image_medium", "size": [90, 90]}'/>
+                    <div class="oe_title">
+                        <div class="oe_edit_only">
+                            <label for="name"/> (
+                        </div>
+                        <h1>
+                            <field name="name" default_focus="1" placeholder="Name" />
+                        </h1>
+                        <field name="category_id" widget="many2many_tags" placeholder="Tags..."/>
+                    </div>
+                    <group>
+                        <group>
+                            <label for="street" string="Address"/>
+                            <div>
+                                <field name="street" placeholder="Street..."/>
+                                <field name="street2"/>
+                                <div class="address_format">
+                                    <field name="city" placeholder="City" style="width: 40%%"/>
+                                    <field name="state_id" class="oe_no_button" placeholder="State" style="width: 37%%" options='{"no_open": True}' on_change="onchange_state(state_id)"/>
+                                    <field name="zip" placeholder="ZIP" style="width: 20%%"/>
+                                </div>
+                                <field name="country_id" placeholder="Country" class="oe_no_button" options='{"no_open": True}'/>
+                            </div>
+                            <field name="website" widget="url" placeholder="e.g. www.openerp.com"/>
+                        </group>
+                        <group>
+                            <field name="phone" placeholder="e.g. +32.81.81.37.00"/>
+                            <field name="mobile"/>
+                            <field name="fax"/>
+                            <field name="email" widget="email"/>
+                        </group>
+                    </group>
+                </sheet>
+                </form>
+            </field>
+        </record>
         <record id="view_users_form" model="ir.ui.view">
             <field name="name">res.users.form</field>
             <field name="model">res.users</field>