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] crm_mail_tracking: error en runbot #176

Closed

Conversation

fw-bot-adhoc
Copy link
Contributor

Ticket: 70925
Al llamar a super de _add_extra_recipients_suggestions contiene un argumento de más (self).

Forward-Port-Of: #174

@roboadhoc
Copy link

@fw-bot-adhoc
Copy link
Contributor Author

@pablohmontenegro @augusto-weiss cherrypicking of pull request #174 failed.

stdout:

CONFLICT (modify/delete): crm_mail_tracking/models/mail_thread.py deleted in HEAD and modified in d297f91 ([FIX] crm_mail_tracking: error en runbot). Version d297f91 ([FIX] crm_mail_tracking: error en runbot) of crm_mail_tracking/models/mail_thread.py left in tree.

stderr:

12:44:33.829526 git.c:444               trace: built-in: git cherry-pick d297f914a1ba3071662fc1c70fd6c53144aa7ffe
error: could not apply d297f91... [FIX] crm_mail_tracking: error en runbot
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.

None yet

3 participants