-
Notifications
You must be signed in to change notification settings - Fork 7.6k
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 #39054
Merged
ruthra-kumar
merged 22 commits into
frappe:develop
from
ruthra-kumar:provision_to_set_dimension_in_reconciliation_tool
Jan 23, 2024
Merged
refactor: provision to filter on dimensions in reconciliation tool #39054
ruthra-kumar
merged 22 commits into
frappe:develop
from
ruthra-kumar:provision_to_set_dimension_in_reconciliation_tool
Jan 23, 2024
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ruthra-kumar
requested review from
deepeshgarg007 and
rohitwaghchaure
as code owners
January 1, 2024 04:40
github-actions
bot
added
accounts
needs-tests
This PR needs automated unit-tests.
labels
Jan 1, 2024
ruthra-kumar
added
backport version-14-hotfix
backport to version 14
backport version-15-hotfix
labels
Jan 1, 2024
ruthra-kumar
force-pushed
the
provision_to_set_dimension_in_reconciliation_tool
branch
from
January 16, 2024 11:19
7e5e6c2
to
ab939cc
Compare
Codecov ReportAttention:
Additional details and impacted files@@ Coverage Diff @@
## develop #39054 +/- ##
===========================================
+ Coverage 60.07% 60.12% +0.05%
===========================================
Files 757 757
Lines 70407 70539 +132
===========================================
+ Hits 42296 42413 +117
- Misses 28111 28126 +15
|
This was referenced Jan 23, 2024
deepeshgarg007
pushed a commit
that referenced
this pull request
Jan 28, 2024
…39054) * refactor: dimensions section in allocation table in reconciliation (cherry picked from commit 1cde804) # Conflicts: # erpnext/accounts/doctype/payment_reconciliation_allocation/payment_reconciliation_allocation.json * refactor: update dimension doctypes in hooks (cherry picked from commit cfb3d87) * refactor: dimensions filter section in payment reconciliation (cherry picked from commit 20e0acc) * refactor: column break in dimension section (cherry picked from commit 20576e0) # Conflicts: # erpnext/accounts/doctype/payment_reconciliation_allocation/payment_reconciliation_allocation.json * refactor: handle dimension filters (cherry picked from commit c1fe4bc) * refactor: pass dimension filters to query (cherry picked from commit ff60ec8) * refactor: set query filters for dimensions (cherry picked from commit ad8475c) * refactor: pass dimension details to query (cherry picked from commit 5dc22e1) * refactor: replace sql with query builder for Jourals query (cherry picked from commit 9c5a792) * refactor: partial change on outstanding invoice popup (cherry picked from commit 2154502) * fix: typo's and parameter changes (cherry picked from commit 0ec1759) * refactor: Credit Note and its Exc gain/loss JE inherits dimensions (cherry picked from commit ab939cc) * refactor: apply dimension filters on cr/dr notes (cherry picked from commit 188ff8c) * chore: test dimension filter output (cherry picked from commit e3c4423) * test: dimension inheritance for cr note reconciliation (cherry picked from commit ba5a7c8) * refactor: pass dimension values to Gain/Loss journal (cherry picked from commit c44eb43) # Conflicts: # erpnext/accounts/utils.py * test: dimension inheritance in PE reconciliation (cherry picked from commit 6148fb0) * refactor: pass dimensions on advance allocation (cherry picked from commit cbd443a) * test: dimension inheritance on adv allocation (cherry picked from commit fcf4687) * refactor: dynamic dimension filters in pop up (cherry picked from commit f8bbb06) * refactor: update dimensions, only if provided (cherry picked from commit ec0f17c) * refactor: handle dynamic dimension in order query (cherry picked from commit 7c2cb70) * chore: resolve conflicts --------- Co-authored-by: ruthra kumar <ruthra@erpnext.com>
ruthra-kumar
added a commit
that referenced
this pull request
Jan 30, 2024
…-39054 refactor: provision to filter on dimensions in reconciliation tool (backport #39054)
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Labels
accounts
backport version-14-hotfix
backport to version 14
backport version-15-hotfix
needs-tests
This PR needs automated unit-tests.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Payment Reconciliation tool will have provision to filter on Accounting Dimensions.
todo:
Get Outstanding Invoice
andGet Outstanding Order
popup dialog in Payment Entryresolves: #38227