Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
26,151 Commits 3 Branches 0 Tags 1 GiB
aa028d7856
Commit Graph

716 Commits

Author SHA1 Message Date
Suraj Shetty
079684f7da feat: Task type (#17311) 
* feat: Add task type doctype
 2019-04-20 23:37:49 +05:30
Rohit Waghchaure
94f43ca2e2 fix: task name was not able to search by name in global search 2019-04-18 22:39:42 +05:30
Nabin Hait
89206e74d0 fixed merge conflict 2019-04-11 12:31:14 +05:30
Anurag Mishra
22867f7fa5 fix: added currency 2019-04-09 15:06:49 +05:30
Anurag Mishra
3e8b8a4359 fix: filters and some conditions 2019-04-09 14:34:56 +05:30
Anurag Mishra
17fbafa390 fix: filters,added total,only submitted doc,considered fraction 2019-04-09 11:31:11 +05:30
Anurag Mishra
0dc62e8747 fix: Removed raw query and used frappe.get_all 2019-04-05 14:36:43 +05:30
Anurag Mishra
f71c147ea8 Added mandatory feilds to the report 2019-04-05 14:36:43 +05:30
Anurag Mishra
5c17e7760b fix: readability 2019-04-05 14:36:43 +05:30
Anurag Mishra
b57c024ff7 feat: Project Billing Summary for timesheet 2019-04-05 14:36:43 +05:30
Anurag Mishra
3d27aabdeb Commonify code 2019-04-05 14:36:42 +05:30
Anurag Mishra
94514ffee9 feat: timesheet Employee Summary Report 2019-04-05 14:36:42 +05:30
rohitwaghchaure
13752774ab
Merge pull request #17000 from scmmishra/hotfix-task-status 
fix: Task overdue status propagates to project
 2019-03-29 18:44:36 +05:30
rohitwaghchaure
706cf7d3d2
Merge pull request #17001 from scmmishra/develop-task-status 
fix: task overdue status propagates to project
 2019-03-29 18:44:17 +05:30
Saurabh
84a18f5b18 Merge branch 'master' into develop 2019-03-28 13:54:34 +05:30
scmmishra
1b63c87929 feat: refactored update status 2019-03-27 15:04:55 +05:30
scmmishra
2405e14dde Merge branch 'hotfix-task-status' of github.com:scmmishra/erpnext into hotfix-task-status 2019-03-27 15:02:35 +05:30
scmmishra
36824cf7fb feat: refactored update status 2019-03-27 15:01:40 +05:30
Raffael Meyer
fdbb516a1b fix(projects): Auto-set employee and company in Timesheet (#16743) 
* fix(projects): auto-set employee and company

* only set employee and company if document is unsaved

* use frm.set_value()
 2019-03-26 12:47:36 +05:30
Shivam Mishra
ec56122876
fix: minor fix in test 2019-03-25 11:36:43 +05:30
scmmishra
26e5c753db fix: Typo in update_status 2019-03-25 11:35:28 +05:30
scmmishra
1af3c41da3 fix: Typo in update_status 2019-03-25 11:34:33 +05:30
scmmishra
f7f32634c8 feat: Added check for no end date and refactored query 2019-03-24 20:43:15 +05:30
scmmishra
a2e801e840 fix: Added check for no end date 2019-03-24 20:38:47 +05:30
scmmishra
5869ba1470 feat: Added filter to query 2019-03-24 20:27:32 +05:30
scmmishra
e7cf06b3c6 fix: task overdue status propagates to project 2019-03-24 18:23:41 +05:30
scmmishra
6ab6d35f92 fix: Task Overdue status propagates to project 
- Used ORM instead of a SQL for set_task_as_overdue
- update_status function compares the time and marks the appropriate task as overdue
- The on_update hook makes the changes in project as well
 2019-03-24 18:17:13 +05:30
Frappe Bot
b07a5d449d Merge branch 'master' into develop 2019-03-23 07:25:03 +00:00
Rushabh Mehta
e5d79f3621
Merge pull request #16673 from Alchez/feat-task-from-issue 
feat(issue): Create and view Tasks from Issues
 2019-03-15 08:55:20 +05:30
Anurag Mishra
641e412853 fix: Removed raw query and used frappe.get_all 2019-03-12 13:12:31 +05:30
Rohan Bansal
f4bce6a66e fix(issue): Replace Make buttons on Issue and Task with a dashboard 2019-03-12 12:48:13 +05:30
Rohan Bansal
2ba21fb66c fix(issue): Add issue name in Task and fix description in Issue 2019-03-12 12:48:13 +05:30
Anurag Mishra
9a1adc7c49 Added mandatory feilds to the report 2019-03-12 11:00:02 +05:30
Anurag Mishra
34e1f92a7e fix: readability 2019-03-11 18:17:22 +05:30
Anurag Mishra
1218255178 feat: Project Billing Summary for timesheet 2019-03-11 17:43:44 +05:30
Anurag Mishra
59f4556d95 Commonify code 2019-03-11 11:58:34 +05:30
Anurag Mishra
e86ac3c8d4 feat: timesheet Employee Summary Report 2019-03-11 11:58:28 +05:30
Rushabh Mehta
703a597478 fix(patch): update customization options if completed is not present 2019-03-07 13:03:40 +05:30
Rushabh Mehta
e9db0d2c61 fix(minor): update task list label from Closed to Completed 2019-03-07 12:50:02 +05:30
Raffael Meyer
33d0a9f684 fix(projects): change fieldtype of billing amounts to Currency 2019-03-05 21:57:11 +01:00
Rushabh Mehta
57128e413c fix: task.js 2019-02-28 12:43:58 +05:30
Rushabh Mehta
45c252a240 fix(test): test_task.py 2019-02-26 16:18:46 +05:30
Rushabh Mehta
b94c8b1c77 fix(tests): add test for bulk complete / cancellation of project 2019-02-26 14:30:38 +05:30
Rushabh Mehta
02a9ec33ed BREAKING: Task status "Closed" renamed to Task status "Completed" and ability to close, cancel projects in bulk 2019-02-26 14:30:38 +05:30
Rushabh Mehta
2d2d176e5c fix: linting 2019-02-26 14:30:38 +05:30
Rushabh Mehta
e9984672ce feat: Project Template 2019-02-26 14:30:38 +05:30
Sagar Vora
cc6e51c62d Merge branch 'master' into develop 2019-02-19 18:09:49 +05:30
deepeshgarg007
de0f59b818 fix: Removed precision from multiple doctypes 2019-02-19 08:40:16 +05:30
Frappe Bot
74fd5daeb2 Merge branch 'master' into develop 2019-02-15 10:22:33 +00:00
Deepesh Garg
4902f7b2a0 fix: Show tasks in timesheet with status as Closed (#16660) 2019-02-14 17:32:52 +05:30