fix: exchange gain/loss GL's should be removed if advance is cancelled #34529
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
ruthra-kumar
force-pushed
the
cancel_exchange_gain_loss_ledger_entries_on_advance_cancellation
branch
from
3627953
to
10da002
Compare
If deferred revenue/expense is enabled for any item, don't repost.
If there are no deferred revenue/expense cancelling advance should cancel the exchange gain/loss booked due to different exchange rates of payment and its linked invoice
ruthra-kumar
force-pushed
the
cancel_exchange_gain_loss_ledger_entries_on_advance_cancellation
branch
from
10da002
to
9cf209d
Compare
ruthra-kumar
requested review from
nextchamp-saqib and
deepeshgarg007
as code owners
deepeshgarg007
added a commit
that referenced
this pull request
Mar 21, 2023
* chore: Update user manual link (#34478) * chore: Update user manual link (#34478) (cherry picked from commit be723bb) # Conflicts: # erpnext/patches.txt * chore: resolve conflicts * chore: Update version Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com> * chore: Update version Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com> --------- Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com> Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com> * fix: Overallocation of 'qty' from Cr Notes to Parent Invoice Cr Notes 'qty' are overallocated to parent invoice, when there are mulitple instances of same item in Invoice. (cherry picked from commit e2f19c6) * refactor: Ignore linked Cr Notes in Report output (cherry picked from commit d0715a8) * test: Gross Profit report output for Cr notes 2 New test cases added. 1. Standalone Cr notes will be reported as normal Invoices 2. Cr notes against an Invoice will not overallocate qty if there are multiple instances of same item (cherry picked from commit cc61dae) * fix: incorrect depr schedules after asset repair [v13] (#34520) * fix: incorrect schedule after repair for WDV and DD * chore: only fix schedules for assets with calc_depr true * fix: incorrect schedule after repair for straight line and manual * refactor: calc depr in asset repair and if statement (#34526) refactor: minor asset repair of calc depr and if statement * fix(client): Amount calculation for 0 qty debit notes (#34455) fix(client): Amount calculation for 0 qty debit notes (#34455) fix(client): Amount calculaton for 0 qty debit notes Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com> (cherry picked from commit ee6c107) Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com> * fix: german translations (#34312) fix: german translations (#34312) fix: some german translations (cherry picked from commit 59c2e7e) Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com> * fix: exchange gain/loss GL's should be removed if advance is cancelled (#34529) * fix: report GL for invoice when advance has different exchange rate If deferred revenue/expense is enabled for any item, don't repost. * test: cancelling advance should remove exchange gain/loss If there are no deferred revenue/expense cancelling advance should cancel the exchange gain/loss booked due to different exchange rates of payment and its linked invoice --------- Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com> Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com> Co-authored-by: ruthra kumar <ruthra@erpnext.com> Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
frappe-pr-bot
pushed a commit
that referenced
this pull request
Mar 28, 2023
## [13.49.9](v13.49.8...v13.49.9) (2023-03-28) ### Bug Fixes * `Blanket Order` (backport [#34279](#34279)) ([#34548](#34548)) ([8ddbac5](8ddbac5)) * **client:** Amount calculation for 0 qty debit notes ([#34455](#34455)) ([19dda80](19dda80)) * exchange gain/loss GL's should be removed if advance is cancelled ([#34529](#34529)) ([00518eb](00518eb)) * german translations ([#34312](#34312)) ([661030a](661030a)) * incorrect `Opening Value` in `Stock Balance` report (backport [#34461](#34461)) ([#34622](#34622)) ([e53a96a](e53a96a)) * incorrect depr schedules after asset repair [v13] ([#34520](#34520)) ([ae88ba5](ae88ba5)) * Overallocation of 'qty' from Cr Notes to Parent Invoice ([d2a1acc](d2a1acc)) * Party Name in SOA print when viewed from Customer/Supplier master ([#34597](#34597)) ([4bdea43](4bdea43)) * Percentage billing in Sales Order ([#34606](#34606)) ([3aab6e6](3aab6e6)) * recalculate WDV rate after asset repair [v13] ([#34567](#34567)) ([c8bde39](c8bde39)) * Search field not working for customer, supplier ([#32693](#32693)) ([dbe289e](dbe289e)) * unset address and contact on trash (backport [#34495](#34495)) ([#34561](#34561)) ([7f83d15](7f83d15)) * valuation rate issue while making stock entry from PO ([3574d49](3574d49))
|
🎉 This PR is included in version 13.49.9 🎉 The release is available on GitHub release Your semantic-release bot 📦🚀 |
ruthra-kumar
deleted the
cancel_exchange_gain_loss_ledger_entries_on_advance_cancellation
branch
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Exchange Gain/Loss booked by invoice if advance payment is of different currency. This should be cancelled when the Advance payment is cancelled.