Skip to content

[FIX] uoms_sale/uoms_purchase: block deletion of used secondary uom#897

Open
fw-bot-adhoc wants to merge 1 commit into
ingadhoc:19.0from
adhoc-dev:19.0-18.0-h-117492-les-5815-fw
Open

[FIX] uoms_sale/uoms_purchase: block deletion of used secondary uom#897
fw-bot-adhoc wants to merge 1 commit into
ingadhoc:19.0from
adhoc-dev:19.0-18.0-h-117492-les-5815-fw

Conversation

@fw-bot-adhoc
Copy link
Copy Markdown

Forward-Port-Of: #895

stdout:
CONFLICT (modify/delete): product_uoms_purchase/models/product_uoms.py deleted in 7c2d22002ef79238701e333602d5077099709394 and modified in 19224d4.  Version 19224d4 of product_uoms_purchase/models/product_uoms.py left in tree.

stderr:
@roboadhoc
Copy link
Copy Markdown
Contributor

Pull request status dashboard

@fw-bot-adhoc
Copy link
Copy Markdown
Author

@les-adhoc @jcadhoc cherrypicking of pull request #895 failed.

stdout:

CONFLICT (modify/delete): product_uoms_purchase/models/product_uoms.py deleted in 7c2d22002ef79238701e333602d5077099709394 and modified in 19224d429c3ed6bd63a5dc8f8e4e0bc9a068fb65.  Version 19224d429c3ed6bd63a5dc8f8e4e0bc9a068fb65 of product_uoms_purchase/models/product_uoms.py left in tree.

Either perform the forward-port manually (and push to this branch, proceeding as usual) or close this PR (maybe?).

:shipit: you can use git-fw to re-do the forward-port for you locally.

⚠️ after resolving this conflict, you will need to merge it via @roboadhoc.

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

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.

3 participants