Anand Doshi
|
df6ff1385f
|
fixes in warehouse validation
|
2013-03-11 19:44:52 +05:30 |
|
Anand Doshi
|
80f7637ae6
|
added print width in txts of istable type doctypes
|
2013-03-07 11:37:33 +05:30 |
|
Anand Doshi
|
4244b3b267
|
fix in monthly salary register
|
2013-03-06 16:49:13 +05:30 |
|
Nabin Hait
|
7804401d03
|
attendance code cleanup
|
2013-03-06 11:32:33 +05:30 |
|
Rushabh Mehta
|
c9e32e6c8d
|
fixed patches for new sync
|
2013-03-06 11:30:09 +05:30 |
|
Nabin Hait
|
a0accd9f67
|
fixed conflict
|
2013-03-05 15:58:04 +05:30 |
|
Nabin Hait
|
dae20d87dc
|
refactored upload attendace tool
|
2013-03-05 15:52:07 +05:30 |
|
Rushabh Mehta
|
c4529ebb0d
|
Merge pull request #300 from mayur-patel/master
Allow user to add leave application which may results in negative balance.
|
2013-03-05 01:27:26 -08:00 |
|
mayur-patel
|
c7e28c7e5d
|
changed the logic to be more elegant.
|
2013-03-05 20:14:05 +11:00 |
|
Rushabh Mehta
|
07287e8b93
|
removed colour fields from txt files
|
2013-03-05 14:19:48 +05:30 |
|
mayur-patel
|
547604cf5a
|
Added a new field called allow_negative. This field was added for allowing a negative balance for a particular leave type.
|
2013-03-05 19:11:53 +11:00 |
|
mayur-patel
|
f10f2513fa
|
Added checks to see if the selected leave type allows negative balance. If it does then warn the user and continue with saving the form else just warn the user and don't save the form data.
|
2013-03-05 18:20:57 +11:00 |
|
mayur-patel
|
639392a0b1
|
Allowing user to add leaves which may results in negative leave balance.
|
2013-03-05 16:21:00 +11:00 |
|
Rushabh Mehta
|
213b180060
|
merge, update bean validations
|
2013-03-01 19:09:06 +05:30 |
|
Rushabh Mehta
|
fee642d547
|
completed Time Log / Time Log Batch
|
2013-03-01 18:24:52 +05:30 |
|
Nabin Hait
|
a139dc93f0
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-03-01 14:40:59 +05:30 |
|
Nabin Hait
|
483731e06c
|
fixes in attendance control panel
|
2013-03-01 14:40:40 +05:30 |
|
Anand Doshi
|
57f83ed36b
|
show leave balance in leave balance report
|
2013-03-01 14:11:56 +05:30 |
|
Rushabh Mehta
|
b21eb9ac09
|
added time log batch
|
2013-02-28 18:42:46 +05:30 |
|
billyfordson
|
9b352309c6
|
Adding German translation
|
2013-02-27 17:36:23 +01:00 |
|
Anand Doshi
|
5c6fc62b9e
|
added company filter in employee leave balance report
|
2013-02-27 19:08:01 +05:30 |
|
Anand Doshi
|
46d437e2ef
|
fix in get previous fiscal year for leave allocation
|
2013-02-27 18:55:37 +05:30 |
|
Anand Doshi
|
89e70d77ca
|
show leave application of other employees in deparment if user has Employee role, but also show leave applications based on permissions - show unique of both
|
2013-02-27 18:46:21 +05:30 |
|
Anand Doshi
|
b60aef5595
|
added report button in todo page
|
2013-02-25 15:22:20 +05:30 |
|
Rushabh Mehta
|
e4eb89b02a
|
added new language and filters in query reports
|
2013-02-25 13:00:16 +05:30 |
|
Rushabh Mehta
|
9e02949821
|
updated language and separated slickgrid files
|
2013-02-25 11:05:27 +05:30 |
|
Rushabh Mehta
|
90098d2ebd
|
new employee_leave_balance_report
|
2013-02-22 17:54:50 +05:30 |
|
Rushabh Mehta
|
96b91f49fa
|
check toggle converted to true / false
|
2013-02-22 12:32:02 +05:30 |
|
Rushabh Mehta
|
25af38e509
|
show leave block day warning
|
2013-02-22 11:43:14 +05:30 |
|
Rushabh Mehta
|
f41dd39286
|
added language
|
2013-02-21 16:57:54 +05:30 |
|
Anand Doshi
|
59d8a76e60
|
Merge branch 'master' of github.com:webnotes/erpnext into edge
Conflicts:
hr/doctype/leave_application/locale/_messages_py.json
hr/doctype/leave_block_list/locale/_messages_doc.json
public/js/locale/_messages_js.json
setup/doctype/email_digest/locale/_messages_doc.json
setup/doctype/global_defaults/global_defaults.txt
|
2013-02-21 11:09:43 +05:30 |
|
Rushabh Mehta
|
833b0f12d5
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-02-21 09:48:35 +05:30 |
|
Anand Doshi
|
67160d48fd
|
allow importing leave allocation
|
2013-02-20 19:11:54 +05:30 |
|
Anand Doshi
|
7ce7d7cad4
|
Merge branch 'master' of github.com:webnotes/erpnext into edge
|
2013-02-20 16:08:43 +05:30 |
|
Rushabh Mehta
|
87e4801946
|
website settings social icons
|
2013-02-20 15:02:21 +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 |
|