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: set correct unallocated amount in Payment Entry (backport #43958) #44466

Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 2, 2024

Closes #43844

Squash and Merge


This is an automatic backport of pull request #43958 done by Mergify.

* fix: set correct unallocated amount in Payment Entry

* fix: add checkbox and other logic fix

* fix: patch to set is_exchange_gain_loss in Payment Entry deductions

* fix: consider deductions except exch. gain/loss

* fix: set exchange gain loss in payment entry

* fix: separate function to set exchange gain loss

* fix: failing test cases

* fix: add cash disc. row first

* fix: review changes

* fix: changes as per review

* fix: failing test cases

* fix: review

* fix: wait for request to complete before updating exchange gain loss

* fix: review

---------

Co-authored-by: vishakhdesai <[email protected]>
Co-authored-by: ruthra kumar <[email protected]>
(cherry picked from commit 7cc111f)

# Conflicts:
#	erpnext/accounts/doctype/payment_entry_deduction/payment_entry_deduction.json
#	erpnext/patches.txt
Copy link
Contributor Author

mergify bot commented Dec 2, 2024

Cherry-pick of 7cc111f has failed:

On branch mergify/bp/version-15-hotfix/pr-43958
Your branch is up to date with 'origin/version-15-hotfix'.

You are currently cherry-picking commit 7cc111f790.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   erpnext/accounts/doctype/exchange_rate_revaluation/test_exchange_rate_revaluation.py
	modified:   erpnext/accounts/doctype/payment_entry/payment_entry.js
	modified:   erpnext/accounts/doctype/payment_entry/payment_entry.json
	modified:   erpnext/accounts/doctype/payment_entry/payment_entry.py
	modified:   erpnext/accounts/doctype/payment_entry/test_payment_entry.py
	modified:   erpnext/accounts/doctype/payment_entry_deduction/payment_entry_deduction.py
	modified:   erpnext/accounts/doctype/unreconcile_payment/test_unreconcile_payment.py
	modified:   erpnext/accounts/test/test_utils.py
	new file:   erpnext/patches/v15_0/set_is_exchange_gain_loss_in_payment_entry_deductions.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/accounts/doctype/payment_entry_deduction/payment_entry_deduction.json
	both modified:   erpnext/patches.txt

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@ruthra-kumar ruthra-kumar force-pushed the mergify/bp/version-15-hotfix/pr-43958 branch from 6d31886 to c157978 Compare December 2, 2024 09:55
@ruthra-kumar ruthra-kumar merged commit 7150aff into version-15-hotfix Dec 2, 2024
11 checks passed
@ruthra-kumar ruthra-kumar deleted the mergify/bp/version-15-hotfix/pr-43958 branch December 2, 2024 10:45
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Dec 17, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants