Nabin Hait
6e9d2a3c1f
fixed conflict
2017-01-09 17:21:34 +05:30
Nabin Hait
802b4359b5
Fetch same items multiple times from source doc if all qty not processed
2017-01-09 15:32:20 +05:30
Kanchan Chauhan
b7cc393eb8
Email ID renamed to Email Address
2017-01-03 16:45:38 +05:30
Neil Trini Lasrado
986927ca98
Added Guardian to school module
2016-12-28 16:15:35 +05:30
Neil Trini Lasrado
22239ac610
Improved Student Dashboard
2016-12-26 17:14:16 +05:30
Neil Trini Lasrado
94f42ea145
Added from date and to date to student leave application
2016-12-26 12:09:27 +05:30
Neil Trini Lasrado
9a7cb6ce92
Added mark as present to student leave application
2016-12-26 12:09:27 +05:30
Neil Trini Lasrado
8979e1c7a5
Allow Data Import for Student Guardian
2016-12-20 11:53:52 +05:30
Nabin Hait
f02f1bb0c7
Added standard filters
2016-12-15 14:57:20 +05:30
Neil Trini Lasrado
984ee372e8
[new Feature] Added Training Module
2016-12-13 15:42:12 +05:30
Neil Trini Lasrado
eccbf43235
Renamed Student Batch Attendance Tool to Student Attendance Tool
...
Merged code for Student Attendance against Course Schedule and Student Batch
Student Attendance Tool now shows marked student attendance as well.
Fixed validation login in Student Attendance for duplicate Student Attendance Record validation"
2016-12-09 17:41:09 +05:30
Rushabh Mehta
323c06ebbf
[minor] rename icons as per FontAwesome 4 ( #7136 )
2016-12-05 14:17:26 +05:30
Neil Trini Lasrado
6841b3198b
Added Roll Number to Student Batch Attendance Tool and Optimised code to mark attendance
2016-12-01 18:40:49 +05:30
Neil Trini Lasrado
19e8bd2221
renamed 'active' in Student Batch to 'enabled'
2016-12-01 14:30:47 +05:30
Neil Trini Lasrado
c6e74680ee
Added Instructor as a Role
2016-12-01 13:00:14 +05:30
Neil Trini Lasrado
87edfef0bb
Added ability to mark student batch in-active
2016-11-28 18:09:50 +05:30
Neil Trini Lasrado
14b27c5b42
New Doctype - Student Leave Application
2016-11-28 16:57:30 +05:30
Rushabh Mehta
5dd12cb4f0
Merge branch 'master' into develop
2016-11-22 23:18:29 +05:30
Nabin Hait
ee874a2a36
Update student_admission.py
2016-11-22 12:42:24 +05:30
Neil Trini Lasrado
fb35b484a5
Added Instructors table to Student Batch
2016-11-21 19:10:13 +05:30
Neil Trini Lasrado
f89ffdb57a
Fixes for student Attendance
2016-11-21 18:32:40 +05:30
Neil Trini Lasrado
b444d5d81b
Rename Scheduling Tool to Course scheduling Tool, Batch Name to Student Batch Name and Batch Creation tool to Student Batch Creation tool
2016-11-21 17:04:23 +05:30
Neil Trini Lasrado
6566431fc5
Rearranged scheduling Tool
2016-11-21 16:21:25 +05:30
Neil Trini Lasrado
defdd784f4
Added Student Batch Name & Batch Creation Tool in Schools Module.
2016-11-21 16:21:25 +05:30
Nabin Hait
52f101d776
Merge pull request #6981 from neilLasrado/develop
...
Added ability to mark attendance against a Student Batch
2016-11-17 17:10:05 +05:30
Nabin Hait
46753de6d7
fixed merge conflict
2016-11-17 15:55:11 +05:30
Neil Trini Lasrado
d9bc5598b6
Added ability to mark attendance against a Student Batch
2016-11-17 15:36:14 +05:30
robert schouten
2b63e14089
dh drop guest from student attendance so disabling acedemic user disables all school doctypes ( #6974 )
2016-11-17 15:23:38 +05:30
Nabin Hait
95e6ccd419
Merge branch 'master' into develop
2016-11-14 12:42:26 +05:30
Nabin Hait
598a0c918d
[fix] fixed student dashboard issue ( #6897 )
2016-11-10 17:25:37 +05:30
Rushabh Mehta
13fc52d713
[minor] added default standard filters ( #6854 )
2016-11-07 17:19:19 +05:30
Faris Ansari
5049296f8d
[ui] fix student image not visible ( #6825 )
2016-11-07 17:10:10 +05:30
Rushabh Mehta
f87b7b0c4e
[fix] typo
2016-11-02 10:53:53 +05:30
Rushabh Mehta
1aac956306
[minor] [fixes] can rename program and disable role on domainify
2016-11-02 07:33:18 +05:30
Rushabh Mehta
bdc8a88b4d
[minor] fix date comparisons
2016-11-02 07:32:09 +05:30
Neil Trini Lasrado
5f041e9665
Added naming series to Course Schedule
2016-10-27 15:37:03 +05:30
Neil Trini Lasrado
a3f2a47020
Allow rename of student doctype
2016-10-26 12:24:27 +05:30
Nabin Hait
a7a3a497d5
Fixed version conflict
2016-10-18 18:35:42 +05:30
Rushabh Mehta
7791ed845f
[hot] [fix] student_dashboard.py
2016-10-18 18:33:19 +05:30
Nabin Hait
a943ec8ff5
Merge pull request #6642 from neilLasrado/develop
...
Fixes to Schools Module
2016-10-18 18:16:29 +05:30
Neil Trini Lasrado
377da58378
Set Student Name in Program Enrollment
2016-10-18 18:11:52 +05:30
Nabin Hait
fa1cdd5bf0
Fixed merge conflict
2016-10-18 15:37:33 +05:30
Rushabh Mehta
17f6874450
[minor] [fix] doctype_dasboard.py files, move data to get_data
2016-10-18 14:54:39 +05:30
Neil Trini Lasrado
8b3dd8fdf2
Changed nationality in student master from link to data field
2016-10-18 12:55:38 +05:30
Rushabh Mehta
2757d8ef03
[minor] [perm] allow owner to read student applicant
2016-10-10 16:46:24 +05:30
Rushabh Mehta
4dacaa103c
[minor] do not submit after accpeting payment
2016-10-05 19:20:37 +05:30
Rushabh Mehta
a47652624a
[minor] student applicant fixes
2016-10-05 18:04:35 +05:30
Neil Trini Lasrado
d5035e05b3
Field rearrange in student applicant
2016-10-05 12:35:55 +05:30
Rushabh Mehta
bb89f6e151
[minor] student applications to be submitted after payment
2016-10-05 09:24:52 +05:30
Rushabh Mehta
6a1742abc8
[minor] status for student applicant
2016-10-04 16:26:32 +05:30
