Rushabh Mehta
36311020de
[minor] ux fixes
2017-06-20 09:31:06 +05:30
almeidapaulopt
31692a2595
Create a project from a Sales Order ( #9111 )
...
* init commit
* don't get tasks if project name is none
* cleanup
* Update sales_order.js
2017-06-16 15:29:41 +05:30
Nabin Hait
84bc5601eb
Total sales cost in Project should be updated based on base_grand_total ( #9302 )
...
* Total sales cost in Project should be updated based on base_grand_total
* Patch to update sales cost in Project in base currency
2017-06-16 12:13:51 +05:30
mbauskar
f9e2bf1ab4
fixed merge conflicts
2017-06-15 13:42:47 +05:30
tundebabzy
f5604c101c
Once primary key is generated, do not allow changing Series #8911 ( #9265 )
...
* changes set_only_once field for tabDocField to 1
* changes all affected doctypes `set_only_once` option to 1
* add patch name to text file
* adds test cases
* Revert "add patch name to text file"
This reverts commit fc7cb6b4557217cee61abfbbf42ff6f40099f23c.
* Revert "changes set_only_once field for tabDocField to 1"
This reverts commit 2b1f7f31a0d6491056d809f319bae0f7b84be435.
2017-06-14 16:10:09 +05:30
Faris Ansari
5f27c94100
Merge pull request #9078 from netchampfaris/remove-globals
...
Lint and fix JS files
2017-06-06 11:35:42 +05:30
Nabin Hait
c9fa07b16d
Merge branch 'master' into develop
2017-05-30 15:59:04 +05:30
Nabin Hait
5d7e8d9e83
Minor fix in timesheet ( #9063 )
2017-05-30 15:34:35 +05:30
Faris Ansari
ab74ca7fff
Lint and fix JS files
2017-05-30 12:54:42 +05:30
Paulo Almeida
97ff6fea47
add milestone field
2017-05-23 11:55:37 +01:00
Faris Ansari
74e2e4672c
Fix for duplicated project dependencies ( #8817 )
...
- skip when task is not found
2017-05-16 08:32:45 +05:30
Nabin Hait
226ea7db88
Filter issue on timesheet calendar view ( #8730 )
2017-05-08 17:34:07 +05:30
Faris Ansari
695327a513
Duplicate dependencies when project is duplicated
...
- fix frappe/erpnext#8274
2017-04-19 20:48:49 +05:30
Makarand Bauskar
141c244ece
[minor] added order by args to get_*_list methods ( #8413 )
2017-04-12 13:02:28 +05:30
Faris Ansari
eae30e5642
[fix] Show project title in kanban view ( #8268 )
...
- frappe/erpnext#8232
2017-03-31 17:46:12 +05:30
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
Rohit Waghchaure
e7485150a1
added roles in the report
2017-03-06 14:26:09 +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
01baceb74e
Revert "proposed usage of daterange picker"
2017-01-10 12:19:48 +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
robert schouten
81130e848e
proposed usage of daterange picker
2017-01-09 08:38:27 +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
Nabin Hait
12a396ef25
Merge pull request #7107 from RobertSchouten/timesheetdates
...
calc timesheet dates on validate not just submit
2016-12-05 14:23:21 +05:30
Rushabh Mehta
323c06ebbf
[minor] rename icons as per FontAwesome 4 ( #7136 )
2016-12-05 14:17:26 +05:30
Nabin Hait
c92e2f9044
Update project_wise_stock_tracking.json
2016-12-01 16:12:35 +05:30
robert schouten
81a5467c8f
[fix] Project wise Stock Tracking is script report
2016-12-01 09:02:17 +08:00
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
Nabin Hait
a469e659c5
Fixed merge conflict
2016-11-08 15:26:27 +05:30
Rushabh Mehta
13fc52d713
[minor] added default standard filters ( #6854 )
2016-11-07 17:19:19 +05:30
Rohit Waghchaure
0ecad33642
cleanup and fixes
2016-11-05 08:09:21 +05:30
Nabin Hait
81f7a265bc
Merge pull request #6723 from rohitwaghchaure/enhancement_remember_last_selected_value
...
Remember last selected value for link field
2016-11-04 16:13:49 +05:30
Rohit Waghchaure
0d2f7e62c0
set remember last selected value as true for company field
2016-11-03 16:19:34 +05:30
Rohit Waghchaure
3844d2cc01
Remember last selected value for link field
2016-11-03 14:49:27 +05:30
robert schouten
e32e2126f4
gantt fix
2016-11-03 08:10:30 +08:00
robert schouten
e8c1777c5f
gantt fix
2016-11-03 08:10:03 +08:00
robert schouten
bb79fc5b0c
[fix] calendar range fixes
2016-11-01 17:14:51 +08:00
bcornwellmott
7ef2c0fc34
Fix calendar view for Timesheet
...
All the calendar events for Timesheets show up on one date. This is because there was a change to the timesheet_calendar.js file when the Gantt chart was added, but the get_events for the calendar wasn't fixed at the same time. Just fixing the reference to the start and end times.
2016-10-26 11:02:48 -07:00
Nabin Hait
c00b17a6e0
Update project.json
2016-10-24 17:53:06 +05:30
Pawan Mehta
297e725727
Update project.json
2016-10-24 11:24:38 +05:30
pawan
46ead70be8
[fix] fixes_6363
2016-10-24 11:18:29 +05:30
pawan
9a43a2a97b
[fix] #6363
2016-10-24 11:18:29 +05:30
pawan
28ad58905d
[fix] #6363
2016-10-24 11:18:29 +05:30
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
e5c7d4b987
Fixed version conflict
2016-09-22 11:33:51 +05:30
Rohit Waghchaure
342ec18b83
[Fix] Daily timesheet summary permission issue
2016-09-21 13:22:15 +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
Nabin Hait
406f0a38de
Fixed merge conflicts
2016-09-05 15:44:18 +05:30
Nabin Hait
8693b5c93a
Minor fixes
2016-09-05 11:51:45 +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
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
Rushabh Mehta
360b05f0f5
[enhancement] activity summary in projects
2016-05-02 14:13:38 +05:30
Kanchan Chauhan
239b351367
New look to the website
2016-05-02 11:43:44 +05:30
Rushabh Mehta
be2ee18de4
[fixed] frappe.require is now async 💥
2016-04-29 17:22:42 +05:30
Rushabh Mehta
127de729b2
[fix] making time log entry easier, to time not mandatory while making time log and Finish button
2016-04-29 14:19:21 +05:30
Rushabh Mehta
1aa1c8a9ef
[minor] remove hide_first in forms
2016-04-29 12:20:23 +05:30
Rushabh Mehta
68d428bfd4
[fix] for sort selector
2016-04-22 13:23:34 +05:30
Rushabh Mehta
c291ab64a6
Merge pull request #5197 from KanchanChauhan/UXChanges_ERPNext
...
[WIP] No not merge
2016-04-21 11:39:45 +05:30
Rushabh Mehta
f2c3cb85a9
Merge pull request #5164 from KanchanChauhan/project-permissions
...
Collaborate PM permission fixes and daily tme log fix
2016-04-21 11:37:31 +05:30
Rushabh Mehta
02772442b6
[cleanup] added dashboard in project
2016-04-20 18:45:56 +05:30
Kanchan Chauhan
11638ba358
Changes 3
2016-04-20 16:24:25 +05:30
Kanchan Chauhan
704f248952
Changes 2
2016-04-20 16:24:24 +05:30
Rushabh Mehta
0525387328
[enhancement] added reserved_qty_for_production in bin and updated item dashboard
2016-04-18 19:27:46 +05:30
ShashaQin
14baa70de3
Update project.py
2016-04-14 10:53:08 +08:00
Kanchan Chauhan
a4ff5d3195
Collaborate PM permission fixes and daily tme log fix
2016-04-08 23:22:04 +05:30
Kanchan Chauhan
017d30f465
[Minor Fixes] Findings in setting up erpnext
2016-04-06 19:28:50 +05:30
Rushabh Mehta
cb144bfcd4
[cleanup] projects
2016-03-31 14:27:35 +05:30
Rushabh Mehta
8b43fd7f02
Merge pull request #5084 from KanchanChauhan/PM-UI-Edits
...
UI Changes
2016-03-29 18:45:58 +05:30
Kanchan Chauhan
b566d42d37
UI Changes
2016-03-29 18:21:59 +05:30
Rushabh Mehta
3117b4b8d6
[fix] minor for quick-entry
2016-03-29 11:53:17 +05:30
Rushabh Mehta
9904c5acf4
Merge pull request #5050 from neilLasrado/develop
...
Fixes Translations
2016-03-29 10:51:44 +05:30
Rushabh Mehta
0a9ad699cf
Merge pull request #5047 from umairsy/task-list-fix
...
On Task, added default filter, Status=Open
2016-03-28 18:28:09 +05:30
Neil Trini Lasrado
b6d9946854
Fixes Translations
2016-03-28 12:44:05 +05:30
Rushabh Mehta
c20c536f28
[fix] [wip] cleanup for collaborative pm
2016-03-25 17:22:17 +05:30
Umair Sayyed
99a686237a
On Task, added default filter, Status=Open
2016-03-23 15:00:51 +05:30
Kanchan Chauhan
b3fe6a45a7
WIP Collaborative Project Management first commit
2016-03-16 18:34:33 +05:30
Neil Trini Lasrado
6e343e23d9
Renamed project_name to project
2016-03-15 17:50:53 +05:30
Rushabh Mehta
5b9d6494a6
Merge pull request #4900 from rmehta/minor-fixes
...
[minor] fix notification for material request, splash icon, cleanup project form layout
2016-03-01 16:15:25 +05:30
Nabin Hait
94a1f3eb90
[fix] Time Log overlap validation and test cases
2016-02-29 13:15:27 +05:30
Rushabh Mehta
4403853828
[minor] fix notification for material request, splash icon, cleanup project form layout
2016-02-27 16:24:34 +05:30
Nabin Hait
56f7fa66ad
[fix] Time log overlap validation
2016-02-26 17:19:11 +05:30
Anand Doshi
17d4fc4fa7
[enhancement] Merge Comment and Feed into Communication 💥
...
Depends on frappe/frappe#1532
2016-02-08 13:06:56 +05:30
Neil Trini Lasrado
5b7d0a960e
Fixed indicators & List view in Time Log, Time Log Batch
2016-01-29 15:20:22 +05:30
Neil Trini Lasrado
172efb1e87
Fixed error messages while making Time Log Batch from Time Log List view
2016-01-29 14:27:03 +05:30
Neil Trini Lasrado
329e7783bc
Fixed time log overlap validation. Fixed test case in time log
2016-01-15 16:34:06 +05:30
Rushabh Mehta
66eaf7e1c3
Merge pull request #4607 from saurabh6790/group_custom_buttons
...
[enhance] merge customize buttons under groups
2016-01-15 11:15:23 +05:30
Rushabh Mehta
9bf2df9303
[minor] [layout] cleaned up Time Log layout
2016-01-14 18:19:21 +05:30
Neil Trini Lasrado
975dcc2bf3
Added additional cost to time log. Fixed issues in Time log billing amount calculation and billing amount calculation while making time log batch
2016-01-14 16:09:35 +05:30
Saurabh
e23e99f4bd
[enhance] merge customize buttons under groups
2016-01-13 09:18:31 +05:30
Rushabh Mehta
5760b79747
[translations] fixes #4533
2016-01-04 15:57:01 +05:30
partzsch
55ad42cfd0
Time Log now down to seconds
...
according to request of @anadpdoshi
new branch new commit new PR
2015-12-21 17:51:42 +01:00
Rushabh Mehta
a1a712b0c6
[minor] [fix] task close button condition
2015-12-11 11:16:03 +05:30
Rushabh Mehta
13ec41abb2
[enhancement] task status will be set to overdue when it crosses expected end date
2015-12-10 12:59:02 +05:30
Rushabh Mehta
c819fd4ee8
[translations] for #4461
2015-12-10 10:34:32 +05:30
Anand Doshi
602e8253be
[enhancement] Int, Currency, Float, Percent as not null and default to 0
2015-11-19 13:23:36 +05:30
Anand Doshi
da79740cdf
[fix] injection
2015-11-17 18:27:50 +05:30
Nabin Hait
58c4646199
[fix][cleanup] Leave allocation, application and balance report cleanup and fixes
2015-11-16 15:35:14 +05:30
Rushabh Mehta
55d0506155
Merge pull request #4264 from superlack/patch-3
...
Update time_log_batch.py
2015-11-02 15:21:59 +05:30
superlack
41f7f7442b
Update time_log_batch.py
2015-11-02 00:39:36 -08:00
superlack
126fb31f9a
Update time_log_batch_detail.json
2015-11-02 00:38:17 -08:00
Rushabh Mehta
ee6862b277
[fix] VARCHAR lengths as 140
2015-10-14 17:28:35 +05:30
Anand Doshi
71ebad5668
Limit varchar length to 140 instead of 255 to mitigate Row Size Too Large error
2015-10-14 16:13:49 +05:30
Rushabh Mehta
2dc619ae1f
[fix] copy task titles with project
2015-10-12 15:55:12 +05:30
Rushabh Mehta
d10ba853e6
[fix] sales & purchase order status
2015-10-02 17:16:51 +05:30
Rushabh Mehta
7f75dbf061
[cleanup] remove backup manager
2015-09-28 19:12:54 +05:30
Anand Doshi
c6e4b5978d
[fix] Sales Order - get_query fix
2015-09-24 11:32:54 +05:30
Anand Doshi
dbe623b167
[fix] Use User Permission value as default only if the document type is Setup
2015-09-14 13:08:53 +05:30
Anand Doshi
840cad0ff7
Don't copy title field in Duplicate
2015-09-11 12:26:57 +05:30
Anand Doshi
bc1e8b4408
[minor] Unset Apply User Permissions in default permissions
2015-09-08 19:23:23 +05:30
Nabin Hait
d387dd3bc6
[fix] Project: round percent_complete to 2 decimals
2015-09-08 16:15:00 +05:30
Rushabh Mehta
be9edae961
[fixes] to task test case and fix tree ui for mobile
2015-09-04 16:18:17 +05:30
Rushabh Mehta
4223d7c044
[minor] task not mandatory for Time Log and Expense Claim #3904
2015-09-04 16:18:17 +05:30
Rushabh Mehta
8f1391dc96
[enhancement] calendar for sales order and other related fixes #3542
2015-08-31 12:42:45 +05:30
Anand Doshi
8b66f2a691
Exported all doctypes
2015-08-27 16:45:52 +05:30
Anand Doshi
f3eeb601ad
Merge pull request #3908 from rmehta/text-editor
...
[fix] changed text > text editor for description fields in tables
2015-08-19 16:48:06 +05:30
Anand Doshi
e270c7261d
[minor] project cost
2015-08-19 13:02:30 +05:30
Rushabh Mehta
81e9d4e8f5
[fix] changed text > text editor for description fields in tables
2015-08-19 13:00:03 +05:30
Nabin Hait
fa5fcf5405
[fix] Purchase cost against project
2015-08-19 11:56:23 +05:30
Neil Trini Lasrado
62dba50e9b
Multiple Fixes
2015-08-13 16:18:55 +05:30
Rushabh Mehta
3131c732ff
[fix] capacity planning error
2015-08-12 12:29:16 +05:30
Rushabh Mehta
d6bdad7adf
[fix] [hot] total in time log batch
2015-08-06 15:46:42 +05:30
Neil Trini Lasrado
f948fea3bf
simulate added to make_time_log in test_time_log
2015-07-29 18:48:58 +05:30
Neil Trini Lasrado
d851bd8d85
Fixed test cases related to Time Logs
2015-07-29 18:48:58 +05:30
Rushabh Mehta
823e88d5bd
[minor] close button for task and item not found error fix
2015-07-20 10:56:39 +05:30
Anand Doshi
41d3e57702
Merge pull request #3650 from rmehta/time-log-fix-2
...
[fix] overlap fix in time log #3647
2015-07-14 11:45:49 +05:30
Rushabh Mehta
dacf127f1b
[fix] time log overlap condition, #SavedByATestCase
2015-07-14 11:06:28 +05:30
Rushabh Mehta
533434e878
[fix] overlap fix in time log #3647
2015-07-14 10:39:33 +05:30
Rushabh Mehta
97b3f750c9
[fixes] hours in time-log #3644 , project buttons on condition, removed Guest permission in notification_control
2015-07-14 10:14:48 +05:30
Rushabh Mehta
e9604d8484
[minor] [enhancement] added employee filter in timelog #3607
2015-07-13 12:47:45 +05:30
Neil Trini Lasrado
58406a920c
Validation added to prevent task being closed with open dependent tasks
2015-07-10 12:57:49 +05:30
Nabin Hait
fdd0db3459
Update project completion percentage and costing after syncing task
2015-07-02 14:09:49 +05:30
Neil Trini Lasrado
90c66b1998
test cases added
2015-07-01 12:51:11 +05:30
Neil Trini Lasrado
a25e8ea0bc
Fixed Issues in Project Task
2015-06-30 17:15:13 +05:30
Nabin Hait
93cdee4503
[fix] Escape values in queries
2015-06-27 12:51:00 +05:30
Neil Trini Lasrado
64cacfb077
Fixes in Activity Cost
2015-06-16 15:42:40 +05:30
Neil Trini Lasrado
ae4cc078ea
Activity Cost - Mandatory removed for Employee.
2015-06-16 15:30:08 +05:30
Nabin Hait
b9626659ea
Merge pull request #3465 from neilLasrado/po
...
Po
2015-06-15 10:04:36 +05:30
Anand Doshi
63e4d31aa6
[fix] Task should be mandatory in Time Log only when Project is mentioned but Production Order is not
2015-06-12 18:59:18 -04:00
Neil Trini Lasrado
3c1a4a0b9b
percent_complete made no-copy in Project
2015-06-12 18:34:08 +05:30
Nabin Hait
e4f689184f
Merge pull request #3459 from neilLasrado/po
...
Multiple Fixes.
2015-06-12 17:55:23 +05:30
Nabin Hait
89592c5180
Load tasks in project for printing purpose
2015-06-12 17:37:28 +05:30
Neil Trini Lasrado
1f048b2426
Fixes in Activity Cost
2015-06-11 18:36:52 +05:30
Nabin Hait
1966225450
[fix] load tasks in project via __setup__ instead of onload function, to return tasks via get_doc
2015-06-11 15:31:47 +05:30
Anand Doshi
ec60ebde6f
[fix] Close assignment (ToDo) when Task status is changed to Closed
2015-06-08 12:48:11 -04:00
Neil Trini Lasrado
39669f2717
operation made non mandatory in time log
2015-06-05 12:17:46 +05:30
Neil Trini Lasrado
58bf6c5950
Update task.py
2015-05-13 19:29:47 +05:30
Neil Trini Lasrado
b4a298ddd4
multiple dependant tasks added
2015-05-06 14:47:34 +05:30
Neil Trini Lasrado
b3b373d0ac
fixes in Test Cases
2015-05-06 14:47:33 +05:30
Neil Trini Lasrado
350943128a
fixes in Pull request
2015-05-06 14:47:33 +05:30
Neil Trini Lasrado
c8f0c25088
referenceError name changed to circularReferenceError
2015-05-06 14:47:33 +05:30
Neil Trini Lasrado
1fa8ed8a1f
Test Cases Added, fixes in task
2015-05-06 14:47:33 +05:30
Neil Trini Lasrado
3da42fcdf9
fixed import errors
2015-05-06 14:47:33 +05:30
Neil Trini Lasrado
fa381c7a6c
task-rescheduling - handled exception if date is None
2015-05-06 14:47:33 +05:30
Neil Trini Lasrado
46d859e694
re-schedule dependaable task logic added
2015-05-06 14:47:33 +05:30
Neil Trini Lasrado
93583faaf0
depends-on added to task, circular reference validation added
2015-05-06 14:47:33 +05:30
Rushabh Mehta
4f41bb35b9
Merge pull request #3192 from neilLasrado/purchase-costing
...
Purchase costing in Projects
2015-05-05 10:59:11 +05:30
Rushabh Mehta
e991c9e075
[fix] [typo] fixes #3193
2015-05-04 11:04:54 +05:30
Neil Trini Lasrado
42a554e5cb
fixes in Purchase Invoice
2015-04-30 13:06:02 +05:30
Neil Trini Lasrado
349461e9e6
Test Cases Added
2015-04-30 13:06:02 +05:30
Neil Trini Lasrado
9a56764bf2
Total Purchase Cost added to Projects
2015-04-30 13:06:02 +05:30
Rushabh Mehta
a30c76f430
[ux] [layouts] project page
2015-04-23 15:23:47 +05:30
Neil Trini Lasrado
8e4cf13d01
fixes time log hours calculation
2015-04-22 16:23:36 +05:30
Neil Trini Lasrado
6a066e07e5
Time Log - to_time trigger called on_load to calculate hours if Tl is created via Calender
2015-04-22 16:11:48 +05:30
Neil Trini Lasrado
051d0ab79a
function name validate cost changed to update cost in Time Log
2015-04-22 11:26:00 +05:30
Neil Trini Lasrado
5e317d2b72
fixes in Expense Claim and get_avtivity_cost function
2015-04-22 11:26:00 +05:30
Neil Trini Lasrado
832dfe7980
fixes in Time Log Batch
2015-04-22 11:26:00 +05:30
Neil Trini Lasrado
e1951306eb
fix in time log batch list
2015-04-22 11:26:00 +05:30
Neil Trini Lasrado
da8c6f6ae2
test case fix for Time Log
2015-04-22 11:26:00 +05:30
Neil Trini Lasrado
50a0fd6204
feild rename fixes in Project
2015-04-22 11:26:00 +05:30
Neil Trini Lasrado
4cffbe26dc
rate removed from time log batch
2015-04-22 11:25:59 +05:30
Neil Trini Lasrado
d4b33d3c14
Costing added in Time log Batch, Sales Order added to Project + more fixes
2015-04-22 11:25:59 +05:30
Neil Trini Lasrado
4e6e4726a4
filters added, ui change, update project moved to project.py
2015-04-22 11:25:59 +05:30
Neil Trini Lasrado
05f15bbb88
fixes in Test Cases
2015-04-22 11:25:59 +05:30
Neil Trini Lasrado
9789d06b3e
task and project- billing amount and actual amount added
2015-04-22 11:25:59 +05:30
Neil Trini Lasrado
650e679a5e
Fixes in Project
2015-04-22 11:25:59 +05:30
Neil Trini Lasrado
78b96ca769
Fixes in time_log
2015-04-22 11:25:59 +05:30
Neil Trini Lasrado
c33ad6b36a
fixes in Activity Cost
2015-04-22 11:25:58 +05:30
