[FW][ADD] account_interests: late payment interest feature #631
+136
−76
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@ica-adhoc @jjscarafia cherrypicking of pull request #608 failed. stdout: stderr: 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 |
stdout: Auto-merging account_interests/views/res_company_views.xml Auto-merging account_interests/models/res_company_interest.py Auto-merging account_interests/__manifest__.py CONFLICT (content): Merge conflict in account_interests/__manifest__.py stderr: 10:41:54.010297 git.c:444 trace: built-in: git cherry-pick e121812 error: could not apply e121812... [ADD] account_interests: late payment interest feature 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:
rov-adhoc
force-pushed
the
18.0-17.0-t-44608-ica-YmzN-fw
branch
from
077487f to
8238102
Compare
|
@roboadhoc r+ |
|
@ica-adhoc @jjscarafia @rov-adhoc unable to stage: All commits must have author and committer email, missing email on 8238102 indicates the authorship is most likely incorrect. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
New feature on late payment interest, now can setup a "daily" interest that calculate thought many days is late payment
Forward-Port-Of: #608