Skip to content

[IMP] hotel: improve design of demo website#2430

Closed
fw-bot wants to merge 1 commit into
odoo:masterfrom
odoo-dev:master-19.0-website-industry-theme-hotel-bram-540007-fw
Closed

[IMP] hotel: improve design of demo website#2430
fw-bot wants to merge 1 commit into
odoo:masterfrom
odoo-dev:master-19.0-website-industry-theme-hotel-bram-540007-fw

Conversation

@fw-bot

@fw-bot fw-bot commented Jun 29, 2026

Copy link
Copy Markdown

This commit adds a demo website into the /hotel industry module. When
the user installs the industry with demo data, it creates a second
website with a cutting edge look and feel to demonstrate what users can
achieve with the Website Builder.

This paves the way for all future industry websites. It is a first
attempt to define a refined methodology.

Task-6292671

Forward-Port-Of: #2420
Forward-Port-Of: #2370

@robodoo

robodoo commented Jun 29, 2026

Copy link
Copy Markdown
Collaborator

Pull request status dashboard

@fw-bot

fw-bot commented Jun 29, 2026

Copy link
Copy Markdown
Author

@bram-odoo @vava-odoo cherrypicking of pull request #2370 failed.

stdout:

Auto-merging hotel/__manifest__.py
Auto-merging hotel/data/product_template.xml
CONFLICT (content): Merge conflict in hotel/data/product_template.xml
CONFLICT (modify/delete): hotel/demo/website.xml deleted in 4439cd218a3ff9d24484aa8ea389fff3e963ddc3 and modified in 76ce74d58be017c7b371727ff7b6c08afe204926.  Version 76ce74d58be017c7b371727ff7b6c08afe204926 of hotel/demo/website.xml left in tree.
CONFLICT (modify/delete): hotel/demo/website_theme_apply.xml deleted in 4439cd218a3ff9d24484aa8ea389fff3e963ddc3 and modified in 76ce74d58be017c7b371727ff7b6c08afe204926.  Version 76ce74d58be017c7b371727ff7b6c08afe204926 of hotel/demo/website_theme_apply.xml left in tree.
CONFLICT (modify/delete): hotel/demo/website_view.xml deleted in 4439cd218a3ff9d24484aa8ea389fff3e963ddc3 and modified in 76ce74d58be017c7b371727ff7b6c08afe204926.  Version 76ce74d58be017c7b371727ff7b6c08afe204926 of hotel/demo/website_view.xml left in tree.
Auto-merging tests/test_generic/tests/test_xml.py

Either perform the forward-port manually (and push to this branch, proceeding as usual) or close this PR (maybe?).

:shipit: you can use git-fw to re-do the forward-port for you locally.

⚠️ after resolving this conflict, you will need to merge it via @robodoo.

More info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port

This commit adds a demo website into the `/hotel` industry module. When
the user installs the industry with demo data, it creates a second
website with a cutting edge look and feel to demonstrate what users can
achieve with the Website Builder.

This paves the way for all future industry websites. It is a first
attempt to define a refined methodology.

Task-6292671

X-original-commit: e7a75fd
@bram-odoo bram-odoo force-pushed the master-19.0-website-industry-theme-hotel-bram-540007-fw branch from d7df536 to 4042e1e Compare June 29, 2026 12:27
@vava-odoo

Copy link
Copy Markdown
Collaborator

@robodoo override=ci/industry
@robodoo r+

robodoo pushed a commit that referenced this pull request Jun 29, 2026
This commit adds a demo website into the `/hotel` industry module. When
the user installs the industry with demo data, it creates a second
website with a cutting edge look and feel to demonstrate what users can
achieve with the Website Builder.

This paves the way for all future industry websites. It is a first
attempt to define a refined methodology.

Task-6292671

closes #2430

X-original-commit: e7a75fd
Signed-off-by: Vallaeys Valentin (vava) <vava@odoo.com>
@robodoo robodoo added the 19.4 label Jun 29, 2026
@robodoo robodoo closed this Jun 29, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants