Skip to content
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.

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

[FW][FIX] base: Allow report with duplicated res_ids #163362

Closed

Conversation

fw-bot
Copy link
Contributor

@fw-bot fw-bot commented Apr 25, 2024

In stock, you would print multiple times the same lot label. In this scenario, the rendering method get multiple times the same res_id as parameter. However, the code is loosing track of those duplicated ids before all streams are indexed by res_id.


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

Forward-Port-Of: #163211
Forward-Port-Of: #157710

@robodoo
Copy link
Contributor

robodoo commented Apr 25, 2024

@fw-bot
Copy link
Contributor Author

fw-bot commented Apr 25, 2024

@smetl @ryv-odoo cherrypicking of pull request #157710 failed.

stdout:

Auto-merging odoo/addons/base/models/ir_actions_report.py
CONFLICT (content): Merge conflict in odoo/addons/base/models/ir_actions_report.py

stderr:

15:51:54.690208 git.c:463               trace: built-in: git cherry-pick d7fd8d81e006486a04c703da0a6dcbdad9e457f0
error: could not apply d7fd8d81e006... [FIX] base: Allow report with duplicated res_ids
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
----------
status:

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 Apr 25, 2024
@C3POdoo C3POdoo added the RD research & development, internal work label Apr 25, 2024
In stock, you would print multiple times the same lot label.
In this scenario, the rendering method get multiple times the same res_id as parameter.
However, the code is loosing track of those duplicated ids before all
streams are indexed by res_id.

X-original-commit: fb92e99
@smetl smetl force-pushed the 17.0-16.0-report-duplicated-ids-las-YuqS-fw branch from 74d1d65 to 9812daf Compare April 26, 2024 11:18
@C3POdoo C3POdoo requested review from a team, rco-odoo and HydrionBurst and removed request for a team April 26, 2024 11:20
@smetl
Copy link
Contributor

smetl commented Apr 26, 2024

@robodoo r+

@robodoo robodoo closed this in 5f01768 Apr 26, 2024
willylohws pushed a commit to willylohws/odoo that referenced this pull request May 1, 2024
In stock, you would print multiple times the same lot label.
In this scenario, the rendering method get multiple times the same res_id as parameter.
However, the code is loosing track of those duplicated ids before all
streams are indexed by res_id.

closes odoo#163362

X-original-commit: fb92e99
Signed-off-by: Rémy Voet (ryv) <ryv@odoo.com>
Signed-off-by: Laurent Smet (las) <las@odoo.com>
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.

None yet

4 participants