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

fix: cannot reconcile bank transactions against internal transfer payment entries #26932

Merged
merged 6 commits into from
Aug 25, 2021

Conversation

GangaManoj
Copy link
Contributor

@GangaManoj GangaManoj commented Aug 12, 2021

Problem:

  • In the case of Payment Entries of type Internal Transfer, two Bank Transactions are required to be made by the same Company to reconcile them. However, on reconciling the first, the Clearance Date for the Payment Entry will be set, which means that when you try to reconcile the second, the Payment Entry will not show up.

Proposed Solution:

  • Only set the Clearance Date for the Payment Entry if it's been reconciled against both Bank Transactions.

…nsfer if both Transactions have been reconciled
@GangaManoj GangaManoj changed the title fix: Set Clearance Date for Payment Entries of type Internal Transfer only if both Transactions have been reconciled fix: Set Clearance Date for Payment Entries of type Internal Transfer only if it's been reconciled against both Transactions Aug 12, 2021
@nextchamp-saqib nextchamp-saqib changed the title fix: Set Clearance Date for Payment Entries of type Internal Transfer only if it's been reconciled against both Transactions fix: cannot reconcile bank transactions against internal transfer payment entries Aug 13, 2021
@coveralls
Copy link

coveralls commented Aug 25, 2021

Coverage Status

Coverage increased (+0.03%) to 51.368% when pulling 574a399 on GangaManoj:fix-clearance-date-setting into 8730846 on frappe:develop.

@mergify
Copy link
Contributor

mergify bot commented Aug 25, 2021

@coveralls is not allowed to run commands

Hey, I reacted but my real name is @Mergifyio

@nabinhait nabinhait merged commit 842ceb1 into frappe:develop 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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants