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 |
|
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
|
2bbb385acf
|
fixes in salary register report
|
2013-02-01 18:13:54 +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
|
4e01011669
|
added language to pages
|
2013-01-24 19:31:55 +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 |
|
Rushabh Mehta
|
597d470e63
|
added format_currency and added options to all currency fields
|
2013-01-23 19:39:51 +05:30 |
|
Rushabh Mehta
|
6382a42dbe
|
more fixes to perms, floats and default enabled / disabled in search
|
2013-01-23 10:09:28 +05:30 |
|
Rushabh Mehta
|
cd4a854a28
|
converted currency to float and removed level 1 permissions
|
2013-01-22 15:10:25 +05:30 |
|
Nabin Hait
|
ec52db8490
|
commonified in_words function and introduced selling_controller
|
2013-01-22 11:53:14 +05:30 |
|
Rushabh Mehta
|
bb9968491b
|
added report permissions to txt files
|
2013-01-21 14:22:07 +05:30 |
|
Rushabh Mehta
|
861b3d6092
|
merge
|
2013-01-21 10:23:21 +05:30 |
|
Rushabh Mehta
|
3ab6c5fca9
|
appraisal, don't validate points for self-appraisal
|
2013-01-19 10:54:03 +05:30 |
|
Anand Doshi
|
75c85a0ff5
|
Merge branch 'master' into edge
|
2013-01-18 16:01:53 +05:30 |
|
Anand Doshi
|
9985699247
|
add to holiday list sorted by idx
|
2013-01-18 15:57:13 +05:30 |
|
Anand Doshi
|
2865571cb9
|
Merge branch 'master' of github.com:webnotes/erpnext into purchase_price_list
Conflicts:
patches/patch_list.py
|
2013-01-18 12:32:00 +05:30 |
|
Nabin Hait
|
dc84d410bc
|
fixes in employee master
|
2013-01-18 11:39:24 +05:30 |
|
Anand Doshi
|
ef02ddfc40
|
Merge branch 'master' of github.com:webnotes/erpnext into purchase_price_list
Conflicts:
accounts/doctype/gl_control/gl_control.py
|
2013-01-17 20:31:41 +05:30 |
|
Anand Doshi
|
9d9aec1ed4
|
shifted get_company_currency from transaction base to setup/utils.py
|
2013-01-17 15:44:57 +05:30 |
|
Rushabh Mehta
|
6f9915cd17
|
install from txt files, part 1
|
2013-01-16 17:48:17 +05:30 |
|
Rushabh Mehta
|
8f3916dd54
|
add job applicant, sales and jobs email settings to module help
|
2013-01-16 12:50:55 +05:30 |
|
Rushabh Mehta
|
8d3fe553e5
|
added automatic lead creation for sales email id
|
2013-01-16 12:19:28 +05:30 |
|
Rushabh Mehta
|
2e5db35856
|
added automatic lead creation for sales email id
|
2013-01-16 11:34:26 +05:30 |
|
Rushabh Mehta
|
390f4e9475
|
added job application
|
2013-01-15 18:37:22 +05:30 |
|
Rushabh Mehta
|
7d9f02cc99
|
added job application
|
2013-01-15 17:54:25 +05:30 |
|
Rushabh Mehta
|
a9d4fb9a73
|
added job application
|
2013-01-15 17:48:19 +05:30 |
|
Rushabh Mehta
|
b6f6d68de0
|
added job application
|
2013-01-15 17:42:41 +05:30 |
|
Rushabh Mehta
|
3074c89ffd
|
added job application
|
2013-01-15 17:36:45 +05:30 |
|
Rushabh Mehta
|
73f84176f0
|
added job application
|
2013-01-15 17:36:36 +05:30 |
|
Rushabh Mehta
|
84e360562d
|
added job application
|
2013-01-15 17:30:56 +05:30 |
|
Rushabh Mehta
|
3169ef0691
|
added job application
|
2013-01-15 17:23:23 +05:30 |
|
Rushabh Mehta
|
0e7751b9fe
|
added job_applicant, job_opening doctypes
|
2013-01-15 16:38:16 +05:30 |
|
Rushabh Mehta
|
846678a1e4
|
added links to open count in module + other minor fixes
|
2013-01-10 12:25:25 +05:30 |
|
Rushabh Mehta
|
249b0b4942
|
Merge branch 'master' into edge
|
2013-01-10 11:12:35 +05:30 |
|
Rushabh Mehta
|
aecae587ce
|
workflow updates: update_field not editable & bug fix
|
2013-01-09 19:03:20 +05:30 |
|
Rushabh Mehta
|
be0b7df27e
|
Merge branch 'master' of github.com:webnotes/erpnext into edge
|
2013-01-09 16:41:01 +05:30 |
|
Rushabh Mehta
|
ce1d5276ff
|
added moduleview
|
2013-01-09 16:39:27 +05:30 |
|
Nabin Hait
|
55963a4164
|
added field description in employee
|
2013-01-09 14:50:01 +05:30 |
|
Anand Doshi
|
89230cbc4b
|
fix in holiday list
|
2013-01-08 18:14:39 +05:30 |
|
Anand Doshi
|
cfd185e5ac
|
fix in leave application holiday calculation
|
2013-01-08 17:44:31 +05:30 |
|
Rushabh Mehta
|
b8f39f00d8
|
appraisal template, total must be 100
|
2013-01-07 17:43:12 +05:30 |
|
Rushabh Mehta
|
523aec499a
|
bootstrapped language and added 'hi'
|
2013-01-07 15:39:54 +05:30 |
|
Rushabh Mehta
|
cd7a02c489
|
added workflow help, fixed button primary action in form and refactored permissions
|
2013-01-04 14:03:36 +05:30 |
|
Rushabh Mehta
|
78a0c20305
|
new permission manager
|
2013-01-01 19:51:35 +05:30 |
|
Rushabh Mehta
|
0727169a5e
|
expense_claim: approval status fix
|
2012-12-31 13:24:24 +05:30 |
|
Anand Doshi
|
f9a3c8fcdc
|
added status validation
|
2012-12-28 19:42:49 +05:30 |
|
Nabin Hait
|
e606e7850a
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-12-28 16:51:55 +05:30 |
|