diff options
| author | Jeremy Kersten <jke@odoo.com> | 2018-07-24 17:01:44 +0200 |
|---|---|---|
| committer | Jeremy Kersten <jke@odoo.com> | 2018-08-13 20:16:34 +0200 |
| commit | 602807acdf20ff4f75a1abb7f5fa1be4db3f532d (patch) | |
| tree | 94b96796b1ef42c41be2e320e6bce973787dc9ed /addons/website/data | |
| parent | a45bb90fac04e454e9792dfea82772227e963e17 (diff) | |
[FIX] website: improve/fix menu, copy on unlink, clone page, unique_path, sale_report, ...
Fix bug from the initial poc of JOV
Fix menu creation
- creating a menu would create a 'container' menu in the DB (.create is call without website_id)
then writing on it would copy (if condition to cow) the menu with a website_id leaving the first
one as a menu container unused.
- website_menu should always have a website_id
we dont want to support the multiwebsite system that allow to have generic/specific menu
unlink/write is useless now since we always have a website_id
Make unique_path website dependent, 2 distinct website can have a page with same name
Make Sale report multiwebsite compliant
Make website_id on sale_order / account.invoice as a related stored from partner_id.
Co-authored-by: Derie Romain <rde@odoo.com>
Co-authored-by: Kersten Jérémy <jke@odoo.com>
Diffstat (limited to 'addons/website/data')
| -rw-r--r-- | addons/website/data/website_data.xml | 5 | ||||
| -rw-r--r-- | addons/website/data/website_demo.xml | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/addons/website/data/website_data.xml b/addons/website/data/website_data.xml index 2c5c131f5e7..4842dab2625 100644 --- a/addons/website/data/website_data.xml +++ b/addons/website/data/website_data.xml @@ -10,7 +10,8 @@ </record> <record id="main_menu" model="website.menu"> - <field name="name">Top Menu</field> + <field name="name">Top Menu</field> + <field name="website_id" ref="default_website"/> </record> <record id="menu_homepage" model="website.menu"> @@ -18,6 +19,7 @@ <field name="url">/</field> <field name="parent_id" ref="website.main_menu"/> <field name="sequence" type="int">10</field> + <field name="website_id" ref="default_website"/> </record> <record id="menu_contactus" model="website.menu"> @@ -25,6 +27,7 @@ <field name="url">/contactus</field> <field name="parent_id" ref="website.main_menu"/> <field name="sequence" type="int">60</field> + <field name="website_id" ref="default_website"/> </record> <!-- split between ir_ui_view & website_page record to keep external_id on ir_ui_view --> diff --git a/addons/website/data/website_demo.xml b/addons/website/data/website_demo.xml index d03a65ce01d..61bda1e784e 100644 --- a/addons/website/data/website_demo.xml +++ b/addons/website/data/website_demo.xml @@ -176,7 +176,7 @@ response = request.render("website.template_partner_comment", { <record id="website2_menu_contactus" model="website.menu"> <field name="name">Contact us</field> <field name="url">/contactus</field> - <field name="parent_id" ref="website.main_menu"/> + <field name="parent_id" search="[('website_id', '=', ref('website2')), ('parent_id', '=', False)]"/> <field name="sequence" type="int">60</field> <field name="website_id" ref="website2"/> <field name="page_id" ref="website2_contactus_page" /> |