Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
21,109 Commits 3 Branches 0 Tags 1 GiB
abc0632925
Commit Graph

15 Commits

Author SHA1 Message Date
Saurabh
35d8ce4fbd resolved merge conflicts 2018-01-12 16:58:32 +05:30
Manas Solanki
bba5fd7a38 Assessment module addition (#12417) 
* add academic session details in the Assessmet Plan

* add the academic session and few details in the assessment result

* fix codacy
 2018-01-12 16:21:09 +05:30
Nabin Hait
cb495fb33b Merge branch 'master' into develop 2018-01-05 13:17:00 +05:30
Manas Solanki
171157f1b3 Fix + Enhancement in Program Enrollment Tool (#12291) 
* Fix + Enhancement in Program Enrollment Tool

* updated the docs
 2018-01-05 12:42:39 +05:30
Shreya Shah
df0dd8be5f Travis fix for client side tests (#12224) 
* salary slip test fix

* attendance tool test fix

* timeout after routing
 2017-12-29 14:04:46 +05:30
Manas Solanki
91017cba8d Additional fields in the instructor doctype for the academics log and minor permission changes (#12204) 2017-12-28 12:34:36 +05:30
Manas Solanki
e20a0f1115 [Fix] make PE unique for the combination of academic year and academic term (#12214) 2017-12-28 12:29:11 +05:30
Manas Solanki
5807cd8e6f Set the guardian role automatically. (#12136) 
* Add the guardian role for parent portal

* invite guardian as user
 2017-12-22 10:50:10 +05:30
Zarrar
17fd6610dc Fix travis (#11882) 
* fieldname wrong

* bifurcated test into two - error when both were running async

* minor fixes with link and route

* move school domain rename up

* fix async creation of operations test

* edit-in-full-page is button, not link

* set_route issue in production order test

* minor changes

* fix task tree test

* more fixes

* fix server side issue

* improvising ui tests
 2017-12-08 14:57:38 +05:30
Manas Solanki
a160879159 set the reference document in the payment entry while creating from fees (#11861) 
* set the reference document in the payment entry while creating from fees

* allocate the paid amount in the reference document
 2017-12-06 14:05:39 +05:30
Manas Solanki
e6fd07fda9 Changes in the Fee structure (#11842) 
* academic year non mandatory in the fee structure and minor changes

* update the docs
 2017-12-04 19:21:50 +05:30
Manas Solanki
3bac586ee2 fix in the assessment result tool while entering the zero marks (#11837) 2017-12-04 12:55:10 +05:30
Manas Solanki
f9cc56cd62 minor fixes in the assessment result tool (#11795) 2017-11-30 11:39:06 +05:30
Manas Solanki
84e9d45055 Minor fixes for the Education domain (#11758) 
* add the new role Education Manager for education settings

* minor changes in the hooks for bootinfo

* Fix for amending the assessment plan
 2017-11-28 18:04:08 +05:30
Manas Solanki
966f141f62 Rename schools to Education (#11524) 
* renaming for the docs, demo data and patch

* changes in the doctypes and reports

* rename the config file

* Few name changes in messages and license

* rename the school settings to education settings

* changes in the documentation

* added the setup file for the fixtures

* corrected the ui tests file path

* fix the codacy

* add the patch for renaming few doctypes and fields

* changes in the patch
 2017-11-23 15:22:10 +05:30