summaryrefslogtreecommitdiff
path: root/addons/calendar/controllers/main.py
diff options
context:
space:
mode:
authorRaphael Collet <rco@openerp.com>2014-07-06 16:44:26 +0200
committerAntony Lesuisse <al@openerp.com>2014-07-06 17:05:41 +0200
commitcbe2dbb672a6c55d86f2e515f9d1cdfee426ef80 (patch)
treed6ff62b719fce32392397783c961b734b1e4c50e /addons/calendar/controllers/main.py
parentd78192c489d3be66cd6487b39f5ce7ba4733a187 (diff)
[MERGE] new v8 api by rco
A squashed merge is required as the conversion of the apiculture branch from bzr to git was not correctly done. The git history contains irrelevant blobs and commits. This branch brings a lot of changes and fixes, too many to list exhaustively. - New orm api, objects are now used instead of ids - Environements to encapsulates cr uid context while maintaining backward compatibility - Field compute attribute is a new object oriented way to define function fields - Shared browse record cache - New onchange protocol - Optional copy flag on fields - Documentation update - Dead code cleanup - Lots of fixes
Diffstat (limited to 'addons/calendar/controllers/main.py')
-rw-r--r--addons/calendar/controllers/main.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/addons/calendar/controllers/main.py b/addons/calendar/controllers/main.py
index 7480c85d629..d0fdb47ab0b 100644
--- a/addons/calendar/controllers/main.py
+++ b/addons/calendar/controllers/main.py
@@ -1,7 +1,7 @@
import simplejson
import openerp
-import openerp.addons.web.http as http
-from openerp.addons.web.http import request
+import openerp.http as http
+from openerp.http import request
import openerp.addons.web.controllers.main as webmain
import json
@@ -67,5 +67,5 @@ class meeting_invitation(http.Controller):
uid = request.session.uid
context = request.session.context
with registry.cursor() as cr:
- res = registry.get("res.partner").calendar_last_notif_ack(cr, uid, context=context)
+ res = registry.get("res.partner")._set_calendar_last_notif_ack(cr, uid, context=context)
return res