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*,{purchase_,}stock: avoid route duplication #165949

Conversation

fw-bot
Copy link
Contributor

@fw-bot fw-bot commented May 17, 2024

Few improvements for commit [1]:
- Before [1], _find_global_route, was not supposed to create any
route. Let's keep it like that
- _find_global_route is sometimes calls with an empty self
- The name of the copied route should not contain "(Copy)"
- When looking for a route, we should skip the active criteria

[1] 961ac2d

OPW-3889889
OPW-3888885

Forward-Port-Of: #165728

@robodoo
Copy link
Contributor

robodoo commented May 17, 2024

@fw-bot
Copy link
Contributor Author

fw-bot commented May 17, 2024

@adwid @Whenrow cherrypicking of pull request #165728 failed.

stdout:

Auto-merging addons/mrp/models/stock_warehouse.py
CONFLICT (content): Merge conflict in addons/mrp/models/stock_warehouse.py
Auto-merging addons/mrp_subcontracting/models/stock_warehouse.py
CONFLICT (content): Merge conflict in addons/mrp_subcontracting/models/stock_warehouse.py
Auto-merging addons/mrp_subcontracting_dropshipping/models/stock_warehouse.py
CONFLICT (content): Merge conflict in addons/mrp_subcontracting_dropshipping/models/stock_warehouse.py
Auto-merging addons/purchase_stock/models/stock.py
CONFLICT (content): Merge conflict in addons/purchase_stock/models/stock.py
Auto-merging addons/stock/models/stock_warehouse.py
CONFLICT (content): Merge conflict in addons/stock/models/stock_warehouse.py

stderr:

12:38:57.865660 git.c:463               trace: built-in: git cherry-pick a5ce4fac2b10bedb2f4171a9182740056e097f3b
error: could not apply a5ce4fac2b10... [FIX] mrp*,{purchase_,}stock: avoid route duplication
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 May 17, 2024
@C3POdoo C3POdoo added the OE the report is linked to a support ticket (opw-...) label May 17, 2024
@adwid adwid force-pushed the saas-16.3-16.0-OPW-3888885-stock_route_duplication-awt-zbMp-fw branch 2 times, most recently from b27b984 to 1329caf Compare May 22, 2024 09:08
Few improvements for commit [1]:
\- Before [1], `_find_global_route`, was not supposed to create any
route. Let's keep it like that
\- `_find_global_route` is sometimes calls with an empty `self`
\- The name of the copied route should not contain "(Copy)"
\- When looking for a route, we should skip the `active` criteria

[1] 961ac2d

OPW-3889889
OPW-3888885

X-original-commit: d1bdcde
@adwid adwid force-pushed the saas-16.3-16.0-OPW-3888885-stock_route_duplication-awt-zbMp-fw branch from 1329caf to 7a224cb Compare May 22, 2024 09:18
@adwid
Copy link
Contributor

adwid commented May 22, 2024

robodoo r+

robodoo pushed a commit that referenced this pull request May 22, 2024
Few improvements for commit [1]:
\- Before [1], `_find_global_route`, was not supposed to create any
route. Let's keep it like that
\- `_find_global_route` is sometimes calls with an empty `self`
\- The name of the copied route should not contain "(Copy)"
\- When looking for a route, we should skip the `active` criteria

[1] 961ac2d

OPW-3889889
OPW-3888885

closes #165949

X-original-commit: d1bdcde
Signed-off-by: William Henrotin (whe) <whe@odoo.com>
Signed-off-by: Adrien Widart (awt) <awt@odoo.com>
@robodoo robodoo closed this May 22, 2024
@fw-bot fw-bot deleted the saas-16.3-16.0-OPW-3888885-stock_route_duplication-awt-zbMp-fw branch June 5, 2024 13: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 OE the report is linked to a support ticket (opw-...)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants