From 7f89c1aec0260fd4ce0be1c8f9634d57e9115d57 Mon Sep 17 00:00:00 2001 From: "Christopher G. Purbaugh" Date: Mon, 20 Jun 2016 14:28:44 -0400 Subject: [PATCH 1/2] Update tasks.md Just some small grammatical corrections --- erpnext/docs/user/manual/en/projects/tasks.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/erpnext/docs/user/manual/en/projects/tasks.md b/erpnext/docs/user/manual/en/projects/tasks.md index dd9d77aca9..5e76f6df6b 100644 --- a/erpnext/docs/user/manual/en/projects/tasks.md +++ b/erpnext/docs/user/manual/en/projects/tasks.md @@ -5,7 +5,7 @@ In ERPNext, you can also create a Task independently. ### Status of the Task -A Task can have either of the following status - Open, Working, Pending Review, Closed, Cancelled. +A Task can have one of the following status' - Open, Working, Pending Review, Closed, or Cancelled. Task - Status @@ -27,7 +27,7 @@ You can specify a list of dependent task under the 'Depends On' section. ERPNext uses [Time Log]({{docs_base_url}}/user/manual/en/projects/time-log.html) to track the progress of a Task. You can create multiple Time Logs against each task. -The Actual Start and End Time along with the costing shall then be updated based on the Time Log. +The Actual Start and End Time along with the costing is updated based on the Time Log. * To view Time Log made against a Task click on 'Time Logs' @@ -35,7 +35,7 @@ The Actual Start and End Time along with the costing shall then be updated based Task - Time Log List -* You can also create a Time Log directlly and link it to the Task. +* You can also create a Time Log directly and link it to the Task. Task - Link Time Log @@ -48,7 +48,7 @@ The system shall update the total amount from expense claims in the costing sect Task - View Expense Claim -* You can also create a Expense Claims directlly and link it to the Task. +* You can also create a Expense Claims directly and link it to the Task. Task - Link Expense Claim From 22e0489ac70632e8335dd10df01c0e298e5ef263 Mon Sep 17 00:00:00 2001 From: "Christopher G. Purbaugh" Date: Mon, 20 Jun 2016 14:36:28 -0400 Subject: [PATCH 2/2] Update tasks.md --- erpnext/docs/user/manual/en/projects/tasks.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/erpnext/docs/user/manual/en/projects/tasks.md b/erpnext/docs/user/manual/en/projects/tasks.md index 5e76f6df6b..ef597485ab 100644 --- a/erpnext/docs/user/manual/en/projects/tasks.md +++ b/erpnext/docs/user/manual/en/projects/tasks.md @@ -5,23 +5,23 @@ In ERPNext, you can also create a Task independently. ### Status of the Task -A Task can have one of the following status' - Open, Working, Pending Review, Closed, or Cancelled. +A Task can have one of the following statuses - Open, Working, Pending Review, Closed, or Cancelled. Task - Status -* By default each new Task created shall have the status set to 'Open'. +* By default each new Task created has the status set to 'Open'. -* If a Time Log is made against a task, its status shall be set to 'Working'. +* If a Time Log is made against a task, its status will be set to 'Working'. ### Dependent Task -You can specify a list of dependent task under the 'Depends On' section. +You can specify a list of dependent tasks under the 'Depends On' section. Depends On -* You cannot close the parent Task until all 'Dependant Task' are closed. +* You cannot close the parent task until all dependent tasks are closed. -* If the Dependent Task are delayed and overlap with the expected Start Date of the Parent task, the system will reschedule the parent task. +* If the dependent tasks are delayed and overlap with the expected Start Date of the Parent task, the system will reschedule the parent task. ### Managing Time