Commit Graph

177 Commits

Author SHA1 Message Date
Rushabh Mehta
c53231a841 model_wrapper is now bean, refactoring defaults 2013-02-18 18:24:28 +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
Rushabh Mehta
981577050c added company in leave application and global holiday block list 2013-02-07 09:09:14 +05:30
Rushabh Mehta
14464473da email receive bugfix 2013-02-06 20:31:08 +05:30
Rushabh Mehta
8c713e7f0c added holidy_block_list_allow 2013-02-06 16:10:48 +05:30
Rushabh Mehta
509f17c3a4 minor 2013-02-06 08:49:59 +05:30
Rushabh Mehta
c2563effbf added test case for leave_application 2013-02-05 23:25:37 +05:30
Rushabh Mehta
4e95bb59a0 added test_runner 2013-02-05 19:20:51 +05:30
Rushabh Mehta
cdc32d02b2 hide toolbar only hides std buttons 2013-02-05 15:04:09 +05:30
Rushabh Mehta
2e8d078adf adding block list, part 1 2013-02-05 11:31:27 +05:30
Rushabh Mehta
d39c55ae4b added explain to get_status in field for debugging 2013-02-04 10:24:43 +05:30
Nabin Hait
9a1b91cf6e Update hr/doctype/leave_application/leave_application.txt
fixed option of field amended_from
2013-02-01 10:35:14 +05:30
Rushabh Mehta
1bf5ee27ea added designation to hr-home 2013-01-29 19:07:24 +05:30
Rushabh Mehta
08da1a0a3d setting list_views 2013-01-29 17:53:29 +05:30
Rushabh Mehta
cda5d42a65 updated languages 2013-01-28 14:21:40 +05:30
Rushabh Mehta
8e3affbf70 added nl 2013-01-25 11:58:18 +05:30
Rushabh Mehta
317177afd2 updated languages 2013-01-24 18:18:39 +05:30
Rushabh Mehta
ad14943c3f added arabic 2013-01-24 17:37:43 +05:30
Rushabh Mehta
4c17718b4c added portuguese 2013-01-24 16:31:23 +05:30
Rushabh Mehta
908d09d058 added spanish 2013-01-24 15:55:30 +05:30
Rushabh Mehta
27254d9440 added spanish 2013-01-24 15:55:08 +05:30
Rushabh Mehta
363e923b80 expense claim list bugfix 2013-01-23 22:26:45 +05:30