[MERGE] forward port branch saas-15 up to 4d79a1ff58f

13 files changed, 57 insertions, 31 deletions

diff --git a/doc/reference/cmdline.rst b/doc/reference/cmdline.rst
index 73416366669..c92a8b034a9 100644
--- a/doc/reference/cmdline.rst
+++ b/doc/reference/cmdline.rst
@@ -2,9 +2,9 @@
 
 .. _reference/cmdline:
 
-===============================
+================================
 Command-line interface: odoo-bin
-===============================
+================================
 
 .. _reference/cmdline/server:
 
diff --git a/doc/reference/images/mobile_notification.png b/doc/reference/images/mobile_notification.png
index 7fb37839af8..f2d189ee0fd 100644
--- a/doc/reference/images/mobile_notification.png
+++ b/doc/reference/images/mobile_notification.png
diff --git a/doc/reference/images/runner.png b/doc/reference/images/runner.png
index 9991fce45a1..4cbba9416f3 100644
--- a/doc/reference/images/runner.png
+++ b/doc/reference/images/runner.png
diff --git a/doc/reference/images/runner2.png b/doc/reference/images/runner2.png
index ff8f5bfe722..551141022a3 100644
--- a/doc/reference/images/runner2.png
+++ b/doc/reference/images/runner2.png
diff --git a/doc/reference/images/snackbar.png b/doc/reference/images/snackbar.png
index 99e4dd42bbb..e3e204cb3dd 100644
--- a/doc/reference/images/snackbar.png
+++ b/doc/reference/images/snackbar.png
diff --git a/doc/reference/images/tests.png b/doc/reference/images/tests.png
index bc3ce8b43fc..3b417889ee9 100644
--- a/doc/reference/images/tests.png
+++ b/doc/reference/images/tests.png
diff --git a/doc/reference/images/tests2.png b/doc/reference/images/tests2.png
index 361fb7fb54b..075cd506bfb 100644
--- a/doc/reference/images/tests2.png
+++ b/doc/reference/images/tests2.png
diff --git a/doc/reference/images/tests3.png b/doc/reference/images/tests3.png
index d323360497d..6901203b5ec 100644
--- a/doc/reference/images/tests3.png
+++ b/doc/reference/images/tests3.png
diff --git a/doc/reference/images/toast.png b/doc/reference/images/toast.png
index 15a252d381d..03593885743 100644
--- a/doc/reference/images/toast.png
+++ b/doc/reference/images/toast.png
diff --git a/doc/reference/mobile.rst b/doc/reference/mobile.rst
index 74bda5997ab..db9dc1343f4 100644
--- a/doc/reference/mobile.rst
+++ b/doc/reference/mobile.rst
@@ -10,11 +10,17 @@ Mobile JavaScript
 Introduction
 ============
 
-In Odoo 10.0 we released a mobile app, allows you to access all **Odoo apps** (even your customized modules). 
+In Odoo 10.0 we released a mobile app, allows you to access all **Odoo apps**
+(even your customized modules). 
 
-The application is a combination of **Odoo Web** and **Native Mobile components**, in other words it is a Odoo Web instance loaded inside native WebView container of mobile.
+The application is a combination of **Odoo Web** and **Native Mobile
+components**, in other words it is a Odoo Web instance loaded inside native
+WebView container of mobile.
 
-This page documents how you can access mobile native components like Camera, Vibration, Notification, Toast through Odoo Web (via JavaScript). For this, you do not need to be a mobile developer, if you know Odoo JavaScript API you can access all available mobile features.
+This page documents how you can access mobile native components like Camera,
+Vibration, Notification, Toast through Odoo Web (via JavaScript). For this, you
+do not need to be a mobile developer, if you know Odoo JavaScript API you can
+access all available mobile features.
 
 .. warning:: This features works with **Odoo Enterprise 10.0+** only
 
@@ -24,34 +30,41 @@ How does it work?
 Internal working of Mobile application:
 
 .. image:: images/mobile_working.jpg
-    :align: left
 
-Of course, it is a web page that loads on a Mobile Native Web container. But it is integrated in such a way that you can access native resources from your web JavaScript.
+Of course, it is a web page that loads on a Mobile Native Web container. But it
+is integrated in such a way that you can access native resources from your web
+JavaScript.
 
-WebPages (Odoo Web) is on the top of each layer, where second layer is a Bridge between Odoo Web (JS) and Native component of mobile.
+WebPages (Odoo Web) is on the top of each layer, where second layer is a Bridge
+between Odoo Web (JS) and Native component of mobile.
 
-When any call from JavaScript triggered it passes through Bridge and Bridge pass it to native invoker to perform that action.
+When any call from JavaScript triggered it passes through Bridge and Bridge
+pass it to native invoker to perform that action.
 
-When the native component has done their work, it again is passed to Bridge and you get the output in JavaScript.
+When the native component has done their work, it again is passed to Bridge and
+you get the output in JavaScript.
 
-Process time taken by the Native component depends on what you are requesting from Native resources. Like Camera or GPS Location.
+Process time taken by the Native component depends on what you are requesting
+from Native resources. Like Camera or GPS Location.
 
 How to use it?
 ==============
 
-As Odoo Web Framework, Mobile api can be used anywhere by getting object of **web_mobile.rpc**
+As Odoo Web Framework, Mobile api can be used anywhere by getting object of
+**web_mobile.rpc**
 
 .. image:: images/odoo_mobile_api.png
-    :align: left
 
-Mobile rpc object provide list of methods available (Works only with Mobile App). 
+Mobile rpc object provide list of methods available (Works only with Mobile
+App). 
 
 Just check for method availability and execute it.
 
 Methods
 -------
 
-.. note:: Each of the methods returns JQuery Deffered object with returning data JSON dictionary
+.. note:: Each of the methods returns JQuery Deffered object with returning
+   data JSON dictionary
 
 Show Toast in device
 .....................
@@ -60,7 +73,9 @@ Show Toast in device
 
 	:param object args: **message** text to display
 
-A toast provides simple feedback about an operation in a small popup. It only fills the amount of space required for the message and the current activity remains visible and interactive
+A toast provides simple feedback about an operation in a small popup. It only
+fills the amount of space required for the message and the current activity
+remains visible and interactive
 
 .. code-block:: javascript
 
@@ -75,7 +90,8 @@ Vibrating device
 
 .. js:function:: vibrate
 
-	:param object args: Vibrates constantly for the specified period of time (in milliseconds).
+	:param object args: Vibrates constantly for the specified period of time
+	       (in milliseconds).
 
 Vibrate mobile device with given duration.
 
@@ -91,7 +107,10 @@ Show snackbar with action
 	:param object args: (*required*) **Message** to show in snackbar and action **button label** in Snackbar (optional)
 	:returns:  ``True`` if User click on Action button, ``False`` if SnackBar auto dismissed after some time
 
-Snackbars provide lightweight feedback about an operation. They show a brief message at the bottom of the screen on mobile and lower left on larger devices. Snackbars appear above all other elements on screen and only one can be displayed at a time.
+Snackbars provide lightweight feedback about an operation. They show a brief
+message at the bottom of the screen on mobile and lower left on larger devices.
+Snackbars appear above all other elements on screen and only one can be
+displayed at a time.
 
 .. code-block:: javascript
 
@@ -112,7 +131,12 @@ Showing notification
 
 	:param object args: **title** (first row) of the notification, **message** (second row) of the notification, in a standard notification.
 
-A notification is a message you can display to the user outside of your application's normal UI. When you tell the system to issue a notification, it first appears as an icon in the notification area. To see the details of the notification, the user opens the notification drawer. Both the notification area and the notification drawer are system-controlled areas that the user can view at any time.
+A notification is a message you can display to the user outside of your
+application's normal UI. When you tell the system to issue a notification, it
+first appears as an icon in the notification area. To see the details of the
+notification, the user opens the notification drawer. Both the notification
+area and the notification drawer are system-controlled areas that the user can
+view at any time.
 
 .. code-block:: javascript
 	
diff --git a/doc/reference/orm.rst b/doc/reference/orm.rst
index 78118d5d63f..876d74f65cc 100644
--- a/doc/reference/orm.rst
+++ b/doc/reference/orm.rst
@@ -910,13 +910,13 @@ and using them:
 
 .. literalinclude:: ../../odoo/addons/test_documentation_examples/tests/test_inheritance.py
     :language: python
-    :lines: 8,12,9,19
+    :lines: 10,11,14,19
 
 will yield:
 
 .. literalinclude:: ../../odoo/addons/test_documentation_examples/tests/test_inheritance.py
     :language: text
-    :lines: 15,22
+    :lines: 16,21
 
 the second model has inherited from the first model's ``check`` method and its
 ``name`` field, but overridden the ``call`` method, as when using standard
@@ -964,19 +964,19 @@ model:
 
 .. literalinclude:: ../../odoo/addons/test_documentation_examples/tests/test_delegation.py
     :language: python
-    :lines: 9-12,21,26
+    :lines: 11-14,23,28
 
 will result in:
 
 .. literalinclude:: ../../odoo/addons/test_documentation_examples/tests/test_delegation.py
     :language: text
-    :lines: 23,28
+    :lines: 25,30
 
 and it's possible to write directly on the delegated field:
 
 .. literalinclude:: ../../odoo/addons/test_documentation_examples/tests/test_delegation.py
     :language: python
-    :lines: 47
+    :lines: 45
 
 .. warning:: when using delegation inheritance, methods are *not* inherited,
              only fields
diff --git a/doc/reference/qweb.rst b/doc/reference/qweb.rst
index f3e6a92e4b6..a806c3fda8f 100644
--- a/doc/reference/qweb.rst
+++ b/doc/reference/qweb.rst
@@ -415,14 +415,16 @@ At a deeper level than the previous helper is the ``render`` method on
 
 .. _reference/qweb/javascript:
 
-API
----
+.. todo:: the members below are no longer relevant, section to rewrite
+
+.. API
+.. ---
 
-It is also possible to use the ``ir.qweb`` model directly (and extend it, and
-inherit from it):
+.. It is also possible to use the ``ir.qweb`` model directly (and extend it, and
+.. inherit from it):
 
-.. automodule:: odoo.addons.base.ir.ir_qweb
-    :members: QWeb, QWebContext, FieldConverter, QwebWidget
+.. .. automodule:: odoo.addons.base.ir.ir_qweb
+..     :members: QWeb, QWebContext, FieldConverter, QwebWidget
 
 Javascript
 ==========
diff --git a/doc/reference/views.rst b/doc/reference/views.rst
index 8ceeaa9750d..74c8188bfab 100644
--- a/doc/reference/views.rst
+++ b/doc/reference/views.rst
@@ -937,7 +937,7 @@ Javascript API
       :returns: an image URL
 
    .. warning::
-   ``kanban_text_ellipsis`` has been removed in Odoo 9. CSS ``text-overflow`` should be used instead.
+      ``kanban_text_ellipsis`` has been removed in Odoo 9. CSS ``text-overflow`` should be used instead.
 
 .. _reference/views/calendar: