diff options
| author | Gery Debongnie <ged@openerp.com> | 2014-01-30 16:52:40 +0100 |
|---|---|---|
| committer | Gery Debongnie <ged@openerp.com> | 2014-01-30 16:52:40 +0100 |
| commit | fe4f692793ec79ee0592483f3c4aa2cd6da2792d (patch) | |
| tree | 9d039e72cab8075d521a8394cbacbfe0362f72d7 | |
| parent | bc39772f0a2381b507a30dcccf666030dca45c63 (diff) | |
| parent | e98a1a8f646953ec4077b895a410eeefdf714da8 (diff) | |
[MERGE] merge formatting fix from trunk-new-graphview-ged (date formatting)
bzr revid: ged@openerp.com-20140130155240-tfygb8jqe1bs545w
| -rw-r--r-- | openerp/osv/orm.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py index eefbaf7421f..d51fffa9bfe 100644 --- a/openerp/osv/orm.py +++ b/openerp/osv/orm.py @@ -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' |