diff options
| author | pso (OpenERP) <pso@tinyerp.com> | 2012-08-09 17:53:58 +0530 |
|---|---|---|
| committer | pso (OpenERP) <pso@tinyerp.com> | 2012-08-09 17:53:58 +0530 |
| commit | b08b3c64d1928ff4fef6c5cf94bcd1fd3467d0b7 (patch) | |
| tree | 8fb822fc555df08422d1db5764bc0ae718558f07 /addons/plugin | |
| parent | e350501add726e85d9b51b8b7d5d9f83e3e80089 (diff) | |
| parent | a59933de2cd15f24b39f73fe49494de2345fb4cb (diff) | |
[MERGE] Merged with main branch
bzr revid: pso@tinyerp.com-20120809122358-031mjff70sgr62rb
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): |