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: filter only submitted fees in student fee collection report #28280

Merged
merged 2 commits into from
Nov 9, 2021

Conversation

bibinqcs
Copy link
Contributor

@bibinqcs bibinqcs commented Nov 8, 2021

Please provide enough information so that others can review your pull request:

I am suggesting this fix to solve an issue with cancelled Fees documents reflecting in the paid column of the Student Fee Collection report, I noticed this while making test entries in V13 i.e ERPNext: v13.13.0 (version-13), Adding the total row was useful to see the total amount of all the fees documents

Explain the details for making this change. What existing problem does the pull request solve?

Made changes to the student_fee_collection.json

To filter out and show only submitted documents added in "query" WHERE docstatus=1
To Show the Total Row added "add_total_row": 1,

Screenshots/GIFs

Before Fix

before_fix

After Fix

after_fix

@codecov
Copy link

codecov bot commented Nov 8, 2021

Codecov Report

Merging #28280 (16621cf) into develop (2da1703) will increase coverage by 0.01%.
The diff coverage is n/a.

@@             Coverage Diff             @@
##           develop   #28280      +/-   ##
===========================================
+ Coverage    55.23%   55.25%   +0.01%     
===========================================
  Files         1117     1117              
  Lines        66494    66494              
===========================================
+ Hits         36729    36738       +9     
+ Misses       29765    29756       -9     
Impacted Files Coverage Δ
...value/warehouse_wise_item_balance_age_and_value.py 92.40% <0.00%> (-2.54%) ⬇️
erpnext/stock/report/stock_ageing/stock_ageing.py 91.24% <0.00%> (-2.19%) ⬇️
erpnext/selling/doctype/sales_order/sales_order.py 76.30% <0.00%> (-0.75%) ⬇️
...ice_creation_tool/opening_invoice_creation_tool.py 60.13% <0.00%> (-0.70%) ⬇️
erpnext/stock/get_item_details.py 79.60% <0.00%> (+0.15%) ⬆️
erpnext/stock/stock_ledger.py 85.81% <0.00%> (+0.18%) ⬆️
...ext/payroll/doctype/payroll_entry/payroll_entry.py 71.02% <0.00%> (+0.23%) ⬆️
erpnext/stock/doctype/serial_no/serial_no.py 78.75% <0.00%> (+0.25%) ⬆️
...ype/account/chart_of_accounts/chart_of_accounts.py 77.93% <0.00%> (+0.68%) ⬆️
erpnext/payroll/doctype/salary_slip/salary_slip.py 84.50% <0.00%> (+0.79%) ⬆️
... and 4 more

@ruchamahabal ruchamahabal merged commit 0e8e7e2 into frappe:develop Nov 9, 2021
@ruchamahabal
Copy link
Member

@Mergifyio backport version-13-hotfix

mergify bot pushed a commit that referenced this pull request Nov 9, 2021
)

* Update student_fee_collection.json

Fix: filter and show only submitted fees documents

* fix: add total row for the student fee collection

(cherry picked from commit 0e8e7e2)
@mergify
Copy link
Contributor

mergify bot commented Nov 9, 2021

backport version-13-hotfix

✅ Backports have been created

ruchamahabal added a commit that referenced this pull request Nov 9, 2021
) (#28282)

* Update student_fee_collection.json

Fix: filter and show only submitted fees documents

* fix: add total row for the student fee collection

(cherry picked from commit 0e8e7e2)

Co-authored-by: Bibin <17405044+bibinqcs@users.noreply.github.com>
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
conncampbell pushed a commit to conncampbell/erpnext that referenced this pull request Jan 9, 2022
…ppe#28280)

* Update student_fee_collection.json

Fix: filter and show only submitted fees documents

* fix: add total row for the student fee collection
@bibinqcs bibinqcs deleted the patch-1 branch September 1, 2022 12:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants