Skip to content

Commit

Permalink
fix(Education): descriptions not copied while creating fees from fee …
Browse files Browse the repository at this point in the history
…structure (#22793)
  • Loading branch information
ruchamahabal authored Jul 24, 2020
1 parent c5b6ba7 commit 9abb8e3
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
6 changes: 3 additions & 3 deletions erpnext/education/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ def get_fee_components(fee_structure):
:param fee_structure: Fee Structure.
"""
if fee_structure:
fs = frappe.get_list("Fee Component", fields=["fees_category", "amount"] , filters={"parent": fee_structure}, order_by= "idx")
fs = frappe.get_list("Fee Component", fields=["fees_category", "description", "amount"] , filters={"parent": fee_structure}, order_by= "idx")
return fs


Expand Down Expand Up @@ -363,9 +363,9 @@ def get_current_enrollment(student, academic_year=None):
select
name as program_enrollment, student_name, program, student_batch_name as student_batch,
student_category, academic_term, academic_year
from
from
`tabProgram Enrollment`
where
where
student = %s and academic_year = %s
order by creation''', (student, current_academic_year), as_dict=1)

Expand Down
1 change: 1 addition & 0 deletions erpnext/education/doctype/fees/fees.js
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,7 @@ frappe.ui.form.on("Fees", {
$.each(r.message, function(i, d) {
var row = frappe.model.add_child(frm.doc, "Fee Component", "components");
row.fees_category = d.fees_category;
row.description = d.description;
row.amount = d.amount;
});
}
Expand Down

0 comments on commit 9abb8e3

Please sign in to comment.