nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-26 08:24:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(Education): descriptions not copied while creating fees from fee structure (#22793)

Browse Source
This commit is contained in:
Rucha Mahabal
2020-07-24 08:52:53 +05:30
committed by GitHub
parent c5b6ba7556
commit 9abb8e309e
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/education/api.py
View File

@@ -151,7 +151,7 @@ def get_fee_components(fee_structure):
:param fee_structure: Fee Structure. :param fee_structure: Fee Structure.
""" """
if 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 return fs
@@ -363,9 +363,9 @@ def get_current_enrollment(student, academic_year=None):
select select
name as program_enrollment, student_name, program, student_batch_name as student_batch, name as program_enrollment, student_name, program, student_batch_name as student_batch,
student_category, academic_term, academic_year student_category, academic_term, academic_year
from from
`tabProgram Enrollment` `tabProgram Enrollment`
where where
student = %s and academic_year = %s student = %s and academic_year = %s
order by creation''', (student, current_academic_year), as_dict=1) order by creation''', (student, current_academic_year), as_dict=1)

1
erpnext/education/doctype/fees/fees.js
View File

@@ -161,6 +161,7 @@ frappe.ui.form.on("Fees", {
$.each(r.message, function(i, d) { $.each(r.message, function(i, d) {
var row = frappe.model.add_child(frm.doc, "Fee Component", "components"); var row = frappe.model.add_child(frm.doc, "Fee Component", "components");
row.fees_category = d.fees_category; row.fees_category = d.fees_category;
row.description = d.description;
row.amount = d.amount; row.amount = d.amount;
}); });
} }