pawan
|
8d187def12
|
[fix] #6363
|
2016-10-24 11:18:29 +05:30 |
|
Nabin Hait
|
fa1cdd5bf0
|
Fixed merge conflict
|
2016-10-18 15:37:33 +05:30 |
|
Rushabh Mehta
|
17f6874450
|
[minor] [fix] doctype_dasboard.py files, move data to get_data
|
2016-10-18 14:54:39 +05:30 |
|
Nabin Hait
|
395d757c5a
|
Fixed merge conflict
|
2016-10-17 16:42:49 +05:30 |
|
Faris Ansari
|
a0608d463a
|
[gantt] Gantt fixes (#6490)
* [gantt] fix Gantt Chart link in Modules
* [gantt] added field for Task dependent
|
2016-10-10 14:32:35 +05:30 |
|
Nabin Hait
|
558f526a68
|
Fixed version conflict
|
2016-10-05 17:18:36 +05:30 |
|
Nabin Hait
|
9ac2fc932d
|
Validate dates, fixes #6542
|
2016-10-05 12:20:25 +05:30 |
|
Kanchan Chauhan
|
b40c0a917d
|
[WIP] Process Payroll Changes
|
2016-09-28 15:14:41 +05:30 |
|
Nabin Hait
|
1e97fc8687
|
Merge pull request #6460 from KanchanChauhan/salary-slip-fixes
[Fix]Salary Slip can be created without salary structure
|
2016-09-28 12:55:04 +05:30 |
|
paurosello
|
a4d19b4c03
|
change to link of gantt in project (#6469)
|
2016-09-27 09:56:17 +05:30 |
|
Faris Ansari
|
70b7d3280b
|
added required fields in doctypes for gantt (#6466)
|
2016-09-26 18:20:14 +05:30 |
|
Kanchan Chauhan
|
273c5e71fd
|
[Fix]Salary Slip can be created without salary structure
|
2016-09-24 18:56:56 +05:30 |
|
Nabin Hait
|
d5ebd79ad7
|
Fixed version conflict
|
2016-09-14 15:50:22 +05:30 |
|
Nabin Hait
|
e9fa81c286
|
Merge pull request #6327 from rohitwaghchaure/timesheet_enhancement
[Enhancement] Timesheet billing based on project
|
2016-09-14 15:31:54 +05:30 |
|
Nabin Hait
|
9c32baa1f4
|
Merge pull request #6355 from rohitwaghchaure/timesheet_calendar_permission_issue
[Fix] Timesheet calendar permission issue
|
2016-09-14 15:26:30 +05:30 |
|
Rohit Waghchaure
|
4bd08182ac
|
[Fix] Timesheet calendar permission issue
|
2016-09-13 13:35:53 +05:30 |
|
superlack
|
1579565e52
|
Activity Summary to not show cancelled timesheets on click
Clicking an Activity Type in the Activity summary portion of project will add filter of "Status" != "Cancelled"
|
2016-09-12 21:18:41 -07:00 |
|
Rohit Waghchaure
|
0568238786
|
rename total_billing_hours to total_billable_hours in timesheet doctype
|
2016-09-12 23:00:24 +05:30 |
|
Rohit Waghchaure
|
7b6fdb77d0
|
rename total_billing_amount to total_billable_amount in timesheet doctype
|
2016-09-12 19:06:41 +05:30 |
|
bcornwellmott
|
6594c841a7
|
Added color coding to timesheet calendars (#6269)
|
2016-09-12 16:43:23 +05:30 |
|
Rohit Waghchaure
|
03e5e68a7a
|
[Fix] Employee name is missing in timesheet
|
2016-09-12 16:14:06 +05:30 |
|
Rohit Waghchaure
|
e1d59d6dde
|
test cases and minor changes
|
2016-09-12 13:27:28 +05:30 |
|
Rohit Waghchaure
|
1d0e8ea9c6
|
minor changes
|
2016-09-12 13:27:27 +05:30 |
|
Rohit Waghchaure
|
c940440fbe
|
patch and rearrangement of fields
|
2016-09-12 13:27:27 +05:30 |
|
Rohit Waghchaure
|
3815ebff8a
|
Added %billed in timesheet
|
2016-09-12 13:27:27 +05:30 |
|
Rohit Waghchaure
|
a6927e05ba
|
set project wise timesheet data
|
2016-09-12 13:27:27 +05:30 |
|
Rohit Waghchaure
|
cc8644f86e
|
[Timesheet] Field rearrange
|
2016-09-12 13:27:27 +05:30 |
|
Rushabh Mehta
|
b2f0920346
|
[minor] new global for query report filters
|
2016-09-01 17:53:42 +05:30 |
|
Nabin Hait
|
2490ea0b91
|
Fixed merge conflict
|
2016-09-01 12:29:31 +05:30 |
|
Rohit Waghchaure
|
7f165f19d2
|
[Fix] Timesheet employee is missing in patch
|
2016-09-01 12:07:21 +05:30 |
|
Rohit Waghchaure
|
a2bf16bfaa
|
[Fix] Billing Hours showing blank on sales invoice
|
2016-08-29 13:37:13 +05:30 |
|
Kanchan Chauhan
|
dd96cbd012
|
Coded column deleted, column added from UI
|
2016-08-26 14:32:38 +05:30 |
|
Rohit Waghchaure
|
69aebf4db5
|
fixes test cases, added patch
|
2016-08-26 13:18:14 +05:30 |
|
Rohit Waghchaure
|
0cb171feb2
|
[Enhancement] Added billing hours for account user in timesheet
|
2016-08-26 13:17:46 +05:30 |
|
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 |
|
Rohit Waghchaure
|
b77a1057ce
|
fixes and cleanups.
|
2016-08-06 12:45:02 +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 |
|