RavishchandraMurari(OpenERP) has proposed merging
lp:~openerp-dev/openobject-server/trunk-usability-remove_address_id-rmu into
lp:~openerp-dev/openobject-server/trunk-usability.
Requested reviews:
Amit (Open ERP) (apa-tiny)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-usability-remove_address_id-rmu/+merge/63523
hello sir
I have done all the required changes....
thanks.
ravish murari
--
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-usability-remove_address_id-rmu/+merge/63523
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-server/trunk-usability.
=== modified file 'openerp/addons/base/base_update.xml'
--- openerp/addons/base/base_update.xml 2011-01-06 17:38:28 +0000
+++ openerp/addons/base/base_update.xml 2011-06-06 07:39:54 +0000
@@ -92,7 +92,6 @@
<field name="context_tz" completion="1" readonly="0"/>
<field name="menu_tips" colspan="2" readonly="0"/>
<separator string="Email & Signature" colspan="4"/>
- <group colspan="4"><field name="user_email" widget="email" readonly="0"/></group>
<field colspan="4" name="signature" readonly="0" nolabel="1"/>
</page>
</notebook>
@@ -119,7 +118,6 @@
context="{'user_preference': 0}"
groups="base.group_multi_company"
/>
- <field name="address_id"/>
<field name="user_email" widget="email"/>
</group>
<group colspan="1" col="2" groups="base.group_extended">
@@ -175,7 +173,6 @@
<search string="Users">
<field name="name"/>
<field name="login"/>
- <field name="address_id" string="Address"/>
<field name="company_ids" string="Company" groups="base.group_multi_company"/>
</search>
</field>
=== modified file 'openerp/addons/base/res/res_user.py'
--- openerp/addons/base/res/res_user.py 2011-05-06 09:37:04 +0000
+++ openerp/addons/base/res/res_user.py 2011-06-06 07:39:54 +0000
@@ -217,11 +217,13 @@
fnct_inv=_set_new_password,
string='Change password', help="Only specify a value if you want to change the user password. "
"This user will have to logout and login again!"),
- 'email': fields.char('E-mail', size=64,
+
+ 'user_email': fields.char('E-mail', size=64,
help='If an email is provided, the user will be sent a message '
'welcoming him.\n\nWarning: if "email_from" and "smtp_server"'
" aren't configured, it won't be possible to email new "
"users."),
+
'signature': fields.text('Signature', size=64),
'address_id': fields.many2one('res.partner.address', 'Address'),
'active': fields.boolean('Active'),
@@ -245,7 +247,7 @@
'view': fields.function(_get_interface_type, method=True, type='selection', fnct_inv=_set_interface_type,
selection=[('simple','Simplified'),('extended','Extended')],
string='Interface', help="Choose between the simplified interface and the extended one"),
- 'user_email': fields.function(_email_get, method=True, fnct_inv=_email_set, string='Email', type="char", size=240),
+
'menu_tips': fields.boolean('Menu Tips', help="Check out this box if you want to always display tips on each menu action"),
'date': fields.datetime('Last Connection', readonly=True),
}
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
