Skip to content

Conversation

@fw-bot
Copy link
Contributor

@fw-bot fw-bot commented Dec 8, 2024

The DIN 5008 layout was not properly addressing reports on invoices and delivery slips. On invoices/pro-forma, the reports were not addressed to the correct partners (commercial partner instead of invoice partner). In the delivery slips the reports were not addressed to the delivery partner. This led to functionally and legally incorrect reports.

task-4089521

Forward-Port-Of: #189951
Forward-Port-Of: #183775

@robodoo
Copy link
Contributor

robodoo commented Dec 8, 2024

Pull request status dashboard

@fw-bot
Copy link
Contributor Author

fw-bot commented Dec 8, 2024

@antonrom1 @qdp-odoo cherrypicking of pull request #183775 failed.

stdout:

Auto-merging addons/l10n_din5008/i18n/de.po
Auto-merging addons/l10n_din5008/i18n/it.po
Auto-merging addons/l10n_din5008/report/din5008_report.xml
Auto-merging addons/l10n_din5008_purchase/i18n/de.po
Auto-merging addons/l10n_din5008_purchase/i18n/fr.po
Auto-merging addons/l10n_din5008_purchase/i18n/it.po
Auto-merging addons/l10n_din5008_repair/i18n/it.po
Auto-merging addons/l10n_din5008_stock/i18n/it.po
CONFLICT (content): Merge conflict in addons/l10n_din5008_stock/i18n/it.po

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

@robodoo robodoo added forwardport This PR was created by @fw-bot conflict There was an error while creating this forward-port PR labels Dec 8, 2024
@antonrom1 antonrom1 force-pushed the 18.0-17.0-din5008-layout-improvements-roan-oDnl-fw branch from 480ea7c to 41daded Compare December 8, 2024 17:13
@C3POdoo C3POdoo added the RD research & development, internal work label Dec 8, 2024
The DIN 5008 layout was not properly addressing reports on invoices and delivery slips. On invoices/pro-forma, the reports were not addressed to the correct partners (commercial partner instead of invoice partner). In the delivery slips the reports were not addressed to the delivery partner. This led to functionally and legally incorrect reports.

task-4089521

X-original-commit: eaf9e77
@antonrom1 antonrom1 force-pushed the 18.0-17.0-din5008-layout-improvements-roan-oDnl-fw branch from 41daded to cb4fa64 Compare December 8, 2024 18:22
@antonrom1
Copy link
Contributor

@robodoo r+

robodoo pushed a commit that referenced this pull request Dec 8, 2024
The DIN 5008 layout was not properly addressing reports on invoices and delivery slips. On invoices/pro-forma, the reports were not addressed to the correct partners (commercial partner instead of invoice partner). In the delivery slips the reports were not addressed to the delivery partner. This led to functionally and legally incorrect reports.

task-4089521

closes #190012

X-original-commit: eaf9e77
Signed-off-by: Quentin De Paoli (qdp) <qdp@odoo.com>
Signed-off-by: Anton Romanova (roan) <roan@odoo.com>
@robodoo
Copy link
Contributor

robodoo commented Dec 8, 2024

@antonrom1 @qdp-odoo staging failed: ci/runbot on 3c78481eae4e1ae5423d8171a3428863ea9ec621 (view more at https://runbot.odoo.com/runbot/build/71707227)

@antonrom1
Copy link
Contributor

@robodoo fw=skipci

@robodoo
Copy link
Contributor

robodoo commented Dec 8, 2024

@antonrom1 you don't have the right to fw=skipci.

@fw-bot
Copy link
Contributor Author

fw-bot commented Dec 9, 2024

@antonrom1 @qdp-odoo this forward port of #183775 is awaiting action (not merged or closed).

@robodoo
Copy link
Contributor

robodoo commented Dec 9, 2024

This staging failed for probably sprurious reasons, we've reset the PR, it should be re-staged soon-ish.

@robodoo robodoo closed this in be0d490 Dec 9, 2024
@fw-bot fw-bot deleted the 18.0-17.0-din5008-layout-improvements-roan-oDnl-fw branch December 23, 2024 08:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

conflict There was an error while creating this forward-port PR forwardport This PR was created by @fw-bot RD research & development, internal work

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants