Nabin Hait
|
b5951b72f3
|
Merge pull request #5924 from KanchanChauhan/salary-structure-changes
Formula based Salary Structure
|
2016-08-18 16:39:58 +05:30 |
|
Kanchan Chauhan
|
bccf0fa041
|
[WIP] Formula based Salary Structure and multiple employees for same Salary Structure
|
2016-08-18 13:02:39 +05:30 |
|
Nabin Hait
|
613ef344f3
|
Patch fixed for v6 to v7 migration
|
2016-08-16 18:31:26 +05:30 |
|
Rushabh Mehta
|
d643f2b249
|
[minor] fixes #6074;
|
2016-08-12 10:36:59 +05:30 |
|
Ben Cornwell-Mott
|
ed1b8cfe3f
|
Added a Calendar view for timesheet logs
|
2016-08-08 14:17:06 +05:30 |
|
Nabin Hait
|
20b4666e89
|
Merge pull request #5958 from rohitwaghchaure/minor_fixes_and_cleanups
fixes and cleanups.
|
2016-08-06 14:11:24 +05:30 |
|
Rushabh Mehta
|
84969bdb2d
|
Merge pull request #6007 from KanchanChauhan/task-json-fixed
[Minor] Removed hard coded success URL from task webform
|
2016-08-06 13:42:50 +05:30 |
|
Rohit Waghchaure
|
b77a1057ce
|
fixes and cleanups.
|
2016-08-06 12:45:02 +05:30 |
|
Kanchan Chauhan
|
93b1f2ad72
|
[Minor] Removed hard coded success URL
|
2016-08-06 12:09:08 +05:30 |
|
Revant Nandgaonkar
|
9a433ffca1
|
[fix] success_url Issue #6004
|
2016-08-05 21:44:34 +05:30 |
|
Rushabh Mehta
|
4d32d5301a
|
Merge pull request #5996 from KanchanChauhan/users-selection-for-project
'Project Users' role not required to add user to the project
|
2016-08-04 14:25:52 +05:30 |
|
Kanchan Chauhan
|
58bc00f954
|
Project Users role not required to add user to the project
|
2016-08-04 14:21:20 +05:30 |
|
Rohit Waghchaure
|
a88dec8775
|
[Fix] batch no searching in pos
|
2016-08-01 13:01:13 +05:30 |
|
Ben Cornwell-Mott
|
e326ae95ef
|
Fixed typo
|
2016-07-26 19:55:09 -07:00 |
|
bcornwellmott
|
5f59a0a00f
|
Corrected SQL query
|
2016-07-28 06:56:20 -07:00 |
|
Ben Cornwell-Mott
|
19cb34ce40
|
removed test variable
|
2016-07-26 13:48:36 -07:00 |
|
Ben Cornwell-Mott
|
5342ec5055
|
Added employee name to get_employee_list query
|
2016-07-26 13:47:55 -07:00 |
|
Rohit Waghchaure
|
26cf01aaba
|
[mionr] fixes and cleanups
|
2016-07-26 00:30:25 +05:30 |
|
Rushabh Mehta
|
6c3ac9587e
|
[fix] quick entry
|
2016-07-25 15:03:39 +05:30 |
|
Rohit Waghchaure
|
f027fd0c66
|
[Fix] Timesheet patch
|
2016-07-24 00:38:10 +05:30 |
|
Rohit Waghchaure
|
ea278b5971
|
[Fix]POS and timesheet issues
|
2016-07-22 01:22:56 +05:30 |
|
Rohit Waghchaure
|
3176bc93c1
|
[Fix] Timesheet to time issue
|
2016-07-21 14:56:15 +05:30 |
|
Rohit Waghchaure
|
f14bf502ef
|
billable field access from grid
|
2016-07-18 23:30:46 +05:30 |
|
Rushabh Mehta
|
76b134192f
|
[fix] grid columns now restricted to 10
|
2016-07-18 14:30:27 +05:30 |
|
Rohit Waghchaure
|
ecb2031bbe
|
[Fix] Timesheet workstation holiday issue
|
2016-07-15 20:11:01 +05:30 |
|
Rohit Waghchaure
|
3bc6a958c7
|
[Fix] Timesheet overlap issue
|
2016-07-14 18:27:49 +05:30 |
|
Rohit Waghchaure
|
e3fe828ea6
|
[Fix] Added note in timesheet and minor fixes
|
2016-07-13 09:40:35 +05:30 |
|
Rohit Waghchaure
|
3e012b7e16
|
[Fix] Time sheet rename issues
|
2016-07-11 15:00:38 +05:30 |
|
Rushabh Mehta
|
391c0efcee
|
[fix] make grids editable
|
2016-07-11 13:01:58 +05:30 |
|
Rushabh Mehta
|
cca33b2ff0
|
[cleanup]
|
2016-07-11 13:01:58 +05:30 |
|
Rushabh Mehta
|
964ad0fcae
|
[cleanup] rename "links" to "dashboard"
|
2016-07-07 14:28:05 +05:30 |
|
Kanchan Chauhan
|
6d76359c31
|
[WIP] Task statuses updated in website
|
2016-07-07 12:19:01 +05:30 |
|
Nabin Hait
|
6a66138764
|
Merge pull request #5675 from rohitwaghchaure/rename_time_sheet_doctype
Rename Time Sheet doctype
|
2016-07-07 10:38:55 +05:30 |
|
Rohit Waghchaure
|
e94d18b4cd
|
Rename Time Sheet doctype
|
2016-07-06 20:38:50 +05:30 |
|
Saurabh
|
38d261653f
|
[fix] load task table for project on saving of project
|
2016-07-06 17:26:21 +05:30 |
|
Saurabh
|
838dd6c530
|
[fix] task visibility fix #5601
|
2016-07-06 17:00:30 +05:30 |
|
Rohit Waghchaure
|
3188b56694
|
[Fixes] Time sheet fixes
|
2016-07-06 14:31:14 +05:30 |
|
Kanchan Chauhan
|
d963b76a4b
|
Salary component cleanup
|
2016-07-06 12:04:38 +05:30 |
|
Rushabh Mehta
|
b33df4afe8
|
[cleanup] link methods made common
|
2016-07-04 11:39:25 +05:30 |
|
Rushabh Mehta
|
8c2e79cf0d
|
[minor] fixes
|
2016-07-04 11:39:25 +05:30 |
|
Rohit Waghchaure
|
3fa0b51e5e
|
[Fixes] Time sheet fixes and changed timesheets to time_logs
|
2016-06-29 19:04:16 +05:30 |
|
Rohit Waghchaure
|
e95ee43d51
|
[Fixes] Timesheet
|
2016-06-27 17:28:48 +05:30 |
|
Rohit Waghchaure
|
d6c986da8f
|
[Enhancement] Time log wages and multiple active salary structure
|
2016-06-27 16:46:39 +05:30 |
|
Rushabh Mehta
|
dad5140eac
|
[minor] add task status
|
2016-06-26 12:21:20 +05:30 |
|
Rushabh Mehta
|
5cba40b74f
|
[fix] [bug] task deletion from project fixes #5470
|
2016-06-25 18:44:59 +05:30 |
|
Rushabh Mehta
|
bd9680f82e
|
[added] web-forms
|
2016-06-24 16:41:33 +05:30 |
|
Rushabh Mehta
|
8a065e0028
|
[rename] Bulk Email to Email Queue
|
2016-06-22 12:58:39 +05:30 |
|
Rushabh Mehta
|
535f3b0975
|
[minor] make task editable in project and add description to designation fixing #5361
|
2016-06-01 12:52:50 +05:30 |
|
Rushabh Mehta
|
b574658c93
|
[minor] allow any time logs to be batched, fixes #5386
|
2016-05-24 12:13:31 +05:30 |
|
Rushabh Mehta
|
c711b82889
|
Merge pull request #5296 from KanchanChauhan/websitemakeover
New look to the website
|
2016-05-02 15:54:41 +05:30 |
|