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: Minor Updates in Payment Request and Payment Entry (backport #44302) #44425

Merged
merged 6 commits into from
Nov 29, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 29, 2024

Issue: Support Ticket - 26199

Changes

  • Refactor: Used object to get indicator color instead of if - else
  • Refactor: Move PR link filters to the client side so users can easily know on what basis PRs are filtered.
  • Fix: Dashboard to view connections
  • Fix: When fetching outstanding transactions in Payment Entry, do not fetch those Payment Requests which have an Outstanding Amount of zero for PR allocation in references.
Dashboard In Light Theme

image

Dashboard In Dark Theme

image

View Filters Changes

Before:
image_2024-11-27_15-51-15

After:
image_2024-11-27_15-50-32

View Outstanding Amount filter effect

Filter:
https://github.com/Abdeali099/erpnext/blob/214dfab2697ec13e70262cb4af92ca812a2dcb80/erpnext/accounts/doctype/payment_entry/payment_entry.py#L2974

Without Filter:

Without_OA_Zero

With Filter:

With_OA_Zero

Note

Backport to V-15 and V-14


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

(cherry picked from commit e1c4d6e)

# Conflicts:
#	erpnext/accounts/doctype/payment_request/payment_request_list.js
(cherry picked from commit 91955e2)
(cherry picked from commit 37ceb09)

# Conflicts:
#	erpnext/accounts/doctype/payment_request/payment_request_list.js
Copy link
Contributor Author

mergify bot commented Nov 29, 2024

Cherry-pick of e1c4d6e has failed:

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

You are currently cherry-picking commit e1c4d6e1e6.
  (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/payment_request/payment_request_list.js

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

Cherry-pick of 37ceb09 has failed:

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

You are currently cherry-picking commit 37ceb09955.
  (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/payment_request/payment_request_list.js

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 Nov 29, 2024
@ruthra-kumar ruthra-kumar merged commit 35e365c into version-15-hotfix Nov 29, 2024
11 checks passed
@ruthra-kumar ruthra-kumar deleted the mergify/bp/version-15-hotfix/pr-44302 branch November 29, 2024 10:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
needs-tests This PR needs automated unit-tests.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants