diff options
| author | Mustufa Rangwala (OpenERP) <mra@tinyerp.com> | 2012-08-13 10:35:23 +0530 |
|---|---|---|
| committer | Mustufa Rangwala (OpenERP) <mra@tinyerp.com> | 2012-08-13 10:35:23 +0530 |
| commit | 952bf3001d13cd17c7ede6456cd4d9b2c7c8c8a5 (patch) | |
| tree | 6846da129de8561a507a6e22a0fb972dc1f5edb5 /addons/plugin | |
| parent | 4546c6fe3c3abfabc29d4595985e06178fae4bd0 (diff) | |
| parent | 9211174a6fbbec8d2637c7d9295714c1657dd8ee (diff) | |
[MERGE] Merge from main addons
bzr revid: mra@tinyerp.com-20120813050523-wgxqhbptiy0v75eq
Diffstat (limited to 'addons/plugin')
| -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): |