[MERGE] forward port of branch saas-9 up to 87a01c7

4 files changed, 33 insertions, 22 deletions

diff --git a/doc/reference/actions.rst b/doc/reference/actions.rst
index 976fe84a922..44a2efd43e1 100644
--- a/doc/reference/actions.rst
+++ b/doc/reference/actions.rst
@@ -208,7 +208,7 @@ field:
         <field name="name">Res Partner Server Action</field>
         <field name="model_id" ref="model_res_partner"/>
         <field name="code">
-            print self, object
+raise Warning(object.name)
         </field>
     </record>
 
diff --git a/doc/reference/cmdline.rst b/doc/reference/cmdline.rst
index 626906951a2..cd7a1d57203 100644
--- a/doc/reference/cmdline.rst
+++ b/doc/reference/cmdline.rst
@@ -280,13 +280,6 @@ customize the amout of logging output
         In case of conflict between :option:`--log-level` and
         :option:`--log-handler`, the latter is used
 
-Advanced options
-----------------
-
-.. option:: --auto-reload
-
-    enable auto-reloading of python files and xml files without having to
-    restart the server. Requires pyinotify_.
 
 .. _reference/cmdline/scaffold:
 
diff --git a/doc/reference/views.rst b/doc/reference/views.rst
index 871b275cd39..39a31bf7f97 100644
--- a/doc/reference/views.rst
+++ b/doc/reference/views.rst
@@ -862,6 +862,8 @@ Possible children of the view element are:
     a :meth:`~openerp.models.Model.read` (except for date and datetime fields
     that are `formatted according to user's locale
     <https://github.com/odoo/odoo/blob/a678bd4e/addons/web_kanban/static/src/js/kanban_record.js#L102>`_)
+  ``formats``
+    the :js:class:`web.formats` module to manipulate and convert values
   ``read_only_mode``
     self-explanatory
 
@@ -1013,26 +1015,40 @@ take the following attributes:
   and the end date will be set to the start date
 ``date_delay``
   name of the field providing the duration of the event
-``progress``
-  name of a field providing the completion percentage for the record's event,
-  between 0 and 100
+``duration_unit``
+  one of ``minute``, ``hour`` (default), ``day``, ``week``, ``month``, ``year``
+
 ``default_group_by``
   name of a field to group tasks by
-``fold_last_level``
-  If a value is set, the last grouping level is folded
-``round_dnd_dates``
-  enables rounding the task's start and end dates to the nearest scale marks
+``type``
+  ``gantt`` classic gantt view (default)
+
+  ``consolidate`` values of the first children are consolidated in the gantt's task
+  
+  ``planning`` children are displayed in the gantt's task
 ``consolidation``
   field name to display consolidation value in record cell
 ``consolidation_max``
   dictionary with the "group by" field as key and the maximum consolidation
   value that can be reached before displaying the cell in red
+  (e.g. ``{"user_id": 100}``)
+
+  .. warning::
+      The dictionnary definition must use double-quotes, ``{'user_id': 100}`` is
+      not a valid value
+``consolidation_label``
+  string to display next to the consolidation value, if not specified, the label
+  of the consolidation field will be used
+``fold_last_level``
+  If a value is set, the last grouping level is folded
+``round_dnd_dates``
+  enables rounding the task's start and end dates to the nearest scale marks
+
+.. ``progress``
+    name of a field providing the completion percentage for the record's event,
+    between 0 and 100
 .. consolidation_exclude
 .. consolidation_color
-..  ``type``
-      ``gantt`` classic gantt view (default)
-      ``consolidate`` values of the first children are consolidated in the gantt's task
-      ``planning`` children are displayed in the gantt's task
 
 .. _reference/views/diagram:
 
diff --git a/doc/reference/workflows.rst b/doc/reference/workflows.rst
index db57880436e..c67784797c4 100644
--- a/doc/reference/workflows.rst
+++ b/doc/reference/workflows.rst
@@ -86,6 +86,7 @@ instance, here is a simple sequence of two activities defined in XML
     <record id="trans_a_b" model="workflow.transition">
         <field name="act_from" ref="activity_a"/>
         <field name="act_to" ref="activity_b"/>
+        <field name="signal">signal_goto_b</signal>
     </record>
 
 A worfklow is always defined with respect to a particular model (the model is
@@ -107,9 +108,10 @@ is of kind ``function``, which means that the action ``print_a()`` is a method
 call on the model ``test.workflow`` (the usual ``cr, uid, ids, context``
 arguments are passed for you).
 
-The transition between "a" and "b" does not specify any condition. This means
-that the workflow instance immediately goes from "a" to "b" after "a" has been
-processed, and thus also processes activity "b".
+The transition between "a" and "b" specify a signal but not any condition. This
+means the workflow instance will immediately transition from "a" to "b" when the
+signal ``signal_goto_b`` is recieved and thus processes activity "b"'s action
+``print_b()``.
 
 Activities
 ----------