[MERGE] merge formatting fix from trunk-new-graphview-ged (date formatting)

bzr revid: ged@openerp.com-20140130155240-tfygb8jqe1bs545w
2014-01-30 16:52:40 +01:00
parent bc39772f0a e98a1a8f64
commit fe4f692793
1 changed files with 4 additions and 4 deletions
@@ -2680,13 +2680,13 @@ class BaseModel(object):
                        interval = 'month'

                    if interval == 'day':
-                        display_format = 'dd MMMM YYYY' 
+                        display_format = 'dd MMM YYYY' 
                    elif interval == 'week':
-                        display_format = "'W'w"
+                        display_format = "'W'w YYYY"
                    elif interval == 'month':
-                        display_format = 'MMMM'
+                        display_format = 'MMMM YYYY'
                    elif interval == 'quarter':
-                        display_format = 'QQQ'
+                        display_format = 'QQQ YYYY'
                    elif interval == 'year':
                        display_format = 'YYYY'