← Back to branch summary

~therp-nl/openobject-server/trunk_lp1188136

« back to all changes in this revision

Viewing changes to openerp/osv/orm.py

  • Committer: Thibault Delavallée
  • Date: 2013-10-03 15:01:38 UTC
  • mfrom: (4955.1.2 saas-2)
  • Revision ID: tde@openerp.com-20131003150138-dgi593kd3n0vflgp
[FORWARD] Forward port of saas-2 fixes until revision 4957 chs@openerp.com-20130930125946-exr791f83seaa9br

Show diffs side-by-side

added added

removed removed

Lines of Context:
openerp/osv/orm.py
39
39
 
40
40
"""
41
41
 
42
 
import babel.dates
43
42
import calendar
44
43
import collections
45
44
import copy
54
53
import traceback
55
54
import types
56
55
 
 
56
import babel.dates
 
57
import dateutil.parser
57
58
import psycopg2
58
59
from lxml import etree
59
60
 
2736
2737
                        d['__context'] = {'group_by': groupby_list[1:]}
2737
2738
            if groupby and groupby in fget:
2738
2739
                if d[groupby] and fget[groupby]['type'] in ('date', 'datetime'):
2739
 
                    groupby_datetime = datetime.datetime.strptime(alldata[d['id']][groupby], '%Y-%m-%d')
 
2740
                    _default = datetime.datetime(1970, 1, 1)    # force starts of month
 
2741
                    groupby_datetime = dateutil.parser.parse(alldata[d['id']][groupby], default=_default)
2740
2742
                    d[groupby] = babel.dates.format_date(
2741
2743
                        groupby_datetime, format=group_by_params.get('display_format', 'MMMM yyyy'), locale=context.get('lang', 'en_US'))
2742
2744
                    if group_by_params.get('interval') == 'month':