[MERGE] forward port branch saas-11.3 up to 6136f0c02e5

4 files changed, 31 insertions, 3 deletions

diff --git a/doc/_extensions/autojsdoc/parser/types.py b/doc/_extensions/autojsdoc/parser/types.py
index 8737b26ecc9..69836f46ac4 100644
--- a/doc/_extensions/autojsdoc/parser/types.py
+++ b/doc/_extensions/autojsdoc/parser/types.py
@@ -44,6 +44,8 @@ def tokenize(typespec):
             yield (LITERAL, ast.literal_eval(string))
         elif toktype == token.ENDMARKER:
             return
+        elif toktype == token.NEWLINE:
+            pass
         else:
             raise ValueError("Unknown typespec token %s" % token.tok_name[toktype])
 
diff --git a/doc/cla/corporate/brahoo.md b/doc/cla/corporate/brahoo.md
new file mode 100644
index 00000000000..04e4d39cb31
--- /dev/null
+++ b/doc/cla/corporate/brahoo.md
@@ -0,0 +1,15 @@
+The Netherlands, 2018-10-24
+
+Brahoo B.V. 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,
+
+Cas Vissers c.vissers@brahoo.nl https://github.com/CasVissers
+
+List of contributors:
+
+Cas Vissers c.vissers@brahoo.nl https://github.com/CasVissers
\ No newline at end of file
diff --git a/doc/cla/individual/mhamra.md b/doc/cla/individual/mhamra.md
new file mode 100644
index 00000000000..260fee70284
--- /dev/null
+++ b/doc/cla/individual/mhamra.md
@@ -0,0 +1,11 @@
+Argentina, 2018-10-18
+
+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,
+
+Marcelo Ariel Hamra marcelo.hamra@gmail.com https://github.com/mhamra
diff --git a/doc/reference/orm.rst b/doc/reference/orm.rst
index e6c74883d41..57a2cbed847 100644
--- a/doc/reference/orm.rst
+++ b/doc/reference/orm.rst
@@ -947,17 +947,17 @@ them (e.g. to change their default sort order):
 
 .. literalinclude:: ../../odoo/addons/test_documentation_examples/extension.py
     :language: python
-    :lines: 5-
+    :lines: 7-
 
 .. literalinclude:: ../../odoo/addons/test_documentation_examples/tests/test_extension.py
     :language: python
-    :lines: 8,13
+    :lines: 10,15
 
 will yield:
 
 .. literalinclude:: ../../odoo/addons/test_documentation_examples/tests/test_extension.py
     :language: text
-    :lines: 11
+    :lines: 13
 
 .. note:: it will also yield the various :ref:`automatic fields
           <reference/orm/model/automatic>` unless they've been disabled