Skip to content

Conversation

@jero-odoo
Copy link
Contributor

This PR combines the two "Invoice time spent on tickets" docs into one document, called "Track and Bill Time". It also updates the process for 16 including screenshots and terminology, and removes unnecessary steps.
I also reorganized the document structure with this update. The two previous documents were under a different sub-section "Timesheet and Invoice". That sub-section been removed, and the new document is now listed under "Advanced".  Redirects have been updated.

@robodoo
Copy link
Collaborator

robodoo commented Mar 31, 2023

@C3POdoo C3POdoo requested a review from a team March 31, 2023 13:27
@jero-odoo jero-odoo self-assigned this Mar 31, 2023
@jero-odoo jero-odoo requested a review from a team April 10, 2023 15:01
Copy link
Contributor

@ksc-odoo ksc-odoo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey @jero-odoo - just finished my Peer Review on this doc - Great Job! If you have any questions about anything, don't hesitate to reach out. Thanks!

@samueljlieber samueljlieber force-pushed the 16.0-helpdesk-track-and-bill-time-jero branch from 5ed4075 to 9430a54 Compare April 18, 2023 19:35
@samueljlieber
Copy link
Contributor

Fixed merge conflict in 9430a54

@odoo odoo deleted a comment from jero-odoo Apr 19, 2023
@jero-odoo jero-odoo force-pushed the 16.0-helpdesk-track-and-bill-time-jero branch from 9430a54 to 8e9151a Compare April 19, 2023 18:56
@jero-odoo
Copy link
Contributor Author

Thank you @ksc-odoo!
@samueljlieber can you do a technical review of this doc when you have a chance? Thank you!

@jero-odoo jero-odoo requested a review from samueljlieber April 20, 2023 19:20
Copy link
Contributor

@samueljlieber samueljlieber left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @jero-odoo 👋 I had only a few small changes from my technical review. I will push these changes up in a commit after this review. Please read through my suggestions and let me know if you approve and I will set this PR for final review.

Thank you 🙂

has even begun.

.. warning::
Since the :guilabel:`Track & Bill Time` features require integration with other applications,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe we should italicize Track & Bill Time here rather than a :guilabel:

Comment on lines 14 to 16
Installing a new application on a *One-App-Free* database triggers a 15-day trial. At the
end of the trial, if a paid subscription has not been added to the database, it will no longer
be active or accessible.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lines in this paragraph can be broken later

On the team's settings page, scroll to the :guilabel:`Track & Bill Time` section. Check the boxes
labeled :guilabel:`Timesheets` and :guilabel:`Time Billing`.

Checking the box for :guilabel:`Timesheets` causes a new field to appear, labeled *Project*.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we will apply a :guilabel: to Project here because it's appearance is part of the active instruction


Checking the box for :guilabel:`Timesheets` causes a new field to appear, labeled *Project*.

This project selected in this field is where all the timesheets for this team's tickets will be
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Grammar: This project... ➡️ The project...


When the :guilabel:`Time Billing` feature is enabled, a new product is created in the *Sales* app
called :guilabel:`Service on Timesheets`. This product can be found under :menuselection:`Sales -->
Products --> Products`. Search for `Service on Timesheets` in the :guilabel:`Search bar`. This is
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

let's lowercase :guilabel:search bar

Comment on lines 142 to 143
As new lines are added to *Timesheets* tab, the *Remaining Hours on SO* field is automatically
updated.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We will make these :guilabel: s since they are part of the active instruction

Comment on lines 150 to 153
If the number of hours on the :guilabel:`Timesheets` tab goes over the number of hours sold, the
:guilabel:`Remaining Hours of SO` will turn red.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These will be italicized because they are not part of the active instruction

If the number of hours on the :guilabel:`Timesheets` tab goes over the number of hours sold, the
:guilabel:`Remaining Hours of SO` will turn red.

As hours are added to the *Timesheets* tab, they are automatically updated in the *Delivered* field
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:guilabel:Timesheets tab & :guilabel:Delivered field


Fill out the :guilabel:`Quotation` with the :guilabel:`Customer` information.

On the *Order Lines* tab, click :guilabel:`Add a Product`. Select the post-paid services
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:guilabel:Order Lines tab

then be sent to the customer for payment.

.. seealso::
- :doc:`/applications/inventory_and_mrp/inventory/management/products/uom`
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No need to include a bullet on a single link in a ..seealso::

@samueljlieber samueljlieber force-pushed the 16.0-helpdesk-track-and-bill-time-jero branch from 8e9151a to ad36786 Compare April 20, 2023 20:44
@jero-odoo
Copy link
Contributor Author

thank you @samueljlieber , these all look good 👍

@samueljlieber
Copy link
Contributor

Hi @StraubCreative this PR is ready for your final review 🙂

Copy link
Contributor

@jcs-odoo jcs-odoo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

About the structure (and redirections, in this case):

I can create a linked PR in odoo/enterprise to update the doc links in the settings, but the two pages used to be targeted by different settings. Is it okay to merge these two? Maybe check with the PO. (see comment in the diff)

Comment on lines +35 to +41
# applications/services

applications/services/helpdesk/timesheet_and_invoice/reinvoice_from_project.rst applications/services/helpdesk/advanced/track_and_bill.rst
applications/services/helpdesk/timesheet_and_invoice/invoice_time.rst applications/services/helpdesk/advanced/track_and_bill.rst
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @jcs-odoo -They are two processes that involve many of the same setup and features but differ when it comes to whether or not the customer is billed before or after the services are completed.

I confirmed with the PO (AJU) that we could combine these two. She agrees that having only one document will make it easier to send to users and to link to in the settings

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Perfect :) Can you remind me, after this PR is merged, that I need to update the links in Odoo? Thanks!

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jcs-odoo Will do! Thank you!

Copy link
Contributor

@StraubCreative StraubCreative left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@samueljlieber take another look please

@StraubCreative StraubCreative added the repeat designation for PRs worth a second look label May 9, 2023
Copy link
Contributor

@samueljlieber samueljlieber left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @jero-odoo 👋 I have a handful of technical changes on this PR after taking another look. Please see my suggestions below and let me know if you have any questions.

Note: there are a couple other early 100th char line breaks in the doc that I did not highlight

Verified that the redirects are working as expected 👍


When the :guilabel:`Time Billing` feature is enabled, a new product is created in the *Sales* app
called :guilabel:`Service on Timesheets`. This product can be found under :menuselection:`Sales -->
Products --> Products`. Search for `Service on Timesheets` in the :guilabel:`search bar`. This is
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note: I feel that search bar warrants a guilabel since we are telling the user to input text into it

Copy link
Contributor

@StraubCreative StraubCreative May 31, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note: I feel that search bar warrants a guilabel since we are telling the user to input text into it

Agreed, in that case it would be...

:guilabel:`Search...` bar

...since that's the text as it appears on the UI.

@jero-odoo jero-odoo force-pushed the 16.0-helpdesk-track-and-bill-time-jero branch from ad36786 to b570eb2 Compare May 10, 2023 14:13
@C3POdoo C3POdoo requested a review from a team May 10, 2023 14:32
@jero-odoo
Copy link
Contributor Author

@samueljlieber Let me know if you have any questions, thanks!

@jero-odoo jero-odoo requested a review from samueljlieber May 10, 2023 14:36
Copy link
Contributor

@samueljlieber samueljlieber left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @jero-odoo 👋 great job with this PR - I left two very minor suggestions, please see them below and implement them as you see fit. Otherwise, I feel this PR is ready for a final review! Please tag @StraubCreative once you're ready 🙂

made, an invoice can be created, and the customer can be billed.

To do this, return to the :abbr:`SO (sales order)` by clicking on the :guilabel:`Sales Order` smart
button at the top of the :guilabel:`Helpdesk Ticket`.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Noting this as I could see the guilabel use either way here, differing to @StraubCreative's expertise 🙂

Suggested change
button at the top of the :guilabel:`Helpdesk Ticket`.
button at the top of the *Helpdesk* ticket.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I will refer to the "After Sales" doc, since there were a lot of references to smart buttons in that one. In that instance, we settled on the following format- 'A :guilabel:Return smart button will then be added to the top of the
ticket.'
So guilabel for the smart button, and then just 'ticket' for the actual ticket (no Helpdesk). @StraubCreative, let me know if you disagree. 👍

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I will refer to the "After Sales" doc, since there were a lot of references to smart buttons in that one. In that instance, we settled on the following format- 'A :guilabel:Return smart button will then be added to the top of the ticket.' So guilabel for the smart button, and then just 'ticket' for the actual ticket (no Helpdesk). @StraubCreative, let me know if you disagree. 👍

Agree with this.
It's the most straightforward option without forcing the need for unnecessary formatting

@jero-odoo jero-odoo force-pushed the 16.0-helpdesk-track-and-bill-time-jero branch from b570eb2 to 92beae4 Compare May 15, 2023 14:06
@jero-odoo
Copy link
Contributor Author

@StraubCreative This one is ready for you, thanks!

@jero-odoo jero-odoo requested a review from StraubCreative May 15, 2023 14:18
Copy link
Contributor

@StraubCreative StraubCreative left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @jero-odoo
Thorough as always 🤌
There's a couple things we'll want to fix before merge, everything else is for your consideration.
Thanks and tag me again when you're ready.

Comment on lines 123 to 124
a :guilabel:`Team`. This will reveal that team's :guilabel:`Pipeline`. Click :guilabel:`New` to
create a new ticket.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

team and pipeline do not get guis 😉

I'd also encourage using more frequent compound sentences, especially for simple instructions or "yea yea yea" content that they may have already read prior in the doc. This is so readers can just read it as one continuous statement, e.g., "do the thing in 1, 2, 3," or skip it if they want.

Suggested change
a :guilabel:`Team`. This will reveal that team's :guilabel:`Pipeline`. Click :guilabel:`New` to
create a new ticket.
a team, which will will reveal that team's pipeline. Click :guilabel:`New` to create a new ticket.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

While I agree that pipeline does need a guilabel, in this case, I do believe 'team' deserves a guilabel, because I am referring to the kanban card for a team on the main Helpdesk dashboard.
I understand it may seem inconsistent that sometimes team is labeled and sometimes it is not, but is usually the case of referring to a team in general or directing the user to select a team as part of an action.

@jero-odoo jero-odoo force-pushed the 16.0-helpdesk-track-and-bill-time-jero branch from 92beae4 to f78697a Compare May 26, 2023 13:28
@jero-odoo
Copy link
Contributor Author

@StraubCreative Ready for your review, let me know about the two guilabels. Thanks 👍

@jero-odoo jero-odoo requested a review from StraubCreative May 26, 2023 13:33
Copy link
Contributor

@StraubCreative StraubCreative left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Continuing convo on those guis @jero-odoo
See below 🙂


When the :guilabel:`Time Billing` feature is enabled, a new product is created in the *Sales* app
called :guilabel:`Service on Timesheets`. This product can be found under :menuselection:`Sales -->
Products --> Products`. Search for `Service on Timesheets` in the :guilabel:`search bar`. This is
Copy link
Contributor

@StraubCreative StraubCreative May 31, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note: I feel that search bar warrants a guilabel since we are telling the user to input text into it

Agreed, in that case it would be...

:guilabel:`Search...` bar

...since that's the text as it appears on the UI.

@StraubCreative StraubCreative force-pushed the 16.0-helpdesk-track-and-bill-time-jero branch from f78697a to e2244f8 Compare May 31, 2023 21:54
@StraubCreative StraubCreative force-pushed the 16.0-helpdesk-track-and-bill-time-jero branch from e2244f8 to c65632d Compare May 31, 2023 21:55
Copy link
Contributor

@StraubCreative StraubCreative left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jero-odoo
Copy link
Contributor Author

Hi @jcs-odoo the PR has been merged, can you update the links as discussed? Thank you!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

repeat designation for PRs worth a second look

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants