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] mrp: write with multiple workorders in self #101706

Conversation

fw-bot
Copy link
Contributor

@fw-bot fw-bot commented Sep 30, 2022

This PR #97805 wrongly assumed that self contained a single workorder. This would raise an error if there were multiple records in self.

Solution:
Modify calls on self to workorder (as we already iterate through them)

Forward-Port-Of: #101580

@robodoo
Copy link
Contributor

robodoo commented Sep 30, 2022

@fw-bot
Copy link
Contributor Author

fw-bot commented Sep 30, 2022

@MerlinGuillaume @Whenrow cherrypicking of pull request #101580 failed.

stderr:

10:29:47.982788 git.c:344               trace: built-in: git cherry-pick 4c8a8cf8261973dc90d87551fdae91653402f679
error: could not apply 4c8a8cf82619... [FIX] mrp: write with multiple workorders in self
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit'
----------
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.

@robodoo robodoo added conflict There was an error while creating this forward-port PR forwardport This PR was created by @fw-bot labels Sep 30, 2022
This PR odoo#97805 wrongly assumed that
self contained a single workorder. This would raise an error if there
were multiple records in self.

Solution:
Modify calls on `self` to `workorder` (as we already iterate through
them)

X-original-commit: f6a66d7
@MerlinGuillaume MerlinGuillaume force-pushed the 14.0-13.0-fix_workorder_ensure_one-megu-053r-fw branch from 5471cdb to c249ac1 Compare September 30, 2022 08:52
@MerlinGuillaume
Copy link
Contributor

@robodoo r+

@C3POdoo C3POdoo requested a review from a team September 30, 2022 08:54
@C3POdoo C3POdoo added the RD research & development, internal work label Sep 30, 2022
robodoo pushed a commit that referenced this pull request Sep 30, 2022
This PR #97805 wrongly assumed that
self contained a single workorder. This would raise an error if there
were multiple records in self.

Solution:
Modify calls on `self` to `workorder` (as we already iterate through
them)

closes #101706

X-original-commit: f6a66d7
Signed-off-by: William Henrotin (whe) <whe@odoo.com>
Signed-off-by: Guillaume Merlin (megu) <megu@odoo.com>
@robodoo robodoo temporarily deployed to merge September 30, 2022 10:35 Inactive
@robodoo robodoo closed this Sep 30, 2022
@fw-bot fw-bot deleted the 14.0-13.0-fix_workorder_ensure_one-megu-053r-fw branch October 14, 2022 10:46
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