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: toggle debit credit amounts for transaction currency too; minor refactor (backport #44263) #44278

Closed

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 22, 2024

Fixes: #44197 (comment)

Issue

Amount in transaction currency is -ve and on credit side.

image

…refactor

(cherry picked from commit 8e759c3)

# Conflicts:
#	erpnext/accounts/general_ledger.py
(cherry picked from commit a10e175)

# Conflicts:
#	erpnext/accounts/doctype/journal_entry/test_journal_entry.py
Copy link
Contributor Author

mergify bot commented Nov 22, 2024

Cherry-pick of 8e759c3 has failed:

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

You are currently cherry-picking commit 8e759c32c4.
  (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/general_ledger.py

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

Cherry-pick of a10e175 has failed:

On branch mergify/bp/version-14-hotfix/pr-44263
Your branch is ahead of 'origin/version-14-hotfix' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit a10e175bc9.
  (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/journal_entry/test_journal_entry.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

@vorasmit
Copy link
Collaborator

Transaction currency doesn't exist in v14 and hence this PR may not be needed.

@vorasmit vorasmit closed this Nov 25, 2024
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