diff --git a/content/applications/finance/expenses/approve_expenses.rst b/content/applications/finance/expenses/approve_expenses.rst index aed981ab4b..b46e293d67 100644 --- a/content/applications/finance/expenses/approve_expenses.rst +++ b/content/applications/finance/expenses/approve_expenses.rst @@ -2,10 +2,11 @@ Approve expenses ================ -In Odoo, not just anyone can approve expense reports, only users with the necessary rights (or -permissions) can. This means that a user **must** have at least *Team Approver* rights for the -*Expenses* app. Employees with the necessary rights can review expense reports, approve or reject -them, and provide feedback thanks to the integrated communication tool. +In Odoo, most users cannot approve expense reports; only users with the necessary access rights or +permissions can. This means that a user **must** have at least *Team Approver* rights for the +**Expenses** app. Employees with the necessary rights can review expense reports, approve or refuse +them, and provide feedback with an integrated :ref:`Refuse Expense ` +communication tool. Please refer to the :doc:`access rights documentation ` to learn more about managing users and their access rights. @@ -13,16 +14,16 @@ about managing users and their access rights. View expense reports ==================== -Users who are able to approve expense reports, typically managers, can easily view all expense -reports they have access rights to. Go to :menuselection:`Expenses app --> Expense Reports`, to view -the :guilabel:`All Reports` dashboard. +Users who are able to approve expense reports (typically managers) have an :guilabel:`Expense +Reports` main navigation button at the top of the **Expenses** app. This allows managers to view all +expense reports they have access rights for. Navigate to :menuselection:`Expenses app --> Expense +Reports`, to view the :guilabel:`All Reports` dashboard. A list of all expense reports with a status of either :guilabel:`To Submit`, :guilabel:`Submitted`, :guilabel:`Approved`, :guilabel:`Posted`, or :guilabel:`Done` appears. Expense reports with a status of :guilabel:`Refused` are hidden, by default. .. image:: approve_expenses/expense-reports-list.png - :align: center :alt: Reports to validate are found on the Reports to Approve page. Approve expense reports @@ -46,12 +47,13 @@ Approve individual reports -------------------------- To approve an individual report, navigate to :menuselection:`Expenses app --> Expense Reports`, and -click on an individual report to view the report form. +click on an individual report to view the detailed report form. From here, several options are presented: :guilabel:`Approve`, :guilabel:`Refuse`, and -:guilabel:`Reset to draft`. +:guilabel:`Reset to draft`. Click :guilabel:`Approve` to approve the report. -Click :guilabel:`Approve` to approve the report. + .. image:: approve_expenses/approve-individual.png + :alt: An individual expense report that can be approved or refused. .. _expenses/multiple: @@ -65,22 +67,16 @@ the checkbox next to each report being approved, or tick the checkbox next to th Next, click the :guilabel:`Approve Report` button. -.. image:: approve_expenses/approve-report.png - :align: center - :alt: Approve multiple reports by clicking the checkboxes next to each report. + .. image:: approve_expenses/approve-multiple.png + :alt: Select multiple expense reports at once. .. tip:: - It is possible for team managers to view all the expense reports for just their team members. + Team managers can view all the expense reports for their team members only. While on the + :guilabel:`All Reports` page, click the :icon:`fa-caret-down` :guilabel:`(down arrow)` to the + right of the search bar, then click :guilabel:`My Team` in the :icon:`fa-filter` + :guilabel:`Filters` section. This presents all the reports for only the manager's team. - To do so, while on the :guilabel:`All Reports` page, click the :icon:`fa-caret-down` - :guilabel:`(down arrow)` to the right of the search bar, then click :guilabel:`My Team` in the - :icon:`fa-filter` :guilabel:`Filters` section. - - This presents all the reports for only the manager's team. - - .. image:: approve_expenses/my-team-filter.png - :align: center - :alt: Select the My Team filter. +.. _expenses/refuse-report: Refuse expense reports ====================== @@ -88,32 +84,30 @@ Refuse expense reports Expense reports can **only** be refused on the individual expense report, and **not** from the :guilabel:`All Reports` dashboard. To open an individual expense report, navigate to :menuselection:`Expenses app --> Expense Reports`, then click on an individual expense report to -view the report form. +view the detailed expense report form. If more information is needed, such as a missing receipt, communicate any necessary information -requests in the *chatter* of the report form. On the individual expense report, click -:guilabel:`Send message` to open a message text box. +requests in the *chatter* of the report form. On the individual expense report, click either +:guilabel:`Send message` or :guilabel:`Log note` to open a message text box. Type in a message, tagging the proper people, and post it to the *chatter* by clicking -:guilabel:`Send`. The message is posted in the chatter, and the tagged people are notified, via -email. +:guilabel:`Send` or :guilabel:`Log`, depending on the method of communication. The message is posted +in the chatter, and the tagged people are notified via email. .. note:: The only people that can be tagged in a message are *followers* of the specific report. To see - who is a follower, click the :icon:`fa-user-o` :guilabel:`(user)` icon to display the followers - of the expense report. + who is a follower, click the :icon:`fa-user-o` :guilabel:`(Show Followers)` icon to display the + followers of the expense report. .. image:: approve_expenses/chatter.png - :align: center :alt: Send messages in the chatter. To refuse an expense report, click :guilabel:`Refuse`, and a :guilabel:`Refuse Expense` pop-up -window appears. Enter a brief explanation for the refusal beneath the :guilabel:`REASON TO REFUSE -EXPENSE` field, then click :guilabel:`Refuse`. +window loads. Enter a brief explanation for the refusal on the :guilabel:`Reason` line, then click +:guilabel:`Refuse`. .. image:: approve_expenses/refuse-expense.png - :align: center :alt: Send messages in the chatter. Once the expense report is refused, the status changes to :guilabel:`Refused`, and the only button -that appears in the top-left is :guilabel:`Reset to Draft`. +that appears is :guilabel:`Reset to Draft`. diff --git a/content/applications/finance/expenses/approve_expenses/approve-individual.png b/content/applications/finance/expenses/approve_expenses/approve-individual.png new file mode 100644 index 0000000000..15ca863099 Binary files /dev/null and b/content/applications/finance/expenses/approve_expenses/approve-individual.png differ diff --git a/content/applications/finance/expenses/approve_expenses/approve-multiple.png b/content/applications/finance/expenses/approve_expenses/approve-multiple.png new file mode 100644 index 0000000000..40e571a6ce Binary files /dev/null and b/content/applications/finance/expenses/approve_expenses/approve-multiple.png differ diff --git a/content/applications/finance/expenses/approve_expenses/approve-report.png b/content/applications/finance/expenses/approve_expenses/approve-report.png deleted file mode 100644 index 7ab74ae951..0000000000 Binary files a/content/applications/finance/expenses/approve_expenses/approve-report.png and /dev/null differ diff --git a/content/applications/finance/expenses/approve_expenses/chatter.png b/content/applications/finance/expenses/approve_expenses/chatter.png index 23b22d8723..532e6ee2df 100644 Binary files a/content/applications/finance/expenses/approve_expenses/chatter.png and b/content/applications/finance/expenses/approve_expenses/chatter.png differ diff --git a/content/applications/finance/expenses/approve_expenses/expense-reports-list.png b/content/applications/finance/expenses/approve_expenses/expense-reports-list.png index 4f2cf7a403..dab9b433a1 100644 Binary files a/content/applications/finance/expenses/approve_expenses/expense-reports-list.png and b/content/applications/finance/expenses/approve_expenses/expense-reports-list.png differ diff --git a/content/applications/finance/expenses/approve_expenses/my-team-filter.png b/content/applications/finance/expenses/approve_expenses/my-team-filter.png deleted file mode 100644 index 817ab2a730..0000000000 Binary files a/content/applications/finance/expenses/approve_expenses/my-team-filter.png and /dev/null differ diff --git a/content/applications/finance/expenses/approve_expenses/refuse-expense.png b/content/applications/finance/expenses/approve_expenses/refuse-expense.png index 3ac9687938..4ac367b27b 100644 Binary files a/content/applications/finance/expenses/approve_expenses/refuse-expense.png and b/content/applications/finance/expenses/approve_expenses/refuse-expense.png differ