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: refactor query inget_total_allocated_amount in bank_transaction (backport #44787) #44896

Open
wants to merge 2 commits into
base: version-14-hotfix
Choose a base branch
from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 24, 2024

Issue: https://support.frappe.io/app/hd-ticket/26093

Before:
image

After:
image


This is an automatic backport of pull request #44787 done by [Mergify](https://mergify.com).

(cherry picked from commit 6b847cd)

# Conflicts:
#	erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py
#	erpnext/accounts/doctype/bank_transaction/bank_transaction.py
(cherry picked from commit 2ce0786)

# Conflicts:
#	erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py
@mergify mergify bot requested a review from deepeshgarg007 as a code owner December 24, 2024 12:24
@mergify mergify bot added the conflicts label Dec 24, 2024
@mergify mergify bot requested a review from ruthra-kumar as a code owner December 24, 2024 12:24
Copy link
Contributor Author

mergify bot commented Dec 24, 2024

Cherry-pick of 6b847cd has failed:

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

You are currently cherry-picking commit 6b847cdb62.
  (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/bank_reconciliation_tool/bank_reconciliation_tool.py
	both modified:   erpnext/accounts/doctype/bank_transaction/bank_transaction.py

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

Cherry-pick of 2ce0786 has failed:

On branch mergify/bp/version-14-hotfix/pr-44787
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 2ce07865d3.
  (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/bank_reconciliation_tool/bank_reconciliation_tool.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

@github-actions github-actions bot added the needs-tests This PR needs automated unit-tests. label Dec 24, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
conflicts needs-tests This PR needs automated unit-tests.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant