diff options
| author | Christophe Simonis <chs@odoo.com> | 2018-05-09 13:55:27 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2018-05-09 13:55:27 +0200 |
| commit | eeae2b80ea9e679a86ca7c8982e679b9ee9c9023 (patch) | |
| tree | fff56bc907eb6874dc7a9b78382bd9837441b918 /addons | |
| parent | 7b67a1474b4f8df411804cebf8ebd7afa193d0dd (diff) | |
| parent | b793e23ae53b5f1edab8c98bbed7ac5f5f921280 (diff) | |
[MERGE] forward port branch 11.0 up to b793e23ae53
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/stock/models/procurement.py | 2 | ||||
| -rw-r--r-- | addons/website/models/website.py | 3 | ||||
| -rw-r--r-- | addons/website/views/website_templates.xml | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/addons/stock/models/procurement.py b/addons/stock/models/procurement.py index ba047badef8..fd08b362949 100644 --- a/addons/stock/models/procurement.py +++ b/addons/stock/models/procurement.py @@ -77,7 +77,7 @@ class ProcurementRule(models.Model): data = self._get_stock_move_values(product_id, product_qty, product_uom, location_id, name, origin, values, group_id) # Since action_confirm launch following procurement_group we should activate it. - move = self.env['stock.move'].sudo().create(data) + move = self.env['stock.move'].sudo().with_context(force_company=data.get('company_id', False)).create(data) move._action_confirm() return True diff --git a/addons/website/models/website.py b/addons/website/models/website.py index 1a18cae3ca6..0dbb1842235 100644 --- a/addons/website/models/website.py +++ b/addons/website/models/website.py @@ -885,9 +885,10 @@ class Menu(models.Model): for menu in data['data']: menu_id = self.browse(menu['id']) # if the url match a website.page, set the m2o relation - page = self.env['website.page'].search([('url', '=', menu['url'])], limit=1) + page = self.env['website.page'].search(['|', ('url', '=', menu['url']), ('url', '=', '/' + menu['url'])], limit=1) if page: menu['page_id'] = page.id + menu['url'] = page.url elif menu_id.page_id: menu_id.page_id.write({'url': menu['url']}) menu_id.write(menu) diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml index 34e8c8abbfd..2fcfd335f9b 100644 --- a/addons/website/views/website_templates.xml +++ b/addons/website/views/website_templates.xml @@ -74,7 +74,7 @@ <span t-field="submenu.name"/> </a> </li> - <li t-if="submenu.is_visible and submenu.child_id.filtered(lambda menu: menu.is_visible)" t-attf-class="dropdown #{ + <li t-if="submenu.child_id.filtered(lambda menu: menu.is_visible)" t-attf-class="dropdown #{ (submenu.clean_url() and submenu.clean_url() != '/' and any([request.httprequest.path == child.url for child in submenu.child_id if child.url]) or (submenu.clean_url() and request.httprequest.path == submenu.clean_url())) and 'active' }"> |