diff options
| author | Vo Minh Thu <vmt@openerp.com> | 2012-08-13 18:06:57 +0200 |
|---|---|---|
| committer | Vo Minh Thu <vmt@openerp.com> | 2012-08-13 18:06:57 +0200 |
| commit | 9822629548894e746a362a5df3c4751c1a8e9a29 (patch) | |
| tree | 4cc6659b431dcd7efae5a7514a81230a87d05fc3 /addons/plugin/plugin_handler.py | |
| parent | 9aa4e7e9db35a2d77ea3ddddddcdae4ec09e66dc (diff) | |
| parent | cdc3e2b33396c02add806b36e9647410cca59aa3 (diff) | |
[MERGE] merged trunk.
bzr revid: vmt@openerp.com-20120813160657-ilujdek8ys4fzhp9
Diffstat (limited to 'addons/plugin/plugin_handler.py')
| -rw-r--r-- | addons/plugin/plugin_handler.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/addons/plugin/plugin_handler.py b/addons/plugin/plugin_handler.py index 700b9648237..e497f902dc2 100644 --- a/addons/plugin/plugin_handler.py +++ b/addons/plugin/plugin_handler.py @@ -19,7 +19,7 @@ class plugin_handler(osv.osv_memory): base_url = self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url', default='http://localhost:8069', context=context) if base_url: user = self.pool.get('res.users').browse(cr, uid, uid, context=context) - base_url += '/web/webclient/login?db=%s&login=%s&key=%s#id=%s&model=%s' % (cr.dbname, user.login, user.password, res_id, model) + base_url += '/login?db=%s&login=%s&key=%s#id=%s&model=%s' % (cr.dbname, user.login, user.password, res_id, model) return base_url def is_installed(self, cr, uid): |