[MERGE] Forward-port saas-4 up to 5ceded9

1 files changed, 3 insertions, 5 deletions

diff --git a/addons/website_customer/controllers/main.py b/addons/website_customer/controllers/main.py
index 3e396f23fcf..fcb2d0d8ded 100644
--- a/addons/website_customer/controllers/main.py
+++ b/addons/website_customer/controllers/main.py
@@ -1,9 +1,8 @@
 # -*- coding: utf-8 -*-
-import re
-
 import openerp
 from openerp import SUPERUSER_ID
 from openerp.addons.web import http
+from openerp.addons.website.models.website import unslug
 from openerp.tools.translate import _
 from openerp.addons.web.http import request
 import werkzeug.urls
@@ -84,9 +83,8 @@ class WebsiteCustomer(http.Controller):
     # Do not use semantic controller due to SUPERUSER_ID
     @http.route(['/customers/<partner_id>'], type='http', auth="public", website=True)
     def partners_detail(self, partner_id, **post):
-        mo = re.search('-([-0-9]+)$', str(partner_id))
-        if mo:
-            partner_id = int(mo.group(1))
+        _, partner_id = unslug(partner_id)
+        if partner_id:
             partner = request.registry['res.partner'].browse(request.cr, SUPERUSER_ID, partner_id, context=request.context)
             if partner.exists() and partner.website_published:
                 values = {}