Update uom.rst

uom is handled since V15 from the uom categories

content/applications/inventory_and_mrp/inventory/management.rst

@@ -10,10 +10,10 @@ Warehouse Management
 
    management/products
    management/warehouses
-   management/inventory_adjustments
+   management/replenishment_strategies
    management/delivery
    management/incoming
    management/misc
    management/planning
    management/lots_serial_numbers
-   management/reporting
+   management/reporting

content/applications/inventory_and_mrp/inventory/management/inventory_adjustments/count_products.rst

@@ -1,96 +0,0 @@
-=====================
-Inventory Adjustments
-=====================
-
-Inventory adjustments can be accessed through :menuselection:`Inventory --> Operations -->
-Inventory Adjustments`.
-The report has all products currently in the stock. Each line is a unique combination of
-- Location
-- Product
-- Lot/Serial
-- Package
-- Owner
-
-
-Add new product in your stock
-=============================
-
-To add a line, just hit *Create* and fill in product and counted quantity fields then press 
-`tab` or click *Save*
-
-.. image:: count_products/create-line.png
-   :align: center
-   :alt: apply all wizzard allows to change reason and accounting date
-
-At this stage, the count is recorded but not yet *applied*. Meaning the quantity on hand is 
-not yet updated. 
-
-Just press *Apply* on the line or button *Apply All* button on the top of the screen.
-
-*Apply All* allows to edit the reason to use for the adjustments applied
-
-
-.. image:: count_products/apply-all.png
-   :align: center
-   :alt: apply all wizzard allows to change reason 
-
-Count products
-==============
-
-Counting products is a recurring activity in a warehouse. It often happens that theoric 
-stock levels are not correct and must be amended. 
-
-If a count is correct, press on *set*, it will copy the on hand quantity in the counted
-quantity. Applying such line will record a move in the history with a 0 quantity.
-
-If the count is different, record it in the counted quanditity field. Applying such line
-will record a move with the difference in tin the history.
-
-.. image:: count_products/history.png
-   :align: center
-   :alt: history of moves
-   
-.. note::
-    It happens that users count but apply only later. In the meantime, transfers of 
-    a counted product can occur. In such case quanities counted and on hand are not
-    consistant with the difference. When applying such line, Odoo will ask if you
-    want to keep the difference and the count.
-   
-Plan counts
-===========
-
-On each line there is:
-- *Scheduled Date*: it's the date at which a count should be made.
-- *User*: it's the person in charge of the count.
-- *Accounting Date*: this is the date at which the adjustments will be accounted. The
-  column is hidden by default.
-
-.. image:: count_products/plan.png
-   :align: center
-   :alt: history of moves
-   
-.. important::
-    In the barcode app, you will only see counts to make assigned to you, scheduled
-    for today or earlier.
-
-If you want to plan big counts, the easiest way is to select some lines, then hit 
-**Request A Count***. There you can select who will count and when. You can also 
-prefill the quantity with the on hand quantity.
-
-.. image:: count_products/request-count.png
-   :align: center
-   :alt: history of moves
-     
-.. tip::
-    The report offers a lot of filters that you can use to make your selection
-    
-By default, after an adjustment is applied, the scheduled date for the next 
-count is the 31st of december of the current year. This is a setting that can
-be modified in :menuselection:`Inventory --> Configuration --> Settings`.
-under the setting **Annual Inventory Day and Month**
-
-.. image:: count_products/annual-inventory.png
-   :align: center
-   :alt: history of moves
-
-

content/applications/inventory_and_mrp/inventory/management/inventory_adjustments/cycle_counts.rst

@@ -1,38 +0,0 @@
-============
-Cycle Counts
-============
-
-In most companies, the stock is only counted once a year. 
-That's why by default, after making an inventory adjustment, the 
-scheduled date for the next count is set on the 31th of decemeber.
-But for some businesses it's crucial to have an accurate
-inventory count. 
-
-The goal of cycle counts is to count more often at key locations
-to keep your critical stock levels accurate.
-
-Configuration
-=============
-
-In Odoo, cycle counts are location-based. That means that the 
-frequency of the counts is defined on the storage location. That
-also means that to use cycle counts you need to activate the setting
-**Storage Locations**. 
-
-.. image:: cycle_counts/locations-settings.png
-   :align: center
-   :alt: Enable locations in an Odoo database's settings
-   
-Then, go to the locations via :menuselection:`Inventory --> Configuration -->
-Locations`.
-
-Open a location and change the Inventory Frequency. In this example we want to 
-count items in this loctation every 30 days. That means that once an adjustment 
-is applied on this location, the next scheduled date for this line will be 30 days
-after.
-
-.. image:: cycle_counts/inventory-frequency.png
-   :align: center
-   :alt: edit a location to change the inventory frequency
-
-

content/applications/inventory_and_mrp/inventory/management/inventory_adjustments/cycle_counts/test

@@ -1 +0,0 @@
-

content/applications/inventory_and_mrp/inventory/management/products/uom.rst

@@ -18,25 +18,28 @@ Configuration
 In the *Inventory* application, go to :menuselection:`Configuration --> Settings`. In
 the *Products* section, activate *Units of Measure*, then *Save*.
 
-.. image:: media/uom_01.png
+.. image:: uom/01-setting.png
     :align: center
 
 Create New Units of Measure
 ===========================
 
-In the *Inventory* application go to :menuselection:`Configuration --> UoM`. There,
-hit *Create*. As an example, we will create a Box of 6 units that we
-will use for the Egg product.
-
-.. image:: media/uom_02.png
-    :align: center
+In the *Inventory* application go to :menuselection:`Configuration --> UoM Categories`.
 
 The category is important for unit conversion, you will be able to
 convert products from one unit to another only if those units belong to
-the same category. The box of 6 is 6 times bigger than the reference
+the same category.
+
+.. image:: uom/02-categories.png
+    :align: center
+
+As an example, we will create a Box of 6 units that we
+will use for the Egg product.
+
+ The box of 6 is 6 times bigger than the reference
 unit of measure for the category which is “Units” here.
 
-.. image:: media/uom_03.png
+.. image:: uom/03-add-uom.png
     :align: center
 
 Specify Units of Measure on your Products
@@ -52,7 +55,7 @@ which internal transfers will take place. You can also select the
 *Purchase Unit of Measure*, which is the unit in which you purchase
 the product.
 
-.. image:: media/uom_04.png
+.. image:: uom/04-product.png
     :align: center
 
 Transfer from One Unit to Another
@@ -65,7 +68,7 @@ In the *Purchase* application, *Create* a new request for quotation
 in which you include the product with the different *Units of Measure*
 and *Confirm* it.
 
-.. image:: media/uom_05.png
+.. image:: uom/05-purchase.png
     :align: center
 
 On the automatically generated purchase orders, the UoM used is the Box
@@ -75,7 +78,7 @@ which is linked to the purchase order, you can observe that the 10 boxes
 of 6 units have been converted in 60 units. Indeed, the stock is managed
 in units.
 
-.. image:: media/uom_06.png
+.. image:: uom/06-receipt.png
     :align: center
 
 Replenishment
@@ -84,10 +87,10 @@ Replenishment
 When doing a replenishment via the *Replenish* button on the product
 form, you have the possibility to use a different unit of measure.
 
-.. image:: media/uom_07.png
+.. image:: uom/07-replenish.png
     :align: center
 
-.. image:: media/uom_08.png
+.. image:: uom/08-replenish.png
     :align: center
 
 Sell in bigger UoM
@@ -97,11 +100,11 @@ You can choose the unit of measure on the sale order document and decide
 to sell the eggs by the dozen. When doing so, the price is automatically
 computed from Units UoM to adapt to the selected *UoM*.
 
-.. image:: media/uom_09.png
+.. image:: uom/09-sales.png
     :align: center
 
 In the delivery order, the *UoM* used in the sale order is converted
 to the *UoM* used for stock management, in our use case, the Units.
 
-.. image:: media/uom_10.png
+.. image:: uom/10-delivery.png
     :align: center

content/applications/inventory_and_mrp/inventory/management/replenishment_strategies.rst

@@ -8,5 +8,4 @@ Inventory Adjustment
    :titlesonly:
    :glob:
 
-   inventory_adjustments/count_products
-   inventory_adjustments/cycle_counts
+   replenishment_strategies/virtual_warehouses

content/applications/inventory_and_mrp/inventory/management/warehouses.rst

@@ -8,5 +8,4 @@ Warehouses
    :titlesonly:
    :glob:
 
-   warehouses/warehouses_locations
-   warehouses/resupply_warehouses
+   warehouses/difference_warehouse_location

content/applications/inventory_and_mrp/inventory/management/warehouses/difference_warehouse_location.rst

@@ -0,0 +1,34 @@
+========================================================
+What is the difference between warehouses and locations?
+========================================================
+
+In Odoo, a **Warehouse** is the actual building/place in which your items
+are stocked. You can setup multiple warehouses and create moves between
+warehouses.
+
+A **Location**, is a specific space within your warehouse. It can be
+considered as a sublocation of your warehouse, as a shelf, a floor, an
+aisle, etc. Therefore, a location is part of one warehouse only and it
+is not possible to link one location to multiple warehouses. You can
+configure as many locations as you need under one warehouse.
+
+There are 3 types of locations:
+
+-   The **Physical Locations** are internal locations that are part of the
+    warehouses for which you are the owner. They can be the loading and
+    unloading area of your warehouse, a shelf or a department, etc.
+
+-   The **Partner Locations** are spaces within a customer and/or vendor's
+    warehouse. They work the same way as Physical Locations with the only
+    difference being that you are not the owner of the warehouse.
+
+-   The **Virtual Locations** are places that do not exist, but in which
+    products can be placed when they are not physically in an inventory yet
+    (or anymore). They come in handy when you want to place lost products
+    out of your stock (in the **Inventory loss**), or when you want to take into
+    account products that are on their way to your warehouse (**Procurements**).
+
+In Odoo, locations are structured hierarchically. You can structure your
+locations as a tree, dependent on a parent-child relationship. This
+gives you more detailed levels of analysis of your stock operations and
+the organization of your warehouses.

content/applications/inventory_and_mrp/inventory/management/warehouses/resupply_warehouses.rst

@@ -1,55 +0,0 @@
-===============================
-Resupply from another Warehouse
-===============================
-
-A common use case for multiple warehouses is to have one central warehouse that
-resupplies shops, each shop is considered as a local warehouse. When a shop want 
-to replenish a product, this product is ordered to the central stock.
-Odoo allows you to set easily which warehouse(s) can resupply a warehouse.
-
-Configuration
-=============
-
-In order to be able to resupply from another warehouse, you need to
-activate *multi-step routes*.
-
-.. image:: resupply_warehouses/virtual-warehouses-settings.png
-   :align: center
-   :alt: Enable Multi-Step Routes in an Odoo database's settings
-
-You can then access your warehouses via :menuselection:`Inventory --> Configuration -->
-Warehouses`.
-Open the warehouse which should be resupplied by the another one. You will
-have the possibility to directly indicate through which warehouse(s) it
-can be resupplied.
-
-.. image:: resupply_warehouses/virtual_warehouses_02.png
-   :align: center
-
-By activating this option, a new route will now be available on your
-products *Supply Product from Second warehouse*. It can now be
-selected, along with either a *reordering rule* or a *make to
-order*.
-
-.. image:: resupply_warehouses/virtual_warehouses_03.png
-   :align: center
-
-In this example, a reordering rule is set with a minimum of 5 units
-in stock and a maximum of 10 units in stock, having currently 0 units on
-hand.
-
-The system automatically creates two pickings, one *delivery order*
-from my Second Warehouse which contains the necessary products, and a
-receipt in my main warehouse WH/Stock for the same products. The source
-document is the *reordering rule* which triggered the route *Supply
-Product from Second warehouse*. 
-The location between the delivery and the receipt is a transit location.
-
-.. image:: resupply_warehouses/virtual_warehouses_05.png
-   :align: center
-
-.. image:: resupply_warehouses/virtual_warehouses_06.png
-   :align: center
-
-.. image:: resupply_warehouses/virtual_warehouses_07.png
-   :align: center

content/applications/inventory_and_mrp/inventory/management/warehouses/warehouses_locations.rst

@@ -1,96 +0,0 @@
-===============================
-Manage Warehouses and Locations
-===============================
-
-Terminology
-===========
-
-Warehouse
----------
-
-In Odoo, a **Warehouse** is the actual building/place in which your items
-are stocked. You can setup multiple warehouses and create moves between
-warehouses.
-
-Location
---------
-
-A **Location**, is a specific space within your warehouse. It can be
-considered as a sublocation of your warehouse, as a shelf, a floor, an
-aisle, etc. Therefore, a location is part of one warehouse only and it
-is not possible to link one location to multiple warehouses. You can
-configure as many locations as you need under one warehouse.
-
-There are 3 types of locations:
-
--   The **Physical Locations** are internal locations that are part of the
-    warehouses for which you are the owner. They can be the loading and
-    unloading area of your warehouse, a shelf or a department, etc.
-
--   The **Partner Locations** are spaces within a customer and/or vendor's
-    warehouse. They work the same way as Physical Locations with the only
-    difference being that you are not the owner of the warehouse.
-
--   The **Virtual Locations** are places that do not exist, but in which
-    products can be placed when they are not physically in an inventory yet
-    (or anymore). They come in handy when you want to place lost products
-    out of your stock (in the **Inventory loss**), or when you want to take into
-    account products that are on their way to your warehouse (**Procurements**).
-
-In Odoo, locations are structured hierarchically. You can structure your
-locations as a tree, dependent on a parent-child relationship. This
-gives you more detailed levels of analysis of your stock operations and
-the organization of your warehouses.
-
-Configuration
-=============
-
-To activate the locations, go to :menuselection:`Configuration --> Settings` and enable 
-**Storage Locations**. Then, hit *Save*.
-
-.. image:: warehouses_locations/feature-storage-location.png
-   :align: center
-   :alt: Enabling the storage location feature in Odoo Inventory.
-
-.. important::
-   If you want to manage several routes within your warehouses, then enable **Multi-Step Routes**
-   and check :doc:`use-routes`.
-
-Creating a new warehouse
-========================
-
-To create a warehouse, go to :menuselection:`Configuration -->
-Warehouse Management --> Warehouses` and click on **Create**.
-
-Fill out a **Warehouse Name** and a **Short Name**. The short name is five characters maximum.
-
-.. image:: warehouses_locations/create-new-warehouse.png
-   :align: center
-   :alt: Short name field of a warehouse on Odoo Inventory.
-
-.. important::
-   The **Short Name** appears on your transfer orders and other warehouse documents. We recommend
-   using an understandable one (e.g.: WH/[first letters of location]).
-
-Now, go back to your dashboard. There, new operations related to your warehouse have been
-automatically generated.
-
-.. image:: warehouses_locations/new-transfer-types.png
-   :align: center
-   :alt: Inventory app dashboard displaying new transfer type for the recently created warehouse.
-
-.. note::
-   Adding a second warehouse will automatically activate the **Locations** setting.
-   
-Creating a new location
-=======================
-
-To create a location, go to :menuselection:`Configuration -->
-Warehouse Management --> Locations` and click on **Create**.
-
-Fill out a **Location Name** and a **Parent Location** and hit *Save*.
-
-.. image:: warehouses_locations/create-new-location.png
-   :align: center
-   :alt: Short name field of a warehouse on Odoo Inventory.
-

content/applications/inventory_and_mrp/inventory/routes/concepts/inter_warehouse.rst

@@ -7,10 +7,73 @@ Proceeding to such behavior is called *inter-warehouse transfers*. If this actio
 easy to perform, the administrative part can be arduous. Fortunately, Odoo comes with an intuitive
 flow that helps save time when registering those transfers.
 
+Configuration
+=============
+
+First of all, go to :menuselection:`Configuration --> Settings` and enable **Storage Locations**.
+Then, hit save.
+
+.. image:: inter_warehouse/feature-storage-location.png
+   :align: center
+   :alt: Enabling the storage location feature in Odoo Inventory.
+
+.. important::
+   If you want to manage several routes within your warehouses, then enable **Multi-Step Routes**
+   and check :doc:`use-routes`.
+
+Creating a new warehouse
+========================
+
+The next step is to create your new warehouse. To do so, go to :menuselection:`Configuration -->
+Warehouse Management --> Warehouses` and click on **Create**.
+
+Fill out a **Warehouse Name** and a **Short Name**. The short name is five characters maximum.
+
+.. image:: inter_warehouse/create-new-warehouse.png
+   :align: center
+   :alt: Short name field of a warehouse on Odoo Inventory.
+
+.. important::
+   The **Short Name** appears on your transfer orders and other warehouse documents. We recommend
+   using an understandable one (e.g.: WH/[first letters of location]).
+
+Now, go back to your dashboard. There, new operations related to your warehouse have been
+automatically generated.
+
+.. image:: inter_warehouse/new-transfer-types.png
+   :align: center
+   :alt: Inventory app dashboard displaying new transfer type for the recently created warehouse.
+
+Creating a new inventory
+========================
+
+If you create a new warehouse, you might already have an existing inventory in it. In that case, you
+should create an inventory in Odoo. If this is not the case, you can skip this step.
+
+Into the inventory application, select :menuselection:`Operations --> Inventory Adjustment`.
+Then, create a new inventory by clicking on **Create**. Fill in the **Inventory Reference**,
+**Date** and make sure to select the right warehouse and location.
+
+.. image:: inter_warehouse/annual-inventory.png
+   :align: center
+   :alt: View of the inventory adjustment form before hitting the start button.
+
+Next, click on **Start Inventory**. You will be able to input your existing products in the new
+window. Select add an item and indicate the **Real Quantity** available in the warehouse.
+The theoretical quantity can not be changed as it represents a computed one from purchase and sales
+orders.
+
+.. image:: inter_warehouse/in-progress-annual-inventory.png
+   :align: center
+   :alt: View of the actual physical inventory of the new warehouse.
+
+.. tip::
+   Don't forget to validate your inventory once you have recorded the state of all your products.
 
 Create an internal transfer
 ===========================
-If you want to transfer eight units of a product
+
+The final step is to create your internal transfer. If you want to transfer eight units of a product
 from your first warehouse to another one, proceed as follows:
 
 From your dashboard, select an internal movement of one of the two warehouses. To do so, click on
@@ -63,4 +126,4 @@ It is also possible to manually transfer each product:
    **backorder**.
 
    - Create a backorder if you expect to process the remaining products later.
-   - Do not create a backorder if you will not supply/receive the remaining products.
+   - Do not create a backorder if you will not supply/receive the remaining products.

content/applications/sales/crm/acquire_leads/lead_mining.rst

@@ -31,7 +31,7 @@ From there, click on the **Generate Leads** button, a window where you will be a
    :align: center
 
 
-When choosing to target Companies and their contacts you can choose the contacts you are getting based on Role or Seniority. 
+When choosing to target Companied and their contacts you can choose the contacts you are getting based on Role or Seniority. 
 When getting contact information make sure to be aware of the latest EU regulation, get more information about General Data Protection Regulation on
 `Odoo GDPR <http://odoo.com/gdpr>`__, 
 
@@ -49,10 +49,10 @@ You can also add tags to track your generated leads.
 Pricing
 ==================
 This is an In-App Purchase feature, each generated lead will cost you one credit.
-If you choose to get contact information each contact will also cost you one additional credit.
+If you choose to get contact information each contact will also cost us one additional credit.
 Here is the pricing for this `feature <https://iap.odoo.com/iap/in-app-services/167?>`__, 
 To buy credits you can either go to :menuselection:`CRM --> Configuration --> Settings --> Buy
-Credits`; or go to :menuselection:`Settings --> Contacts --> Odoo IAP --> View my Services`.
+Credits`; or go to :menuselection:`Settings --> In-App Purchases --> View my Services`.
 
 .. image:: media/LM6.png
    :align: center

content/developer/howtos/rdtraining/02_setup.rst

@@ -148,10 +148,10 @@ Here are some useful git commands for your day-to-day work.
   .. code-block:: console
 
     $ cd $HOME/src/odoo
-    $ git checkout 15.0
+    $ git checkout 14.0
 
     $ cd $HOME/src/enterprise
-    $ git checkout 15.0
+    $ git checkout 14.0
 
 * Fetch and rebase:
 
@@ -159,11 +159,11 @@ Here are some useful git commands for your day-to-day work.
 
     $ cd $HOME/src/odoo
     $ git fetch --all --prune
-    $ git rebase --autostash odoo/15.0
+    $ git rebase --autostash odoo/14.0
 
     $ cd $HOME/src/enterprise
     $ git fetch --all --prune
-    $ git rebase --autostash enterprise/15.0
+    $ git rebase --autostash enterprise/14.0
 
 
 Install the dependencies

content/developer/howtos/rdtraining/B_acl_irrules.rst

@@ -169,7 +169,7 @@ C                     X
 ====== ====== ==== ====== ======
 
 A user with the groups A and C will be able to do anything but delete the object
-while one with B and C will be able to read and update it, but not create or delete it.
+while one with B and C will be able to read or update, but not search or read.
 
 .. note::