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] account_interest: Fix in comment of the interest invoice #663

Conversation

fw-bot-adhoc
Copy link
Contributor

Forward-Port-Of: #662

@roboadhoc
Copy link

@fw-bot-adhoc
Copy link
Contributor Author

@rov-adhoc @cav-adhoc cherrypicking of pull request #662 failed.

stdout:

Auto-merging account_interests/models/res_company_interest.py
CONFLICT (content): Merge conflict in account_interests/models/res_company_interest.py

stderr:

12:29:42.475555 git.c:444               trace: built-in: git cherry-pick 9ff82559ff78d01ccac02ae21867742e9b21b01f
error: could not apply 9ff82559... [FIX] account_interest: Fix in comment of the interest invoice
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

@rov-adhoc rov-adhoc force-pushed the 18.0-17.0-t-44608-rov-fix-H57s-fw branch 2 times, most recently from 38d16f9 to 2b5a1e7 Compare January 30, 2025 12:24
closes ingadhoc#654

closes ingadhoc#659

X-original-commit: d7817f6
Related: ingadhoc/odoo-academic#189
Related: ingadhoc/odoo-academic#193
Signed-off-by: Ignacio Cainelli <[email protected]>
Signed-off-by: Camila Vives <[email protected]>
Signed-off-by: rov-adhoc <[email protected]>
@rov-adhoc rov-adhoc force-pushed the 18.0-17.0-t-44608-rov-fix-H57s-fw branch from 2b5a1e7 to 52cabea Compare January 30, 2025 12:26
@rov-adhoc
Copy link
Contributor

@roboadhoc r+

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