[MERGE] forward port branch 9.0 up to cbaecc5cbb8

3 files changed, 60 insertions, 2 deletions

diff --git a/addons/web_editor/static/src/js/summernote.js b/addons/web_editor/static/src/js/summernote.js
index a3e3db42a71..8166d77201e 100644
--- a/addons/web_editor/static/src/js/summernote.js
+++ b/addons/web_editor/static/src/js/summernote.js
@@ -2018,6 +2018,14 @@ eventHandler.modules.editor.currentStyle = function (target) {
         if(r)
             styleInfo.image = r.isOnImg();
     }
+    // Fix when the target is a link: the text-align buttons state should
+    // indicate the alignment of the link in the parent, not the text inside
+    // the link (which is not possible to customize with summernote). Summernote fixed
+    // this in their newest version... by just not showing the active button
+    // for alignments.
+    if (styleInfo.anchor) {
+        styleInfo['text-align'] = $(styleInfo.anchor).parent().css('text-align');
+    }
     return styleInfo;
 }
 
diff --git a/doc/cla/individual/moutio.md b/doc/cla/individual/moutio.md
new file mode 100644
index 00000000000..4a1b5b4b955
--- /dev/null
+++ b/doc/cla/individual/moutio.md
@@ -0,0 +1,9 @@
+Spain, 2018-01-29
+
+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,
+
+Nacho Muñoz nacmuro@gmail.com https://github.com/moutio
diff --git a/doc/reference/module.rst b/doc/reference/module.rst
index aecb8de8a8f..9ec0ef39c93 100644
--- a/doc/reference/module.rst
+++ b/doc/reference/module.rst
@@ -1,5 +1,3 @@
-:banner: banners/module.jpg
-
 =======
 Modules
 =======
@@ -84,6 +82,49 @@ Available manifest fields are:
     to ``auto_install``. When both ``sale`` and ``crm`` are installed, it
     automatically adds CRM campaigns tracking to sale orders without either
     ``sale`` or ``crm`` being aware of one another
+``external_dependencies`` (``dict(key=list(str))``)
+    A dictionary containing python and/or binary dependencies.
+
+    For python dependencies, the ``python`` key must be defined for this
+    dictionary and a list of python modules to be imported should be assigned
+    to it.
+
+    For binary dependencies, the ``bin`` key must be defined for this
+    dictionary and a list of binary executable names should be assigned to it.
+
+    The module won't be installed if either the python module is not installed
+    in the host machine or the binary executable is not found within the
+    host machine's PATH environment variable.
+``application`` (``bool``, default: ``False``)
+    Whether the module should be considered as a fully-fledged application
+    (``True``) or is just a technical module (``False``) that provides some
+    extra functionality to an existing application module.
+``css`` (``list(str)``)
+    Specify css files with custom rules to be imported, these files should be
+    located in ``static/src/css`` inside the module.
+``images`` (``list(str)``)
+    Specify image files to be used by the module.
+``installable`` (``bool`` default: ``False``)
+    Whether a user should be able to install the module from the Web UI or not.
+``maintainer`` (``str``)
+    Person or entity in charge of the maintenance of this module, by default
+    it is assumed that the author is the maintainer.
+``{pre_init, post_init, uninstall}_hook`` (``str``)
+    Hooks for module installation/uninstallation, their value should be a
+    string representing the name of a function defined inside the module's
+    ``__init__.py``.
+
+    ``pre_init_hook`` takes a cursor as its only argument, this function is
+    executed prior to the module's installation.
+
+    ``post_init_hook`` takes a cursor and a registry as its arguments, this
+    function is executed right after the module's installation.
+
+    ``uninstall_hook`` takes a cursor and a registry as its arguments, this
+    function is executed after the module's uninstallation.
+
+    These hooks should only be used when setup/cleanup required for this module
+    is either extremely difficult or impossible through the api.
 
 .. _semantic versioning: http://semver.org
 .. _existing categories: