[MERGE] forward port branch saas-14 up to b857fd4c905

6 files changed, 39 insertions, 4 deletions

diff --git a/doc/cla/corporate/tawasta.md b/doc/cla/corporate/tawasta.md
new file mode 100644
index 00000000000..130e6adf0f2
--- /dev/null
+++ b/doc/cla/corporate/tawasta.md
@@ -0,0 +1,14 @@
+Finland, 2017-07-17
+
+Oy Tawasta OS Technologies Ltd. agrees to the terms of the Odoo Corporate Contributor License Agreement v1.0.
+
+We declare that we are authorized and able to make this agreement and sign this declaration.
+
+Signed,
+
+    Jarmo Kortetjärvi jarmo.kortetjarvi@tawasta.fi https://github.com/jarmokortetjarvi
+
+List of contributors:
+
+    Aleksi Savijoki aleksi.savijoki@tawasta.fi https://github.com/savijoki
+    Jarmo Kortetjärvi jarmo.kortetjarvi@tawasta.fi https://github.com/jarmokortetjarvi
diff --git a/doc/cla/individual/sindhav.md b/doc/cla/individual/sindhav.md
new file mode 100644
index 00000000000..876d54b2475
--- /dev/null
+++ b/doc/cla/individual/sindhav.md
@@ -0,0 +1,10 @@
+India, 2017-07-04
+
+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,
+
+Rakesh Sindhav sindhav21591@gmail.com https://github.com/sindhav
+
diff --git a/doc/cla/individual/timotalvitie.md b/doc/cla/individual/timotalvitie.md
new file mode 100644
index 00000000000..1268e38225e
--- /dev/null
+++ b/doc/cla/individual/timotalvitie.md
@@ -0,0 +1,11 @@
+Finland, 2017-07-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,
+
+Timo Talvitie timo.talvitie@vizucom.com https://github.com/timotalvitie
diff --git a/doc/howtos/backend/exercise-calendar b/doc/howtos/backend/exercise-calendar
index 9a86e6b03de..2f79c935441 100644
--- a/doc/howtos/backend/exercise-calendar
+++ b/doc/howtos/backend/exercise-calendar
@@ -11,7 +11,7 @@ diff --git a/openacademy/models.py b/openacademy/models.py
 +from datetime import timedelta
  from odoo import models, fields, api, exceptions
  
- class Session(models.Model):
+ class Course(models.Model):
 @@ -55,6 +56,8 @@ class Session(models.Model):
      attendee_ids = fields.Many2many('res.partner', string="Attendees")
  
diff --git a/doc/howtos/backend/exercise-kanban b/doc/howtos/backend/exercise-kanban
index 68001ea87a8..14899f46a3d 100644
--- a/doc/howtos/backend/exercise-kanban
+++ b/doc/howtos/backend/exercise-kanban
@@ -17,7 +17,7 @@ Index: addons/openacademy/views/openacademy.xml
 ===================================================================
 --- addons.orig/openacademy/views/openacademy.xml	2014-08-28 14:21:58.627015606 +0200
 +++ addons/openacademy/views/openacademy.xml	2014-08-28 14:21:58.623015606 +0200
-@@ -169,11 +169,57 @@
+@@ -168,11 +168,57 @@
              </field>
          </record>
  
diff --git a/doc/reference/module.rst b/doc/reference/module.rst
index 76200fbc9a1..aecb8de8a8f 100644
--- a/doc/reference/module.rst
+++ b/doc/reference/module.rst
@@ -30,11 +30,11 @@ dictionary, where each key specifies module metadatum.
         """,
         # data files always loaded at installation
         'data': [
-            'mymodule_view.xml',
+            'views/mymodule_view.xml',
         ],
         # data files containing optionally loaded demonstration data
         'demo': [
-            'demo_data.xml',
+            'demo/demo_data.xml',
         ],
     }