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

[MERGE] Less intrusive timezone offset warning (corresponds to web branch) 

bzr revid: odo@openerp.com-20121130174819-q8g6m5mhoaczcr8q
This commit is contained in:
Olivier Dony 2012-11-30 18:48:19 +01:00
parent a1d79115e5 dec5b8e761
commit 8fba574007
2 changed files with 2 additions and 2 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

@ -202,7 +202,7 @@ class res_partner(osv.osv, format_address):
help="The partner's timezone, used to output proper date and time values inside printed reports. "
"It is important to set a value for this field. You should use the same timezone "
"that is otherwise used to pick and render date and time values: your computer's timezone."),
'tz_offset': fields.function(_get_tz_offset, type='char', size=5, string='Timezone offset', store=True),
'tz_offset': fields.function(_get_tz_offset, type='char', size=5, string='Timezone offset', invisible=True),
'user_id': fields.many2one('res.users', 'Salesperson', help='The internal user that is in charge of communicating with this contact if any.'),
'vat': fields.char('TIN', size=32, help="Tax Identification Number. Check the box if this contact is subjected to taxes. Used by the some of the legal statements."),
'bank_ids': fields.one2many('res.partner.bank', 'partner_id', 'Banks'),

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

@ -343,7 +343,7 @@ class res_users(osv.osv):
for k in self._all_columns.keys():
if k.startswith('context_'):
context_key = k[8:]
elif k in ['lang', 'tz', 'tz_offset']:
elif k in ['lang', 'tz']:
context_key = k
else:
context_key = False