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

3 files changed, 13 insertions, 9 deletions

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
 '''''''''