Skip to content

Conversation

@fw-bot
Copy link

@fw-bot fw-bot commented Jan 7, 2026

This PR adds a new module for construction. While construction remains fully standard, construction_developer is built on top of it, with some customizations (see commits).

task-5386776

Forward-Port-Of: #1472

@robodoo
Copy link
Collaborator

robodoo commented Jan 7, 2026

Pull request status dashboard

@fw-bot
Copy link
Author

fw-bot commented Jan 7, 2026

@vava-odoo cherrypicking of pull request #1472 failed.

stdout:

Auto-merging .weblate.json
Auto-merging construction/__manifest__.py
CONFLICT (content): Merge conflict in construction/__manifest__.py
CONFLICT (modify/delete): construction_line_numbering/__manifest__.py deleted in 53b3152cc7092a195998c22e6ca3ce83adafa437 and modified in 44d316c9c7c82135d2548181e37f89922b4f8e70.  Version 44d316c9c7c82135d2548181e37f89922b4f8e70 of construction_line_numbering/__manifest__.py left in tree.
CONFLICT (modify/delete): construction_line_numbering/i18n/ko.po deleted in 53b3152cc7092a195998c22e6ca3ce83adafa437 and modified in 44d316c9c7c82135d2548181e37f89922b4f8e70.  Version 44d316c9c7c82135d2548181e37f89922b4f8e70 of construction_line_numbering/i18n/ko.po left in tree.
CONFLICT (modify/delete): construction_line_numbering/i18n/ku.po deleted in 53b3152cc7092a195998c22e6ca3ce83adafa437 and modified in 44d316c9c7c82135d2548181e37f89922b4f8e70.  Version 44d316c9c7c82135d2548181e37f89922b4f8e70 of construction_line_numbering/i18n/ku.po left in tree.
CONFLICT (modify/delete): construction_line_numbering/i18n/nb.po deleted in 53b3152cc7092a195998c22e6ca3ce83adafa437 and modified in 44d316c9c7c82135d2548181e37f89922b4f8e70.  Version 44d316c9c7c82135d2548181e37f89922b4f8e70 of construction_line_numbering/i18n/nb.po left in tree.
CONFLICT (modify/delete): construction_line_numbering/i18n/pl.po deleted in 53b3152cc7092a195998c22e6ca3ce83adafa437 and modified in 44d316c9c7c82135d2548181e37f89922b4f8e70.  Version 44d316c9c7c82135d2548181e37f89922b4f8e70 of construction_line_numbering/i18n/pl.po left in tree.
CONFLICT (modify/delete): construction_line_numbering/i18n/[email protected] deleted in 53b3152cc7092a195998c22e6ca3ce83adafa437 and modified in 44d316c9c7c82135d2548181e37f89922b4f8e70.  Version 44d316c9c7c82135d2548181e37f89922b4f8e70 of construction_line_numbering/i18n/[email protected] left in tree.
CONFLICT (modify/delete): construction_line_numbering/i18n/zh_TW.po deleted in 53b3152cc7092a195998c22e6ca3ce83adafa437 and modified in 44d316c9c7c82135d2548181e37f89922b4f8e70.  Version 44d316c9c7c82135d2548181e37f89922b4f8e70 of construction_line_numbering/i18n/zh_TW.po left in tree.
CONFLICT (modify/delete): construction_progress_management/__manifest__.py deleted in 53b3152cc7092a195998c22e6ca3ce83adafa437 and modified in 44d316c9c7c82135d2548181e37f89922b4f8e70.  Version 44d316c9c7c82135d2548181e37f89922b4f8e70 of construction_progress_management/__manifest__.py left in tree.
CONFLICT (modify/delete): construction_progress_management/i18n/de.po deleted in 53b3152cc7092a195998c22e6ca3ce83adafa437 and modified in 44d316c9c7c82135d2548181e37f89922b4f8e70.  Version 44d316c9c7c82135d2548181e37f89922b4f8e70 of construction_progress_management/i18n/de.po left in tree.
CONFLICT (modify/delete): construction_progress_management/i18n/pl.po deleted in 53b3152cc7092a195998c22e6ca3ce83adafa437 and modified in 44d316c9c7c82135d2548181e37f89922b4f8e70.  Version 44d316c9c7c82135d2548181e37f89922b4f8e70 of construction_progress_management/i18n/pl.po left in tree.
CONFLICT (modify/delete): construction_progress_management/i18n/pt_BR.po deleted in 53b3152cc7092a195998c22e6ca3ce83adafa437 and modified in 44d316c9c7c82135d2548181e37f89922b4f8e70.  Version 44d316c9c7c82135d2548181e37f89922b4f8e70 of construction_progress_management/i18n/pt_BR.po left in tree.

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

In the former case, you may want to edit this PR message as well.

⚠️ 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 an extended industry module for construction with:

- 'Show Line Numbering': On sale orders and invoices, modify views to
make the sequence numbers of the lines visible.
- 'Progress Management': In project, handle the SOL progress to easily
invoice customers (added in PR:1275).

Task-5135963
@vava-odoo vava-odoo force-pushed the saas-19.1-19.0-construction-developer-vava-486596-fw branch from 3bdb81c to 5be60a8 Compare January 7, 2026 09:41
This commit moves the chatter down in order to display the full width
of the Sales Order Lines in the progress view.

task-5238284
@vava-odoo vava-odoo force-pushed the saas-19.1-19.0-construction-developer-vava-486596-fw branch from 5be60a8 to 3640f36 Compare January 7, 2026 14:53
@vava-odoo
Copy link
Collaborator

@robodoo override=ci/industry
@robodoo r+

robodoo pushed a commit that referenced this pull request Jan 7, 2026
This commit adds an extended industry module for construction with:

- 'Show Line Numbering': On sale orders and invoices, modify views to
make the sequence numbers of the lines visible.
- 'Progress Management': In project, handle the SOL progress to easily
invoice customers (added in PR:1275).

Task-5135963

Part-of: #1502
Signed-off-by: Vallaeys Valentin (vava) <[email protected]>
robodoo pushed a commit that referenced this pull request Jan 7, 2026
This commit moves the chatter down in order to display the full width
of the Sales Order Lines in the progress view.

task-5238284

closes #1502

Signed-off-by: Vallaeys Valentin (vava) <[email protected]>
@robodoo robodoo closed this Jan 7, 2026
@fw-bot fw-bot deleted the saas-19.1-19.0-construction-developer-vava-486596-fw branch January 14, 2026 15:21
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