← Back to branch summary

~openobject-training/+junk/client-training

« back to all changes in this revision

Viewing changes to bin/modules/gui/window/view_tree/view_tree.py

[MERGE]

Show diffs side-by-side

added added

removed removed

Lines of Context:
bin/modules/gui/window/view_tree/view_tree.py
35
35
import options
36
36
import rpc
37
37
import parse
 
38
import pytz
38
39
 
39
40
import tools
40
41
import tools.datetime_util
97
98
                    if x[field]:
98
99
                        date = time.strptime(x[field], DHM_FORMAT)
99
100
                        if rpc.session.context.get('tz'):
100
 
                            try:
101
 
                                import pytz
102
 
                                lzone = pytz.timezone(rpc.session.context['tz'])
103
 
                                szone = pytz.timezone(rpc.session.timezone)
104
 
                                dt = DT.datetime(date[0], date[1], date[2],
105
 
                                        date[3], date[4], date[5], date[6])
106
 
                                sdt = szone.localize(dt, is_dst=True)
107
 
                                ldt = sdt.astimezone(lzone)
108
 
                                date = ldt.timetuple()
109
 
                            except:
110
 
                                #ignore and consider client is in server TZ
111
 
                                pass
 
101
                            lzone = pytz.timezone(rpc.session.context['tz'])
 
102
                            szone = pytz.timezone(rpc.session.timezone)
 
103
                            dt = DT.datetime(date[0], date[1], date[2],
 
104
                                    date[3], date[4], date[5], date[6])
 
105
                            sdt = szone.localize(dt, is_dst=True)
 
106
                            ldt = sdt.astimezone(lzone)
 
107
                            date = ldt.timetuple()
112
108
                        x[field] = time.strftime(display_format, date)
 
109
 
113
110
            if self.fields_type[field]['type'] in ('one2one','many2one'):
114
111
                for x in res_ids:
115
112
                    if x[field]:
116
113
                        x[field] = x[field][1]
 
114
 
117
115
            if self.fields_type[field]['type'] in ('selection'):
118
116
                for x in res_ids:
119
117
                    if x[field]: