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 386965534..e4d1a2db7 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 @@ -5,44 +5,44 @@ 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. -In Odoo, Project managers can connect Helpdesk tickets to Project tasks. As the Helpdesk agent -works on the ticket, they can use the ticket itself or the Project task to record timesheets. - -Thanks to the :guilabel:`Timesheet on Ticket` integration, timesheets will always be consistent and -up-to-date on both records. Once a ticket is solved, the client can be billed for the time spent on -the ticket. Odoo will pull from either the task or the ticket timesheet to accurately bill the -client. +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 +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`. +enable the options :guilabel:`Timesheet on Ticket` and :guilabel:`Time Reinvoicing`. Then, click +:guilabel:`Save` to apply these changes to the Helpdesk team settings. -In the :guilabel:`Timesheet on Ticket` drop-down option, choose the Project to which tickets (and -timesheets) will be linked by default. Then, open the Project's external link to edit its settings -and enable the :guilabel:`Billable` option. Finally, save both the Project and the Helpdesk team's -settings to apply these features. - -.. image:: reinvoice_from_project/project-billable.png - :align: center - :alt: Billable feature in Project 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. Create a sales order ==================== After a ticket comes into the pipeline, go to :menuselection:`Sales --> Create`. Then, add the -customer from the ticket to the new quotation. In the :guilabel:`Order Lines` tab, add the -:guilabel:`Service on Timesheet` product. Finally, click :guilabel:`Confirm` to turn the quotation -into a sales order. +customer from the ticket to the :guilabel:`Customer` field in the new quotation. In the +:guilabel:`Order Lines` tab, create or select a product to charge the customer for the time spent +on their Helpdesk ticket. -.. tip:: - Remember the sales order name for later to link the Helpdesk ticket to the correct sales order. +If creating a new product from the sales order form, first give the product a name by typing it in +the :guilabel:`Product` column. Then, click :guilabel:`Create and edit`. -.. image:: reinvoice_from_project/service-on-timesheet.png +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. + +Once the product is added, click :guilabel:`Confirm` to turn the quotation into a sales order. + +.. image:: reinvoice_from_project/create-sales-order.png :align: center - :alt: Add Service on Timesheet product to the SO. + :alt: Create a sales order and add a product. Record a timesheet ================== @@ -56,27 +56,46 @@ clicking :guilabel:`Tickets` on the team's card (or by going to the Projects das :align: center :alt: Record time spent on a ticket. +.. tip:: + The ticket's timesheets can be recorded before or after the sales order is made, the order + doesn't matter. + Link the Helpdesk ticket to the SO ================================== -To link the :abbr:`SO (Sales Order)` to the ticket, start on the ticket form, click -:guilabel:`Edit`, and then, click the :guilabel:`Sales Order Item` field. Next, select the -:abbr:`SO (Sales Order)` that was created earlier from the drop-down menu. Lastly, click -:guilabel:`Save` to connect the ticket and the :abbr:`SO (Sales Order)`. +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)`. -.. image:: reinvoice_from_project/link-so-ticket.png +.. image:: reinvoice_from_project/link-soi-to-ticket.png :align: center :alt: Link the SO item to the ticket. +Modify billing rates +==================== + +If a timesheet entry is recorded, but the agent does not want to bill the client for that time, go +to the :guilabel:`Timesheets` tab and toggle on the visibility of the :guilabel:`Sales Order Item` +column. When filling out the information for the timesheet entry, make sure to leave the +non-billable timesheet entry's :guilabel:`Sales Order Item` field blank. + +If the agent wants to charge a different rate for a timesheet entry, first, add a new product to +the connected :abbr:`SO (Sales Order)` priced at the new rate. Then, select the new product in the +timesheet entry's :guilabel:`Sales Order Item` field. + 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. +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 new file mode 100644 index 000000000..43beae882 Binary files /dev/null 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-so-ticket.png b/content/applications/services/helpdesk/timesheet_and_invoice/reinvoice_from_project/link-so-ticket.png deleted file mode 100644 index 8c9a9fbcd..000000000 Binary files a/content/applications/services/helpdesk/timesheet_and_invoice/reinvoice_from_project/link-so-ticket.png and /dev/null 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 new file mode 100644 index 000000000..85eb6bc66 Binary files /dev/null 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/project-billable.png b/content/applications/services/helpdesk/timesheet_and_invoice/reinvoice_from_project/project-billable.png deleted file mode 100644 index ab5e9f87d..000000000 Binary files a/content/applications/services/helpdesk/timesheet_and_invoice/reinvoice_from_project/project-billable.png and /dev/null differ diff --git a/content/applications/services/helpdesk/timesheet_and_invoice/reinvoice_from_project/service-on-timesheet.png b/content/applications/services/helpdesk/timesheet_and_invoice/reinvoice_from_project/service-on-timesheet.png deleted file mode 100644 index 2dfff3e4f..000000000 Binary files a/content/applications/services/helpdesk/timesheet_and_invoice/reinvoice_from_project/service-on-timesheet.png and /dev/null differ