Skip to content

[FW][FIX]purchase_stock_ux: restrict cancel_remaining for blocked PO#243

Closed
fw-bot-adhoc wants to merge 1 commit into
ingadhoc:18.0from
adhoc-dev:18.0-16.0-h-89660-mav-0OcD-fw
Closed

[FW][FIX]purchase_stock_ux: restrict cancel_remaining for blocked PO#243
fw-bot-adhoc wants to merge 1 commit into
ingadhoc:18.0from
adhoc-dev:18.0-16.0-h-89660-mav-0OcD-fw

Conversation

@fw-bot-adhoc

Copy link
Copy Markdown

Forward-Port-Of: #236

@roboadhoc

Copy link
Copy Markdown
Contributor

@fw-bot-adhoc

Copy link
Copy Markdown
Author

@mav-adhoc @jcadhoc cherrypicking of pull request #236 failed.

stdout:

Auto-merging purchase_stock_ux/models/purchase_order_line.py
CONFLICT (content): Merge conflict in purchase_stock_ux/models/purchase_order_line.py

stderr:

18:44:01.182605 git.c:444               trace: built-in: git cherry-pick 325e3e43b89fc4a2161cc01bfa7eb89c8f2652c9
error: could not apply 325e3e4... [FIX]purchase_stock_ux: restrict cancel_remaining for blocked PO
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.

More info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port

@mav-adhoc mav-adhoc force-pushed the 18.0-16.0-h-89660-mav-0OcD-fw branch from d835669 to d492e36 Compare May 28, 2025 15:41
@jcadhoc

jcadhoc commented May 29, 2025

Copy link
Copy Markdown
Contributor

@roboadhoc r+

@roboadhoc roboadhoc closed this in f50f113 May 29, 2025
@roboadhoc roboadhoc added the 17.1 label May 29, 2025
@fw-bot-adhoc fw-bot-adhoc deleted the 18.0-16.0-h-89660-mav-0OcD-fw branch June 12, 2025 17:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants