From 331b2a4c64aee45612a502af034671d131c3f622 Mon Sep 17 00:00:00 2001
From: Yannick Vaucher <yannick.vaucher@camptocamp.com>
Date: Wed, 20 Feb 2013 13:43:45 +0100
Subject: [PATCH] [FIX] partner_firstname name not editable in user view

---
 partner_firstname/__openerp__.py    |  7 +++++--
 partner_firstname/res_user.py       |  7 ++++---
 partner_firstname/res_user_view.xml | 15 +++++++++++++++
 3 files changed, 24 insertions(+), 5 deletions(-)
 create mode 100644 partner_firstname/res_user_view.xml

diff --git a/partner_firstname/__openerp__.py b/partner_firstname/__openerp__.py
index b2cae6906..17d7d93e5 100644
--- a/partner_firstname/__openerp__.py
+++ b/partner_firstname/__openerp__.py
@@ -23,12 +23,15 @@
 
 The field 'name' becomes a stored function field concatenating lastname, firstname
 """,
- 'version': '1.0',
+ 'version': '1.0.1',
  'author': 'Camptocamp',
  'category': 'MISC',
  'website': 'http://www.camptocamp.com',
  'depends': ['base'],
- 'data': ['partner_view.xml'],
+ 'data': [
+     'partner_view.xml',
+     'res_user_view.xml',
+     ],
  'demo': [],
  'test': [],
  'auto_install': False,
diff --git a/partner_firstname/res_user.py b/partner_firstname/res_user.py
index 71cf38c1f..8bb093414 100644
--- a/partner_firstname/res_user.py
+++ b/partner_firstname/res_user.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
 ##############################################################################
 #
 #    Author: Nicolas Bessi. Copyright Camptocamp SA
@@ -27,5 +27,6 @@ class ResUsers(orm.Model):
     _inherit = 'res.users'
 
     def create(self, cursor, uid, vals, context=None):
-        vals['name'] = vals['login']
-        return super(ResUsers, self).create(cursor, uid, vals, context=context)
\ No newline at end of file
+        if not 'name' in vals or not vals['name']:
+            vals['name'] = vals['login']
+        return super(ResUsers, self).create(cursor, uid, vals, context=context)
diff --git a/partner_firstname/res_user_view.xml b/partner_firstname/res_user_view.xml
new file mode 100644
index 000000000..22fd1b57b
--- /dev/null
+++ b/partner_firstname/res_user_view.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+  <data>
+    <record id="view_users_form" model="ir.ui.view">
+      <field name="name">res.users.form.firstname</field>
+      <field name="model">res.users</field>
+      <field name="inherit_id" ref="base.view_users_form"/>
+      <field name="arch" type="xml">
+        <field name="name" position="attributes">
+          <attribute name="readonly">False</attribute>
+        </field>
+      </field>
+    </record>
+  </data>
+</openerp>