Faris Ansari
|
df65d21225
|
[ui] show assignees in gantt popup frappe/erpnext#6916
|
2017-03-13 14:52:56 +05:30 |
|
Faris Ansari
|
0e4b924f59
|
[gantt] show task project in popup
|
2017-03-07 12:01:39 +05:30 |
|
Nabin Hait
|
258c8199fb
|
Merge pull request #7842 from superlack/develop
Add Sales Orders to Project costing and billing section
|
2017-03-01 17:20:23 +05:30 |
|
superlack
|
62d7ba0afd
|
Update project.py
|
2017-02-27 07:00:30 -08:00 |
|
Kanchan Chauhan
|
e76685d925
|
Dependent task dates gets updated with parent dates
|
2017-02-27 14:55:03 +05:30 |
|
superlack
|
f800892ec3
|
Update project.py
|
2017-02-24 12:33:59 -08:00 |
|
superlack
|
868ef7738f
|
Update project.json
|
2017-02-23 17:46:07 -08:00 |
|
superlack
|
c4587d2945
|
Update project.py
|
2017-02-23 17:39:05 -08:00 |
|
Nabin Hait
|
5079c9ef47
|
Fixed merge conflict
|
2017-02-22 15:31:31 +05:30 |
|
Nabin Hait
|
fd3ec066ce
|
Added fields in global search
|
2017-02-20 13:38:31 +05:30 |
|
Rohit Waghchaure
|
a020e4eba4
|
Payment entry fields issue, added total billed hours in timesheet
|
2017-02-17 14:51:57 +05:30 |
|
Nabin Hait
|
2f7697d1bd
|
Merge pull request #7746 from pratu16x7/minor-search-presets
Preset doctypes fields to Search
|
2017-02-15 18:46:03 +05:30 |
|
pratu16x7
|
349ed568ed
|
Add task and item
|
2017-02-15 09:23:26 +05:30 |
|
Kanchan Chauhan
|
bab6c9c006
|
[Fix] Project perecentage set 0 if no tasks
|
2017-02-14 14:30:00 +05:30 |
|
bcornwellmott
|
92b6ceec41
|
Duplicate "title" field
The title field was duplicated - removed first one.
|
2017-02-06 10:51:02 -08:00 |
|
Kanchan Chauhan
|
5f5457085e
|
Joining date validation removed from Salary Structure
|
2017-02-06 14:50:39 +05:30 |
|
Rushabh Mehta
|
3714626dd0
|
[minor] enhance BOM view
|
2017-02-01 18:35:53 +05:30 |
|
Kanchan Chauhan
|
3dd85a0e9e
|
Task rename now possible
|
2017-01-27 12:34:06 +05:30 |
|
Nabin Hait
|
dd839055e3
|
Fixed merge conflict
|
2017-01-17 15:52:56 +05:30 |
|
Gaurav Naik
|
d9b4c52046
|
[Fix] Project: Enabled autocomplete for project users
|
2017-01-16 16:01:25 +05:30 |
|
Nabin Hait
|
b251cd4ccb
|
Fixed merge conflict
|
2017-01-13 14:34:54 +05:30 |
|
Nabin Hait
|
9e08ccdf39
|
Merge pull request #7425 from KanchanChauhan/sync-projecttask-task
Sync Project Task and Task
|
2017-01-10 17:26:51 +05:30 |
|
Nabin Hait
|
20aba32318
|
Merge pull request #7427 from KanchanChauhan/projects-manager-role
[Minor] Added Projects Manager role
|
2017-01-10 17:25:16 +05:30 |
|
Kanchan Chauhan
|
c4aceaad7f
|
[Minor] Added Projects Manager role
|
2017-01-10 16:35:54 +05:30 |
|
Kanchan Chauhan
|
4a15fa4c86
|
Sync Project Task and Task
|
2017-01-10 16:01:38 +05:30 |
|
Nabin Hait
|
51d45d8bce
|
Fixed merge conflict
|
2017-01-10 12:32:01 +05:30 |
|
Nabin Hait
|
6e9d2a3c1f
|
fixed conflict
|
2017-01-09 17:21:34 +05:30 |
|
Nabin Hait
|
a2fae844b6
|
Merge pull request #7410 from RobertSchouten/timesheet_overlap_validation
[fix] timesheet overlap validation not including modified timesheet
|
2017-01-09 17:15:40 +05:30 |
|
Nabin Hait
|
802b4359b5
|
Fetch same items multiple times from source doc if all qty not processed
|
2017-01-09 15:32:20 +05:30 |
|
robert schouten
|
138c2f6b29
|
[fix] timesheet overlap validation not including modified timesheet
|
2017-01-09 12:50:35 +08:00 |
|
Nabin Hait
|
4573029a5e
|
Merge pull request #7292 from frappe/bcornwellmott-patch-1
Add hours to calendar labels
|
2016-12-26 16:09:11 +05:30 |
|
Nabin Hait
|
58291c77e9
|
Fixed version conflict
|
2016-12-23 17:43:42 +05:30 |
|
Nabin Hait
|
c2d66bdfb2
|
Merge branch 'master' into develop
|
2016-12-23 16:45:09 +05:30 |
|
bcornwellmott
|
e549984a42
|
Grabs title from SQL
Gets a concatenated title label for the Calendar event that includes the number of hours
|
2016-12-21 12:36:45 -08:00 |
|
bcornwellmott
|
3385bd4921
|
Add hours to label in calendar view
Adds a label for the number of hours to each calendar event
|
2016-12-21 12:33:32 -08:00 |
|
Rohit Waghchaure
|
1af1a43616
|
[Enhancement] Setting to maintain the work hours and bill hours same on the timesheet
|
2016-12-21 19:19:16 +05:30 |
|
Kanchan Chauhan
|
b79aa1d091
|
[Minor] Read permissions to Employee on Activity Type and Appraisal Template
|
2016-12-13 14:16:57 +05:30 |
|
Kanchan Chauhan
|
a72841e5e5
|
Show only Project tasks in depends on tasks
|
2016-12-12 18:33:46 +05:30 |
|
Nabin Hait
|
f5460e9e6f
|
Merge pull request #6846 from KanchanChauhan/payroll-updates
Weekly, Fortnightly, Bimonthly and Monthly payroll frequency
|
2016-12-08 13:51:55 +05:30 |
|
Nabin Hait
|
1b9caf90dd
|
Merge branch 'master' into develop
|
2016-12-08 12:33:54 +05:30 |
|
Kanchan Chauhan
|
f7b25cbb6b
|
[WIP] Payroll Updates
|
2016-12-08 12:20:20 +05:30 |
|
Rohit Waghchaure
|
86ed030b5c
|
minor issue
|
2016-12-07 19:17:01 +05:30 |
|
Rohit Waghchaure
|
0327b35b5e
|
[fix] timesheet datetime issue
|
2016-12-07 18:32:36 +05:30 |
|
Nabin Hait
|
5c18bd9b61
|
Fixed merge conflict
|
2016-12-06 16:16:58 +05:30 |
|
Rushabh Mehta
|
323c06ebbf
|
[minor] rename icons as per FontAwesome 4 (#7136)
|
2016-12-05 14:17:26 +05:30 |
|
robert schouten
|
0beb5bdea6
|
calc timesheet dates on validate not just submit
|
2016-12-01 08:51:03 +08:00 |
|
Nabin Hait
|
7f3da5dbb1
|
Fixed merge conflict
|
2016-11-28 14:23:51 +05:30 |
|
Rohit Waghchaure
|
8c4e45ab3d
|
cleanup timesheet
|
2016-11-23 17:54:47 +05:30 |
|
Rushabh Mehta
|
4e61564f73
|
[minor] fixes to daily work summary formatting
|
2016-11-22 21:59:20 +05:30 |
|
Nabin Hait
|
d4e8b297cd
|
Merge pull request #6784 from RobertSchouten/calendar_fix
[fix] calendar range fixes
|
2016-11-17 14:45:59 +05:30 |
|