[MERGE] forward port branch saas-16 up to 0f2b2c4e2b9

7 files changed, 46 insertions, 8 deletions

diff --git a/doc/cla/corporate/avoinsystems.md b/doc/cla/corporate/avoinsystems.md
index 13209ca53a3..4009dc466e5 100644
--- a/doc/cla/corporate/avoinsystems.md
+++ b/doc/cla/corporate/avoinsystems.md
@@ -17,3 +17,6 @@ Svante Suominen svante.suominen@avoin.systems https://github.com/svantesuominen
 Erno Iipponen erno.iipponen@avoin.systems https://github.com/iipponen
 Tuomo Aura tuomo.aura@avoin.systems https://github.com/tuomoaura
 Atte Isopuro atte.isopuro@avoin.systems https://github.com/aisopuro
+Mikko Närjänen mikko.narjanen@avoin.systems https://github.com/mtnarjan
+Toni Pesola toni.pesola@avoin.systems https://github.com/tonipes
+Santeri Valjakka santeri.valjakka@avoin.systems https://github.com/hegenator
diff --git a/doc/cla/corporate/merchise.md b/doc/cla/corporate/merchise.md
index 829864e2b50..6cc3e022152 100644
--- a/doc/cla/corporate/merchise.md
+++ b/doc/cla/corporate/merchise.md
@@ -1,8 +1,7 @@
-Havana, 2017-05-05
+Cuba, 2017-07-03
 
-Merchise Autrement (https://github.com/merchise/ and
-https://github.com/merchise-autrement/) agrees to the terms of the Odoo
-Corporate Contributor License Agreement v1.0.
+Merchise Autrement [~º/~] 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.
@@ -11,7 +10,7 @@ Signed,
 
 Manuel Vázquez Acosta manuel@merchise.org https://github.com/mvaled
 
-List of contributors (some members don't have a github account yet):
+List of contributors:
 
 Manuel Vázquez Acosta manuel@merchise.org https://github.com/mvaled
 Johanny Rivera johanny@merchise.org
diff --git a/doc/cla/corporate/therp.md b/doc/cla/corporate/therp.md
index e9f7dfae3ba..cf1a8f99fda 100644
--- a/doc/cla/corporate/therp.md
+++ b/doc/cla/corporate/therp.md
@@ -1,6 +1,8 @@
 Netherlands, 2015-03-09
 
-Updated 2016-05-27
+Updated:
+    2016-05-27
+    2017-06-27
 
 Therp BV agrees to the terms of the Odoo Corporate 
 Contributor License Agreement v1.0.
@@ -18,4 +20,5 @@ List of contributors:
 *  Holger Brunn hbrunn@therp.nl https://github.com/hbrunn
 *  Lara Freeke lfreeke@therp.nl https://github.com/lfreeke
 *  Ronald Portier ronald@therp.nl https://github.com/nl66278
+*  George Daramouskas gdaramouskas@therp.nl https://github.com/daramousk
 
diff --git a/doc/cla/individual/leneo.md b/doc/cla/individual/leneo.md
new file mode 100644
index 00000000000..82cb85f012c
--- /dev/null
+++ b/doc/cla/individual/leneo.md
@@ -0,0 +1,11 @@
+Switzerland, 30/06/2017
+
+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,
+
+Frederic Siffert frederic@treyvaud.ch https://github.com/leNeo
diff --git a/doc/cla/individual/pashute.md b/doc/cla/individual/pashute.md
new file mode 100644
index 00000000000..e0dde9fed9a
--- /dev/null
+++ b/doc/cla/individual/pashute.md
@@ -0,0 +1,11 @@
+Israel, 2017-07-06
+
+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,
+
+Moshe Flam pashute@gmail.com https://github.com/pashute
diff --git a/doc/reference/orm.rst b/doc/reference/orm.rst
index 876d74f65cc..00b284f9cb2 100644
--- a/doc/reference/orm.rst
+++ b/doc/reference/orm.rst
@@ -45,14 +45,20 @@ Field access
 ------------
 
 Recordsets provide an "Active Record" interface: model fields can be read and
-written directly from the record, but only on singletons (single-record
-recordsets). Setting a field's value triggers an update to the database::
+written directly from the record as attributes, but only on singletons
+(single-record recordsets).
+Field values can also be accessed like dict items, which is more elegant and
+safer than ``getattr()`` for dynamic field names.
+Setting a field's value triggers an update to the database::
 
     >>> record.name
     Example Name
     >>> record.company_id.name
     Company Name
     >>> record.name = "Bob"
+    >>> field = "name"
+    >>> record[field]
+    Bob
 
 Trying to read or write a field on multiple records will raise an error.
 
diff --git a/doc/reference/views.rst b/doc/reference/views.rst
index 8b90ca00f44..2a9b5ece4bc 100644
--- a/doc/reference/views.rst
+++ b/doc/reference/views.rst
@@ -237,6 +237,11 @@ Possible children elements of the list view are:
 
         Makes the button ``invisible`` if the record is *not* in one of the
         listed states
+
+        .. danger::
+
+            Using ``states`` in combination with ``attrs`` may lead to
+            unexpected results as domains are combined with a logical AND.
     ``context``
         merged into the view's context when performing the button's Odoo call
     ``confirm``