[pull] develop from frappe:develop#365
Merged
Merged
Conversation
When an Employee Advance in a currency different from the Expense Claim's currency was fetched (e.g. a USD advance pulled into an INR claim), its amounts were appended in the advance's own currency. Those row fields are interpreted in the claim currency, so the values were never converted and the advance/grand totals came out wrong. get_expense_claim_advances now converts advance_paid / unclaimed_amount / allocated_amount / return_amount into the claim currency (using advance_rate / claim_rate) when the currencies differ, and stores the row exchange rate as the claim rate so base-amount calculation stays consistent. Same-currency advances (incl. the existing exchange gain/loss flow) are unchanged. Adds a test for fetching a foreign-currency advance into a base-currency claim. Closes #4402
GL entries against an Employee Advance must be in the advance's own currency, so a cross-currency advance cannot be adjusted against a claim and breaks on submit. Exclude mismatched-currency advances from the fetch (query + form filter) instead of converting their amounts.
This file contains hidden or 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
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
1 participant
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.
See Commits and Changes for more details.
Created by
pull[bot] (v2.0.0-alpha.4)
Can you help keep this open source service alive? 💖 Please sponsor : )