Nimesh Contractor(Open ERP) has proposed merging
lp:~openerp-dev/openobject-server/trunk-addons15_preferences-nco into
lp:openobject-server.
Requested reviews:
Atul Patel(OpenERP) (atp-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-addons15_preferences-nco/+merge/129101
Hello sir,
I have fix the problem extra blank selection in language field in
preferences.
Remove change password button, highlight the save button.
Thanks,
NCO.
--
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-addons15_preferences-nco/+merge/129101
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-server/trunk-addons15_preferences-nco.
=== modified file 'openerp/addons/base/res/res_partner.py'
--- openerp/addons/base/res/res_partner.py 2012-10-04 13:02:24 +0000
+++ openerp/addons/base/res/res_partner.py 2012-10-11 06:19:20 +0000
@@ -157,7 +157,7 @@
lang_pool = self.pool.get('res.lang')
ids = lang_pool.search(cr, uid, [], context=context)
res = lang_pool.read(cr, uid, ids, ['code', 'name'], context)
- return [(r['code'], r['name']) for r in res] + [('','')]
+ return [(r['code'], r['name']) for r in res]
POSTAL_ADDRESS_FIELDS = ('street', 'street2', 'zip', 'city', 'state_id', 'country_id')
ADDRESS_FIELDS = POSTAL_ADDRESS_FIELDS + ('email', 'phone', 'fax', 'mobile', 'website', 'ref', 'lang')
@@ -189,7 +189,7 @@
'parent_id': fields.many2one('res.partner', 'Company'),
'child_ids': fields.one2many('res.partner', 'parent_id', 'Contacts'),
'ref': fields.char('Reference', size=64, select=1),
- 'lang': fields.selection(_lang_get, 'Language',
+ 'lang': fields.selection(_lang_get, 'Language', required=True,
help="If the selected language is loaded in the system, all documents related to this contact will be printed in this language. If not, it will be English."),
'tz': fields.selection(_tz_get, 'Timezone', size=64,
help="The partner's timezone, used to output proper date and time values inside printed reports. "
=== modified file 'openerp/addons/base/res/res_users.py'
--- openerp/addons/base/res/res_users.py 2012-10-05 10:12:20 +0000
+++ openerp/addons/base/res/res_users.py 2012-10-11 06:19:20 +0000
@@ -486,13 +486,6 @@
'tag': 'reload',
}
- def preference_change_password(self, cr, uid, ids, context=None):
- return {
- 'type': 'ir.actions.client',
- 'tag': 'change_password',
- 'target': 'new',
- }
-
def has_group(self, cr, uid, group_ext_id):
"""Checks whether user belongs to given group.
=== modified file 'openerp/addons/base/res/res_users_view.xml'
--- openerp/addons/base/res/res_users_view.xml 2012-09-29 11:42:36 +0000
+++ openerp/addons/base/res/res_users_view.xml 2012-10-11 06:19:20 +0000
@@ -213,8 +213,7 @@
<field name="signature" readonly="0"/>
</group>
<footer>
- <button name="preference_change_password" type="object" string="Change password"/>
- <button name="preference_save" type="object" string="Save"/>
+ <button name="preference_save" type="object" class="oe_highlight" string="Save"/>
or
<button name="preference_cancel" string="Cancel" special="cancel" class="oe_link"/>
</footer>
_______________________________________________
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
