[IMP] helpdesk: update field names and screenshots

In Odoo v15, the field names for "Timesheet on Ticket" and "Time
Reinvoicing" changed to "Timesheets" and "Time Billing", respectively.
The "Tickets" button on the project card is also no longer available in
Odoo v15. Updated the RST file to reflect these changes, and also
updated screenshots to match.

Fixes PR #2094
Closes Odoo Task 2870115

closes odoo/documentation#2486

Signed-off-by: Victor Feyens (vfe) <vfe@odoo.com>

content/applications/services/helpdesk/timesheet_and_invoice/reinvoice_from_project.rst

@@ -2,8 +2,8 @@
 Invoice Time Spent on Tickets (Postpaid Support Services)
 =========================================================
 
-The :guilabel:`Timesheet on Ticket` integration provides more control and transparency over how
+The :guilabel:`Timesheets` integration provides more control and transparency over how clients are
-clients are charged, and what they're specifically billed for.
+charged, and what they're specifically billed for.
 
 In Odoo, the Helpdesk agent can use the ticket to record timesheets. Once a ticket is solved, the
 client can be billed for the time spent on the ticket. Odoo will pull from the ticket's timesheet
@@ -12,15 +12,15 @@ to accurately bill the client.
 Configuration
 =============
 
-To turn on the :guilabel:`Timesheet on Ticket` feature, go to :menuselection:`Helpdesk -->
+To turn on the :guilabel:`Timesheets` feature, go to :menuselection:`Helpdesk --> Configuration
-Configuration --> Helpdesk Teams`, select a Helpdesk team, and then, click :guilabel:`Edit`. Next,
+--> Helpdesk Teams`, select a Helpdesk team, and then, click :guilabel:`Edit`. Next, enable the
-enable the options :guilabel:`Timesheet on Ticket` and :guilabel:`Time Reinvoicing`. Then, click
+options :guilabel:`Timesheets` and :guilabel:`Time Billing`. Then, click :guilabel:`Save` to apply
-:guilabel:`Save` to apply these changes to the Helpdesk team settings.
+these changes to the Helpdesk team settings.
 
-Once the :guilabel:`Timesheet on Ticket` feature is enabled, a :guilabel:`Project` drop-down option
+Once the :guilabel:`Timesheets` feature is enabled, a :guilabel:`Project` drop-down option will
-will appear below :guilabel:`Timesheet on Ticket`. The :guilabel:`Project` drop-down option will
+appear below :guilabel:`Timesheets`. The :guilabel:`Project` drop-down option will automatically
-automatically be set to a Project that Odoo created for the Helpdesk team. The tickets' timesheets
+be set to a project that Odoo created for the Helpdesk team. The tickets' timesheets
-will be stored in the selected Project.
+will be stored in the selected project.
 
 Create a sales order
 ====================
@@ -34,9 +34,9 @@ If creating a new product from the sales order form, first give the product a na
 the :guilabel:`Product` column. Then, click :guilabel:`Create and edit`.
 
 First, in the :guilabel:`General Information` tab, set the :guilabel:`Product Type` to
-:guilabel:`Service` and the :guilabel:`Sales Price` to the Helpdesk agent's service rate. Then, in
+:guilabel:`Service` and the :guilabel:`Sales Price` to the Helpdesk agent's service rate. Then, set
-the :guilabel:`Sales` tab, set the :guilabel:`Service Invoicing Policy` to :guilabel:`Timesheets on
+the :guilabel:`Invoicing Policy` to :guilabel:`Based on Timesheets`. Finally, click
-tasks`. Finally, click :guilabel:`Save` to create the new product and add it to the quotation.
+:guilabel:`Save` to create the new product and add it to the quotation.
 
 Once the product is added, click :guilabel:`Confirm` to turn the quotation into a sales order.
 
@@ -47,10 +47,10 @@ Once the product is added, click :guilabel:`Confirm` to turn the quotation into
 Record a timesheet
 ==================
 
-To record a timesheet, jump back to the Helpdesk ticket by going to the Helpdesk dashboard and
+To record a timesheet, jump back to the Helpdesk ticket by going to the :guilabel:`Helpdesk`
-clicking :guilabel:`Tickets` on the team's card (or by going to the Projects dashboard and clicking
+dashboard, clicking :guilabel:`Tickets` on the team's card, and locating the correct ticket. Then,
-:guilabel:`Tickets` on the project card). Then, click :guilabel:`Edit` and use the
+click :guilabel:`Edit` and use the :guilabel:`Timesheets` tab to record the time spent on the
-:guilabel:`Timesheets` tab to record the time spent on the ticket.
+ticket.
 
 .. image:: reinvoice_from_project/record-timesheet-ticket.png
    :align: center
@@ -63,17 +63,20 @@ clicking :guilabel:`Tickets` on the team's card (or by going to the Projects das
 Link the Helpdesk ticket to the SO
 ==================================
 
-Once a timesheet is recorded, the :guilabel:`Sales Order Item` field will appear on the ticket
+To link the :guilabel:`Sales Order` to the ticket, start on the ticket form and click
-form. To link the :abbr:`SO (Sales Order)` to the ticket, start on the ticket form and click
+:guilabel:`Edit`. Next, select the :guilabel:`Sales Order` that was created earlier from the
-:guilabel:`Edit`. Next, select the :abbr:`SO (Sales Order)` that was created earlier from the
+:guilabel:`Sales Order Item` drop-down menu. Odoo will automatically filter the options to only
-drop-down menu. Odoo will automatically filter the sales orders to only show sales orders that are
+show sales orders that are connected to the ticket's customer. Lastly, click :guilabel:`Save` to
-connected to the ticket's customer. Lastly, click :guilabel:`Save` to connect the ticket and the
+connect the ticket and the :guilabel:`Sales Order Item`.
-:abbr:`SO (Sales Order)`.
 
 .. image:: reinvoice_from_project/link-soi-to-ticket.png
    :align: center
    :alt: Link the SO item to the ticket.
 
+.. tip::
+   The :guilabel:`Sales Order Item` can be connected to the ticket before or after any timesheets
+   are recorded, the order doesn't matter.
+
 Modify billing rates
 ====================
 
@@ -90,12 +93,11 @@ Create the invoice
 ==================
 
 When the Helpdesk ticket is completed and the client is ready to be billed for time, begin by
-clicking the :guilabel:`Sales Order` smart button on the ticket form to navigate to the :abbr:`SO
+clicking the :guilabel:`Sales Order` smart button on the ticket form to navigate to the sales
-(Sales Order)`. The :guilabel:`Delivered` column should match the number of hours recorded on the
+order. The :guilabel:`Delivered` column should match the number of hours recorded on the ticket's
-ticket's timesheet. After checking and filling out the relevant information, click
+timesheet. After checking and filling out the relevant information, click :guilabel:`Create
-:guilabel:`Create Invoice` to bill the client for the time spent on the ticket. Odoo will
+Invoice` to bill the client for the time spent on the ticket. Odoo will automatically generate an
-automatically generate an invoice to send to the client and the Helpdesk ticket can officially be
+invoice to send to the client and the Helpdesk ticket can officially be closed.
-closed.
 
 .. seealso::
    - :doc:`invoice_time`