Skip to content

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

Closed
fw-bot wants to merge 6 commits into
odoo:masterfrom
odoo-dev:master-saas-19.4-construction-demo-keynote-frva-557693-fw
Closed

[IMP] construction{_developer}: update demo data#2806
fw-bot wants to merge 6 commits 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

@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).

@trcazier
trcazier force-pushed the master-saas-19.4-construction-demo-keynote-frva-557693-fw branch 5 times, most recently from 196b237 to 30179b6 Compare September 1, 2026 11:06
frva-odoo and others added 2 commits September 1, 2026 13:16
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
If MO in the past:
On backorder creation:
MO1: start, now
MO2: now, now+1d

On full completion:
MO: start, x_date_planned_end

task-6487518
@trcazier
trcazier force-pushed the master-saas-19.4-construction-demo-keynote-frva-557693-fw branch from 30179b6 to 07cc678 Compare September 1, 2026 11:21
Comment thread construction_developer/demo/product_pricelist.xml Outdated
@trcazier
trcazier force-pushed the master-saas-19.4-construction-demo-keynote-frva-557693-fw branch from 07cc678 to 9b8059f Compare September 1, 2026 13:22
In addition:
- Add informative margin field on pricelist item
- Make unit prices 0
- Fix the dashboard increment qty computation to rely on MO state

task-6487518
@trcazier
trcazier force-pushed the master-saas-19.4-construction-demo-keynote-frva-557693-fw branch from 9b8059f to 2af988b Compare September 1, 2026 13:35
…because of location

Before this commit, creating a SO with a simple, non-BOM template product (so with no BOM on any SOL) crashes if a route with x_select_dest_on_po was used because it tried to unconditionally apply the SO's location to the picking, even if it didn't exist, leading to a crash.
This commit fixes this by restricting the automation to only modify the pickings with that setting if the SO actually has a location.
@vava-odoo

Copy link
Copy Markdown
Collaborator

@robodoo override=ci/industry
@robodoo r+ rebase-ff

@robodoo

robodoo commented Sep 3, 2026

Copy link
Copy Markdown
Collaborator

Merge method set to rebase and fast-forward.

robodoo pushed a commit that referenced this pull request Sep 3, 2026
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
Part-of: #2806
Signed-off-by: Vallaeys Valentin (vava) <vava@odoo.com>
robodoo pushed a commit that referenced this pull request Sep 3, 2026
If MO in the past:
On backorder creation:
MO1: start, now
MO2: now, now+1d

On full completion:
MO: start, x_date_planned_end

task-6487518

Part-of: #2806
Signed-off-by: Vallaeys Valentin (vava) <vava@odoo.com>
robodoo pushed a commit that referenced this pull request Sep 3, 2026
In addition:
- Add informative margin field on pricelist item
- Make unit prices 0
- Fix the dashboard increment qty computation to rely on MO state

task-6487518

Part-of: #2806
Signed-off-by: Vallaeys Valentin (vava) <vava@odoo.com>
robodoo pushed a commit that referenced this pull request Sep 3, 2026
…ect name starts with S

Part-of: #2806
Signed-off-by: Vallaeys Valentin (vava) <vava@odoo.com>
robodoo pushed a commit that referenced this pull request Sep 3, 2026
Part-of: #2806
Signed-off-by: Vallaeys Valentin (vava) <vava@odoo.com>
robodoo pushed a commit that referenced this pull request Sep 3, 2026
…because of location

Before this commit, creating a SO with a simple, non-BOM template product (so with no BOM on any SOL) crashes if a route with x_select_dest_on_po was used because it tried to unconditionally apply the SO's location to the picking, even if it didn't exist, leading to a crash.
This commit fixes this by restricting the automation to only modify the pickings with that setting if the SO actually has a location.

closes #2806

Signed-off-by: Vallaeys Valentin (vava) <vava@odoo.com>
@robodoo robodoo added the 19.5 label Sep 3, 2026
@robodoo robodoo closed this Sep 3, 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.

5 participants