[MERGE] forward port branch 12.0 up to 52f6e38cea8

5 files changed, 39 insertions, 4 deletions

diff --git a/doc/cla/corporate/arxilead.md b/doc/cla/corporate/arxilead.md
new file mode 100644
index 00000000000..8640fa2ff95
--- /dev/null
+++ b/doc/cla/corporate/arxilead.md
@@ -0,0 +1,15 @@
+Portugal, 2019-08-13
+
+Arxilead Tecnologia e Gestão Lda. 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,
+
+Rita Santos rita.santos@arxi.pt https://github.com/Arxilead
+
+List of contributors:
+
+* Marcelo Pereira marcelo.pereira@arxi.pt https://github.com/marcelopereiraarxi
+* Nuno Silva nuno.silva@arxi.pt https://github.com/nunosilvaarxi
+* Reinaldo Ramos reinaldo.ramos@arxi.pt https://github.com/reinaldoramosarxi
diff --git a/doc/cla/corporate/tvtmarine-automation.md b/doc/cla/corporate/tvtmarine-automation.md
index 59e3c250ab3..d5f077c852b 100644
--- a/doc/cla/corporate/tvtmarine-automation.md
+++ b/doc/cla/corporate/tvtmarine-automation.md
@@ -13,7 +13,10 @@ David Tran david.tran@tvtmarine.com https://github.com/tvtma/
 List of contributors:
 
 David Tran david.tran@tvtmarine.com https://github.com/davidtranhp
-Long Do long.do@tvtmarine.com https://github.com/hoanglong87
+Phong Dao phong.dao@tvtmarine.com https://github.com/phongdao
 Hao Hoang hao.hoang@ma.tvtmarine.com https://github.com/hoanghao2001
 Tommy Tran tu.tran@tvtmarine.com https://github.com/tutran81
-Emily Ha emily.ha@tvtmarine.com https://github.com/emilyha
+Trinh Anh Ngoc ngoc.trinh@tvtmarine.com https://github.com/trinhanhngoc
+
+(up to 2019-07-14)
+Long Do long.do@tvtmarine.com https://github.com/hoanglong87
\ No newline at end of file
diff --git a/doc/cla/individual/hari4274.md b/doc/cla/individual/hari4274.md
new file mode 100644
index 00000000000..24ff61a8cd6
--- /dev/null
+++ b/doc/cla/individual/hari4274.md
@@ -0,0 +1,11 @@
+India, 2019-08-24
+
+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,
+
+Hariprasath bala.hariprasath@gmail.com https://github.com/hari4274
\ No newline at end of file
diff --git a/doc/reference/javascript_reference.rst b/doc/reference/javascript_reference.rst
index 05e546dfec6..16f3608836d 100644
--- a/doc/reference/javascript_reference.rst
+++ b/doc/reference/javascript_reference.rst
@@ -1969,7 +1969,7 @@ Relational fields
 
 .. autoclass:: web.relational_fields.FieldSelection
 
-    Supported field types: *selection*, *many2one*
+    Supported field types: *selection*
 
     .. attribute:: placeholder
 
@@ -2010,7 +2010,7 @@ Relational fields
 - many2one (FieldMany2One)
     Default widget for many2one fields.
 
-    - Supported field types: *selection, many2one*
+    - Supported field types: *many2one*
 
     Attributes:
 
diff --git a/doc/reference/orm.rst b/doc/reference/orm.rst
index f0c0452c8d5..5213add7765 100644
--- a/doc/reference/orm.rst
+++ b/doc/reference/orm.rst
@@ -1118,6 +1118,12 @@ A domain is a list of criteria, each criterion being a triple (either a
         Takes the semantics of the model into account (i.e following the
         relationship field named by
         :attr:`~odoo.models.Model._parent_name`).
+    ``parent_of``
+        is a parent (ascendant) of a ``value`` record.
+
+        Takes the semantics of the model into account (i.e following the
+        relationship field named by
+        :attr:`~odoo.models.Model._parent_name`).
 
 ``value``
     variable type, must be comparable (through ``operator``) to the named