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: Debit and Credit mismatch on transaction currency debit and credit values (backport #46064) #46397

Merged
merged 20 commits into from
Mar 8, 2025

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 8, 2025

Issue

Debit and Credit values in Transaction currency have a slight mismatch on high precision exchange rates. This is un-fixable on the current approach.
Screenshot from 2025-02-19 11-39-23

Solution

Instead of calculating Transaction Debit and Credit from base currency, use values directly from parent document.

todo:

(cherry picked from commit 7ff3977)
(cherry picked from commit ee93ed8)
(cherry picked from commit 3e292ef)

# Conflicts:
#	erpnext/accounts/doctype/sales_invoice/sales_invoice.py
(cherry picked from commit 9f3847c)
(cherry picked from commit 5c86e3c)
(cherry picked from commit bc792c6)
(cherry picked from commit 6545467)
(cherry picked from commit f1d8fee)
Copy link
Contributor Author

mergify bot commented Mar 8, 2025

Cherry-pick of 3e292ef has failed:

On branch mergify/bp/version-15/pr-46064
Your branch is ahead of 'origin/version-15' by 4 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 3e292ef2cb.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/accounts/doctype/sales_invoice/sales_invoice.py

no changes added to commit (use "git add" and/or "git commit -a")

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 merged commit 84b0348 into version-15 Mar 8, 2025
11 checks passed
@ruthra-kumar ruthra-kumar deleted the mergify/bp/version-15/pr-46064 branch March 8, 2025 07:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant