Save changes to time and cost tracking and reporting.

help/user-guide/Time and costs/README.md

@@ -15,18 +15,14 @@ Create budgets, log time and costs on specific work packages and  create time an
 
 ## Overview
 
-| Popular Topics | Description |
+| Popular Topics                        | Description                                 |
-| -------------- | :---------- |
+| ------------------------------------- | :------------------------------------------ |
-|                |             |
+| [Time tracking](/time-tracking)       | How to log time to work packages?           |
-|                |             |
+| [Cost tracking](/cost-tracking)       | How to track unit costs spent in a project? |
-|                |             |
+| [Time and cost reporting](/reporting) | How to create time and cost reports?        |
-|                |             |
-|                |             |
-|                |             |
-|                |             |
-|                |             |
-|                |             |
 
 ## Time tracking, budgets and cost report video tutorial
 
+Watch this short video to get a fist overview about time and cost reporting and budgets in OpenProject.
+
 <iframe width="560" height="315" src="https://www.youtube.com/embed/CU0pcDQvZuM" frameborder="0" allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>

help/user-guide/Time and costs/cost-tracking.md

@@ -1,19 +1,109 @@
 ---
-title: Time and cost tracking
+sidebar_navigation:
+  title: Cost tracking
+  priority: 798
 description: Time and cost tracking in OpenProject
 robots: index, follow
-keywords: time tracking, cost tracking
+keywords: cost tracking
 ---
 
-# Time and cost tracking
+# Cost tracking
 
-XX
+You can log unit costs on a work package within a project to keep track on certain units spent in a project, e.g. travel costs or machines.
 
-| Feature                                                      | Documentation for |
+<div class="alert alert-info" role="alert">
-| ------------------------------------------------------------ | ----------------- |
+**Note**: When using the cost tracking functionality, the **Cost reports** module needs to be activated in the [project menu](/project-admin-guide/activate-modules).
-| [Project concept and initiation](Project concept and initiation) |                   |
-|                                                              |                   |
-|                                                              |                   |
-|                                                              |                   |
-|                                                              |                   |
 
+
+| Feature                                                      | Documentation for                                   |
+| ------------------------------------------------------------ | --------------------------------------------------- |
+| [Logging costs to a work package](#logging-costs-to-a-work-package) | How to track costs on a work package?               |
+| [Edit logged costs](#edit-logged-costs)                      | How to edit spent costs logged to a work package?   |
+| [Delete logged costs](#delete-logged-costs)                  | How to delete spent costs logged to a work package? |
+| [Define hourly rate for labor costs](#define-hourly-rate-for-labor-costs) | How to set the hourly rate to track labor costs?    |
+
+## Logging costs to a work package
+
+To track unit costs to a work package select the **Log unit costs** option from the **More functions** dropdown menu.
+
+![Cost-tracking_log-costs](Cost-tracking_log-costs.png)
+
+A new form is opened, where you can log unit costs. You can edit the following information:
+
+1. **Work package ID**. By default, the work package ID of the work package where you selected *Log unit costs* option is shown. You can change this number, in which case the unit costs will be logged for the respective work package.
+2. The **date**, for which the unit costs are logged.
+3. You can select a **user** (project member) from the dropdown menu for whom you log the unit costs.
+4. The **cost type** field offers a range of pre-defined cost types which can be configured in the Administration. The  units and respective costs per unit category are defined for every cost type separately. Please note that you need certain privileges to be able to  create new cost types and define costs for specific units.
+5. You can enter the number of **units** to be logged.
+6. The **costs** for the entered units will be automatically calculated  after you have entered the number of units. You can manually change the  sum of the calculated costs, if for example a discount is offered or a special agreement was reached. To adapt the sum manually click on the **pen icon** to the left of the sum.
+7. In the **comment** field you can enter more details to describe the logged costs.
+8. Do not forget to **Save** your time log.
+9. ![Cost-tracking-log-costs-details](Cost-tracking-log-costs-details.png)
+
+The **spent unit costs** as well as the total amount of **overall costs** are displayed on the work packages details view.
+
+
+
+![Cost-tracking-overview](Cost-tracking-overview.png)
+
+
+
+## Edit logged costs
+
+To display and edit the logged costs to a work package, navigate to the work package details view. Here, the total amount of spent costs are displayed. Click on the sum of logged costs on a work package to display the details.
+
+![Edit-logged-costs](Edit-logged-costs.png)
+
+The detailed logs are displayed in a cost report. To edit a cost entry, click on the Edit icon with the little pen next to a cost entry.
+
+![Edit-logged-costs-details](Edit-logged-costs-details.png)
+
+It will open the details view of the cost entry and you will be able to make your changes just as for [Logging costs to a work package](#logging-costs-to-a-work-package).
+
+In some cases, you might want to change the costs manually so that it differs from the automatically calculated product from spent units and costs per unit.
+
+In this case, click on the Edit icon, the little pen, next to the cost entry. Now you can manually enter the costs.
+
+![Edit-costs-details](Edit-costs-details.png)
+
+Do not forget to save your changes.
+
+## Delete logged costs
+
+If you made a mistake and need to delete logged costs, click on the **delete icon** next to a cost entry in the cost report.
+
+![Delete-cost-entry](Delete-cost-entry.png)
+
+## Define hourly rate for labor costs
+
+You can define an hourly rate to **track labor costs per user**. Please navigate to the user profile, e.g. by clicking on a hyper link of the user name on a work package.
+
+ ![User-profile](User-profile.png)
+
+You will be directed to the user's profile page.
+
+Here, you can click the **Edit button** on the top right corner of the user profile page.
+
+ ![User-profile-edit](User-profile-edit.png)
+
+Alternatively, you can navigate to ->Administration ->Users & Permissions ->Users.
+
+Click on the **Rate history** tab.
+
+You will see a default hourly rate valid for all projects.
+
+If you want to set a different hourly rate for the user on different projects, you can overwrite the default rate with a different rate below in the respective projects.
+
+![Rate-history](Rate-history-1574778553695.png)
+
+To enter a new hourly rate, click on the **Update** icon next to the rate history. You can either set a **default hourly rate** or define a rate for a certain project.
+
+![Update-hourly-rate](Update-hourly-rate-1574778595938.png)
+
+1. Enter a date from which the rate is **Valid from**.
+2. Enter the (hourly) **Rate**. The currency can only be adapted in the system's Administration settings.
+3. You can delete an hourly rate.
+4. You can **add a rate** for a different time period.
+5. Save your changes.
+
+![Rate-history-change](Rate-history-change.png)

help/user-guide/Time and costs/reporting.md

@@ -1,19 +1,80 @@
 ---
-title: Reporting
+sidebar_navigation:
+  title: Time and cost reporting
+  priority: 797
 description: Time and cost reporting
 robots: index, follow
-keywords: reporting
+keywords: time and cost reporting
 ---
 
-# Time and costs
+# Time and cost reporting
 
-XX
+You can easily report spent time and costs in OpenProject and filter, group and save the reports according to your needs.
 
-| Feature                                                      | Documentation for |
+<div class="alert alert-info" role="alert">
-| ------------------------------------------------------------ | ----------------- |
+**Note**: If you want to use the reporting functionality,, the **Cost reports module** needs to be activated in the project settings.
-| [Project concept and initiation](Project concept and initiation) |                   |
-|                                                              |                   |
-|                                                              |                   |
-|                                                              |                   |
-|                                                              |                   |
 
+
+| Feature                                                      | Documentation for                                            |
+| ------------------------------------------------------------ | ------------------------------------------------------------ |
+| [Time and costs report](#time-and-costs-reports)             | How to open time and costs reports in OpenProject?           |
+| [Change time and costs reports](#change-time-and-costs-reports) | How to change the view of the reports, e.g. to filter, group by and select units to be displayed? |
+| [Filter cost reports](#filter-cost-reports)                  | How to filter time and cost reports?                         |
+| [Group by criteria for cost reports](#group-by-criteria-for-cost-reports) | How to group time and cost reports?                          |
+| [Select units to display](#select-units-to-display)          | How to choose the unit to be displayed in a report?          |
+
+## Time and costs reports
+
+To open the time and costs reports in OpenProject, navigate to the **Cost reports** module in the project navigation.
+
+![Time-costs-reports](Time-costs-reports.png)
+
+## Change time and costs reports
+
+You can change the view of a cost reports and adapt it to your needs.
+
+### Filter cost reports
+
+You can select and apply various filters, such as work package, author, start date or target version.
+
+Multiple projects can be selected with the **Projects** filter. Depending on your rights in the project, multiple users can also be selected. This way you can filter the time and cost entries exactly to your need, depending on the time, work or user you want to see.
+
+The results will the be displayed in the time and cost report below.
+
+![Time-costs-filter](Time-costs-filter.png)
+
+### Group by criteria for cost reports
+
+The time and cost reports can be grouped by selected criteria, such as dates, work packages, assignee, or any other field, incl. custom fields.
+
+To add grouping criteria to the columns or rows of the report, select the drop-down field on the right to **add grouping field**.
+
+![Time-cots-group-by](Time-cots-group-by.png)
+
+The grouping criteria will then be added to the Column or Row of the report. 
+
+Click the blue **Apply button** in order to display your changes.
+
+![Time-costs-reports-columns-rows](Time-costs-reports-columns-rows.png)
+
+The report will then be displayed according to the selected criteria in the columns and rows.
+
+You can make changes to the order of the grouping criteria in the columns or rows with drag and drop.
+
+### Select units to display
+
+In the time and cost reports you can select the **units** which you want to display.
+
+You can either select **Labor** which will display the logged time to the work packages according the filter and group by criteria above.
+
+![Time-costs-units](Time-costs-units-1574773348146.png)
+
+The **Cash value** will display the costs logged according to the filter and grouping criteria above. This includes labor costs (calculated based on the logged time and the [hourly rate](#/cost-tracking/#hourly-rate)) as well as the unit costs.
+
+![Time-costs-cash-value](Time-costs-cash-value.png)
+
+## Report unit costs
+
+If you just want to report on spent **unit costs**, choose the respective unit costs in the cost report under Units. Only the logged unit costs will then be displayed in the report according to your filter and grouping criteria.
+
+![Time-costs-unit-costs](Time-costs-unit-costs.png)

help/user-guide/Time and costs/time-tracking.md

@@ -1,6 +1,4 @@
 ---
-
-
 sidebar_navigation:
   title: Time tracking
   priority: 799
@@ -22,9 +20,8 @@ Users can book their time or units spent on an activity within a project directl
 | ------------------------------------------------------------ | ------------------------------------------------------- |
 | [Logging time](#logging-time-in-the-work-package-view)       | How to log time to work packages?                       |
 | [Logging time via commit message](#logging-time-via-a-commit message) | How to log time via a commit message to a work package? |
-| Edit logged time                                             | How to edit logged time on a work package?              |
+| [Edit logged time](#edit-logged-time)                        | How to edit logged time on a work package?              |
-|                                                              |                                                         |
+| [Delete time entries](#delte-time-entires)                   | how to delete time entries logged to a work package?    |
-|                                                              |                                                         |
 
 ## Logging time in the work package view
 
@@ -77,3 +74,7 @@ In the list of time entries, click on the **Delete** icon next to a time entry t
 
 ![Time-logging-delete](Time-logging-delete.png)
 
+## Track labor costs
+
+In order to track labor costs, you need to [define an hourly rate](/cost-tracking/#hourly-rate) in your user profile first.
+