[18.0] [MIG] pricelist_brand (refresh) by jarcosmts · Pull Request #318 · OCA/brand

jarcosmts · 2026-07-29T08:11:22Z

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.

pedrobaeza · 2026-07-29T08:13:03Z

Not so fast, as if the problems were in the other PR, there will be here as well. Let's see the CI.

jarcosmts · 2026-07-29T09:51:16Z

@pedrobaeza the pre-commit issue has been fixed and all checks are now green. Could you try merging again?

/ocabot merge nobump

OCA-git-bot · 2026-07-29T09:51:31Z

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 maintainers key of its manifest.

pedrobaeza · 2026-07-29T10:03:21Z

Please squash the last 2 commits into one, as it's the same code.

jarcosmts · 2026-07-29T10:16:48Z

@pedrobaeza squashed the fix commits, all checks are green now. Could you try merging again?

/ocabot merge nobump

OCA-git-bot · 2026-07-29T10:17:02Z

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 maintainers key of its manifest.

jarcosmts · 2026-07-30T12:49:39Z

Please squash the last 2 commits into one, as it's the same code.

Done :D

juanparmer

Approved!

tonygalmiche

Functional review

Tested on a local Odoo 18.0 instance:

Pricelist rules applied on a product brand work correctly.
Confirmed the automated test suite (previously blocking PR #298) now passes: test_combine_analytic_with_product in both account_analytic_brand and sale_analytic_brand succeeds (0 failed, 0 errors of 6 tests), validating the _merge_distribution() fix.

Works as expected.

OCA-git-bot · 2026-08-14T08:00:02Z

This PR has the approved label and has been created more than 5 days ago. It should therefore be ready to merge by a maintainer (or a PSC member if the concerned addon has no declared maintainer). 🤖

jarcosmts · 2026-08-18T12:59:55Z

@pedrobaeza Hi Pedro, this PR is ready to merge. Could you help me, please? Thanks!

pedrobaeza · 2026-08-18T14:09:41Z

/ocabot migration pricelist_brand

It requires the approval of a PSC or maintainer. Check the previous authors.

OCA-git-bot · 2026-08-18T14:09:52Z

The migration issue (#210) has not been updated to reference the current pull request because a previous pull request (#298) is not closed.
Perhaps you should check that there is no duplicate work.
CC @ThomasBinsfeld

kdominguezmts · 2026-08-21T10:52:44Z

/ocabot migration pricelist_brand

It requires the approval of a PSC or maintainer. Check the previous authors.

@sbejaoui, could you please help approve this PR?

jarcosmts · 2026-09-17T12:56:40Z

@pedrobaeza @ThomasBinsfeld It is possible to close the PR #298 and approve this one to merge it. Thanks.

pedrobaeza · 2026-09-17T13:06:52Z

As this one is respecting previous attribution, let's move.

/ocabot merge nobump

OCA-git-bot · 2026-09-17T13:07:02Z

What a great day to merge this nice PR. Let's do it!
Prepared branch 18.0-ocabot-merge-pr-318-by-pedrobaeza-bump-nobump, awaiting test results.

OCA-git-bot · 2026-09-17T13:14:36Z

@pedrobaeza The merge process could not be finalized, because command twine upload --disable-progress-bar --non-interactive --repository-url https://upload.pypi.org/legacy/ -u __token__ odoo_addon_pricelist_brand-18.0.1.0.0.2-py3-none-any.whl failed with output:

Uploading distributions to https://upload.pypi.org/legacy/
Uploading odoo_addon_pricelist_brand-18.0.1.0.0.2-py3-none-any.whl
�[33mWARNING �[0m Error during upload. Retry with the --verbose option for more details. 
�[31mERROR   �[0m HTTPError: 429 Too Many Requests from https://upload.pypi.org/legacy/  
         Too Many Requests

pedrobaeza · 2026-09-17T13:16:14Z

@OCA/pypi-support to reserve

sbejaoui · 2026-09-21T13:10:36Z

/ocabot merge nobump

OCA-git-bot · 2026-09-21T13:10:46Z

On my way to merge this fine PR!
Prepared branch 18.0-ocabot-merge-pr-318-by-sbejaoui-bump-nobump, awaiting test results.

OCA-git-bot · 2026-09-21T13:26:41Z

@sbejaoui The merge process could not be finalized, because command twine upload --disable-progress-bar --non-interactive --repository-url https://upload.pypi.org/legacy/ -u __token__ odoo_addon_pricelist_brand-18.0.1.0.0.2-py3-none-any.whl failed with output:

Uploading distributions to https://upload.pypi.org/legacy/
Uploading odoo_addon_pricelist_brand-18.0.1.0.0.2-py3-none-any.whl
�[33mWARNING �[0m Error during upload. Retry with the --verbose option for more details. 
�[31mERROR   �[0m HTTPError: 429 Too Many Requests from https://upload.pypi.org/legacy/  
         Too Many Requests

sbejaoui · 2026-09-23T10:22:09Z

/ocabot merge nobump

OCA-git-bot · 2026-09-23T10:22:20Z

This PR looks fantastic, let's merge it!
Prepared branch 18.0-ocabot-merge-pr-318-by-sbejaoui-bump-nobump, awaiting test results.

OCA-git-bot · 2026-09-23T10:25:55Z

@sbejaoui your merge command was aborted due to failed check(s), which you can inspect on this commit of 18.0-ocabot-merge-pr-318-by-sbejaoui-bump-nobump.

After fixing the problem, you can re-issue a merge command. Please refrain from merging manually as it will most probably make the target branch red.

sbejaoui · 2026-09-23T10:36:07Z

/ocabot rebase

OCA-git-bot · 2026-09-23T10:36:17Z

Congratulations, PR rebased to 18.0.

sbejaoui · 2026-09-29T07:59:58Z

/ocabot rebase

…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.

OCA-git-bot · 2026-09-29T08:00:13Z

Congratulations, PR rebased to 18.0.

OCA-git-bot added series:18.0 mod:pricelist_brand Module pricelist_brand labels Jul 29, 2026

OCA-git-bot added the mod:analytic_brand Module analytic_brand label Jul 29, 2026

jarcosmts force-pushed the 18.0-mig_pricelist_brand_refresh branch from 39efb37 to 61c9e40 Compare July 29, 2026 10:16

juanparmer approved these changes Aug 13, 2026

View reviewed changes

tonygalmiche approved these changes Aug 14, 2026

View reviewed changes

OCA-git-bot added approved ready to merge labels Aug 14, 2026

OCA-git-bot added this to the 18.0 milestone Aug 18, 2026

This was referenced Sep 17, 2026

[18.0] [MIG] pricelist_brand #298

Closed

Migration to version 18.0 #210

Open

OCA-git-bot added the bot is merging ⏳ label Sep 17, 2026

OCA-git-bot removed the bot is merging ⏳ label Sep 17, 2026

ThomasBinsfeld approved these changes Sep 21, 2026

View reviewed changes

OCA-git-bot added the bot is merging ⏳ label Sep 21, 2026

OCA-git-bot removed the bot is merging ⏳ label Sep 21, 2026

OCA-git-bot added the bot is merging ⏳ label Sep 23, 2026

OCA-git-bot removed the bot is merging ⏳ label Sep 23, 2026

OCA-git-bot force-pushed the 18.0-mig_pricelist_brand_refresh branch from 61c9e40 to 4cf97e1 Compare September 23, 2026 10:36

qgroulard and others added 9 commits September 29, 2026 08:00

[ADD] Pricelist brand

c225251

[UPD] Update pricelist_brand.pot

2a39a4d

[UPD] README.rst

c80ad7b

[UPD] README.rst

2ba79fa

[MIG] pricelist_brand: Migration to 16.0

9289bfa

[IMP] pricelist_brand: pre-commit auto fixes

1662dbd

[MIG] pricelist_brand: Migration to 19.0

99590e0

[MIG] pricelist_brand (backport from 19.0)

aaa22b6

OCA-git-bot force-pushed the 18.0-mig_pricelist_brand_refresh branch from 4cf97e1 to 15406fa Compare September 29, 2026 08:00

Uh oh!

Conversation

jarcosmts commented Jul 29, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

pedrobaeza commented Jul 29, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

jarcosmts commented Jul 29, 2026

Uh oh!

OCA-git-bot commented Jul 29, 2026

Uh oh!

pedrobaeza commented Jul 29, 2026

Uh oh!

jarcosmts commented Jul 29, 2026

Uh oh!

OCA-git-bot commented Jul 29, 2026

Uh oh!

jarcosmts commented Jul 30, 2026

Uh oh!

juanparmer left a comment

Choose a reason for hiding this comment

Uh oh!

tonygalmiche left a comment

Choose a reason for hiding this comment

Uh oh!

OCA-git-bot commented Aug 14, 2026

Uh oh!

jarcosmts commented Aug 18, 2026

Uh oh!

pedrobaeza commented Aug 18, 2026

Uh oh!

OCA-git-bot commented Aug 18, 2026

Uh oh!

kdominguezmts commented Aug 21, 2026

Uh oh!

jarcosmts commented Sep 17, 2026

Uh oh!

pedrobaeza commented Sep 17, 2026

Uh oh!

OCA-git-bot commented Sep 17, 2026

Uh oh!

OCA-git-bot commented Sep 17, 2026

Uh oh!

pedrobaeza commented Sep 17, 2026

Uh oh!

sbejaoui commented Sep 21, 2026

Uh oh!

OCA-git-bot commented Sep 21, 2026

Uh oh!

OCA-git-bot commented Sep 21, 2026

Uh oh!

sbejaoui commented Sep 23, 2026

Uh oh!

OCA-git-bot commented Sep 23, 2026

Uh oh!

OCA-git-bot commented Sep 23, 2026

Uh oh!

sbejaoui commented Sep 23, 2026

Uh oh!

OCA-git-bot commented Sep 23, 2026

Uh oh!

sbejaoui commented Sep 29, 2026

Uh oh!

OCA-git-bot commented Sep 29, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

12 participants

jarcosmts commented Jul 29, 2026 •

edited

Loading

pedrobaeza commented Jul 29, 2026 •

edited

Loading