[18.0] [MIG] pricelist_brand (refresh) - #318
Conversation
|
Not so fast, as if the problems were in the other PR, there will be here as well. Let's see the CI. |
|
@pedrobaeza the pre-commit issue has been fixed and all checks are now green. Could you try merging again? /ocabot merge nobump |
|
Sorry @jarcosmts you are not allowed to merge. To do so you must either have push permissions on the repository, or be a declared maintainer of all modified addons. If you wish to adopt an addon and become it's maintainer, open a pull request to add your GitHub login to the |
|
Please squash the last 2 commits into one, as it's the same code. |
…ic plans When merging analytic distributions from different analytic plans, Odoo's _merge_distribution combines keys into a single comma-separated key instead of keeping them separate. This fix ensures distributions for different plans are merged as a simple union.
39efb37 to
61c9e40
Compare
|
@pedrobaeza squashed the fix commits, all checks are green now. Could you try merging again? /ocabot merge nobump |
|
Sorry @jarcosmts you are not allowed to merge. To do so you must either have push permissions on the repository, or be a declared maintainer of all modified addons. If you wish to adopt an addon and become it's maintainer, open a pull request to add your GitHub login to the |
Done :D |
9 participants
Refresh of #298 - rebased against latest 18.0.
The original PR #298 had 4 approvals and was marked "ready to merge",
but merge attempts failed due to pre-existing test failures in
account_analytic_brand and sale_analytic_brand (test_combine_analytic_with_product).
Root cause: Odoo 18's _merge_distribution() combines analytic distribution
keys from different analytic plans into a single comma-separated key
(e.g. {'25,24': 100.0}) instead of keeping them separate
({'25': 100.0, '24': 100.0}).
Fix: Override _merge_distribution() in analytic_brand to return a simple
dict union when the distributions come from different analytic plans.