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][ADD] product_catalog_tree: fields in search view #711

Open
wants to merge 1 commit into
base: 18.0
Choose a base branch
from

Conversation

fw-bot-adhoc
Copy link

Forward-Port-Of: #710

@roboadhoc
Copy link

@fw-bot-adhoc
Copy link
Author

@matiasperalta1 @lav-adhoc cherrypicking of pull request #710 failed.

stdout:

Auto-merging product_catalog_tree/views/product_product_views.xml
Auto-merging product_catalog_tree/__manifest__.py
CONFLICT (content): Merge conflict in product_catalog_tree/__manifest__.py

stderr:

14:38:27.949002 git.c:444               trace: built-in: git cherry-pick 111b8e0b6db0ca57a8ea091f3593bfd83d006d94
error: could not apply 111b8e0b... [ADD] product_catalog_tree: fields in search view
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

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