Nabin Hait
|
a9ec49e0bf
|
[fix] [mapper] add rows only table is blank, allow multiple time pull and validation if same item pulled twice
|
2013-07-15 16:33:24 +05:30 |
|
Nabin Hait
|
cfecd2bc16
|
[fix] [cleanup] fixes while testing and code cleanup
|
2013-07-11 17:49:18 +05:30 |
|
Nabin Hait
|
1ac928ed5c
|
Merge branch 'responsive' of github.com:webnotes/erpnext into responsive
|
2013-07-11 16:07:53 +05:30 |
|
Rushabh Mehta
|
df92a553cb
|
[style] Added Icons to Pages
|
2013-07-11 14:50:43 +05:30 |
|
Nabin Hait
|
76cacdbb78
|
[fix] [hr] letter head in salary slip email
|
2013-07-11 11:11:34 +05:30 |
|
Nabin Hait
|
a4f0240bfc
|
[conflict] merged for get_query
|
2013-07-10 19:05:57 +05:30 |
|
Nabin Hait
|
c0ebaae15a
|
[fix][hr] fetch emp name in attendance and default value
|
2013-07-10 17:42:01 +05:30 |
|
Nabin Hait
|
10b112807c
|
[fix] related to mapping
|
2013-07-10 16:48:29 +05:30 |
|
Nabin Hait
|
cb04d0cd14
|
Merge branch 'responsive' of github.com:webnotes/erpnext into responsive
|
2013-07-10 15:16:30 +05:30 |
|
Rushabh Mehta
|
3429b609a7
|
[feature] [grid] Allow Grid viewable columns to be selected via 'In List View'
|
2013-07-10 15:03:37 +05:30 |
|
Nabin Hait
|
749b37f4f5
|
[fix][hr] pull salary structure in salary slip
|
2013-07-10 14:16:59 +05:30 |
|
Nabin Hait
|
6c17f012ba
|
[minor][hr] validation added: salary slip can not be made if employee left before this month
|
2013-07-10 12:28:56 +05:30 |
|
Saurabh
|
2e3c06e66d
|
[get_query]to server side
|
2013-07-09 18:20:49 +05:30 |
|
Saurabh
|
ab462d2000
|
[get_query]to server side
|
2013-07-09 16:18:52 +05:30 |
|
Rushabh Mehta
|
a2a1ec765b
|
[mappers] cleanup, remove dt_map, map_doclist and other such functions
|
2013-07-08 11:08:27 +05:30 |
|
Nabin Hait
|
ed23cca9d3
|
[mapper] removed old mapper from files and database
|
2013-07-07 19:11:52 +05:30 |
|
Rushabh Mehta
|
11d688a536
|
Merge branch 'responsive' of github.com:webnotes/erpnext into responsive
|
2013-07-05 15:14:15 +05:30 |
|
Rushabh Mehta
|
3a3c2710d1
|
[icon] added in doctype
|
2013-07-05 15:13:31 +05:30 |
|
Anand Doshi
|
ef8d3bcb77
|
Merge branch 'responsive' of github.com:webnotes/erpnext into responsive
|
2013-07-05 12:57:41 +05:30 |
|
Anand Doshi
|
901773a139
|
[fresh install] [fix] replace allow roles with explicit has_permission checks for doctype py files
|
2013-07-05 12:57:03 +05:30 |
|
Rushabh Mehta
|
54352c7140
|
[form cleanup]
|
2013-07-05 12:43:59 +05:30 |
|
Rushabh Mehta
|
d420401ba3
|
[moduleview] added top bar
|
2013-07-01 17:15:23 +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 |
|
Anand Doshi
|
618edee8b7
|
[search criteria] [cleanup] removed search criteria folders and files
|
2013-06-11 15:04:37 +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
|
8fefeaf1bd
|
[ui] removed links to old search_criteria and Report2 is now Report
|
2013-06-04 11:23:42 +05:30 |
|
Rushabh Mehta
|
e05135c8c4
|
[fixes to wnf #127
|
2013-05-27 18:32:20 +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 |
|
Nabin Hait
|
da369d8eee
|
[report] requested qty to be ordered
|
2013-05-13 16:29:28 +05:30 |
|
Nabin Hait
|
c518e8be12
|
[report] monthly attendance sheet
|
2013-05-13 15:59:50 +05:30 |
|
Nabin Hait
|
765383b3cf
|
[report] monthly salary register
|
2013-05-10 18:41:58 +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
|
6754dda4a8
|
[report] employee information
|
2013-05-06 18:50:29 +05:30 |
|
Nabin Hait
|
35e7e8f58f
|
[report] employee birthday
|
2013-05-06 18:37:57 +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 |
|