Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[minor] student applicant fixes

Browse Source
This commit is contained in:
Rushabh Mehta 2016-10-05 18:04:19 +05:30
parent 558f526a68
commit a47652624a
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
erpnext/schools/doctype/student_admission/student_admission.py
View File

@ -15,14 +15,15 @@ class StudentAdmission(WebsiteGenerator):
) )
def autoname(self): def autoname(self):
self.name = self.get_title() if not self.title:
self.title = self.name self.title = self.get_title()
self.name = self.title
def get_context(self, context): def get_context(self, context):
context.parents = [{'name': 'admissions', 'title': _('All Student Admissions') }] context.parents = [{'name': 'admissions', 'title': _('All Student Admissions') }]
def get_title(self): def get_title(self):
return _("Admissions for {0}") + self.academic_year return _("Admissions for {0}").format(self.academic_term)
def get_list_context(context): def get_list_context(context):
context.title = _("Student Admissions") context.title = _("Student Admissions")

2
erpnext/schools/doctype/student_applicant/student_applicant_list.js
View File

@ -3,7 +3,7 @@ frappe.listview_settings['Student Applicant'] = {
has_indicator_for_draft: 1, has_indicator_for_draft: 1,
get_indicator: function(doc) { get_indicator: function(doc) {
if (doc.paid) { if (doc.paid) {
return [__("Paid"), "green", "paid,=,1"]; return [__("Paid"), "green", "paid,=,Yes"];
} }
else if (doc.application_status=="Applied") { else if (doc.application_status=="Applied") {
return [__("Applied"), "orange", "application_status,=,Applied"]; return [__("Applied"), "orange", "application_status,=,Applied"];