diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py index fb4387fb3ae..5d4c10eb242 100644 --- a/openerp/addons/base/res/res_partner.py +++ b/openerp/addons/base/res/res_partner.py @@ -74,7 +74,8 @@ class format_address(object): def _tz_get(self,cr,uid, context=None): - return [(x, x) for x in pytz.all_timezones] + # put POSIX 'Etc/*' entries at the end to avoid confusing users - see bug 1086728 + return [(tz,tz) for tz in sorted(pytz.all_timezones, key=lambda tz: tz if not tz.startswith('Etc/') else '_')] class res_partner_category(osv.osv):