Commit Graph

34 Commits

Author SHA1 Message Date
Neil Trini Lasrado
fd1767d2ea Patch fix for Update Assessment Module Patch 2017-01-30 17:50:05 +05:30
Neil Trini Lasrado
ab1ee1e6fc Patch fix for Update Assessment Module Patch 2017-01-30 16:40:14 +05:30
Neil Trini Lasrado
6d0da98a78 Fixes to update student guardian name patch 2017-01-27 17:44:28 +05:30
Neil Trini Lasrado
7ff5682193 Merge branch 'develop' into guarding-name 2017-01-27 16:54:50 +05:30
Neil Trini Lasrado
f36ff488c0 Added Guardian Name to Student Master 2017-01-27 16:53:55 +05:30
Rushabh Mehta
710dc5392f [merge] 2017-01-27 15:48:31 +05:30
Neil Trini Lasrado
15c5ae0918 Fix for update assessment modules patch 2017-01-24 10:28:49 +05:30
Kanchan Chauhan
c948a4fc92 Patch to update Salary Detail where Salary Component Abbr is null 2017-01-23 16:12:45 +05:30
Neil Trini Lasrado
d471ad2c45 Fix for update assessment modules patch 2017-01-23 14:59:19 +05:30
Nabin Hait
1f9d1bb877 Merge branch 'develop' into assessment 2017-01-20 20:09:44 +05:30
Neil Trini Lasrado
16d40cf0a3 Added ability to disable a student in student group/studnet batch 2017-01-20 19:33:09 +05:30
Nabin Hait
349d520ae2 Fixed merge conflict 2017-01-20 15:44:35 +05:30
Nabin Hait
f356e539bb Update set_null_value_to_fields.py 2017-01-20 12:35:22 +05:30
Rohit Waghchaure
84b827efcd [Fix] Budget not working properly 2017-01-20 12:33:50 +05:30
Rushabh Mehta
c81621d3ce [minor] add progress bar in patch 2017-01-19 14:32:36 +05:30
Rushabh Mehta
00d3cd6d64 [fix] contact address link patch 2017-01-19 14:27:02 +05:30
Rushabh Mehta
d69fd1b8c0 [fix] update_salary_slip.py 2017-01-19 12:51:37 +05:30
Rushabh Mehta
683d98fd54 [fix] update_salary_slip.py 2017-01-19 12:48:03 +05:30
Rushabh Mehta
35e4d8b152 [fix] update_salary_slip.py 2017-01-19 12:47:27 +05:30
Rushabh Mehta
60908f4a08 [fix] update_salary_slip.py 2017-01-19 12:46:11 +05:30
Rushabh Mehta
26fdb113a8 [fix] update_salary_slip.py 2017-01-19 12:44:54 +05:30
Nabin Hait
b064cf39c2 Merge branch 'develop' into fleet-moved-to-hr 2017-01-17 11:05:39 +05:30
Kanchan Chauhan
f80c2b9606 Fleet management moved to HR 2017-01-16 14:38:24 +05:30
Neil Trini Lasrado
38bd62d82d Merge branch 'develop' into assessment 2017-01-16 12:23:51 +05:30
Rushabh Mehta
b92087cb2d [cleanup] move contact, address to frappe 💥 2017-01-13 18:54:47 +05:30
Nabin Hait
e7cb911634 Salary Slip Patch Fixed 2017-01-13 17:30:06 +05:30
Nabin Hait
b166caa9fb Patch fixed 2017-01-13 17:09:57 +05:30
Nabin Hait
e43a94de4b Merge branch 'hotfix' into draft_status_issue_after_amend 2017-01-13 13:14:32 +05:30
Rohit Waghchaure
29458836e4 [Fix] After amend the status become cancelled even if docstatus is zero 2017-01-13 12:51:19 +05:30
Kanchan Chauhan
b6114e672f Patch to add Start and End Date in Salary Slips 2017-01-13 12:05:03 +05:30
Neil Trini Lasrado
a56224c03a Rename Assessment to Assessment Plan 2017-01-09 18:26:03 +05:30
Neil Trini Lasrado
233ecfdd9c Renamed min_score to threshold in Grading Scale 2017-01-09 18:26:03 +05:30
Neil Trini Lasrado
5c87455918 Patch for assessment module redesign 2017-01-09 18:26:03 +05:30
Rushabh Mehta
174c3478a1 [fix] item variants not directly shown in website due to route clash 2016-12-27 12:30:30 +05:30