import openerp
import openerp.service.report
import uuid
+import collections
from werkzeug.exceptions import BadRequest
from datetime import datetime, timedelta
from dateutil import parser
ids = res_lang.search(request.cr, uid, [("code", "=", lang)])
if ids:
lang_params = res_lang.read(request.cr, uid, ids[0], ["date_format", "time_format"])
- format_date = lang_params.get("date_format", '%B-%d-%Y')
- format_time = lang_params.get("time_format", '%I-%M %p')
+
+ # formats will be used for str{f,p}time() which do not support unicode in Python 2, coerce to str
+ format_date = lang_params.get("date_format", '%B-%d-%Y').encode('utf-8')
+ format_time = lang_params.get("time_format", '%I-%M %p').encode('utf-8')
return (format_date, format_time)
def get_display_time_tz(self, cr, uid, ids, tz=False, context=None):
if not tz: # tz can have a value False, so dont do it in the default value of get !
context['tz'] = self.pool.get('res.users').read(cr, SUPERUSER_ID, uid, ['tz'])['tz']
tz = context['tz']
+ tz = tools.ustr(tz).encode('utf-8') # make safe for str{p,f}time()
format_date, format_time = self.get_date_formats(cr, uid, context=context)
date = fields.datetime.context_timestamp(cr, uid, datetime.strptime(start, tools.DEFAULT_SERVER_DATETIME_FORMAT), context=context)
name_get = browse_event[ord].name_get()
if len(name_get) and len(name_get[0]) >= 2:
sort_fields[ord] = name_get[0][1]
-
+ if r_date:
+ sort_fields['sort_start'] = r_date.strftime("%Y%m%d%H%M%S")
+ else:
+ sort_fields['sort_start'] = browse_event['display_start'].replace(' ', '').replace('-', '')
return sort_fields
def get_recurrent_ids(self, cr, uid, event_id, domain, order=None, context=None):
result_data.append(self.get_search_fields(ev, order_fields, r_date=r_date))
if order_fields:
+ uniq = lambda it: collections.OrderedDict((id(x), x) for x in it).values()
+
def comparer(left, right):
for fn, mult in comparers:
result = cmp(fn(left), fn(right))
return 0
sort_params = [key.split()[0] if key[-4:].lower() != 'desc' else '-%s' % key.split()[0] for key in (order or self._order).split(',')]
+ sort_params = uniq([comp if comp not in ['start', 'start_date', 'start_datetime'] else 'sort_start' for comp in sort_params])
+ sort_params = uniq([comp if comp not in ['-start', '-start_date', '-start_datetime'] else '-sort_start' for comp in sort_params])
comparers = [((itemgetter(col[1:]), -1) if col[0] == '-' else (itemgetter(col), 1)) for col in sort_params]
ids = [r['id'] for r in sorted(result_data, cmp=comparer)]