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.

Sign up for GitHub

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

Jump to bottom

fix: deduplicate gain/loss JE creation for journals as payment #36911

Merged
merged 5 commits into from
Sep 3, 2023
Merged

fix: deduplicate gain/loss JE creation for journals as payment #36911

merged 5 commits into from
Sep 3, 2023

Conversation

ruthra-kumar
Copy link
Member

@ruthra-kumar ruthra-kumar commented Sep 2, 2023 •
edited
Loading

Reconciling Journal Entry to Invoices should not create duplicate gain/loss JE.

For Gain/Loss JE's, use payment's cost center, if company default is unset.

fixes: #36873 (comment)

@github-actions github-actions bot added accounts needs-tests This PR needs automated unit-tests. labels Sep 2, 2023
@codecov
Copy link

codecov bot commented Sep 2, 2023 •
edited
Loading

Codecov Report

Merging #36911 (0366928) into develop (0d26f67) will increase coverage by 0.13%.
Report is 15 commits behind head on develop.
The diff coverage is 68.75%.

@@             Coverage Diff             @@
##           develop   #36911      +/-   ##
===========================================
+ Coverage    65.42%   65.55%   +0.13%     
===========================================
  Files          794      795       +1     
  Lines        62194    62650     +456     
===========================================
+ Hits         40692    41073     +381     
- Misses       21502    21577      +75
Files Changed Coverage
...e/payment_reconciliation/payment_reconciliation.py ø
erpnext/controllers/accounts_controller.py 54.54%
erpnext/accounts/utils.py 100.00%

@ruthra-kumar ruthra-kumar linked an issue Sep 2, 2023 that may be closed by this pull request
Payment Entry : Exchange Gain/ loss #36873
Closed
@ruthra-kumar ruthra-kumar force-pushed the deduplicate_gain_loss_journal_creation branch from e020d95 to cb6da6e Compare September 2, 2023 08:01
@ruthra-kumar ruthra-kumar removed the needs-tests This PR needs automated unit-tests. label Sep 3, 2023
@ruthra-kumar ruthra-kumar merged commit 27e0dd9 into frappe:develop Sep 3, 2023
13 checks passed
@ruthra-kumar ruthra-kumar added the backport version-14-hotfix backport to version 14 label Sep 3, 2023
@ruthra-kumar ruthra-kumar mentioned this pull request Sep 3, 2023
Closed
@mergify mergify bot mentioned this pull request Sep 3, 2023
Merged
ruthra-kumar added a commit that referenced this pull request Sep 3, 2023
@ruthra-kumar
Merge pull request #36925 from frappe/mergify/bp/version-14-hotfix/pr…
553ff11 
…-36911

fix: deduplicate gain/loss JE creation for journals as payment (backport #36911)
@ankush ankush mentioned this pull request Oct 20, 2023
Closed
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Feb 3, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@deepeshgarg007 deepeshgarg007 Awaiting requested review from deepeshgarg007 deepeshgarg007 is a code owner

@rohitwaghchaure rohitwaghchaure Awaiting requested review from rohitwaghchaure rohitwaghchaure is a code owner

Assignees
No one assigned
Labels
accounts backport version-14-hotfix backport to version 14
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Payment Entry : Exchange Gain/ loss
1 participant
@ruthra-kumar