Skip to content

[IMP] construction{_developer}: update demo data - #2806

Open
fw-bot wants to merge 1 commit into
odoo:masterfrom
odoo-dev:master-saas-19.4-construction-demo-keynote-frva-557693-fw
Open

[IMP] construction{_developer}: update demo data#2806
fw-bot wants to merge 1 commit into
odoo:masterfrom
odoo-dev:master-saas-19.4-construction-demo-keynote-frva-557693-fw

Conversation

@fw-bot

@fw-bot fw-bot commented Aug 20, 2026

Copy link
Copy Markdown

Update demo datas related to sale orders, purchase orders, invoices and stock moves to have clean data to analyse when looking at the margins earned through a project.

Task-6470254

Forward-Port-Of: #2771

@robodoo

robodoo commented Aug 20, 2026

Copy link
Copy Markdown
Collaborator

Pull request status dashboard

@fw-bot

fw-bot commented Aug 20, 2026

Copy link
Copy Markdown
Author

@frva-odoo @vava-odoo cherrypicking of pull request #2771 failed.

stdout:

Auto-merging construction_developer/__manifest__.py
CONFLICT (content): Merge conflict in construction_developer/__manifest__.py
CONFLICT (modify/delete): construction_developer/demo/ir_attachment.xml deleted in 16012b711b52137a01bd41b831df4ee40fd67839 and modified in 42ee82595c751c07792e6512e166f68daccab2bb.  Version 42ee82595c751c07792e6512e166f68daccab2bb of construction_developer/demo/ir_attachment.xml left in tree.
CONFLICT (modify/delete): construction_developer/demo/project_project.xml deleted in 16012b711b52137a01bd41b831df4ee40fd67839 and modified in 42ee82595c751c07792e6512e166f68daccab2bb.  Version 42ee82595c751c07792e6512e166f68daccab2bb of construction_developer/demo/project_project.xml left in tree.
CONFLICT (modify/delete): construction_developer/demo/x_remark.xml deleted in 16012b711b52137a01bd41b831df4ee40fd67839 and modified in 42ee82595c751c07792e6512e166f68daccab2bb.  Version 42ee82595c751c07792e6512e166f68daccab2bb of construction_developer/demo/x_remark.xml left in tree.

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

@vava-odoo

Copy link
Copy Markdown
Collaborator

@frva-odoo @trcazier as expected there are a few conflicts. I'd suggest to do the minimal here to have something similar to 19.4, but let's not spend too much time on this since there is a rework task for demo data anyway

Update demo datas related to sale orders, purchase orders,
invoices and stock moves to have clean data to analyse when
looking at the margins earned through a project.

Task-6470254

X-original-commit: 687fc74
@frva-odoo
frva-odoo force-pushed the master-saas-19.4-construction-demo-keynote-frva-557693-fw branch from 02f7a85 to 560ef34 Compare August 21, 2026 13:17
@fw-bot

fw-bot commented Aug 28, 2026

Copy link
Copy Markdown
Author

@frva-odoo @vava-odoo this forward port of #2771 is awaiting action (not merged or closed).

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