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 #39054

Conversation

ruthra-kumar
Copy link
Member

@ruthra-kumar ruthra-kumar commented Jan 1, 2024

Payment Reconciliation tool will have provision to filter on Accounting Dimensions.

todo:

  • Credit Note(JE) created on reconciling Sales Return to Invoice, should inherit its parent's dimensions
  • Exchage Gain/Loss Journal should inherit dimension from its parent
  • Add dynamic dimension filter's in the Get Outstanding Invoice and Get Outstanding Order popup dialog in Payment Entry
  • test cases

resolves: #38227

@ruthra-kumar ruthra-kumar force-pushed the provision_to_set_dimension_in_reconciliation_tool branch from 7e5e6c2 to ab939cc Compare January 16, 2024 11:19
Copy link

codecov bot commented Jan 22, 2024

Codecov Report

Attention: 13 lines in your changes are missing coverage. Please review.

Comparison is base (ad59069) 60.07% compared to head (7c2cb70) 60.12%.
Report is 104 commits behind head on develop.

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     
Files Coverage Δ
...xt/accounts/doctype/payment_entry/payment_entry.py 79.73% <100.00%> (-0.10%) ⬇️
erpnext/accounts/utils.py 74.38% <100.00%> (+0.30%) ⬆️
erpnext/controllers/accounts_controller.py 85.40% <100.00%> (+0.28%) ⬆️
erpnext/hooks.py 100.00% <ø> (ø)
erpnext/stock/report/stock_ageing/stock_ageing.py 91.07% <100.00%> (+0.12%) ⬆️
...ounts/doctype/bank_transaction/bank_transaction.py 63.30% <85.71%> (+0.74%) ⬆️
...customer_ledger_summary/customer_ledger_summary.py 0.00% <0.00%> (ø)
...e/payment_reconciliation/payment_reconciliation.py 85.64% <85.89%> (-0.51%) ⬇️

... and 26 files with indirect coverage changes

@ruthra-kumar ruthra-kumar merged commit ebaa5d3 into frappe:develop Jan 23, 2024
15 checks passed
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)
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Feb 7, 2024
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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Need branch filter or accounting dimension filters in Payment entry or Payment reconciliation
1 participant