summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2017-07-04 18:14:13 +0200
committerChristophe Simonis <chs@odoo.com>2017-07-04 18:14:13 +0200
commit780ae8a808697cc156549e532614f8536cef2b1b (patch)
tree3a5865d782dab6e03f9e58314f81508bef161c61 /doc
parent680ab988607967a2503ae5a1abeabf899ff40477 (diff)
parent10cb34bcacc0983cdab722e528d413a996df3a7b (diff)
[MERGE] forward port branch saas-15 up to 10cb34bcacc
Diffstat (limited to 'doc')
-rw-r--r--doc/cla/individual/leneo.md11
-rw-r--r--doc/reference/views.rst5
2 files changed, 16 insertions, 0 deletions
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/reference/views.rst b/doc/reference/views.rst
index 74c8188bfab..d1848a701ee 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``