Skip to content

[FIX] account_edi_ubl_cii: Fix tax's grouping_key can be None #239959

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Open
fw-bot wants to merge 1 commit into
base: saas-18.4
Choose a base branch
from
Open

[FIX] account_edi_ubl_cii: Fix tax's grouping_key can be None #239959

fw-bot wants to merge 1 commit into from

Conversation

@fw-bot
Copy link
Contributor

@fw-bot fw-bot commented Dec 13, 2025

Some overrides assign a value to the tax's grouping_key after the super call. However, the returned value could be None.

Also fix a little mistake regarding excise taxes.

I confirm I have signed the CLA and read the PR guidelines at www.odoo.com/submit-pr

Forward-Port-Of: #239954

@smetl
[FIX] account_edi_ubl_cii: Fix tax's grouping_key can be None
a214fdc 
Some overrides assign a value to the tax's grouping_key after
the super call. However, the returned value could be None.

Also fix a little mistake regarding excise taxes.

X-original-commit: 920247c
@robodoo
Copy link
Contributor

robodoo commented Dec 13, 2025

Pull request status dashboard

@robodoo robodoo added forwardport This PR was created by @fw-bot conflict There was an error while creating this forward-port PR labels Dec 13, 2025
@fw-bot fw-bot mentioned this pull request Dec 13, 2025
Closed
@fw-bot
Copy link
Contributor Author

fw-bot commented Dec 13, 2025

@smetl @clbr-odoo cherrypicking of pull request #239954 failed.

stdout:

CONFLICT (modify/delete): addons/account_edi_ubl_cii/models/account_edi_ubl.py deleted in 55eb6b3560456558c6b54d9dce85f402ec134d15 and modified in 630ee521adbb8e49bfafa75127d45ee72e45d3f5.  Version 630ee521adbb8e49bfafa75127d45ee72e45d3f5 of addons/account_edi_ubl_cii/models/account_edi_ubl.py left in tree.
Auto-merging addons/account_edi_ubl_cii/models/account_edi_xml_ubl_a_nz.py
CONFLICT (content): Merge conflict in addons/account_edi_ubl_cii/models/account_edi_xml_ubl_a_nz.py
Auto-merging addons/account_edi_ubl_cii/models/account_edi_xml_ubl_nlcius.py
CONFLICT (content): Merge conflict in addons/account_edi_ubl_cii/models/account_edi_xml_ubl_nlcius.py
Auto-merging addons/account_edi_ubl_cii/models/account_edi_xml_ubl_sg.py
CONFLICT (content): Merge conflict in addons/account_edi_ubl_cii/models/account_edi_xml_ubl_sg.py
CONFLICT (modify/delete): addons/account_edi_ubl_cii/tests/test_ubl_export_bis3_be.py deleted in 55eb6b3560456558c6b54d9dce85f402ec134d15 and modified in 630ee521adbb8e49bfafa75127d45ee72e45d3f5.  Version 630ee521adbb8e49bfafa75127d45ee72e45d3f5 of addons/account_edi_ubl_cii/tests/test_ubl_export_bis3_be.py left in tree.
Auto-merging addons/l10n_anz_ubl_pint/models/account_edi_xml_pint_anz.py
CONFLICT (content): Merge conflict in addons/l10n_anz_ubl_pint/models/account_edi_xml_pint_anz.py
Auto-merging addons/l10n_my_ubl_pint/models/account_edi_xml_pint_my.py
CONFLICT (content): Merge conflict in addons/l10n_my_ubl_pint/models/account_edi_xml_pint_my.py
Auto-merging addons/l10n_sg_ubl_pint/models/account_edi_xml_pint_sg.py
CONFLICT (content): Merge conflict in addons/l10n_sg_ubl_pint/models/account_edi_xml_pint_sg.py

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

conflict There was an error while creating this forward-port PR forwardport This PR was created by @fw-bot

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@fw-bot @robodoo @smetl