Closed fw-bot-adhoc closed 3 months ago
@rov-adhoc @jjscarafia cherrypicking of pull request ingadhoc/account-financial-tools#527 failed.
stdout:
Auto-merging account_interests/models/res_company_interest.py
CONFLICT (content): Merge conflict in account_interests/models/res_company_interest.py
stderr:
14:49:05.292994 git.c:444 trace: built-in: git cherry-pick cfcb3389e98cba1baea4bfce475bdc26adb891b7
error: could not apply cfcb3389... [IMP] account_interest: Add try and catch in order to be aware of the companies where the cron fail
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
@fw-bot-adhoc r+
@rov-adhoc I can only do this on unmodified forward-port PRs, ask roboadhoc.
@roboadhoc r+
… companies where the cron fail
Forward-Port-Of: ingadhoc/account-financial-tools#527