Rushabh Mehta
|
54352c7140
|
[form cleanup]
|
2013-07-05 12:43:59 +05:30 |
|
Rushabh Mehta
|
64c2764b56
|
[translations/build] deleted translation files (to be built on demand)
|
2013-06-17 11:56:41 +05:30 |
|
Anand Doshi
|
b53b9dcff4
|
Merge branch 'responsive' of github.com:webnotes/erpnext into responsive
|
2013-06-11 16:23:45 +05:30 |
|
Anand Doshi
|
27e6f13b5d
|
[cleanup] deprecated search criteria, amendment_date, cancel_reason
|
2013-06-11 16:23:18 +05:30 |
|
Rushabh Mehta
|
d9dfbae718
|
[docs] added readme for hr module
|
2013-06-11 15:03:41 +05:30 |
|
Rushabh Mehta
|
e93a2f6e8e
|
[cleanup] removed Employee Training, Other Income
|
2013-06-11 15:03:25 +05:30 |
|
Rushabh Mehta
|
c4f08ef456
|
[views] cleaned up, added ganttview
|
2013-06-05 17:14:52 +05:30 |
|
Rushabh Mehta
|
126f2c62f2
|
[merge] merge with master
|
2013-05-24 16:09:13 +05:30 |
|
Nabin Hait
|
5e50ffa308
|
[fixes] employee query in leave application
|
2013-05-21 15:31:32 +05:30 |
|
Anand Doshi
|
4430c0d718
|
[upload attendance] [fix] fixed import issue for role restricted whitelist methods
|
2013-05-14 19:23:37 +05:30 |
|
Anand Doshi
|
6e3706d733
|
[employee] [fix] on user id, set Employee role to profile
|
2013-05-14 17:11:27 +05:30 |
|
Anand Doshi
|
ef06a4b349
|
[autoname] [cleanup] strip blank spaces and remove autoname where naming_series: can be set in doctype
|
2013-05-09 15:13:47 +05:30 |
|
Rushabh Mehta
|
f514998011
|
merge
|
2013-05-09 11:42:35 +05:30 |
|
Nabin Hait
|
c51c0ce3e9
|
[fixes] salary slip
|
2013-05-03 15:40:26 +05:30 |
|
Rushabh Mehta
|
d3e00995db
|
[conflicts] [merged]
|
2013-05-02 16:02:59 +05:30 |
|
Nabin Hait
|
81bbfba0cc
|
[hr] allowed rename in earning and deduction type
|
2013-05-02 11:27:25 +05:30 |
|
Rushabh Mehta
|
f1cfbeaa5c
|
[merge] fix
|
2013-04-24 10:03:56 +05:30 |
|
Anand Doshi
|
dc0f2d2422
|
Merge branch 'master' into edge
Conflicts:
accounts/doctype/sales_invoice/sales_invoice.txt
stock/doctype/item/item.txt
|
2013-04-23 12:42:18 +05:30 |
|
Anand Doshi
|
6f83e77010
|
[leave application] [employee query] fixes
|
2013-04-23 12:24:31 +05:30 |
|
Anand Doshi
|
f2785c9e61
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-04-22 18:59:48 +05:30 |
|
Anand Doshi
|
a7b8f35539
|
[leave application] [employee query] allow employee lookup for which the current user is leave approver or thhe employee has no leave approvers mentioned or the user is the employee
|
2013-04-22 18:59:04 +05:30 |
|
Nabin Hait
|
d16cae113a
|
[salary structure] added a validation
|
2013-04-22 15:15:47 +05:30 |
|
Nabin Hait
|
a305406267
|
[salary structure] added a validation
|
2013-04-22 14:30:30 +05:30 |
|
Nabin Hait
|
2f829ecbdf
|
field label changed in salary structure
|
2013-04-22 14:10:36 +05:30 |
|
Rushabh Mehta
|
1615f2f46c
|
[merge edge]
|
2013-04-18 10:38:02 +05:30 |
|
Rushabh Mehta
|
651ce05fcc
|
[merge master
]
|
2013-04-18 10:37:16 +05:30 |
|
Anand Doshi
|
a1924eda90
|
[employee] [fix] removed erroneous break statement
|
2013-04-17 18:40:40 +05:30 |
|
Anand Doshi
|
c6aecb3f97
|
Merge branch 'master' into edge
Conflicts:
home/page/latest_updates/latest_updates.js
hr/doctype/employee/employee.txt
|
2013-04-16 21:32:06 +05:30 |
|
Rushabh Mehta
|
ac118c8822
|
[cleanup] started responsive layouts and removed tinymce
|
2013-04-15 17:02:20 +05:30 |
|
Anand Doshi
|
60666a278f
|
[Leave Application] [fixes] Validate Leave Approver based on a list specified in Employee
|
2013-04-12 20:19:53 +05:30 |
|
Rushabh Mehta
|
0c1611219e
|
[files] [cleanup/redesign] removed the old file_list structure and also added file listing in setup
|
2013-04-10 13:54:13 +05:30 |
|
Rushabh Mehta
|
33075e1f69
|
[files] [patch] dropped file_list property and moved links to
|
2013-04-10 11:08:50 +05:30 |
|
Rushabh Mehta
|
cfa663e337
|
[message] [fix] rewire to core
|
2013-04-04 10:02:08 +05:30 |
|
Nabin Hait
|
787c02ee42
|
aii fixes
|
2013-03-29 16:42:33 +05:30 |
|
Anand Doshi
|
96b189c118
|
fixes in test cases and buying amount function
|
2013-03-26 18:43:10 +05:30 |
|
Rushabh Mehta
|
4731fb999c
|
[feature] [fix] utilities/rename tool upgraded to upload multiple items
|
2013-03-26 12:47:19 +05:30 |
|
Anand Doshi
|
a1e44e4202
|
Merge pull request #315 from mayur-patel/master
Added default for Employee doctype with help of Anand Doshi
|
2013-03-22 05:49:25 -07:00 |
|
mayur-patel
|
e635a45be9
|
Added new default value with help of Anand Doshi.
|
2013-03-21 21:30:34 +11:00 |
|
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 |
|
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 |
|