[MERGE] lp:~openerp-commiter/openobject-server/trunk-preference-fka

bzr revid: kjo@tinyerp.com-20120627064648-zme3bvj2xz9vzuzf

openerp/addons/base/res/res_config.py

@@ -541,4 +541,12 @@ class res_config_settings(osv.osv_memory):
             'tag': 'reload',
         }
 
+    def cancel(self, cr, uid, ids, context=None):
+        # ignore the current record, and send the action to reopen the view
+        act_window = self.pool.get('ir.actions.act_window')
+        action_ids = act_window.search(cr, uid, [('res_model', '=', self._name)])
+        if action_ids:
+            return act_window.read(cr, uid, action_ids[0], [], context=context)
+        return {}
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

openerp/addons/base/res/res_users_view.xml

@@ -202,15 +202,15 @@
                         <h1>
                             <field name="name" readonly="1" class="oe_edit_only"/>
                             (<field name="login" readonly="1" class="oe_edit_only"/>)
-                        </h1>
+                        </h1> 
+                    </div>
+                    <group col="4" string="Preferences">
+                        <field name="context_lang" readonly="0"/>
                         <label for="company_id" class="oe_edit_only"/>
                         <h2>
                             <field name="company_id" widget="selection" readonly="0"
                                 groups="base.group_multi_company" on_change="on_change_company_id(company_id)"/>
                         </h2>
-                    </div>
-                    <group col="4" string="Preferences">
-                        <field name="context_lang" readonly="0"/>
                         <field name="context_tz" readonly="0"/>
                     </group>
                     <group string="Email Preferences">
@@ -222,7 +222,6 @@
             </field>
         </record>
         <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>