[MERGE] forward port branch 10.0 up to 00e169c05a2

9 files changed, 84 insertions, 10 deletions

diff --git a/doc/cla/corporate/metalsartigan.md b/doc/cla/corporate/metalsartigan.md
new file mode 100644
index 00000000000..027d794fcaa
--- /dev/null
+++ b/doc/cla/corporate/metalsartigan.md
@@ -0,0 +1,15 @@
+Canada, 2017-3-24
+
+Métal Sartigan 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,
+
+Jérôme Thériault jerther@gmail.com https://github.com/jerther
+
+List of contributors:
+
+Jérôme Thériault jerther@gmail.com https://github.com/jerther
diff --git a/doc/cla/corporate/ontruck.md b/doc/cla/corporate/ontruck.md
new file mode 100644
index 00000000000..baf0b0a2df4
--- /dev/null
+++ b/doc/cla/corporate/ontruck.md
@@ -0,0 +1,15 @@
+Spain, 2017-03-30
+
+OnTruck 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,
+
+Iñigo Juantegui
+
+List of contributors:
+
+Antonio Espinosa <antonio.espinosa@ontruck.com> https://github.com/antespi
diff --git a/doc/cla/corporate/tecnativa.md b/doc/cla/corporate/tecnativa.md
new file mode 100644
index 00000000000..72a73cbbe28
--- /dev/null
+++ b/doc/cla/corporate/tecnativa.md
@@ -0,0 +1,22 @@
+Spain, 2017-04-04
+
+Tecnativa 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,
+
+Pedro M. Baeza pedro.baeza@tecnativa.com https://github.com/pedrobaeza
+
+List of contributors:
+
+Pedro M. Baeza pedro.baeza@tecnativa.com https://github.com/pedrobaeza
+Rafael Blasco rafael.blasco@tecnativa.com https://github.com/rafaelbn
+Sergio Teruel sergio.teruel@tecnativa.com https://github.com/sergio-teruel
+Carlos Dauden carlos.dauden@tecnativa.com https://github.com/carlosdauden
+Jairo Llopis jairo.llopis@tecnativa.com https://github.com/yajo
+Vicent Cubells vicent.cubells@tecnativa.com https://github.com/cubells
+Luis Montalba luis.montalba@tecnativa.com https://github.com/luismontalba
+David Vidal david.vidal@tecnativa.com https://github.com/chienandalu
diff --git a/doc/cla/corporate/tvtmarine-automation.md b/doc/cla/corporate/tvtmarine-automation.md
index a9a365d33ee..8b5b59d501b 100644
--- a/doc/cla/corporate/tvtmarine-automation.md
+++ b/doc/cla/corporate/tvtmarine-automation.md
@@ -1,4 +1,4 @@
-Vietnam, 2016-11-30
+Vietnam, 2017-04-03
 
 T.V.T Marine Automation agrees to the terms of the Odoo Corporate Contributor License
 Agreement v1.0.
@@ -12,4 +12,6 @@ David Tran david.tran@tvtmarine.com https://github.com/tvtma/
 
 List of contributors:
 
-David Tran david.tran@tvtmarine.com https://github.com/tvtma/
\ No newline at end of file
+David Tran david.tran@tvtmarine.com https://github.com/davidtranhp
+Long Do dhlong.1209@gmail.com https://github.com/hoanglong87
+Hao Hoang hao.hoang@ma.tvtmarine.com https://github.com/hoanghao2001
\ No newline at end of file
diff --git a/doc/cla/individual/monami7001.md b/doc/cla/individual/monami7001.md
new file mode 100644
index 00000000000..4549f0e8026
--- /dev/null
+++ b/doc/cla/individual/monami7001.md
@@ -0,0 +1,9 @@
+Azer, 2017-03-26
+
+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,
+
+GHADHOUN AZER ezer1989@gmail.com https://github.com/monami7001
diff --git a/doc/cla/individual/ttpphuctran.md b/doc/cla/individual/ttpphuctran.md
new file mode 100644
index 00000000000..2cbbdd58851
--- /dev/null
+++ b/doc/cla/individual/ttpphuctran.md
@@ -0,0 +1,11 @@
+Vietnam, 2017-04-10
+
+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,
+
+Tran Thanh Phuc ttp.phuctran@gmail.com https://github.com/ttpphuctran
diff --git a/doc/cla/sign-cla.md b/doc/cla/sign-cla.md
index 62de420d0e8..247961f63bc 100644
--- a/doc/cla/sign-cla.md
+++ b/doc/cla/sign-cla.md
@@ -14,7 +14,7 @@ requirement is explained in the [FAQ](#faq).
     `odony`, the file would be `doc/cla/individual/odony.md`. The file should
     contain:
 
-    ```
+```
 <country>, <date>
 
 I hereby agree to the terms of the Odoo Individual Contributor License
@@ -50,7 +50,7 @@ signature is merged.
     If the name of the company is Odoo, the file would be
     `doc/cla/corporate/odoo.md`. The file should contain:
 
-    ```
+```
 <country>, <date>
 
 <company-name> agrees to the terms of the Odoo Corporate Contributor License
diff --git a/doc/reference/data.rst b/doc/reference/data.rst
index 20172fa063b..c8ebf864a88 100644
--- a/doc/reference/data.rst
+++ b/doc/reference/data.rst
@@ -58,7 +58,7 @@ following attributes:
     Requires an :term:`external id`, defaults to ``True``.
 
 ``field``
-'''''''''
+----------
 
 Each record can be composed of ``field`` tags, defining values to set when
 creating the record. A ``record`` with no ``field`` will use all default
diff --git a/doc/setup/enterprise.rst b/doc/setup/enterprise.rst
index c853fa7c697..a613e0c8e39 100644
--- a/doc/setup/enterprise.rst
+++ b/doc/setup/enterprise.rst
@@ -15,7 +15,7 @@ In any case the basic guidelines are:
 
 * Shutdown your server
 
-* Upgrade the web module
+* Install the web_enterprise module
 
 * Restart your server
 
@@ -45,7 +45,7 @@ On Linux, using an installer
 
   .. code-block:: console
 
-    $ python /usr/bin/odoo.py -d <database_name> -u web --stop-after-init
+    $ python /usr/bin/odoo.py -d <database_name> -i web_enterprise --stop-after-init
 
 * You should be able to connect to your Odoo Enterprise instance using your usual mean of identification.
   You can then link your database with your Odoo Enterprise Subscription by entering the code you received
@@ -61,11 +61,11 @@ have your own favourite. You may need to adapt sections to your usual workflow.
 * Shutdown your server
 * Backup your community database
 * Update the ``--addons-path`` parameter of your launch command (see :ref:`setup/install/source`)
-* Update the web module by using
+* Install the web_enterprise module by using
 
   .. code-block:: console
 
-    $ -d <database_name> -u web --stop-after-init
+    $ -d <database_name> -i web_enterprise --stop-after-init
 
   Depending on the size of your database, this may take some time.
 
@@ -97,7 +97,7 @@ On Windows
 
   .. code-block:: console
 
-    $ odoo.exe -d <database_name> -u web --stop-after-init
+    $ odoo.exe -d <database_name> -i web_enterprise --stop-after-init
 
 * No need to manually launch the server, the service is running.
   You should be able to connect to your Odoo Enterprise instance using your usual