[MERGE] forward port of branch 8.0 up to bff6dff

6 files changed, 42 insertions, 12 deletions

diff --git a/doc/cla/individual/jeffery.md b/doc/cla/individual/jeffery.md
new file mode 100644
index 00000000000..5063b81c4df
--- /dev/null
+++ b/doc/cla/individual/jeffery.md
@@ -0,0 +1,11 @@
+China, 2015-04-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,
+
+Jeffery Chen Fan  jeffery9@gmail.com  https://github.com/jeffery9
diff --git a/doc/cla/individual/mvaled.md b/doc/cla/individual/mvaled.md
new file mode 100644
index 00000000000..e9dd0add952
--- /dev/null
+++ b/doc/cla/individual/mvaled.md
@@ -0,0 +1,11 @@
+La Habana, 2015-04-30
+
+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,
+
+Manuel Vázquez Acosta mva.led@gmail.com https://github.com/mvaled
diff --git a/doc/cla/individual/shingonoide.md b/doc/cla/individual/shingonoide.md
new file mode 100644
index 00000000000..af4e340188d
--- /dev/null
+++ b/doc/cla/individual/shingonoide.md
@@ -0,0 +1,11 @@
+Brazil, 2015-04-28
+
+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,
+
+Rui Andrada shingonoide@gmail.com https://github.com/shingonoide
diff --git a/doc/howtos/backend.rst b/doc/howtos/backend.rst
index d7d6e4c02ea..00c5b103462 100644
--- a/doc/howtos/backend.rst
+++ b/doc/howtos/backend.rst
@@ -764,6 +764,7 @@ method should simply set the value of the field to compute on every record in
 
         name = fields.Char(compute='_compute_name')
 
+        @api.multi
         def _compute_name(self):
             for record in self:
                 record.name = str(random.randint(1, 1e6))
diff --git a/doc/howtos/backend/exercise-gantt b/doc/howtos/backend/exercise-gantt
index dc4033e18de..273854b197d 100644
--- a/doc/howtos/backend/exercise-gantt
+++ b/doc/howtos/backend/exercise-gantt
@@ -35,7 +35,7 @@ Index: addons/openacademy/views/openacademy.xml
 ===================================================================
 --- addons.orig/openacademy/views/openacademy.xml	2014-08-28 14:21:46.543015785 +0200
 +++ addons/openacademy/views/openacademy.xml	2014-08-28 14:21:46.539015785 +0200
-@@ -145,11 +145,24 @@
+@@ -145,11 +145,23 @@
              </field>
          </record>
  
@@ -44,10 +44,9 @@ Index: addons/openacademy/views/openacademy.xml
 +            <field name="model">openacademy.session</field>
 +            <field name="arch" type="xml">
 +                <gantt string="Session Gantt" color="course_id"
-+                       date_start="start_date" date_delay="hours">
-+                    <level object="res.partner" link="instructor_id">
-+                        <field name="name"/>
-+                    </level>
++                       date_start="start_date" date_delay="hours"
++                       default_group_by='instructor_id'>
++                    <field name="name"/>
 +                </gantt>
 +            </field>
 +        </record>
diff --git a/doc/howtos/backend/exercise-state-workflow-actions b/doc/howtos/backend/exercise-state-workflow-actions
index 826ec5ce870..fe9a0c8a796 100644
--- a/doc/howtos/backend/exercise-state-workflow-actions
+++ b/doc/howtos/backend/exercise-state-workflow-actions
@@ -5,7 +5,7 @@ Index: addons/openacademy/views/session_workflow.xml
 ===================================================================
 --- addons.orig/openacademy/views/session_workflow.xml	2014-08-26 17:26:17.339783114 +0200
 +++ addons/openacademy/views/session_workflow.xml	2014-08-26 17:26:17.331783114 +0200
-@@ -6,24 +6,53 @@
+@@ -6,24 +6,50 @@
              <field name="on_create">True</field>
          </record>
  
@@ -13,8 +13,7 @@ Index: addons/openacademy/views/session_workflow.xml
 +            <field name="name">Set session to Draft</field>
 +            <field name="model_id" ref="model_openacademy_session"/>
 +            <field name="code">
-+recs = self.browse(cr, uid, context['active_ids'], context=context)
-+recs.action_draft()
++model.search([('id', 'in', context['active_ids'])]).action_draft()
 +            </field>
 +        </record>
          <record model="workflow.activity" id="draft">
@@ -32,8 +31,7 @@ Index: addons/openacademy/views/session_workflow.xml
 +            <field name="name">Set session to Confirmed</field>
 +            <field name="model_id" ref="model_openacademy_session"/>
 +            <field name="code">
-+recs = self.browse(cr, uid, context['active_ids'], context=context)
-+recs.action_confirm()
++model.search([('id', 'in', context['active_ids'])]).action_confirm()
 +            </field>
          </record>
          <record model="workflow.activity" id="confirmed">
@@ -50,8 +48,7 @@ Index: addons/openacademy/views/session_workflow.xml
 +            <field name="name">Set session to Done</field>
 +            <field name="model_id" ref="model_openacademy_session"/>
 +            <field name="code">
-+recs = self.browse(cr, uid, context['active_ids'], context=context)
-+recs.action_done()
++model.search([('id', 'in', context['active_ids'])]).action_done()
 +            </field>
          </record>
          <record model="workflow.activity" id="done">