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

refactor: provision to filter on dimensions in reconciliation tool (backport #39054) #39509

Merged
merged 28 commits into from
Jan 30, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 23, 2024

This is an automatic backport of pull request #39054 done by Mergify.
Cherry-pick of ff60ec8 has failed:

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

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

Changes to be committed:
	modified:   erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py

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

Cherry-pick of 5dc22e1 has failed:

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

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

Changes to be committed:
	modified:   erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py
	modified:   erpnext/controllers/accounts_controller.py

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

Cherry-pick of c44eb43 has failed:

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

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

Changes to be committed:
	modified:   erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py
	modified:   erpnext/controllers/accounts_controller.py

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

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

(cherry picked from commit c1fe4bc)
(cherry picked from commit ff60ec8)

# Conflicts:
#	erpnext/controllers/accounts_controller.py
(cherry picked from commit 5dc22e1)

# Conflicts:
#	erpnext/accounts/utils.py
(cherry picked from commit 0ec1759)
(cherry picked from commit e3c4423)
(cherry picked from commit c44eb43)

# Conflicts:
#	erpnext/accounts/utils.py
@ruthra-kumar
Copy link
Member

removed all conflicts, but unsure get_advance_payment_entries will get the dimension filters properly. Waiting for server tests to finish to decide further.

@ruthra-kumar ruthra-kumar force-pushed the mergify/bp/version-14-hotfix/pr-39054 branch from fc08a1a to d0c810a Compare January 30, 2024 01:00
@ruthra-kumar ruthra-kumar merged commit 844db3b into version-14-hotfix Jan 30, 2024
9 of 10 checks passed
@ruthra-kumar ruthra-kumar deleted the mergify/bp/version-14-hotfix/pr-39054 branch January 30, 2024 02:50
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 14.61.3 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Feb 15, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants