[MERGE] forward port of branch saas-10 up to bb8f0f1

12 files changed, 102 insertions, 19 deletions

diff --git a/doc/cla/corporate/VanRoey.md b/doc/cla/corporate/VanRoey.md
new file mode 100644
index 00000000000..956d6bb43a4
--- /dev/null
+++ b/doc/cla/corporate/VanRoey.md
@@ -0,0 +1,18 @@
+Belgium 2016-04-11
+
+Van Roey 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,
+
+Yenthe Van Ginneken  yenthe.vanginneken@vanroey.be https://github.com/Yenthe666
+
+List of contributors:
+
+Yenthe Van Ginneken  yenthe.vanginneken@vanroey.be https://github.com/Yenthe666
+Maarten Wijnants maarten.wijnants@vanroey.be https://github.com/weilant
+Vincent Adriaensen vincent.adriaensen@vanroey.be https://github.com/vincentadriaensen
+Pieter Paulussen pieter.paulussen@vanroey.be https://github.com/PieterPaulussen
diff --git a/doc/cla/corporate/bisneSmart.md b/doc/cla/corporate/bisneSmart.md
new file mode 100644
index 00000000000..229c626f5c5
--- /dev/null
+++ b/doc/cla/corporate/bisneSmart.md
@@ -0,0 +1,16 @@
+Spain, March 11, 2016
+
+bisneSmart S.C. 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,
+
+bisneSmart S.C. hola@bisnesmart.com https://github.com/bisnesmart
+
+List of contributors:
+
+Gonzalo Borrás Beta gborras@bisnesmart.com https://github.com/gonxi
+Rubén Cabrera Martínez rcabrera@bisnesmart.com https://github.com/rubencabrera
diff --git a/doc/cla/corporate/camptocamp.md b/doc/cla/corporate/camptocamp.md
index bb68262d95f..6e6d131fc2c 100644
--- a/doc/cla/corporate/camptocamp.md
+++ b/doc/cla/corporate/camptocamp.md
@@ -27,4 +27,5 @@ Romain Deheele romain.deheele@camptocamp.com https://github.com/rdeheele
 Maxime Wiot maxime.wiot@camptocamp.com https://github.com/maxime-c2c
 Ferdinand Gassauer ferdinand.gassauer@camptocamp.com https://github.com/ferdiga
 Jean-Baptiste Aubort jean-baptiste.aubort@camptocamp.com
+Cyril Gaudin cyril.gaudin@camptocamp.com https://github.com/cyrilgdn
 
diff --git a/doc/cla/corporate/cloudland.md b/doc/cla/corporate/cloudland.md
new file mode 100644
index 00000000000..6ff6f0456b9
--- /dev/null
+++ b/doc/cla/corporate/cloudland.md
@@ -0,0 +1,15 @@
+Saudi Arabia, April 24, 2016
+
+Cloudland 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,
+
+Fahad Alqahtani alqfahad@gmail.com https://github.com/alqfahad
+
+List of contributors:
+
+Fahad Alqahtani alqfahad@gmail.com https://github.com/alqfahad
diff --git a/doc/cla/individual/erocre.md b/doc/cla/individual/erocre.md
new file mode 100644
index 00000000000..a7a2aca53b0
--- /dev/null
+++ b/doc/cla/individual/erocre.md
@@ -0,0 +1,9 @@
+Spain, 2016-04-08
+
+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,
+
+Eduardo Rodriguez erocre@gmail.com https://github.com/erocre
diff --git a/doc/cla/individual/javcasas.md b/doc/cla/individual/javcasas.md
new file mode 100644
index 00000000000..0458f7754b1
--- /dev/null
+++ b/doc/cla/individual/javcasas.md
@@ -0,0 +1,11 @@
+Ecuador, 14th of March, 2016
+
+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,
+
+Javier Casas javcasas@gmail.com https://github.com/javcasas
diff --git a/doc/cla/individual/stephen144.md b/doc/cla/individual/stephen144.md
index 1caf0b28b4f..282bd5f0a50 100644
--- a/doc/cla/individual/stephen144.md
+++ b/doc/cla/individual/stephen144.md
@@ -1,4 +1,4 @@
-United States of America, 2015-10-22
+United States of America, 2016-04-07
 
 I hereby agree to the terms of the Odoo Individual Contributor License
 Agreement v1.0.
@@ -9,3 +9,4 @@ declaration.
 Signed,
 
 Stephen Medina stephen@lilmail.xyz https://github.com/stephen144
+Stephen Medina stephenm@lsm.org https://github.com/stephen144
diff --git a/doc/cla/individual/tesserb.md b/doc/cla/individual/tesserb.md
new file mode 100644
index 00000000000..ba4e41e2e42
--- /dev/null
+++ b/doc/cla/individual/tesserb.md
@@ -0,0 +1,11 @@
+United States, 2016-04-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,
+
+Cody Kitterman ckitterm@gmail.com https://github.com/tesserb
\ No newline at end of file
diff --git a/doc/howtos/backend.rst b/doc/howtos/backend.rst
index 778966e7d8b..17f3a4a986c 100644
--- a/doc/howtos/backend.rst
+++ b/doc/howtos/backend.rst
@@ -236,7 +236,7 @@ record.
                 <field name="{a field name}">{a value}</field>
             </record>
         </data>
-    <openerp>
+    </openerp>
 
 * ``model`` is the name of the Odoo model for the record
 * ``id`` is an :term:`external identifier`, it allows referring to the record
@@ -293,7 +293,7 @@ action more easily.
 
 .. exercise:: Define new menu entries
 
-    Define new menu entries to access courses and sessions under the
+    Define new menu entries to access courses under the
     OpenAcademy menu entry. A user should be able to
 
     - display a list of all the courses
@@ -982,10 +982,6 @@ Tree views
 Tree views can take supplementary attributes to further customize their
 behavior:
 
-``colors``
-    .. deprecated:: 9.0
-        replaced by ``decoration-{$name}``
-
 ``decoration-{$name}``
     allow changing the style of a row's text based on the corresponding
     record's attributes.
@@ -997,7 +993,8 @@ behavior:
     as a string of the form ``yyyy-MM-dd``).
 
     ``{$name}`` can be ``bf`` (``font-weight: bold``), ``it``
-    (``font-style: italic``), or any bootstrap contextual color (``danger``,
+    (``font-style: italic``), or any `bootstrap contextual color
+    <http://getbootstrap.com/components/#available-variations>`_ (``danger``,
     ``info``, ``muted``, ``primary``, ``success`` or ``warning``).
 
     .. code-block:: xml
@@ -1470,8 +1467,8 @@ hooks in the ORM, such an action is declared in XML with the tag ``act_window``.
 
     <act_window id="launch_the_wizard"
                 name="Launch the Wizard"
-                src_model="context_model_name"
-                res_model="wizard_model_name"
+                src_model="context.model.name"
+                res_model="wizard.model.name"
                 view_mode="form"
                 target="new"
                 key2="client_action_multi"/>
diff --git a/doc/reference/actions.rst b/doc/reference/actions.rst
index 6b87af72222..bd9fab4451e 100644
--- a/doc/reference/actions.rst
+++ b/doc/reference/actions.rst
@@ -209,7 +209,7 @@ field:
         <field name="name">Res Partner Server Action</field>
         <field name="model_id" ref="model_res_partner"/>
         <field name="code">
-raise Warning(object.name)
+            raise Warning(object.name)
         </field>
     </record>
 
diff --git a/doc/reference/guidelines.rst b/doc/reference/guidelines.rst
index 17e50fe89ae..e4cfe1255ec 100644
--- a/doc/reference/guidelines.rst
+++ b/doc/reference/guidelines.rst
@@ -16,7 +16,7 @@ Module structure
 
 Directories
 -----------
-A module is organised in a few directory :
+A module is organised in a few directories :
 
 - *data/* : demo and data xml
 - *models/* : models definition
@@ -129,7 +129,7 @@ When declaring a record in XML,
         <field name="arch" type="xml">
             <tree>
                 <field name="my_field_1"/>
-                <field name="my_field_2" string="My Label" widget="statusbar" statusbar_visible="draft,sent,progress,done" statusbar_colors='{"invoice_except":"red","waiting_date":"blue"}' />
+                <field name="my_field_2" string="My Label" widget="statusbar" statusbar_visible="draft,sent,progress,done" />
             </tree>
         </field>
     </record>
@@ -266,7 +266,7 @@ Inside these 3 groups, the imported lines are alphabetically sorted.
 Idioms
 ------
 
-- Prefer ``%`` over ``.format()``, prefer ``%(varname)`` instead of position (This is better for translation)
+- Prefer ``%`` over ``.format()``, prefer ``%(varname)`` instead of position (This is better for translations)
 - Try to avoid generators and decorators
 - Always favor *Readability* over *conciseness* or using the language features or idioms.
 - Use list comprehension, dict comprehension, and basic manipulation using ``map``, ``filter``, ``sum``, ... They make the code easier to read.
diff --git a/doc/reference/views.rst b/doc/reference/views.rst
index e26f1810ce8..3c8eaa02126 100644
--- a/doc/reference/views.rst
+++ b/doc/reference/views.rst
@@ -158,7 +158,8 @@ root can have the following attributes:
     as a string of the form ``yyyy-MM-dd``).
 
     ``{$name}`` can be ``bf`` (``font-weight: bold``), ``it``
-    (``font-style: italic``), or any bootstrap contextual color (``danger``,
+    (``font-style: italic``), or any `bootstrap contextual color
+    <http://getbootstrap.com/components/#available-variations>`_ (``danger``,
     ``info``, ``muted``, ``primary``, ``success`` or ``warning``).
 ``create``, ``edit``, ``delete``
     allows *dis*\ abling the corresponding action in the view by setting the
@@ -362,7 +363,7 @@ system. Available semantic components are:
     .. todo:: list of widgets
 
        & options & specific attributes (e.g. widget=statusbar
-       statusbar_visible statusbar_colors clickable)
+       statusbar_visible clickable)
   ``options``
     JSON object specifying configuration option for the field's widget
     (including default widgets)
@@ -501,13 +502,16 @@ The states are shown following the order used in the field (the list in a
 selection field, etc). States that are always visible are specified with the
 attribute ``statusbar_visible``.
 
-``statusbar_colors`` can be used to give a custom color to specific states.
+``statusbar_colors``
+    can be used to give a custom color to specific states.
+
+    .. deprecated:: 9.0
+
 
 ::
 
     <field name="state" widget="statusbar"
-        statusbar_visible="draft,sent,progress,invoiced,done"
-        statusbar_colors="{'shipping_except':'red','waiting_date':'blue'}"/>
+        statusbar_visible="draft,sent,progress,invoiced,done" />
 
 The Sheet
 '''''''''