Skip to content

Conversation

@fw-bot
Copy link
Contributor

@fw-bot fw-bot commented Dec 6, 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: #189619
Forward-Port-Of: #183775

@robodoo
Copy link
Contributor

robodoo commented Dec 6, 2024

Pull request status dashboard

@fw-bot
Copy link
Contributor Author

fw-bot commented Dec 6, 2024

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

stdout:

Auto-merging addons/l10n_din5008/__manifest__.py
Auto-merging addons/l10n_din5008/i18n/de.po
CONFLICT (content): Merge conflict in addons/l10n_din5008/i18n/de.po
Auto-merging addons/l10n_din5008/i18n/fr.po
CONFLICT (content): Merge conflict in addons/l10n_din5008/i18n/fr.po
Auto-merging addons/l10n_din5008/i18n/it.po
CONFLICT (content): Merge conflict in addons/l10n_din5008/i18n/it.po
Auto-merging addons/l10n_din5008/i18n/l10n_din5008.pot
CONFLICT (content): Merge conflict in addons/l10n_din5008/i18n/l10n_din5008.pot
CONFLICT (modify/delete): addons/l10n_din5008/models/account_move.py deleted in fd4015655e52e5c838d8873a29fdf18537c87d0b and modified in c502fb7d1a1d7067962c0b70394e13df32e35a00.  Version c502fb7d1a1d7067962c0b70394e13df32e35a00 of addons/l10n_din5008/models/account_move.py left in tree.
Auto-merging addons/l10n_din5008/report/din5008_report.xml
CONFLICT (content): Merge conflict in addons/l10n_din5008/report/din5008_report.xml
Auto-merging addons/l10n_din5008_repair/__manifest__.py
CONFLICT (content): Merge conflict in addons/l10n_din5008_repair/__manifest__.py
Auto-merging addons/l10n_din5008_repair/i18n/de.po
CONFLICT (content): Merge conflict in addons/l10n_din5008_repair/i18n/de.po
Auto-merging addons/l10n_din5008_repair/i18n/fr.po
CONFLICT (content): Merge conflict in addons/l10n_din5008_repair/i18n/fr.po
Auto-merging addons/l10n_din5008_repair/i18n/it.po
CONFLICT (content): Merge conflict in addons/l10n_din5008_repair/i18n/it.po
Auto-merging addons/l10n_din5008_repair/i18n/l10n_din5008_repair.pot
CONFLICT (content): Merge conflict in addons/l10n_din5008_repair/i18n/l10n_din5008_repair.pot
Auto-merging addons/l10n_din5008_sale/__manifest__.py
CONFLICT (content): Merge conflict in addons/l10n_din5008_sale/__manifest__.py
Auto-merging addons/l10n_din5008_sale/i18n/de.po
CONFLICT (content): Merge conflict in addons/l10n_din5008_sale/i18n/de.po
Auto-merging addons/l10n_din5008_sale/i18n/fr.po
CONFLICT (content): Merge conflict in addons/l10n_din5008_sale/i18n/fr.po
Auto-merging addons/l10n_din5008_sale/i18n/it.po
CONFLICT (content): Merge conflict in addons/l10n_din5008_sale/i18n/it.po
Auto-merging addons/l10n_din5008_sale/i18n/l10n_din5008_sale.pot
CONFLICT (content): Merge conflict in addons/l10n_din5008_sale/i18n/l10n_din5008_sale.pot
CONFLICT (modify/delete): addons/l10n_din5008_sale/models/sale.py deleted in fd4015655e52e5c838d8873a29fdf18537c87d0b and modified in c502fb7d1a1d7067962c0b70394e13df32e35a00.  Version c502fb7d1a1d7067962c0b70394e13df32e35a00 of addons/l10n_din5008_sale/models/sale.py left in tree.
Auto-merging addons/l10n_din5008_stock/__manifest__.py
CONFLICT (content): Merge conflict in addons/l10n_din5008_stock/__manifest__.py
Auto-merging addons/l10n_din5008_stock/i18n/de.po
CONFLICT (content): Merge conflict in addons/l10n_din5008_stock/i18n/de.po
Auto-merging addons/l10n_din5008_stock/i18n/fr.po
CONFLICT (content): Merge conflict in addons/l10n_din5008_stock/i18n/fr.po
Auto-merging addons/l10n_din5008_stock/i18n/it.po
CONFLICT (content): Merge conflict in addons/l10n_din5008_stock/i18n/it.po
Auto-merging addons/l10n_din5008_stock/i18n/l10n_din5008_stock.pot
CONFLICT (content): Merge conflict in addons/l10n_din5008_stock/i18n/l10n_din5008_stock.pot
CONFLICT (modify/delete): addons/l10n_din5008_stock/models/stock.py deleted in fd4015655e52e5c838d8873a29fdf18537c87d0b and modified in c502fb7d1a1d7067962c0b70394e13df32e35a00.  Version c502fb7d1a1d7067962c0b70394e13df32e35a00 of addons/l10n_din5008_stock/models/stock.py 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

@robodoo robodoo added forwardport This PR was created by @fw-bot conflict There was an error while creating this forward-port PR labels Dec 6, 2024
@C3POdoo C3POdoo added the RD research & development, internal work label Dec 6, 2024
@fw-bot
Copy link
Contributor Author

fw-bot commented Dec 8, 2024

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

@antonrom1 antonrom1 force-pushed the saas-17.4-17.0-din5008-layout-improvements-roan-ZMfY-fw branch 5 times, most recently from 205fa48 to 2a667ea Compare December 8, 2024 13:22
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: 28200ff
@antonrom1 antonrom1 force-pushed the saas-17.4-17.0-din5008-layout-improvements-roan-ZMfY-fw branch from 2a667ea to 777063c Compare December 8, 2024 13:58
@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 #189951

X-original-commit: 28200ff
Signed-off-by: Quentin De Paoli (qdp) <qdp@odoo.com>
Signed-off-by: Anton Romanova (roan) <roan@odoo.com>
@robodoo robodoo closed this Dec 8, 2024
@fw-bot fw-bot deleted the saas-17.4-17.0-din5008-layout-improvements-roan-ZMfY-fw branch December 22, 2024 17:42
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