Odoo Server (MOVED TO GITHUB)

Merge lp:~openerp-dev/openobject-server/saas-3-fix_qweb_evaluator-stw into lp:~openerp/openobject-server/saas-3

  1. saas-3-fix_qweb_evaluator-stw
  2. Merge into saas-3
Proposed by Stephane Wirtel (OpenERP)
Status: Merged
Merged at revision: 5119
Proposed branch: lp:~openerp-dev/openobject-server/saas-3-fix_qweb_evaluator-stw
Merge into: lp:~openerp/openobject-server/saas-3
Diff against target: 19 lines (+2/-1)
1 file modified
openerp/addons/base/ir/ir_ui_view.py (+2/-1)
To merge this branch: bzr merge lp:~openerp-dev/openobject-server/saas-3-fix_qweb_evaluator-stw
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+217032@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'openerp/addons/base/ir/ir_ui_view.py'
2--- openerp/addons/base/ir/ir_ui_view.py 2014-04-23 16:28:27 +0000
3+++ openerp/addons/base/ir/ir_ui_view.py 2014-04-24 12:05:19 +0000
4@@ -22,6 +22,7 @@
5 import copy
6 import datetime
7 import dateutil
8+from dateutil.relativedelta import relativedelta
9 import fnmatch
10 import logging
11 import os
12@@ -866,7 +867,7 @@
13 quote_plus=werkzeug.url_quote_plus,
14 time=time,
15 datetime=datetime,
16- dateutil=dateutil,
17+ relativedelta=relativedelta,
18 )
19 qcontext.update(values)
20

Subscribers

People subscribed via source and target branches