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: Correct interest calculation for late payments with multiple associated payments per invoice #700

Closed

Conversation

fw-bot-adhoc
Copy link
Contributor

Forward-Port-Of: #694

@roboadhoc
Copy link

@fw-bot-adhoc
Copy link
Contributor Author

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

stdout:

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

stderr:

17:52:17.352395 git.c:444               trace: built-in: git cherry-pick db23f4933d8fe5d1a24965386b3ba9aae3625be8
error: could not apply db23f493... [FIX] account_interest: Correct interest calculation for late payments with multiple associated payments per 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

…s with multiple associated payments per invoice

X-original-commit: e04ff37
@rov-adhoc rov-adhoc force-pushed the 18.0-17.0-h-49446-rov-Mv-K-fw branch from 662c25a to 29fc21f Compare March 12, 2025 18:11
@rov-adhoc
Copy link
Contributor

@roboadhoc r+

roboadhoc pushed a commit to ingadhoc/odoo-academic that referenced this pull request Mar 12, 2025
…s with multiple associated payments per invoice

closes #227

X-original-commit: 8559324
Related: ingadhoc/account-financial-tools#700
Signed-off-by: Camila Vives <[email protected]>
Signed-off-by: rov-adhoc <[email protected]>
roboadhoc pushed a commit that referenced this pull request Mar 12, 2025
…s with multiple associated payments per invoice

closes #700

X-original-commit: e04ff37
Related: ingadhoc/odoo-academic#227
Signed-off-by: Camila Vives <[email protected]>
Signed-off-by: rov-adhoc <[email protected]>
@roboadhoc roboadhoc closed this Mar 12, 2025
@roboadhoc roboadhoc added the 17.1 label Mar 12, 2025
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