diff options
| author | Denis Ledoux <dle@odoo.com> | 2014-08-13 10:45:36 +0200 |
|---|---|---|
| committer | Denis Ledoux <dle@odoo.com> | 2014-08-13 10:45:36 +0200 |
| commit | fe83c11301b1d2449b45701869269837ad9ac0fc (patch) | |
| tree | 874a0f01ca6e0c6b6915853c5bf491ea2a2c5fc5 /addons/website_customer/controllers | |
| parent | bbbd1465e5c35ad5d4349a7f0a4509776fc862fb (diff) | |
| parent | b49755b54554c1f85a53b4283a3b513400b82096 (diff) | |
[MERGE] forward port of branch saas-4 up to b49755b
The forward port of the fix 3609ba10f2d00a608d8f32334ae1b9a25b34f037 will be done separately, as the mrp scheduler has been completely refactored from saas-5.
Conflicts:
addons/l10n_be_coda/wizard/account_coda_import.py
addons/point_of_sale/static/src/xml/pos.xml
addons/procurement/schedulers.py
Diffstat (limited to 'addons/website_customer/controllers')
| -rw-r--r-- | addons/website_customer/controllers/main.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/addons/website_customer/controllers/main.py b/addons/website_customer/controllers/main.py index d4b996a0ab6..02a42b0b621 100644 --- a/addons/website_customer/controllers/main.py +++ b/addons/website_customer/controllers/main.py @@ -59,8 +59,11 @@ class WebsiteCustomer(http.Controller): partner_count = partner_obj.search_count(cr, openerp.SUPERUSER_ID, domain, context=request.context) # pager + url = '/customers/' + if country_id: + url += 'country/%s' % country_id pager = request.website.pager( - url="/customers", total=partner_count, page=page, step=self._references_per_page, + url=url, total=partner_count, page=page, step=self._references_per_page, scope=7, url_args=post ) |