diff --git a/content/applications/services/helpdesk/timesheet_and_invoice/reinvoice_from_project.rst b/content/applications/services/helpdesk/timesheet_and_invoice/reinvoice_from_project.rst index e4d1a2db7..8ca7cdec6 100644 --- a/content/applications/services/helpdesk/timesheet_and_invoice/reinvoice_from_project.rst +++ b/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 -clients are charged, and what they're specifically billed for. +The :guilabel:`Timesheets` integration provides more control and transparency over how clients are +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 --> -Configuration --> Helpdesk Teams`, select a Helpdesk team, and then, click :guilabel:`Edit`. Next, -enable the options :guilabel:`Timesheet on Ticket` and :guilabel:`Time Reinvoicing`. Then, click -:guilabel:`Save` to apply these changes to the Helpdesk team settings. +To turn on the :guilabel:`Timesheets` feature, go to :menuselection:`Helpdesk --> Configuration +--> Helpdesk Teams`, select a Helpdesk team, and then, click :guilabel:`Edit`. Next, enable the +options :guilabel:`Timesheets` and :guilabel:`Time Billing`. Then, click :guilabel:`Save` to apply +these changes to the Helpdesk team settings. -Once the :guilabel:`Timesheet on Ticket` feature is enabled, a :guilabel:`Project` drop-down option -will appear below :guilabel:`Timesheet on Ticket`. The :guilabel:`Project` drop-down option will -automatically be set to a Project that Odoo created for the Helpdesk team. The tickets' timesheets -will be stored in the selected Project. +Once the :guilabel:`Timesheets` feature is enabled, a :guilabel:`Project` drop-down option will +appear below :guilabel:`Timesheets`. The :guilabel:`Project` drop-down option will automatically +be set to a project that Odoo created for the Helpdesk team. The tickets' timesheets +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 -the :guilabel:`Sales` tab, set the :guilabel:`Service Invoicing Policy` to :guilabel:`Timesheets on -tasks`. Finally, click :guilabel:`Save` to create the new product and add it to the quotation. +:guilabel:`Service` and the :guilabel:`Sales Price` to the Helpdesk agent's service rate. Then, set +the :guilabel:`Invoicing Policy` to :guilabel:`Based on Timesheets`. Finally, click +: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 -clicking :guilabel:`Tickets` on the team's card (or by going to the Projects dashboard and clicking -:guilabel:`Tickets` on the project card). Then, click :guilabel:`Edit` and use the -:guilabel:`Timesheets` tab to record the time spent on the ticket. +To record a timesheet, jump back to the Helpdesk ticket by going to the :guilabel:`Helpdesk` +dashboard, clicking :guilabel:`Tickets` on the team's card, and locating the correct ticket. Then, +click :guilabel:`Edit` and use the :guilabel:`Timesheets` tab to record the time spent on the +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 -form. To link the :abbr:`SO (Sales Order)` to the ticket, start on the ticket form and click -:guilabel:`Edit`. Next, select the :abbr:`SO (Sales Order)` that was created earlier from the -drop-down menu. Odoo will automatically filter the sales orders to only show sales orders that are -connected to the ticket's customer. Lastly, click :guilabel:`Save` to connect the ticket and the -:abbr:`SO (Sales Order)`. +To link the :guilabel:`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:`Sales Order Item` drop-down menu. Odoo will automatically filter the options to only +show sales orders that are connected to the ticket's customer. Lastly, click :guilabel:`Save` to +connect the ticket and the :guilabel:`Sales Order Item`. .. 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 -(Sales Order)`. The :guilabel:`Delivered` column should match the number of hours recorded on the -ticket's timesheet. After checking and filling out the relevant information, click -:guilabel:`Create Invoice` to bill the client for the time spent on the ticket. Odoo will -automatically generate an invoice to send to the client and the Helpdesk ticket can officially be -closed. +clicking the :guilabel:`Sales Order` smart button on the ticket form to navigate to the sales +order. The :guilabel:`Delivered` column should match the number of hours recorded on the ticket's +timesheet. After checking and filling out the relevant information, click :guilabel:`Create +Invoice` to bill the client for the time spent on the ticket. Odoo will automatically generate an +invoice to send to the client and the Helpdesk ticket can officially be closed. .. seealso:: - :doc:`invoice_time` diff --git a/content/applications/services/helpdesk/timesheet_and_invoice/reinvoice_from_project/create-sales-order.png b/content/applications/services/helpdesk/timesheet_and_invoice/reinvoice_from_project/create-sales-order.png index 43beae882..b95a69641 100644 Binary files a/content/applications/services/helpdesk/timesheet_and_invoice/reinvoice_from_project/create-sales-order.png and b/content/applications/services/helpdesk/timesheet_and_invoice/reinvoice_from_project/create-sales-order.png differ diff --git a/content/applications/services/helpdesk/timesheet_and_invoice/reinvoice_from_project/link-soi-to-ticket.png b/content/applications/services/helpdesk/timesheet_and_invoice/reinvoice_from_project/link-soi-to-ticket.png index 85eb6bc66..234f3a4f2 100644 Binary files a/content/applications/services/helpdesk/timesheet_and_invoice/reinvoice_from_project/link-soi-to-ticket.png and b/content/applications/services/helpdesk/timesheet_and_invoice/reinvoice_from_project/link-soi-to-ticket.png differ diff --git a/content/applications/services/helpdesk/timesheet_and_invoice/reinvoice_from_project/record-timesheet-ticket.png b/content/applications/services/helpdesk/timesheet_and_invoice/reinvoice_from_project/record-timesheet-ticket.png index 30231a65f..143c38eaa 100644 Binary files a/content/applications/services/helpdesk/timesheet_and_invoice/reinvoice_from_project/record-timesheet-ticket.png and b/content/applications/services/helpdesk/timesheet_and_invoice/reinvoice_from_project/record-timesheet-ticket.png differ