odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE] trunk-fp 

bzr revid: fp@tinyerp.com-20121022174451-ez1yw4d37y3okfk6
This commit is contained in:
Fabien Pinckaers 2012-10-22 19:44:51 +02:00
parent 2e4585594e 7ee91c1d29
commit 7501a8b9ad
4 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openerp/addons/base/res/res_partner.py
View File

@ -157,7 +157,7 @@ def _lang_get(self, cr, uid, context=None):
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')

1
openerp/addons/base/res/res_partner_view.xml
View File

@ -85,6 +85,7 @@
<field name="is_company" invisible="1"/>
<field name="country" invisible="1"/>
<field name="country_id" invisible="1"/>
<field name="parent_id" invisible="1"/>
</tree>
</field>
</record>

7
openerp/addons/base/res/res_users.py
View File

@ -486,13 +486,6 @@ class res_users(osv.osv):
'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.

3
openerp/addons/base/res/res_users_view.xml
View File

@ -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>