[IMP] on_premise: update version number in source install

content/applications/hr/fleet/new_vehicle.rst

@@ -1,47 +1,33 @@
-============
-New vehicles
-============
+===================
+Create new vehicles
+===================
 
-Odoo's *Fleet* app manages all vehicles, and the accompanying documentation that comes with vehicle
-maintenance, and drivers records.
+Odoo's *Fleet* app manages all vehicles and the accompanying documentation that comes with vehicle
+maintenance and driver's records.
 
-Upon opening the :menuselection:`Fleet` application, all vehicles are organized within the
-:guilabel:`Vehicles` dashboard, which is the default dashboard for the *Fleet* application. Each
-vehicle is displayed in its corresponding Kanban stage, based on its status. The default stages are
-:guilabel:`New Request`, :guilabel:`To Order`, :guilabel:`Registered`, and :guilabel:`Downgraded`.
+All vehicles are organized on the main :guilabel:`Fleet` dashboard. Each vehicle has its own
+*vehicle form*, which is displayed as a card in the kanban view, according to it's status. Every
+vehicle form is displayed in its current corresponding kanban stage. The default stages are
+:guilabel:`New Request`, :guilabel:`To Order`, :guilabel:`Ordered`, :guilabel:`Registered`,
+:guilabel:`Downgraded`, :guilabel:`Reserve`, and :guilabel:`Waiting List`.
 
-To add a new vehicle to the fleet from the :guilabel:`Vehicles` page, click the :guilabel:`New`
-button in the top-left corner, and a blank vehicle form loads. Then, proceed to enter the vehicle
-information on the vehicle form.
-
-The form auto-saves as data is entered. However, the form can be saved manually at any time by
-clicking the *save manually* option, represented by a :guilabel:`(cloud upload)` icon, located in
-the top-left corner of the page.
-
-.. _fleet/new_vehicle/vehicle-form:
+To add a new vehicle to the fleet, click the :guilabel:`Create` button, and a blank vehicle form
+loads. Enter the vehicle information in the vehicle form, then click :guilabel:`Save`.
 
 Vehicle form fields
 ===================
 
-- :guilabel:`Model`: select the vehicle's model from the drop-down menu. Once a model is selected,
-  additional fields may appear on the form.
-
-  If the model is not listed, type in the model name, and click either :guilabel:`Create "model"`,
-  or :guilabel:`Create and edit...` to :ref:`create a new model and edit the model details
-  <fleet/configuration/add-model>`.
+- :guilabel:`Model`: select the vehicle's model from the drop-down menu. If the model is not listed,
+  type in the model name and click either :guilabel:`Create` or :guilabel:`Create and Edit`.
 - :guilabel:`License Plate`: enter the vehicle's license plate number in this field.
 - :guilabel:`Tags`: select any tags from the drop-down menu, or type in a new tag. There is no limit
   on the amount of tags that can be selected.
 
-.. image:: new_vehicle/model.png
-   :align: center
-   :alt: The new vehicle form, showing the model section.
-
 .. note::
    The :guilabel:`Model` is the only required field on the new vehicle form. When a model is
-   selected, other fields appear on the vehicle form, and relevant information auto-populates the
-   fields that apply to the model. If some of the fields do not appear, this may indicate there is
-   no model selected.
+   selected, other fields will appear on the vehicle form, and relevant information will
+   auto-populate fields that apply to the model. If some of the fields do not appear, this may
+   indicate there is no model selected.
 
 Driver section
 --------------
@@ -50,226 +36,58 @@ This section of the vehicle form relates to the person who is currently driving
 any plans for a change in the driver in the future, and when.
 
 - :guilabel:`Driver`: select the driver from the drop-down menu, or type in a new driver and click
-  either :guilabel:`Create "driver"` or :guilabel:`Create and edit...` to :ref:`create a new driver,
-  and edit the driver details <fleet/new_vehicle/add-driver>`.
-
-  .. important::
-     A driver does **not** have to be an employee. When creating a new driver, the driver is added
-     to the *Fleet* application, **not** the *Employees* application.
-
-     If the *Contacts* application is installed, the driver information is also stored in the
-     *Contacts* application.
-
+  either :guilabel:`Create` or :guilabel:`Create and Edit`.
 - :guilabel:`Mobility Card`: if the selected driver has a mobility card listed on their employee
-  card in the *Employees* application, the mobility card number appears in this field. If there is
-  no mobility card listed, and one should be added, :ref:`edit the employee record
+  card in the *Employees* application, the mobility card number will appear in this field. If there
+  is no mobility card listed and one should be added, :ref:`edit the employee card
   <employees/hr-settings>` in the *Employees* application.
 - :guilabel:`Future Driver`: if the next driver for the vehicle is known, select the next driver
-  from the drop-down menu. Or, type in the next driver and click either :guilabel:`Create "future
-  driver"` or :guilabel:`Create and edit...` to :ref:`create a new future driver, and edit the
-  driver details <fleet/new_vehicle/add-driver>`.
+  from the drop-down menu, or type in the next driver and click either :guilabel:`Create` or
+  :guilabel:`Create and Edit`.
 - :guilabel:`Plan To Change Car`: if the current driver set for this vehicle plans to change their
-  vehicle - either because they are waiting on a new vehicle that is being ordered, or this is a
-  temporary vehicle assignment, and they know which vehicle they are driving next - check this box.
-  Do **not** check this box if the current driver does not plan to change their vehicle.
-- :guilabel:`Assignment Date`: using the drop-down calendar, select when the vehicle is available
-  for another driver. Select the date by navigating to the correct month and year using the
-  :guilabel:`⬅️ (left arrow)` and :guilabel:`➡️ (right arrow)` icons. Then, click on the specific
-  day. If this field is left blank, that indicates the vehicle is currently available, and can be
-  reassigned to another driver. If it is populated, the vehicle is not available for another driver
-  until the selected date.
-- :guilabel:`Company`: select the company from the drop-down menu. This field only appears in a
-  multi-company database.
+  vehicle, either because they are waiting on a new vehicle that is being ordered, or this is a
+  temporary vehicle assignment and they know which vehicle they will be driving next, check this
+  box. If the current driver does not plan to change their vehicle and use this current vehicle, do
+  not check this box.
+- :guilabel:`Assignment Date`: select the date the vehicle will be available for another driver
+  using the drop-down calendar. Select the date by navigating to the correct month and year using
+  the :guilabel:`⬅️ (left arrow)` and :guilabel:`➡️ (right arrow)` icons, then click on the specific
+  day. If this field is blank, this indicates the vehicle is currently available and can be
+  reassigned to another driver. If it is populated, the vehicle will not be available to assign to
+  another driver until the date entered.
 
-.. _fleet/new_vehicle/add-driver:
-
-Create a new driver
-~~~~~~~~~~~~~~~~~~~
-
-If a driver is not already in the system, the new driver should first be configured and added to the
-database. A new driver can be added either from the :guilabel:`Driver` or :guilabel:`Future Driver`
-fields on the :ref:`vehicle form <fleet/new_vehicle/vehicle-form>`.
-
-First, type in the name of the new driver in either the :guilabel:`Driver` or :guilabel:`Future
-Driver` field, then click :guilabel:`Create and edit...`. A :guilabel:`Create Driver` or
-:guilabel:`Create Future Driver` form appears, depending on which field initiated the form.
-
-Both the :guilabel:`Create Driver` and :guilabel:`Create Future Driver` forms are identical.
-
-.. _fleet/new_vehicle/general-info:
-
-.. note::
-   Depending on the installed applications, different tabs or fields may be visible on the
-   :guilabel:`Create Driver` and :guilabel:`Create Future Driver` forms.
-
-General information
-*******************
-
-Fill out the following information on the top-half of the form:
-
-- :guilabel:`Individual` or :guilabel:`Company`: choose if the driver being added is an individual
-  driver or a company. Click the radio button to make a selection.
-
-  When a selection is made, some fields may disappear from the form. If any of the fields below are
-  not visible, that is because :guilabel:`Company` was selected instead of :guilabel:`Individual`.
-- :guilabel:`Name`: enter the name of the driver or company in this field.
-- :guilabel:`Company Name...`: using the drop-down menu, select the company the driver is associated
-  with.
-
-  If the :guilabel:`Company` radio button is selected at the top of the form, this field does not
-  appear.
-- :guilabel:`Contact`: enter the contact information in this section.
-
-  If desired, the :guilabel:`Contact` field can be changed to a different type of contact. Click on
-  :guilabel:`Contact` to reveal a drop-down menu. The available options to select are
-  :guilabel:`Contact`, :guilabel:`Invoice Address`, :guilabel:`Delivery Address`,
-  :guilabel:`Follow-up Address`, or :guilabel:`Other Address`.
-
-  If desired, select one of these other options for the :guilabel:`Contact` field, and enter the
-  corresponding information.
-
-  If the :guilabel:`Company` radio button is selected at the top of the form, this field is labeled
-  :guilabel:`Address` and cannot be modified.
-
-- :guilabel:`Tax ID`: enter the driver or company's tax ID in this field.
-- :guilabel:`Job Position`: enter the driver's job position in this field. If the
-  :guilabel:`Company` radio button is selected at the top of the form, this field does not appear.
-- :guilabel:`Phone`: enter the driver or company's phone number in this field.
-- :guilabel:`Mobile`: enter the driver or company's mobile number in this field.
-- :guilabel:`Email`: enter the driver or company's email address in this field.
-- :guilabel:`Website`: enter the driver or company's website address in this field.
-- :guilabel:`Title`: using the drop-down menu, select the driver's title in this field. The default
-  options are :guilabel:`Doctor`, :guilabel:`Madam`, :guilabel:`Miss`, :guilabel:`Mister`, and
-  :guilabel:`Professor`.
-
-  If the :guilabel:`Company` radio button is selected at the top of the form, this field does not
-  appear.
-- :guilabel:`Tags`: using the drop-down menu, select any tags that apply to the driver or company.
-
-  To add a new tag, type in the tag, then click :guilabel:`Create "tag"`.
-
-  There is no limit to the number of tags that can be selected.
-
-.. image:: new_vehicle/create-driver.png
-   :align: center
-   :alt: The top portion of the create driver form.
-
-Contacts & Addresses tab
-************************
-
-After completing the top-half of the :guilabel:`Create Driver` or :guilabel:`Create Future Driver`
-form, add any other contacts and addresses associated with the driver or company in this tab.
-
-To add a new contact, click the :guilabel:`Add` button, and a :guilabel:`Create Contact` pop-up
-window appears.
-
-Before entering the necessary information on the form, select the type of contact being added from a
-series radio button options located at the top of the form. Those options are:
-
-- :guilabel:`Contact`: select this option to add general contact details for employees of the
-  associated company.
-- :guilabel:`Invoice Address`: select this option to add a preferred address for all invoices. When
-  added to the form, this address is selected by default when sending an invoice to the associated
-  company.
-- :guilabel:`Delivery Address`: select this option to add a preferred address for all deliveries.
-  When added to the form, this address is selected by default when delivering an order to the
-  associated company.
-- :guilabel:`Follow-up Address`: select this option to add a preferred address for all follow-up
-  correspondence. When added to the form, this address is selected by default when sending reminders
-  about overdue invoices.
-- :guilabel:`Other Address`: select this option to add any other necessary addresses for the company
-  or driver.
-
-.. image:: new_vehicle/create-contact.png
-   :align: center
-   :alt: The create contact form with all parts filled in.
-
-Depending on the :guilabel:`Contact Type`, some optional fields may not be visible. The available
-fields are identical to the fields in the :ref:`general information
-<fleet/new_vehicle/general-info>` section of the new driver form.
-
-Add any notes to the :guilabel:`Internal notes...` section of the form.
-
-After entering all of the information, click either :guilabel:`Save & Close` to add the one new
-contact, or :guilabel:`Save & New` to add the current address record and create another address
-record.
-
-As contacts are added to this tab, each contact appears in a separate box, with an icon indicating
-what type of contact is listed.
-
-.. example::
-   An :guilabel:`Invoice Address` displays a :guilabel:`💲 (dollar sign)` icon inside that specific
-   address box, whereas a :guilabel:`Delivery Address` displays a :guilabel:`🚚 (truck)` icon
-   inside.
-
-   .. image:: new_vehicle/contacts-address.png
-     :align: center
-     :alt: The create contact form with all parts filled in.
-
-Sales & Purchase tab
-********************
-
-Enter the following sales and purchasing information, in the :guilabel:`Sales & Purchase` tab of the
-:guilabel:`Create Driver` or :guilabel:`Create Future Driver` pop-up form for the various sections
-below.
-
-Depending on the other installed applications, additional fields and sections may appear. The
-following are all default fields for the *Fleet* application **only**.
-
-Sales section
-^^^^^^^^^^^^^
-
-- :guilabel:`Salesperson`: using the drop-down menu, select the user who is the main point of
-  contact for sales with this driver's company.
-
-  This person **must** be an internal user of the company, meaning they can log into the database as
-  a user.
-
-Misc
-^^^^
-
-- :guilabel:`Company ID`: if the company has an ID number, **other than** its *tax ID*, enter it in
-  this field.
-- :guilabel:`Reference`: enter any text to give more information regarding the contact person. This
-  is an internal note to provide any additional information.
-
-  .. example::
-     A company has several people with the same name, John Smith. The :guilabel:`Reference` field
-     could state `John Smith at X205 - purchaser` to provide additional details.
-
-Internal Notes tab
-******************
-
-Add any notes that pertain to the driver, or any other necessary information, in this tab.
+.. important::
+   A driver does **not** have to be an employee, but a driver must be listed in the *Contacts*
+   application. When creating a new driver, the driver is added to the *Contacts* application, not
+   the *Employees* application.
 
 Vehicle section
 ---------------
 
-This section of the vehicle form relates to the physical details of the vehicle.
+This section of the vehicle form relates to the physical vehicle, it's various properties, when it
+was added, where it is located, and who is managing it.
 
-If a preexisting vehicle in the database was selected for the :guilabel:`Model` field in the top
-portion of the form, some fields may auto-populate, and additional fields may also appear.
-
-Fill in the following fields on the form:
-
-- :guilabel:`Category`: using the drop-down menu, select the vehicle category from the available
-  options. To create a new category, type in the new category name, then click :guilabel:`Create
-  "category"`.
-- :guilabel:`Order Date`: using the drop-down calendar, select the date the vehicle was ordered.
-- :guilabel:`Registration Date`: using the drop-down calendar, select the date the vehicle was
-  registered.
-- :guilabel:`Cancellation Date`: using the drop-down calendar, select the date the vehicle lease
-  expires, or when the vehicle is no longer available.
+- :guilabel:`Immatriculation Date`: select the date the vehicle is acquired using the drop-down
+  calendar.
+- :guilabel:`Cancellation Date`: select the date the vehicle lease will expire, or when the vehicle
+  will be no longer available, using the drop-down calendar.
 - :guilabel:`Chassis Number`: enter the chassis number in the field. This is known in some countries
   as the :abbr:`VIN (Vehicle Identification Number)` number.
 - :guilabel:`Last Odometer`: enter the last known odometer reading in the number field. Using the
   drop-down menu next to the number field, select whether the odometer reading is in kilometers
   :guilabel:`(km)` or miles :guilabel:`(mi)`.
 - :guilabel:`Fleet Manager`: select the fleet manager from the drop-down menu, or type in a new
-  fleet manager, and click either :guilabel:`Create` or :guilabel:`Create and Edit`.
-- :guilabel:`Location`: type in the specific location where the vehicle is typically located in this
-  field. The entry should clearly explain where the vehicle can be found, such as `Main Garage` or
-  `Building 2 Parking Lot`.
+  fleet manager and click either :guilabel:`Create` or :guilabel:`Create and Edit`.
+- :guilabel:`Location`: type in the location for the vehicle in the field. The most common scenario
+  for when this field would be populated is if a company has several office locations. The typical
+  office location where the vehicle is located would be the location entered.
+- :guilabel:`Company`: select the company that the vehicle will be used for and associated with from
+  the drop-down menu, or type in a new company and click either :guilabel:`Create` or
+  :guilabel:`Create and Edit`.
+
+.. important::
+   Creating a new company may cause a subscription price change depending on the current plan. Refer
+   to `Odoo's pricing plan <https://www.odoo.com/pricing-plan>`_ for more details.
 
 .. image:: new_vehicle/new-vehicle-type.png
    :align: center
@@ -278,18 +96,24 @@ Fill in the following fields on the form:
 Tax Info tab
 ------------
 
-Depending on the localization setting for the database, and what additional applications are
-installed, other fields may be present on the form.
-
-The sections below are default and appear for all vehicles, regardless of other installed
-applications or localization settings.
-
 Fiscality
 ~~~~~~~~~
 
-- :guilabel:`Horsepower Taxation`: enter the amount that is taxed based on the size of the vehicle's
+- :guilabel:`Horsepower Taxation`: enter the amount that is taxed based on the size of the vehicles
   engine. This is determined by local taxes and regulations, and varies depending on the location.
   It is recommended to check with the accounting department to ensure this value is correct.
+- :guilabel:`Disallowed Expense Rate`: this is the amount of non-deductible expenses for the
+  vehicle. This amount is not counted towards any deductions on a tax return or as an allowable
+  expense when calculating taxable income. It is recommended to check with the accounting department
+  to ensure the value(s) entered are correct.
+
+  - :guilabel:`Start Date`: enter the :guilabel:`Start Date` and :guilabel:`(%) Percentage` for when
+    the :guilabel:`Disallowed Expense Rate` value goes into effect. Click :guilabel:`Add a line` to
+    enter a date. Click on the blank line to display a calendar. Select the date by navigating to
+    the correct month and year using the :guilabel:`⬅️ (left arrow)` and :guilabel:`➡️ (right
+    arrow)` icons, then click on the specific day. Enter the percentage that is disallowed in the
+    :guilabel:`% (percent)` field to the right of the date. The percentage should be entered in an
+    XX.XX format. Repeat this for all entries needed.
 
 Contract
 ~~~~~~~~
@@ -302,8 +126,8 @@ Contract
 - :guilabel:`Residual Value`: enter the current value of the vehicle.
 
 .. note::
-   The values listed above affect the accounting department. It is recommended to check with the
-   accounting department for more information and/or assistance with these values.
+   The values listed above will affect the accounting department. It is recommended to check with
+   the accounting department for more information and/or assistance with these values.
 
 .. image:: new_vehicle/new-vehicle-tax.png
    :align: center
@@ -313,13 +137,13 @@ Model tab
 ---------
 
 If the model for the new vehicle is already configured in the database, the :guilabel:`Model` tab
-populates the corresponding information. If the model is **not** already in the database, and the
-:guilabel:`Model` tab needs to be configured, it is recommended that :ref:`the new vehicle model
-<fleet/configuration/add-model>` be configured so this information auto-populates.
+will be populated with the corresponding information. If the model is not already in the database
+and the :guilabel:`Model` tab needs to be configured, :ref:`configure the new vehicle model
+<fleet/configuration/add-model>`.
 
 Check the information in the :guilabel:`Model` tab to ensure it is accurate. For example, the color
-of the vehicle, or if a trailer hitch is installed, are examples of common information that may need
-updating.
+of the vehicle, or whether there is a trailer hitch installed or not, are examples of information
+that may need updating.
 
 .. image:: new_vehicle/model-tab.png
    :align: center

content/applications/inventory_and_mrp/purchase/manage_deals/calls_for_tenders.rst

@@ -1,315 +1,267 @@
-================
-Alternative RfQs
-================
-
-.. _purchase/manage_deals/alternative-rfqs:
-
-.. |PO| replace:: :abbr:`PO (Purchase Order)`
-.. |POs| replace:: :abbr:`POs (Purchase Orders)`
-.. |RfQ| replace:: :abbr:`RfQ (Request for Quotation)`
-.. |RfQs| replace:: :abbr:`RfQs (Requests for Quotation)`
+==============================================================
+Create alternative requests for quotation for multiple vendors
+==============================================================
 
 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, fastest vendors, depending on their specific business needs.
+companies to select the cheapest (and fastest) vendors, depending on their specific business needs.
 
-In Odoo, this can be done by creating alternative requests for quotation (RfQs) for different
-vendors. Once a response is received from each vendor, the product lines from each |RfQ| can be
-compared, and a decision can be made for which products to purchase from which vendors.
+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.
 
-.. note::
-   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 |RfQs| to spend money efficiently.
+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.
 
-Configuration
-=============
+.. seealso::
+   :doc:`blanket_orders`
 
-To create alternative |RfQs|, the *Purchase Agreements* feature **must** be enabled in the
-*Purchase* app settings. To enable the feature, navigate to :menuselection:`Purchase app -->
-Configuration --> Settings`. Under the :guilabel:`Orders` section, click the checkbox for
-:guilabel:`Purchase Agreements`.
+Configure purchase agreement settings
+=====================================
 
-Then, click :guilabel:`Save` to apply the change.
+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*.
 
-Doing so enables the ability to create alternative |RfQs|, as well as *blanket orders*.
-
-.. image:: calls_for_tenders/calls-for-tenders-enabled-setting.png
+.. image:: calls_for_tenders/calls-for-tenders-settings-page.png
    :align: center
    :alt: Purchase Agreements enabled in the Purchase app settings.
 
 .. tip::
-   To save time creating alternative |RfQs|, custom vendors, prices, and delivery lead times can be
-   set in the :guilabel:`Purchase` tab of a product form.
+   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.
 
-   To do that, navigate to :menuselection:`Purchase app --> Products --> Products`, and select a
-   product to edit. On the product form, click the :guilabel:`Purchase` tab, and click
-   :guilabel:`Add a line`.
+Create an :abbr:`RFQ (Request for Quotation)`
+=============================================
 
-   From the drop-down menu, choose a vendor to set under the :guilabel:`Vendor` column, then set a
-   :guilabel:`Price` and :guilabel:`Delivery Lead Time`, if necessary. Clicking the
-   :guilabel:`(optional columns drop-down toggle)` icon, at the top right of the header row,
-   provides additional column options to add to the line item.
+To create a new :abbr:`RFQ (Request for Quotation)`, navigate to the :menuselection:`Purchase` app,
+and click :guilabel:`New`.
 
-.. _purchase/manage_deals/create-rfq:
+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.
 
-Create an |RfQ|
-===============
+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.
 
-To create a new |RfQ|, navigate to the :menuselection:`Purchase` app, and click :guilabel:`New`.
+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.
 
-On the blank |RfQ| form, add a vendor from the drop-down menu, next to the :guilabel:`Vendor` field.
-Then, click :guilabel:`Add a product`, in the :guilabel:`Products` tab, to select a product from the
-drop-down menu in the :guilabel:`Product` column.
-
-Then, set the desired quantity to purchase in the :guilabel:`Quantity` column, and change the
-purchase price in the :guilabel:`Unit Price` column, if necessary.
-
-Clicking the :guilabel:`(optional columns drop-down toggle)` icon, at the top right of the header
-row, provides additional column options to add to the line item.
-
-Repeat these steps to add as many column options in the :guilabel:`Products` tab as desired,
-including the :guilabel:`UoM` (Units of Measure) to purchase the products in, and the
-:guilabel:`Expected Arrival` date.
-
-Once ready, click :guilabel:`Send by Email`.
-
-This opens a :guilabel:`Compose Email` pop-up window, wherein the message to the vendor can be
-customized, and attachments can be added, if needed. Once ready, click :guilabel:`Send`.
-
-This sends an email to the vendor listed on the |RfQ| form.
-
-.. image:: calls_for_tenders/calls-for-tenders-compose-email.png
+.. image:: calls_for_tenders/calls-for-tenders-email-popup.png
    :align: center
    :alt: Compose and send quotation email pop-up.
 
 .. note::
-   Sending emails to each vendor can be useful when creating alternative |RfQs|, because vendors can
-   confirm if their past prices still hold today, which helps companies choose the best offers.
+   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.
 
-.. _purchase/manage_deals/create-alternatives:
+Create alternatives to an :abbr:`RFQ (Request for Quotation)`
+=============================================================
 
-Create alternative |RfQs|
-=========================
+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.
 
-Once a |PO| is created and sent to a vendor, alternative |RfQs| can be created for additional
-vendors to compare prices, delivery times, and other factors, to help make a decision for the order.
+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.
 
-To create alternative |RfQs| from the original, click the :guilabel:`Alternatives` tab. Then, click
-:guilabel:`Create Alternative`. When clicked, a :guilabel:`Create alternative` pop-up window
-appears.
-
-.. image:: calls_for_tenders/calls-for-tenders-create-alternative.png
+.. image:: calls_for_tenders/calls-for-tenders-alternatives-popup.png
    :align: center
    :alt: Calls for tenders pop-up to create alternative quotation.
 
-From this window, select an alternative vendor from the drop-down menu next to the
-:guilabel:`Vendor` field, to whom the alternative quotation is assigned.
+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.
 
 Next to this, there is a :guilabel:`Copy Products` checkbox that is selected by default. When
-selected, the product quantities of the original |RfQ| are copied over to the alternative. For this
-first alternative quotation, leave the checkbox checked. Once finished, click :guilabel:`Create
-Alternative`. This opens a new |RfQ| form.
+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)`.
 
-Since the :guilabel:`Create Alternative` checkbox was left checked, the new form is already
-pre-populated with the same products, quantities, and other details as the previous, original |RfQ|.
+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)`.
 
 .. note::
    When the :guilabel:`Copy Products` checkbox is selected while creating an alternative quotation,
-   additional products do **not** need to be added, unless desired.
+   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.
 
-   However, if a chosen vendor is listed in the :guilabel:`Vendor` column under a specific product
-   form included in the order, the values set on the product form carry over to the |RfQ|, and
-   **must** be changed manually, if necessary.
-
-Once ready, create a second alternative quotation by clicking the :guilabel:`Alternatives` tab,
-followed by :guilabel:`Create Alternative`.
-
-.. note::
-   An option to :guilabel:`Compare Product Lines` also appears. Clicking this navigates to the
-   :guilabel:`Compare Order Lines` page, where alternative |RfQs| can be compared, side-by-side. For
-   more information on this, refer to the :ref:`Compare Product Lines
-   <purchase/manage_deals/compare-product-lines>` section.
-
-This opens the :guilabel:`Create alternative` pop-up window. Once again, choose a different vendor
-from the drop-down menu next to :guilabel:`Vendor`. For this particular |RfQ|, however, *uncheck*
-the :guilabel:`Copy Products` checkbox. Doing so removes all products on the new alternative |RfQ|,
-leaving it blank. The specific products which should be ordered from this particular vendor can be
-added in as needed.
-
-Once ready, click :guilabel:`Create Alternative`.
+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`.
 
 .. tip::
-   If an alternative quotation should be removed from the :guilabel:`Alternatives` tab, they can be
-   individually removed by clicking on the :guilabel:`X (remove)` icon at the end of their row.
+   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.
 
-This creates a third, new |RfQ|. But, since the product quantities of the original |RfQ| were
-**not** copied over, the product lines are empty, and new products can be added as needed by
-clicking :guilabel:`Add a product`, and selecting the desired products from the drop-down menu.
+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`.
 
-Once the desired number of specific products are added, click :guilabel:`Send by Email`.
-
-.. image:: calls_for_tenders/calls-for-tenders-blank-quotation.png
+.. image:: calls_for_tenders/calls-for-tenders-blank-alternative.png
    :align: center
    :alt: Blank alternative quotation with alternatives in breadcrumbs.
 
-This opens a :guilabel:`Compose Email` pop-up window, wherein the message to the vendor can be
-customized, and attachments can be added, if necessary. Once ready, click :guilabel:`Send`.
+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.
 
-From this newest form, click the :guilabel:`Alternatives` tab. Under this tab, all three |RfQs| 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.
+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.
 
-The date in the :guilabel:`Expected Arrival` column is calculated for each vendor, based on any
-pre-configured lead times in the vendor and product forms.
+Link a new :abbr:`RFQ (Request for Quotation)` to existing quotations
+=====================================================================
 
-.. _purchase/manage_deals/link-rfq:
+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.
 
-Link new |RfQ| to existing quotations
-=====================================
+To create a new :abbr:`RFQ (Request for Quotation)`, navigate to the :menuselection:`Purchase` app,
+and click :guilabel:`New`.
 
-Even if a quotation is not created directly from the :guilabel:`Alternatives` tab of another |RfQ|,
-it can still be linked to existing |RfQs|.
+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.
 
-To do that, begin by creating a new |RfQ|. Navigate to :menuselection:`Purchase app --> New`. Fill
-out the |RfQ|, according to the :ref:`previous instructions <purchase/manage_deals/create-rfq>`.
+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.
 
-Then, once ready, click the :guilabel:`Alternatives` tab. Since this new |RfQ| was created
-separately, there are no other orders linked yet.
+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.
 
-However, to link this |RfQ| with existing alternatives, click :guilabel:`Link to Existing RfQ` on
-the first line in the :guilabel:`Vendor` column.
-
-.. image:: calls_for_tenders/calls-for-tenders-link-rfq-popup.png
+.. image:: calls_for_tenders/calls-for-tenders-link-existing-rfq.png
    :align: center
-   :alt: Pop-up to link new quotation to existing RFQs.
+   :alt: pop-up to link new quotation to existing RFQs.
 
-This opens an :guilabel:`Add: Alternative POs` pop-up window. Select the desired previously-created
-|RfQs|, and click :guilabel:`Select`. All of these orders are now copied to this |RfQ|, and can be
-found under the :guilabel:`Alternatives` tab.
+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.
 
 .. tip::
-   If a large number of |POs| are being processed, and the previous |POs| can't be located, click
-   the :guilabel:`⬇️ (down arrow)` icon to the right of the search bar, at the top of the pop-up
-   window.
-
-   Then, under the :guilabel:`Group By` section, click :guilabel:`Vendor`. Vendors are displayed in
-   their own nested drop-down lists, and each vendor's list can be expanded to view open |POs| for
-   that vendor.
-
-.. _purchase/manage_deals/compare-product-lines:
+   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.
 
 Compare product lines
 =====================
 
-Alternative |RfQs| can be compared side-by-side, in order to determine which vendors offer the best
-deals on the products included in the orders.
+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.
 
-To compare alternative |RfQs|, navigate to the :menuselection:`Purchase` app, and select one of the
-previously-created |RfQs|.
+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.
 
-Then, click the :guilabel:`Alternatives` tab to see all linked |RfQs|. Next, under the
-:guilabel:`Create Alternative` option, click :guilabel:`Compare Product Lines`. This navigates to
-the :guilabel:`Compare Order Lines` page.
-
-.. image:: calls_for_tenders/calls-for-tenders-compare-products.png
+.. image:: calls_for_tenders/calls-for-tenders-compare-product-lines.png
    :align: center
    :alt: Compare Product Lines page for alternative RFQs.
 
-The :guilabel:`Compare Order Lines` page, by default, groups by :guilabel:`Product`. Each product
-included in any of the |RfQs| is displayed in its own nested drop-down list, and features all of the
-|PO| numbers in the :guilabel:`Reference` column.
+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.
 
 Additional columns on this page include the :guilabel:`Vendor` from which products were ordered,
-:guilabel:`OTD`, the :guilabel:`Reference` number, the :guilabel:`Status` of the quotation (e.g.,
-:guilabel:`RFQ`, :guilabel:`RFQ Sent`, etc.), the product :guilabel:`Description`, the
-:guilabel:`Expected Arrival` date, the :guilabel:`Quantity` of products ordered from each vendor,
-the :guilabel:`Unit of Measure` used for each product (if any), the :guilabel:`Unit Price` per
-product, the :guilabel:`Total` price of the order, and the :guilabel:`Currency` applied to the
-order.
+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.
 
 .. note::
-   To remove product lines from the :guilabel:`Compare Order Lines` page, click :guilabel:`Clear` at
-   the far-right end of that product line's row.
+   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.
 
-   Doing so removes this specific product as a selectable option from the page, and changes the
-   :guilabel:`Total` price of that product on the page to `0`.
-
-   Additionally, on the |RfQ| form, in which that product was included, its ordered quantity is also
-   changed to `0`.
-
-Once the best offers have been identified, individual products can be selected by clicking the
-:guilabel:`Choose` button at the end of each corresponding row.
-
-Once all 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 |RfQs|.
-
-.. _purchase/manage_deals/cancel-keep-alternatives:
+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)`.
 
 Cancel (or keep) alternatives
 =============================
 
-Once the desired products have been chosen from the :guilabel:`Compare Order Lines` page, the
-remaining |RfQs|, from which no products were chosen, can be canceled.
+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.
 
-The cost in the :guilabel:`Total` column for each product that wasn't chosen is automatically set to
-`0`, indicated at the far-right of each corresponding row.
+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.
 
-Although they haven't been canceled yet, this indicates that each of those orders can be canceled
-without having an effect on the other live orders, once those orders have been confirmed.
-
-.. image:: calls_for_tenders/calls-for-tenders-zero-total.png
+.. image:: calls_for_tenders/calls-for-tenders-canceled-quotes.png
    :align: center
    :alt: Canceled quotations in the Purchase app overview.
 
-To confirm an |RfQ| for which products were selected, click into one, and click :guilabel:`Confirm
-Order`.
+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`.
 
-This causes a pop-up window reading :guilabel:`What about the alternative Requests for Quotations?`
-to appear. From the pop-up window, two options are presented: :guilabel:`Cancel Alternatives` and
-:guilabel:`Keep Alternatives`.
+: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.
 
-If this |PO| should **not** be confirmed, click :guilabel:`Discard`.
+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.
 
-Selecting :guilabel:`Cancel Alternatives` automatically cancels the alternative |RfQs|. Selecting
-:guilabel:`Keep Alternatives` keeps the alternative |RfQs| open, so they can still be accessed, if
-any additional product quantities need to be ordered later.
-
-Once all products are ordered, :guilabel:`Cancel Alternatives` can be selected from whichever |PO|
-is open at that time.
-
-.. image:: calls_for_tenders/calls-for-tenders-keep-or-cancel.png
+.. image:: calls_for_tenders/calls-for-tenders-keep-cancel-alternatives.png
    :align: center
    :alt: Keep or cancel pop-up for alternative RFQs.
 
-To view a detailed form of one of the |RfQs| listed, click the line item for that quotation. This
-opens an :guilabel:`Open: Alternative POs` pop-up window, from which all details of that particular
-|RfQ| can be viewed.
+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)`.
 
-Once ready, click :guilabel:`Close` to close the pop-up window.
-
-If all alternative |RfQs| should stay open, from the :guilabel:`What about the alternative Requests
-for Quotations?` pop-up window, click :guilabel:`Keep Alternatives`.
-
-Then, click :guilabel:`Requests for Quotation` (in the breadcrumbs, at the top of the page) to
-navigate back to an overview of all |RfQs|.
-
-Click into the remaining |RfQs| that contain products that need to be ordered, and click
-:guilabel:`Confirm Order`.
-
-This opens the :guilabel:`What about the alternative Requests for Quotations?` pop-up window. If
-desired, and the remaining alternative |RfQs| are no longer needed, click :guilabel:`Cancel
-Alternatives` to cancel all other alternative |RfQs| linked with this order.
+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.
 
 Finally, click :guilabel:`Requests for Quotation` (in the breadcrumbs, at the top of the page) to
-navigate back to an overview of all |RfQs|.
+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.
 
-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 respective rows.
-
-Now that all product quantities have been ordered, the purchase process can be completed, and the
-products can be received into the warehouse.
-
-.. seealso::
-   :doc:`blanket_orders`
+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.

content/applications/sales/point_of_sale/payment_methods/terminals.rst

@@ -25,7 +25,6 @@ Then, follow the corresponding documentation to configure your device:
 - :doc:`SIX configuration <terminals/six>`
 - :doc:`Stripe configuration <terminals/stripe>`
 - :doc:`Vantiv configuration <terminals/vantiv>`
-- :doc:`Viva Wallet configuration <terminals/viva_wallet>`
 - :doc:`Worldline configuration <terminals/worldline>`
 
 Once the terminal is configured, you can :doc:`create the corresponding payment method and add it to
@@ -39,5 +38,4 @@ the POS <../payment_methods>`.
    terminals/six
    terminals/stripe
    terminals/vantiv
-   terminals/viva_wallet
    terminals/worldline

content/applications/sales/point_of_sale/payment_methods/terminals/viva_wallet.rst

@@ -1,134 +0,0 @@
-===========
-Viva Wallet
-===========
-
-Connecting a **Viva Wallet** :doc:`payment terminal <../terminals>`  allows you to offer a fluid
-payment flow to your customers and ease the work of your cashiers.
-
-.. note::
-   Viva Wallet lets you turn your phone into a mobile card reader: `Tap On Phone
-   <https://www.vivawallet.com/gb_en/blog-tap-on-phone-gb>`_.
-
-Configuration
-=============
-
-Start by creating your Viva Wallet account on `Viva Wallet's website <https://www.vivawallet.com>`_.
-
-Locate your Viva Wallet credentials
------------------------------------
-
-When configuring Viva Wallet in Point of Sale, you need to use specific credentials that are
-available in your Viva Wallet account. These credentials include your :ref:`Merchant ID
-<viva_wallet/id-key>`, :ref:`API key <viva_wallet/id-key>`, :ref:`POS API credentials
-<viva_wallet/pos-api>`, and :ref:`Terminal ID <viva_wallet/identifier>` number.
-
-.. _viva_wallet/id-key:
-
-Merchant ID and API key
-~~~~~~~~~~~~~~~~~~~~~~~
-
-Locate your `Merchant ID and API key following the Viva documentation
-<https://developer.vivawallet.com/getting-started/find-your-account-credentials/merchant-id-and-api-key/>`_.
-Then, save the keys and paste them into the Odoo :guilabel:`Merchant ID` and :guilabel:`API Key`
-fields :ref:`when creating the payment method <viva_wallet/method-creation>`.
-
-.. image:: viva_wallet/access-cred.png
-   :alt: merchant ID and API key fields
-
-.. note::
-   These credentials are used for APIs that authenticate with Basic Auth.
-
-.. _viva_wallet/pos-api:
-
-POS API credentials
-~~~~~~~~~~~~~~~~~~~
-
-Locate and generate your `POS API credentials following the Viva documentation
-<https://developer.vivawallet.com/getting-started/find-your-account-credentials/pos-api-credentials/>`_.
-Then, save the keys and paste them in the Odoo :guilabel:`Client secret` and :guilabel:`Client ID`
-fields :ref:`when creating the payment method <viva_wallet/method-creation>`.
-
-.. warning::
-   These credentials are only displayed once. Ensure you keep a copy to secure them.
-
-.. image:: viva_wallet/api-cred.png
-   :alt: Client secret and client ID fields
-
-.. note::
-   These credentials are used for Android and iOS POS Activation requests, as well as the Cloud
-   Terminal API.
-
-.. _viva_wallet/identifier:
-
-Terminal ID
-~~~~~~~~~~~
-
-Your terminal ID number is used to identify your terminal. To find it:
-
-#. Go to your Viva Wallet account and select the relevant account.
-#. Go to :menuselection:`Sales --> Physical payments --> Card terminals` in the navigation menu.
-
-The terminal ID number is located under the :guilabel:`Terminal ID (TID)` column. Save it to paste
-it into the :guilabel:`Terminal ID` field :ref:`when creating the payment method
-<viva_wallet/method-creation>`.
-
-.. image:: viva_wallet/terminal-id.png
-   :alt: Viva terminal ID
-
-.. _viva_wallet/method-creation:
-
-Configure the payment method
-----------------------------
-
-#. :doc:`Activate the POS Viva Wallet module <../../../../general/apps_modules>` to enable the
-   payment terminal.
-#. :doc:`Create the related payment method <../../payment_methods>` by going to
-   :menuselection:`Point of Sale --> Configuration --> Payment Methods` and clicking
-   :guilabel:`New`.
-#. Set the journal type as :guilabel:`Bank`.
-#. Select :guilabel:`Viva Wallet` in the :guilabel:`Use a Payment Terminal` field.
-#. Fill in the mandatory fields with your:
-
-   - :ref:`Merchant ID and API key <viva_wallet/ID-key>`
-   - :ref:`Client ID and Client secret <viva_wallet/pos-api>`
-   - :ref:`Terminal ID <viva_wallet/identifier>`
-
-#. Save the form and copy the generated webhook URL from the :guilabel:`Viva Wallet Webhook
-   Endpoint` field. This URL is necessary :ref:`when configuring the webhook <viva_wallet/webhook>`.
-
-.. image:: viva_wallet/create-method-viva-wallet.png
-   :alt: payment method creation form
-   :scale: 75%
-
-.. _viva_wallet/webhook:
-
-Configure the webhook
----------------------
-
-Webhooks allow you to receive real-time notifications whenever a transaction occurs within your Viva
-Wallet account. Set them up for `payment transactions following the Viva documentation
-<https://developer.vivawallet.com/webhooks-for-payments/transaction-payment-created/>`_.
-
-.. seealso::
-   `Setting up webhooks <https://developer.viva.com/webhooks-for-payments/#setting-up-webhooks>`_
-
-Link the payment method to a POS
---------------------------------
-
-You can select the payment method in your POS settings once the payment method is created. To do so,
-go to the :ref:`POS' settings <configuration/settings>` and add the payment method under the
-:guilabel:`Payment methods` field of the :guilabel:`Payment` section.
-
-Pay with a payment terminal
-===========================
-
-When processing a payment, select the related payment method. Check the amount and click on
-:guilabel:`Send`. Once the payment is successful, the status changes to :guilabel:`Payment
-Successful`.
-
-.. note::
-   - | In case of connection issues between Odoo and the payment terminal, force the payment by
-       clicking on :guilabel:`Force Done`, which allows you to validate the order.
-     | This option is only available after receiving an error message informing you that the
-       connection failed.
-   - To cancel the payment request, click :guilabel:`cancel`.

content/applications/websites/website/reporting/link_tracker.rst

@@ -1,75 +1,56 @@
-============
-Link tracker
-============
+=============
+Link trackers
+=============
 
-The link tracker allow you to create tracked links to measure your marketing campaigns'
-effectiveness. They let you determine which channels bring you the most visitors and make informed
-decisions.
+Link Trackers allow you to track your marketing campaigns (emails, banner ads, blog posts, social
+media posts, affiliate links, etc.). This way, you are able to identify your best traffic sources
+and make informed decisions about the distribution of your marketing budget.
 
 Configuration
 =============
 
-The :guilabel:`Link Tracker` module is not installed by default. You need to enable the
-:guilabel:`Email Marketing` option by going to :menuselection:`Website --> Configuration -->
-Settings.` Alternatively, you can :doc:`install <../../../general/apps_modules>` the :guilabel:`Link
-Tracker` module itself or one of the marketing apps.
+Go to :menuselection:`Website --> Configuration --> Settings` and activate *Link Trackers*.
 
-Create a traceable URL
-======================
+.. image:: link_tracker/enable_link_tracker.png
+   :align: center
+   :alt: View of Website settings page emphasizing the link trackers field in Odoo Website
 
-To create and manage tracked links, navigate to :menuselection:`Website --> Site --> Link Tracker`.
-Fill in the following information and click :guilabel:`Get tracked link` to generate a tracking URL.
+Set up traceable URLs
+---------------------
 
-#. :guilabel:`URL`: The URL which is the target of the campaign. It is automatically populated with
-   the URL from where you access the menu.
+Go to :menuselection:`Website --> Go to website --> Promote --> Track this page`. Here, you are able
+to get a specific tracked URL based on the campaign, medium, and source being used.
 
-#. :guilabel:`Campaign`: The specific campaign the link should be associated with. This parameter is
-   used to distinguish the different campaigns.
+.. image:: link_tracker/link_tracker_fields.png
+   :align: center
+   :alt: View of the link tracker fields for Odoo Website
 
-#. :guilabel:`Medium`: The medium describes the category or method through which the visitor arrives
-   at your site, such as organic search, paid search, social media ad, email, etc.
+- **URL**: url of the page you want to track (e.g. the home page or a product's page).
+- **Campaign**: context of your link (e.g. a special promotion).
+- **Medium**: channel used to share (deliver) your link (e.g. an email or a Facebook ad).
+- **Source**: platform where the traffic originates (e.g. Google or Twitter).
 
-#. :guilabel:`Source`: The source identifies the precise platform or website that referred the
-   visitor, such as a search engine, a newsletter, or a website.
+Now, click on *Get tracked link* to generate a URL that you can post or send by the source you have
+decided on.
 
-.. image:: link_tracker/create-link-tracker.png
-   :alt: Create a link tracker URL
+Follow-up on tracked links
+==========================
 
-The :guilabel:`Campaign`, :guilabel:`Medium`, and :guilabel:`Source` are called :abbr:`UTM (Urchin
-Tracking Module)` parameters. They are incorporated in the tracked URL.
+To look at statistics of your links, go to :menuselection:`Website --> Go to website --> Promote
+--> Track this page`. Besides being able to see the *Most Clicked* and *Recently Used* links, you
+can also see complete statistics by clicking on *Stats*, including the number of clicks, and the
+country of origin for those clicks.
 
-Website visibility
-------------------
+.. image:: link_tracker/links_statistics.png
+   :align: center
+   :alt: View of the tracked list emphasizing the statistics buttons in Odoo Website
 
-You can use the :abbr:`UTM (Urchin Tracking Module)` parameters to hide or show building blocks for
-specific audiences. To achieve this, click the :guilabel:`Edit` button on your website, select a
-building block, go to the :guilabel:`Customize` tab, scroll down to :guilabel:`Visibility`, and
-click :guilabel:`Conditionally`.
+.. tip::
 
-.. image:: link_tracker/conditional-visibility.png
-   :alt: Use the conditional visibility to display site elements to specific audiences.
-
-For each parameter available in the :ref:`Visibility <blocks/visibility>` section, you can choose
-:guilabel:`Visible for` or :guilabel:`Hidden for` and select the record you want from the dropdown
-list.
-
-Tracked links overview
-======================
-
-To get an overview of your tracked links, go to :menuselection:`Website --> Site --> Link Tracker`
-and scroll down to :guilabel:`Your tracked links` section.
-
-.. image:: link_tracker/your-tracked-links.png
-   :alt: Get an overview of all the links you track.
-
-Statistics
-----------
-
-To measure the performance of tracked links, click the :guilabel:`Stats` button.
-
-.. image:: link_tracker/statistics.png
-   :alt: View the statistics related to a specific tracked link.
-
-Scroll down to the :guilabel:`Statistics` section to get an overview of the number of clicks of your
-tracked links. You can display information for a specific period by clicking the
-:guilabel:`All Time`, :guilabel:`Last Month`, or :guilabel:`Last Week` options.
+   #. You can also access the link tracker on *odoo.com/r* via your browser.
+   #. Activate the developer mode (:menuselection:`Settings --> Activate the developer mode`) and
+      get access to the *Link Tracker* module and its back-end functionalities.
+   #. Integrated with :ref:`analytics/google-analytics`, those trackers allow you to see the number
+      of clicks and visitors to keep you on top of your marketing campaigns.
+   #. The integration with the :doc:`CRM </applications/sales/crm/track_leads/prospect_visits>` application allows
+      you to understand where your leads and opportunities are coming from.

content/applications/websites/website/web_design/building_blocks.rst

@@ -88,8 +88,6 @@ You can also use the drag-and-drop icon to move a block manually.
 .. image:: building_blocks/reordering-blocks.png
    :alt: Reordering building blocks
 
-.. _blocks/visibility:
-
 Visibility
 ==========
 
@@ -119,7 +117,7 @@ instead. Then, configure the condition(s) to apply by selecting :guilabel:`Visib
 :guilabel:`Hidden for` and which :guilabel:`Records` will be impacted.
 
 .. seealso::
-   :doc:`Link Tracker <../reporting/link_tracker>`
+   :doc:`Link Tracker and UTMs <../reporting/link_tracker>`
 
 Invisible elements
 ------------------