diff options
| author | Denis Ledoux <dle@odoo.com> | 2014-08-13 10:45:36 +0200 |
|---|---|---|
| committer | Denis Ledoux <dle@odoo.com> | 2014-08-13 10:45:36 +0200 |
| commit | fe83c11301b1d2449b45701869269837ad9ac0fc (patch) | |
| tree | 874a0f01ca6e0c6b6915853c5bf491ea2a2c5fc5 /addons/calendar/controllers | |
| parent | bbbd1465e5c35ad5d4349a7f0a4509776fc862fb (diff) | |
| parent | b49755b54554c1f85a53b4283a3b513400b82096 (diff) | |
[MERGE] forward port of branch saas-4 up to b49755b
The forward port of the fix 3609ba10f2d00a608d8f32334ae1b9a25b34f037 will be done separately, as the mrp scheduler has been completely refactored from saas-5.
Conflicts:
addons/l10n_be_coda/wizard/account_coda_import.py
addons/point_of_sale/static/src/xml/pos.xml
addons/procurement/schedulers.py
Diffstat (limited to 'addons/calendar/controllers')
| -rw-r--r-- | addons/calendar/controllers/main.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/addons/calendar/controllers/main.py b/addons/calendar/controllers/main.py index 7480c85d629..64e074d9624 100644 --- a/addons/calendar/controllers/main.py +++ b/addons/calendar/controllers/main.py @@ -54,7 +54,7 @@ class meeting_invitation(http.Controller): # Function used, in RPC to check every 5 minutes, if notification to do for an event or not @http.route('/calendar/notify', type='json', auth="none") def notify(self): - registry = openerp.modules.registry.RegistryManager.get(request.session.db) + registry = request.registry uid = request.session.uid context = request.session.context with registry.cursor() as cr: @@ -63,7 +63,7 @@ class meeting_invitation(http.Controller): @http.route('/calendar/notify_ack', type='json', auth="none") def notify_ack(self, type=''): - registry = openerp.modules.registry.RegistryManager.get(request.session.db) + registry = request.registry uid = request.session.uid context = request.session.context with registry.cursor() as cr: |