Anand Doshi
|
7ce7d7cad4
|
Merge branch 'master' of github.com:webnotes/erpnext into edge
|
2013-02-20 16:08:43 +05:30 |
|
Anand Doshi
|
150d98d786
|
calculate total leave days on load
|
2013-02-19 18:52:20 +05:30 |
|
Anand Doshi
|
64e47afec1
|
calculate total leave days on load
|
2013-02-19 18:49:12 +05:30 |
|
Anand Doshi
|
f36a00bcbe
|
changed description of allow users in Leave Block List
|
2013-02-19 18:43:20 +05:30 |
|
Anand Doshi
|
d70f7dec2b
|
raise leave blocked error when status is saved as Approved
|
2013-02-19 18:37:51 +05:30 |
|
Anand Doshi
|
b05b1dacd5
|
added Follow Via Email
|
2013-02-19 16:54:49 +05:30 |
|
Rushabh Mehta
|
5c6216f0bd
|
merge
|
2013-02-19 15:36:38 +05:30 |
|
Rushabh Mehta
|
5117d9c266
|
refactored defaults, bin material request wip
|
2013-02-19 15:27:31 +05:30 |
|
Anand Doshi
|
7621a94ed9
|
allow leave application to have attachments
|
2013-02-19 15:24:34 +05:30 |
|
Anand Doshi
|
04ae7b86ff
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-02-19 15:09:52 +05:30 |
|
Anand Doshi
|
a95e2db5b6
|
leave application calendar: add leaves based on permission; add holidays applicable to the employee
|
2013-02-19 15:09:21 +05:30 |
|
Nabin Hait
|
fe787259b6
|
removed observer function for employee
|
2013-02-19 12:56:12 +05:30 |
|
Anand Doshi
|
22d3a8b41b
|
fetch docstatus in leave application for calendar view; fix in leave application test
|
2013-02-19 08:45:22 +05:30 |
|
Anand Doshi
|
6ad06f3210
|
fixes in employee helper
|
2013-02-18 19:57:16 +05:30 |
|
Anand Doshi
|
ac1985ff68
|
added observer for employee doctype to update salary structure
|
2013-02-18 19:42:02 +05:30 |
|
Anand Doshi
|
d19e2f56cc
|
make sure employee name is a string
|
2013-02-18 19:15:56 +05:30 |
|
Anand Doshi
|
62ef71be57
|
added leave application to allow import list
|
2013-02-18 18:38:36 +05:30 |
|
Anand Doshi
|
b54b22734f
|
fixed leave application error -- take employee name from employee record
|
2013-02-18 18:33:20 +05:30 |
|
Rushabh Mehta
|
c53231a841
|
model_wrapper is now bean, refactoring defaults
|
2013-02-18 18:24:28 +05:30 |
|
Anand Doshi
|
17bc54107f
|
make leave application importable
|
2013-02-18 18:02:47 +05:30 |
|
Anand Doshi
|
78352d1e71
|
leave application permissions patch - removed permlevel 2
|
2013-02-18 17:09:11 +05:30 |
|
Rushabh Mehta
|
c06ce25470
|
updated translations
|
2013-02-18 14:24:05 +05:30 |
|
Rushabh Mehta
|
e51b5e3643
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-02-15 19:28:41 +05:30 |
|
Rushabh Mehta
|
9249f354cd
|
added view selector and calendar view for leave application
|
2013-02-15 19:28:05 +05:30 |
|
Anand Doshi
|
9cde1bbb0e
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-02-15 18:29:22 +05:30 |
|
Anand Doshi
|
0bf801af62
|
email to leave approver and employee
|
2013-02-15 18:27:05 +05:30 |
|
Rushabh Mehta
|
6227527cdb
|
added leave applications and block lists to calendar
|
2013-02-14 20:42:33 +05:30 |
|
Rushabh Mehta
|
5eb37647cf
|
added new calendar and renamed holiday block list
|
2013-02-14 17:34:51 +05:30 |
|
Anand Doshi
|
9c35b2897c
|
raise holiday block list exception only when submitting
|
2013-02-13 20:26:45 +05:30 |
|
Anand Doshi
|
798c6b4fdb
|
fixes in test runner and add role for profile
|
2013-02-13 19:57:58 +05:30 |
|
Anand Doshi
|
5070224079
|
select leave approver by fullname in leave application
|
2013-02-13 19:49:42 +05:30 |
|
Anand Doshi
|
223072be02
|
when saving employee add employee image to profile
|
2013-02-13 18:53:08 +05:30 |
|
Anand Doshi
|
c45630faf8
|
added add_role method in profile
|
2013-02-13 18:35:33 +05:30 |
|
Anand Doshi
|
eb92b52817
|
fixes in employee form
|
2013-02-13 18:30:53 +05:30 |
|
Rushabh Mehta
|
a9545794aa
|
number format fix, permission fix in listview
|
2013-02-13 12:33:02 +05:30 |
|
Rushabh Mehta
|
4b9827a5fc
|
upgraded test_runner, now can run multiple tests
|
2013-02-12 19:20:39 +05:30 |
|
Rushabh Mehta
|
629c196606
|
added date in pop3 mails
|
2013-02-11 16:21:14 +05:30 |
|
Rushabh Mehta
|
e38d783aff
|
removed session timeout for getting emails
|
2013-02-11 15:55:20 +05:30 |
|
Rushabh Mehta
|
af222dc6b2
|
updated language
|
2013-02-11 11:49:18 +05:30 |
|
Rushabh Mehta
|
60135df6fd
|
updated language
|
2013-02-11 11:44:12 +05:30 |
|
Anand Doshi
|
a11a21c6a9
|
changed _Test Fiscal Year to _Test Fiscal Year 2013
|
2013-02-08 19:27:38 +05:30 |
|
Anand Doshi
|
6fad5ab075
|
if total leave days is 0, do not allow leave application to be saved
|
2013-02-08 16:43:37 +05:30 |
|
Anand Doshi
|
e1ca5fdf4e
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-02-08 15:29:54 +05:30 |
|
Anand Doshi
|
8b5645d281
|
leave application overlap validation: consider both open and approved leave applications
|
2013-02-08 15:29:13 +05:30 |
|
Rushabh Mehta
|
66aa26546b
|
fix
|
2013-02-08 15:06:05 +05:30 |
|
Nabin Hait
|
df35645e2a
|
Update hr/doctype/employee/employee.txt
removed salary structure button
|
2013-02-08 13:09:18 +05:30 |
|
Nabin Hait
|
197861f576
|
Update hr/doctype/leave_application/leave_application.txt
changed permlevel for some fiedls in leave application
|
2013-02-08 11:28:40 +05:30 |
|
Anand Doshi
|
40ad7a7bbc
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-02-07 19:48:49 +05:30 |
|
Anand Doshi
|
6209046772
|
added some test records
|
2013-02-07 19:47:34 +05:30 |
|
Nabin Hait
|
b7084b8995
|
Update hr/doctype/appraisal/appraisal.py
fixed issue in appraisal
|
2013-02-07 18:15:04 +05:30 |
|