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 #43958

Merged
merged 18 commits into from
Dec 2, 2024

Conversation

sagarvora
Copy link
Collaborator

@sagarvora sagarvora commented Nov 4, 2024

Closes #43844

Squash and Merge

@github-actions github-actions bot added the needs-tests This PR needs automated unit-tests. label Nov 4, 2024
@sagarvora sagarvora removed the needs-tests This PR needs automated unit-tests. label Nov 11, 2024
@sagarvora sagarvora added the squash Meant to tell reviewers that this PR should be squashed into a single commit while merging. label Nov 13, 2024
@sagarvora sagarvora marked this pull request as ready for review November 13, 2024 10:38
@ruthra-kumar
Copy link
Member

@sagarvora
Can you resolve the conflicts

@vishakhdesai
Copy link
Contributor

@sagarvora Can you resolve the conflicts

Conflicts are resolved.

@ruthra-kumar ruthra-kumar merged commit 7cc111f into frappe:develop Dec 2, 2024
18 checks passed
mergify bot pushed a commit that referenced this pull request Dec 2, 2024
* 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
ruthra-kumar added a commit that referenced this pull request Dec 2, 2024
…-43958

fix: set correct unallocated amount in Payment Entry (backport #43958)
frappe-pr-bot pushed a commit that referenced this pull request Dec 4, 2024
# [15.45.0](v15.44.0...v15.45.0) (2024-12-04)

### Bug Fixes

* Add filter for `outstanding_amount` to fetch open PRs ([5999a8e](5999a8e))
* Add translation for showing mandatory fields in error msg ([0e1f5ff](0e1f5ff))
* added fieldname to avoid fieldname to translate ([17c2734](17c2734))
* Added translation for `Account` column ([eb4a485](eb4a485))
* adjusted incoming rate for zero rated item in purchase receipt ([435280d](435280d))
* always set sales incoming rate for internal transfers ([05795af](05795af))
* calculate submitted payment entry as paid amount ([ebdacc0](ebdacc0))
* correct buying amount for product bundel ([f165e17](f165e17))
* Dashboard for `Payment Request` ([0d67c62](0d67c62))
* Data Should be Computed in Backend to Maintain Consistent Behaviour ([#44195](#44195)) ([8ab9fc7](8ab9fc7))
* do not validate stock during inward (backport [#44417](#44417)) ([#44427](#44427)) ([e607795](e607795))
* handle multi currency in common party journal entry ([c8e2c9a](c8e2c9a))
* incorrect Gross Margin on project (backport [#44461](#44461)) ([#44468](#44468)) ([0a9c92f](0a9c92f))
* IndexError in Asset Depreciation Ledger when query result is empty ([c3bc724](c3bc724))
* link cash flow rows and fix summary linking ([633be8d](633be8d))
* move validate_total_debit_and_credit from validate to on_submit in Journal Entry ([63de576](63de576))
* number format in the message (backport [#44435](#44435)) ([#44438](#44438)) ([579d8e2](579d8e2))
* precision calculation causing 0.1 discrepancy (backport [#44431](#44431)) ([#44436](#44436)) ([0d41c23](0d41c23))
* remove queries ([ea57f2b](ea57f2b))
* SABB print for packed items (backport [#44413](#44413)) ([#44428](#44428)) ([0e39aa3](0e39aa3))
* set correct unallocated amount in Payment Entry ([#43958](#43958)) ([ae93f7f](ae93f7f))
* show "Send SMS" only when enabled (backport [#43941](#43941)) ([#43970](#43970)) ([0fbc60a](0fbc60a))
* source warehouse not set in required items of WO (backport [#44426](#44426)) ([#44434](#44434)) ([c81b5e3](c81b5e3))
* Translate `Party Account` column label ([fdda864](fdda864))
* typeerror on transaction.js ([173d60f](173d60f))

### Features

* add Company Contact Person in selling transactions (backport [#44362](#44362)) ([#44398](#44398)) ([70b5b08](70b5b08))
* **Dunning:** separate tab "Address & Contact" ([#44363](#44363)) ([e0cb5f9](e0cb5f9))

### Performance Improvements

* cache product bundle items at document level ([#44440](#44440)) ([1f97979](1f97979))
* reduce queries during transaction save ([48059a7](48059a7))

### Reverts

* remove default `Payment Request` indicator color ([9c4b581](9c4b581))
@sagarvora sagarvora deleted the fix-pe-allocation branch December 4, 2024 07:50
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Dec 25, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
backport version-15-hotfix squash Meant to tell reviewers that this PR should be squashed into a single commit while merging.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Handling Unallocated Amounts and Exchange Discrepancies in Multi-Currency Payment Entries
3 participants