[I18N] *: export 16.0 source terms

closes odoo/documentation#4318 Signed-off-by: Martin Trigaux (mat) <mat@odoo.com>
2023-05-02 14:04:43 +00:00 · 2023-05-02 14:04:43 +00:00 · b9049f4374
commit b9049f4374
parent d5d3dd9a85
9 changed files with 3873 additions and 2282 deletions
--- a/locale/sources/administration.pot
+++ b/locale/sources/administration.pot
@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo 16.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-04-06 08:12+0000\n"
+"POT-Creation-Date: 2023-05-02 14:02+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@ -1477,7 +1477,7 @@ msgid ":doc:`/applications/general/auth/azure`"
 msgstr ""

 #: ../../content/administration/maintain/azure_oauth.rst:16
-msgid ":doc:`/applications/general/calendars/outlook/outlook_calendar`"
+msgid ":doc:`/applications/productivity/calendar/outlook`"
 msgstr ""

 #: ../../content/administration/maintain/azure_oauth.rst:19
@ -1513,7 +1513,7 @@ msgid "API permissions"
 msgstr ""

 #: ../../content/administration/maintain/azure_oauth.rst:49
-msgid "The :guilabel:`API permissions` should be set next. Odoo will need specific API permissions to be able to read (IMAP) and send (IMAP) emails in the Microsoft 365 setup. First, click the :guilabel:`API permissions` link, located in the left menu bar. Next, click on the :guilabel:`(+) Add a Permission` button and select :guilabel:`Microsoft Graph` under :guilabel:`Commonly Used Microsoft APIs`. After, select the :guilabel:`Delegated Permissions` option."
+msgid "The :guilabel:`API permissions` should be set next. Odoo will need specific API permissions to be able to read (IMAP) and send (SMTP) emails in the Microsoft 365 setup. First, click the :guilabel:`API permissions` link, located in the left menu bar. Next, click on the :guilabel:`(+) Add a Permission` button and select :guilabel:`Microsoft Graph` under :guilabel:`Commonly Used Microsoft APIs`. After, select the :guilabel:`Delegated Permissions` option."
 msgstr ""

 #: ../../content/administration/maintain/azure_oauth.rst:55
@ -1610,7 +1610,7 @@ msgid "This completes the setup on the :guilabel:`Microsoft Azure Portal` side."
 msgstr ""

 #: ../../content/administration/maintain/azure_oauth.rst:136
-#: ../../content/administration/maintain/google_oauth.rst:88
+#: ../../content/administration/maintain/google_oauth.rst:111
 msgid "Setup in Odoo"
 msgstr ""

@ -1639,7 +1639,7 @@ msgid "Outlook Credentials in Odoo General Settings."
 msgstr ""

 #: ../../content/administration/maintain/azure_oauth.rst:159
-#: ../../content/administration/maintain/google_oauth.rst:102
+#: ../../content/administration/maintain/google_oauth.rst:127
 msgid "Configure outgoing email server"
 msgstr ""

@ -1781,7 +1781,7 @@ msgid "Some search engines provide tools for web admins, such as `Google Search
 msgstr ""

 #: ../../content/administration/maintain/domain_names.rst:74
-msgid ":doc:`/applications/websites/website/optimize/seo`"
+msgid ":doc:`/applications/websites/website/pages/seo`"
 msgstr ""

 #: ../../content/administration/maintain/domain_names.rst:75
@ -2270,7 +2270,7 @@ msgid ":doc:`/applications/general/auth/google`"
 msgstr ""

 #: ../../content/administration/maintain/google_oauth.rst:16
-msgid ":doc:`/applications/general/calendars/google/google_calendar_credentials`"
+msgid ":doc:`/applications/productivity/calendar/google`"
 msgstr ""

 #: ../../content/administration/maintain/google_oauth.rst:19
@ -2282,82 +2282,102 @@ msgid "Create a new project"
 msgstr ""

 #: ../../content/administration/maintain/google_oauth.rst:24
-msgid "To get started, go to the `Google API Platform <https://console.cloud.google.com/apis/credentials/consent>`_. Log in with your *Google Workspace* account if you have one, otherwise log in with your personal Gmail account (this should match the email address you want to configure in Odoo)."
+msgid "To get started, go to the `Google API Console <https://console.developers.google.com>`_. Log in with your *Google Workspace* account if you have one, otherwise log in with your personal Gmail account (this should match the email address you want to configure in Odoo)."
 msgstr ""

-#: ../../content/administration/maintain/google_oauth.rst:29
-msgid "After that, click on :guilabel:`Create Project`, located on the far right of the OAuth consent screen. If a project has already been created in this account, then the :guilabel:`New Project` option will be located on the top left under the :guilabel:`Select a project` drop-down menu."
+#: ../../content/administration/maintain/google_oauth.rst:28
+msgid "After that, click on :guilabel:`Create Project`, located on the far right of the :guilabel:`OAuth consent screen`. If a project has already been created in this account, then the :guilabel:`New Project` option will be located on the top right under the :guilabel:`Select a project` drop-down menu."
 msgstr ""

 #: ../../content/administration/maintain/google_oauth.rst:33
-msgid "On the :guilabel:`New Project` screen, rename the :guilabel:`Project name` to `Odoo` and browse for the :guilabel:`Location`. Set the :guilabel:`Location` as the `Google Workspace` organization. If you are using a personal Gmail account, then leave the :guilabel:`Location` as `No Organization`."
+msgid "On the :menuselection:`New Project` screen, rename the :guilabel:`Project name` to `Odoo` and browse for the :guilabel:`Location`. Set the :guilabel:`Location` as the *Google Workspace organization*. If you are using a personal Gmail account, then leave the :guilabel:`Location` as :guilabel:`No Organization`."
 msgstr ""

 #: ../../content/administration/maintain/google_oauth.rst:-1
-msgid "Project Name and Location for Google Oauth."
+msgid "Project Name and Location for Google OAuth."
 msgstr ""

-#: ../../content/administration/maintain/google_oauth.rst:41
-msgid "Click on :guilabel:`Create` to finish this step. On the next screen, :guilabel:`User Type` options, select the :guilabel:`External` option, and then click on :guilabel:`Create` again, which will finally navigate to the :guilabel:`Edit app registration` page."
+#: ../../content/administration/maintain/google_oauth.rst:42
+msgid "Click on :guilabel:`Create` to finish this step."
 msgstr ""

-#: ../../content/administration/maintain/google_oauth.rst:46
-msgid "Edit app registration"
+#: ../../content/administration/maintain/google_oauth.rst:45
+msgid "OAuth consent screen"
 msgstr ""

-#: ../../content/administration/maintain/google_oauth.rst:48
-msgid "On the :guilabel:`Oauth consent screen` step, under the :guilabel:`App information` section, enter `Odoo` in the :guilabel:`App name` field. Select the organization's email address under the :guilabel:`User support` email field."
+#: ../../content/administration/maintain/google_oauth.rst:47
+msgid "If the page doesn't redirect to the :menuselection:`User Type` options, click on :guilabel:`OAuth consent screen` in the left menu."
 msgstr ""

-#: ../../content/administration/maintain/google_oauth.rst:51
-msgid "Next, under :menuselection:`App Domain --> Authorized domains`, click on :guilabel:`Add Domain` and enter `odoo.com`."
+#: ../../content/administration/maintain/google_oauth.rst:50
+msgid "Under :guilabel:`User Type` options, select the appropriate :guilabel:`User Type`, and then click on :guilabel:`Create` again, which will finally navigate to the :menuselection:`Edit app registration` page."
 msgstr ""

-#: ../../content/administration/maintain/google_oauth.rst:53
-msgid "After that, under the :guilabel:`Developer contact information` section, enter the organization's email address. Google uses this email address to notify the organization about any changes to your project."
-msgstr ""
-
-#: ../../content/administration/maintain/google_oauth.rst:56
-msgid "Next, click on the :guilabel:`Save and Continue` button."
-msgstr ""
-
-#: ../../content/administration/maintain/google_oauth.rst:57
-msgid "Then, skip the :guilabel:`Scopes` page by scrolling to the bottom and clicking on :guilabel:`Save and Continue`."
+#: ../../content/administration/maintain/google_oauth.rst:55
+msgid "*Personal* Gmail Accounts are only allowed to be **External** User Type, which means Google may require an approval, or for *Scopes* to be added on. However, using a *Google WorkSpace* account allows for **Internal** User Type to be used."
 msgstr ""

 #: ../../content/administration/maintain/google_oauth.rst:59
-msgid "Next, add the email being configured under the :guilabel:`Test users` step by clicking on :guilabel:`Add Users` and then the :guilabel:`Save and Continue` button. A summary of the :guilabel:`App registration` appears."
+msgid "Note, as well, that while the API connection is in the *External* testing mode, then no approval is necessary from Google. User limits in this testing mode is set to 100 users."
 msgstr ""

-#: ../../content/administration/maintain/google_oauth.rst:62
-msgid "Finally, scroll to the bottom and click on :guilabel:`Back to Dashboard`."
+#: ../../content/administration/maintain/google_oauth.rst:63
+msgid "Edit app registration"
 msgstr ""

 #: ../../content/administration/maintain/google_oauth.rst:65
-msgid "Create Credentials"
+msgid "Next we will configure the app registration of the project."
 msgstr ""

 #: ../../content/administration/maintain/google_oauth.rst:67
-msgid "Now that you have set up the project, you need to create credentials, which includes the :guilabel:`Client ID` and :guilabel:`Client Secret`. First, click on :guilabel:`Credentials` in the left sidebar menu."
+msgid "On the :guilabel:`OAuth consent screen` step, under the :guilabel:`App information` section, enter `Odoo` in the :guilabel:`App name` field. Select the organization's email address under the :guilabel:`User support` email field."
 msgstr ""

 #: ../../content/administration/maintain/google_oauth.rst:71
-msgid "Then, click on :guilabel:`Create Credentials` in the top menu and select :guilabel:`OAuth client ID` from the dropdown menu."
+msgid "Next, under :menuselection:`App Domain --> Authorized domains`, click on :guilabel:`Add Domain` and enter `odoo.com`."
 msgstr ""

 #: ../../content/administration/maintain/google_oauth.rst:74
+msgid "After that, under the :guilabel:`Developer contact information` section, enter the organization's email address. Google uses this email address to notify the organization about any changes to your project."
+msgstr ""
+
+#: ../../content/administration/maintain/google_oauth.rst:78
+msgid "Next, click on the :guilabel:`Save and Continue` button. Then, skip the :menuselection:`Scopes` page by scrolling to the bottom and clicking on :guilabel:`Save and Continue`."
+msgstr ""
+
+#: ../../content/administration/maintain/google_oauth.rst:81
+msgid "If continuing in testing mode (External), add the email addresses being configured under the :guilabel:`Test users` step, by clicking on :guilabel:`Add Users`, and then the :guilabel:`Save and Continue` button. A summary of the app registration appears."
+msgstr ""
+
+#: ../../content/administration/maintain/google_oauth.rst:85
+msgid "Finally, scroll to the bottom and click on :guilabel:`Back to Dashboard` to finish setting up the project."
+msgstr ""
+
+#: ../../content/administration/maintain/google_oauth.rst:89
+msgid "Create Credentials"
+msgstr ""
+
+#: ../../content/administration/maintain/google_oauth.rst:91
+msgid "Now that the project is set up, credentials should be created, which includes the *Client ID* and *Client Secret*. First, click on :guilabel:`Credentials` in the left sidebar menu."
+msgstr ""
+
+#: ../../content/administration/maintain/google_oauth.rst:94
+msgid "Then, click on :guilabel:`Create Credentials` in the top menu and select :guilabel:`OAuth client ID` from the dropdown menu."
+msgstr ""
+
+#: ../../content/administration/maintain/google_oauth.rst:97
 msgid "Under :guilabel:`Application Type`, select :guilabel:`Web Application` from the dropdown menu."
 msgstr ""

-#: ../../content/administration/maintain/google_oauth.rst:75
-msgid "In the :guilabel:`Client ID` field, enter `Odoo`."
+#: ../../content/administration/maintain/google_oauth.rst:98
+msgid "In the :guilabel:`Name` field, enter `Odoo`."
 msgstr ""

-#: ../../content/administration/maintain/google_oauth.rst:76
-msgid "Under the :guilabel:`Authorized redirect URIs` label, click the button :guilabel:`ADD URI`, and then input `https://yourdbname.odoo.com/google_gmail/confirm` in the :guilabel:`URIs 1` field. Be sure to replace the *yourdbname* part of the URL with your actual Odoo database name."
+#: ../../content/administration/maintain/google_oauth.rst:99
+msgid "Under the :guilabel:`Authorized redirect URIs` label, click the button :guilabel:`ADD URI`, and then input `https://yourdbname.odoo.com/google_gmail/confirm` in the :guilabel:`URIs 1` field. Be sure to replace the *yourdbname* part of the URL with the actual Odoo database name."
 msgstr ""

-#: ../../content/administration/maintain/google_oauth.rst:79
+#: ../../content/administration/maintain/google_oauth.rst:102
 msgid "Next, click on :guilabel:`Create` to generate an OAuth :guilabel:`Client ID` and :guilabel:`Client Secret`. Finally, copy each generated value for later use when configuring in Odoo, and then navigate to the Odoo database."
 msgstr ""

@ -2365,71 +2385,75 @@ msgstr ""
 msgid "Client ID and Client Secret for Google OAuth."
 msgstr ""

-#: ../../content/administration/maintain/google_oauth.rst:91
+#: ../../content/administration/maintain/google_oauth.rst:114
 msgid "Enter Google Credentials"
 msgstr ""

-#: ../../content/administration/maintain/google_oauth.rst:93
+#: ../../content/administration/maintain/google_oauth.rst:116
 msgid "First, open Odoo and navigate to the :guilabel:`Apps` module. Then, remove the :guilabel:`Apps` filter from the search bar and type in `Google`. Install the module called :guilabel:`Google Gmail`."
 msgstr ""

-#: ../../content/administration/maintain/google_oauth.rst:96
-msgid "Next, navigate to :menuselection:`Settings --> General Settings`, and under the :guilabel:`Discuss` section, ensure that the checkbox for :guilabel:`Custom Email Servers` is checked. This populates a new option for :guilabel:`Gmail Credentials`. Then, copy and paste the :guilabel:`Client ID` and :guilabel:`Client Secret` into the respective fields and :guilabel:`Save` the settings."
+#: ../../content/administration/maintain/google_oauth.rst:120
+msgid "Next, navigate to :menuselection:`Settings --> General Settings`, and under the :guilabel:`Discuss` section, ensure that the checkbox for :guilabel:`Custom Email Servers` or :guilabel:`External Email Servers` is checked. This populates a new option for :guilabel:`Gmail Credentials` or :guilabel:`Use a Gmail Sever`. Then, copy and paste the respective values into the :guilabel:`Client ID` and :guilabel:`Client Secret` fields and :guilabel:`Save` the settings."
 msgstr ""

-#: ../../content/administration/maintain/google_oauth.rst:104
-msgid "After that, on the :guilabel:`General Settings` page, under :guilabel:`Custom Email Servers`, click :guilabel:`Outgoing Email Servers` to configure the external Gmail account."
+#: ../../content/administration/maintain/google_oauth.rst:129
+msgid "To configure the external Gmail account, return to the top of the :guilabel:`Custom Email Servers` setting and then click the :guilabel:`Outgoing Email Servers` link."
 msgstr ""

 #: ../../content/administration/maintain/google_oauth.rst:-1
 msgid "Configure Outgoing Email Servers in Odoo."
 msgstr ""

-#: ../../content/administration/maintain/google_oauth.rst:111
-msgid "Then, :guilabel:`Create` a new email server and select the option for :guilabel:`Gmail`. Next, fill in the :guilabel:`Description` (can be anything) and the email :guilabel:`Username` and click on :guilabel:`Connect your Gmail account`."
+#: ../../content/administration/maintain/google_oauth.rst:136
+msgid "Then, click on :guilabel:`New` or :guilabel:`Create` to create a new email server, and fill in the :guilabel:`Name`, :guilabel:`Description`, and the email :guilabel:`Username` (if required)."
 msgstr ""

-#: ../../content/administration/maintain/google_oauth.rst:115
-msgid "A new window from :guilabel:`Google` opens to complete the authorization process. Select the appropriate email address that is being configured in Odoo."
+#: ../../content/administration/maintain/google_oauth.rst:139
+msgid "Next, click on :guilabel:`Gmail OAuth Authentication` or :guilabel:`Gmail` (under the :guilabel:`Authenticate with` or :guilabel:`Connection` section). Finally, click on :guilabel:`Connect your Gmail Account`."
 msgstr ""

-#: ../../content/administration/maintain/google_oauth.rst:118
-msgid "If the email address is a personal account, an extra step pops up, click :guilabel:`Continue` to allow the verification and connect the Gmail account to Odoo."
+#: ../../content/administration/maintain/google_oauth.rst:143
+msgid "A new window labeled :guilabel:`Google` opens to complete the authorization process. Select the appropriate email address that is being configured in Odoo."
 msgstr ""

-#: ../../content/administration/maintain/google_oauth.rst:121
+#: ../../content/administration/maintain/google_oauth.rst:146
+msgid "If the email address is a personal account, then an extra step pops up, so click :guilabel:`Continue` to allow the verification and connect the Gmail account to Odoo."
+msgstr ""
+
+#: ../../content/administration/maintain/google_oauth.rst:149
 msgid "Then, allow Odoo to access the Google account by clicking on :guilabel:`Continue` or :guilabel:`Allow`. After that, the page navigates back to the newly configured outgoing email server in Odoo. The configuration automatically loads the token in Odoo, and a tag stating :guilabel:`Gmail Token Valid` appears in green."
 msgstr ""

-#: ../../content/administration/maintain/google_oauth.rst:130
-msgid "Finally, save the settings and :guilabel:`Test the Connection`. A confirmation message should appear. The Odoo database can now send safe, secure emails through Google using OAuth authentication."
+#: ../../content/administration/maintain/google_oauth.rst:158
+msgid "Finally, :guilabel:`Test the Connection`. A confirmation message should appear. The Odoo database can now send safe, secure emails through Google using OAuth authentication."
 msgstr ""

-#: ../../content/administration/maintain/google_oauth.rst:135
+#: ../../content/administration/maintain/google_oauth.rst:162
 msgid "Google OAuth FAQ"
 msgstr ""

-#: ../../content/administration/maintain/google_oauth.rst:138
+#: ../../content/administration/maintain/google_oauth.rst:165
 msgid "Production VS Testing Publishing Status"
 msgstr ""

-#: ../../content/administration/maintain/google_oauth.rst:140
-msgid "Choosing :guilabel:`Production` as the :guilabel:`Publishing Status` (instead of Testing) will display the following warning message:"
+#: ../../content/administration/maintain/google_oauth.rst:167
+msgid "Choosing :guilabel:`Production` as the :guilabel:`Publishing Status` (instead of :guilabel:`Testing`) will display the following warning message:"
 msgstr ""

 #: ../../content/administration/maintain/google_oauth.rst:-1
 msgid "OAuth is Limited to 100 Sensitive Scope Logins."
 msgstr ""

-#: ../../content/administration/maintain/google_oauth.rst:147
+#: ../../content/administration/maintain/google_oauth.rst:174
 msgid "To correct this warning, navigate to the `Google API Platform <https://console.cloud.google.com/apis/credentials/consent>`_. If the :guilabel:`Publishing status` is :guilabel:`In Production`, click :guilabel:`Back to Testing` to correct the issue."
 msgstr ""

-#: ../../content/administration/maintain/google_oauth.rst:152
+#: ../../content/administration/maintain/google_oauth.rst:179
 msgid "No Test Users Added"
 msgstr ""

-#: ../../content/administration/maintain/google_oauth.rst:154
+#: ../../content/administration/maintain/google_oauth.rst:181
 msgid "If no test users are added to the OAuth consent screen, then a 403 access denied error will populate."
 msgstr ""

@ -2437,44 +2461,40 @@ msgstr ""
 msgid "403 Access Denied Error."
 msgstr ""

-#: ../../content/administration/maintain/google_oauth.rst:161
+#: ../../content/administration/maintain/google_oauth.rst:188
 msgid "To correct this error, return to the :guilabel:`OAuth consent screen` under :guilabel:`APIs & Services` and add test user(s) to the app. Add the email that you are configuring in Odoo."
 msgstr ""

-#: ../../content/administration/maintain/google_oauth.rst:166
+#: ../../content/administration/maintain/google_oauth.rst:192
 msgid "Gmail Module not updated"
 msgstr ""

-#: ../../content/administration/maintain/google_oauth.rst:168
-msgid "If the :guilabel:`Gmail Module` in Odoo has not been updated to the latest version, then a :guilabel:`Forbidden` error message populates."
+#: ../../content/administration/maintain/google_oauth.rst:194
+msgid "If the *Google Gmail* module in Odoo has not been updated to the latest version, then a :guilabel:`Forbidden` error message populates."
 msgstr ""

 #: ../../content/administration/maintain/google_oauth.rst:-1
 msgid "Forbidden you don't have the permission to access the requested resource."
 msgstr ""

-#: ../../content/administration/maintain/google_oauth.rst:175
-msgid "To correct this error, go to the :guilabel:`Apps` module and clear out the search terms. Then, search for `Gmail` or `Google` and upgrade the :guilabel:`Google Gmail` module. Finally, click on the three dots on the upper right of the module and select :guilabel:`Upgrade`."
+#: ../../content/administration/maintain/google_oauth.rst:201
+msgid "To correct this error, go to the :menuselection:`Apps` module and clear out the search terms. Then, search for `Gmail` or `Google` and upgrade the :guilabel:`Google Gmail` module. Finally, click on the three dots on the upper right of the module and select :guilabel:`Upgrade`."
 msgstr ""

-#: ../../content/administration/maintain/google_oauth.rst:180
+#: ../../content/administration/maintain/google_oauth.rst:206
 msgid "Application Type"
 msgstr ""

-#: ../../content/administration/maintain/google_oauth.rst:182
-msgid "When creating the :guilabel:`Credentials` (OAuth Client ID and Client Secret), if :guilabel:`Desktop App` is selected for the :guilabel:`Application Type`, an :guilabel:`Authorization Error` appears."
+#: ../../content/administration/maintain/google_oauth.rst:208
+msgid "When creating the credentials (OAuth *Client ID* and *Client Secret*), if :guilabel:`Desktop App` is selected for the :guilabel:`Application Type`, an :guilabel:`Authorization Error` appears."
 msgstr ""

 #: ../../content/administration/maintain/google_oauth.rst:-1
 msgid "Error 400 Redirect URI Mismatch."
 msgstr ""

-#: ../../content/administration/maintain/google_oauth.rst:190
-msgid "To correct this error, delete the credentials already created and create new credentials, selecting :guilabel:`Web Application` for the :guilabel:`Application Type`. Then, under :guilabel:`Authorized redirect URIs`, click :guilabel:`ADD URI` and type: `https://yourdbname.odoo.com/google_gmail/confirm` in the field."
-msgstr ""
-
-#: ../../content/administration/maintain/google_oauth.rst:196
-msgid "Replace *yourdbname* in the URL with the Odoo database name."
+#: ../../content/administration/maintain/google_oauth.rst:215
+msgid "To correct this error, delete the credentials already created and create new credentials, selecting :guilabel:`Web Application` for the :guilabel:`Application Type`. Then, under :guilabel:`Authorized redirect URIs`, click :guilabel:`ADD URI` and type: `https://yourdbname.odoo.com/google_gmail/confirm` in the field, being sure to replace *yourdbname* in the URL with the Odoo database name."
 msgstr ""

 #: ../../content/administration/maintain/hosting_changes.rst:6
--- a/locale/sources/contributing.pot
+++ b/locale/sources/contributing.pot
@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo 16.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-04-06 08:12+0000\n"
+"POT-Creation-Date: 2023-05-02 14:02+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@ -255,115 +255,115 @@ msgstr ""
 msgid "In the command below, replace `<your_github_account>` with the name of the GitHub account on which you created the fork(s)."
 msgstr ""

-#: ../../content/contributing/development.rst:56
+#: ../../content/contributing/development.rst:57
 msgid "If you have access to `odoo/enterprise`, configure the related remote too."
 msgstr ""

-#: ../../content/contributing/development.rst:62
+#: ../../content/contributing/development.rst:64
 msgid "Link Git with odoo-dev"
 msgstr ""

-#: ../../content/contributing/development.rst:72
+#: ../../content/contributing/development.rst:76
 msgid "That's it! You are ready to :ref:`make your first contribution <contributing/development/first-contribution>`."
 msgstr ""

-#: ../../content/contributing/development.rst:79
+#: ../../content/contributing/development.rst:83
 #: ../../content/contributing/documentation.rst:158
 msgid "Make your first contribution"
 msgstr ""

-#: ../../content/contributing/development.rst:82
+#: ../../content/contributing/development.rst:86
 msgid "Odoo development can be challenging for beginners. We recommend you to be knowledgeable enough to code a small module before contributing. If that is not the case, take some time to go through the :doc:`developer tutorials </developer/howtos>` to fill in the gaps."
 msgstr ""

-#: ../../content/contributing/development.rst:85
+#: ../../content/contributing/development.rst:89
 #: ../../content/contributing/documentation.rst:204
 msgid "Some steps of this guide require to be comfortable with Git. Here are some `tutorials <https://www.atlassian.com/git/tutorials>`_ and an `interactive training <https://learngitbranching.js.org/>`_ if you are stuck at some point."
 msgstr ""

-#: ../../content/contributing/development.rst:89
+#: ../../content/contributing/development.rst:93
 msgid "Now that your environment is set up, you can start contributing to the codebase. In a terminal, navigate to the directory where you installed Odoo from sources and follow the guide below."
 msgstr ""

-#: ../../content/contributing/development.rst:92
+#: ../../content/contributing/development.rst:96
 msgid "Choose the version of Odoo to which you want to make changes. Keep in mind that contributions targeting an :doc:`unsupported version of Odoo </administration/maintain/supported_versions>` are not accepted. This guide assumes that the changes target Odoo 16, which corresponds to branch `16.0`."
 msgstr ""

-#: ../../content/contributing/development.rst:96
+#: ../../content/contributing/development.rst:100
 #: ../../content/contributing/documentation.rst:216
 msgid "Create a new branch starting from branch 16.0. Prefix the branch name with the base branch: `16.0-...`. If you work at Odoo, suffix the branch name with your Odoo handle: `16.0-...-xyz`."
 msgstr ""

-#: ../../content/contributing/development.rst:110
+#: ../../content/contributing/development.rst:114
 msgid "`Sign the Odoo CLA <https://github.com/odoo/odoo/blob/16.0/doc/cla/sign-cla.md>`_ if not already done. Skip this step if you work at Odoo."
 msgstr ""

-#: ../../content/contributing/development.rst:112
+#: ../../content/contributing/development.rst:116
 msgid "Make the desired changes to the codebase. When working on the codebase, follow these rules:"
 msgstr ""

-#: ../../content/contributing/development.rst:114
+#: ../../content/contributing/development.rst:118
 msgid "Keep your changes focused and specific. It is best to work on one particular feature or bug fix at a time rather than tackle multiple unrelated changes simultaneously."
 msgstr ""

-#: ../../content/contributing/development.rst:116
+#: ../../content/contributing/development.rst:120
 msgid "Respect the `stable policy <https://github.com/odoo/odoo/wiki/Contributing#what-does-stable-mean>`_ when working in another branch than `master`."
 msgstr ""

-#: ../../content/contributing/development.rst:119
+#: ../../content/contributing/development.rst:123
 msgid "Follow the :doc:`coding guidelines <development/coding_guidelines>`."
 msgstr ""

-#: ../../content/contributing/development.rst:120
+#: ../../content/contributing/development.rst:124
 msgid "Test your changes thoroughly and :doc:`write tests </developer/reference/backend/testing>` to ensure that everything is working as expected and that there are no regressions or unintended consequences."
 msgstr ""

-#: ../../content/contributing/development.rst:124
+#: ../../content/contributing/development.rst:128
 #: ../../content/contributing/documentation.rst:249
 msgid "Commit your changes. Write a clear commit message as instructed in the :doc:`Git guidelines <development/git_guidelines>`."
 msgstr ""

-#: ../../content/contributing/development.rst:132
+#: ../../content/contributing/development.rst:136
 #: ../../content/contributing/documentation.rst:257
 msgid "Push your change to your fork, for which we added the remote alias `dev`."
 msgstr ""

-#: ../../content/contributing/development.rst:140
+#: ../../content/contributing/development.rst:144
 #: ../../content/contributing/documentation.rst:274
 msgid "Open a :abbr:`PR (Pull Request)` on GitHub to submit your changes for review."
 msgstr ""

-#: ../../content/contributing/development.rst:142
+#: ../../content/contributing/development.rst:146
 msgid "Go to the `compare page of the odoo/odoo codebase <https://github.com/odoo/odoo/compare>`_, or the `compare page of the odoo/enterprise codebase <https://github.com/odoo/enterprise/compare>`_, depending on which codebase your changes target."
 msgstr ""

-#: ../../content/contributing/development.rst:146
+#: ../../content/contributing/development.rst:150
 #: ../../content/contributing/documentation.rst:278
 msgid "Select **16.0** for the base."
 msgstr ""

-#: ../../content/contributing/development.rst:147
+#: ../../content/contributing/development.rst:151
 #: ../../content/contributing/documentation.rst:279
 msgid "Click on :guilabel:`compare across forks`."
 msgstr ""

-#: ../../content/contributing/development.rst:148
+#: ../../content/contributing/development.rst:152
 msgid "Select **<your_github_account>/odoo** or **<your_github_account>/enterprise** for the head repository. Replace `<your_github_account>` with the name of the GitHub account on which you created the fork or by **odoo-dev** if you work at Odoo."
 msgstr ""

-#: ../../content/contributing/development.rst:151
+#: ../../content/contributing/development.rst:155
 #: ../../content/contributing/documentation.rst:192
 #: ../../content/contributing/documentation.rst:283
 msgid "Review your changes and click on the :guilabel:`Create pull request` button."
 msgstr ""

-#: ../../content/contributing/development.rst:152
+#: ../../content/contributing/development.rst:156
 #: ../../content/contributing/documentation.rst:193
 #: ../../content/contributing/documentation.rst:284
 msgid "Tick the :guilabel:`Allow edits from maintainer` checkbox. Skip this step if you work at Odoo."
 msgstr ""

-#: ../../content/contributing/development.rst:153
+#: ../../content/contributing/development.rst:157
 #: ../../content/contributing/documentation.rst:286
 msgid "Complete the description and click on the :guilabel:`Create pull request` button again."
 msgstr ""
@ -373,7 +373,7 @@ msgstr ""
 msgid "As soon as your :abbr:`PR (Pull Request)` is ready for merging, a member of the Odoo team will be automatically assigned for review. If the reviewer has questions or remarks, they will post them as comments and you will be notified by email. Those comments must be resolved for the contribution to go forward."
 msgstr ""

-#: ../../content/contributing/development.rst:157
+#: ../../content/contributing/development.rst:161
 msgid "Once your changes are approved, the review merges them and they become available for all Odoo users after the next code update!"
 msgstr ""

--- a/locale/sources/finance.pot
+++ b/locale/sources/finance.pot
--- a/locale/sources/general.pot
+++ b/locale/sources/general.pot
@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo 16.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-04-13 05:55+0000\n"
+"POT-Creation-Date: 2023-05-02 14:02+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@ -238,15 +238,15 @@ msgid "Google Sign-In Authentication"
 msgstr ""

 #: ../../content/applications/general/auth/google.rst:5
-msgid "The **Google Sign-In Authentication** is a useful function that allows your users to sign in to Odoo with their Google account."
+msgid "The *Google Sign-In Authentication* is a useful function that allows Odoo users to sign in to their database with their Google account."
 msgstr ""

 #: ../../content/applications/general/auth/google.rst:8
-msgid "This is particularly helpful if your organization uses Google Workforce and you want the employees within your organization to connect to Odoo with their Google Accounts."
+msgid "This is particularly helpful if the organization uses Google Workspace, and wants employees within the organization to connect to Odoo using their Google Accounts."
 msgstr ""

 #: ../../content/applications/general/auth/google.rst:12
-msgid ":doc:`../../productivity/calendar/google`"
+msgid ":doc:`/applications/productivity/calendar/google`"
 msgstr ""

 #: ../../content/applications/general/auth/google.rst:13
@ -261,7 +261,7 @@ msgid "Configuration"
 msgstr ""

 #: ../../content/applications/general/auth/google.rst:20
-msgid "The integration of the Google sign-in function requires configuration both on Google and on Odoo."
+msgid "The integration of the Google sign-in function requires configuration both on Google *and* Odoo."
 msgstr ""

 #: ../../content/applications/general/auth/google.rst:25
@ -273,130 +273,150 @@ msgid "Go to the `Google API Dashboard <https://console.developers.google.com/>`
 msgstr ""

 #: ../../content/applications/general/auth/google.rst:28
-msgid "Make sure the right project is opened. If you don't have a project yet, click on *Create Project*, fill out the project name and other details of your company, and click on *Create*."
+msgid "Make sure the right project is opened. If there isn't a project yet, click on :guilabel:`Create Project`, fill out the project name and other details of the company, and click on :guilabel:`Create`."
 msgstr ""

 #: ../../content/applications/general/auth/google.rst:0
-msgid "Filling out the details of a new project"
+msgid "Filling out the details of a new project."
 msgstr ""

-#: ../../content/applications/general/auth/google.rst:36
-msgid "Choose the name of your own company from the drop-down menu."
+#: ../../content/applications/general/auth/google.rst:37
+msgid "Choose the name of the company from the drop-down menu."
 msgstr ""

-#: ../../content/applications/general/auth/google.rst:41
+#: ../../content/applications/general/auth/google.rst:42
 msgid "OAuth consent screen"
 msgstr ""

-#: ../../content/applications/general/auth/google.rst:43
+#: ../../content/applications/general/auth/google.rst:44
 msgid "On the left side menu, click on :menuselection:`OAuth consent screen`."
 msgstr ""

 #: ../../content/applications/general/auth/google.rst:0
-msgid "Google oauth consent selection menu"
+msgid "Google OAuth consent selection menu."
 msgstr ""

-#: ../../content/applications/general/auth/google.rst:49
-msgid "Choose the option for :guilabel:`internal`, and click on :guilabel:`Create`."
+#: ../../content/applications/general/auth/google.rst:50
+msgid "Choose one of the options (:guilabel:`Internal` / :guilabel:`External`), and click on :guilabel:`Create`."
 msgstr ""

 #: ../../content/applications/general/auth/google.rst:0
-msgid "Choice of a user type in oauth consent"
+msgid "Choice of a user type in OAuth consent."
 msgstr ""

-#: ../../content/applications/general/auth/google.rst:55
-msgid "Fill out your details and domain info, then click on *Save and Continue*."
+#: ../../content/applications/general/auth/google.rst:58
+msgid "*Personal* Gmail Accounts are only allowed to be **External** User Type, which means Google may require an approval, or for *Scopes* to be added on. However, using a *Google WorkSpace* account allows for **Internal** User Type to be used."
 msgstr ""

-#: ../../content/applications/general/auth/google.rst:56
-msgid "On the **Scopes** page, leave all fields as is, and click on *Save and Continue*."
+#: ../../content/applications/general/auth/google.rst:62
+msgid "Note, as well, that while the API connection is in the *External* testing mode, then no approval is necessary from Google. User limits in this testing mode is set to 100 users."
 msgstr ""

-#: ../../content/applications/general/auth/google.rst:61
+#: ../../content/applications/general/auth/google.rst:65
+msgid "Fill out the required details and domain info, then click on :guilabel:`Save and Continue`."
+msgstr ""
+
+#: ../../content/applications/general/auth/google.rst:66
+msgid "On the :menuselection:`Scopes` page, leave all fields as is, and click on :guilabel:`Save and Continue`."
+msgstr ""
+
+#: ../../content/applications/general/auth/google.rst:68
+msgid "Next, if continuing in testing mode (*External*), add the email addresses being configured under the :guilabel:`Test users` step by clicking on :guilabel:`Add Users`, and then the :guilabel:`Save and Continue` button. A summary of the app registration appears."
+msgstr ""
+
+#: ../../content/applications/general/auth/google.rst:71
+msgid "Finally, scroll to the bottom, and click on :guilabel:`Back to Dashboard`."
+msgstr ""
+
+#: ../../content/applications/general/auth/google.rst:76
 msgid "Credentials"
 msgstr ""

-#: ../../content/applications/general/auth/google.rst:63
+#: ../../content/applications/general/auth/google.rst:78
 msgid "On the left side menu, click on :menuselection:`Credentials`."
 msgstr ""

 #: ../../content/applications/general/auth/google.rst:0
-msgid "Credentials button menu"
+msgid "Credentials button menu."
 msgstr ""

-#: ../../content/applications/general/auth/google.rst:69
-msgid "Click on *Create Credentials* and select **OAuth client ID**."
+#: ../../content/applications/general/auth/google.rst:84
+msgid "Click on :guilabel:`Create Credentials`, and select :guilabel:`OAuth client ID`."
 msgstr ""

 #: ../../content/applications/general/auth/google.rst:0
-msgid "Oauth client id selection"
+msgid "OAuth client id selection."
 msgstr ""

-#: ../../content/applications/general/auth/google.rst:75
-msgid "Select **Web Application** as the Application type. Now configure the allowed pages on which you will be redirected."
+#: ../../content/applications/general/auth/google.rst:90
+msgid "Select :guilabel:`Web Application` as the :guilabel:`Application Type`. Now, configure the allowed pages on which Odoo will be redirected."
 msgstr ""

-#: ../../content/applications/general/auth/google.rst:78
-msgid "In order to achieve this, in the **Authorized redirect URIs** field, enter your database's domain immediately followed by ``/auth_oauth/signin``. For example: ``https://mydomain.odoo.com/auth_oauth/signin``, then click on *Create*."
+#: ../../content/applications/general/auth/google.rst:93
+msgid "In order to achieve this, in the :guilabel:`Authorized redirect URIs` field, enter the database's domain immediately followed by `/auth_oauth/signin`. For example: `https://mydomain.odoo.com/auth_oauth/signin`, then click on :guilabel:`Create`."
 msgstr ""

-#: ../../content/applications/general/auth/google.rst:0
-msgid "Creating oauth client id"
+#: ../../content/applications/general/auth/google.rst:97
+msgid "Now that the *OAuth client* has been created, a screen will appear with the :guilabel:`Client ID` and :guilabel:`Client Secret`. Copy the :guilabel:`Client ID` for later, as it will be necessary for the configuration in Odoo, which will be covered in the following steps."
 msgstr ""

-#: ../../content/applications/general/auth/google.rst:89
+#: ../../content/applications/general/auth/google.rst:104
 msgid "Google Authentication on Odoo"
 msgstr ""

-#: ../../content/applications/general/auth/google.rst:94
+#: ../../content/applications/general/auth/google.rst:109
 msgid "Retrieve the Client ID"
 msgstr ""

-#: ../../content/applications/general/auth/google.rst:96
-msgid "Once you have done the previous steps, two keys are generated on the Google API Dashboard: *Client ID* and *Client Secret*. Copy the *Client ID*."
+#: ../../content/applications/general/auth/google.rst:111
+msgid "Once the previous steps are complete, two keys are generated on the Google API Dashboard: :guilabel:`Client ID` and :guilabel:`Client Secret`. Copy the :guilabel:`Client ID`."
 msgstr ""

 #: ../../content/applications/general/auth/google.rst:-1
-msgid "Google OAuth Client ID generated"
+msgid "Google OAuth Client ID generated."
 msgstr ""

-#: ../../content/applications/general/auth/google.rst:106
+#: ../../content/applications/general/auth/google.rst:121
 msgid "Odoo activation"
 msgstr ""

-#: ../../content/applications/general/auth/google.rst:108
-msgid "Go to :menuselection:`Odoo General Settings --> Integrations` and activate **OAuth Authentication**."
-msgstr ""
-
-#: ../../content/applications/general/auth/google.rst:112
-msgid "You may have to log in again after this step."
-msgstr ""
-
-#: ../../content/applications/general/auth/google.rst:114
-msgid "Go back to :menuselection:`General Settings --> Integrations`, activate **Google Authentication**, then fill out the *Client ID* with the key from the Google API Dashboard, and *Save*."
-msgstr ""
-
-#: ../../content/applications/general/auth/google.rst:0
-msgid "Filling out the client id in Odoo settings"
-msgstr ""
-
-#: ../../content/applications/general/auth/google.rst:125
-msgid "Log in to Odoo with Google"
+#: ../../content/applications/general/auth/google.rst:123
+msgid "Go to :menuselection:`Odoo General Settings --> Integrations` and activate :guilabel:`OAuth Authentication`."
 msgstr ""

 #: ../../content/applications/general/auth/google.rst:127
-msgid "To link your Google account to your Odoo profile, click on *Log in with Google* when you are asked to choose a new password."
+msgid "Odoo may prompt the user to log-in again after this step."
+msgstr ""
+
+#: ../../content/applications/general/auth/google.rst:129
+msgid "Go back to :menuselection:`General Settings --> Integrations --> OAuth Authentication`, activate the selection and :guilabel:`Save`. Next, return to :menuselection:`General Settings --> Integrations --> Google Authentication` and activate the selection. Then fill out the :guilabel:`Client ID` with the key from the Google API Dashboard, and :guilabel:`Save`."
 msgstr ""

 #: ../../content/applications/general/auth/google.rst:0
-msgid "Reset password screen with \"Log in with Google\" button"
-msgstr ""
-
-#: ../../content/applications/general/auth/google.rst:134
-msgid "Existing users must :ref:`reset their password <users/reset-password>` to access the *reset password* page, while new users can directly click on *Log in with Google* instead of choosing a new password."
+msgid "Filling out the client id in Odoo settings."
 msgstr ""

 #: ../../content/applications/general/auth/google.rst:139
+msgid "Google OAuth2 configuration can also be accessed by clicking on :guilabel:`OAuth Providers` under the :guilabel:`OAuth Authentication` heading in :menuselection:`Integrations`."
+msgstr ""
+
+#: ../../content/applications/general/auth/google.rst:145
+msgid "Log in to Odoo with Google"
+msgstr ""
+
+#: ../../content/applications/general/auth/google.rst:147
+msgid "To link the Google account to the Odoo profile, click on :guilabel:`Log in with Google` when first logging into Odoo."
+msgstr ""
+
+#: ../../content/applications/general/auth/google.rst:0
+msgid "Reset password screen with \"Log in with Google\" button."
+msgstr ""
+
+#: ../../content/applications/general/auth/google.rst:155
+msgid "Existing users must :ref:`reset their password <users/reset-password>` to access the :menuselection:`Reset Password` page, while new users can directly click on :guilabel:`Log in with Google`, instead of choosing a new password."
+msgstr ""
+
+#: ../../content/applications/general/auth/google.rst:160
 msgid "`Google Cloud Platform Console Help - Setting up OAuth 2.0 <https://support.google.com/cloud/answer/6158849>`_"
 msgstr ""

--- a/locale/sources/inventory_and_mrp.pot
+++ b/locale/sources/inventory_and_mrp.pot
@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo 16.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-04-13 05:55+0000\n"
+"POT-Creation-Date: 2023-05-02 14:02+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@ -3125,6 +3125,7 @@ msgid "To manage several routes within the warehouses, also enable :guilabel:`Mu
 msgstr ""

 #: ../../content/applications/inventory_and_mrp/inventory/management/warehouses/warehouses_locations.rst:56
+#: ../../content/applications/inventory_and_mrp/inventory/routes/concepts/stock_warehouses.rst:41
 msgid "Create a new warehouse"
 msgstr ""

@ -3233,43 +3234,219 @@ msgid "The delivery order is now ready to be processed and can be validated too.
 msgstr ""

 #: ../../content/applications/inventory_and_mrp/inventory/routes/concepts/stock_warehouses.rst:3
-msgid "Taking stock from different warehouses"
+msgid "Sell stock from multiple warehouses using virtual locations"
 msgstr ""

 #: ../../content/applications/inventory_and_mrp/inventory/routes/concepts/stock_warehouses.rst:5
-msgid "When you plan to deliver a customer, you don't know in advance if the products will come from Warehouse A or Warehouse B. You may, in some cases, need to take stock from different warehouses. With *Odoo*, you can configure this by using the concept of virtual warehouses. Let us show you how to set those virtual warehouses."
+msgid "While keeping stock and selling inventory from one warehouse might work for smaller companies, bigger companies might need to keep stock in, or sell from, multiple warehouses in multiple locations."
 msgstr ""

-#: ../../content/applications/inventory_and_mrp/inventory/routes/concepts/stock_warehouses.rst:11
-msgid "Set up virtual warehouses"
+#: ../../content/applications/inventory_and_mrp/inventory/routes/concepts/stock_warehouses.rst:9
+msgid "In Odoo, sometimes products included in a single sales order might take stock from two (or more) warehouses. In Odoo, pulling products from multiple warehouses to satisfy sales demands can be done by using *virtual locations*."
 msgstr ""

-#: ../../content/applications/inventory_and_mrp/inventory/routes/concepts/stock_warehouses.rst:13
-msgid "Let's say you have two warehouses: Warehouse A and Warehouse B. Create a new warehouse, that will be a virtual one. It will allow you to take the stock from A or B. To do so, go to your inventory app settings and enable the multi-warehouses feature. Then, go to the warehouses menu and click on create."
+#: ../../content/applications/inventory_and_mrp/inventory/routes/concepts/stock_warehouses.rst:14
+msgid "In order to create virtual locations in warehouses and proceed to the following steps, the :guilabel:`Storage Locations` and :guilabel:`Multi-Step Routes` features will need to be enabled in the :menuselection:`Settings` app."
 msgstr ""

-#: ../../content/applications/inventory_and_mrp/inventory/routes/concepts/stock_warehouses.rst:22
-msgid "The *Storage Location* feature will be automatically enabled. Good news, because you will need it later in the process."
+#: ../../content/applications/inventory_and_mrp/inventory/routes/concepts/stock_warehouses.rst:18
+msgid "To do so, go to :menuselection:`Inventory --> Configuration --> Settings`, scroll down to the :guilabel:`Warehouse` section, and click the checkboxes next to :guilabel:`Storage Locations` and :guilabel:`Multi-Step Routes`. Then, :guilabel:`Save` the changes to finish."
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/inventory/routes/concepts/stock_warehouses.rst:23
+msgid "Create and configure a virtual parent location"
 msgstr ""

 #: ../../content/applications/inventory_and_mrp/inventory/routes/concepts/stock_warehouses.rst:25
-msgid "Now, you have to make sure that the main stock locations of warehouse A and warehouse B are children locations of the main stock location of warehouse A + B. Go to the locations menu, and edit the main location of your two warehouses. Then, change their parent location to main location of warehouse A+B."
+msgid "Before creating any virtual stock locations, a new warehouse will need to be created. This new warehouse will act as a *virtual* warehouse, and will be the *parent* location of other physical warehouses."
 msgstr ""

-#: ../../content/applications/inventory_and_mrp/inventory/routes/concepts/stock_warehouses.rst:34
-msgid "Sell a product from the virtual warehouse"
+#: ../../content/applications/inventory_and_mrp/inventory/routes/concepts/stock_warehouses.rst:31
+msgid "Virtual warehouses are great for companies with multiple physical warehouses. This is because a situation might arise when one warehouse runs out of stock of a particular product, but another warehouse still has stock on-hand. In this case, stock from these two (or more) warehouses could be used to fulfill a single sales order."
 msgstr ""

 #: ../../content/applications/inventory_and_mrp/inventory/routes/concepts/stock_warehouses.rst:36
-msgid "Let's say you have two products, one stored in warehouse A and one stored in warehouse B. Now, you can create a new quotation for one of each product. Go to other information and choose Warehouse A+B in the shipping information."
+msgid "The \"virtual\" warehouse acts as a single aggregator of all the inventory stored in a company's physical warehouses, and is used (for traceability purposes) to create a hierarchy of locations in Odoo."
 msgstr ""

-#: ../../content/applications/inventory_and_mrp/inventory/routes/concepts/stock_warehouses.rst:41
-msgid "You might find it handy to set the Warehouse A+B as the default warehouse for each sales person. This way each sale will use the Warehouse A+B as the default warehouse option."
+#: ../../content/applications/inventory_and_mrp/inventory/routes/concepts/stock_warehouses.rst:43
+msgid "To create a new warehouse, go to :menuselection:`Inventory --> Configuration --> Warehouses`, and click :guilabel:`Create`. From here, the warehouse :guilabel:`Name` and :guilabel:`Short Name` can be changed, and other warehouse details can be changed under the :guilabel:`Warehouse Configuration` tab."
 msgstr ""

-#: ../../content/applications/inventory_and_mrp/inventory/routes/concepts/stock_warehouses.rst:47
-msgid "Once you have done it, you can convert it to a sales order. Then, a delivery order will be automatically generated, with a product reserved in warehouse A and one in warehouse B."
+#: ../../content/applications/inventory_and_mrp/inventory/routes/concepts/stock_warehouses.rst:48
+msgid "Under the :guilabel:`Shipments` heading, set the number of steps used to process :guilabel:`Incoming Shipments` and :guilabel:`Outgoing Shipments` by selecting between the :guilabel:`1 step`, :guilabel:`2 steps`, and :guilabel:`3 steps` radio buttons. The desired option for :guilabel:`Incoming Shipments` and :guilabel:`Outgoing Shipments` will depend on the warehouse's procurement process, and might differ for individual products or product categories."
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/inventory/routes/concepts/stock_warehouses.rst:55
+msgid ":doc:`How to choose the right flow to handle receipts? </applications/inventory_and_mrp/inventory/management/incoming/handle_receipts>`"
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/inventory/routes/concepts/stock_warehouses.rst:57
+msgid ":doc:`How to choose the right inventory flow to handle delivery orders? </applications/inventory_and_mrp/inventory/management/delivery/inventory_flow>`"
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/inventory/routes/concepts/stock_warehouses.rst:60
+msgid "Under the :guilabel:`Resupply` heading, configure the method(s) for how the warehouse resupplies its inventory:"
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/inventory/routes/concepts/stock_warehouses.rst:63
+msgid ":guilabel:`Resupply Subcontractors`: resupply subcontractors with components from this warehouse."
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/inventory/routes/concepts/stock_warehouses.rst:64
+msgid ":guilabel:`Manufacture to Resupply`: when products are manufactured, they can be manufactured in this warehouse."
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/inventory/routes/concepts/stock_warehouses.rst:66
+msgid ":guilabel:`Manufacture`: to produce right away, move the components to the production location directly and start the manufacturing process; to pick first and then produce, unload the components from the stock to input location first, and then transfer it to the production location."
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/inventory/routes/concepts/stock_warehouses.rst:70
+msgid ":guilabel:`Buy to Resupply`: when products are bought, they can be delivered to this warehouse."
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/inventory/routes/concepts/stock_warehouses.rst:71
+msgid ":guilabel:`Resupply From`: automatically create routes to resupply this warehouse from another chosen warehouse"
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/inventory/routes/concepts/stock_warehouses.rst:75
+msgid "*Routes* can be set and configured directly from the :guilabel:`Warehouse` form, by clicking on the :guilabel:`Routes` smart button. Once the warehouse is configured, virtual *Locations* can be created."
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/inventory/routes/concepts/stock_warehouses.rst:-1
+msgid "The edit screen for creating a new warehouse."
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/inventory/routes/concepts/stock_warehouses.rst:83
+msgid "In order to apply this virtual warehouse as the *parent* location of two *child* location warehouses, there need to be two warehouses configured with physical stock locations."
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/inventory/routes/concepts/stock_warehouses.rst:0
+msgid "**Parent Warehouse**"
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/inventory/routes/concepts/stock_warehouses.rst:0
+msgid ":guilabel:`Warehouse`: `Virtual Warehouse`"
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/inventory/routes/concepts/stock_warehouses.rst:0
+msgid ":guilabel:`Location`: `VWH`"
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/inventory/routes/concepts/stock_warehouses.rst:0
+msgid "**Child Warehouses**"
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/inventory/routes/concepts/stock_warehouses.rst:0
+msgid ":guilabel:`Warehouses`: `Warehouse A` and `Warehouse B`"
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/inventory/routes/concepts/stock_warehouses.rst:0
+msgid ":guilabel:`Locations`: `WHA/Stock` and `WHB/Stock`"
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/inventory/routes/concepts/stock_warehouses.rst:97
+msgid "Create a virtual parent location"
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/inventory/routes/concepts/stock_warehouses.rst:100
+msgid "In order to take stock from multiple warehouses to fulfill a sales order, there need to be at least **two** warehouses acting as *child locations* of the *virtual parent location* warehouse."
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/inventory/routes/concepts/stock_warehouses.rst:103
+msgid "To create and edit *Locations*, go to :menuselection:`Inventory --> Configuration --> Locations`. All :guilabel:`Locations` are listed here, including the *Stock* :guilabel:`Location` of the virtual warehouse that was created. Click into the *Stock* :guilabel:`Location` for the virtual warehouse that was previously created (:dfn:`Warehouse Name/Stock`)."
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/inventory/routes/concepts/stock_warehouses.rst:108
+msgid "Then, under the :guilabel:`Additional Information` section, change the :guilabel:`Location Type` from :guilabel:`Internal Location` to :guilabel:`View`. :guilabel:`Save` the changes."
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/inventory/routes/concepts/stock_warehouses.rst:111
+msgid "This identifies this :guilabel:`Location` as a *virtual location*, which is used to create a hierarchical structure for a warehouse and aggregate its *child locations*."
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/inventory/routes/concepts/stock_warehouses.rst:115
+msgid "Products can *not* be stored in a :guilabel:`View` :guilabel:`Location Type`."
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/inventory/routes/concepts/stock_warehouses.rst:-1
+msgid "Warehouse location types in location creation screen."
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/inventory/routes/concepts/stock_warehouses.rst:122
+msgid "Configure physical warehouse locations"
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/inventory/routes/concepts/stock_warehouses.rst:124
+msgid "Navigate back to the :guilabel:`Locations` overview (via the breadcrumbs), and remove any filters in the :guilabel:`Search Bar`. Then, click into the first physical warehouse :guilabel:`Location` that was previously created to be a *child location*, and click :guilabel:`Edit`."
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/inventory/routes/concepts/stock_warehouses.rst:128
+msgid "Under :guilabel:`Parent Location`, select the virtual warehouse from the drop-down menu, and :guilabel:`Save` changes. Then, navigate back to the :guilabel:`Locations` overview, and repeat this step for the second physical warehouse stock location. Be sure to :guilabel:`Save` changes again."
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/inventory/routes/concepts/stock_warehouses.rst:132
+msgid "Both locations are now *child locations* of the virtual warehouse *parent location*. This allows stock to be taken from multiple locations to fulfill a single sales order, if there is not enough stock in any one location (provided they are both tied to the same virtual warehouse *parent location*)."
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/inventory/routes/concepts/stock_warehouses.rst:138
+msgid "Example flow: Sell a product from a virtual warehouse"
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/inventory/routes/concepts/stock_warehouses.rst:141
+msgid "To sell products from multiple warehouses using a virtual *parent* location in this flow, there must be at least **two** products and at least **two** warehouses configured - with at least **one** product with quantity on-hand in each warehouse, respectively."
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/inventory/routes/concepts/stock_warehouses.rst:145
+msgid "To create a new request for quotation, or RFQ, navigate to the :menuselection:`Sales` app, and click :guilabel:`Create` from the :guilabel:`Quotations` overview. Fill out the information on the new quotation by adding a :guilabel:`Customer`, and click :guilabel:`Add a product` to add the two products stored in the two warehouses."
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/inventory/routes/concepts/stock_warehouses.rst:150
+msgid "Then, click the :guilabel:`Other Info` tab on the sales order form. Under the :guilabel:`Delivery` section, change the :guilabel:`Warehouse` field value listed to the virtual warehouse that was previously created. Once the warehouse has been changed, click :guilabel:`Confirm` to convert the quotation into a sales order."
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/inventory/routes/concepts/stock_warehouses.rst:155
+msgid "Now that the quotation has been confirmed as a sales order, click the :guilabel:`Delivery` smart button. From the warehouse delivery form, confirm that the :guilabel:`Source Location` value matches the :guilabel:`Warehouse` field value from the sales order. Both should list the virtual warehouse location."
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/inventory/routes/concepts/stock_warehouses.rst:161
+msgid "The :guilabel:`Source Location` on the warehouse delivery form and the :guilabel:`Warehouse` under the :guilabel:`Other Info` tab on the sales order form *must* match in order for the products included in the sales order to be pulled from different warehouses."
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/inventory/routes/concepts/stock_warehouses.rst:165
+msgid "If the virtual warehouse is not the value in the :guilabel:`Source Location` field on the warehouse delivery form, then click :guilabel:`Edit`, make the change, and click :guilabel:`Save`."
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/inventory/routes/concepts/stock_warehouses.rst:168
+msgid "If the virtual warehouse is not the value in the :guilabel:`Warehouse` field on the sales order, then a new quotation may need to be generated."
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/inventory/routes/concepts/stock_warehouses.rst:170
+msgid "If whe :guilabel:`Warehouse` field is missing on the sales order form, then the virtual warehouse (and its children warehouses) may not have been set up correctly, in which case, review the documentation above again to make sure all settings/configuration were done properly."
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/inventory/routes/concepts/stock_warehouses.rst:-1
+msgid "Delivery order with matching source and child locations."
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/inventory/routes/concepts/stock_warehouses.rst:178
+msgid "Finally, on the warehouse delivery form, under the :guilabel:`Detailed Operations` tab, confirm that the *Locations* values under the :guilabel:`From` column for each product matches to the *child locations* that are tied to the virtual *parent location*."
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/inventory/routes/concepts/stock_warehouses.rst:183
+msgid "To view which *Locations* the products are coming from on the drop-down menus, click the :guilabel:`internal link (arrow)` icon to expand the *Location* information. If needed, it can be changed from here (granted there is quantity on hand for the product in that location)."
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/inventory/routes/concepts/stock_warehouses.rst:187
+msgid "Once everything has been properly set, click :guilabel:`Validate` and then :guilabel:`Apply` to validate the delivery. Then, navigate back to the sales order form (via the breadcrumbs), and click :guilabel:`Create Invoice` to invoice for the sales order."
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/inventory/routes/concepts/stock_warehouses.rst:192
+msgid "To use a virtual *parent* location as the default warehouse for sales orders, each salesperson can have the virtual warehouse assigned to them from the drop-down menu next to :guilabel:`Default Warehouse` on their employee form."
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/inventory/routes/concepts/stock_warehouses.rst:-1
+msgid "Default warehouse location on employee form."
 msgstr ""

 #: ../../content/applications/inventory_and_mrp/inventory/routes/concepts/use_routes.rst:3
@ -5107,6 +5284,130 @@ msgstr ""
 msgid ":doc:`IoT Boxes (MES) </applications/productivity/iot>`"
 msgstr ""

+#: ../../content/applications/inventory_and_mrp/manufacturing/maintenance.rst:5
+msgid "Maintenance"
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/manufacturing/maintenance/add_new_equipment.rst:3
+msgid "Add new equipment"
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/manufacturing/maintenance/add_new_equipment.rst:5
+msgid "In Odoo, **equipment** refers to any item that is used in everyday operations, including the manufacturing of products. This can mean a piece of machinery on a production line, a tool that is used in different locations, or a computer in an office space. Equipment registered in Odoo can be owned by the company that uses the Odoo database, or by a third party, such as a vendor in the case of equipment rentals."
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/manufacturing/maintenance/add_new_equipment.rst:11
+msgid "Using Odoo **Maintenance**, it is possible to track individual pieces of equipment, along with information about their maintenance requirements. To add a new piece of equipment, navigate to the :guilabel:`Maintenance` module, select :menuselection:`Equipments --> Machines & Tools --> Create`, and configure the equipment as follows:"
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/manufacturing/maintenance/add_new_equipment.rst:16
+msgid ":guilabel:`Equipment Name`: the product name of the piece of equipment"
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/manufacturing/maintenance/add_new_equipment.rst:17
+msgid ":guilabel:`Equipment Category`: the category that the equipment belongs to; for example, computers, machinery, tools, etc.; new categories can be created by navigating to :menuselection:`Configuration --> Equipment Categories` and clicking :guilabel:`Create`"
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/manufacturing/maintenance/add_new_equipment.rst:20
+msgid ":guilabel:`Company`: the company that owns the equipment; again, this can be the company that uses the Odoo database, or a third-party company"
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/manufacturing/maintenance/add_new_equipment.rst:22
+msgid ":guilabel:`Used By`: specify if the equipment is used by a specific employee, department, or both; select :guilabel:`Other` to specify both an employee and a department"
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/manufacturing/maintenance/add_new_equipment.rst:24
+msgid ":guilabel:`Maintenance Team`: the team responsible for servicing the equipment; new teams can be created by navigating to :menuselection:`Configuration --> Maintenance Teams` and selecting :guilabel:`Create`; the members of each team can also be assigned from this page"
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/manufacturing/maintenance/add_new_equipment.rst:27
+msgid ":guilabel:`Technician`: the person responsible for servicing the equipment; this can be used to assign a specific individual in the event that no maintenance team is assigned or when a specific member of the assigned team should always be responsible for the equipment; any person added to Odoo as a user can be assigned as a technician"
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/manufacturing/maintenance/add_new_equipment.rst:31
+msgid ":guilabel:`Used in location`: the location where the equipment is used; this is a simple text field that can be used to specify locations that are not work centers, like an office, for example"
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/manufacturing/maintenance/add_new_equipment.rst:34
+msgid ":guilabel:`Work Center`: if the equipment is used at a work center, specify it here; equipment can also be assigned to a work center by navigating to :menuselection:`Maintenance --> Equipments --> Work Centers`, selecting a work center or creating a new one using the :guilabel:`Create` button, and clicking the :guilabel:`Equipment` tab on the work center form"
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/manufacturing/maintenance/add_new_equipment.rst:-1
+msgid "An example of a fully configured new equipment form."
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/manufacturing/maintenance/add_new_equipment.rst:44
+msgid "Include additional product information"
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/manufacturing/maintenance/add_new_equipment.rst:46
+msgid "The :guilabel:`Product Information` tab at the bottom of the form can be used to provide further details about the piece of equipment:"
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/manufacturing/maintenance/add_new_equipment.rst:49
+msgid ":guilabel:`Vendor`: the vendor that the equipment was purchased from"
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/manufacturing/maintenance/add_new_equipment.rst:50
+msgid ":guilabel:`Vendor Reference`: the reference code assigned to the vendor"
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/manufacturing/maintenance/add_new_equipment.rst:51
+msgid ":guilabel:`Model`: the specific model of the piece of equipment"
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/manufacturing/maintenance/add_new_equipment.rst:52
+msgid ":guilabel:`Serial Number`: the unique serial number of the equipment"
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/manufacturing/maintenance/add_new_equipment.rst:53
+msgid ":guilabel:`Effective Date`: the date that the equipment became available for use; this is used to calculate the :abbr:`MTBF (Mean Time Between Failures)`"
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/manufacturing/maintenance/add_new_equipment.rst:55
+msgid ":guilabel:`Cost`: the amount the equipment was purchased for"
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/manufacturing/maintenance/add_new_equipment.rst:56
+msgid ":guilabel:`Warranty Expiration Date`: the date on which the equipment's warranty will expire"
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/manufacturing/maintenance/add_new_equipment.rst:-1
+msgid "The product information tab for the new piece of equipment."
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/manufacturing/maintenance/add_new_equipment.rst:63
+msgid "Add maintenance details"
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/manufacturing/maintenance/add_new_equipment.rst:65
+msgid "The :guilabel:`Maintenance` tab includes information that can be useful to maintenance teams:"
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/manufacturing/maintenance/add_new_equipment.rst:67
+msgid ":guilabel:`Preventive Maintenance Frequency`: specifies how often maintenance should be performed to prevent equipment failure"
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/manufacturing/maintenance/add_new_equipment.rst:69
+msgid ":guilabel:`Maintenance Duration`: the amount of time required to fix the equipment when it fails"
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/manufacturing/maintenance/add_new_equipment.rst:70
+msgid ":guilabel:`Expected Mean Time Between Failure`: the average amount of time that the equipment is expected to operate before failing"
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/manufacturing/maintenance/add_new_equipment.rst:-1
+msgid "The maintenance tab for the new piece of equipment."
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/manufacturing/maintenance/add_new_equipment.rst:78
+msgid "The :guilabel:`Maintenance` tab also includes sections for :guilabel:`Mean Time Between Failure`, :guilabel:`Estimated Next Failure`, :guilabel:`Latest Failure`, and :guilabel:`Mean Time To Repair`. These values are calculated automatically based on maintenance requests if any exist."
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/manufacturing/maintenance/add_new_equipment.rst:84
+msgid "To see the maintenance requests for a piece of equipment, go to the page for the equipment and select :guilabel:`Maintenance` in the top right corner of the form."
+msgstr ""
+
 #: ../../content/applications/inventory_and_mrp/manufacturing/management.rst:5
 msgid "Manufacturing management"
 msgstr ""
@ -6360,160 +6661,443 @@ msgstr ""
 msgid "Manage deals"
 msgstr ""

-#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/agreements.rst:3
-msgid "Purchase agreements: blanket orders and calls for tenders"
+#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/blanket_orders.rst:3
+msgid "Use blanket orders to create purchase agreements with vendors"
 msgstr ""

-#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/agreements.rst:5
-msgid "There are two main types of purchase agreements preconfigured in Odoo: blanket orders and call for tenders."
+#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/blanket_orders.rst:5
+msgid "Blanket orders are long-term purchase agreements between a company and a vendor to deliver products on a recurring basis with predetermined pricing. Using blanket orders are useful when products are always purchased from the same vendor, but in different quantities at different times."
 msgstr ""

-#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/agreements.rst:8
-msgid "Blanket orders are long-term agreements between a company and a vendor to deliver products on a recurring basis with predetermined pricing. Your company should consider using them when you frequently purchase the same products from the same vendor in varying quantities and/or at different times. Among their many benefits, you can save time as the ordering process is simplified, and money thanks to more advantageous bulk pricing."
+#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/blanket_orders.rst:9
+msgid "By simplifying the ordering process, blanket orders not only save time, they also save money, since they can be advantageous when negotiating bulk pricing with vendors."
 msgstr ""

-#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/agreements.rst:14
-msgid "Calls for tenders use a special procedure to request offers from multiple vendors at the same time. While public sector organizations are often legally bound to release calls for tenders when they want to purchase goods or services, private organizations can also use them to get the best deal among several vendors."
+#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/blanket_orders.rst:13
+msgid ":doc:`calls_for_tenders`"
 msgstr ""

-#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/agreements.rst:20
-msgid "Enable purchase agreements"
+#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/blanket_orders.rst:16
+msgid "Create a new blanket order"
 msgstr ""

-#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/agreements.rst:22
-msgid "From the Purchase app, go to :menuselection:`Configuration --> Settings` and activate *Purchase Agreements*."
+#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/blanket_orders.rst:18
+msgid "To create blanket orders, the *Purchase Agreements* feature first needs to be enabled in the settings of the *Purchase* app. To do this, go to :menuselection:`Purchase --> Configuration --> Settings`, and under the :guilabel:`Orders` section, click the checkbox next to :guilabel:`Purchase Agreements`. Doing so will enable the ability to create blanket orders, as well as alternative requests for quotation (RFQs)."
 msgstr ""

-#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/agreements.rst:-1
-msgid "Enable purchase agreements in Odoo Purchase"
+#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/blanket_orders.rst:-1
+msgid "Purchase Agreements enabled in the Purshase app settings."
 msgstr ""

-#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/agreements.rst:30
-msgid "Configure or create new types of purchase agreements"
+#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/blanket_orders.rst:28
+msgid "To create a blanket order, go to :menuselection:`Purchase --> Orders --> blanket orders`, and click :guilabel:`New`. This creates (and navigates to) a new blanket order form."
 msgstr ""

-#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/agreements.rst:32
-msgid "Before you start using purchase agreements, make sure they are configured the way you want by going to :menuselection:`Configuration --> Purchase Agreement Types`. From there, you can edit the way blanket orders and calls for tenders or *Create* a new type of purchase agreement. You can configure the:"
+#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/blanket_orders.rst:31
+msgid "From this new blanket order form, different fields and settings can be configured, so there are pre-determined rules that the recurring long-term agreement must follow:"
 msgstr ""

-#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/agreements.rst:37
-msgid "Agreement Type: the name you want to give to the agreement."
+#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/blanket_orders.rst:34
+msgid ":guilabel:`Purchase Representative`: is the user assigned to this specific blanket order. By default, this is the user who created the agreement; the user can be changed directly from the drop-down menu next to this field."
 msgstr ""

-#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/agreements.rst:39
-msgid "Agreement Selection Type: you can either select multiple offers using *Select multiple RFQ (non-exclusive)*, which is the default setting for both blanket orders and calls for tenders, or a single offer using *Select only one RFQ (exclusive)*, which is sometimes needed for calls for tenders where you only want to select a single vendor."
+#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/blanket_orders.rst:37
+msgid ":guilabel:`Agreement Type`: is the type of purchase agreement this blanket order is classified as. In Odoo, blanket orders are the only official purchase agreement."
 msgstr ""

-#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/agreements.rst:44
-msgid "Lines: generally, you would always want to select *Use lines of agreement*, which are the different product lines you can configure when you set up your purchase agreement. However, you can select *Do not create RfQ lines automatically* if you don't want your requests for quotations to be pre-filled in with that information."
+#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/blanket_orders.rst:39
+msgid ":guilabel:`Vendor`: is the supplier to whom this agreement is tied, either once or on a recurring basis. The vendor can be selected directly from the drop-down menu next to this field."
 msgstr ""

-#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/agreements.rst:49
-msgid "Quantities: if you use lines of agreements, you can also specify independently if the products' quantities should be used to pre-fill new requests for quotations. The default option for blanket orders is *Set quantities manually*, while for calls for tenders are set to *Use quantities of agreement*."
+#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/blanket_orders.rst:41
+msgid ":guilabel:`Currency`: is the agreed-upon currency that will be used for this exchange. If multiple currencies have been activated in the database, the currency can be changed from the drop-down menu next to this field."
 msgstr ""

-#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/agreements.rst:-1
-msgid "Configure purchase agreements types in Odoo Purchase"
+#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/blanket_orders.rst:44
+msgid ":guilabel:`Agreement Deadline`: is the date that this purchase agreement will be set to expire on (if desired). If this blanket order should not expire, leave this field blank."
 msgstr ""

-#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/agreements.rst:59
-msgid "Set up a blanket order"
+#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/blanket_orders.rst:46
+msgid ":guilabel:`Ordering Date`: is the date that this blanket order should be placed on if a new quotation is created directly from the blanket order form. If a new quotation is created, this value will automatically populate the *Order Deadline* field on the :abbr:`RFQ (Request for Quotation)`."
 msgstr ""

-#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/agreements.rst:61
-msgid "Go to :menuselection:`Orders --> Purchase Agreements` and click on *Create*. Select *Blanket Order* as your *Agreement Type*. Next, select the vendor. The other fields aren't mandatory."
+#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/blanket_orders.rst:50
+msgid ":guilabel:`Delivery Date`: is the expected delivery date that the products included in an :abbr:`RFQ (Request for Quotation)` created directly from the blanket order form will be expected to arrive. If a new quotation is created, this value will automatically populate the *Expected Arrival* field on the :abbr:`RFQ (Request for Quotation)`."
 msgstr ""

-#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/agreements.rst:64
-msgid "Next, add the products you want to order and their price. Note that you can also add a *Quantity* for each product, for example, if you have agreed with your vendor to order a specific minimum quantity each time or in total. If you have configured your blanket order to *Set quantities manually*, this is only used for informational purposes."
+#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/blanket_orders.rst:54
+msgid ":guilabel:`Source Document`: is the source purchase order (PO) that this blanket order will be tied to. If this blanket order should not be tied to any existing :abbr:`POs (Purchase Orders)`, leave this field blank."
 msgstr ""

-#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/agreements.rst:-1
-msgid "Set up a blanket order in Odoo Purchase"
+#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/blanket_orders.rst:57
+msgid ":guilabel:`Company`: is the company assigned to this specific blanket order. By default, this is the company that the user creating the blanket order is listed under. If the database is not a multi-company database, this field can not be changed, and will default to the only company listed in the database."
 msgstr ""

-#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/agreements.rst:73
-msgid "You can also write any *Terms and Conditions* at the bottom of the agreement. Once you are satisfied with your blanket order, click on *Confirm*. Its status then changes from *Draft* to *Ongoing* and it's ready to be used."
+#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/blanket_orders.rst:-1
+msgid "New blanket order purchase agreement with added products."
 msgstr ""

-#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/agreements.rst:78
-msgid "Create requests for quotation from the blanket order"
+#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/blanket_orders.rst:66
+msgid "Once all relevant fields have been filled out, click :guilabel:`Add a line` to add products under the :guilabel:`Product` column. Then, change the quantity of each product in the :guilabel:`Quantity` column (if desired), and set a price in the :guilabel:`Unit Price` column."
 msgstr ""

-#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/agreements.rst:80
-msgid "You can now create new quotations from the blanket order whenever you need it by clicking on *New Quotation*. Odoo automatically fills in requests for quotation with the information initially defined when you set up the blanket order. Depending on the way you configured the *Purchase Agreement Type*, product lines can also be pre-filled."
+#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/blanket_orders.rst:71
+msgid "When adding products to a new blanket order, the pre-existing prices of products will not be added automatically to the product lines. The prices must be manually assigned by changing the value in the :guilabel:`Unit Price` column to an agreed-upon price with the listed vendor. Otherwise, the price will remain **0**."
 msgstr ""

-#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/agreements.rst:85
-msgid "From here, you can quickly view all the requests for quotations made under that blanket order by clicking on *RFQs/Orders*."
+#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/blanket_orders.rst:76
+msgid "To view and change the default purchase agreement settings for blanket orders directly from the blanket order form, click the :guilabel:`internal link (arrow icon)` next to the :guilabel:`Agreement Type` field where :guilabel:`Blanket Order` is listed. This navigates to the blanket order settings."
 msgstr ""

-#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/agreements.rst:-1
-msgid "Create new quotations for an ongoing blanket order in Odoo Purchase"
+#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/blanket_orders.rst:81
+msgid "From here, the settings for blanket orders can be edited. Under the :guilabel:`Agreement Type` section, the name of the :guilabel:`Agreement Type` can be changed (if desired), and the :guilabel:`Agreement Selection Type` can be changed, as well. There are two options that can be activated for the type of selection:"
 msgstr ""

-#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/agreements.rst:93
-msgid "You can also create a *Request for Quotation* the usual way and then link it to an existing *Blanket Order*."
+#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/blanket_orders.rst:86
+msgid ":guilabel:`Select only one RFQ (exclusive)`: when a purchase order is confirmed, the remaining purchase orders will be canceled."
 msgstr ""

-#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/agreements.rst:97
+#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/blanket_orders.rst:88
+msgid ":guilabel:`Select multiple RFQ (non-exclusive)`: when a purchase order is confirmed, remaining purchase orders will ***not** be canceled. Instead, multiple purchase orders are allowed."
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/blanket_orders.rst:91
+msgid "Under the :guilabel:`Data For New Quotations` section, the settings for how product lines and quantities will be populated on new quotations using this purchase agreeement can be changed next to the :guilabel:`Lines` and :guilabel:`Quantities` fields."
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/blanket_orders.rst:-1
+msgid "Purchase Agreement type edit screen for blanket orders."
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/blanket_orders.rst:99
+msgid "There are two options that can be activated for :guilabel:`Lines`:"
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/blanket_orders.rst:101
+msgid ":guilabel:`Use lines of agreement`: when creating a new quotation, the product lines will pre-populate with the same products listed on the blanket order, if said blanket order is chosen on the new quotation."
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/blanket_orders.rst:104
+msgid ":guilabel:`Do not create RfQ lines automatically`: when creating a new quotation and selecting an existing blanket order, the settings will carry over to the new quotation, but the product lines will not populate."
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/blanket_orders.rst:108
+msgid "And, there are two options that can be activated for :guilabel:`Quantities`:"
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/blanket_orders.rst:110
+msgid ":guilabel:`Use quantities of agreement`: when creating a new quotation, the product quantities listed on the blanket order will pre-populate on the product lines, if said blanket order is chosen on the new quotation."
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/blanket_orders.rst:113
+msgid ":guilabel:`Set quantities manually`: when creating a new quotation and selecting an existing blanket order, the product lines will pre-populate, but all quantities will be set to **0**. The quantities will need to be manually set by the user."
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/blanket_orders.rst:117
+msgid "Once the desired changes have been made (if any), click :guilabel:`New` (via the breadcrumbs, at the top of the page) to navigate back to the blanket order form, and click :guilabel:`Confirm` to save this new purchase agreement. Once confirmed, the blanket order changes from *Draft* to *Ongoing*, meaning this agreement can be selected and used when creating new :abbr:`RFQs (Requests for Quotation)`."
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/blanket_orders.rst:124
+msgid "After creating and confirming a blanket order, products, quantities, and prices can still be edited, added, and removed from the purchase agreement."
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/blanket_orders.rst:128
+msgid "Create a new :abbr:`RFQ (Request for Quotation)` from the blanket order"
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/blanket_orders.rst:130
+msgid "After confirming a blanket order, new quotations can be created directly from the blanket order form that will use the rules set on the form and pre-populate the new quotation with the correct information. Additionally, this new quotation will be automatically linked to this blanket order form via the :guilabel:`RFQs/Orders` smart button at the top right of the form."
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/blanket_orders.rst:135
+msgid "To create a new quotation from the blanket order form, click :guilabel:`New Quotation`. This creates (and navigates to) a new :abbr:`RFQ (Request for Quotation)`, that is pre-populated with the correct information, depending on the settings configured on the blanket order form."
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/blanket_orders.rst:139
+msgid "From the new :abbr:`RFQ (Request for Quotation)` form, click :guilabel:`Send by Email` to compose and send an email to the listed vendor; click :guilabel:`Print RFQ` to generate a printable PDF of the quotation; or, once ready, click :guilabel:`Confirm Order` to confirm the purchase order (PO)."
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/blanket_orders.rst:-1
+msgid "New quotation with copied products and rules from blanket order."
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/blanket_orders.rst:147
+msgid "Once the :abbr:`PO (Purchase Order)` has been confirmed, click back to the blanket order form (via the breadcrumbs, at the top of the page). From the blanket order form, there is now one :abbr:`RFQ (Request for Quotation)` listed in the :guilabel:`RFQs/Orders` smart button at the top right of the form. Click the :guilabel:`RFQs/Orders` smart button to see the purchase order that was just created."
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/blanket_orders.rst:-1
+msgid "RFQs and Orders smart button from blanket order form."
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/blanket_orders.rst:157
+msgid "Create a new blanket order from an :abbr:`RFQ (Request for Quotation)`"
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/blanket_orders.rst:159
+#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/calls_for_tenders.rst:49
+#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/calls_for_tenders.rst:148
+msgid "To create a new :abbr:`RFQ (Request for Quotation)`, navigate to the :menuselection:`Purchase` app, and click :guilabel:`New`."
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/blanket_orders.rst:162
+msgid "Then, add information to the :abbr:`RFQ (Request for Quotation)` form: add a vendor from the drop-down menu next to the :guilabel:`Vendor` field, and click :guilabel:`Add a product` to select a product from the drop-down menu in the :guilabel:`Product` column. Then, set the desired purchase quantity in the :guilabel:`Quantity` column, and change the purchase price in the :guilabel:`Unit Price` column, if desired."
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/blanket_orders.rst:168
+msgid "Clicking the :guilabel:`additional options (two-dots)` icon provides additional visibility options to add to the line item. Repeat these steps to add as many additional options as desired, including the :guilabel:`UoM` (Units of Measure) to purchase the products in, and the :guilabel:`Expected Arrival` date."
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/blanket_orders.rst:173
+msgid "Before confirming the new quotation and creating a purchase order, click the drop-down menu next to the :guilabel:`Blanket Order` field, and type a new name for the new blanket order. This creates a brand new purchase agreement, and saves the information entered in the fields of the purchase order form, as well as the product information entered on the product lines."
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/blanket_orders.rst:178
+msgid "From the new :abbr:`RFQ (Request for Quotation)` form, click :guilabel:`Send by Email` to compose and send an email to the listed vendor; click :guilabel:`Print RFQ` to generate a printable PDF of the quotation; or, once ready, click :guilabel:`Confirm Order` to confirm the :abbr:`PO (purchase order)`."
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/blanket_orders.rst:-1
+msgid "New blanket order created directly from quotation."
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/blanket_orders.rst:188
+msgid "To see the newly-created blanket order purchase agreement, go to :menuselection:`Orders --> Blanket Orders`, and click into the new blanket order. From here, settings and rules can be changed, if desired."
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/blanket_orders.rst:193
 msgid "Blanket orders and replenishment"
 msgstr ""

-#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/agreements.rst:99
-msgid "Blanket orders can be used for :doc:`automated replenishment <../../purchase/products/reordering>`, as once a blanket order is confirmed, a new vendor line is added to your product. Make sure the related vendor is in the first position if you have several vendors linked to your product."
+#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/blanket_orders.rst:195
+msgid "Once a blanket order is confirmed, a new vendor line is added under the :guilabel:`Purchase` tab of of the products included in the :abbr:`BO (Blanket Order)`. This makes blanket orders useful with :doc:`automated replenishment <../../purchase/products/reordering>`, because information about the :guilabel:`Vendor`, :guilabel:`Price`, and the :guilabel:`Agreement` are referenced on the vendor line. This information is used to determine where, when, and for what price this product could be replenished."
 msgstr ""

-#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/agreements.rst:-1
-msgid "Blanket order added to product configuration in Odoo Purchase"
+#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/blanket_orders.rst:-1
+msgid "Product form with replenishment agreement linked to blanket order."
 msgstr ""

-#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/agreements.rst:108
-msgid "Set up a call for tenders"
+#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/calls_for_tenders.rst:3
+msgid "Create alternative requests for quotation for multiple vendors"
 msgstr ""

-#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/agreements.rst:110
-msgid "Go to :menuselection:`Orders --> Purchase Agreements` and click on *Create*. Select *Call for Tenders* as your *Agreement Type*. The other fields aren't mandatory, but you can add the date you want to be delivered and set an agreement deadline. You usually don't want to select a vendor for calls for tenders as you are looking to get quotations from multiple vendors."
+#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/calls_for_tenders.rst:5
+msgid "Sometimes, companies might want to request offers from multiple vendors at the same time, by inviting those vendors to submit offers for similar goods or services all at once. This helps companies to select the cheapest (and fastest) vendors, depending on their specific business needs."
 msgstr ""

-#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/agreements.rst:115
-msgid "Next, add the products you want to order and in what quantity. For calls for tenders, you typically don't add a price, as the vendors should give you their best quote."
+#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/calls_for_tenders.rst:9
+msgid "In Odoo, this can be done by adding alternative requests for quotation (RFQs) for different vendors. Once a response is received from each vendor, the product lines from each :abbr:`RFQ (Request for Quotation)` can be compared, and a decision can be made for which products to purchase from which vendors."
 msgstr ""

-#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/agreements.rst:118
-msgid "You can also write any *Terms and Conditions* at the bottom of the agreement. Once you are ready, click on *Confirm*."
+#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/calls_for_tenders.rst:14
+msgid "Sometimes referred to as a *call for tender*, this process is primarily used by organizations in the public sector, who are legally bound to use it when making a purchase. However, private companies can also use alternative :abbr:`RFQs (Requests for Quotation)` to spend money efficiently, as well."
 msgstr ""

-#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/agreements.rst:-1
-msgid "Set up a call for tenders in Odoo Purchase"
+#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/calls_for_tenders.rst:20
+msgid ":doc:`blanket_orders`"
 msgstr ""

-#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/agreements.rst:126
-msgid "Requests quotations from the call for tenders"
+#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/calls_for_tenders.rst:23
+msgid "Configure purchase agreement settings"
 msgstr ""

-#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/agreements.rst:128
-msgid "You can now request new quotations from the call for tenders. Click on *New Quotation* and select one of your vendors you want to invite to the call for tenders. Product lines should also be pre-filled in, depending on how you configured the *Purchase Agreement Type*. Click on *Send by email* to send it to the vendor. Go back to the call for tenders and repeat this process for each vendor."
+#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/calls_for_tenders.rst:25
+msgid "To create alternative :abbr:`RFQs (Requests for Quotation)` directly from a quotation, the *Purchase Agreements* feature first needs to be enabled in the settings of the *Purchase* app. To do this, go to :menuselection:`Purchase --> Configuration --> Settings`, and under the :guilabel:`Orders` section, click the checkbox next to :guilabel:`Purchase Agreements`. Doing so will enable the ability to create alternative :abbr:`RFQs (Requests for Quotation)`, as well as the ability to create *blanket orders*."
 msgstr ""

-#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/agreements.rst:-1
-msgid "Request a quotation from a call for tenders in Odoo Purchase"
+#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/calls_for_tenders.rst:-1
+msgid "Purchase Agreements enabled in the Purchase app settings."
 msgstr ""

-#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/agreements.rst:138
-msgid "Once you have sent a request for quotation to every vendor and receiving their quotes, click on *Validate* to proceed to the bid selection. Next, click on the RFQs/Orders smart button to view all your vendors' quotations."
+#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/calls_for_tenders.rst:37
+msgid "To save time on a *call for tender*, custom vendors, prices, and delivery lead times can be set in the :guilabel:`Purchase` tab on a product form. To do so, navigate to :menuselection:`Purchase --> Products --> Products`, and select a product to edit. From the product form, click the :guilabel:`Purchase tab`, then click :guilabel:`Add a line`. From the drop-down menu, choose a vendor to set under the :guilabel:`Vendor` column, and set a :guilabel:`Price` and :guilabel:`Delivery Lead Time` if desired. Clicking the :guilabel:`additional options (two-dots)` icon provides additional visibility options to add to the line item."
 msgstr ""

-#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/agreements.rst:-1
-msgid "Validate a call for tenders and view all quotations in Odoo Purchase"
+#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/calls_for_tenders.rst:47
+msgid "Create an :abbr:`RFQ (Request for Quotation)`"
 msgstr ""

-#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/agreements.rst:146
-msgid "Click on each request for quotation to add the price communicated by your vendors manually. When that's done, select the most advantageous offer and click on *Confirm Order*. This automatically closes the call for tenders. You can now proceed with the purchase order as you would for a regular one."
+#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/calls_for_tenders.rst:52
+#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/calls_for_tenders.rst:151
+msgid "Then, add information to the :abbr:`RFQ (Request for Quotation)` form: add a vendor from the drop-down next to the :guilabel:`Vendor` field, and click :guilabel:`Add a product` to select a product from the drop-down menu in the :guilabel:`Product` column. Then, set the desired purchase quantity in the :guilabel:`Quantity` column, and change the purchase price in the :guilabel:`Unit Price` column, if desired."
 msgstr ""

-#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/agreements.rst:-1
-msgid "Confirm an order in Odoo Purchase"
+#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/calls_for_tenders.rst:58
+msgid "Clicking the :guilabel:`additional options (two-dots)` icon provides additional visibility options to add to the line item. Repeat these steps to add as many options as desired, including the :guilabel:`UoM` (Units of Measure) to purchase the products in, and the :guilabel:`Expected Arrival` date."
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/calls_for_tenders.rst:63
+msgid "Once ready, click :guilabel:`Send by Email`. This causes a :guilabel:`Compose Email` pop-up window to appear, wherein the message to the vendor can be customized. Once ready, click :guilabel:`Send`. This turns the :abbr:`RFQ (Request for Quotation)` into a purchase order (PO), and sends an email to the vendor listed on the purchase order form."
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/calls_for_tenders.rst:-1
+msgid "Compose and send quotation email pop-up."
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/calls_for_tenders.rst:73
+msgid "Sending emails to each vendor can be useful when creating alternative :abbr:`RFQs (Requests for Quotation)`, because vendors can confirm if their past prices still hold today, which can help companies choose the best offers for them."
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/calls_for_tenders.rst:78
+msgid "Create alternatives to an :abbr:`RFQ (Request for Quotation)`"
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/calls_for_tenders.rst:80
+msgid "Once a :abbr:`PO (Purchase Order)` is created and sent by email to a vendor, alternative :abbr:`RFQs (Requests for Quotation)` can be created and sent to additional, alternate vendors to compare prices, delivery times, and other factors to make a decision from which vendors to order which products."
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/calls_for_tenders.rst:85
+msgid "To create alternative :abbr:`RFQs (Requests for Quotation)`, click the :guilabel:`Alternatives` tab from the purchase order form, then click :guilabel:`Create Alternative`. When clicked, a :guilabel:`Create alternative` pop-up window appears."
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/calls_for_tenders.rst:-1
+msgid "Calls for tenders pop-up to create alternative quotation."
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/calls_for_tenders.rst:93
+msgid "From this window, select a new/different vendor from the drop-down menu next to the :guilabel:`Vendor` field to assign this alternative quotation to."
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/calls_for_tenders.rst:96
+msgid "Next to this, there is a :guilabel:`Copy Products` checkbox that is selected by default. When selected, the product quantities of the original :abbr:`PO (Purchase Order)` are copied to the alternative. For this first alternative quotation, leave the checkbox checked. Once finished, click :guilabel:`Create Alternative`. This creates (and navigates to) a new :abbr:`PO (Purchase Order)`."
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/calls_for_tenders.rst:101
+msgid "Since the :guilabel:`Create Alternative` checkbox was left checked, this new purchase order form is already populated with the same products, quantities, and other details as the previous, original :abbr:`PO (Purchase Order)`."
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/calls_for_tenders.rst:106
+msgid "When the :guilabel:`Copy Products` checkbox is selected while creating an alternative quotation, additional products do not need to be added on the purchase order form unless desired. However, if a chosen vendor is listed in the :guilabel:`Vendor` column under the :guilabel:`Purchase` tab on a product form included in the purchase order, the values set on the product form carry over to the :abbr:`PO (Purchase Order)`, and have to be changed manually, if desired."
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/calls_for_tenders.rst:112
+msgid "Once ready, create a second alternative quotation by clicking the :guilabel:`Alternatives` tab, and once again, click :guilabel:`Create Alternative`. This causes the :guilabel:`Create alternative` pop-up window to appear again. This time, choose a different vendor from the drop-down menu next to :guilabel:`Vendor`, and this time, *uncheck* the :guilabel:`Copy Products` checkbox. Then, click :guilabel:`Create Alternative`."
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/calls_for_tenders.rst:119
+msgid "If an alternative quotation needs to be removed from the :guilabel:`Alternatives` tab, they can be individually removed by clicking on the :guilabel:`Remove (X)` icon at the end of their row."
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/calls_for_tenders.rst:122
+msgid "This creates a third, new purchase order. But, since the product quantities of the original :abbr:`PO (Purchase Order)` were *not* copied over, the product lines are empty, and new products need to be added by clicking :guilabel:`Add a product`, and selecting the desired products from the drop-down menu. Once the desired number of products are added, click :guilabel:`Send by Email`."
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/calls_for_tenders.rst:-1
+msgid "Blank alternative quotation with alternatives in breadcrumbs."
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/calls_for_tenders.rst:131
+msgid "This causes a :guilabel:`Compose Email` pop-up window to appear, wherein the message to the vendor can be customized. Once ready, click :guilabel:`Send` to send an email to the vendor listed on the purchase order form."
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/calls_for_tenders.rst:135
+msgid "From this newest purchase order form, click the :guilabel:`Alternatives` tab. Under this tab, all three purchase orders can be seen in the :guilabel:`Reference` column. Additionally, the vendors are listed under the :guilabel:`Vendor` column, and the order :guilabel:`Total` and :guilabel:`Status` of the orders are in the rows, as well."
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/calls_for_tenders.rst:141
+msgid "Link a new :abbr:`RFQ (Request for Quotation)` to existing quotations"
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/calls_for_tenders.rst:143
+msgid "Creating alternative quotations directly from a purchase order form under the :guilabel:`Alternatives` tab is the easiest way to create and link quotations. However, separate :abbr:`RFQs (Requests for Quotation)` can also be linked *after* the fact, even if they are created completely separately at first."
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/calls_for_tenders.rst:157
+msgid "Once ready, click :guilabel:`Send by Email`. This causes a :guilabel:`Compose Email` pop-up window to appear, wherein the message to the vendor can be customized. Once ready, click :guilabel:`Send` to send an email to the vendor listed on the purchase order form."
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/calls_for_tenders.rst:161
+msgid "Then, click the :guilabel:`Alternatives` tab once more. Since this new :abbr:`PO (Purchase Order)` was created separately, there are no other orders linked yet. To link this order with the alternatives created previously, click :guilabel:`Link to Existing RfQ` on the first line in the :guilabel:`Vendor` column."
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/calls_for_tenders.rst:-1
+msgid "pop-up to link new quotation to existing RFQs."
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/calls_for_tenders.rst:170
+msgid "This causes an :guilabel:`Add: Alternative POs` pop-up window to appear. Select the three purchase orders created previously, and click :guilabel:`Select`. All of these orders are now copied to this :abbr:`PO (Purchase Order)` under the :guilabel:`Alternatives` tab."
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/calls_for_tenders.rst:175
+msgid "If a large number of purchase orders are being processed and the previous :abbr:`POs (Purchase Orders)` can't be located, try clicking :menuselection:`Group By --> Vendor` under the search bar at the top of the pop-up window to group by the vendors selected on the previous orders."
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/calls_for_tenders.rst:181
+msgid "Compare product lines"
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/calls_for_tenders.rst:183
+msgid "When there are multiple :abbr:`RFQs (Requests for Quotation)` linked as alternatives, they can be compared side-by-side in order to determine which vendors offer the best deals on which products. To compare each quotation, go to the :menuselection:`Purchase` app, and select one of the quotations created previously."
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/calls_for_tenders.rst:188
+msgid "Then, click the :guilabel:`Alternatives` tab to see all the linked :abbr:`RFQs (Requests for Quotation)`. Next, under the :guilabel:`Create Alternative` tab, click :guilabel:`Compare Product Lines`. This navigates to a Compare Order Lines page."
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/calls_for_tenders.rst:-1
+msgid "Compare Product Lines page for alternative RFQs."
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/calls_for_tenders.rst:196
+msgid "The Compare Order Lines page, by default, groups by :guilabel:`Product`. Each product included in any of the :abbr:`RFQs (Requests for Quotation)` is displayed in its own drop-down, along with all of the :abbr:`PO (Purchase Order)` numbers in the :guilabel:`Reference` column."
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/calls_for_tenders.rst:200
+msgid "Additional columns on this page include the :guilabel:`Vendor` from which products were ordered, the :guilabel:`Status` of the quotation (i.e., RFQ, RFQ Sent); the :guilabel:`Quantity` of products ordered from each vendor; the :guilabel:`Unit Price` per product and :guilabel:`Total` price of the order, and more."
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/calls_for_tenders.rst:206
+msgid "To remove product lines from the Compare Order Lines page, click :guilabel:`Clear` at the far right end of that product line's row. This removes this product as a chooseable option from the page, and changes the :guilabel:`Total` price of that product on the page to **0**. On the purchase order form in which that product was included, its ordered quantity is changed to **0**, as well."
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/calls_for_tenders.rst:212
+msgid "Once the best offers have been identified, at the end of each row, individual products can be selected by clicking :guilabel:`Choose`. Once all the desired products have been chosen, click :guilabel:`Requests for Quotation` (in the breadcrumbs, at the top of the page) to navigate back to an overview of all :abbr:`RFQs (Requests for Quotation)`."
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/calls_for_tenders.rst:218
+msgid "Cancel (or keep) alternatives"
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/calls_for_tenders.rst:220
+msgid "Now that the desired products have been chosen, based on which vendors provided the best offer, the other :abbr:`RFQs (Requests for Quotation)` (from which no products were chosen) can be canceled."
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/calls_for_tenders.rst:223
+msgid "Under the :guilabel:`Total` column, at the far right of each row, the orders from which no products were chosen have automatically had their total cost set to **0**. Although they haven't been canceled yet, this means that they can ultimately be canceled without repercussions, *after* the desired purchase orders have been confirmed."
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/calls_for_tenders.rst:-1
+msgid "Canceled quotations in the Purchase app overview."
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/calls_for_tenders.rst:232
+msgid "To confirm a quotation that contains the chosen product quantities, click into one. Then, click :guilabel:`Confirm Order`. This causes an :guilabel:`Alternative Warning` pop-up window to appear. From there, either :guilabel:`Cancel Alternatives` or :guilabel:`Keep Alternatives` can be clicked. If this :abbr:`PO (Purchase Order)` should *not* be confirmed, click :guilabel:`Cancel`."
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/calls_for_tenders.rst:237
+msgid ":guilabel:`Cancel Alternatives` automatically cancels the alternative purchase orders. :guilabel:`Keep Alternatives` keeps the alternative purchase orders open, so they can still be accessed if any additional product quantities need to be ordered. Once all products are ordered, :guilabel:`Cancel Alternatives` can be selected from whichever :abbr:`PO (Purchase Order)` is open."
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/calls_for_tenders.rst:242
+msgid "To view a detailed form of one of the :abbr:`RFQs (Requests for Quotation)` listed, click the line item for that quotation. This causes an :guilabel:`Open: Alternative POs` pop-up window to appear, from which all details of that particular quotation can be viewed. Click :guilabel:`Close` when finished."
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/calls_for_tenders.rst:-1
+msgid "Keep or cancel pop-up for alternative RFQs."
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/calls_for_tenders.rst:251
+msgid "From the :guilabel:`Alternative Warning` pop-up window, click :guilabel:`Keep Alternatives` to keep all alternative quotations open for now. Then, click :guilabel:`Requests for Quotation` (in the breadcrumbs, at the top of the page) to navigate back to an overview of all :abbr:`RFQs (Requests for Quotation)`."
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/calls_for_tenders.rst:256
+msgid "Click into the remaining quotation(s) that contain products that need to be ordered, and click :guilabel:`Confirm Order`. This causes the :guilabel:`Alternative Warning` pop-up window to appear again. This time, click :guilabel:`Cancel Alternatives` to cancel all other alternative :abbr:`RFQs` linked with this quotation."
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/calls_for_tenders.rst:261
+msgid "Finally, click :guilabel:`Requests for Quotation` (in the breadcrumbs, at the top of the page) to navigate back to an overview of all :abbr:`RFQs (Requests for Quotation)`. The canceled orders can be seen greyed out and listed with a :guilabel:`Cancelled` status under the :guilabel:`Status` column at the far right of their rows."
+msgstr ""
+
+#: ../../content/applications/inventory_and_mrp/purchase/manage_deals/calls_for_tenders.rst:266
+msgid "Now that all product quantities have been ordered, the purchase process can be followed, and continued to completion, until the products are received into the warehouse."
 msgstr ""

 #: ../../content/applications/inventory_and_mrp/purchase/manage_deals/control_bills.rst:3
--- a/locale/sources/marketing.pot
+++ b/locale/sources/marketing.pot
--- a/locale/sources/productivity.pot
+++ b/locale/sources/productivity.pot
@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo 16.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-04-13 05:55+0000\n"
+"POT-Creation-Date: 2023-05-02 14:02+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@ -26,11 +26,11 @@ msgid "Calendar"
 msgstr ""

 #: ../../content/applications/productivity/calendar/google.rst:3
-msgid "Google Calendar synchronization"
+msgid "Synchronize Google calendar with Odoo"
 msgstr ""

 #: ../../content/applications/productivity/calendar/google.rst:5
-msgid "Synchronize Google Calendar with Odoo to see and manage meetings from both platforms (updates go in both directions). This integration helps organize your schedule so you never miss a meeting."
+msgid "Synchronize Google Calendar with Odoo to see and manage meetings from both platforms (updates go in both directions). This integration helps organize schedules, so a meeting is never missed."
 msgstr ""

 #: ../../content/applications/productivity/calendar/google.rst:9
@ -46,143 +46,179 @@ msgid "Setup in Google"
 msgstr ""

 #: ../../content/applications/productivity/calendar/google.rst:16
-msgid "Enable Google Calendar API"
+msgid "Select (or create) a project"
 msgstr ""

 #: ../../content/applications/productivity/calendar/google.rst:18
-msgid "Begin by creating a new Google API project and enabling the Google Calendar API. Then, go to the `Google API Console <https://console.developers.google.com>`_ and log into your Google account."
+msgid "Create a new Google API project and enable the Google Calendar API. First, go to the `Google API Console <https://console.developers.google.com>`_ and log into the Google account."
 msgstr ""

 #: ../../content/applications/productivity/calendar/google.rst:22
-msgid "If this is your first time visiting this page, Google will prompt you to enter a country and agree to the Terms of Service. Select a country from the drop-down list and agree to the :abbr:`ToS (Terms of Service)`."
+msgid "If this is the first time visiting this page, Google will prompt the user to enter a country and agree to the Terms of Service. Select a country from the drop-down list and agree to the :abbr:`ToS (Terms of Service)`."
 msgstr ""

 #: ../../content/applications/productivity/calendar/google.rst:26
-msgid "Next, click :guilabel:`Select a project` and select or create an API project to store credentials."
+msgid "Next, click :guilabel:`Select a project` and select (or create) an API project to configure OAuth in, and store credentials. Click :guilabel:`New Project`."
 msgstr ""

 #: ../../content/applications/productivity/calendar/google.rst:-1
 msgid "Create a new API project to store credentials."
 msgstr ""

-#: ../../content/applications/productivity/calendar/google.rst:33
-msgid "Give the API Project a clear name like \"Odoo Sync\" so you can easily find it."
+#: ../../content/applications/productivity/calendar/google.rst:34
+msgid "Give the API Project a clear name, like \"Odoo Sync\", so it can be easily identified."
 msgstr ""

-#: ../../content/applications/productivity/calendar/google.rst:35
-msgid "Then, open the API Project and click :guilabel:`Enable APIs and Services`."
+#: ../../content/applications/productivity/calendar/google.rst:37
+msgid "Enable Google calendar API"
+msgstr ""
+
+#: ../../content/applications/productivity/calendar/google.rst:39
+msgid "Now, click on :guilabel:`Enabled APIs and Services` in the left menu. Select :guilabel:`Enabled APIs and Services` again if the :guilabel:`Search bar` doesn't appear."
 msgstr ""

 #: ../../content/applications/productivity/calendar/google.rst:-1
 msgid "Enable APIs and Services on the API Project."
 msgstr ""

-#: ../../content/applications/productivity/calendar/google.rst:41
-msgid "After that, search for *Google Calendar API* using the search bar and select :guilabel:`Google Calendar API` from the search results. Click :guilabel:`Enable`."
+#: ../../content/applications/productivity/calendar/google.rst:46
+msgid "After that, search for `Google Calendar API` using the search bar and select :guilabel:`Google Calendar API` from the search results. Click :guilabel:`Enable`."
 msgstr ""

 #: ../../content/applications/productivity/calendar/google.rst:-1
 msgid "Enable the Google Calendar API."
 msgstr ""

-#: ../../content/applications/productivity/calendar/google.rst:49
-msgid "Create credentials"
+#: ../../content/applications/productivity/calendar/google.rst:54
+msgid "OAuth consent screen"
 msgstr ""

-#: ../../content/applications/productivity/calendar/google.rst:51
-msgid "Now that you have created your API project and enabled the Google Calendar API, you need to create credentials. Begin by clicking :guilabel:`Create Credentials`. Google will then guide you through four steps to create your API credentials."
+#: ../../content/applications/productivity/calendar/google.rst:56
+msgid "Now that the API project has been created, OAuth should be configured. To do that, click on :guilabel:`OAuth consent` in the left menu and then select the :guilabel:`User Type`."
 msgstr ""

-#: ../../content/applications/productivity/calendar/google.rst:55
-msgid "In the first step, :guilabel:`Credential Type`, select the :guilabel:`Google Calendar API` and :guilabel:`User Data` options. Then, click :guilabel:`Next`."
+#: ../../content/applications/productivity/calendar/google.rst:60
+msgid "*Personal* Gmail Accounts are only allowed to be **External** User Type, which means Google may require an approval, or for *Scopes* to be added on. However, using a *Google WorkSpace* account allows for **Internal** User Type to be used."
 msgstr ""

-#: ../../content/applications/productivity/calendar/google.rst:-1
-msgid "Select Google Calendar API and User Data for the Credential Type."
-msgstr ""
-
-#: ../../content/applications/productivity/calendar/google.rst:62
-msgid "In the second step, :guilabel:`OAuth Consent Screen`, type *Odoo* in the :guilabel:`App name` field, select your email address for the :guilabel:`User support email` field, and type your email address for the :guilabel:`Developer contact information` section. Then, click :guilabel:`Save and Continue`."
+#: ../../content/applications/productivity/calendar/google.rst:64
+msgid "Note, as well, that while the API connection is in the *External* testing mode, then no approval is necessary from Google. User limits in this testing mode is set to 100 users."
 msgstr ""

 #: ../../content/applications/productivity/calendar/google.rst:67
-msgid "Skip the third step, :guilabel:`Scopes`, by clicking :guilabel:`Save and Continue`."
-msgstr ""
-
-#: ../../content/applications/productivity/calendar/google.rst:69
-msgid "In the last step, :guilabel:`OAuth Client ID`, select :guilabel:`Website application` for the :guilabel:`Application Type` field and type *My Odoo Database* for the :guilabel:`Name`."
+msgid "In the second step, :guilabel:`OAuth Consent Screen`, type `Odoo` in the :guilabel:`App name` field, select the email address for the :guilabel:`User support email` field, and type the email address for the :guilabel:`Developer contact information` section. Then, click :guilabel:`Save and Continue`."
 msgstr ""

 #: ../../content/applications/productivity/calendar/google.rst:72
-msgid "Under the :guilabel:`Authorized JavaScript Origins` section, click :guilabel:`+ Add URI` and type your company's Odoo URL address."
+msgid "Skip the third step, :menuselection:`Scopes`, by clicking :guilabel:`Save and Continue`."
 msgstr ""

-#: ../../content/applications/productivity/calendar/google.rst:75
-msgid "Under the :guilabel:`Authorized redirect URIs` section, click :guilabel:`+ Add URI` and type your company's Odoo URL address followed by */google_account/authentication*. Finally, click :guilabel:`Create` and :guilabel:`Done`."
+#: ../../content/applications/productivity/calendar/google.rst:74
+msgid "Next, if continuing in testing mode (External), add the email addresses being configured under the :guilabel:`Test users` step, by clicking on :guilabel:`Add Users`, and then the :guilabel:`Save and Continue` button. A summary of the app registration appears."
+msgstr ""
+
+#: ../../content/applications/productivity/calendar/google.rst:78
+msgid "Finally, scroll to the bottom, and click on :guilabel:`Back to Dashboard`."
+msgstr ""
+
+#: ../../content/applications/productivity/calendar/google.rst:80
+msgid "Now, the OAuth consent has been configured, and it's time to create credentials."
+msgstr ""
+
+#: ../../content/applications/productivity/calendar/google.rst:83
+msgid "Create credentials"
+msgstr ""
+
+#: ../../content/applications/productivity/calendar/google.rst:85
+msgid "The *Client ID* and the *Client Secret* are both needed to connect Google Calendar to Odoo. This is the last step in the Google console. Begin by clicking :guilabel:`Credentials` in the left menu. Then, click :guilabel:`Create Credentials`, and select :guilabel:`OAuth client ID`, Google will open a guide to create credentials."
+msgstr ""
+
+#: ../../content/applications/productivity/calendar/google.rst:90
+msgid "Under :menuselection:`Create OAuth Client ID`, select :guilabel:`Website application` for the :guilabel:`Application Type` field, and type `My Odoo Database` for the :guilabel:`Name`."
+msgstr ""
+
+#: ../../content/applications/productivity/calendar/google.rst:93
+msgid "Under the :guilabel:`Authorized JavaScript Origins` section, click :guilabel:`+ Add URI` and type the company's Odoo full :abbr:`URL (Uniform Resource Locator)` address."
+msgstr ""
+
+#: ../../content/applications/productivity/calendar/google.rst:95
+msgid "Under the :guilabel:`Authorized redirect URIs` section, click :guilabel:`+ Add URI` and type the company's Odoo :abbr:`URL (Uniform Resource Locator)` address followed by `/google_account/authentication`. Finally, click :guilabel:`Create`."
 msgstr ""

 #: ../../content/applications/productivity/calendar/google.rst:-1
 msgid "Add the authorized JavaScript origins and the authorized redirect URIs."
 msgstr ""

-#: ../../content/applications/productivity/calendar/google.rst:83
-msgid "After successfully creating a new API project, enabling the Google Calendar API, and generating the Google Calendar API credentials, you should now have a Client ID and Client Secret."
+#: ../../content/applications/productivity/calendar/google.rst:103
+msgid "A :guilabel:`Client ID` and :guilabel:`Client Secret` will appear, copy these to a notepad."
 msgstr ""

-#: ../../content/applications/productivity/calendar/google.rst:87
-msgid "Client ID & Client Secret"
-msgstr ""
-
-#: ../../content/applications/productivity/calendar/google.rst:89
-msgid "The **Client ID** and the **Client Secret** are both needed to connect Google Calendar to Odoo. Find the Client ID and the Client Secret by opening the Google Cloud Platform navigation menu and going to :menuselection:`API & Services --> Credentials --> OAuth 2.0 Client IDs`."
-msgstr ""
-
-#: ../../content/applications/productivity/calendar/google.rst:93
-msgid "Next, locate the credentials you just created for the Google Calendar API. Then, click on :guilabel:`Edit OAuth Client` (the pencil icon). The page will redirect to the edit page, where you can view the Client ID and the Client Secret."
-msgstr ""
-
-#: ../../content/applications/productivity/calendar/google.rst:-1
-msgid "Click Edit OAuth Client to view the credential details."
-msgstr ""
-
-#: ../../content/applications/productivity/calendar/google.rst:102
+#: ../../content/applications/productivity/calendar/google.rst:106
 msgid "Setup in Odoo"
 msgstr ""

-#: ../../content/applications/productivity/calendar/google.rst:104
-msgid "Once the Client ID and the Client Secret are located, open the Odoo database and go to :menuselection:`Settings --> General Settings --> Integrations --> Google Calendar`. Check the box next to :guilabel:`Google Calendar`."
+#: ../../content/applications/productivity/calendar/google.rst:108
+msgid "Once the *Client ID* and the *Client Secret* are located, open the Odoo database and go to :menuselection:`Settings --> General Settings --> Integrations --> Google Calendar`. Check the box next to :guilabel:`Google Calendar`."
 msgstr ""

 #: ../../content/applications/productivity/calendar/google.rst:-1
 msgid "The Google Calendar checkbox in General Settings."
 msgstr ""

-#: ../../content/applications/productivity/calendar/google.rst:112
-msgid "Next, copy and paste the Client ID and the Client Secret from the Google Calendar API Credentials page into their respective fields below the :guilabel:`Google Calendar` checkbox. Then, click :guilabel:`Save`."
+#: ../../content/applications/productivity/calendar/google.rst:116
+msgid "Next, copy and paste the *Client ID* and the *Client Secret* from the Google Calendar API credentials page into their respective fields below the :guilabel:`Google Calendar` checkbox. Then, click :guilabel:`Save`."
 msgstr ""

-#: ../../content/applications/productivity/calendar/google.rst:116
-msgid "Finally, open the Calendar module in Odoo and click on the :guilabel:`Google` sync button to sync Google Calendar with Odoo."
+#: ../../content/applications/productivity/calendar/google.rst:121
+msgid "Sync calendar in Odoo"
+msgstr ""
+
+#: ../../content/applications/productivity/calendar/google.rst:123
+msgid "Finally, open the :menuselection:`Calendar` app in Odoo and click on the :guilabel:`Google` sync button to sync Google Calendar with Odoo."
 msgstr ""

 #: ../../content/applications/productivity/calendar/google.rst:-1
 msgid "Click the Google sync button in Odoo Calendar to sync Google Calendar with Odoo."
 msgstr ""

-#: ../../content/applications/productivity/calendar/google.rst:124
-msgid "The first time you sync your Google Calendar with Odoo, the page will redirect to your Google Account. Click :guilabel:`OK` and :guilabel:`Allow` to authorize Odoo to access Google Calendar."
+#: ../../content/applications/productivity/calendar/google.rst:131
+msgid "When syncing Google Calendar with Odoo for the first time, the page will redirect to the Google Account. From there, select the :guilabel:`Email Account` that should have access, then select :guilabel:`Continue` (should the app be unverifed), and finally select :guilabel:`Continue` (to give permission for the transfer of data)`."
 msgstr ""

 #: ../../content/applications/productivity/calendar/google.rst:-1
 msgid "Give Odoo permission to access Google Calendar."
 msgstr ""

-#: ../../content/applications/productivity/calendar/google.rst:131
+#: ../../content/applications/productivity/calendar/google.rst:140
 msgid "Now, Odoo Calendar is successfully synced with Google Calendar!"
 msgstr ""

-#: ../../content/applications/productivity/calendar/google.rst:-1
-msgid "Successfully sync between Odoo and Google Calendar."
+#: ../../content/applications/productivity/calendar/google.rst:143
+msgid "Odoo highly recommends testing the Google calendar synchronization on a test database and a test email address (that is not used for any other purpose) before attempting to sync the desired Google Calendar with the user's production database."
+msgstr ""
+
+#: ../../content/applications/productivity/calendar/google.rst:147
+msgid "Once a user synchronizes their Google calendar with the Odoo calendar:"
+msgstr ""
+
+#: ../../content/applications/productivity/calendar/google.rst:149
+msgid "Creating an event in Odoo causes Google to send an invitation to all event attendees."
+msgstr ""
+
+#: ../../content/applications/productivity/calendar/google.rst:150
+msgid "Deleting an event in Odoo causes Google to send a cancellation to all event attendees."
+msgstr ""
+
+#: ../../content/applications/productivity/calendar/google.rst:151
+msgid "Adding a contact to an event causes Google to send an invitation to all event attendees."
+msgstr ""
+
+#: ../../content/applications/productivity/calendar/google.rst:152
+msgid "Removing a contact from an event causes Google to send a cancellation to all event attendees."
+msgstr ""
+
+#: ../../content/applications/productivity/calendar/google.rst:154
+msgid "Events can be created in Google Calendar without sending a notification by selecting :guilabel:`Don't Send` when prompted to send invitation emails."
 msgstr ""

 #: ../../content/applications/productivity/calendar/outlook.rst:3
@ -1289,7 +1325,7 @@ msgid "**Customer Display**: Connect a screen to the IoT Box to display the PoS
 msgstr ""

 #: ../../content/applications/productivity/iot/config/pos.rst:55
-msgid "**Payment terminal**: The connection process depends on the terminal, please refer to the :doc:`payment terminals documentation </applications/sales/point_of_sale/payment>`."
+msgid "**Payment terminal**: The connection process depends on the terminal, please refer to the :doc:`payment terminals documentation </applications/sales/point_of_sale/payment_methods>`."
 msgstr ""

 #: ../../content/applications/productivity/iot/config/pos.rst:59
--- a/locale/sources/sales.pot
+++ b/locale/sources/sales.pot
--- a/locale/sources/services.pot
+++ b/locale/sources/services.pot
@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo 16.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-04-13 05:55+0000\n"
+"POT-Creation-Date: 2023-05-02 14:02+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@ -20,153 +20,160 @@ msgstr ""
 msgid "Services"
 msgstr ""

-#: ../../content/applications/services/fsm.rst:8
+#: ../../content/applications/services/field_service.rst:8
 msgid "Field Service"
 msgstr ""

-#: ../../content/applications/services/fsm.rst:11
+#: ../../content/applications/services/field_service.rst:11
 msgid "`Odoo Tutorials: Field Service <https://www.odoo.com/slides/field-service-49>`_"
 msgstr ""

-#: ../../content/applications/services/fsm/default_warehouse.rst:3
+#: ../../content/applications/services/field_service/default_warehouse.rst:3
 msgid "User default warehouse"
 msgstr ""

-#: ../../content/applications/services/fsm/default_warehouse.rst:5
-msgid "Setting up a **default warehouse** can be useful for field technicians who keep a supply in their van or those who always resupply from the same warehouse."
+#: ../../content/applications/services/field_service/default_warehouse.rst:5
+msgid "Setting up a **default warehouse** can be useful for field technicians who keep a supply in their van or those who always resupply from the same warehouse. It also allows field workers to switch between warehouses from their profiles."
 msgstr ""

-#: ../../content/applications/services/fsm/default_warehouse.rst:8
-msgid "Products in sales orders created during field interventions are always pulled from the same warehouse, keeping the inventory accurate with the default warehouse feature."
+#: ../../content/applications/services/field_service/default_warehouse.rst:9
+msgid "Products in sales orders created during field interventions are always pulled from the default warehouse, keeping the inventory accurate."
 msgstr ""

-#: ../../content/applications/services/fsm/default_warehouse.rst:12
+#: ../../content/applications/services/field_service/default_warehouse.rst:13
 msgid ":doc:`../../inventory_and_mrp/inventory`"
 msgstr ""

-#: ../../content/applications/services/fsm/default_warehouse.rst:15
+#: ../../content/applications/services/field_service/default_warehouse.rst:16
 #: ../../content/applications/services/helpdesk/timesheet_and_invoice/reinvoice_from_project.rst:13
 #: ../../content/applications/services/project/project_management.rst:17
 msgid "Configuration"
 msgstr ""

-#: ../../content/applications/services/fsm/default_warehouse.rst:17
-msgid "To set up a user default warehouse, the :doc:`storage locations <../../inventory_and_mrp/inventory/management/warehouses/warehouses_locations>` and :ref:`multi-step routes <use-routes/routes-rules>` features need to be activated. It is also necessary to have more than one warehouse in your database."
+#: ../../content/applications/services/field_service/default_warehouse.rst:18
+msgid "To set up a user default warehouse, the :doc:`storage locations <../../inventory_and_mrp/inventory/management/warehouses/warehouses_locations>` feature needs to be activated in the **Inventory** app. It is also necessary to have more than one warehouse in your database."
 msgstr ""

-#: ../../content/applications/services/fsm/default_warehouse.rst:23
+#: ../../content/applications/services/field_service/default_warehouse.rst:23
+msgid "You can either set it up :ref:`for your profile <default-warehouse/my-profile>`, or :ref:`for all users <default-warehouse/all-users>`."
+msgstr ""
+
+#: ../../content/applications/services/field_service/default_warehouse.rst:27
 msgid ":doc:`../../inventory_and_mrp/inventory/management/warehouses/warehouses_locations`"
 msgstr ""

-#: ../../content/applications/services/fsm/default_warehouse.rst:24
-msgid ":doc:`../../inventory_and_mrp/inventory/routes/concepts/use_routes`"
+#: ../../content/applications/services/field_service/default_warehouse.rst:32
+msgid "For your profile"
 msgstr ""

-#: ../../content/applications/services/fsm/default_warehouse.rst:27
-msgid "User account"
+#: ../../content/applications/services/field_service/default_warehouse.rst:34
+msgid "To set up a default warehouse for yourself, click your **profile icon** in the upper right corner of the screen, then, go to :menuselection:`My Profile --> Preferences --> Default Warehouse`. Select the default warehouse from the drop-down menu."
 msgstr ""

-#: ../../content/applications/services/fsm/default_warehouse.rst:29
-msgid "To set up a default warehouse for a specific user, go to :menuselection:`Settings --> Users --> Manage users`, open a user, then go to the :guilabel:`Preferences` tab, scroll down to :guilabel:`Inventory`, and select the default warehouse from the drop-down menu."
+#: ../../content/applications/services/field_service/default_warehouse.rst:41
+msgid "For all users"
 msgstr ""

-#: ../../content/applications/services/fsm/default_warehouse.rst:-1
+#: ../../content/applications/services/field_service/default_warehouse.rst:43
+msgid "To set up a default warehouse for a specific user, go to :menuselection:`Settings --> Users --> Manage users`, select a user, then go to the :guilabel:`Preferences` tab. Scroll down to :guilabel:`Inventory`, and select the default warehouse from the drop-down menu."
+msgstr ""
+
+#: ../../content/applications/services/field_service/default_warehouse.rst:-1
 msgid "Selection of a default warehouse on a user profile."
 msgstr ""

-#: ../../content/applications/services/fsm/default_warehouse.rst:37
-msgid "Default warehouse in field service tasks"
+#: ../../content/applications/services/field_service/default_warehouse.rst:51
+msgid "Use in field service tasks"
 msgstr ""

-#: ../../content/applications/services/fsm/default_warehouse.rst:39
-msgid "Once a default warehouse has been configured for a user, the materials used for a sales order linked to a Field Service task are pulled from that specific warehouse. In the sales order, go to the :guilabel:`Other Info` tab, then scroll down to :guilabel:`Delivery`. The default warehouse is applied correctly."
+#: ../../content/applications/services/field_service/default_warehouse.rst:53
+msgid "Once a default warehouse has been configured for a user, the materials used for a sales order related to a Field Service task are pulled from that specific warehouse. Open the related sales order, go to the :guilabel:`Other Info` tab, then scroll down to :guilabel:`Delivery`. The default warehouse is applied correctly."
 msgstr ""

-#: ../../content/applications/services/fsm/helpdesk.rst:5
-#: ../../content/applications/services/helpdesk.rst:8
-msgid "Helpdesk"
+#: ../../content/applications/services/field_service/default_warehouse.rst:58
+msgid "Once the Field Service task is marked as done, the stock of the default warehouse is automatically updated."
 msgstr ""

-#: ../../content/applications/services/fsm/helpdesk/plan_onsite.rst:3
-msgid "Plan onsite interventions from helpdesk tickets"
+#: ../../content/applications/services/field_service/onsite_interventions.rst:3
+msgid "Onsite interventions planning"
 msgstr ""

-#: ../../content/applications/services/fsm/helpdesk/plan_onsite.rst:5
-msgid "The integration with the Helpdesk app lets your helpdesk team manage intervention requests directly. Planning field service tasks from tickets speeds up your processes."
+#: ../../content/applications/services/field_service/onsite_interventions.rst:6
+msgid "From a sales order"
 msgstr ""

-#: ../../content/applications/services/fsm/helpdesk/plan_onsite.rst:9
-msgid "Configure the helpdesk team"
-msgstr ""
-
-#: ../../content/applications/services/fsm/helpdesk/plan_onsite.rst:11
-msgid "Go to :menuselection:`Helpdesk --> Configuration --> Helpdesk Teams`. Select a team and enable *Onsite Interventions*."
-msgstr ""
-
-#: ../../content/applications/services/fsm/helpdesk/plan_onsite.rst:-1
-msgid "Onsite interventions setting in Odoo Helpdesk"
-msgstr ""
-
-#: ../../content/applications/services/fsm/helpdesk/plan_onsite.rst:18
-msgid "The helpdesk tickets of the team now display the *Plan Intervention* button. Click on it to create a new task under your field service project."
-msgstr ""
-
-#: ../../content/applications/services/fsm/helpdesk/plan_onsite.rst:-1
-msgid "Plan intervention from helpdesk ticket in Odoo Helpdesk"
-msgstr ""
-
-#: ../../content/applications/services/fsm/sales.rst:5
-msgid "Sales"
-msgstr ""
-
-#: ../../content/applications/services/fsm/sales/onsite_tasks_from_sales_orders.rst:3
-msgid "Create onsite interventions from sales orders"
-msgstr ""
-
-#: ../../content/applications/services/fsm/sales/onsite_tasks_from_sales_orders.rst:5
+#: ../../content/applications/services/field_service/onsite_interventions.rst:8
 msgid "Allowing your sales team to open onsite interventions creates a seamless experience for your customers. They can receive a quotation they first have to approve before the work even starts."
 msgstr ""

-#: ../../content/applications/services/fsm/sales/onsite_tasks_from_sales_orders.rst:9
-msgid "Configure a product"
-msgstr ""
-
-#: ../../content/applications/services/fsm/sales/onsite_tasks_from_sales_orders.rst:11
+#: ../../content/applications/services/field_service/onsite_interventions.rst:11
 msgid "Go to :menuselection:`Field Service --> Configuration --> Products` and create or edit a product."
 msgstr ""

-#: ../../content/applications/services/fsm/sales/onsite_tasks_from_sales_orders.rst:13
-msgid "Under the *General Information* tab, select *Service* as *Product Type*."
+#: ../../content/applications/services/field_service/onsite_interventions.rst:13
+msgid "Under the :guilabel:`General Information` tab, select :guilabel:`Service` as :guilabel:`Product Type`."
 msgstr ""

-#: ../../content/applications/services/fsm/sales/onsite_tasks_from_sales_orders.rst:14
-msgid "Under the *Sales* tab, select *Timesheets on tasks* as *Service Invoicing Policy*."
+#: ../../content/applications/services/field_service/onsite_interventions.rst:15
+msgid "Under the :guilabel:`Sales` tab, select :guilabel:`Timesheets on tasks` as :guilabel:`Service Invoicing Policy`."
 msgstr ""

-#: ../../content/applications/services/fsm/sales/onsite_tasks_from_sales_orders.rst:15
-msgid "Select *Create a task in an existing project* as *Service Tracking*."
+#: ../../content/applications/services/field_service/onsite_interventions.rst:17
+msgid "Select :guilabel:`Create a task in an existing project` as :guilabel:`Service Tracking`."
 msgstr ""

-#: ../../content/applications/services/fsm/sales/onsite_tasks_from_sales_orders.rst:16
-msgid "Select your *Project*."
+#: ../../content/applications/services/field_service/onsite_interventions.rst:18
+msgid "Select your :guilabel:`Project`."
 msgstr ""

-#: ../../content/applications/services/fsm/sales/onsite_tasks_from_sales_orders.rst:17
-msgid "If you use them, select your *Worksheet Template* and then click on *Save*."
+#: ../../content/applications/services/field_service/onsite_interventions.rst:19
+msgid "If you use them, select your :guilabel:`Worksheet Template`, and save."
 msgstr ""

-#: ../../content/applications/services/fsm/sales/onsite_tasks_from_sales_orders.rst:-1
+#: ../../content/applications/services/field_service/onsite_interventions.rst:-1
 msgid "Product configuration to create tasks from sales orders in Odoo Field Service"
 msgstr ""

-#: ../../content/applications/services/fsm/sales/onsite_tasks_from_sales_orders.rst:23
-msgid "From the *Sales* app, create a quotation with the product and confirm it. A task is automatically set up under your Field Service project. It is directly accessible from the sales order."
+#: ../../content/applications/services/field_service/onsite_interventions.rst:25
+msgid "From the :doc:`Sales <../../sales/sales>` app, create a quotation with the product and confirm it. A task is automatically set up under your Field Service project. It is directly accessible from the sales order."
 msgstr ""

-#: ../../content/applications/services/fsm/sales/onsite_tasks_from_sales_orders.rst:-1
+#: ../../content/applications/services/field_service/onsite_interventions.rst:-1
 msgid "Field Service task on a sales order in Odoo Sales"
 msgstr ""

+#: ../../content/applications/services/field_service/onsite_interventions.rst:34
+msgid "From helpdesk tickets"
+msgstr ""
+
+#: ../../content/applications/services/field_service/onsite_interventions.rst:36
+msgid "The integration with the :doc:`Helpdesk <../helpdesk>` app lets your helpdesk team manage intervention requests directly. Planning field service tasks from tickets speeds up your processes."
+msgstr ""
+
+#: ../../content/applications/services/field_service/onsite_interventions.rst:40
+msgid "Configure the helpdesk team"
+msgstr ""
+
+#: ../../content/applications/services/field_service/onsite_interventions.rst:42
+msgid "Go to :menuselection:`Helpdesk --> Configuration --> Helpdesk Teams`. Select a team and enable :guilabel:`Onsite Interventions`."
+msgstr ""
+
+#: ../../content/applications/services/field_service/onsite_interventions.rst:-1
+msgid "Onsite interventions settings in Odoo Helpdesk"
+msgstr ""
+
+#: ../../content/applications/services/field_service/onsite_interventions.rst:49
+msgid "The helpdesk tickets of the team now display the :guilabel:`Plan Intervention` button. Click on it to create a new task under your field service project."
+msgstr ""
+
+#: ../../content/applications/services/field_service/onsite_interventions.rst:-1
+msgid "Plan intervention from helpdesk tickets in Odoo Helpdesk"
+msgstr ""
+
+#: ../../content/applications/services/helpdesk.rst:8
+msgid "Helpdesk"
+msgstr ""
+
 #: ../../content/applications/services/helpdesk.rst:11
 msgid "`Odoo Tutorials: Helpdesk <https://www.odoo.com/slides/helpdesk-51>`_"
 msgstr ""
@ -398,7 +405,6 @@ msgstr ""

 #: ../../content/applications/services/helpdesk/overview/forum_and_elearning.rst:14
 #: ../../content/applications/services/helpdesk/overview/forum_and_elearning.rst:52
-#: ../../content/applications/services/helpdesk/overview/ratings.rst:10
 #: ../../content/applications/services/helpdesk/timesheet_and_invoice/invoice_time.rst:11
 msgid "Set up"
 msgstr ""
@ -639,6 +645,7 @@ msgid "View of an SMS template setup page in Odoo Helpdesk"
 msgstr ""

 #: ../../content/applications/services/helpdesk/overview/getting_started.rst:137
+#: ../../content/applications/services/helpdesk/overview/ratings.rst:60
 msgid ":doc:`/applications/general/email_communication/email_template`"
 msgstr ""

@ -675,57 +682,129 @@ msgid "Manually folding a stage from the kanban view will not close the tickets
 msgstr ""

 #: ../../content/applications/services/helpdesk/overview/ratings.rst:3
-msgid "Ratings"
+msgid "Customer ratings"
 msgstr ""

 #: ../../content/applications/services/helpdesk/overview/ratings.rst:5
-msgid "Allow customers to rate their experience with your helpdesk teams to strengthen your credibility and gain their trust. Reviews can also influence a customer’s decision and open space for feedback that can help you improve the quality of your services."
+msgid "Asking customers to rate the support they received from a *Helpdesk* team provides an opportunity to gauge team performance and track customer satisfaction. Ratings can be published to the portal, providing customers with a general overview of the team's performance."
+msgstr ""
+
+#: ../../content/applications/services/helpdesk/overview/ratings.rst:10
+msgid "Enable customer ratings on a Helpdesk team"
 msgstr ""

 #: ../../content/applications/services/helpdesk/overview/ratings.rst:12
-msgid "Go to :menuselection:`Helpdesk --> Configuration --> Helpdesk Teams` and enable *Ratings on tickets*. The feature automatically adds a default email template on the non-folded *closing stage(s)* of that team."
+msgid "To enable *customer ratings* on a helpdesk team by going to :menuselection:`Helpdesk --> Configuration --> Teams`. Select a team from the list and navigate to the settings page. Scroll to the :guilabel:`Performance` section, and check the box for :guilabel:`Customer Ratings`."
 msgstr ""

 #: ../../content/applications/services/helpdesk/overview/ratings.rst:-1
 msgid "Overview of the settings page of a helpdesk team emphasizing the rating on ticket feature\n"
-"in Odoo Helpdesk"
+"in Odoo Helpdesk."
 msgstr ""

-#: ../../content/applications/services/helpdesk/overview/ratings.rst:21
-msgid "To edit the email template and the stage(s) set as the closing ones, go to the Kanban view of your helpdesk team and click on *Settings*, then on *Edit Stage*."
+#: ../../content/applications/services/helpdesk/overview/ratings.rst:22
+msgid "Set a ratings request email template on a stage"
+msgstr ""
+
+#: ../../content/applications/services/helpdesk/overview/ratings.rst:24
+msgid "To automatically request ratings from customers once their tickets have closed, an email template should be added to the appropriate stage."
+msgstr ""
+
+#: ../../content/applications/services/helpdesk/overview/ratings.rst:27
+msgid "Once the :guilabel:`Customer Ratings` setting has been enabled on the team's settings page, (see above) click the :guilabel:`Set an Email Template on Stages` link. Select a stage from the list, or click :guilabel:`New` to create a new stage."
+msgstr ""
+
+#: ../../content/applications/services/helpdesk/overview/ratings.rst:32
+msgid "Customers should only be asked to rate tickets once an issue has been resolved and their ticket is closed. Therefore, a *ratings request* email should only be added to a stage that is **folded** in the kanban, as tickets in a *folded stage* are considered closed."
+msgstr ""
+
+#: ../../content/applications/services/helpdesk/overview/ratings.rst:36
+msgid "On the stage's settings page, select `Helpdesk: Ticket Rating Request` in the :guilabel:`Email Template` field. This template has been pre-configured with ratings customers can use to provide feedback. To view the template, click the arrow button to the right of the field."
+msgstr ""
+
+#: ../../content/applications/services/helpdesk/overview/ratings.rst:40
+msgid "Once the template has been added to the stage, it will automatically send a message when a ticket is moved to that stage. Customers will be asked to rate the support they received with colored icons."
+msgstr ""
+
+#: ../../content/applications/services/helpdesk/overview/ratings.rst:43
+msgid "*Green smiling face* - Satisfied"
+msgstr ""
+
+#: ../../content/applications/services/helpdesk/overview/ratings.rst:44
+msgid "*Yellow neutral face* - Okay"
+msgstr ""
+
+#: ../../content/applications/services/helpdesk/overview/ratings.rst:45
+msgid "*Red frowning face* - Dissatisfied"
 msgstr ""

 #: ../../content/applications/services/helpdesk/overview/ratings.rst:-1
-msgid "Overview of a helpdesk team kanban view emphasizing the menu edit stage in Odoo Helpdesk"
-msgstr ""
-
-#: ../../content/applications/services/helpdesk/overview/ratings.rst:28
-msgid "Now, once a ticket reaches the stage(s) designated as the *Closing Stage*, an email is sent to the customer."
-msgstr ""
-
-#: ../../content/applications/services/helpdesk/overview/ratings.rst:-1
-msgid "View of a standard helpdesk customer review email template for Odoo Helpdesk"
-msgstr ""
-
-#: ../../content/applications/services/helpdesk/overview/ratings.rst:35
-msgid "Ratings can be seen on the chatter of each ticket, under the *See Customer Satisfaction* link on the main dashboard, and through *Reporting*."
-msgstr ""
-
-#: ../../content/applications/services/helpdesk/overview/ratings.rst:39
-msgid "Ratings visible on the customer portal"
-msgstr ""
-
-#: ../../content/applications/services/helpdesk/overview/ratings.rst:41
-msgid "Go to :menuselection:`Helpdesk --> Configuration --> Helpdesk Teams` and enable *Display Rating on Customer Portal*. Now, by clicking on the helpdesk team’s name on their ticket, customers can see its ratings."
-msgstr ""
-
-#: ../../content/applications/services/helpdesk/overview/ratings.rst:-1
-msgid "View of the helpdesk ticket from a user’s portal emphasizing the link to the helpdesk team\n"
-"in Odoo Helpdesk"
+msgid "View of a standard helpdesk customer review email template for Odoo Helpdesk."
 msgstr ""

 #: ../../content/applications/services/helpdesk/overview/ratings.rst:51
-msgid ":doc:`../advanced/close_tickets`"
+msgid "After selecting a rating, customers are taken to a webpage where they can provide specific written feedback to support their rating. Once a rating is submitted, it is added to the chatter on the ticket."
+msgstr ""
+
+#: ../../content/applications/services/helpdesk/overview/ratings.rst:56
+msgid "Customer ratings can also be viewed through the :guilabel:`Customer Ratings` report. To view this report, go to :menuselection:`Helpdesk --> Reporting --> Customer Ratings`."
+msgstr ""
+
+#: ../../content/applications/services/helpdesk/overview/ratings.rst:63
+msgid "Publish ratings on the customer portal"
+msgstr ""
+
+#: ../../content/applications/services/helpdesk/overview/ratings.rst:65
+msgid "After enabling the :guilabel:`Customer Ratings` setting, an option to publish ratings on the team's website appears. Enabling this setting provides portal users with an overview of the ratings the team has received over the last thirty days. Specific written feedback will not be included; only statistics of the team's performance will be visible."
+msgstr ""
+
+#: ../../content/applications/services/helpdesk/overview/ratings.rst:71
+msgid "In order to display ratings on the customer portal, a team has to have their visibility setting set to :guilabel:`Invited portal users and all internal users`. This setting is found on the team's settings page under :guilabel:`Visibility`."
+msgstr ""
+
+#: ../../content/applications/services/helpdesk/overview/ratings.rst:75
+msgid "Next, to publish the ratings, go to :menuselection:`Helpdesk --> Configuration --> Teams` and select a team. Scroll to :guilabel:`Performance` and enable :guilabel:`Publish this team's ratings on your website`."
+msgstr ""
+
+#: ../../content/applications/services/helpdesk/overview/ratings.rst:79
+msgid "To view the ratings for a team, a customer will log into the portal and navigate to one of their tickets. After clicking on the team name in the :guilabel:`Managed By` field, they will be directed to a page with the team's ratings over the past thirty days."
+msgstr ""
+
+#: ../../content/applications/services/helpdesk/overview/ratings.rst:-1
+msgid "View of the ratings performance overview from the customer portal."
+msgstr ""
+
+#: ../../content/applications/services/helpdesk/overview/ratings.rst:88
+msgid "Manually hide individual ratings"
+msgstr ""
+
+#: ../../content/applications/services/helpdesk/overview/ratings.rst:90
+msgid "Individual ratings can be manually hidden from the portal. This allows for specific ratings to be kept out of the performance metrics that are shown to customers."
+msgstr ""
+
+#: ../../content/applications/services/helpdesk/overview/ratings.rst:93
+msgid "To make a rating visible only to internal users, navigate to the page for a rating. This can be done in one of the following ways:"
+msgstr ""
+
+#: ../../content/applications/services/helpdesk/overview/ratings.rst:96
+msgid "Go to :menuselection:`Helpdesk --> Reporting --> Customer Ratings` and click on one of the kanban cards for an individual rating."
+msgstr ""
+
+#: ../../content/applications/services/helpdesk/overview/ratings.rst:98
+msgid "Navigate to :menuselection:`Helpdesk --> Tickets --> All Tickets` and remove the :guilabel:`Open` filter from the search bar. Then filter by :guilabel:`Satisfied`, :guilabel:`Okay` and/or :guilabel:`Dissatisfied`. Select a ticket from the results. Click the :guilabel:`Rating` smart button."
+msgstr ""
+
+#: ../../content/applications/services/helpdesk/overview/ratings.rst:103
+msgid "Once on the rating details page, check the :guilabel:`Visible Internally Only` box."
+msgstr ""
+
+#: ../../content/applications/services/helpdesk/overview/ratings.rst:110
+#: ../../content/applications/services/helpdesk/overview/receiving_tickets.rst:291
+msgid ":doc:`/applications/services/helpdesk/advanced/close_tickets`"
+msgstr ""
+
+#: ../../content/applications/services/helpdesk/overview/ratings.rst:111
+msgid ":doc:`/applications/services/helpdesk/overview/reports`"
 msgstr ""

 #: ../../content/applications/services/helpdesk/overview/receiving_tickets.rst:3
@ -1079,10 +1158,6 @@ msgstr ""
 msgid "As priority levels can be used as criteria for assigning :doc:`SLAs <sla>`, changing the priority level of a ticket can alter the :abbr:`SLA (Service Level Agreement)` deadline."
 msgstr ""

-#: ../../content/applications/services/helpdesk/overview/receiving_tickets.rst:291
-msgid ":doc:`/applications/services/helpdesk/advanced/close_tickets`"
-msgstr ""
-
 #: ../../content/applications/services/helpdesk/overview/receiving_tickets.rst:292
 msgid ":doc:`/applications/general/email_communication/email_servers`"
 msgstr ""