-
Notifications
You must be signed in to change notification settings - Fork 7.9k
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
fix: cannot reconcile bank transactions against internal transfer payment entries #26932
Merged
nabinhait
merged 6 commits into
frappe:develop
from
GangaManoj:fix-clearance-date-setting
Aug 25, 2021
Merged
fix: cannot reconcile bank transactions against internal transfer payment entries #26932
nabinhait
merged 6 commits into
frappe:develop
from
GangaManoj:fix-clearance-date-setting
Aug 25, 2021
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
…nsfer if both Transactions have been reconciled
… only been reconciled with one Bank Transaction
@coveralls is not allowed to run commands Hey, I reacted but my real name is @Mergifyio |
nabinhait
approved these changes
Aug 25, 2021
frappe-pr-bot
pushed a commit
to frappe-pr-bot/erpnext
that referenced
this pull request
Aug 25, 2021
…ment entries (frappe#26932) * fix: Only set Clearance Date for Payment Entries of type Internal Transfer if both Transactions have been reconciled * fix: Reset clearance_date for intra-company Payment Entries that have only been reconciled with one Bank Transaction * fix: indentation and args Co-authored-by: Saqib <nextchamp.saqib@gmail.com> Co-authored-by: Nabin Hait <nabinhait@gmail.com> (cherry picked from commit 842ceb1) # Conflicts: # erpnext/patches.txt
nabinhait
added a commit
that referenced
this pull request
Aug 26, 2021
…ment entries (#27148) * fix: cannot reconcile bank transactions against internal transfer payment entries (#26932) * fix: Only set Clearance Date for Payment Entries of type Internal Transfer if both Transactions have been reconciled * fix: Reset clearance_date for intra-company Payment Entries that have only been reconciled with one Bank Transaction * fix: indentation and args Co-authored-by: Saqib <nextchamp.saqib@gmail.com> Co-authored-by: Nabin Hait <nabinhait@gmail.com> (cherry picked from commit 842ceb1) # Conflicts: # erpnext/patches.txt * fix: merge conflict * fixed patches Co-authored-by: Ganga Manoj <ganga.manoj98@gmail.com> Co-authored-by: Nabin Hait <nabinhait@gmail.com>
asoral
pushed a commit
to asoral/erpnext
that referenced
this pull request
Nov 12, 2021
…ment entries (frappe#26932) * fix: Only set Clearance Date for Payment Entries of type Internal Transfer if both Transactions have been reconciled * fix: Reset clearance_date for intra-company Payment Entries that have only been reconciled with one Bank Transaction * fix: indentation and args Co-authored-by: Saqib <nextchamp.saqib@gmail.com> Co-authored-by: Nabin Hait <nabinhait@gmail.com>
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.
Problem:
Proposed Solution: