Merge lp:~openerp-dev/openobject-server/trunk-bug-1098300-dhr into lp:openobject-server

[Dharti Ratani(OpenERP)]

Unmerged revisions

4769. By Dharti Ratani(OpenERP) on 2013-01-24

[FIX]Solved warning while creating user from employee form

=== modified file 'openerp/addons/base/res/res_users_view.xml'
--- openerp/addons/base/res/res_users_view.xml	2012-12-20 12:52:01 +0000
+++ openerp/addons/base/res/res_users_view.xml	2013-01-25 05:40:30 +0000
@@ -101,6 +101,8 @@
                         <h1>
                             <field name="name" default_focus="1" placeholder="Name" />
                         </h1>
+			<label for="login" class="oe_edit_only"/>
+                        <h2><field name="login"/></h2>
                         <field name="category_id" widget="many2many_tags" placeholder="Tags..."/>
                     </div>
                     <group>