odoo/odoo#163362
Created by fw-bot
Merged
at 5f017682c1efb73a08e4c26f1aaa1b2c17d51e11
- label
- odoo-dev:17.0-16.0-report-duplicated-ids-las-YuqS-fw
- head
- 9812daf108a2b7dc021539a911b9c2345abe0e80
- target
- 17.0
- merged
- 3 weeks ago by Accounting, Laurent Smet (las)
- forward-port of
- odoo/odoo#157710 DETACHED (conflicts: ('d7fd8d81e006486a04c703da0a6dcbdad9e457f0', 'Auto-merging odoo/addons/base/models/ir_actions_report.py\nCONFLICT (content): Merge conflict in odoo/addons/base/models/ir_actions_report.py\n', '15:51:54.690208 git.c:463 trace: built-in: git cherry-pick d7fd8d81e006486a04c703da0a6dcbdad9e457f0\nerror: could not apply d7fd8d81e006... [FIX] base: Allow report with duplicated res_ids\nhint: After resolving the conflicts, mark them with\nhint: "git add/rm <pathspec>", then run\nhint: "git cherry-pick --continue".\nhint: You can instead skip this commit with "git cherry-pick --skip".\nhint: To abort and get back to the state before "git cherry-pick",\nhint: run "git cherry-pick --abort".\n----------\nstatus:\n', ['d7fd8d81e006486a04c703da0a6dcbdad9e457f0']) ('d7fd8d81e006486a04c703da0a6dcbdad9e457f0', 'Auto-merging odoo/addons/base/models/ir_actions_report.py\nCONFLICT (content): Merge conflict in odoo/addons/base/models/ir_actions_report.py\n', '15:51:54.690208 git.c:463 trace: built-in: git cherry-pick d7fd8d81e006486a04c703da0a6dcbdad9e457f0\nerror: could not apply d7fd8d81e006... [FIX] base: Allow report with duplicated res_ids\nhint: After resolving the conflicts, mark them with\nhint: "git add/rm <pathspec>", then run\nhint: "git cherry-pick --continue".\nhint: You can instead skip this commit with "git cherry-pick --skip".\nhint: To abort and get back to the state before "git cherry-pick",\nhint: run "git cherry-pick --abort".\n----------\nstatus:\n', ['d7fd8d81e006486a04c703da0a6dcbdad9e457f0']))
[FW][FIX] base: Allow report with duplicated res_ids
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: odoo/odoo#163211
Forward-Port-Of: odoo/odoo#157710