[MERGE] forward port branch saas-11.3 up to 4850fb08385

6 files changed, 41 insertions, 4 deletions

diff --git a/doc/cla/corporate/d2go.md b/doc/cla/corporate/d2go.md
new file mode 100644
index 00000000000..f65bc6f5b8b
--- /dev/null
+++ b/doc/cla/corporate/d2go.md
@@ -0,0 +1,15 @@
+Canada, August 27th, 2018
+
+D2GO SOLUTIONS INC agrees to the terms of the Odoo Corporate Contributor License
+Agreement v1.0.
+
+I declare that I am authorized and able to make this agreement and sign this
+declaration.
+
+Signed,
+
+Louis-Philippe Papillon lppapillon@attrix.ca https://github.com/stechnique
+
+List of contributors:
+
+Louis-Philippe Papillon lppapillon@attrix.ca https://github.com/stechnique
diff --git a/doc/cla/individual/abdur-rahmaanJ.md b/doc/cla/individual/abdur-rahmaanJ.md
new file mode 100644
index 00000000000..257221f1a91
--- /dev/null
+++ b/doc/cla/individual/abdur-rahmaanJ.md
@@ -0,0 +1,11 @@
+Mauritius, 2018-08-27
+
+I hereby agree to the terms of the Odoo Individual Contributor License
+Agreement v1.0.
+
+I declare that I am authorized and able to make this agreement and sign this
+declaration.
+
+Signed,
+
+Abdur-Rahmaan Janhangeer cryptolabour@gmail.com https://github.com/Abdur-RahmaanJ
diff --git a/doc/cla/individual/dek-odoo.md b/doc/cla/individual/dek-odoo.md
new file mode 100644
index 00000000000..295973aee65
--- /dev/null
+++ b/doc/cla/individual/dek-odoo.md
@@ -0,0 +1,11 @@
+India, 2018-08-26
+
+I hereby agree to the terms of the Odoo Individual Contributor License
+Agreement v1.0.
+
+I declare that I am authorized and able to make this agreement and sign this
+declaration.
+
+Signed,
+
+Devendra kavthekar dkatodoo@gmail.com https://github.com/dek-odoo
diff --git a/doc/howtos/backend.rst b/doc/howtos/backend.rst
index 933309ad190..01f2bcd7ce9 100644
--- a/doc/howtos/backend.rst
+++ b/doc/howtos/backend.rst
@@ -1760,7 +1760,7 @@ Examples can be easily adapted from XML-RPC to JSON-RPC.
     systems without *explicitly* going through XML-RPC or JSON-RPC, such as:
 
     * https://github.com/akretion/ooor
-    * https://github.com/syleam/openobject-library
+    * https://github.com/OCA/odoorpc
     * https://github.com/nicolas-van/openerp-client-lib
     * http://pythonhosted.org/OdooRPC
     * https://github.com/abhishek-jaiswal/php-openerp-lib
diff --git a/doc/reference/javascript_reference.rst b/doc/reference/javascript_reference.rst
index 720157fef37..26ed37bd8ee 100644
--- a/doc/reference/javascript_reference.rst
+++ b/doc/reference/javascript_reference.rst
@@ -446,7 +446,7 @@ of them in the new class.
         },
     };
 
-    var Hamster = Hamster.extend(DanceMixin, {
+    var Hamster = Animal.extend(DanceMixin, {
         sleep: function () {
             console.log('sleeping');
         },
diff --git a/doc/reference/orm.rst b/doc/reference/orm.rst
index 9ce03c8709a..e6c74883d41 100644
--- a/doc/reference/orm.rst
+++ b/doc/reference/orm.rst
@@ -499,8 +499,8 @@ necessary to clear caches when using ``CREATE``, ``UPDATE`` or ``DELETE`` in
 SQL, but not ``SELECT`` (which simply reads the database).
 
 Clearing caches can be performed using the
-:meth:`~odoo.api.Environment.invalidate_all` method of the
-:class:`~odoo.api.Environment` object.
+:meth:`~odoo.models.BaseModel.invalidate_cache` method of the
+:class:`~odoo.models.BaseModel` object.
 
 
 .. _reference/orm/oldapi: