summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabien Pinckaers <fp@tinyerp.com>2010-03-02 22:47:39 +0100
committerFabien Pinckaers <fp@tinyerp.com>2010-03-02 22:47:39 +0100
commit9ded20ae70329312b4d672e9b64e3f0fe8a8cd11 (patch)
tree675584f6571e2dabb5f700731f481e853c5e41eb
parent044b13980c64aa5a2de8bc8cdfcd88fe1e827190 (diff)
[IMP] removed this month
bzr revid: fp@tinyerp.com-20100302214739-uwq4kgmh01a7xoxi
-rw-r--r--bin/osv/orm.py6
-rw-r--r--bin/report/render/rml2pdf/trml2pdf.py2
2 files changed, 2 insertions, 6 deletions
diff --git a/bin/osv/orm.py b/bin/osv/orm.py
index 88058aa10c3..c0caf70087c 100644
--- a/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@ -1893,11 +1893,7 @@ class orm(orm_template):
dt = datetime.datetime.strptime(alldata[d['id']][groupby][:7],'%Y-%m')
days = calendar.monthrange(dt.year, dt.month)[1]
- if d[groupby][:7] == today.strftime('%Y-%m'):
- d[groupby] = 'This Month'
- else:
- d[groupby] = datetime.datetime.strptime(d[groupby][:10],'%Y-%m-%d').strftime('%B %Y')
-
+ d[groupby] = datetime.datetime.strptime(d[groupby][:10],'%Y-%m-%d').strftime('%B %Y')
d['__domain'] = [(groupby,'>=',alldata[d['id']][groupby] and datetime.datetime.strptime(alldata[d['id']][groupby][:7] + '-01','%Y-%m-%d').strftime('%Y-%m-%d') or False),\
(groupby,'<=',alldata[d['id']][groupby] and datetime.datetime.strptime(alldata[d['id']][groupby][:7] + '-' + str(days),'%Y-%m-%d').strftime('%Y-%m-%d') or False)] + domain
elif fget[groupby]['type'] == 'many2one':
diff --git a/bin/report/render/rml2pdf/trml2pdf.py b/bin/report/render/rml2pdf/trml2pdf.py
index 920d89a8479..0574f563c90 100644
--- a/bin/report/render/rml2pdf/trml2pdf.py
+++ b/bin/report/render/rml2pdf/trml2pdf.py
@@ -135,7 +135,7 @@ class _rml_styles(object,):
sys.stderr.write('Warning: style not found, %s - setting default!\n' % (node.get('style'),) )
if not style:
styles = reportlab.lib.styles.getSampleStyleSheet()
- style = copy.deepcopy(styles['Normal'])
+ style = styles['Normal']
style.__dict__.update(self._para_style_update(node))
return style