renamed one doctype to the fee schedule
diff --git a/erpnext/config/schools.py b/erpnext/config/schools.py
index 78c80ca..6d2a9c0 100644
--- a/erpnext/config/schools.py
+++ b/erpnext/config/schools.py
@@ -155,7 +155,7 @@
"name": "Fees"
},{
"type": "doctype",
- "name": "Fee Request"
+ "name": "Fee Schedule"
},
{
"type": "doctype",
diff --git a/erpnext/schools/doctype/fee_request/test_fee_request.py b/erpnext/schools/doctype/fee_request/test_fee_request.py
deleted file mode 100644
index f419e94..0000000
--- a/erpnext/schools/doctype/fee_request/test_fee_request.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and Contributors
-# See license.txt
-from __future__ import unicode_literals
-
-import unittest
-
-class TestFeeRequest(unittest.TestCase):
- pass
diff --git a/erpnext/schools/doctype/fee_request/__init__.py b/erpnext/schools/doctype/fee_schedule/__init__.py
similarity index 100%
rename from erpnext/schools/doctype/fee_request/__init__.py
rename to erpnext/schools/doctype/fee_schedule/__init__.py
diff --git a/erpnext/schools/doctype/fee_request/fee_request.js b/erpnext/schools/doctype/fee_schedule/fee_schedule.js
similarity index 82%
rename from erpnext/schools/doctype/fee_request/fee_request.js
rename to erpnext/schools/doctype/fee_schedule/fee_schedule.js
index 830940e..480ca57 100644
--- a/erpnext/schools/doctype/fee_request/fee_request.js
+++ b/erpnext/schools/doctype/fee_schedule/fee_schedule.js
@@ -1,14 +1,14 @@
// Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-frappe.ui.form.on('Fee Request', {
+frappe.ui.form.on('Fee Schedule', {
refresh: function(frm) {
frm.disable_save();
},
fee_structure: function(frm) {
if (frm.doc.fee_structure) {
frappe.call({
- method: "erpnext.schools.doctype.fee_request.fee_request.get_fee_structure",
+ method: "erpnext.schools.doctype.fee_schedule.fee_schedule.get_fee_structure",
args: {
"target_doc": frm.doc.name,
"source_name": frm.doc.fee_structure
diff --git a/erpnext/schools/doctype/fee_request/fee_request.json b/erpnext/schools/doctype/fee_schedule/fee_schedule.json
similarity index 98%
rename from erpnext/schools/doctype/fee_request/fee_request.json
rename to erpnext/schools/doctype/fee_schedule/fee_schedule.json
index 6cdcd8d..dd793b2 100644
--- a/erpnext/schools/doctype/fee_request/fee_request.json
+++ b/erpnext/schools/doctype/fee_schedule/fee_schedule.json
@@ -21,7 +21,7 @@
"columns": 0,
"fieldname": "create_fees",
"fieldtype": "Button",
- "hidden": 0,
+ "hidden": 1,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
@@ -335,7 +335,7 @@
"label": "",
"length": 0,
"no_copy": 0,
- "options": "Fee Request Program",
+ "options": "Fee Schedule Program",
"permlevel": 0,
"precision": "",
"print_hide": 0,
@@ -367,7 +367,7 @@
"label": "",
"length": 0,
"no_copy": 0,
- "options": "Fee Request Student Group",
+ "options": "Fee Schedule Student Group",
"permlevel": 0,
"precision": "",
"print_hide": 0,
@@ -601,10 +601,10 @@
"issingle": 1,
"istable": 0,
"max_attachments": 0,
- "modified": "2017-07-24 15:49:48.117287",
+ "modified": "2017-07-28 11:14:28.695618",
"modified_by": "Administrator",
"module": "Schools",
- "name": "Fee Request",
+ "name": "Fee Schedule",
"name_case": "",
"owner": "Administrator",
"permissions": [
diff --git a/erpnext/schools/doctype/fee_request/fee_request.py b/erpnext/schools/doctype/fee_schedule/fee_schedule.py
similarity index 96%
rename from erpnext/schools/doctype/fee_request/fee_request.py
rename to erpnext/schools/doctype/fee_schedule/fee_schedule.py
index f8cb554..012c510 100644
--- a/erpnext/schools/doctype/fee_request/fee_request.py
+++ b/erpnext/schools/doctype/fee_schedule/fee_schedule.py
@@ -10,7 +10,7 @@
from frappe.utils import money_in_words
-class FeeRequest(Document):
+class FeeSchedule(Document):
def validate(self):
if not(self.programs or self.student_groups):
frappe.throw(_("Select atleast one {0}").format(self.fee_request_against))
@@ -51,7 +51,6 @@
def get_fee_structure(source_name,target_doc=None):
fee_request = get_mapped_doc("Fee Structure", source_name,
{"Fee Structure": {
- "doctype": "Fee Request"
+ "doctype": "Fee Schedule"
}}, ignore_permissions=True)
return fee_request
-
diff --git a/erpnext/schools/doctype/fee_schedule/test_fee_schedule.js b/erpnext/schools/doctype/fee_schedule/test_fee_schedule.js
new file mode 100644
index 0000000..d495b4c
--- /dev/null
+++ b/erpnext/schools/doctype/fee_schedule/test_fee_schedule.js
@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Fee Schedule", function (assert) {
+ let done = assert.async();
+
+ // number of asserts
+ assert.expect(1);
+
+ frappe.run_serially('Fee Schedule', [
+ // insert a new Fee Schedule
+ () => frappe.tests.make([
+ // values to be set
+ {key: 'value'}
+ ]),
+ () => {
+ assert.equal(cur_frm.doc.key, 'value');
+ },
+ () => done()
+ ]);
+
+});
diff --git a/erpnext/schools/doctype/fee_request_program/__init__.py b/erpnext/schools/doctype/fee_schedule_program/__init__.py
similarity index 100%
rename from erpnext/schools/doctype/fee_request_program/__init__.py
rename to erpnext/schools/doctype/fee_schedule_program/__init__.py
diff --git a/erpnext/schools/doctype/fee_request_program/fee_request_program.json b/erpnext/schools/doctype/fee_schedule_program/fee_schedule_program.json
similarity index 96%
rename from erpnext/schools/doctype/fee_request_program/fee_request_program.json
rename to erpnext/schools/doctype/fee_schedule_program/fee_schedule_program.json
index d5c8911..61525aa 100644
--- a/erpnext/schools/doctype/fee_request_program/fee_request_program.json
+++ b/erpnext/schools/doctype/fee_schedule_program/fee_schedule_program.json
@@ -115,10 +115,10 @@
"issingle": 0,
"istable": 1,
"max_attachments": 0,
- "modified": "2017-07-13 16:08:16.498227",
+ "modified": "2017-07-28 10:32:15.941541",
"modified_by": "Administrator",
"module": "Schools",
- "name": "Fee Request Program",
+ "name": "Fee Schedule Program",
"name_case": "",
"owner": "Administrator",
"permissions": [],
diff --git a/erpnext/schools/doctype/fee_request_program/fee_request_program.py b/erpnext/schools/doctype/fee_schedule_program/fee_schedule_program.py
similarity index 82%
rename from erpnext/schools/doctype/fee_request_program/fee_request_program.py
rename to erpnext/schools/doctype/fee_schedule_program/fee_schedule_program.py
index 61ce1d5..f6cc6f1 100644
--- a/erpnext/schools/doctype/fee_request_program/fee_request_program.py
+++ b/erpnext/schools/doctype/fee_schedule_program/fee_schedule_program.py
@@ -3,7 +3,8 @@
# For license information, please see license.txt
from __future__ import unicode_literals
+import frappe
from frappe.model.document import Document
-class FeeRequestProgram(Document):
+class FeeScheduleProgram(Document):
pass
diff --git a/erpnext/schools/doctype/fee_request_student_group/__init__.py b/erpnext/schools/doctype/fee_schedule_student_group/__init__.py
similarity index 100%
rename from erpnext/schools/doctype/fee_request_student_group/__init__.py
rename to erpnext/schools/doctype/fee_schedule_student_group/__init__.py
diff --git a/erpnext/schools/doctype/fee_request_student_group/fee_request_student_group.json b/erpnext/schools/doctype/fee_schedule_student_group/fee_schedule_student_group.json
similarity index 93%
rename from erpnext/schools/doctype/fee_request_student_group/fee_request_student_group.json
rename to erpnext/schools/doctype/fee_schedule_student_group/fee_schedule_student_group.json
index 08d7c01..ea5cde9 100644
--- a/erpnext/schools/doctype/fee_request_student_group/fee_request_student_group.json
+++ b/erpnext/schools/doctype/fee_schedule_student_group/fee_schedule_student_group.json
@@ -13,6 +13,7 @@
"engine": "InnoDB",
"fields": [
{
+ "allow_bulk_edit": 0,
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
@@ -43,6 +44,7 @@
"unique": 0
},
{
+ "allow_bulk_edit": 0,
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
@@ -82,10 +84,10 @@
"issingle": 0,
"istable": 1,
"max_attachments": 0,
- "modified": "2017-03-23 18:01:09.736921",
+ "modified": "2017-07-28 10:32:34.839135",
"modified_by": "Administrator",
"module": "Schools",
- "name": "Fee Request Student Group",
+ "name": "Fee Schedule Student Group",
"name_case": "",
"owner": "Administrator",
"permissions": [],
diff --git a/erpnext/schools/doctype/fee_request_student_group/fee_request_student_group.py b/erpnext/schools/doctype/fee_schedule_student_group/fee_schedule_student_group.py
similarity index 80%
rename from erpnext/schools/doctype/fee_request_student_group/fee_request_student_group.py
rename to erpnext/schools/doctype/fee_schedule_student_group/fee_schedule_student_group.py
index 777d225..e1e729c 100644
--- a/erpnext/schools/doctype/fee_request_student_group/fee_request_student_group.py
+++ b/erpnext/schools/doctype/fee_schedule_student_group/fee_schedule_student_group.py
@@ -3,7 +3,8 @@
# For license information, please see license.txt
from __future__ import unicode_literals
+import frappe
from frappe.model.document import Document
-class FeeRequestStudentGroup(Document):
+class FeeScheduleStudentGroup(Document):
pass