[MERGE] Forward-port of branch 14.0 to master

Author: AntoineVDV

Makefile

@@ -5,6 +5,10 @@ ifndef WORKERS
   WORKERS = auto
 endif
 
+ifndef BUILD_DIR
+  BUILD_DIR    = _build
+endif
+
 SPHINX_BUILD   = sphinx-build
 CONFIG_DIR     = .
 SPHINXOPTS     = -D project_root=$(ROOT) -D canonical_version=$(CANONICAL_VERSION) \
@@ -13,7 +17,7 @@ SPHINXOPTS     = -D project_root=$(ROOT) -D canonical_version=$(CANONICAL_VERSIO
                  -A google_analytics_key=$(GOOGLE_ANALYTICS_KEY) \
 				 -j $(WORKERS)
 SOURCE_DIR     = content
-BUILD_DIR      = _build
+
 
 HTML_BUILD_DIR = $(BUILD_DIR)/html
 ifdef VERSIONS
@@ -37,10 +41,9 @@ help:
 clean:
 	@echo "Cleaning build files..."
 	rm -rf $(BUILD_DIR)/*
-	rm extensions/odoo_theme/static/style.css
 	@echo "Cleaning finished."
 
-html: extensions/odoo_theme/static/style.css
+html: $(BUILD_DIR)/html/_static/style.css
 	@echo "Starting build..."
 	$(SPHINX_BUILD) -c $(CONFIG_DIR) -b html $(SPHINXOPTS) $(SOURCE_DIR) $(HTML_BUILD_DIR)
 	@echo "Build finished."
@@ -60,16 +63,17 @@ gettext:
 	$(SPHINX_BUILD) -c $(CONFIG_DIR) -b gettext $(SOURCE_DIR) locale/sources
 	@echo "Generation finished."
 
-extensions/odoo_theme/static/style.css: extensions/odoo_theme/static/style.scss extensions/odoo_theme/static/scss/*.scss
+$(BUILD_DIR)/html/_static/style.css: extensions/odoo_theme/static/style.scss extensions/odoo_theme/static/scss/*.scss
 	@echo "Compiling stylesheets..."
-	pysassc $(subst .css,.scss,$@) $@
+	mkdir -p $(BUILD_DIR)/html/_static
+	pysassc extensions/odoo_theme/static/style.scss $(BUILD_DIR)/html/_static/style.css
 	@echo "Compilation finished."
 
 #=== Development and debugging rules ===#
 
 fast: SPHINXOPTS += -A collapse_menu=True
 fast: html
 
-static: extensions/odoo_theme/static/style.css
-	cp -r extensions/odoo_theme/static/* _build/html/_static/
-	cp -r static/* _build/html/_static/
+static: $(BUILD_DIR)/static/style.css
+	cp -r extensions/odoo_theme/static/* $(BUILD_DIR)/html/_static/
+	cp -r static/* $(BUILD_DIR)/html/_static/

conf.py

@@ -60,6 +60,11 @@
 # Search for the directory of odoo sources to know whether autodoc should be used on the dev doc
 odoo_dir = Path('odoo')
 odoo_dir_in_path = False
+if not odoo_dir.is_dir():
+    parent_odoo_dir = Path('../odoo')
+    if parent_odoo_dir.is_dir():
+        _logger.info('Using parent dir to find odoo sources')
+        odoo_dir = parent_odoo_dir
 if not odoo_dir.is_dir():
     _logger.warning(
         f"Could not find Odoo sources directory at {odoo_dir.absolute()}.\n"

content/applications/finance/accounting/bank/reconciliation/use_cases.rst

@@ -101,8 +101,5 @@ right and validate all related payments :
 .. image:: media/use10.png
    :align: center
 
-.. tip::
-   Hit CTRL-Enter to reconcile all the balanced items in the sheet.
-
 .. seealso::
    * :doc:`../feeds/bank_synchronization`

content/applications/sales/sales/amazon_connector/manage.rst

@@ -36,6 +36,17 @@ at once or ship products partially by using backorders.
 When a picking related to the order is confirmed, a notification is sent to Amazon who will, in
 turn, notify the customer that the order (or a part of it) is on its way.
 
+.. important::
+   Starting from July 2021, Amazon requires that deliveries be provided with a tracking
+   reference. This concerns all marketplaces.
+   
+   If this is not already done, you need to :ref:`install <general/install>` the **Delivery Costs**
+   module in order to provide the tracking reference. There is unfortunately no workaround to comply
+   with this new Amazon policy.
+
+.. seealso::
+   - :doc:`../../../inventory_and_mrp/inventory/shipping/setup/third_party_shipper`
+
 Follow deliveries in FBA
 ========================
 

content/developer/misc/other/guidelines.rst

@@ -911,10 +911,10 @@ Symbols and Conventions
 
         # Fields declaration
         name = fields.Char(string='Name', default=_default_name)
-        seats_reserved = fields.Integer(oldname='register_current', string='Reserved Seats',
-            store=True, readonly=True, compute='_compute_seats')
-        seats_available = fields.Integer(oldname='register_avail', string='Available Seats',
-            store=True, readonly=True, compute='_compute_seats')
+        seats_reserved = fields.Integer(string='Reserved Seats', store=True
+            readonly=True, compute='_compute_seats')
+        seats_available = fields.Integer(string='Available Seats', store=True
+            readonly=True, compute='_compute_seats')
         price = fields.Integer(string='Price')
         event_type = fields.Selection(string="Type", selection='_selection_type')