[MERGE] forward port of branch 8.0 up to d350f5b

doc/_themes/odoodoc/static/app.js

@@ -66,22 +66,25 @@ $(function () {
             .prependTo('.switchable:not(.setup) .highlight');
         $(document).on('click', '.btn-show-setup', function (e) {
             var $target = $(e.target);
-            var target = $target.closest('.switchable:not(.setup)').get(0);
+            var switchable = $target.closest('.switchable:not(.setup)').get(0);
             // not in a switchable (???)
-            if (!target) { return; }
-            var lang = getHighlightLanguage(target);
+            if (!switchable) { return; }
+
+            var lang = getHighlightLanguage(switchable);
             if (!lang) {
                 // switchable without highlight (e.g. language-specific notes),
                 // don't munge
                 return;
             }
 
-            var $setup_code = $target.prev();
-            if ($setup_code.length) {
-                // remove existing setup code
-                $setup_code.remove();
+            var $following_siblings = $target.nextAll();
+            if ($following_siblings.length > 1) {
+                // remove all but the very last following sibling (which
+                // should be the non-setup <pre>)
+                $following_siblings.slice(0, -1).remove();
             } else {
-                $('.setupcode.highlight-' + lang + ' pre').clone().insertBefore($target);
+                // otherwise insert setupcode
+                $('.setupcode.highlight-' + lang + ' pre').clone().insertAfter($target);
             }
         });
     })(); }

doc/cla/corporate/eugeconsulting.md

@@ -0,0 +1,15 @@
+USA, 2015-02-17
+
+EUGE Consulting agrees to the terms of the Odoo Corporate Contributor License
+Agreement v1.0.
+
+I declare that I am authorized and able to make this agreement and sign this
+declaration.
+
+Signed,
+
+E.R. Spada II er@eugeconsulting.com https://github.com/spadae22
+
+List of contributors:
+
+E.R. Spada II er@eugeconsulting.com https://github.com/spadae22

doc/cla/corporate/jamotion.md

@@ -0,0 +1,17 @@
+Switzerland, 19.02.2015
+
+Jamotion GmbH agrees to the terms of the Odoo Corporate Contributor License
+Agreement v1.0.
+
+I declare that I am authorized and able to make this agreement and sign this
+declaration.
+
+Signed,
+
+Renzo Meister, rm@jamotion.ch https://github.com/jamotion
+
+List of contributors:
+
+Renzo Meister, rm@jamotion.ch https://github.com/rm-jamotion
+Patrick Reiser, pr@jamotion.ch https://github.com/prjamo
+Gregor Lazzarato, gl@jamotion.ch https://github.com/gregorlazzarato

doc/cla/individual/vice.md

@@ -0,0 +1,11 @@
+Spain, 2015-02-20
+
+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,
+
+Vicente Jimenez Aguilar googuy@gmail.com https://github.com/vice