summaryrefslogtreecommitdiff
path: root/addons/plugin/plugin_handler.py
diff options
context:
space:
mode:
authorpso (OpenERP) <pso@tinyerp.com>2012-08-17 12:17:59 +0530
committerpso (OpenERP) <pso@tinyerp.com>2012-08-17 12:17:59 +0530
commit5e10a3fd49334d2afb3082767f720a47f5d522d8 (patch)
tree7bf483067454d141ee2f57f9563467e9917d6ae0 /addons/plugin/plugin_handler.py
parent71cd55490ab73e16811c960f0f45bc9f4aa4aaf0 (diff)
parent9b7e11cb047a889fdd56a5575a05b3f74d7f2730 (diff)
[MERGE] Merged with main branch
bzr revid: pso@tinyerp.com-20120817064759-7f7mv1k20kz3azwb
Diffstat (limited to 'addons/plugin/plugin_handler.py')
-rw-r--r--addons/plugin/plugin_handler.py2
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):