[MERGE] Forward-port 10.0 up to 7e44444878760ca44cf1b22bf05d77e26c477cab

14 files changed, 151 insertions, 8 deletions

diff --git a/doc/cla/corporate/acsone.md b/doc/cla/corporate/acsone.md
index 1e64c996e74..cb97dc6b20d 100644
--- a/doc/cla/corporate/acsone.md
+++ b/doc/cla/corporate/acsone.md
@@ -24,3 +24,4 @@ Olivier Laurent olivier.laurent@acsone.eu https://github.com/Olivier-LAURENT
 Philippe Schmidt philippe.schmidt@acsone.eu https://github.com/phschmidt
 Stéphane Bidoul stephane.bidoul@acsone.eu https://github.com/sbidoul
 Thomas Binsfeld thomas.binsfeld@acsone.eu https://github.com/ThomasBinsfeld
+Benjamin Willig benjamin.willig@acsone.eu https://github.com/benwillig
diff --git a/doc/cla/corporate/bloopark.md b/doc/cla/corporate/bloopark.md
index 2664bbe3006..f6eeb53698b 100644
--- a/doc/cla/corporate/bloopark.md
+++ b/doc/cla/corporate/bloopark.md
@@ -18,3 +18,4 @@ Benjamin Bachmann bBachmann@bloopark.de https://github.com/benniphx
 Robert Rübner rruebner@bloopark.de https://github.com/rruebner
 Florian Fischer ffischer@bloopark.de https://github.com/florianfischer
 Mercerdes Scenna mscenna@bloopark.de https://github.com/mscenna
+Andrei Poehlmann andrei.poehlmann90@gmail.com https://github.com/reinka
diff --git a/doc/cla/corporate/eficent.md b/doc/cla/corporate/eficent.md
new file mode 100644
index 00000000000..3723fbf0740
--- /dev/null
+++ b/doc/cla/corporate/eficent.md
@@ -0,0 +1,19 @@
+Spain, 2017-03-21
+
+Eficent Business and IT Consulting Services, S.L. 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,
+
+Jordi Ballester jordi.ballester@eficent.com https://github.com/jbeficent
+
+List of contributors:
+
+Aarón Henríquez ahenriquez@eficent.com https://github.com/aheficent
+Lois Rilo lois.rilo@eficent.com https://github.com/lreficent
+Gisela Mora gisela.mora@eficent.com https://github.com/gmeficent
+Miquel Raich miquel.raich@eficent.com https://github.com/mreficent
+Jordi Ballester jordi.ballester@eficent.com https://github.com/jbeficent
diff --git a/doc/cla/corporate/iterativo.md b/doc/cla/corporate/iterativo.md
new file mode 100644
index 00000000000..83075996389
--- /dev/null
+++ b/doc/cla/corporate/iterativo.md
@@ -0,0 +1,15 @@
+Dominican Republic, 2017-05-13
+
+iterativo SRL 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,
+
+Edser G. Solís edser@iterativo.do https://github.com/edsersolis
+
+List of contributors:
+
+Gustavo A. Valverde gustavo@iterativo.do https://github.com/gustavovalverde
diff --git a/doc/cla/corporate/landoo.md b/doc/cla/corporate/landoo.md
new file mode 100644
index 00000000000..89c63976560
--- /dev/null
+++ b/doc/cla/corporate/landoo.md
@@ -0,0 +1,16 @@
+Spain, 2017-05-28
+
+LANDOO S.L. 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,
+
+Josean Soroa js@landoo.es https://github.com/js-landoo
+
+List of contributors:
+
+Josean Soroa js@landoo.es https://github.com/js-landoo
+Ignacio Garbizu ig@landoo.es https://github.com/ig-landoo
diff --git a/doc/cla/corporate/maao.md b/doc/cla/corporate/maao.md
new file mode 100644
index 00000000000..efe0f66faab
--- /dev/null
+++ b/doc/cla/corporate/maao.md
@@ -0,0 +1,14 @@
+Kyiv, Ukraine, 2017-05-29
+
+Management and Accouting online llc 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,
+
+Management and Accouting online llc info@maao.com.ua https://github.com/management-and-acounting-on-line
+
+List of contributors:
+
+Ostap Yakovenko ostap.yakovenko@maao.com.ua https://github.com/OstapYakovenko
+Dmytro Katyukha dmytro.katyukha@maao.com.ua https://github.com/katyukha
diff --git a/doc/cla/corporate/merchise.md b/doc/cla/corporate/merchise.md
new file mode 100644
index 00000000000..829864e2b50
--- /dev/null
+++ b/doc/cla/corporate/merchise.md
@@ -0,0 +1,21 @@
+Havana, 2017-05-05
+
+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.
+
+I declare that I am authorized and able to make this agreement and sign this
+declaration.
+
+Signed,
+
+Manuel Vázquez Acosta manuel@merchise.org https://github.com/mvaled
+
+List of contributors (some members don't have a github account yet):
+
+Manuel Vázquez Acosta manuel@merchise.org https://github.com/mvaled
+Johanny Rivera johanny@merchise.org
+Henrik Pestano henrik@merchise.org https://github.com/hpestano
+Oraldo Jacinto Simón oraldo@merchise.org
+Sergio Valdés sergiov@merchise.org
+Medardo Rodríguez med@merchise.org https://github.com/med-merchise
diff --git a/doc/cla/corporate/vauxoo.md b/doc/cla/corporate/vauxoo.md
index d651412fb9d..036e1a63620 100644
--- a/doc/cla/corporate/vauxoo.md
+++ b/doc/cla/corporate/vauxoo.md
@@ -33,3 +33,7 @@ Jose Angel Fentanez Delfin joseangel@vauxoo.com https://github.com/Angelfentanez
 Osval Reyes osval@vauxoo.com https://github.com/osvalr
 Jose Suniaga josemiguel@vauxoo.com https://github.com/suniagajose
 Luis González lgonzalez@vauxoo.com https://github.com/luisg123v
+Oriana Maita oriana@vauxoo.com https://github.com/maitaoriana
+Gabriela Mogollon gmogollon@vauxoo.com https://github.com/GavyMG
+Jesus Zapata jesus@vauxoo.com https://github.com/JesusZapata
+Germana Oliveira germana@vauxoo.com https://github.com/goliveirab
\ No newline at end of file
diff --git a/doc/cla/individual/Giuliano69.md b/doc/cla/individual/Giuliano69.md
new file mode 100644
index 00000000000..93a358ad260
--- /dev/null
+++ b/doc/cla/individual/Giuliano69.md
@@ -0,0 +1,11 @@
+Italy, 1st March 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,
+
+Giuliano Lotta giuliano.lotta@gmail.com https://github.com/Giuliano69
diff --git a/doc/cla/individual/bima_wijaya.md b/doc/cla/individual/bima_wijaya.md
new file mode 100644
index 00000000000..490d5f34e0a
--- /dev/null
+++ b/doc/cla/individual/bima_wijaya.md
@@ -0,0 +1,10 @@
+Indonesia, 2017-05-19
+
+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,
+Bima Jati Wijaya bimajatiwijaya@gmail.com https://github.com/bimajatiwijaya
diff --git a/doc/cla/individual/celm1990.md b/doc/cla/individual/celm1990.md
new file mode 100644
index 00000000000..245c0e93869
--- /dev/null
+++ b/doc/cla/individual/celm1990.md
@@ -0,0 +1,11 @@
+Ecuador, 2017-05-19
+
+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,
+
+Carlos Lopez celm1990@hotmail.com https://github.com/celm1990
diff --git a/doc/cla/individual/sum1201.md b/doc/cla/individual/sum1201.md
new file mode 100644
index 00000000000..f5535bcf050
--- /dev/null
+++ b/doc/cla/individual/sum1201.md
@@ -0,0 +1,11 @@
+Chinese, 2017-05-25
+
+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,
+
+Lin Jun sum1201@gmail.com https://github.com/sum1201
diff --git a/doc/reference/views.rst b/doc/reference/views.rst
index 853104bfaa6..8d9b231b2b1 100644
--- a/doc/reference/views.rst
+++ b/doc/reference/views.rst
@@ -819,6 +819,12 @@ attributes:
   the list view)
 ``class``
   adds HTML classes to the root HTML element of the Kanban view
+``group_create``
+  whether the "Add a new column" bar is visible or not. Default: true.
+``group_delete``
+  whether groups can be deleted via the context menu. Default: true.
+``group_edit``
+  whether groups can be edited via the context menu. Default: true.
 ``quick_create``
   whether it should be possible to create records without switching to the
   form view. By default, ``quick_create`` is enabled when the Kanban view is
@@ -930,11 +936,8 @@ Javascript API
                            caching entirely
       :returns: an image URL
 
-   .. js:function:: kanban_text_ellipsis(string[, size=160])
-
-      clips text beyond the specified size and appends an ellipsis to it. Can
-      be used to display the initial part of potentially very long fields
-      (e.g. descriptions) without the risk of unwieldy cards
+   .. warning::
+   ``kanban_text_ellipsis`` has been removed in Odoo 9. CSS ``text-overflow`` should be used instead.
 
 .. _reference/views/calendar:
 
diff --git a/doc/setup/install.rst b/doc/setup/install.rst
index 389050dd4bb..de21d6c53ab 100644
--- a/doc/setup/install.rst
+++ b/doc/setup/install.rst
@@ -335,9 +335,15 @@ For example:
   $ odoo-bin --addons-path=~/src/custom_modules,~/src/enterprise,~/src/odoo/addons
 
 .. warning:: The Enterprise git repository **does not contain the full Odoo
-    source code**. You need to clone both the Community and Enterprise repository to
-    have a working Odoo installation. The Download_ page contains the entire
-    source code but is not updateable as easily.
+    source code**. It is only a collection of extra add-ons. The main server
+    code is in the Community version.  Running the Enterprise version actually
+    means running the server from the Community version with the addons-path option
+    set to the folder with the Enterprise version.
+    
+    You need to clone both the Community and Enterprise repository to have a working
+    Odoo installation. The Download_ page contains the entire source code but is not
+    updateable as easily.
+
 
 
 Installing dependencies