Neil Trini Lasrado
|
749516c22d
|
Renamed Evaluation Criteria to Assessment Criteria
|
2017-02-01 18:47:36 +05:30 |
|
Neil Trini Lasrado
|
879a2d84dc
|
Added Evaluation Criteria Group
|
2017-01-31 17:03:37 +05:30 |
|
Rushabh Mehta
|
7ec4b717ed
|
[feature] added team updates page
|
2017-01-31 11:42:58 +05:30 |
|
Rohit Waghchaure
|
d9a265fab1
|
Merge branch 'develop' of github.com:frappe/erpnext into develop
|
2017-01-31 11:34:07 +05:30 |
|
Neil Trini Lasrado
|
ba96ce7dd5
|
Merge pull request #7616 from neilLasrado/assessment-validations
Patch fix for Update Assessment Module Patch
|
2017-01-30 17:50:37 +05:30 |
|
Neil Trini Lasrado
|
fd1767d2ea
|
Patch fix for Update Assessment Module Patch
|
2017-01-30 17:50:05 +05:30 |
|
Rushabh Mehta
|
4500f7b4d6
|
[cleanup] remove unused LMS (#7612)
|
2017-01-30 17:04:38 +05:30 |
|
Neil Trini Lasrado
|
455824235a
|
Merge pull request #7613 from neilLasrado/assessment-validations
Patch fix for Update Assessment Module Patch
|
2017-01-30 16:41:46 +05:30 |
|
Neil Trini Lasrado
|
ab1ee1e6fc
|
Patch fix for Update Assessment Module Patch
|
2017-01-30 16:40:14 +05:30 |
|
Neil Trini Lasrado
|
dbd95936ea
|
Merge pull request #7610 from neilLasrado/assessment-validations
Validations for Assessment Plan
|
2017-01-30 15:51:08 +05:30 |
|
Neil Trini Lasrado
|
80ca65c166
|
Added validation to ensure that the Sum of Scores of evaluation Criteras is equal to the max assessment score.
|
2017-01-30 15:28:41 +05:30 |
|
KanchanChauhan
|
fbaa6197f9
|
Employee Loan Management (#7126)
* [WIP] Employee Loan Management
* EMI calculation
* Fixing PR
|
2017-01-30 15:15:58 +05:30 |
|
Makarand Bauskar
|
d893efd0a9
|
[minor] replace object values in translations (#7602)
|
2017-01-30 12:35:34 +05:30 |
|
rohitwaghchaure
|
3b40098738
|
Merge pull request #7571 from RicardoJohann/projectfilter
added project filter to gl and carry project filter from P&L
|
2017-01-30 12:24:36 +05:30 |
|
rohitwaghchaure
|
0bdffa8130
|
Merge pull request #7533 from mbauskar/minor-fixes
[WIP] Address and Contact Fixes
|
2017-01-30 11:13:10 +05:30 |
|
mbauskar
|
16ce3623bc
|
[fixes] set lead to Null on delete company transaction & other minor fixes
|
2017-01-30 10:45:28 +05:30 |
|
mbauskar
|
51b1d6de48
|
[minor] moved the address_and_contact utils to frappe
|
2017-01-30 10:45:28 +05:30 |
|
mbauskar
|
7fa039f15c
|
[fixes] delete company transaction and other minor fixes
|
2017-01-30 10:45:28 +05:30 |
|
mbauskar
|
83f4780f74
|
[Fixes] Address and Contact fixes
|
2017-01-30 10:45:28 +05:30 |
|
mbauskar
|
8271b4c564
|
[minor] fixes in address filters
|
2017-01-30 10:45:28 +05:30 |
|
mbauskar
|
cbc49e2989
|
[WIP] Address and Contact Fixes
|
2017-01-30 10:45:28 +05:30 |
|
rohitwaghchaure
|
531b49f6c7
|
Merge pull request #7590 from KanchanChauhan/rename-task
[Minor]Task rename now possible
|
2017-01-30 09:29:10 +05:30 |
|
KanchanChauhan
|
2dfb90a922
|
Merge pull request #7565 from KanchanChauhan/leave-balance-report-fix
[Fix] Permissions to view Leave Balance Report
|
2017-01-29 21:07:02 +05:30 |
|
Rohit Waghchaure
|
92c9ad8c72
|
Merge branch 'master' into develop
|
2017-01-28 14:14:33 +05:30 |
|
Rohit Waghchaure
|
bf667a6540
|
Merge branch 'hotfix'
|
2017-01-28 14:14:32 +05:30 |
|
Rohit Waghchaure
|
ce4a0b20ab
|
bumped to version 7.2.18
|
2017-01-28 14:44:32 +06:00 |
|
Nabin Hait
|
68fd31ca0e
|
Merge pull request #7599 from KanchanChauhan/stock-controller-urgent-fix
[URGENT][FIX]Stock Controller fix
|
2017-01-28 14:11:14 +05:30 |
|
Kanchan Chauhan
|
b77eaf7053
|
[URGENT][FIX]Stock Controller fix
|
2017-01-28 13:26:46 +05:30 |
|
KanchanChauhan
|
ecc44e506b
|
Merge pull request #7597 from neilLasrado/guarding-name
Fixes to update student guardian name patch
|
2017-01-27 17:45:57 +05:30 |
|
Neil Trini Lasrado
|
6d0da98a78
|
Fixes to update student guardian name patch
|
2017-01-27 17:44:28 +05:30 |
|
KanchanChauhan
|
4db5dd3cc2
|
Merge pull request #7591 from neilLasrado/guarding-name
Added Guardian Name to Student Master
|
2017-01-27 17:31:22 +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
|
245c2e885a
|
Merge branch 'hotfix'
|
2017-01-27 16:18:26 +05:30 |
|
Rushabh Mehta
|
e239d4dfe9
|
Merge branch 'master' into develop
|
2017-01-27 16:18:26 +05:30 |
|
Rushabh Mehta
|
098bd34f00
|
bumped to version 7.2.17
|
2017-01-27 16:48:25 +06:00 |
|
Rushabh Mehta
|
063e86a1bf
|
[fix] remove on_update in Item
|
2017-01-27 16:16:08 +05:30 |
|
Rushabh Mehta
|
b5eaf324b3
|
Merge branch 'master' into develop
|
2017-01-27 16:03:30 +05:30 |
|
Rushabh Mehta
|
73bf1bc4b0
|
Merge branch 'hotfix'
|
2017-01-27 16:03:29 +05:30 |
|
Rushabh Mehta
|
5f0027a2d0
|
bumped to version 7.2.16
|
2017-01-27 16:33:29 +06:00 |
|
Rushabh Mehta
|
fd82f4b0d4
|
[minor] fix for item_group.py
|
2017-01-27 16:00:47 +05:30 |
|
Rushabh Mehta
|
710dc5392f
|
[merge]
|
2017-01-27 15:48:31 +05:30 |
|
Rushabh Mehta
|
83cc7c9382
|
Merge branch 'hotfix'
|
2017-01-27 15:46:07 +05:30 |
|
Rushabh Mehta
|
149c033c8f
|
bumped to version 7.2.15
|
2017-01-27 16:16:07 +06:00 |
|
KanchanChauhan
|
173fe24ef4
|
Merge pull request #7594 from neilLasrado/student-batch
Added 'Active' checkbox in list view for Student Batch and Student Group
|
2017-01-27 14:56:58 +05:30 |
|
Neil Trini Lasrado
|
7326217ab5
|
Added 'Active' checkbox in list view for Student Batch and Student Group
|
2017-01-27 14:50:48 +05:30 |
|
KanchanChauhan
|
6c85ad9726
|
Merge pull request #7593 from neilLasrado/student-batch
Fix- Student batch strength in Batch Wise attendance report
|
2017-01-27 14:18:40 +05:30 |
|
Neil Trini Lasrado
|
8c3fb43d8a
|
Fix- Student batch strength in Batch Wise attendance report
|
2017-01-27 14:13:25 +05:30 |
|
Kanchan Chauhan
|
3dd85a0e9e
|
Task rename now possible
|
2017-01-27 12:34:06 +05:30 |
|
Kanchan Chauhan
|
e877ecfb7b
|
[Fix] Permissions to view Leave Balance Report
|
2017-01-27 11:53:56 +05:30 |
|