diff --git a/doc/_extensions/autojsdoc/README.rst b/doc/_extensions/autojsdoc/README.rst
index c530f1d3..15745a51 100644
--- a/doc/_extensions/autojsdoc/README.rst
+++ b/doc/_extensions/autojsdoc/README.rst
@@ -1,8 +1,8 @@
 :orphan:
 
-======================================
+=========================================
 JSDoc parser/Sphinx extension for Flectra
-======================================
+=========================================
 
 Why?
 ====
diff --git a/doc/_extensions/flectra_ext/layout.html b/doc/_extensions/flectra_ext/layout.html
index 586b6f88..d8c4ce0b 100644
--- a/doc/_extensions/flectra_ext/layout.html
+++ b/doc/_extensions/flectra_ext/layout.html
@@ -48,117 +48,10 @@
 {%- block header -%}
   <header class="o_main_header o_has_sub_nav o_inverted {{ ' '.join(classes) }}">
     <div class="o_main_header_main">
-      <a class="pull-left o_logo" href="/"></a>
-      <a href="#" class="o_mobile_menu_toggle visible-xs-block pull-right">
-        <span class="sr-only">Toggle navigation</span>
-        <span class="mdi-navigation-menu"></span>
-      </a>
-      <div class="o_header_buttons">
-        <a href="http://www.flectra.com/trial" class="btn btn-primary">Start Now</a>
-      </div>
+      <a class="pull-left o_logo" href="https://flectrahq.com"></a>
       <ul class="o_primary_nav">
         <li class="dropdown">
-          <a href="#" class="dropdown-toggle">Apps</a>
-          <div class="dropdown-menu o_secondary_nav">
-            <div class="container">
-              <div class="row">
-                <div class="col-sm-3 o_website_apps">
-                  <div class="o_nav_app_family">
-                    <span></span> Websites
-                    <div>Build great user experience</div>
-                  </div>
-                  <ul>
-                    <li><a href="https://www.flectra.com/page/website-builder">Website Builder</a></li>
-                    <li><a href="https://www.flectra.com/page/e-commerce">eCommerce</a></li>
-                    <li><a href="https://www.flectra.com/page/blog-engine">Blogs</a></li>
-                    <li><a href="https://www.flectra.com/page/community-builder">Forums</a></li>
-                    <li><a href="https://www.flectra.com/page/slides">Slides</a></li>
-                    <li><a href="https://adspike.flectra.com">SEA</a></li>
-                  </ul>
-                </div>
-                <div class="col-sm-3 o_sale_apps">
-                  <div class="o_nav_app_family">
-                    <span></span> Sales
-                    <div>Boost your success rate</div>
-                  </div>
-                  <ul>
-                    <li><a href="https://www.flectra.com/page/sales">Sales</a></li>
-                    <li><a href="https://www.flectra.com/page/crm">CRM</a></li>
-                    <li><a href="https://www.flectra.com/page/billing">Invoicing</a></li>
-                    <li class="dropdown">
-                      <a href="#0" class="dropdown-toggle">Point of Sale</a>
-                      <ul>
-                        <li><a href="https://www.flectra.com/page/point-of-sale">Shops</a></li>
-                        <li><a href="https://www.flectra.com/page/pos-restaurant">Restaurants</a></li>
-                      </ul>
-                    </li>
-                    <li><a href="https://www.flectra.com/page/subscriptions">Subscriptions</a></li>
-                    <li><a href="https://www.flectra.com/page/sign">Sign</a></li>
-                  </ul>
-                </div>
-                <div class="col-sm-3 o_operation_apps">
-                  <div class="o_nav_app_family">
-                    <span></span> Operations
-                    <div>It's all about efficiency</div>
-                  </div>
-                  <ul>
-                    <li><a href="https://www.flectra.com/page/accounting/">Accounting</a></li>
-                    <li><a href="https://www.flectra.com/page/project-management/">Project</a></li>
-                    <li class="dropdown">
-                      <a href="#0" class="dropdown-toggle">Human Resources</a>
-                      <ul>
-                        <li><a href="https://www.flectra.com/page/recruitment">Recruitment</a></li>
-                        <li><a href="https://www.flectra.com/page/employees">Employees</a></li>
-                        <li><a href="https://www.flectra.com/page/expenses">Expenses</a></li>
-                        <li><a href="https://www.flectra.com/page/appraisal">Appraisal</a></li>
-                        <li><a href="https://www.flectra.com/page/fleet">Fleet</a></li>
-                        <li><a href="https://www.flectra.com/page/leaves">Leaves</a></li>
-                      </ul>
-                    </li>
-                    <li><a href="https://www.flectra.com/page/warehouse">Inventory</a></li>
-                    <li><a href="https://www.flectra.com/page/purchase">Purchase</a></li>
-                    <li class="dropdown">
-                      <a href="#0" class="dropdown-toggle">Manufacturing</a>
-                      <ul>
-                        <li><a href="https://www.flectra.com/page/manufacturing">MRP</a></li>
-                        <li><a href="https://www.flectra.com/page/plm">PLM</a></li>
-                        <li><a href="https://www.flectra.com/page/maintenance">Maintenance</a></li>
-                        <li><a href="https://www.flectra.com/page/quality">Quality</a></li>
-                      </ul>
-                    </li>
-                  </ul>
-                </div>
-                <div class="col-sm-3 o_productivity_apps">
-                  <div class="o_nav_app_family">
-                    <span></span> Productivity Tools
-                    <div>Great Tools = Happy People</div>
-                  </div>
-                  <ul>
-                    <li class="dropdown">
-                      <a href="#0" class="dropdown-toggle">Communication</a>
-                      <ul>
-                        <li><a href="https://www.flectra.com/page/discuss">Discuss</a></li>
-                        <li><a href="https://www.flectra.com/page/discuss-groups">Mailing Lists</a></li>
-                        <li><a href="https://www.flectra.com/page/notes">Notes</a></li>
-                        <li><a href="#">Help desk</a></li>
-                        <li><a href="#">Appointment</a></li>
-                      </ul>
-                    </li>
-                    <li><a href="https://www.flectra.com/page/timesheet">Timesheet</a></li>
-                    <li><a href="https://www.flectra.com/page/email-marketing">Email Marketing</a></li>
-                    <li><a href="https://www.flectra.com/page/events">Events</a></li>
-                    <li><a href="https://www.flectra.com/page/survey">Survey</a></li>
-                    <li><a href="https://www.flectra.com/page/live-chat">Live Chat</a></li>
-                  </ul>
-                </div>
-              </div>
-            </div>
-            <a href="http://www.flectra.com/apps/modules" class="o_store_link"><i class="fa fa-cube fa-fw"></i> Third party apps</a>
-          </div>
         </li>
-        <li><a href="https://www.flectra.com/page/tour">Tour</a></li>
-        <li><a href="https://www.flectra.com/pricing">Pricing</a></li>
-        <li><a href="https://www.flectra.com/page/docs">Docs</a></li>
       </ul>
     </div>
     <nav class="navbar o_sub_nav">
@@ -177,10 +70,6 @@
               {% endblock %}
           </ol>
 
-          <div class="call-to-action navbar-right hidden-xs">
-            <a href="http://www.flectra.com/trial" class="btn btn-primary">Start Now</a>
-          </div>
-
           <ul class="navbar-nav navbar-right nav o_sub_nav_actions">
             {% if pagename != master_doc %}
               <li class="divider"></li>
@@ -196,10 +85,6 @@
               <li class="divider"></li>
             {% endif %}
 
-            {% block sub_menu_desktop %}
-            {% include "sub-menu_list.html" %}
-            {% endblock %}
-
             {% if languages or versions %}
               <li class="divider"></li>
             {% endif %}
@@ -236,7 +121,7 @@
               {{ toc }}
               {% if github_link %}
               <p class="gith-container"><a href="{{ github_link(mode='edit') }}" class="gith-link">
-                  Edit on GitHub
+                  Edit on GitLab
               </a></p>
               {% endif %}
             </div>
@@ -276,42 +161,17 @@
             <div class="col-xs-6 col-sm-4">
               <span class="menu_title">Community</span>
               <ul>
-                <li><a href="https://github.com/flectra/flectra">Github</a></li>
-                <li><a href="http://www.flectra.com/page/download">Download</a></li>
+                <li><a href="https://gitlab.com/flectra-hq/flectra">GitLab
+                </a></li>
+                <li><a href="https://flectrahq.com/download">Download</a></li>
                 <li class="divider"></li>
-                <li><a href="http://runbot.flectra.com/runbot/repo/git-github-com-flectra-enterprise-7">Runbot</a></li>
-                <li><a href="https://github.com/flectra/flectra/wiki/Translations">Translations</a></li>
-                <li class="divider"></li>
-                <li><a href="http://www.flectra.com/page/flectra-community">Mailing Lists</a></li>
-                <li><a href="http://www.flectra.com/forum/help-1">Forum</a></li>
               </ul>
             </div>
             <div class="col-xs-6 col-sm-4">
-              <span class="menu_title">Services</span>
-              <ul>
-                <li><a href="http://www.flectra.com/pricing">Editions</a></li>
-                <li><a href="http://www.flectra.com/pricing-online">Cloud Pricing</a></li>
-                <li><a href="http://www.flectra.com/page/upgrade">Upgrade</a></li>
-                <li class="divider"></li>
-                <li><a href="http://www.flectra.com/partners">Find a partner</a></li>
-                <li><a href="http://www.flectra.com/page/become-a-partner">Become a partner</a></li>
-                <li class="divider"></li>
-                <li><a href="http://www.flectra.com/page/education-program">Education</a></li>
-                <li class="divider"></li>
-                <li><a href="http://www.flectra.com/page/security">Security</a></li>
-              </ul>
-            </div>
-            <div class="col-sm-4 mb64">
               <span class="menu_title">About us</span>
               <ul>
-                <li><a href="http://www.flectra.com/page/about-us">Our company</a></li>
-                <li><a href="http://www.flectra.com/page/contactus">Contact</a></li>
+                <li><a href="https://flectrahq.com/contactus">Contact</a></li>
                 <li class="divider" />
-                <li><a href="http://www.flectra.com/event">Events</a></li>
-                <li><a href="http://www.flectra.com/blog/">Blog</a></li>
-                <li><a href="http://www.flectra.com/blog/6">Customers</a></li>
-                <li class="divider" />
-                <li><a href="http://www.flectra.com/jobs">Jobs</a></li>
               </ul>
             </div>
           </div>
@@ -329,11 +189,9 @@
     </div>
     <div class="o_footer_bottom">
       <div class="container">
-        <a class="small" href="http://www.flectra.com/page/website-builder">Website made with <span class="o_logo o_logo_inverse o_logo_15"></span></a>
         <div class="social-links pull-right">
-          <a href="http://www.flectra.com/web/about/facebook"><i class="fa fa-facebook"></i></a>
-          <a href="http://www.flectra.com/web/about/twitter"><i class="fa fa-twitter"></i></a>
-          <a href="http://www.flectra.com/web/about/linkedin"><i class="fa fa-linkedin"></i></a>
+          <a href="https://www.facebook.com/flectrahq"><i class="fa fa-facebook"></i></a>
+          <a href="https://twitter.com/flectrahq"><i class="fa fa-twitter"></i></a>
           <a href="mailto:info@flectra.com"><i class="fa fa-envelope"></i></a>
         </div>
       </div>
diff --git a/doc/_extensions/flectra_ext/static/img/flectra_logo_rgb.png b/doc/_extensions/flectra_ext/static/img/flectra_logo_rgb.png
new file mode 100644
index 00000000..5d7b311b
Binary files /dev/null and b/doc/_extensions/flectra_ext/static/img/flectra_logo_rgb.png differ
diff --git a/doc/_extensions/flectra_ext/static/img/flectra_logo_white.png b/doc/_extensions/flectra_ext/static/img/flectra_logo_white.png
new file mode 100644
index 00000000..5d7b311b
Binary files /dev/null and b/doc/_extensions/flectra_ext/static/img/flectra_logo_white.png differ
diff --git a/doc/_extensions/flectra_ext/static/img/logos/flectra_logo.png b/doc/_extensions/flectra_ext/static/img/logos/flectra_logo.png
new file mode 100644
index 00000000..5d7b311b
Binary files /dev/null and b/doc/_extensions/flectra_ext/static/img/logos/flectra_logo.png differ
diff --git a/doc/_extensions/flectra_ext/static/img/logos/flectra_logo.svg b/doc/_extensions/flectra_ext/static/img/logos/flectra_logo.svg
new file mode 100644
index 00000000..ed4cb9b5
--- /dev/null
+++ b/doc/_extensions/flectra_ext/static/img/logos/flectra_logo.svg
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="800px" height="350px" viewBox="0 0 800 350" style="enable-background:new 0 0 800 350;" xml:space="preserve">
+<rect style="display:none;" width="800" height="350"/>
+<g>
+	<g>
+		<path style="fill-rule:evenodd;clip-rule:evenodd;fill:#FFFFFF;" d="M135.55,163.083c0,0,7.69,26.345,33.097,44.28h111.345
+			c0,0-3.195-20.385,0.767-44.287L135.55,163.083z"/>
+		<path style="fill-rule:evenodd;clip-rule:evenodd;fill:#FFFFFF;" d="M228.436,101.231c5.857-14.035,34.104-44.08,75.541-26.84
+			l63.472-0.164L319.41,84.862c0,0-25.254,25.398-34.652,60.649H81.103c0,0-22.948-14.831-33.319-44.281H228.436L228.436,101.231z
+			 M289.486,82.889c-2.597,0-4.702,2.106-4.702,4.705c0,2.598,2.105,4.704,4.702,4.704c2.596,0,4.701-2.106,4.701-4.704
+			C294.188,84.995,292.083,82.889,289.486,82.889z"/>
+		<path style="fill-rule:evenodd;clip-rule:evenodd;fill:#FFFFFF;" d="M223.241,225.077l60.127-0.031
+			c5.785,22.587,15.106,37.899,19.125,44.437C294.204,269.464,251.567,268.697,223.241,225.077z"/>
+	</g>
+	<g>
+		<path style="fill:#FFFFFF;" d="M327.853,143.301h57.971c1.329,0,2.465,0.474,3.412,1.42c0.946,0.947,1.419,2.084,1.419,3.414
+			c0,1.329-0.474,2.468-1.419,3.414c-0.946,0.947-2.083,1.42-3.412,1.42h-53.14v33.836h38.647c1.329,0,2.465,0.474,3.412,1.42
+			c0.946,0.946,1.419,2.084,1.419,3.414c0,1.329-0.474,2.468-1.419,3.413c-0.946,0.947-2.083,1.42-3.412,1.42h-38.647v38.67
+			c0,1.329-0.474,2.468-1.419,3.414c-0.946,0.947-2.083,1.42-3.412,1.42c-1.328,0-2.466-0.473-3.412-1.42
+			c-0.946-0.946-1.419-2.085-1.419-3.414v-87.007c0-1.33,0.473-2.467,1.419-3.414C325.387,143.775,326.525,143.301,327.853,143.301z
+			"/>
+		<path style="fill:#FFFFFF;" d="M400.316,148.135c0-1.33,0.473-2.467,1.419-3.414c0.945-0.946,2.083-1.42,3.412-1.42
+			c1.328,0,2.465,0.474,3.411,1.42c0.945,0.947,1.419,2.084,1.419,3.414v82.174h4.831c1.329,0,2.466,0.474,3.412,1.42
+			c0.945,0.946,1.419,2.084,1.419,3.413s-0.474,2.468-1.419,3.414c-0.946,0.947-2.083,1.42-3.412,1.42h-9.661
+			c-1.329,0-2.467-0.473-3.412-1.42c-0.946-0.946-1.419-2.085-1.419-3.414V148.135z"/>
+		<path style="fill:#FFFFFF;" d="M481.717,223.541c1.328,0,2.465,0.474,3.412,1.42c0.945,0.947,1.419,2.084,1.419,3.414
+			c0,1.329-0.464,2.477-1.39,3.443c-6.24,5.438-13.586,8.157-22.04,8.157c-9.341,0-17.312-3.303-23.913-9.909
+			c-6.603-6.605-9.903-14.581-9.903-23.927c0-9.345,3.301-17.32,9.903-23.927c6.602-6.606,14.572-9.91,23.913-9.91
+			c9.339,0,17.31,3.304,23.912,9.91c6.603,6.606,9.903,14.582,9.903,23.927c0,1.329-0.474,2.468-1.419,3.414
+			c-0.946,0.946-2.083,1.42-3.411,1.42h-52.718c0.886,4.632,3.1,8.721,6.643,12.266c4.71,4.713,10.406,7.069,17.09,7.069
+			c6.038,0,11.231-1.913,15.579-5.74C479.582,223.884,480.589,223.541,481.717,223.541z M486.85,201.306
+			c-0.886-4.632-3.101-8.721-6.643-12.266c-4.71-4.713-10.407-7.069-17.089-7.069c-6.684,0-12.38,2.356-17.09,7.069
+			c-3.543,3.545-5.757,7.634-6.643,12.266H486.85z"/>
+		<path style="fill:#FFFFFF;" d="M559.132,223.42c1.328,0,2.465,0.474,3.411,1.42c0.945,0.947,1.419,2.085,1.419,3.414
+			s-0.504,2.518-1.51,3.564c-6.24,5.438-13.586,8.157-22.04,8.157c-9.341,0-17.312-3.303-23.913-9.909
+			c-6.603-6.605-9.903-14.581-9.903-23.927c0-9.345,3.301-17.32,9.903-23.927c6.602-6.606,14.572-9.91,23.913-9.91
+			c8.454,0,15.8,2.719,22.04,8.157c1.127,1.008,1.691,2.257,1.691,3.746c0,1.33-0.474,2.468-1.419,3.414
+			c-0.946,0.947-2.084,1.42-3.412,1.42c-1.168,0-2.194-0.362-3.08-1.088c-4.509-3.987-9.782-5.981-15.82-5.981
+			c-6.684,0-12.38,2.356-17.09,7.069s-7.065,10.413-7.065,17.1s2.355,12.387,7.065,17.1s10.406,7.069,17.09,7.069
+			c6.038,0,11.292-1.974,15.761-5.922C557.018,223.743,558.004,223.42,559.132,223.42z"/>
+		<path style="fill:#FFFFFF;" d="M608.045,230.309c1.328,0,2.465,0.474,3.411,1.42c0.945,0.946,1.419,2.084,1.419,3.413
+			s-0.474,2.468-1.419,3.414c-0.946,0.947-2.083,1.42-3.411,1.42c-16.104,0-24.155-8.056-24.155-24.169v-33.836h-4.83
+			c-1.329,0-2.467-0.473-3.412-1.42c-0.946-0.946-1.419-2.084-1.419-3.414c0-1.329,0.473-2.467,1.419-3.414
+			c0.945-0.946,2.083-1.42,3.412-1.42h4.83v-24.168c0-1.33,0.474-2.467,1.42-3.414c0.945-0.946,2.083-1.42,3.411-1.42
+			c1.329,0,2.466,0.474,3.412,1.42c0.945,0.947,1.419,2.084,1.419,3.414v24.168h9.723c1.328,0,2.465,0.474,3.411,1.42
+			c0.945,0.947,1.419,2.084,1.419,3.414c0,1.33-0.474,2.468-1.419,3.414c-0.946,0.947-2.083,1.42-3.411,1.42h-9.723v33.836
+			C593.552,225.475,598.383,230.309,608.045,230.309z"/>
+		<path style="fill:#FFFFFF;" d="M622.537,177.137c0-1.329,0.473-2.467,1.419-3.414c0.945-0.946,2.083-1.42,3.412-1.42
+			c1.328,0,2.465,0.474,3.411,1.42c0.945,0.947,1.419,2.084,1.419,3.414v5.317c6.764-6.767,14.814-10.151,24.155-10.151
+			c4.71,0,9.037,0.806,12.982,2.417c0.725,0.282,1.389,0.705,1.993,1.269c0.926,0.966,1.389,2.114,1.389,3.443
+			c0,1.33-0.474,2.469-1.419,3.414c-0.946,0.947-2.084,1.42-3.412,1.42c-0.765,0-1.47-0.16-2.113-0.483
+			c-2.859-1.208-5.999-1.813-9.42-1.813c-6.684,0-12.38,2.356-17.09,7.069s-7.065,10.413-7.065,17.1v29.002
+			c0,1.329-0.474,2.468-1.419,3.414c-0.946,0.947-2.083,1.42-3.411,1.42c-1.329,0-2.467-0.473-3.412-1.42
+			c-0.946-0.946-1.419-2.085-1.419-3.414V177.137z"/>
+		<path style="fill:#FFFFFF;" d="M738.479,229.825c-6.764,6.767-14.815,10.15-24.154,10.15c-9.341,0-17.312-3.303-23.913-9.909
+			c-6.603-6.605-9.903-14.581-9.903-23.927c0-9.345,3.301-17.32,9.903-23.927c6.602-6.606,14.572-9.91,23.913-9.91
+			c9.339,0,17.31,3.304,23.912,9.91c6.603,6.606,9.903,14.582,9.903,23.927v29.002c0,1.329-0.474,2.468-1.419,3.414
+			c-0.946,0.947-2.083,1.42-3.411,1.42c-1.329,0-2.467-0.473-3.412-1.42c-0.946-0.946-1.419-2.085-1.419-3.414V229.825z
+			 M714.324,181.971c-6.684,0-12.38,2.356-17.09,7.069s-7.065,10.413-7.065,17.1s2.355,12.387,7.065,17.1s10.406,7.069,17.09,7.069
+			c6.682,0,12.379-2.356,17.089-7.069s7.065-10.413,7.065-17.1s-2.355-12.387-7.065-17.1S721.006,181.971,714.324,181.971z"/>
+	</g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+</svg>
diff --git a/doc/_extensions/flectra_ext/static/img/logos/odoo_logo.png b/doc/_extensions/flectra_ext/static/img/logos/odoo_logo.png
deleted file mode 100644
index 55b03ae3..00000000
Binary files a/doc/_extensions/flectra_ext/static/img/logos/odoo_logo.png and /dev/null differ
diff --git a/doc/_extensions/flectra_ext/static/img/logos/odoo_logo.svg b/doc/_extensions/flectra_ext/static/img/logos/odoo_logo.svg
deleted file mode 100644
index e03ecba5..00000000
--- a/doc/_extensions/flectra_ext/static/img/logos/odoo_logo.svg
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="1254px" height="200px" viewBox="0 0 1254 200" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
-    <title>flectra_logo</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
-        <g id="flectra_logo" sketch:type="MSArtboardGroup">
-            <g id="flectra_logo_rgb" sketch:type="MSLayerGroup" transform="translate(0.000000, 1.000000)">
-                <path d="M550.5,198.865327 C592.197499,198.865327 626,165.062825 626,123.365327 C626,81.667828 592.197499,47.8653266 550.5,47.8653266 C508.802501,47.8653266 475,81.667828 475,123.365327 C475,165.062825 508.802501,198.865327 550.5,198.865327 Z M550.5,167.865327 C575.076671,167.865327 595,147.941998 595,123.365327 C595,98.7886553 575.076671,78.8653266 550.5,78.8653266 C525.923329,78.8653266 506,98.7886553 506,123.365327 C506,147.941998 525.923329,167.865327 550.5,167.865327 Z" id="Oval-3" fill="#888888" sketch:type="MSShapeGroup"></path>
-                <path d="M390.5,198.865327 C432.197499,198.865327 466,165.062825 466,123.365327 C466,81.667828 432.197499,47.8653266 390.5,47.8653266 C348.802501,47.8653266 315,81.667828 315,123.365327 C315,165.062825 348.802501,198.865327 390.5,198.865327 Z M390.5,167.865327 C415.076671,167.865327 435,147.941998 435,123.365327 C435,98.7886553 415.076671,78.8653266 390.5,78.8653266 C365.923329,78.8653266 346,98.7886553 346,123.365327 C346,147.941998 365.923329,167.865327 390.5,167.865327 Z" id="Oval-2" fill="#888888" sketch:type="MSShapeGroup"></path>
-                <g id="D" transform="translate(157.000000, 0.000000)" fill="#888888" sketch:type="MSShapeGroup">
-                    <g id="d-+-Rectangle-1">
-                        <path d="M151.130367,122.770274 C151.131897,122.968444 151.132663,123.166796 151.132663,123.365327 C151.132663,165.062825 117.330162,198.865327 75.6326633,198.865327 C33.9351647,198.865327 0.132663317,165.062825 0.132663317,123.365327 C0.132663317,81.667828 33.9351647,47.8653266 75.6326633,47.8653266 C92.7270283,47.8653266 108.494494,53.5464573 121.149994,63.1236518 L121.149994,15.0040777 C121.149994,6.71755439 127.863901,0 136.149994,0 C144.434265,0 151.149994,6.72381102 151.149994,15.0040777 L151.149994,121.995922 C151.149994,122.255634 151.143399,122.513804 151.130367,122.770274 L151.130367,122.770274 Z M75.6326633,167.865327 C100.209335,167.865327 120.132663,147.941998 120.132663,123.365327 C120.132663,98.7886553 100.209335,78.8653266 75.6326633,78.8653266 C51.055992,78.8653266 31.1326633,98.7886553 31.1326633,123.365327 C31.1326633,147.941998 51.055992,167.865327 75.6326633,167.865327 Z" id="d"></path>
-                    </g>
-                </g>
-                <path d="M76.1924623,198.697487 C117.889961,198.697487 151.692462,164.894986 151.692462,123.197487 C151.692462,81.4999888 117.889961,47.6974874 76.1924623,47.6974874 C34.4949637,47.6974874 0.692462312,81.4999888 0.692462312,123.197487 C0.692462312,164.894986 34.4949637,198.697487 76.1924623,198.697487 Z M75.5,168 C100.076671,168 120,148.076671 120,123.5 C120,98.9233286 100.076671,79 75.5,79 C50.9233286,79 31,98.9233286 31,123.5 C31,148.076671 50.9233286,168 75.5,168 Z" id="Oval-1" fill="#9C5789" sketch:type="MSShapeGroup"></path>
-            </g>
-            <g id="flectra_logo_white" sketch:type="MSLayerGroup" transform="translate(627.000000, 1.000000)" fill="#FFFFFF">
-                <path d="M550.5,198.865327 C592.197499,198.865327 626,165.062825 626,123.365327 C626,81.667828 592.197499,47.8653266 550.5,47.8653266 C508.802501,47.8653266 475,81.667828 475,123.365327 C475,165.062825 508.802501,198.865327 550.5,198.865327 Z M550.5,167.865327 C575.076671,167.865327 595,147.941998 595,123.365327 C595,98.7886553 575.076671,78.8653266 550.5,78.8653266 C525.923329,78.8653266 506,98.7886553 506,123.365327 C506,147.941998 525.923329,167.865327 550.5,167.865327 Z" id="Oval-3" sketch:type="MSShapeGroup"></path>
-                <path d="M390.5,198.865327 C432.197499,198.865327 466,165.062825 466,123.365327 C466,81.667828 432.197499,47.8653266 390.5,47.8653266 C348.802501,47.8653266 315,81.667828 315,123.365327 C315,165.062825 348.802501,198.865327 390.5,198.865327 Z M390.5,167.865327 C415.076671,167.865327 435,147.941998 435,123.365327 C435,98.7886553 415.076671,78.8653266 390.5,78.8653266 C365.923329,78.8653266 346,98.7886553 346,123.365327 C346,147.941998 365.923329,167.865327 390.5,167.865327 Z" id="Oval-2" sketch:type="MSShapeGroup"></path>
-                <g id="D" transform="translate(157.000000, 0.000000)" sketch:type="MSShapeGroup">
-                    <g id="d-+-Rectangle-1">
-                        <path d="M151.130367,122.770274 C151.131897,122.968444 151.132663,123.166796 151.132663,123.365327 C151.132663,165.062825 117.330162,198.865327 75.6326633,198.865327 C33.9351647,198.865327 0.132663317,165.062825 0.132663317,123.365327 C0.132663317,81.667828 33.9351647,47.8653266 75.6326633,47.8653266 C92.7270283,47.8653266 108.494494,53.5464573 121.149994,63.1236518 L121.149994,15.0040777 C121.149994,6.71755439 127.863901,0 136.149994,0 C144.434265,0 151.149994,6.72381102 151.149994,15.0040777 L151.149994,121.995922 C151.149994,122.255634 151.143399,122.513804 151.130367,122.770274 L151.130367,122.770274 Z M75.6326633,167.865327 C100.209335,167.865327 120.132663,147.941998 120.132663,123.365327 C120.132663,98.7886553 100.209335,78.8653266 75.6326633,78.8653266 C51.055992,78.8653266 31.1326633,98.7886553 31.1326633,123.365327 C31.1326633,147.941998 51.055992,167.865327 75.6326633,167.865327 Z" id="d"></path>
-                    </g>
-                </g>
-                <path d="M76.1924623,198.697487 C117.889961,198.697487 151.692462,164.894986 151.692462,123.197487 C151.692462,81.4999888 117.889961,47.6974874 76.1924623,47.6974874 C34.4949637,47.6974874 0.692462312,81.4999888 0.692462312,123.197487 C0.692462312,164.894986 34.4949637,198.697487 76.1924623,198.697487 Z M75.5,168 C100.076671,168 120,148.076671 120,123.5 C120,98.9233286 100.076671,79 75.5,79 C50.9233286,79 31,98.9233286 31,123.5 C31,148.076671 50.9233286,168 75.5,168 Z" id="Oval-1" sketch:type="MSShapeGroup"></path>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/doc/_extensions/flectra_ext/static/img/logos/odoo_logo_small.png b/doc/_extensions/flectra_ext/static/img/logos/odoo_logo_small.png
deleted file mode 100644
index 49ff16ac..00000000
Binary files a/doc/_extensions/flectra_ext/static/img/logos/odoo_logo_small.png and /dev/null differ
diff --git a/doc/_extensions/flectra_ext/static/img/odoo_logo_rgb.png b/doc/_extensions/flectra_ext/static/img/odoo_logo_rgb.png
deleted file mode 100644
index 1776dbd0..00000000
Binary files a/doc/_extensions/flectra_ext/static/img/odoo_logo_rgb.png and /dev/null differ
diff --git a/doc/_extensions/flectra_ext/static/img/odoo_logo_white.png b/doc/_extensions/flectra_ext/static/img/odoo_logo_white.png
deleted file mode 100644
index 528d485f..00000000
Binary files a/doc/_extensions/flectra_ext/static/img/odoo_logo_white.png and /dev/null differ
diff --git a/doc/_extensions/flectra_ext/static/style.css b/doc/_extensions/flectra_ext/static/style.css
index 65bc09e9..f2f617f4 100644
--- a/doc/_extensions/flectra_ext/static/style.css
+++ b/doc/_extensions/flectra_ext/static/style.css
@@ -10286,9 +10286,12 @@ main.index .card figcaption {
   color: #273239;
 }
 .o_main_header > .o_main_header_main .o_logo {
-  margin: 15px 0;
-  width: 63px;
-  height: 20px;
+  //margin: 15px 0;
+ // width: 63px;
+  //height: 20px;
+  margin: 5px 0;
+    width: 7%;
+    height: 75%;
   background-size: cover;
 }
 .o_main_header > .o_main_header_main > .o_primary_nav {
diff --git a/doc/_extensions/flectra_ext/sub-menu_list.html b/doc/_extensions/flectra_ext/sub-menu_list.html
deleted file mode 100644
index fa9b05ba..00000000
--- a/doc/_extensions/flectra_ext/sub-menu_list.html
+++ /dev/null
@@ -1,9 +0,0 @@
-{# note: if flectra.com/page/docs sub-menu's structure change, these links have to change as well #}
-
-<li><a href="https://www.flectra.com/documentation/user/11.0/index.html">User</a></li>
-<li><a href="https://www.flectra.com/documentation/11.0/index.html">Developer</a></li>
-<li><a href="https://training.flectra.com/">Training center</a></li>
-<li><a href="https://www.flectra.com/documentation/11.0/webservices/flectra.html">API</a></li>
-<li><a href="https://www.flectra.com/documentation/11.0/setup/install.html">Installation</a></li>
-<li><a href="https://www.flectra.com/page/flectra-white-paper">White Papers</a></li>
-<li><a href="https://www.flectra.com/page/legal">Legal</a></li>
diff --git a/doc/_extensions/github_link.py b/doc/_extensions/github_link.py
index 6b8cc756..3db1b6fe 100644
--- a/doc/_extensions/github_link.py
+++ b/doc/_extensions/github_link.py
@@ -86,7 +86,7 @@ def make_github_link(app, path, line=None, mode="blob"):
     )
     return urls.url_unparse((
         'https',
-        'github.com',
+        'gitlab.com',
         urlpath,
         '',
         '' if line is None else 'L%d' % line
diff --git a/doc/_static/pull-request-version.png b/doc/_static/pull-request-version.png
deleted file mode 100644
index dd45388d..00000000
Binary files a/doc/_static/pull-request-version.png and /dev/null differ
diff --git a/doc/howtos/backend.rst b/doc/howtos/backend.rst
index 6d285e93..16624d80 100644
--- a/doc/howtos/backend.rst
+++ b/doc/howtos/backend.rst
@@ -11,7 +11,7 @@ Building a Module
     This tutorial requires :ref:`having installed Flectra <setup/install>`
 
 Start/Stop the Flectra server
-==========================
+=============================
 
 Flectra uses a client/server architecture in which clients are web browsers
 accessing the Flectra server via RPC.
@@ -32,7 +32,7 @@ The server is stopped by hitting ``Ctrl-C`` twice from the terminal, or by
 killing the corresponding OS process.
 
 Build an Flectra module
-====================
+=======================
 
 Both server and client extensions are packaged as *modules* which are
 optionally loaded in a *database*.
@@ -80,7 +80,7 @@ An Flectra module is declared by its :ref:`manifest <reference/module/manifest>`
 See the :ref:`manifest documentation <reference/module/manifest>` about it.
 
 A module is also a
-`Python package <http://docs.python.org/2/tutorial/modules.html#packages>`_
+`Python package <http://docs.python.org/3/tutorial/modules.html#packages>`_
 with a ``__init__.py`` file, containing import instructions for various Python
 files in the module.
 
@@ -1122,8 +1122,7 @@ Gantt
 
 .. warning::
 
-    The gantt view requires the web_gantt module which is present in
-    :ref:`the enterprise edition <setup/install/editions>` version.
+    The gantt view requires the web_gantt module.
 
 Horizontal bar charts typically used to show project planning and advancement,
 their root element is ``<gantt>``.
diff --git a/doc/howtos/backend/exercise-access-rights b/doc/howtos/backend/exercise-access-rights
index 465dffea..620d711c 100644
--- a/doc/howtos/backend/exercise-access-rights
+++ b/doc/howtos/backend/exercise-access-rights
@@ -31,10 +31,10 @@ Index: addons/openacademy/security/security.xml
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
 +++ addons/openacademy/security/security.xml	2014-08-26 17:26:18.135783102 +0200
 @@ -0,0 +1,7 @@
-+<odoo>
++<flectra>
 +
 +        <record id="group_manager" model="res.groups">
 +            <field name="name">OpenAcademy / Manager</field>
 +        </record>
 +
-+</odoo>
++</flectra>
diff --git a/doc/howtos/backend/exercise-access-rules b/doc/howtos/backend/exercise-access-rules
index d6290dfd..0509fa79 100644
--- a/doc/howtos/backend/exercise-access-rules
+++ b/doc/howtos/backend/exercise-access-rules
@@ -24,4 +24,4 @@ Index: addons/openacademy/security/security.xml
 +            </field>
 +        </record>
  
- </odoo>
+ </flectra>
diff --git a/doc/howtos/backend/exercise-basic-action b/doc/howtos/backend/exercise-basic-action
index 537554b6..cfa32ec2 100644
--- a/doc/howtos/backend/exercise-basic-action
+++ b/doc/howtos/backend/exercise-basic-action
@@ -18,7 +18,7 @@ Index: addons/openacademy/views/openacademy.xml
 +++ addons/openacademy/views/openacademy.xml	2014-08-26 17:25:53.511783468 +0200
 @@ -0,0 +1,35 @@
 +<?xml version="1.0" encoding="UTF-8"?>
-+<odoo>
++<flectra>
 +
 +        <!-- window action -->
 +        <!--
@@ -51,4 +51,4 @@ Index: addons/openacademy/views/openacademy.xml
 +             action="openacademy.course_list_action"
 +             It is not required when it is the same module -->
 +
-+</odoo>
++</flectra>
diff --git a/doc/howtos/backend/exercise-calendar b/doc/howtos/backend/exercise-calendar
index f63422c9..e4408c8b 100644
--- a/doc/howtos/backend/exercise-calendar
+++ b/doc/howtos/backend/exercise-calendar
@@ -9,7 +9,7 @@ diff --git a/openacademy/models.py b/openacademy/models.py
  # -*- coding: utf-8 -*-
  
 +from datetime import timedelta
- from odoo import models, fields, api, exceptions
+ from flectra import models, fields, api, exceptions
  
  class Course(models.Model):
 @@ -55,6 +56,8 @@ class Session(models.Model):
diff --git a/doc/howtos/backend/exercise-constraint-python b/doc/howtos/backend/exercise-constraint-python
index 144a64e0..c934a110 100644
--- a/doc/howtos/backend/exercise-constraint-python
+++ b/doc/howtos/backend/exercise-constraint-python
@@ -8,8 +8,8 @@ diff --git a/openacademy/models.py b/openacademy/models.py
 @@ -1,6 +1,6 @@
  # -*- coding: utf-8 -*-
  
--from odoo import models, fields, api
-+from odoo import models, fields, api, exceptions
+-from flectra import models, fields, api
++from flectra import models, fields, api, exceptions
  
  class Course(models.Model):
      _name = 'openacademy.course'
diff --git a/doc/howtos/backend/exercise-creation b/doc/howtos/backend/exercise-creation
index a6ffeda8..57ac7128 100644
--- a/doc/howtos/backend/exercise-creation
+++ b/doc/howtos/backend/exercise-creation
@@ -22,7 +22,7 @@ Index: addons/openacademy/__manifest__.py
 +    'website': "http://www.yourcompany.com",
 +
 +    # Categories can be used to filter modules in modules listing
-+    # Check https://github.com/odoo/odoo/blob/master/odoo/addons/base/module/module_data.xml
++    # Check https://gitlab.com/flectra-hq/flectra/blob/master/flectra-hq/flectra/addons/base/module/module_data.xml
 +    # for the full list
 +    'category': 'Test',
 +    'version': '0.1',
@@ -54,7 +54,7 @@ Index: addons/openacademy/controllers.py
 +++ addons/openacademy/controllers.py	2014-08-26 17:25:49.791783523 +0200
 @@ -0,0 +1,20 @@
 +# -*- coding: utf-8 -*-
-+from odoo import http
++from flectra import http
 +
 +# class Openacademy(http.Controller):
 +#     @http.route('/openacademy/openacademy/', auth='public')
@@ -78,7 +78,7 @@ Index: addons/openacademy/demo.xml
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
 +++ addons/openacademy/demo.xml	2014-08-26 17:25:49.791783523 +0200
 @@ -0,0 +1,25 @@
-+<odoo>
++<flectra>
 +
 +        <!--  -->
 +        <!--   <record id="object0" model="openacademy.openacademy"> -->
@@ -102,7 +102,7 @@ Index: addons/openacademy/demo.xml
 +        <!--   </record> -->
 +        <!--  -->
 +
-+</odoo>
++</flectra>
 Index: addons/openacademy/models.py
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
@@ -110,7 +110,7 @@ Index: addons/openacademy/models.py
 @@ -0,0 +1,8 @@
 +# -*- coding: utf-8 -*-
 +
-+from odoo import models, fields, api
++from flectra import models, fields, api
 +
 +# class openacademy(models.Model):
 +#     _name = 'openacademy.openacademy'
@@ -128,7 +128,7 @@ Index: addons/openacademy/templates.xml
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
 +++ addons/openacademy/templates.xml	2014-08-26 17:25:49.791783523 +0200
 @@ -0,0 +1,22 @@
-+<odoo>
++<flectra>
 +
 +        <!-- <template id="listing"> -->
 +        <!--   <ul> -->
@@ -149,4 +149,4 @@ Index: addons/openacademy/templates.xml
 +        <!--   </dl> -->
 +        <!-- </template> -->
 +
-+</odoo>
++</flectra>
diff --git a/doc/howtos/backend/exercise-dashboard b/doc/howtos/backend/exercise-dashboard
index 01876e65..03a1d97b 100644
--- a/doc/howtos/backend/exercise-dashboard
+++ b/doc/howtos/backend/exercise-dashboard
@@ -28,7 +28,7 @@ Index: addons/openacademy/views/session_board.xml
 +++ addons/openacademy/views/session_board.xml	2014-08-26 17:26:21.531783052 +0200
 @@ -0,0 +1,66 @@
 +<?xml version="1.0"?>
-+<odoo>
++<flectra>
 +
 +        <record model="ir.actions.act_window" id="act_session_graph">
 +            <field name="name">Attendees by course</field>
@@ -92,4 +92,4 @@ Index: addons/openacademy/views/session_board.xml
 +            sequence="1"
 +            id="menu_board_session"/>
 +
-+</odoo>
++</flectra>
diff --git a/doc/howtos/backend/exercise-demo b/doc/howtos/backend/exercise-demo
index 50a95644..11e2bfd9 100644
--- a/doc/howtos/backend/exercise-demo
+++ b/doc/howtos/backend/exercise-demo
@@ -6,7 +6,7 @@ Index: addons/openacademy/demo.xml
 --- addons.orig/openacademy/demo.xml	2014-08-26 17:25:52.683783480 +0200
 +++ addons/openacademy/demo.xml	2014-08-26 17:25:52.679783480 +0200
 @@ -1,25 +1,19 @@
- <odoo>
+ <flectra>
  
 -        <!--  -->
 -        <!--   <record id="object0" model="openacademy.openacademy"> -->
@@ -45,4 +45,4 @@ Index: addons/openacademy/demo.xml
 +            <field name="description">Course 2's description</field>
 +        </record>
  
- </odoo>
+ </flectra>
diff --git a/doc/howtos/backend/exercise-domain-advanced b/doc/howtos/backend/exercise-domain-advanced
index 55d5e1da..030adb53 100644
--- a/doc/howtos/backend/exercise-domain-advanced
+++ b/doc/howtos/backend/exercise-domain-advanced
@@ -40,4 +40,4 @@ Index: addons/openacademy/views/partner.xml
 +            <field name="name">Teacher / Level 2</field>
 +        </record>
  
- </odoo>
+ </flectra>
diff --git a/doc/howtos/backend/exercise-formview b/doc/howtos/backend/exercise-formview
index 9f80bc2f..bd433ab4 100644
--- a/doc/howtos/backend/exercise-formview
+++ b/doc/howtos/backend/exercise-formview
@@ -7,7 +7,7 @@ Index: addons/openacademy/views/openacademy.xml
 +++ addons/openacademy/views/openacademy.xml	2014-08-26 17:25:54.283783457 +0200
 @@ -1,6 +1,21 @@
  <?xml version="1.0" encoding="UTF-8"?>
- <odoo>
+ <flectra>
  
 +        <record model="ir.ui.view" id="course_form_view">
 +            <field name="name">course.form</field>
diff --git a/doc/howtos/backend/exercise-gantt b/doc/howtos/backend/exercise-gantt
index 6ee1e426..085b1290 100644
--- a/doc/howtos/backend/exercise-gantt
+++ b/doc/howtos/backend/exercise-gantt
@@ -45,7 +45,7 @@ diff --git a/openacademy/views/openacademy.xml b/openacademy/views/openacademy.x
 +                <gantt string="Session Gantt" color="course_id"
 +                       date_start="start_date" date_delay="hours"
 +                       default_group_by='instructor_id'>
-+                    <!-- <field name="name"/> this is not required after Odoo 10.0 -->
++                    <!-- <field name="name"/> this is not required after flectra 1.0 -->
 +                </gantt>
 +            </field>
 +        </record>
diff --git a/doc/howtos/backend/exercise-model b/doc/howtos/backend/exercise-model
index 4c3b8573..08ed54f5 100644
--- a/doc/howtos/backend/exercise-model
+++ b/doc/howtos/backend/exercise-model
@@ -6,7 +6,7 @@ Index: addons/openacademy/models.py
 +++ addons/openacademy/models.py	2014-08-26 17:25:51.639783496 +0200
 @@ -2,7 +2,8 @@
  
- from odoo import models, fields, api
+ from flectra import models, fields, api
  
 -# class openacademy(models.Model):
 -#     _name = 'openacademy.openacademy'
diff --git a/doc/howtos/backend/exercise-model-inheritance b/doc/howtos/backend/exercise-model-inheritance
index 073d706c..c8c078c1 100644
--- a/doc/howtos/backend/exercise-model-inheritance
+++ b/doc/howtos/backend/exercise-model-inheritance
@@ -28,7 +28,7 @@ Index: addons/openacademy/partner.py
 +++ addons/openacademy/partner.py	2014-08-26 17:26:01.223783354 +0200
 @@ -0,0 +1,12 @@
 +# -*- coding: utf-8 -*-
-+from odoo import fields, models
++from flectra import fields, models
 +
 +class Partner(models.Model):
 +    _inherit = 'res.partner'
@@ -45,7 +45,7 @@ Index: addons/openacademy/views/partner.xml
 +++ addons/openacademy/views/partner.xml	2014-08-26 17:26:01.223783354 +0200
 @@ -0,0 +1,32 @@
 +<?xml version="1.0" encoding="UTF-8"?>
-+ <odoo>
++ <flectra>
 +
 +        <!-- Add instructor field to existing view -->
 +        <record model="ir.ui.view" id="partner_instructor_form_view">
@@ -75,4 +75,4 @@ Index: addons/openacademy/views/partner.xml
 +                  parent="configuration_menu"
 +                  action="contact_list_action"/>
 +
-+</odoo>
++</flectra>
diff --git a/doc/howtos/backend/exercise-report b/doc/howtos/backend/exercise-report
index 68cc7b4b..0a99a0a0 100644
--- a/doc/howtos/backend/exercise-report
+++ b/doc/howtos/backend/exercise-report
@@ -18,7 +18,7 @@ Index: addons/openacademy/reports.xml
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
 +++ addons/openacademy/reports.xml	2014-08-29 08:41:12.663540061 +0200
 @@ -0,0 +1,30 @@
-+<odoo>
++<flectra>
 +
 +    <report
 +        id="report_session"
@@ -47,4 +47,4 @@ Index: addons/openacademy/reports.xml
 +        </t>
 +    </template>
 +
-+</odoo>
++</flectra>
diff --git a/doc/howtos/backend/exercise-session b/doc/howtos/backend/exercise-session
index 95558473..8e058551 100644
--- a/doc/howtos/backend/exercise-session
+++ b/doc/howtos/backend/exercise-session
@@ -55,4 +55,4 @@ Index: addons/openacademy/views/openacademy.xml
 +                  parent="openacademy_menu"
 +                  action="session_list_action"/>
  
- </odoo>
+ </flectra>
diff --git a/doc/howtos/backend/exercise-translations b/doc/howtos/backend/exercise-translations
index e7dfe53e..876d3c39 100644
--- a/doc/howtos/backend/exercise-translations
+++ b/doc/howtos/backend/exercise-translations
@@ -8,8 +8,8 @@ diff --git a/openacademy/models.py b/openacademy/models.py
  # -*- coding: utf-8 -*-
  
  from datetime import timedelta
--from odoo import models, fields, api, exceptions
-+from odoo import models, fields, api, exceptions, _
+-from flectra import models, fields, api, exceptions
++from flectra import models, fields, api, exceptions, _
  
  class Course(models.Model):
      _name = 'openacademy.course'
diff --git a/doc/howtos/backend/exercise-wizard b/doc/howtos/backend/exercise-wizard
index 400654c4..a25157c4 100644
--- a/doc/howtos/backend/exercise-wizard
+++ b/doc/howtos/backend/exercise-wizard
@@ -14,7 +14,7 @@ Index: addons/openacademy/wizard.py
 @@ -0,0 +1,10 @@
 +# -*- coding: utf-8 -*-
 +
-+from odoo import models, fields, api
++from flectra import models, fields, api
 +
 +class Wizard(models.TransientModel):
 +    _name = 'openacademy.wizard'
diff --git a/doc/howtos/backend/exercise-wizard-launch b/doc/howtos/backend/exercise-wizard-launch
index 7f76c45c..61ad5b30 100644
--- a/doc/howtos/backend/exercise-wizard-launch
+++ b/doc/howtos/backend/exercise-wizard-launch
@@ -42,4 +42,4 @@ Index: addons/openacademy/views/openacademy.xml
 +                    target="new"
 +                    key2="client_action_multi"/>
 +
- </odoo>
+ </flectra>
diff --git a/doc/howtos/theme_tutorial_assets/img/Intro.jpg b/doc/howtos/theme_tutorial_assets/img/Intro.jpg
deleted file mode 100644
index 1061e966..00000000
Binary files a/doc/howtos/theme_tutorial_assets/img/Intro.jpg and /dev/null differ
diff --git a/doc/howtos/theme_tutorial_assets/img/after-menu.png b/doc/howtos/theme_tutorial_assets/img/after-menu.png
deleted file mode 100755
index 5608b235..00000000
Binary files a/doc/howtos/theme_tutorial_assets/img/after-menu.png and /dev/null differ
diff --git a/doc/howtos/theme_tutorial_assets/img/cms.jpg b/doc/howtos/theme_tutorial_assets/img/cms.jpg
deleted file mode 100755
index 006ec697..00000000
Binary files a/doc/howtos/theme_tutorial_assets/img/cms.jpg and /dev/null differ
diff --git a/doc/howtos/theme_tutorial_assets/img/flectra_after_menu.png b/doc/howtos/theme_tutorial_assets/img/flectra_after_menu.png
new file mode 100644
index 00000000..702987db
Binary files /dev/null and b/doc/howtos/theme_tutorial_assets/img/flectra_after_menu.png differ
diff --git a/doc/howtos/theme_tutorial_assets/img/flectra_cms.jpg b/doc/howtos/theme_tutorial_assets/img/flectra_cms.jpg
new file mode 100644
index 00000000..723362ed
Binary files /dev/null and b/doc/howtos/theme_tutorial_assets/img/flectra_cms.jpg differ
diff --git a/doc/howtos/theme_tutorial_assets/img/flectra_functionalities.jpg b/doc/howtos/theme_tutorial_assets/img/flectra_functionalities.jpg
new file mode 100644
index 00000000..a4725359
Binary files /dev/null and b/doc/howtos/theme_tutorial_assets/img/flectra_functionalities.jpg differ
diff --git a/doc/howtos/theme_tutorial_assets/img/flectra_intro.jpg b/doc/howtos/theme_tutorial_assets/img/flectra_intro.jpg
new file mode 100644
index 00000000..82cc2632
Binary files /dev/null and b/doc/howtos/theme_tutorial_assets/img/flectra_intro.jpg differ
diff --git a/doc/howtos/theme_tutorial_assets/img/flectra_page.jpg b/doc/howtos/theme_tutorial_assets/img/flectra_page.jpg
new file mode 100644
index 00000000..f1185f09
Binary files /dev/null and b/doc/howtos/theme_tutorial_assets/img/flectra_page.jpg differ
diff --git a/doc/howtos/theme_tutorial_assets/img/flectra_page_structure.jpg b/doc/howtos/theme_tutorial_assets/img/flectra_page_structure.jpg
new file mode 100644
index 00000000..2153e5c0
Binary files /dev/null and b/doc/howtos/theme_tutorial_assets/img/flectra_page_structure.jpg differ
diff --git a/doc/howtos/theme_tutorial_assets/img/flectra_services_page_menu.png b/doc/howtos/theme_tutorial_assets/img/flectra_services_page_menu.png
new file mode 100644
index 00000000..a52b29d1
Binary files /dev/null and b/doc/howtos/theme_tutorial_assets/img/flectra_services_page_menu.png differ
diff --git a/doc/howtos/theme_tutorial_assets/img/flectra_services_page_nostyle.png.png b/doc/howtos/theme_tutorial_assets/img/flectra_services_page_nostyle.png.png
new file mode 100644
index 00000000..55cf32d4
Binary files /dev/null and b/doc/howtos/theme_tutorial_assets/img/flectra_services_page_nostyle.png.png differ
diff --git a/doc/howtos/theme_tutorial_assets/img/flectra_services_page_styled.png b/doc/howtos/theme_tutorial_assets/img/flectra_services_page_styled.png
new file mode 100644
index 00000000..06e621e4
Binary files /dev/null and b/doc/howtos/theme_tutorial_assets/img/flectra_services_page_styled.png differ
diff --git a/doc/howtos/theme_tutorial_assets/img/flectra_snippet.jpg b/doc/howtos/theme_tutorial_assets/img/flectra_snippet.jpg
new file mode 100644
index 00000000..4035975a
Binary files /dev/null and b/doc/howtos/theme_tutorial_assets/img/flectra_snippet.jpg differ
diff --git a/doc/howtos/theme_tutorial_assets/img/flectra_snippet_custom_method.png b/doc/howtos/theme_tutorial_assets/img/flectra_snippet_custom_method.png
new file mode 100644
index 00000000..ce328097
Binary files /dev/null and b/doc/howtos/theme_tutorial_assets/img/flectra_snippet_custom_method.png differ
diff --git a/doc/howtos/theme_tutorial_assets/img/flectra_structure.jpg b/doc/howtos/theme_tutorial_assets/img/flectra_structure.jpg
new file mode 100644
index 00000000..2ed3b9a8
Binary files /dev/null and b/doc/howtos/theme_tutorial_assets/img/flectra_structure.jpg differ
diff --git a/doc/howtos/theme_tutorial_assets/img/flectra_styles.jpg b/doc/howtos/theme_tutorial_assets/img/flectra_styles.jpg
new file mode 100644
index 00000000..a85bfbe7
Binary files /dev/null and b/doc/howtos/theme_tutorial_assets/img/flectra_styles.jpg differ
diff --git a/doc/howtos/theme_tutorial_assets/img/flectra_upgrade_module.png b/doc/howtos/theme_tutorial_assets/img/flectra_upgrade_module.png
new file mode 100644
index 00000000..58f5d9d9
Binary files /dev/null and b/doc/howtos/theme_tutorial_assets/img/flectra_upgrade_module.png differ
diff --git a/doc/howtos/theme_tutorial_assets/img/folder.jpeg b/doc/howtos/theme_tutorial_assets/img/folder.jpeg
new file mode 100644
index 00000000..888648b7
Binary files /dev/null and b/doc/howtos/theme_tutorial_assets/img/folder.jpeg differ
diff --git a/doc/howtos/theme_tutorial_assets/img/functionalities.jpg b/doc/howtos/theme_tutorial_assets/img/functionalities.jpg
deleted file mode 100755
index dfe9b8d6..00000000
Binary files a/doc/howtos/theme_tutorial_assets/img/functionalities.jpg and /dev/null differ
diff --git a/doc/howtos/theme_tutorial_assets/img/page.jpg b/doc/howtos/theme_tutorial_assets/img/page.jpg
deleted file mode 100755
index 50558c37..00000000
Binary files a/doc/howtos/theme_tutorial_assets/img/page.jpg and /dev/null differ
diff --git a/doc/howtos/theme_tutorial_assets/img/page_structure.jpg b/doc/howtos/theme_tutorial_assets/img/page_structure.jpg
deleted file mode 100755
index 2170f65d..00000000
Binary files a/doc/howtos/theme_tutorial_assets/img/page_structure.jpg and /dev/null differ
diff --git a/doc/howtos/theme_tutorial_assets/img/services_page_menu.png b/doc/howtos/theme_tutorial_assets/img/services_page_menu.png
deleted file mode 100755
index 4ea2a426..00000000
Binary files a/doc/howtos/theme_tutorial_assets/img/services_page_menu.png and /dev/null differ
diff --git a/doc/howtos/theme_tutorial_assets/img/services_page_nostyle.png b/doc/howtos/theme_tutorial_assets/img/services_page_nostyle.png
deleted file mode 100755
index 7ebc937e..00000000
Binary files a/doc/howtos/theme_tutorial_assets/img/services_page_nostyle.png and /dev/null differ
diff --git a/doc/howtos/theme_tutorial_assets/img/services_page_styled.png b/doc/howtos/theme_tutorial_assets/img/services_page_styled.png
deleted file mode 100755
index 6d5646bd..00000000
Binary files a/doc/howtos/theme_tutorial_assets/img/services_page_styled.png and /dev/null differ
diff --git a/doc/howtos/theme_tutorial_assets/img/snippet.jpg b/doc/howtos/theme_tutorial_assets/img/snippet.jpg
deleted file mode 100755
index 0ab285ba..00000000
Binary files a/doc/howtos/theme_tutorial_assets/img/snippet.jpg and /dev/null differ
diff --git a/doc/howtos/theme_tutorial_assets/img/snippet_custom_method.png b/doc/howtos/theme_tutorial_assets/img/snippet_custom_method.png
deleted file mode 100644
index ab7dcd46..00000000
Binary files a/doc/howtos/theme_tutorial_assets/img/snippet_custom_method.png and /dev/null differ
diff --git a/doc/howtos/theme_tutorial_assets/img/styles.jpg b/doc/howtos/theme_tutorial_assets/img/styles.jpg
deleted file mode 100755
index 02f44240..00000000
Binary files a/doc/howtos/theme_tutorial_assets/img/styles.jpg and /dev/null differ
diff --git a/doc/howtos/theme_tutorial_assets/img/upgrade_module.png b/doc/howtos/theme_tutorial_assets/img/upgrade_module.png
index ffeca7d4..6df4f810 100644
Binary files a/doc/howtos/theme_tutorial_assets/img/upgrade_module.png and b/doc/howtos/theme_tutorial_assets/img/upgrade_module.png differ
diff --git a/doc/howtos/themes.rst b/doc/howtos/themes.rst
index fb4f3599..6d082576 100644
--- a/doc/howtos/themes.rst
+++ b/doc/howtos/themes.rst
@@ -11,7 +11,7 @@ freedom for the user to customize everything according to their needs.
 
 Ready to create your own theme? Great. Here are some things you should know before you begin. This tutorial is a guide to creating an Flectra theme.
 
-.. image:: theme_tutorial_assets/img/Intro.jpg
+.. image:: theme_tutorial_assets/img/flectra_intro.jpg
 
 
 An introduction for web designers
@@ -25,7 +25,7 @@ This introduction will outline the basics of Flectra theme creation.
    Flectra’s team has created a framework that’s powerful and easy to use. There’s no need to know special syntaxes to use this set of tools.
 
 From common CMS to Flectra
------------------------
+--------------------------
 
 .. note::
 
@@ -39,9 +39,9 @@ This is usually the first question from a web designer used to working with Word
 
 .. container:: row
 
-  .. container:: col-sm-4
+  .. container:: col-sm-5
 
-     .. image:: theme_tutorial_assets/img/cms.jpg
+     .. image:: theme_tutorial_assets/img/flectra_cms.jpg
 
   .. container:: col-sm-7
 
@@ -54,11 +54,11 @@ This is usually the first question from a web designer used to working with Word
    We think that theme design should be simple (and powerful). When we created our Website Builder, we decided to start from scratch instead of relying on what already existed. This approach gave us the freedom to focus on the things that are really important for designers: styles, content and the logic behind them. No more struggling with technical stuff.
 
 Flectra default theme structure
-----------------------------
+-------------------------------
 
 .. container:: row
 
-  .. container:: col-sm-8
+  .. container:: col-sm-7
 
     Flectra comes with a default theme structure.
     It is a very basic “theme” that provides minimal structure and layout. When you create a new theme, you are actually extending this.
@@ -67,13 +67,13 @@ Flectra default theme structure
 
     As a result, you are totally free to focus on design while this structure does the job of providing integrations and functionality.
 
-  .. container:: col-sm-4
+  .. container:: col-sm-5
 
-     .. image:: theme_tutorial_assets/img/def_structure.jpg
+     .. image:: theme_tutorial_assets/img/flectra_structure.jpg
 
 .. container:: row
 
-  .. container:: col-md-6
+  .. container:: col-md-7
 
      **Main features:**
 
@@ -83,7 +83,7 @@ Flectra default theme structure
      * Automatic Less/Sass compiling
      * Automatic Js and CSS minification and combination
 
-  .. container:: col-md-6
+  .. container:: col-md-5
 
      **Main technologies:**
 
@@ -109,34 +109,40 @@ Let’s take a tour of our “list” elements:
 
 .. container:: row
 
-  .. figure:: theme_tutorial_assets/img/snippet.jpg
-     :figclass: col-sm-6
+    .. container:: col-sm-6
 
-     Snippets (or building-blocks)
+        .. image:: theme_tutorial_assets/img/flectra_snippet.jpg
 
-     A piece of HTML code.  The user  will  drag&drop, modify and combine them using our built-in Website Builder interface. You can define sets of options and styles for each snippet. The user will choose from them according to their needs.
 
-  .. figure:: theme_tutorial_assets/img/page.jpg
-     :figclass: col-sm-6
+    .. container:: col-sm-6
+
+         Snippets (or building-blocks)
+
+         A piece of HTML code.  The user  will  drag&drop, modify and combine them using our built-in Website Builder interface. You can define sets of options and styles for each snippet. The user will choose from them according to their needs.
+
+
+.. container:: row
+
+    .. container:: col-sm-6
 
      Pages
 
      These are normal web pages, except that they will be editable by the final user and that you can define an empty area that the user can “fill” by dragging snippets into it.
 
-.. raw:: html
+    .. container:: col-sm-6
 
-    <div class="clearfix themes"></div>
+      .. image:: theme_tutorial_assets/img/flectra_page.jpg
 
 .. container:: row
 
-  .. figure:: theme_tutorial_assets/img/styles.jpg
+  .. figure:: theme_tutorial_assets/img/flectra_styles.jpg
      :figclass: col-sm-6
 
      Styles
 
      Styles are defined using standard CSS files (or Less/Sass). You can define a style as **default** or **optional**. The default styles are always active in your theme, the optional styles can be enabled or disabled by the user.
 
-  .. figure:: theme_tutorial_assets/img/functionalities.jpg
+  .. figure:: theme_tutorial_assets/img/flectra_functionalities.jpg
      :figclass: col-sm-6
 
      Functionalities
@@ -145,7 +151,7 @@ Let’s take a tour of our “list” elements:
 
 
 Flectra's XML files, an overview
------------------------------
+--------------------------------
 
 Any Flectra XML file starts with encoding specifications.
 After that, you have to write your code inside a ``<flectra>`` tag.
@@ -198,7 +204,7 @@ Update your theme
 
   .. container:: col-sm-5
 
-    .. image:: theme_tutorial_assets/img/upgrade_module.png
+    .. image:: theme_tutorial_assets/img/flectra_upgrade_module.png
 
 
 
@@ -233,7 +239,7 @@ Flectra’s themes are packaged like modules. Even if you are designing a very s
 
 The final result should be something like this:
 
-.. image:: theme_tutorial_assets/img/folder.jpg
+.. image:: theme_tutorial_assets/img/folder.jpeg
 
 Edit ``__manifest__.py``
 ------------------------
@@ -259,7 +265,7 @@ These values will be used to identify your new theme in Flectra’s backend.
 
 The ``data`` property will contain the xml files list. Right now it’s empty, but we will add any new files created.
 
-``category`` defines your module category (always “Theme”) and, after a slash, the subcategory. You can use one subcategory from the Flectra Apps categories list. (https://www.flectra.com/apps/themes)
+``category`` defines your module category (always “Theme”) and, after a slash, the subcategory.You can use one subcategory from the Flectra Apps categories list. (https://store.flectrahq.com/apps/category/2)
 
 
 ``depends`` specifies the modules needed by our theme to work properly. For our tutorial theme, we only need website. If you need blogging or eCommerce features as well, you have to add those modules too.
@@ -280,7 +286,7 @@ To install your theme, you just place your theme folder inside addons in your Fl
 After that, navigate to the Settings page, look for your theme and click on the install button.
 
 Structure of an Flectra page
-=========================
+============================
 
 An Flectra page is the visual result of a combination of 2 kind of elements, **cross-pages** and **unique**.
 By default, Flectra provides you with a **Header** and a **Footer** (cross-pages) and a unique main element that contains the content that makes your page unique.
@@ -289,7 +295,7 @@ By default, Flectra provides you with a **Header** and a **Footer** (cross-pages
 
   Cross-pages elements will be the same on every page. Unique elements are related to a specific page only.
 
-.. image:: theme_tutorial_assets/img/page_structure.jpg
+.. image:: theme_tutorial_assets/img/flectra_page_structure.jpg
 
 To inspect the default layout, simply create a new page using the
 Website Builder.  Click on :menuselection:`Content --> New Page` and
@@ -367,7 +373,7 @@ Great! We successfully added an id to the
 header and an element after the navigation menu. These changes will be
 applied to each page of the website.
 
-.. image:: theme_tutorial_assets/img/after-menu.png
+.. image:: theme_tutorial_assets/img/flectra_after_menu.png
    :class: shadow-0
 
 Create a specific page layout
@@ -389,9 +395,9 @@ default Flectra markup.  Inside ``<flectra>`` create a ``<template>`` tag, set t
        <template name="Services page" id="website.services" page="True">
          <h1>Our Services</h1>
            <ul class="services">
-             <li>Cloud Hosting</li>
+             <li>Training</li>
              <li>Support</li>
-             <li>Unlimited space</li>
+             <li>Development</li>
            </ul>
          </template>
 
@@ -412,9 +418,9 @@ html code into a ``<t>`` tag, like in this example.
          <div class="container">
            <h1>Our Services</h1>
            <ul class="services">
-             <li>Cloud Hosting</li>
+             <li>Training</li>
              <li>Support</li>
-             <li>Unlimited space</li>
+             <li>Development</li>
            </ul>
          </div>
        </div>
@@ -442,9 +448,9 @@ can fill with snippets. To achieve this, just create a ``div`` with
         <div class="container">
           <h1>Our Services</h1>
           <ul class="services">
-            <li>Cloud Hosting</li>
-            <li>Support</li>
-            <li>Unlimited space</li>
+             <li>Training</li>
+             <li>Support</li>
+             <li>Development</li>
           </ul>
           <!-- === Snippets' area === -->
           <div class="oe_structure" />
@@ -477,7 +483,7 @@ Great, our Services page is ready and you’ll be able to access it by navigatin
 You will notice that it's possible to drag/drop snippets underneath the
 *Our Services* list.
 
-.. image:: theme_tutorial_assets/img/services_page_nostyle.png
+.. image:: theme_tutorial_assets/img/flectra_services_page_nostyle.png.png
    :class: shadow-0
 
 Now let's go back to our *pages.xml* and, after our page template,
@@ -494,7 +500,7 @@ copy/paste the following code.
 
 This code will add a link to the main menu.
 
-.. image:: theme_tutorial_assets/img/services_page_menu.png
+.. image:: theme_tutorial_assets/img/flectra_services_page_menu.png
    :class: shadow-0
 
 The **sequence** attribute defines the link’s position in the top menu.
@@ -575,7 +581,7 @@ Update your theme
 
 Our less file is now included in our theme, it will be automatically compiled, minified and combined with all Flectra’s assets.
 
-.. image:: theme_tutorial_assets/img/services_page_styled.png
+.. image:: theme_tutorial_assets/img/flectra_services_page_styled.png
    :class: shadow-0
 
 Create Snippets
@@ -848,7 +854,7 @@ Let’s test our new javascript function. Enter in Edit mode and drop into the p
 You should now see the javascript alert that we bound on the ``onFocus`` event.
 If you close it, then click outside of your snippet and then click in it again, the event will trigger again.
 
-.. image:: theme_tutorial_assets/img/snippet_custom_method.png
+.. image:: theme_tutorial_assets/img/flectra_snippet_custom_method.png
    :class: shadow-0
 
 
diff --git a/doc/howtos/web.rst b/doc/howtos/web.rst
index 91190b1b..55669d15 100644
--- a/doc/howtos/web.rst
+++ b/doc/howtos/web.rst
@@ -114,14 +114,10 @@ The files in the ``static`` folder, need to be defined within the module in orde
     individual files disappear and the code is made significantly less
     readable. It is possible to disable this process by enabling the
     "developer mode": log into your Flectra instance (user *admin* password
-    *admin* by default) open the user menu (in the top-right corner of the
-    Flectra screen) and select :guilabel:`About Flectra` then :guilabel:`Activate
+    *admin* by default) open the settings menu and select :guilabel:`Activate
     the developer mode`:
 
-    .. image:: web/about_flectra.png
-        :align: center
-
-    .. image:: web/devmode.png
+     .. image:: web/devmode.png
         :align: center
 
     This will reload the web client with optimizations disabled, making
@@ -130,7 +126,7 @@ The files in the ``static`` folder, need to be defined within the module in orde
 .. todo:: qweb files hooked via __manifest__.py, but js and CSS use bundles
 
 Flectra JavaScript Module
-======================
+=========================
 
 Javascript doesn't have built-in modules. As a result variables defined in
 different files are all mashed together and may conflict. This has given rise
@@ -903,10 +899,6 @@ Exercise
                 border-radius: 3px;
             }
 
-        .. image:: web/qweb.*
-           :align: center
-           :width: 70%
-
 Widget Helpers
 ==============
 
@@ -1264,7 +1256,7 @@ initialized, for class attributes for instance (as modules are loaded before
 the user's language is configured and translations are downloaded).
 
 Communication with the Flectra Server
-==================================
+=====================================
 
 Contacting Models
 -----------------
@@ -2320,4 +2312,4 @@ the most useful being:
 .. _PostgreSQL: http://en.wikipedia.org/wiki/PostgreSQL
 .. _positional arguments:
 .. _keyword arguments:
-    https://docs.python.org/2/glossary.html#term-argument
+    https://docs.python.org/3/glossary.html#term-argument
diff --git a/doc/howtos/web/about_odoo.png b/doc/howtos/web/about_flectra.png
similarity index 100%
rename from doc/howtos/web/about_odoo.png
rename to doc/howtos/web/about_flectra.png
diff --git a/doc/howtos/web/devmode.png b/doc/howtos/web/devmode.png
index 2ce51649..6b24777a 100644
Binary files a/doc/howtos/web/devmode.png and b/doc/howtos/web/devmode.png differ
diff --git a/doc/howtos/website.rst b/doc/howtos/website.rst
index dba55e21..0c3ce678 100644
--- a/doc/howtos/website.rst
+++ b/doc/howtos/website.rst
@@ -9,7 +9,7 @@ Building a Website
 .. warning::
 
     * This guide assumes `basic knowledge of Python
-      <http://docs.python.org/2/tutorial/>`_
+      <http://docs.python.org/3/tutorial/>`_
     * This guide assumes :ref:`an installed Flectra <setup/install>`
 
 Creating a basic module
@@ -48,7 +48,7 @@ Although it does absolutely nothing we can install it:
 
       $ ./flectra-bin --addons-path addons,my-modules
 
-* go to http://localhost:8069
+* go to http://localhost:7073
 * create a new database including demonstration data
 * to go :menuselection:`Settings --> Modules --> Modules`
 * in the top-right corner remove the *Installed* filter and search for
@@ -72,7 +72,7 @@ Shut down your server (:kbd:`^C`) then restart it:
 
     $ ./flectra-bin --addons-path addons,my-modules
 
-and open a page to http://localhost:8069/academy/academy/, you should see your
+and open a page to http://localhost:7073/academy/academy/, you should see your
 "page" appear:
 
 .. figure:: website/helloworld.png
@@ -108,12 +108,12 @@ Academy` and clicking :guilabel:`Upgrade`.
 
         $ flectra-bin --addons-path addons,my-modules -d academy -u academy
 
-Going to http://localhost:8069/academy/academy/ should now result in:
+Going to http://localhost:7073/academy/academy/ should now result in:
 
-.. image:: website/basic-list.png
+.. image:: website/flectra_basic-list.png
 
 Storing data in Flectra
-====================
+=======================
 
 :ref:`Flectra models <reference/orm/model>` map to database tables.
 
@@ -182,7 +182,7 @@ The last step is to alter model and template to use our demonstration data:
 
 Restart the server and update the module (in order to update the manifest
 and templates and load the demo file) then navigate to
-http://localhost:8069/academy/academy/. The page should look slightly
+http://localhost:7073/academy/academy/. The page should look slightly
 different: names should simply be prefixed by a number (the database
 identifier for the teacher).
 
@@ -204,11 +204,11 @@ integration and a few other services (e.g. default styling, theming) via the
 .. patch::
 
 After restarting the server while updating the module (in order to update the
-manifest and template) access http://localhost:8069/academy/academy/ should
+manifest and template) access http://localhost:7073/academy/academy/ should
 yield a nicer looking page with branding and a number of built-in page
 elements (top-level menu, footer, …)
 
-.. image:: website/layout.png
+.. image:: website/flectra_layout.png
 
 The website layout also provides support for edition tools: click
 :guilabel:`Sign In` (in the top-right), fill the credentials in (``admin`` /
@@ -241,8 +241,8 @@ create a new controller method which takes a bit of URL and prints it out:
 
 .. patch::
 
-restart Flectra, access http://localhost:8069/academy/Alice/ and
-http://localhost:8069/academy/Bob/ and see the difference.
+restart Flectra, access http://localhost:7073/academy/Alice/ and
+http://localhost:7073/academy/Bob/ and see the difference.
 
 As the name indicates, `converter patterns`_ don't just do extraction, they
 also do *validation* and *conversion*, so we can change the new controller
@@ -250,9 +250,9 @@ to only accept integers:
 
 .. patch::
 
-Restart Flectra, access http://localhost:8069/academy/2, note how the old value
+Restart Flectra, access http://localhost:7073/academy/2, note how the old value
 was a string, but the new one was converted to an integers. Try accessing
-http://localhost:8069/academy/Carol/ and note that the page was not found:
+http://localhost:7073/academy/Carol/ and note that the page was not found:
 since "Carol" is not an integer, the route was ignored and no route could be
 found.
 
@@ -319,7 +319,7 @@ Administration and ERP integration
 ==================================
 
 A brief and incomplete introduction to the Flectra administration
---------------------------------------------------------------
+-----------------------------------------------------------------
 
 The Flectra administration was briefly seen during the `website support`_ section.
 We can go back to it using :menuselection:`Administrator --> Administrator` in
@@ -337,7 +337,7 @@ The conceptual structure of the Flectra backend is simple:
    model is displayed inside the view.
 
 Editing in the Flectra administration
-----------------------------------
+-------------------------------------
 
 By default, an Flectra model is essentially invisible to a user. To make it
 visible it must be available through an action, which itself needs to be
@@ -347,7 +347,7 @@ Let's create a menu for our model:
 
 .. patch::
 
-then accessing http://localhost:8069/web/ in the top left should be a menu
+then accessing http://localhost:7073/web/ in the top left should be a menu
 :guilabel:`Academy`, which is selected by default, as it is the first menu,
 and having opened a listing of teachers. From the listing it is possible to
 :guilabel:`Create` new teacher records, and to switch to the "form" by-record
diff --git a/doc/howtos/website/basic-controller b/doc/howtos/website/basic-controller
index 831ecf6f..002e54b1 100644
--- a/doc/howtos/website/basic-controller
+++ b/doc/howtos/website/basic-controller
@@ -7,7 +7,7 @@ diff --git a/academy/controllers.py b/academy/controllers.py
 +++ b/academy/controllers.py
 @@ -1,10 +1,10 @@
  # -*- coding: utf-8 -*-
- from odoo import http
+ from flectra import http
  
 -# class Academy(http.Controller):
 -#     @http.route('/academy/academy/', auth='public')
diff --git a/doc/howtos/website/basic-model b/doc/howtos/website/basic-model
index a27d0543..a4cb76c1 100644
--- a/doc/howtos/website/basic-model
+++ b/doc/howtos/website/basic-model
@@ -7,7 +7,7 @@ diff --git a/academy/models.py b/academy/models.py
 +++ b/academy/models.py
 @@ -2,7 +2,7 @@
  
- from odoo import models, fields, api
+ from flectra import models, fields, api
  
 -# class academy(models.Model):
 -#     _name = 'academy.academy'
diff --git a/doc/howtos/website/course-product b/doc/howtos/website/course-product
index 25224115..fef83882 100644
--- a/doc/howtos/website/course-product
+++ b/doc/howtos/website/course-product
@@ -18,12 +18,12 @@ new file mode 100644
 --- /dev/null
 +++ b/academy/data.xml
 @@ -0,0 +1,6 @@
-+<odoo>
++<flectra>
 +  <record model="product.public.category" id="category_courses">
 +    <field name="name">Courses</field>
 +    <field name="parent_id" ref="website_sale.categ_others"/>
 +  </record>
-+</odoo>
++</flectra>
 diff --git a/academy/demo.xml b/academy/demo.xml
 --- a/academy/demo.xml
 +++ b/academy/demo.xml
@@ -56,7 +56,7 @@ diff --git a/academy/demo.xml b/academy/demo.xml
 +            <field name="type">service</field>
 +        </record>
 +
- </odoo>
+ </flectra>
 diff --git a/academy/models.py b/academy/models.py
 --- a/academy/models.py
 +++ b/academy/models.py
diff --git a/doc/howtos/website/demo-data b/doc/howtos/website/demo-data
index bf50fd31..68b86a9e 100644
--- a/doc/howtos/website/demo-data
+++ b/doc/howtos/website/demo-data
@@ -6,7 +6,7 @@ diff --git a/academy/demo.xml b/academy/demo.xml
 --- a/academy/demo.xml
 +++ b/academy/demo.xml
 @@ -1,25 +1,13 @@
- <odoo>
+ <flectra>
  
 -        <!--  -->
 -        <!--   <record id="object0" model="academy.academy"> -->
@@ -39,4 +39,4 @@ diff --git a/academy/demo.xml b/academy/demo.xml
 +            <field name="name">Lester Vaughn</field>
 +        </record>
  
- </odoo>
+ </flectra>
diff --git a/doc/howtos/website/flectra_basic-list.png b/doc/howtos/website/flectra_basic-list.png
new file mode 100644
index 00000000..f87e3751
Binary files /dev/null and b/doc/howtos/website/flectra_basic-list.png differ
diff --git a/doc/howtos/website/flectra_layout.png b/doc/howtos/website/flectra_layout.png
new file mode 100644
index 00000000..b5ecf377
Binary files /dev/null and b/doc/howtos/website/flectra_layout.png differ
diff --git a/doc/howtos/website/module-empty b/doc/howtos/website/module-empty
index 4b6c69c2..967ac18d 100644
--- a/doc/howtos/website/module-empty
+++ b/doc/howtos/website/module-empty
@@ -55,7 +55,7 @@ new file mode 100644
 +++ b/academy/controllers.py
 @@ -0,0 +1,20 @@
 +# -*- coding: utf-8 -*-
-+from odoo import http
++from flectra import http
 +
 +# class Academy(http.Controller):
 +#     @http.route('/academy/academy/', auth='public')
@@ -79,7 +79,7 @@ new file mode 100644
 --- /dev/null
 +++ b/academy/demo.xml
 @@ -0,0 +1,25 @@
-+<odoo>
++<flectra>
 +
 +        <!--  -->
 +        <!--   <record id="object0" model="academy.academy"> -->
@@ -103,7 +103,7 @@ new file mode 100644
 +        <!--   </record> -->
 +        <!--  -->
 +
-+</odoo>
++</flectra>
 diff --git a/academy/models.py b/academy/models.py
 new file mode 100644
 --- /dev/null
@@ -111,7 +111,7 @@ new file mode 100644
 @@ -0,0 +1,8 @@
 +# -*- coding: utf-8 -*-
 +
-+from odoo import models, fields, api
++from flectra import models, fields, api
 +
 +# class academy(models.Model):
 +#     _name = 'academy.academy'
@@ -129,7 +129,7 @@ new file mode 100644
 --- /dev/null
 +++ b/academy/templates.xml
 @@ -0,0 +1,22 @@
-+<odoo>
++<flectra>
 +
 +        <!-- <template id="listing"> -->
 +        <!--   <ul> -->
@@ -150,4 +150,4 @@ new file mode 100644
 +        <!--   </dl> -->
 +        <!-- </template> -->
 +
-+</odoo>
++</flectra>
diff --git a/doc/howtos/website/teachers-menu b/doc/howtos/website/teachers-menu
index 6e7bdbc1..5b4c6cf7 100644
--- a/doc/howtos/website/teachers-menu
+++ b/doc/howtos/website/teachers-menu
@@ -18,7 +18,7 @@ new file mode 100644
 --- /dev/null
 +++ b/academy/views.xml
 @@ -0,0 +1,13 @@
-+<odoo>
++<flectra>
 +
 +  <record id="action_academy_teachers" model="ir.actions.act_window">
 +    <field name="name">Academy teachers</field>
@@ -32,4 +32,4 @@ new file mode 100644
 +            parent="menu_academy_content"
 +            action="action_academy_teachers"/>
 +
-+</odoo>
++</flectra>
diff --git a/doc/howtos/website/template b/doc/howtos/website/template
index a7e68254..971aa320 100644
--- a/doc/howtos/website/template
+++ b/doc/howtos/website/template
@@ -5,7 +5,7 @@
 diff --git a/academy/controllers.py b/academy/controllers.py
 --- a/academy/controllers.py
 +++ b/academy/controllers.py
-@@ -4,7 +4,9 @@ from odoo import http
+@@ -4,7 +4,9 @@ from flectra import http
  class Academy(http.Controller):
      @http.route('/academy/academy/', auth='public')
      def index(self, **kw):
@@ -20,7 +20,7 @@ diff --git a/academy/templates.xml b/academy/templates.xml
 --- a/academy/templates.xml
 +++ b/academy/templates.xml
 @@ -1,14 +1,11 @@
- <odoo>
+ <flectra>
  
 -        <!-- <template id="listing"> -->
 -        <!--   <ul> -->
diff --git a/doc/howtos/website/website-support b/doc/howtos/website/website-support
index 8df46dc7..4b5ffd4a 100644
--- a/doc/howtos/website/website-support
+++ b/doc/howtos/website/website-support
@@ -18,7 +18,7 @@ diff --git a/academy/controllers.py b/academy/controllers.py
 --- a/academy/controllers.py
 +++ b/academy/controllers.py
 @@ -2,7 +2,7 @@
- from odoo import http
+ from flectra import http
  
  class Academy(http.Controller):
 -    @http.route('/academy/academy/', auth='public')
@@ -30,7 +30,7 @@ diff --git a/academy/templates.xml b/academy/templates.xml
 --- a/academy/templates.xml
 +++ b/academy/templates.xml
 @@ -1,9 +1,15 @@
- <odoo>
+ <flectra>
  
          <template id="index">
 -            <title>Academy</title>
diff --git a/doc/python3.rst b/doc/python3.rst
index 0682baad..8bde633b 100644
--- a/doc/python3.rst
+++ b/doc/python3.rst
@@ -4,7 +4,7 @@
 Python 3 compatibility/conversions
 ==================================
 
-Official compatibility: Flectra 11 will be the first LTS release to introduce
+Official compatibility: Flectra 1.0 will be the first LTS release to introduce
 Python 3 compatibility, starting with Python 3.5. It will also be the first
 LTS release to drop official support for Python 2.
 
@@ -13,7 +13,7 @@ used by the official Flectra distribution have been ported and are considered
 stable. Most supported platforms have a Python 3.5 package, or a similar
 way to deploy it. Preserving dual compatibility is therefore considered
 unnecessary, and would represent a significant overhead in testing for the
-lifetime of Flectra 11.
+lifetime of Flectra 1.0.
 
 Python 2 and Python 3 are somewhat different language, but following
 backports, forward ports and cross-compatibility library it is possible to
@@ -35,7 +35,7 @@ References/useful documents:
 
 * `What's new in Python 3? <https://docs.python.org/3.0/whatsnew/3.0.html>`_
   covers many of the changes between Python 2 and Python 3, though it is
-  missing a number of changes which `were backported to Python 2.7 <https://docs.python.org/2.7/whatsnew/2.7.html#python-3-1-features>`_
+  missing a number of changes which `were backported to Python 2.7 <https://docs.python.org/3/whatsnew/2.7.html#python-3-1-features>`_
   as well as :ref:`some feature reintroductions <p3support>` of later Python 3
   revisions
 * `How do I port to Python 3? <https://eev.ee/blog/2016/07/31/python-faq-how-do-i-port-to-python-3/>`_
diff --git a/doc/reference.rst b/doc/reference.rst
index 11712beb..a398567a 100644
--- a/doc/reference.rst
+++ b/doc/reference.rst
@@ -23,4 +23,3 @@ Reference
     reference/reports
     reference/mixins
     reference/guidelines
-    reference/mobile
diff --git a/doc/reference/cmdline.rst b/doc/reference/cmdline.rst
index 5d132bd1..7e376f7e 100644
--- a/doc/reference/cmdline.rst
+++ b/doc/reference/cmdline.rst
@@ -2,9 +2,9 @@
 
 .. _reference/cmdline:
 
-================================
+===================================
 Command-line interface: flectra-bin
-================================
+===================================
 
 .. _reference/cmdline/server:
 
@@ -192,7 +192,7 @@ built-in HTTP
 
 .. option:: --http-port <port>
 
-    Port on which the HTTP server listens, defaults to 8069.
+    Port on which the HTTP server listens, defaults to 7073.
 
 .. option:: --longpolling-port <port>
 
@@ -211,19 +211,19 @@ customize the amount of logging output
 
     sends logging output to the specified file instead of stdout. On Unix, the
     file `can be managed by external log rotation programs
-    <https://docs.python.org/2/library/logging.handlers.html#watchedfilehandler>`_
+    <https://docs.python.org/3/library/logging.handlers.html#watchedfilehandler>`_
     and will automatically be reopened when replaced
 
 .. option:: --logrotate
 
-    enables `log rotation <https://docs.python.org/2/library/logging.handlers.html#timedrotatingfilehandler>`_
+    enables `log rotation <https://docs.python.org/3/library/logging.handlers.html#timedrotatingfilehandler>`_
     daily, keeping 30 backups. Log rotation frequency and number of backups is
     not configurable.
 
 .. option:: --syslog
 
-    logs to the system's event logger: `syslog on unices <https://docs.python.org/2/library/logging.handlers.html#sysloghandler>`_
-    and `the Event Log on Windows <https://docs.python.org/2/library/logging.handlers.html#nteventloghandler>`_.
+    logs to the system's event logger: `syslog on unices <https://docs.python.org/3/library/logging.handlers.html#sysloghandler>`_
+    and `the Event Log on Windows <https://docs.python.org/3/library/logging.handlers.html#nteventloghandler>`_.
 
     Neither is configurable
 
@@ -390,13 +390,13 @@ can be overridden using :option:`--config <flectra-bin -c>`. Specifying
 to that file.
 
 .. _jinja2: http://jinja.pocoo.org
-.. _regular expression: https://docs.python.org/2/library/re.html
+.. _regular expression: https://docs.python.org/3/library/re.html
 .. _password authentication:
     http://www.postgresql.org/docs/9.3/static/auth-methods.html#AUTH-PASSWORD
 .. _template database:
     http://www.postgresql.org/docs/9.3/static/manage-ag-templatedbs.html
 .. _level:
-    https://docs.python.org/2/library/logging.html#logging.Logger.setLevel
+    https://docs.python.org/3/library/logging.html#logging.Logger.setLevel
 .. _a PostgreSQL URI:
     http://www.postgresql.org/docs/9.2/static/libpq-connect.html#AEN38208
 .. _Werkzeug's proxy support:
diff --git a/doc/reference/forms/flectra_account_line.png b/doc/reference/forms/flectra_account_line.png
new file mode 100644
index 00000000..bbd886ed
Binary files /dev/null and b/doc/reference/forms/flectra_account_line.png differ
diff --git a/doc/reference/forms/flectra_wizard_popup.png b/doc/reference/forms/flectra_wizard_popup.png
new file mode 100644
index 00000000..b63e24cd
Binary files /dev/null and b/doc/reference/forms/flectra_wizard_popup.png differ
diff --git a/doc/reference/forms/header.png b/doc/reference/forms/header.png
index bf97b8cd..950ef65b 100644
Binary files a/doc/reference/forms/header.png and b/doc/reference/forms/header.png differ
diff --git a/doc/reference/forms/header2.png b/doc/reference/forms/header2.png
index 0d0dbbf9..9106a7d3 100644
Binary files a/doc/reference/forms/header2.png and b/doc/reference/forms/header2.png differ
diff --git a/doc/reference/forms/header3.png b/doc/reference/forms/header3.png
index 17e8fb9c..f3f747fc 100644
Binary files a/doc/reference/forms/header3.png and b/doc/reference/forms/header3.png differ
diff --git a/doc/reference/forms/nosheet.png b/doc/reference/forms/nosheet.png
index 99d915c9..15a25d7a 100644
Binary files a/doc/reference/forms/nosheet.png and b/doc/reference/forms/nosheet.png differ
diff --git a/doc/reference/forms/oppreadonly.png b/doc/reference/forms/oppreadonly.png
index 447e7bbf..58da30f0 100644
Binary files a/doc/reference/forms/oppreadonly.png and b/doc/reference/forms/oppreadonly.png differ
diff --git a/doc/reference/forms/placeholder.png b/doc/reference/forms/placeholder.png
index ab7d592f..2825be6c 100644
Binary files a/doc/reference/forms/placeholder.png and b/doc/reference/forms/placeholder.png differ
diff --git a/doc/reference/forms/screenshot-00.png b/doc/reference/forms/screenshot-00.png
deleted file mode 100644
index dca05afe..00000000
Binary files a/doc/reference/forms/screenshot-00.png and /dev/null differ
diff --git a/doc/reference/forms/screenshot-01.png b/doc/reference/forms/screenshot-01.png
index 464a2374..6a9a69d4 100644
Binary files a/doc/reference/forms/screenshot-01.png and b/doc/reference/forms/screenshot-01.png differ
diff --git a/doc/reference/forms/screenshot-02.png b/doc/reference/forms/screenshot-02.png
index ea6ec770..89b2ce8e 100644
Binary files a/doc/reference/forms/screenshot-02.png and b/doc/reference/forms/screenshot-02.png differ
diff --git a/doc/reference/forms/screenshot-03.png b/doc/reference/forms/screenshot-03.png
index 3a59801c..1b58b0e4 100644
Binary files a/doc/reference/forms/screenshot-03.png and b/doc/reference/forms/screenshot-03.png differ
diff --git a/doc/reference/forms/screenshot-04.png b/doc/reference/forms/screenshot-04.png
index b0de67d5..ab5f6cf3 100644
Binary files a/doc/reference/forms/screenshot-04.png and b/doc/reference/forms/screenshot-04.png differ
diff --git a/doc/reference/forms/sheet.png b/doc/reference/forms/sheet.png
index dee87a0e..78bbbde1 100644
Binary files a/doc/reference/forms/sheet.png and b/doc/reference/forms/sheet.png differ
diff --git a/doc/reference/forms/status.png b/doc/reference/forms/status.png
index 4f4a0cb1..2bd31871 100644
Binary files a/doc/reference/forms/status.png and b/doc/reference/forms/status.png differ
diff --git a/doc/reference/forms/status1.png b/doc/reference/forms/status1.png
index 7ccd80bb..e6726f5f 100644
Binary files a/doc/reference/forms/status1.png and b/doc/reference/forms/status1.png differ
diff --git a/doc/reference/forms/status2.png b/doc/reference/forms/status2.png
index b0d01bd2..d91c3de3 100644
Binary files a/doc/reference/forms/status2.png and b/doc/reference/forms/status2.png differ
diff --git a/doc/reference/forms/wizard-popup.png b/doc/reference/forms/wizard-popup.png
deleted file mode 100644
index d36549f8..00000000
Binary files a/doc/reference/forms/wizard-popup.png and /dev/null differ
diff --git a/doc/reference/guidelines.rst b/doc/reference/guidelines.rst
index ff408fc3..deb865d3 100644
--- a/doc/reference/guidelines.rst
+++ b/doc/reference/guidelines.rst
@@ -2,9 +2,9 @@
 
 .. highlight:: python
 
-===============
+==================
 Flectra Guidelines
-===============
+==================
 
 This page introduces the new Flectra Coding Guidelines. Those aim to improve the quality of the code (e.g. better readability of source) and Flectra Apps. Indeed, proper code eases maintenance, aids debugging, lowers complexity and promotes reliability.
 
@@ -479,7 +479,7 @@ So, you can write ``if some_collection:`` instead of ``if len(some_collection):`
   (a little bit outdated, but quite relevant)
 
 Programming in Flectra
--------------------
+----------------------
 
 - Avoid to create generators and decorators: only use the ones provided by
   the Flectra API.
diff --git a/doc/reference/images/odoo_mobile_api.png b/doc/reference/images/flectra_mobile_api.png
similarity index 100%
rename from doc/reference/images/odoo_mobile_api.png
rename to doc/reference/images/flectra_mobile_api.png
diff --git a/doc/reference/javascript.rst b/doc/reference/javascript.rst
index 17230610..3aaed168 100644
--- a/doc/reference/javascript.rst
+++ b/doc/reference/javascript.rst
@@ -15,7 +15,7 @@ Javascript
 Widgets
 =======
 
-.. class:: Widget
+:class:`~Widget`
 
     Exported in ``web.Widget``, the base class for all visual components.
     It corresponds to an MVC view, and provides a number of service to
@@ -412,8 +412,10 @@ Development Guidelines
 
 .. _deferred: http://api.jquery.com/category/deferred-object/
 
+====
 RPC
-===
+====
+
 
 To display and interact with data, calls to the Flectra server are necessary.
 This is performed using :abbr:`RPC <Remote Procedure Call>`.
@@ -699,8 +701,9 @@ For instance, to call the ``resequence`` of the
 
 .. _reference/javascript/client:
 
+===========
 Web Client
-==========
+===========
 
 Javascript module system overview
 ---------------------------------
@@ -834,9 +837,9 @@ Here are some basic conventions for the javascript code:
 
 
 
-
+=============================
 Testing in Flectra Web Client
-==========================
+=============================
 
 Javascript Unit Testing
 -----------------------
@@ -976,7 +979,7 @@ anything). The following list is available:
     inverse operation to :func:`equal`
 
 Getting an Flectra instance
-------------------------
+---------------------------
 
 The Flectra instance is the base through which most Flectra Web
 modules behaviors (functions, objects, …) are accessed. As a result,
diff --git a/doc/reference/mixins.rst b/doc/reference/mixins.rst
index 1dceeb90..9520139a 100644
--- a/doc/reference/mixins.rst
+++ b/doc/reference/mixins.rst
@@ -1084,10 +1084,4 @@ an action for the ratings:
     </record>
 
 Note that there are default views (kanban,pivot,graph) for ratings which allow
-you a quick bird's eye view of your customer ratings.
-
-You can find concrete examples of integration in the following models:
-
-* ``project.task`` in the Project (*rating_project*) Application
-* ``helpdesk.ticket`` in the Helpdesk (*helpdesk* - Flectra Enterprise only) Application
-
+you a quick bird's eye view of your customer ratings.
\ No newline at end of file
diff --git a/doc/reference/mobile.rst b/doc/reference/mobile.rst
deleted file mode 100644
index fe5ced21..00000000
--- a/doc/reference/mobile.rst
+++ /dev/null
@@ -1,213 +0,0 @@
-:banner: banners/mobile.jpg
-:types: api
-
-.. _reference/mobile:
-
-==================
-Mobile JavaScript
-==================
-
-Introduction
-============
-
-In Flectra 10.0 we released a mobile app which allows you to access all **Flectra apps**
-(even your customized modules). 
-
-The application is a combination of **Flectra Web** and **Native Mobile
-components**. In other words it is a Flectra Web instance loaded inside a native, mobile, WebView container.
-
-This page documents how you can access mobile native components like Camera,
-Vibration, Notification and Toast through Flectra Web (via JavaScript). For this, you
-do not need to be a mobile developer, if you know Flectra JavaScript API you can
-access all available mobile features.
-
-.. warning:: This features works with **Flectra Enterprise 10.0+** only
-
-How does it work? 
-=================
-
-Internal workings of the mobile application:
-
-.. image:: images/mobile_working.jpg
-
-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 (Flectra Web) is on the top of each layer, where the second layer is a Bridge
-between Flectra Web (JS) and the native mobile components.
-
-When any call from JavaScript is triggered it passes through Bridge and Bridge
-passes it to the native invoker to perform that action.
-
-When the native component has done its work, it is passed to the Bridge again and
-you get the output in JavaScript.
-
-Process time taken by the Native component depends on what you are requesting
-from the Native resources. For example the Camera or GPS Location.
-
-How to use it?
-==============
-
-Just like the Flectra Web Framework, the Mobile API can be used anywhere by getting the object from
-**web_mobile.rpc**
-
-.. image:: images/flectra_mobile_api.png
-
-The mobile RPC object provides a list of methods that are available (this only works with the mobile
-app). 
-
-Check if the method is available and then execute it.
-
-Methods
--------
-
-.. note:: Each of the methods returns a JQuery Deffered object which returns
-   a data JSON dictionary
-
-Show Toast in device
-.....................
-
-.. js:function:: showToast
-
-	: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.
-
-.. code-block:: javascript
-
-	mobile.methods.showToast({'message': 'Message sent'});
-
-.. image:: images/toast.png
-
-
-Vibrating device
-................
-
-
-.. js:function:: vibrate
-
-	:param object args: Vibrates constantly for the specified period of time
-	       (in milliseconds).
-
-Vibrate mobile device with given duration.
-
-.. code-block:: javascript
-
-	mobile.methods.vibrate({'duration': 100});
-
-Show snackbar with action
-.........................
-
-.. js:function:: showSnackBar
-
-	:param object args: (*required*) **Message** to show in snackbar and action **button label** in Snackbar (optional)
-	:returns:  ``True`` if the user clicks on the 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 or in the lower left corner on larger devices.
-Snackbars appear above all the other elements on the screen and only one can be
-displayed at a time.
-
-.. code-block:: javascript
-
-	mobile.methods.showSnackBar({'message': 'Message is deleted', 'btn_text': 'Undo'}).then(function(result){
-		if(result){
-			// Do undo operation
-		}else{
-			// Snack Bar dismissed
-		}
-	});
-
-.. image:: images/snackbar.png
-
-Showing notification
-.....................
-
-.. js:function:: showNotification
-
-	: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.
-
-.. code-block:: javascript
-	
-	mobile.showNotification({'title': 'Simple Notification', 'message': 'This is a test for a simple notification'})
-
-.. image:: images/mobile_notification.png
-
-
-Create contact in device
-.........................
-
-.. js:function:: addContact
-
-	:param object args: Dictionary with contact details. Possible keys (name, mobile, phone, fax, email, website, street, street2, country_id, state_id, city, zip, parent_id, function and image)
-
-Create a new device contact with the given contact details.
-
-.. code-block:: javascript
-	
-	var contact = {
-		'name': 'Michel Fletcher',
-		'mobile': '9999999999',
-		'phone': '7954856587',
-		'fax': '765898745',
-		'email': 'michel.fletcher@agrolait.example.com',
-		'website': 'http://www.agrolait.com',
-		'street': '69 rue de Namur',
-		'street2': false,
-		'country_id': [21, 'Belgium'],
-		'state_id': false,
-		'city': 'Wavre',
-		'zip': '1300',
-		'parent_id': [8, 'Agrolait'],
-		'function': 'Analyst',
-		'image': '<<BASE 64 Image Data>>'
-	}
-
-	mobile.methods.addContact(contact);
-
-.. image:: images/mobile_contact_create.png
-
-Scanning barcodes
-..................
-
-.. js:function:: scanBarcode
-
-	:returns: Scanned ``code`` from any barcode
-
-The barcode API detects barcodes in real-time, on the device, in any orientation.
-
-The barcode API can read the following barcode formats:
-
-* 1D barcodes: EAN-13, EAN-8, UPC-A, UPC-E, Code-39, Code-93, Code-128, ITF, Codabar
-* 2D barcodes: QR Code, Data Matrix, PDF-417, AZTEC
-
-.. code-block:: javascript
-
-	mobile.methods.scanBarcode().then(function(code){
-		if(code){
-			// Perform operation with the scanned code
-		}
-	});
-
-Switching account in device
-...........................
-
-.. js:function:: switchAccount
-
-Use switchAccount to switch from one account to another on the device.
-
-.. code-block:: javascript
-	
-	mobile.methods.switchAccount();
-
-.. image:: images/mobile_switch_account.png
diff --git a/doc/reference/orm.rst b/doc/reference/orm.rst
index d59e3229..40de0d9b 100644
--- a/doc/reference/orm.rst
+++ b/doc/reference/orm.rst
@@ -9,12 +9,8 @@ ORM API
 Recordsets
 ==========
 
-.. versionadded:: 8.0
-
-    This page documents the New API added in Flectra 8.0 which should be the
-    primary development API going forward. It also provides information about
-    porting from or bridging with the "old API" of versions 7 and earlier, but
-    does not explicitly document that API. See the old documentation for that.
+    This page documents the New API added in Flectra 1.0 which should be the
+    primary development API going forward.
 
 Interaction with models and records is performed through recordsets, a sorted
 set of records of the same model.
@@ -662,8 +658,6 @@ Model Reference
         list of ``(constraint_function, message, fields)`` defining Python
         constraints. The fields list is indicative
 
-        .. deprecated:: 8.0
-
             use :func:`~flectra.api.constrains`
 
     .. attribute:: _sql_constraints
diff --git a/doc/reference/security.rst b/doc/reference/security.rst
index fd830dc6..bf7524df 100644
--- a/doc/reference/security.rst
+++ b/doc/reference/security.rst
@@ -2,9 +2,9 @@
 
 .. _reference/security:
 
-================
+===================
 Security in Flectra
-================
+===================
 
 Aside from manually managing access using custom code, Flectra provides two main
 data-driven mechanisms to manage or restrict access to data.
@@ -78,8 +78,6 @@ This means the first *group rule* restricts access, but any further
 Field Access
 ============
 
-.. versionadded:: 7.0
-
 An ORM :class:`~flectra.fields.Field` can have a ``groups`` attribute
 providing a list of groups (as a comma-separated string of
 :term:`external identifiers`).
@@ -99,4 +97,4 @@ access to the field:
     read/write...
 
 .. _foo: http://google.com
-.. _time module: https://docs.python.org/2/library/time.html
+.. _time module: https://docs.python.org/3/library/time.html
diff --git a/doc/reference/testing.rst b/doc/reference/testing.rst
index fe7ac4be..45ac60a0 100644
--- a/doc/reference/testing.rst
+++ b/doc/reference/testing.rst
@@ -32,11 +32,8 @@ and ``__init__.py`` contains::
     test modules which are not imported from ``tests/__init__.py`` will not be
     run
 
-.. versionchanged:: 8.0
-
-    previously, the test runner would only run modules added to two lists
-    ``fast_suite`` and ``checks`` in ``tests/__init__.py``. In 8.0 it will
-    run all imported modules
+the test runner would only run modules added to two lists
+``fast_suite`` and ``checks`` in ``tests/__init__.py``.
 
 The test runner will simply run any test case, as described in the official
 `unittest documentation`_, but Flectra provides a number of utilities and helpers
@@ -86,7 +83,7 @@ Tests are automatically run when installing or updating modules if
 :option:`--test-enable <flectra-bin --test-enable>` was enabled when starting the
 Flectra server.
 
-As of Flectra 8, running tests outside of the install/update cycle is not
+As of Flectra, running tests outside of the install/update cycle is not
 supported.
 
-.. _unittest documentation: https://docs.python.org/2/library/unittest.html
+.. _unittest documentation: https://docs.python.org/3/library/unittest.html
diff --git a/doc/reference/views.rst b/doc/reference/views.rst
index 5774fa3c..eadcf974 100644
--- a/doc/reference/views.rst
+++ b/doc/reference/views.rst
@@ -521,7 +521,7 @@ attribute ``statusbar_visible``.
 ::
 
     <field name="state" widget="statusbar"
-        statusbar_visible="draft,sent,progress,invoiced,done" />
+        statusbar_visible="draft,sent,sale,done,cancel" />
 
 The Sheet
 '''''''''
@@ -569,13 +569,23 @@ blocks): content following the field will be displayed on the same line rather
 than on the line below it. The form above is produced by the following XML::
 
     <label for="name" class="oe_edit_only"/>
-    <h1><field name="name"/></h1>
-
-    <label for="planned_revenue" class="oe_edit_only"/>
-    <h2>
-        <field name="planned_revenue" class="oe_inline"/>
-        <field name="company_currency" class="oe_inline oe_edit_only"/> at
-        <field name="probability" class="oe_inline"/> % success rate
+    <h1><field name="name" placeholder="e.g. Product Pricing"/></h1>
+    <h2 class="o_row">
+        <div>
+            <label for="planned_revenue" class="oe_edit_only" />
+            <div class="o_row">
+                <field name="company_currency" invisible="1"/>
+                <field name="planned_revenue" widget='monetary' options="{'currency_field': 'company_currency'}"/>
+                <span class="oe_grey"> at </span>
+            </div>
+        </div>
+        <div>
+            <label for="probability" class="oe_edit_only"/>
+            <div class="o_row">
+                <field name="probability" widget="integer"/>
+                <span>%%</span>
+            </div>
+        </div>
     </h2>
 
 Button Box
@@ -596,8 +606,8 @@ block on the top of the sheet.
 ::
 
     <div class="oe_button_box" name="button_box">
-        <button string="Schedule/Log Call" name="..." type="action"/>
-        <button string="Schedule Meeting" name="action_makeMeeting" type="object"/>
+        <button class="oe_stat_button" type="object" context="{'partner_id': partner_id}" name="action_schedule_meeting" icon="fa-calendar">
+        <button class="oe_stat_button" type="action" name=".." icon="fa-pencil-square-o" context="{'default_partner_id': partner_id, 'search_default_draft': 1}">
     </div>
 
 Groups and Titles
@@ -611,10 +621,11 @@ optional title.
 
 ::
 
-    <group string="Payment Options">
-        <field name="writeoff_amount"/>
-        <field name="payment_option"/>
-    </group>
+     <group string="Marketing">
+        <field name="campaign_id"/>
+        <field name="medium_id"/>
+        <field name="source_id"/>
+     </group>
 
 It is recommended to have two columns of fields on the form. For this, simply
 put the ``<group>`` elements that contain the fields inside a top-level
@@ -629,17 +640,21 @@ Special Case: Subtotals
 
 Some classes are defined to render subtotals like in invoice forms:
 
-.. image:: forms/screenshot-00.png
+.. image:: forms/flectra_account_line.png
    :class: img-responsive
 
 ::
 
-    <group class="oe_subtotal_footer">
+     <group class="oe_subtotal_footer oe_right">
         <field name="amount_untaxed"/>
         <field name="amount_tax"/>
         <field name="amount_total" class="oe_subtotal_footer_separator"/>
-        <field name="residual" style="margin-top: 10px"/>
-    </group>
+        <field name="payments_widget" colspan="2" nolabel="1" widget="payment"/>
+        <field name="residual" class="oe_subtotal_footer_separator" attrs="{'invisible': [('state', '=', 'draft')]}"/>
+        <field name="reconciled" invisible="1"/>
+        <field name="outstanding_credits_debits_widget" colspan="2" nolabel="1" widget="payment" attrs="{'invisible': [('state', 'not in', 'open')]}"/>
+     </group>
+
 
 Placeholders and Inline Fields
 ..............................
@@ -673,10 +688,10 @@ inline fields (zip and city).
         <label for="street" string="Address"/>
         <div>
             <field name="street" placeholder="Street..."/>
-            <field name="street2"/>
+            <field name="street2"  placeholder="Street 2..."/>
             <div>
-                <field name="zip" class="oe_inline" placeholder="ZIP"/>
-                <field name="city" class="oe_inline" placeholder="City"/>
+                <field name="zip" class="o_address_zip" placeholder="ZIP"/>
+                <field name="city" class="o_address_city" placeholder="City"/>
             </div>
             <field name="state_id" placeholder="State"/>
             <field name="country_id" placeholder="Country"/>
@@ -686,7 +701,7 @@ inline fields (zip and city).
 Images
 ......
 
-Images, like avatars, should be displayed on the right of the sheet.  The
+Images, like avatars, By default avatars should be displayed on the left of the sheet.  The
 product form looks like:
 
 .. image:: forms/screenshot-02.png
@@ -696,7 +711,7 @@ The form above contains a <sheet> element that starts with:
 
 ::
 
-    <field name="product_image" widget="image" class="oe_avatar oe_right"/>
+    <field name="image_medium" widget="image" class="oe_avatar"/>
 
 Tags
 ....
@@ -715,7 +730,7 @@ Configuration forms guidelines
 ------------------------------
 
 Examples of configuration forms: Stages, Leave Type, etc.  This concerns all
-menu items under Configuration of each application (like Sales/Configuration).
+menu items under Configuration of each application (like CRM/Configuration).
 
 .. image:: forms/nosheet.png
    :class: img-responsive
@@ -726,19 +741,16 @@ menu items under Configuration of each application (like Sales/Configuration).
 Dialog forms guidelines
 -----------------------
 
-Example: "Schedule a Call" from an opportunity.
+Example: "Create Invoice" from a sale order.
 
-.. image:: forms/wizard-popup.png
+.. image:: forms/flectra_wizard_popup.png
    :class: img-responsive
 
 1. avoid separators (the title is already in the popup title bar, so another
    separator is not relevant)
-2. avoid cancel buttons (user generally close the popup window to get the same
-   effect)
-3. action buttons must be highlighted (red)
-4. when there is a text area, use a placeholder instead of a label or a
+2. action buttons must be highlighted (red)
+3. when there is a text area, use a placeholder instead of a label or a
    separator
-5. like in regular form views, put buttons in the <header> element
 
 Configuration Wizards guidelines
 --------------------------------
@@ -1179,7 +1191,7 @@ Possible children elements of the search view are:
         make the field only available to specific users
     ``widget``
         use specific search widget for the field (the only use case in
-        standard Flectra 8.0 is a ``selection`` widget for
+        standard Flectra 1.0 is a ``selection`` widget for
         :class:`~flectra.fields.Many2one` fields)
     ``domain``
         if the field can provide an auto-completion
@@ -1214,7 +1226,6 @@ Possible children elements of the search view are:
 
     .. tip::
 
-       .. versionadded:: 7.0
 
        Sequences of filters (without non-filters separating them) are treated
        as inclusively composited: they will be composed with ``OR`` rather
diff --git a/doc/setup.rst b/doc/setup.rst
index f2001089..d238c6ca 100644
--- a/doc/setup.rst
+++ b/doc/setup.rst
@@ -9,5 +9,3 @@ Setting Up
 
     setup/install
     setup/deploy
-    setup/cdn
-    setup/enterprise
diff --git a/doc/setup/cdn.rst b/doc/setup/cdn.rst
deleted file mode 100644
index f3dfadfe..00000000
--- a/doc/setup/cdn.rst
+++ /dev/null
@@ -1,81 +0,0 @@
-:banner: banners/cdn.jpg
-
-========================================
-Deploying with Content Delivery Networks
-========================================
-
-.. _reference/cdn/keycdn:
-
-Deploying with KeyCDN_
-======================
-
-.. sectionauthor:: Fabien Meghazi
-
-This document will guide you through the setup of a KeyCDN_ account with your
-Flectra powered website.
-
-Step 1: Create a pull zone in the KeyCDN dashboard
---------------------------------------------------
-
-.. image:: cdn/keycdn_create_a_pull_zone.png
-   :class: img-responsive
-
-When creating the zone, enable the CORS option in the
-:guilabel:`advanced features` submenu. (more on that later)
-
-.. image:: cdn/keycdn_enable_CORS.png
-   :class: img-responsive
-
-Once done, you'll have to wait a bit while KeyCDN_ is crawling your website.
-
-.. image:: cdn/keycdn_progressbar.png
-   :class: img-responsive
-
-.. note:: a new URL has been generated for your Zone, in this case it is
-          ``http://pulltest-b49.kxcdn.com``
-
-Step 2: Configure the flectra instance with your zone
---------------------------------------------------
-
-In the Flectra back end, go to the :guilabel:`Website Settings`: menu, then
-activate the CDN support and copy/paste your zone URL in the
-:guilabel:`CDN Base URL` field.
-
-.. image:: cdn/flectra_cdn_base_url.png
-   :class: img-responsive
-
-Now your website is using the CDN for the resources matching the
-:guilabel:`CDN filters` regular expressions.
-
-You can have a look to the HTML of your website in order to check if the CDN
-integration is properly working.
-
-.. image:: cdn/flectra_check_your_html.png
-   :class: img-responsive
-
-
-Why should I activate CORS?
----------------------------
-
-A security restriction in some browsers (Firefox and Chrome at time of writing)
-prevents a remotely linked CSS file to fetch relative resources on this same
-external server.
-
-If you don't activate the CORS option in the CDN zone, the more obvious
-resulting problem on a default Flectra website will be the lack of font-awesome
-icons because the font file declared in the font-awesome CSS won't be loaded on
-the remote server.
-
-Here's what you would see on your homepage in such a case:
-
-.. image:: cdn/flectra_font_file_not_loaded.png
-   :class: img-responsive
-
-A security error message will also appear in the browser's console:
-
-.. image:: cdn/flectra_security_message.png
-   :class: img-responsive
-
-Enabling the CORS option in the CDN fixes this issue.
-
-.. _KeyCDN: https://www.keycdn.com
diff --git a/doc/setup/cdn/keycdn_create_a_pull_zone.png b/doc/setup/cdn/keycdn_create_a_pull_zone.png
deleted file mode 100644
index ae8d8e29..00000000
Binary files a/doc/setup/cdn/keycdn_create_a_pull_zone.png and /dev/null differ
diff --git a/doc/setup/cdn/keycdn_enable_CORS.png b/doc/setup/cdn/keycdn_enable_CORS.png
deleted file mode 100644
index f95c2406..00000000
Binary files a/doc/setup/cdn/keycdn_enable_CORS.png and /dev/null differ
diff --git a/doc/setup/cdn/keycdn_progressbar.png b/doc/setup/cdn/keycdn_progressbar.png
deleted file mode 100644
index e40c819d..00000000
Binary files a/doc/setup/cdn/keycdn_progressbar.png and /dev/null differ
diff --git a/doc/setup/cdn/odoo_cdn_base_url.png b/doc/setup/cdn/odoo_cdn_base_url.png
deleted file mode 100644
index e5c7c185..00000000
Binary files a/doc/setup/cdn/odoo_cdn_base_url.png and /dev/null differ
diff --git a/doc/setup/cdn/odoo_check_your_html.png b/doc/setup/cdn/odoo_check_your_html.png
deleted file mode 100644
index 542afe94..00000000
Binary files a/doc/setup/cdn/odoo_check_your_html.png and /dev/null differ
diff --git a/doc/setup/cdn/odoo_font_file_not_loaded.png b/doc/setup/cdn/odoo_font_file_not_loaded.png
deleted file mode 100644
index e695261f..00000000
Binary files a/doc/setup/cdn/odoo_font_file_not_loaded.png and /dev/null differ
diff --git a/doc/setup/cdn/odoo_security_message.png b/doc/setup/cdn/odoo_security_message.png
deleted file mode 100644
index 68b860f2..00000000
Binary files a/doc/setup/cdn/odoo_security_message.png and /dev/null differ
diff --git a/doc/setup/deploy.rst b/doc/setup/deploy.rst
index 30f0095a..eef0bcea 100644
--- a/doc/setup/deploy.rst
+++ b/doc/setup/deploy.rst
@@ -1,8 +1,8 @@
 :banner: banners/deploying_flectra.jpg
 
-==============
+=================
 Deploying Flectra
-==============
+=================
 
 This document describes basic steps to set up Flectra in production or on an
 internet-facing server. It follows :ref:`installation <setup/install>`, and is
@@ -119,7 +119,7 @@ in ``/etc/postgresql/9.5/main/postgresql.conf`` set:
 .. _setup/deploy/flectra:
 
 Configuring Flectra
-----------------
+-------------------
 
 Out of the box, Flectra connects to a local postgres over UNIX socket via port
 5432. This can be overridden using :ref:`the database options
@@ -332,7 +332,7 @@ in ``/etc/nginx/sites-enabled/flectra.conf`` set:
   }
  
 Flectra as a WSGI Application
-==========================
+=============================
 
 It is also possible to mount Flectra as a standard WSGI_ application. Flectra
 provides the base for a WSGI launcher script as ``flectra-wsgi.example.py``. That
@@ -505,8 +505,7 @@ distinction is made according to the browser version in order to be
 up-to-date. Flectra is supported on the current browser version. The list 
 of the supported browsers by Flectra version is the following:
 
-- **Flectra 9:** IE11, Mozilla Firefox, Google Chrome, Safari, Microsoft Edge
-- **Flectra 10+:** Mozilla Firefox, Google Chrome, Safari, Microsoft Edge
+- **Flectra 1.0+:** Mozilla Firefox, Google Chrome, Safari, Microsoft Edge
 
 .. [#different-machines]
     to have multiple Flectra installations use the same PostgreSQL database,
diff --git a/doc/setup/enterprise.rst b/doc/setup/enterprise.rst
deleted file mode 100644
index e4d3055c..00000000
--- a/doc/setup/enterprise.rst
+++ /dev/null
@@ -1,106 +0,0 @@
-:banner: banners/enterprise.jpg
-.. _setup/enterprise:
-
-============================
-From Community to Enterprise
-============================
-
-Depending on your current installation, there are multiple ways to upgrade
-your community version.
-In any case the basic guidelines are:
-
-* Backup your community database
-
-  .. image:: enterprise/db_manager.png
-    :class: img-responsive
-
-* Shutdown your server
-
-* Install the web_enterprise module
-
-* Restart your server
-
-* Enter your Flectra Enterprise Subscription code
-
-.. image:: enterprise/enterprise_code.png
-  :class: img-responsive
-
-On Linux, using an installer
-============================
-
-* Backup your community database
-
-* Stop the flectra service
-
-  .. code-block:: console
-
-    $ sudo service flectra stop
-
-* Install the enterprise .deb (it should install over the community package)
-
-  .. code-block:: console
-
-    $ sudo dpkg -i <path_to_enterprise_deb>
-  
-* Update your database to the enterprise packages using
-
-  .. code-block:: console
-
-    $ python3 /usr/bin/flectra.py -d <database_name> -i web_enterprise --stop-after-init
-
-* You should be able to connect to your Flectra Enterprise instance using your usual mean of identification.
-  You can then link your database with your Flectra Enterprise Subscription by entering the code you received
-  by e-mail in the form input
-
-
-On Linux, using the source code
-===============================
-
-There are many ways to launch your server when using sources, and you probably
-have your own favourite. You may need to adapt sections to your usual workflow.
-
-* Shutdown your server
-* Backup your community database
-* Update the ``--addons-path`` parameter of your launch command (see :ref:`setup/install/source`)
-* Install the web_enterprise module by using
-
-  .. code-block:: console
-
-    $ -d <database_name> -i web_enterprise --stop-after-init
-
-  Depending on the size of your database, this may take some time.
-
-* Restart your server with the updated addons path of point 3.
-  You should be able to connect to your instance. You can then link your database with your
-  Flectra Enterprise Subscription by entering the code you received by e-mail in the form input
-
-On Windows
-==========
-
-* Backup your community database
-
-* Uninstall Flectra Community (using the Uninstall executable in the installation folder) -
-  PostgreSQL will remain installed
-
-  .. image:: enterprise/windows_uninstall.png
-    :class: img-responsive
-
-* Launch the Flectra Enterprise Installer and follow the steps normally. When choosing
-  the installation path, you can set the folder of the Community installation
-  (this folder still contains the PostgreSQL installation).
-  Uncheck ``Start Flectra`` at the end of the installation
-
-  .. image:: enterprise/windows_setup.png
-   :class: img-responsive
-
-* Using a command window, update your Flectra Database using this command (from the Flectra
-  installation path, in the server subfolder)
-
-  .. code-block:: console
-
-    $ flectra.exe -d <database_name> -i web_enterprise --stop-after-init
-
-* No need to manually launch the server, the service is running.
-  You should be able to connect to your Flectra Enterprise instance using your usual
-  mean of identification. You can then link your database with your Flectra Enterprise
-  Subscription by entering the code you received by e-mail in the form input
diff --git a/doc/setup/enterprise/db_manager.png b/doc/setup/enterprise/db_manager.png
deleted file mode 100644
index 7805e101..00000000
Binary files a/doc/setup/enterprise/db_manager.png and /dev/null differ
diff --git a/doc/setup/enterprise/enterprise_code.png b/doc/setup/enterprise/enterprise_code.png
deleted file mode 100644
index af4af289..00000000
Binary files a/doc/setup/enterprise/enterprise_code.png and /dev/null differ
diff --git a/doc/setup/enterprise/windows_setup.png b/doc/setup/enterprise/windows_setup.png
deleted file mode 100644
index 8c790579..00000000
Binary files a/doc/setup/enterprise/windows_setup.png and /dev/null differ
diff --git a/doc/setup/enterprise/windows_uninstall.png b/doc/setup/enterprise/windows_uninstall.png
deleted file mode 100644
index 14e287d0..00000000
Binary files a/doc/setup/enterprise/windows_uninstall.png and /dev/null differ
diff --git a/doc/setup/install.rst b/doc/setup/install.rst
index 2a463104..509c509d 100644
--- a/doc/setup/install.rst
+++ b/doc/setup/install.rst
@@ -2,18 +2,15 @@
 
 .. _setup/install:
 
-===============
+==================
 Installing Flectra
-===============
+==================
 
 There are mutliple ways to install Flectra, or not install it at all, depending
 on the intended use case.
 
 This documents attempts to describe most of the installation options.
 
-:ref:`setup/install/online`
-    The easiest way to use Flectra in production or to try it.
-
 :ref:`setup/install/packaged`
     Suitable for testing Flectra, developing modules and can be used for
     long-term production use with additional deployment and maintenance work.
@@ -27,26 +24,10 @@ This documents attempts to describe most of the installation options.
     If you usually use docker_ for development or deployment, an official
     docker_ base image is available.
 
-.. _setup/install/editions:
-
-Editions
-========
-
-There are two different Editions_ of Flectra: the Community and Enterprise versions.
-Using the Enterprise version is possible on our SaaS_ and accessing the code is
-restricted to Enterprise customers and partners. The Community version is freely
-available to anyone.
-
-If you already use the Community version and wish to upgrade to Enterprise, please
-refer to :ref:`setup/enterprise` (except for :ref:`setup/install/source`).
-
-.. _setup/install/online:
-
-Online
-======
+.. _setup/install/demo:
 
 Demo
-----
+======
 
 To simply get a quick idea of Flectra, demo_ instances are available. They are
 shared instances which only live for a few hours, and can be used to browse
@@ -74,20 +55,15 @@ Packaged installers
 
 Flectra provides packaged installers for Windows, deb-based distributions
 (Debian, Ubuntu, …) and RPM-based distributions (Fedora, CentOS, RHEL, …) for
-both the Community and Enterprise versions.
+the Community versions.
 
-These packages automatically set up all dependencies (for the Community version),
-but may be difficult to keep up-to-date.
-
-Official Community packages with all relevant dependency requirements are
-available on our nightly_ server. Both Communtiy and Enterprise packages can
-be downloaded from our Download_ page (you must to be logged in as a paying
-customer or partner to download the Enterprise packages).
+These packages automatically set up all dependencies,but may be difficult
+to keep up-to-date.
 
 Windows
 -------
 
-* Download the installer from our nightly_ server (Community only)
+* Download the installer from our Community only
   or the Windows installer from the Download_ page (any edition)
 * Run the downloaded file
 
@@ -106,7 +82,7 @@ Linux
 Debian/Ubuntu
 '''''''''''''
 
-Flectra 11.0 'deb' package currently supports `Debian Stretch`_, `Ubuntu Xenial`_,
+Flectra 1.0 'deb' package currently supports `Debian Stretch`_, `Ubuntu Xenial`_,
 `Ubuntu Zesty`_ and `Ubuntu Artful`_.
 
 Prepare
@@ -131,8 +107,8 @@ Repository
 ^^^^^^^^^^
 
 Flectra S.A. provides a repository that can be used with  Debian and Ubuntu
-distributions. It can be used to install Flectra Community Edition by executing the
-following commands as root:
+distributions. It can be used to install Flectra by executing the following
+commands as root:
 
 .. code-block:: console
 
@@ -142,16 +118,13 @@ following commands as root:
 
 You can then use the usual ``apt-get upgrade`` command to keep your installation up-to-date.
 
-At this moment, there is no repository for the Enterprise Edition.
-
 Deb Package
 ^^^^^^^^^^^
 
 Instead of using the repository as described above, the 'deb' package can be
 downloaded here:
 
-* Community Edition: `nightly`_
-* Enterprise Edition `Download`_
+* Community Edition: `flectrahq`_
 
 You can then use ``gdebi``:
 
@@ -200,9 +173,9 @@ If you need this feature, you can install the python module like this:
 Fedora
 ''''''
 
-Flectra 11.0 'rpm' package supports Fedora 26.
+Flectra 1.0 'rpm' package supports Fedora 26.
 As of 2017, CentOS does not have the minimum Python requirements (3.5) for
-Flectra 11.0.
+Flectra 1.0.
 
 Prepare
 ^^^^^^^
@@ -231,7 +204,7 @@ commands:
 
 .. code-block:: console
 
-    $ sudo dnf config-manager --add-repo=https://nightly.flectra.com/11.0/nightly/rpm/flectra.repo
+    $ sudo dnf config-manager --add-repo=https://download.flectrahq.com/1.0/pub/rpm/flectra_1.0.latest.noarch.rpm
     $ sudo dnf install -y flectra
     $ sudo systemctl enable flectra
     $ sudo systemctl start flectra
@@ -242,14 +215,13 @@ RPM package
 Instead of using the repository as described above, the 'rpm' package can be
 downloaded here:
 
-* Community Edition: `nightly`_
-* Enterprise Edition `Download`_
+* Community Edition: `flectrahq_rpm`_
 
 Once downloaded, the package can be installed using the 'dnf' package manager:
 
 .. code-block:: console
 
-    $ sudo dnf localinstall flectra_11.0.latest.noarch.rpm
+    $ sudo dnf localinstall flectra_1.0.latest.noarch.rpm
     $ sudo systemctl enable flectra
     $ sudo systemctl start flectra
 
@@ -418,58 +390,19 @@ Fetch the sources
 
 There are two ways to obtain the Flectra source code: zip or git.
 
-* Flectra zip can be downloaded from  our nightly_ server or our Download_  page,
+* Flectra zip can be downloaded from  our flectrahq_ server or our flectrahq_zip_  page,
   the zip file then needs to be uncompressed to use its content
 
-* git allows simpler update and easier switching between different versions
+* gitlab allows simpler update and easier switching between different versions
   of Flectra. It also simplifies maintaining non-module patches and
   contributions.  The primary drawback of git is that it is significantly
   larger than a tarball as it contains the entire history of the Flectra project.
 
-Community Edition
-'''''''''''''''''
-
-The git repository is https://github.com/flectra/flectra.git for the Community
-edition.
-
-Downloading it requires a `git client <http://git-scm.com/download/>`_
-(which may be available via your distribution on linux) and can be performed
-using the following command:
-
-.. code-block:: console
-
-    $ git clone https://github.com/flectra/flectra.git
-
-Enterprise Edition
-''''''''''''''''''
-
-If you have access to the Enterprise repository (see :ref:`setup/install/editions`
-if you wish to get access), you can use this command to fetch the addons:
-
-.. code-block:: console
-
-  $ git clone https://github.com/flectra/enterprise.git
-
-.. note:: The Enterprise git repository **does not contain the full Flectra
-    source code**. It is only a collection of extra add-ons. The main server
-    code is in the Community version.  Running the Enterprise version actually
-    means running the server from the Community version with the addons-path option
-    set to the folder with the Enterprise version.
-
-    You need to clone both the Community and Enterprise repository to have a working
-    Flectra installation
-
 Running Flectra
-------------
+---------------
 
 Once all dependencies are set up, Flectra can be launched by running ``flectra-bin``.
 
-.. tip:: For the Enterprise edition, you must specify the :file:`enterprise`
-    addons folder when starting your server. You can do so by providing the path
-    to your :file:`enterprise` folder in the ``addons-path`` parameter. Please
-    note that the :file:`enterprise` folder must come before the default
-    :file:`addons` folder in the  list for the addons to be loaded correctly.
-
 :ref:`Configuration <reference/cmdline>` can be provided either through
 :ref:`command-line arguments <reference/cmdline>` or through a
 :ref:`configuration file <reference/cmdline/config>`.
@@ -494,7 +427,7 @@ Under Windows a typical way to execute flectra would be:
 
 Where ``flectra``, ``flectra`` are the postgresql login and password,
 ``../mymodules`` a directory with additional addons and ``mydb`` the default
-db to serve on localhost:8069
+db to serve on localhost:7073
 
 Under Unix a typical way to execute flectra would be:
 
@@ -503,7 +436,7 @@ Under Unix a typical way to execute flectra would be:
     $ ./flectra-bin --addons-path=addons,../mymodules --db-filter=mydb$
 
 Where ``../mymodules`` is a directory with additional addons and ``mydb`` the
-default db to serve on localhost:8069
+default db to serve on localhost:7073
 
 Virtualenv
 ----------
@@ -588,11 +521,10 @@ Docker
 ======
 
 The full documentation on how to use Flectra with Docker can be found on the
-offcial Flectra `docker image <https://registry.hub.docker.com/_/flectra/>`_ page.
+offcial Flectra `docker image <https://hub.docker.com/r/flectrahq/flectra/>`_ page.
 
 .. _demo: https://demo.flectra.com
 .. _docker: https://www.docker.com
-.. _Download: https://www.flectra.com/page/download
 .. _Debian Stretch: https://www.debian.org/releases/stretch/
 .. _Ubuntu Xenial: http://releases.ubuntu.com/16.04/
 .. _Ubuntu Zesty: http://releases.ubuntu.com/17.04/
@@ -616,8 +548,12 @@ offcial Flectra `docker image <https://registry.hub.docker.com/_/flectra/>`_ pag
 .. _virtualenv: https://pypi.python.org/pypi/virtualenv
 .. _virtualenvwrapper: https://virtualenvwrapper.readthedocs.io/en/latest/
 .. _pywin32: http://sourceforge.net/projects/pywin32/files/pywin32/
-.. _the repository: https://github.com/flectra/flectra
+.. _the repository: https://gitlab.com/flectra-hq/flectra
 .. _git: http://git-scm.com
 .. _Editions: https://www.flectra.com/pricing#pricing_table_features
-.. _nightly: https://nightly.flectra.com/11.0/nightly/
-.. _extra: https://nightly.flectra.com/extra/
+.. _extra: https://download.flectrahq.com/1.0/pub/
+.. _flectrahq_rpm: https://download.flectrahq.com/1.0/pub/rpm/
+.. _Download: https://download.flectrahq.com/
+.. _flectrahq_zip: https://download.flectrahq.com/1.0/pub/src/flectra_1.0.latest.zip
+.. _flectrahq: https://download.flectrahq.com/1.0/pub/deb/flectra_1.0.latest_all.deb
+
diff --git a/doc/webservices.rst b/doc/webservices.rst
index 8173c583..b9799a47 100644
--- a/doc/webservices.rst
+++ b/doc/webservices.rst
@@ -9,6 +9,4 @@ Web Services
     :titlesonly:
 
     webservices/flectra
-    webservices/iap
-    webservices/upgrade
     webservices/localization
\ No newline at end of file
diff --git a/doc/webservices/iap.rst b/doc/webservices/iap.rst
deleted file mode 100644
index 445a8e3b..00000000
--- a/doc/webservices/iap.rst
+++ /dev/null
@@ -1,597 +0,0 @@
-:banner: banners/iap.jpg
-:types: api
-
-.. _webservices/iap:
-
-.. using sphinx-patchqueue:
-    * the "queue" directive selects a *series* file which lists the patches in
-      the patch queue, in order of application (from top to bottom). The
-      corresponding patch files should be in the same directory.
-    * the "patch" directive steps to the next patch in the queue, applies it
-      and reifies its content (depending on the extension's configuration, by
-      default it shows the changed files post-diff application, slicing to
-      only display sections affecte by the file)
-
-.. while it's technically possible to apply and update patches by hand, it's
-   finnicky work and easy to break.
-
-.. the easiest way is to install quilt (http://savannah.nongnu.org/projects/quilt),
-   go to the directory where you want to reify the addon, then create a
-   "patches" symlink to the patches directory (the iap/ folder next to this
-   file) or set QUILT_PATCHES to that folder.
-
-.. at that point you have a "primed" queue with no patch applied, and you can
-   move within the queue with "quilt push" and "quilt pop".
-    * "quilt new" creates a new empty patch at the top of the stack
-    * "quilt add" tells quilt to start tracking the file, quilt add *works per
-      patch*, it must be called *every time you want to alter a file within a
-      patch*: quilt is not a full VCS (since it's intended to sit on top of
-      an existing source) and does not do permanent tracking of files
-    * "quilt edit" is a shorthand to "quilt add" then open the file in your
-      editor, I suggest you use that rather than open the edited module
-      normally, it avoids forgetting to "quilt add" before doing your
-      modifications (at which point your modifications are untracked,
-      invisible and depending on your editor may be a PITA to revert & redo)
-    * "quilt refresh" updates the current patch to include pending changes
-
-.. see "man quilt" for the rest of the subcommands. FWIW I could not get
-   "quilt setup" to do anything useful.
-
-================
-In-App Purchases
-================
-
-In-App Purchase (IAP) allow providers of ongoing services through Flectra apps to
-be compensated for ongoing service use rather than — and possibly instead of
-— a sole initial purchase.
-
-In that context, Flectra acts mostly as a *broker* between a client and an Flectra
-App Developer:
-
-* users purchase service tokens from Flectra
-* service providers draw tokens from the user's Flectra account when service
-  is requested
-
-.. attention::
-
-    This document is intended for *service providers* and presents the latter,
-    which can be done either via direct JSON-RPC2_ or if you are using Flectra
-    using the convenience helpers it provides.
-
-Overview
-========
-
-.. figure:: images/players.png
-    :align: center
-
-    The Players
-
-    * The Service Provider is (probably) you the reader, you will be providing
-      value to the client in the form of a service paid per-use
-    * The Client installed your Flectra App, and from there will request services
-    * Flectra brokers crediting, the Client adds credit to their account, and you
-      can draw credits from there to provide services
-    * The External Service is an optional player: *you* can either provide a
-      service directly, or you can delegate the actual service acting as a
-      bridge/translator between an Flectra system and the actual service
-
-    
-.. figure:: images/credits.jpg
-    :align: center
-
-    The Credits
-
-    Every service provided through the In-App platform can be used by the
-    clients with tokens or *credits*. The credits are an integer unit and
-    their monetary value depends on the service and is decided by the
-    provider. This could be:
-
-    * for an sms service: 1 credit = 1 sms,
-    * for an add service: 1 credit = 1 add,
-    * for a postage service: 1 credit = 1 post stamp.
-
-    A credit can also simply be associated with a fixed amount of money
-    to palliate the variations of price (e.g. the prices of sms and stamps 
-    may vary following the countries).
-
-    The value of the credits is fixed with the help of prepaid credit packs
-    that the clients can buy on https://iap.flectra.com (see :ref:`Packages <iap-packages>`).
-
-.. note:: in the following explanations we will ignore the External Service,
-          they're just a detail of the service you provide
-
-.. figure:: images/normal.png
-    :align: center
-
-    A "normal" service flow
-
-    If everything goes well, the normal flow is:
-
-    1. the Client requests a service of some sort
-    2. the Service Provider asks Flectra if there are enough credits for the
-       service in the Client's account, and creates a transaction over that
-       amount
-    3. the Service Provider provides the service (either on their own or
-       calling to External Services)
-    4. the Service Provider goes back to Flectra to capture (if the service could
-       be provided) or cancel (if the service could not be provided) the
-       transaction created at step 2
-    5. finally the Service Provider notifies the Client that the service has
-       been rendered, possibly (depending on the service) displaying or
-       storing its results in the client's system
-
-.. figure:: images/no-credit.png
-    :align: center
-
-    Insufficient Credits
-
-    If the Client's account lacks credits for the service, however
-
-    1. the Client requests a service as previously
-    2. the Service Provider asks Flectra if there are enough credits on the
-       Client's account and gets a negative reply
-    3. this is signaled back to the Client
-    4. who is redirected to their Flectra account to credit it and re-try
-
-
-Building your service
-=====================
-
-For this example, the service we will provide is ~~mining dogecoins~~ burning
-10 seconds of CPU for a credit. For your own services, you could for example:
-
-* provide an online service yourself (e.g. convert quotations to faxes for
-  business in Japan)
-* provide an *offline* service yourself (e.g. provide accountancy service)
-* act as intermediary to an other service provider (e.g. bridge to an MMS
-  gateway)
-
-Register the service on Flectra
-----------------------------
-
-.. queue:: iap_service/series
-
-.. todo:: complete this part with screenshots
-
-The first step is to register your service on the IAP endpoint (production 
-and/or test) before you can actually query user accounts. To create a service,
-go to your *Portal Account* on the IAP endpoint (https://iap.flectra.com for
-production, https://iap-sandbox.flectra.com for testing, the endpoints are
-*independent* and *not synchronized*). 
-
-.. note:: 
-    
-    On production, there is a manual validation step before the service
-    can be used to manage real transactions. This step is automatically passed when
-    on sandbox to ease the tests.
-
-Log in then go to :menuselection:`My Account --> Your In-App Services`, click
-Create and provide the name of your service. 
-
-
-The now created service has *two* important fields:
-
-* :samp:`name` - :class:`ServiceName`: this will identify your service in the
-  client's :ref:`app <iap-flectra-app>` communicates directly with IAP.
-* :samp:`key` - :class:`ServiceKey`: the developer key that identifies you in 
-  IAP (see :ref:`your service <iap-service>`) and allows to draw credits from
-  the client's account.
-
-.. warning::
-    The :class:`ServiceName` is unique and should usually match the name of your 
-    Flectra App.
-
-.. danger:: 
-    Your :class:`ServiceKey` *is a secret*, leaking your service key
-    allows other application developers to draw credits bought for
-    your service(s).
-
-.. image:: images/service_select.png
-    :align: center
-
-.. image:: images/service_create.png
-    :align: center
-
-.. image:: images/service_packs.png
-    :align: center
-
-You can then create *credit packs* which clients can purchase in order to
-use your service.
-
-.. _iap-packages:
-
-Packages
---------
-
-The credit packages are essentially a product with 4 characteristics.
-
-* Name: the name of the package,
-* Description: details on the package that will appear on the shop page as
-  well as the invoice,
-* Credits: the amount of credits the client is entitled to when buying the package,
-* Price: the price in *EUROS* for the time being (USD support is planned).
-
-.. note:: 
-    
-    Flectra takes a 25% commission on all package sales. Adjust your selling price accordingly.
-
-
-.. note::
-
-    Depending on the strategy, the price per credit can vary from one
-    package to another.
-
-
-.. image:: images/package.png
-    :align: center
-
-.. _iap-flectra-app:
-
-Flectra App
---------
-
-.. queue:: iap/series
-
-.. todo:: does this actually require apps?
-
-The second step is to develop an `Flectra App`_ which clients can install in their
-Flectra instance and through which they can *request* services you will provide.
-Our app will just add a button to the Partners form which lets a user request
-burning some CPU time on the server.
-
-First, we'll create an *flectra module* depending on ``iap``. IAP is a standard
-V11 module and the dependency ensures a local account is properly set up and
-we will have access to some necessary views and useful helpers
-
-.. patch::
-
-Second, the "local" side of the integration, here we will only be adding an
-action button to the partners view, but you can of course provide significant
-local value via your application and additional parts via a remote service.
-
-.. patch::
-
-.. image:: images/button.png
-    :align: center
-
-We can now implement the action method/callback. This will *call our own
-server*.
-
-There are no requirements when it comes to the server or the communication
-protocol between the app and our server, but ``iap`` provides a
-:func:`~flectra.addons.iap.jsonrpc` helper to call a JSON-RPC2_ endpoint on an
-other Flectra instance and transparently re-raise relevant Flectra exceptions
-(:class:`~flectra.addons.iap.models.iap.InsufficientCreditError`,
-:class:`flectra.exceptions.AccessError` and :class:`flectra.exceptions.UserError`).
-
-In that call, we will need to provide:
-
-* any relevant client parameter (none here)
-* the :class:`token <UserToken>` of the current client, this is provided by
-  the ``iap.account`` model's ``account_token`` field. You can retrieve the
-  account for your service by calling :samp:`env['iap.account'].get({service_name})`
-  where :class:`service_name <ServiceName>` is the name of the service registered 
-  on IAP endpoint.
-
-.. patch::
-
-.. note::
-
-    ``iap`` automatically handles
-    :class:`~flectra.addons.iap.models.iap.InsufficientCreditError` coming from the action
-    and prompts the user to add credits to their account.
-
-    :func:`~flectra.addons.iap.jsonrpc` takes care of re-raising
-    :class:`~flectra.addons.iap.models.iap.InsufficientCreditError` for you.
-
-.. danger::
-
-    If you are not using :func:`~flectra.addons.iap.jsonrpc` you *must* be
-    careful to re-raise
-    :class:`~flectra.addons.iap.models.iap.InsufficientCreditError` in your handler
-    otherwise the user will not be prompted to credit their account, and the
-    next call will fail the same way.
-
-.. _iap-service:
-
-Service
--------
-
-.. queue:: iap_service/series
-
-Though that is not *required*, since ``iap`` provides both a client helper
-for JSON-RPC2_ calls (:func:`~flectra.addons.iap.jsonrpc`) and a service helper
-for transactions (:class:`~flectra.addons.iap.models.iap.charge`) we will also be
-implementing the service side as an Flectra module:
-
-.. patch::
-
-Since the query from the client comes as JSON-RPC2_ we will need the
-corresponding controller which can call :class:`~flectra.addons.iap.models.iap.charge` and
-perform the service within:
-
-.. patch::
-
-.. todo:: for the actual IAP will the "portal" page be on flectra.com or iap.flectra.com?
-
-.. todo:: "My Account" > "Your InApp Services"?
-
-
-The :class:`~flectra.addons.iap.models.iap.charge` helper will:
-
-.. note::
-
-    Since the 15th of January 2018, a new functionality that allows one to capture a different amount than autorized has been added.
-    See :ref:`Charging <iap-charging>`
-
-1. authorize (create) a transaction with the specified number of credits,
-   if the account does not have enough credits it will raise the relevant
-   error
-2. execute the body of the ``with`` statement
-3. (NEW) if the body of the ``with`` executes succesfully, update the price 
-   of the transaction if needed
-4. capture (confirm) the transaction
-5. otherwise if an error is raised from the body of the ``with`` cancel the
-   transaction (and release the hold on the credits)
-
-.. danger::
-
-    By default, :class:`~flectra.addons.iap.models.iap.charge` contacts the *production*
-    IAP endpoint, https://iap.flectra.com. While developing and testing your
-    service you may want to point it towards the *development* IAP endpoint
-    https://iap-sandbox.flectra.com.
-
-    To do so, set the ``iap.endpoint`` config parameter in your service
-    Flectra: in debug/developer mode, :menuselection:`Setting --> Technical -->
-    Parameters --> System Parameters`, just define an entry for the key
-    ``iap.endpoint`` if none already exists).
-
-The :class:`~flectra.addons.iap.models.iap.charge` helper has two additional optional
-parameters we can use to make things clearer to the end-user:
-
-``description``
-    is a message which will be associated with the transaction and will be
-    displayed in the user's dashboard, it is useful to remind the user why
-    the charge exists
-``credit_template``
-    is the name of a :ref:`reference/qweb` template which will be rendered
-    and shown to the user if their account has less credit available than the
-    service provider is requesting, its purpose is to tell your users why
-    they should be interested in your IAP offers
-
-.. patch::
-
-
-
-.. TODO:: how do you test your service?
-
-JSON-RPC2_ Transaction API
-==========================
-
-.. image:: images/flow.png
-    :align: center
-
-* The IAP transaction API does not require using Flectra when implementing your
-  server gateway, calls are standard JSON-RPC2_.
-* Calls use different *endpoints* but the same *method* on all endpoints
-  (``call``).
-* Exceptions are returned as JSON-RPC2_ errors, the formal exception name is
-  available on ``data.name`` for programmatic manipulation.
-
-Authorize
----------
-
-.. function:: /iap/1/authorize
-
-    Verifies that the user's account has at least as ``credit`` available
-    *and creates a hold (pending transaction) on that amount*.
-
-    Any amount currently on hold by a pending transaction is considered
-    unavailable to further authorize calls.
-
-    Returns a :class:`TransactionToken` identifying the pending transaction
-    which can be used to capture (confirm) or cancel said transaction.
-
-    :param ServiceKey key:
-    :param UserToken account_token:
-    :param int credit:
-    :param str description: optional, helps users identify the reason for
-                            charges on their accounts.
-    :returns: :class:`TransactionToken` if the authorization succeeded.
-    :raises: :class:`~flectra.exceptions.AccessError` if the service token is invalid
-    :raises: :class:`~flectra.addons.iap.models.iap.InsufficientCreditError` if the account does
-    :raises: ``TypeError`` if the ``credit`` value is not an integer
-
-.. code-block:: python
-
-    r = requests.post(ODOO + '/iap/1/authorize', json={
-        'jsonrpc': '2.0',
-        'id': None,
-        'method': 'call',
-        'params': {
-            'account_token': user_account,
-            'key': SERVICE_KEY,
-            'credit': 25,
-            'description': "Why this is being charged",
-        }
-    }).json()
-    if 'error' in r:
-        # handle authorize error
-    tx = r['result']
-
-    # provide your service here
-
-Capture
--------
-
-.. function:: /iap/1/capture
-
-    Confirms the specified transaction, transferring the reserved credits from
-    the user's account to the service provider's.
-
-    Capture calls are idempotent: performing capture calls on an already
-    captured transaction has no further effect.
-
-    :param TransactionToken token:
-    :param ServiceKey key:
-    :param int credit_to_capture: (new - 15 Jan 2018) optional parameter to capture a smaller amount of credits than authorized
-    :raises: :class:`~flectra.exceptions.AccessError`
-
-.. code-block:: python
-  :emphasize-lines: 8
-   
-    r2 = requests.post(ODOO + '/iap/1/capture', json={
-        'jsonrpc': '2.0',
-        'id': None,
-        'method': 'call',
-        'params': {
-            'token': tx,
-            'key': SERVICE_KEY,
-            'credit_to_capture': credit or False,
-        }
-    }).json()
-    if 'error' in r:
-        # handle capture error
-    # otherwise transaction is captured
-
-Cancel
-------
-
-.. function:: /iap/1/cancel
-
-    Cancels the specified transaction, releasing the hold on the user's
-    credits.
-
-    Cancel calls are idempotent: performing capture calls on an already
-    cancelled transaction has no further effect.
-
-    :param TransactionToken token:
-    :param ServiceKey key:
-    :raises: :class:`~flectra.exceptions.AccessError`
-
-.. code-block:: python
-
-    r2 = requests.post(ODOO + '/iap/1/cancel', json={
-        'jsonrpc': '2.0',
-        'id': None,
-        'method': 'call',
-        'params': {
-            'token': tx,
-            'key': SERVICE_KEY,
-        }
-    }).json()
-    if 'error' in r:
-        # handle cancel error
-    # otherwise transaction is cancelled
-
-Types
------
-
-Exceptions aside, these are *abstract types* used for clarity, you should not
-care how they are implemented
-
-.. class:: ServiceName
-
-    String identifying your service on https://iap.flectra.com (production) as well
-    as the account related to your service in the client's database.
-
-.. class:: ServiceKey
-
-    Identifier generated for the provider's service. Each key (and service)
-    matches a token of a fixed value, as generated by the service provide.
-
-    Multiple types of tokens correspond to multiple services e.g. SMS and MMS
-    could either be the same service (with an MMS being "worth" multiple SMS)
-    or could be separate services at separate price points.
-
-    .. danger:: your service key *is a secret*, leaking your service key
-                allows other application developers to draw credits bought for
-                your service(s).
-
-.. class:: UserToken
-
-    Identifier for a user account.
-
-.. class:: TransactionToken
-
-    Transaction identifier, returned by the authorization process and consumed
-    by either capturing or cancelling the transaction
-
-.. exception:: flectra.addons.iap.models.iap.InsufficientCreditError
-
-    Raised during transaction authorization if the credits requested are not
-    currently available on the account (either not enough credits or too many
-    pending transactions/existing holds).
-
-.. exception:: flectra.exceptions.AccessError
-
-    Raised by:
-
-    * any operation to which a service token is required, if the service token is invalid.
-    * any failure in an inter-server call. (typically, in :func:`~flectra.addons.iap.jsonrpc`)
-
-.. exception:: flectra.exceptions.UserError
-
-    Raised by any unexpeted behaviour at the discretion of the App developer (*you*).
-
-Flectra Helpers
-============
-
-For convenience, if you are implementing your service using Flectra the ``iap``
-module provides a few helpers to make IAP flow even simpler:
-
-.. _iap-charging:
-
-Charging
---------
-
-.. note::
-
-    A new functionality was introduced to capture a different amount of credits than reserved.
-    As this patch was added on the 15th of January 2018, you will need to upgrade your ``iap`` module in order to use it.
-    The specifics of the new functionality are highlighted in the code. 
-
-.. class:: flectra.addons.iap.models.iap.charge(env, key, account_token, credit[, description, credit_template])
-
-    A *context manager* for authorizing and automatically capturing or
-    cancelling transactions for use in the backend/proxy.
-
-    Works much like e.g. a cursor context manager:
-
-    * immediately authorizes a transaction with the specified parameters
-    * executes the ``with`` body
-    * if the body executes in full without error, captures the transaction
-    * otherwise cancels it
-
-    :param flectra.api.Environment env: used to retrieve the ``iap.endpoint``
-                                     configuration key
-    :param ServiceKey key:
-    :param UserToken token:
-    :param int credit:
-    :param str description:
-    :param Qweb template credit_template:
-
-.. code-block:: python
-  :emphasize-lines: 10,13,14,15
-
-    @route('/deathstar/superlaser', type='json')
-    def superlaser(self, user_account,
-                   coordinates, target,
-                   factor=1.0):
-        """
-        :param factor: superlaser power factor,
-                       0.0 is none, 1.0 is full power
-        """
-        credits = int(MAXIMUM_POWER * factor)
-        with charge(request.env, SERVICE_KEY, user_account, credits) as transaction:
-            # TODO: allow other targets
-            transaction.credit = max(credits, 2)
-            # Sales ongoing one the energy price,
-            # a maximum of 2 credits will be charged/captured.
-            self.env['systems.planets'].search([
-                ('grid', '=', 'M-10'),
-                ('name', '=', 'Alderaan'),
-            ]).unlink()
-
-.. _JSON-RPC2: http://www.jsonrpc.org/specification
-.. _Flectra App: https://www.flectra.com/apps
diff --git a/doc/webservices/iap/01-init b/doc/webservices/iap/01-init
deleted file mode 100644
index 243dd911..00000000
--- a/doc/webservices/iap/01-init
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: coalroller/coalroller/__manifest__.py
-===================================================================
---- /dev/null
-+++ coalroller/coalroller/__manifest__.py
-@@ -0,0 +1,5 @@
-+{
-+    'name': "Coal Roller",
-+    'category': 'Tools',
-+    'depends': ['iap'],
-+}
-Index: coalroller/coalroller/__init__.py
-===================================================================
---- /dev/null
-+++ coalroller/coalroller/__init__.py
-@@ -0,0 +1 @@
-+# -*- coding: utf-8 -*-
diff --git a/doc/webservices/iap/02-button b/doc/webservices/iap/02-button
deleted file mode 100644
index c5e73606..00000000
--- a/doc/webservices/iap/02-button
+++ /dev/null
@@ -1,34 +0,0 @@
-Index: coalroller/coalroller/__manifest__.py
-===================================================================
---- coalroller.orig/coalroller/__manifest__.py
-+++ coalroller/coalroller/__manifest__.py
-@@ -2,4 +2,7 @@
-     'name': "Coal Roller",
-     'category': 'Tools',
-     'depends': ['iap'],
-+    'data': [
-+        'views/views.xml',
-+    ],
- }
-Index: coalroller/coalroller/views/views.xml
-===================================================================
---- /dev/null
-+++ coalroller/coalroller/views/views.xml
-@@ -0,0 +1,17 @@
-+<odoo>
-+  <record model="ir.ui.view" id="partner_form_coalroll">
-+    <field name="name">partner.form.coalroll</field>
-+    <field name="model">res.partner</field>
-+    <field name="inherit_id" ref="base.view_partner_form" />
-+    <field name="arch" type="xml">
-+      <xpath expr="//div[@name='button_box']">
-+        <button type="object" name="action_partner_coalroll"
-+                class="oe_stat_button" icon="fa-gears">
-+          <div class="o_form_field o_stat_info">
-+            <span class="o_stat_text">Roll Coal</span>
-+          </div>
-+        </button>
-+      </xpath>
-+    </field>
-+  </record>
-+</odoo>
diff --git a/doc/webservices/iap/03-callback b/doc/webservices/iap/03-callback
deleted file mode 100644
index 675f117d..00000000
--- a/doc/webservices/iap/03-callback
+++ /dev/null
@@ -1,40 +0,0 @@
-Index: coalroller/coalroller/__init__.py
-===================================================================
---- coalroller.orig/coalroller/__init__.py
-+++ coalroller/coalroller/__init__.py
-@@ -1 +1,2 @@
- # -*- coding: utf-8 -*-
-+from . import models
-Index: coalroller/coalroller/models/__init__.py
-===================================================================
---- /dev/null
-+++ coalroller/coalroller/models/__init__.py
-@@ -0,0 +1 @@
-+from . import res_partner
-Index: coalroller/coalroller/models/res_partner.py
-===================================================================
---- /dev/null
-+++ coalroller/coalroller/models/res_partner.py
-@@ -0,0 +1,22 @@
-+# -*- coding: utf-8 -*-
-+from odoo import api, models
-+from odoo.addons.iap import jsonrpc, InsufficientCreditError
-+
-+# whichever URL you deploy the service at, here we will run the remote
-+# service in a local Odoo bound to the port 8070
-+DEFAULT_ENDPOINT = 'http://localhost:8070'
-+class Partner(models.Model):
-+    _inherit = 'res.partner'
-+    @api.multi
-+    def action_partner_coalroll(self):
-+        # fetch the user's token for our service
-+        user_token = self.env['iap.account'].get('coalroller')
-+        params = {
-+            # we don't have any parameter to provide
-+            'account_token': user_token.account_token
-+        }
-+        # ir.config_parameter allows locally overriding the endpoint
-+        # for testing & al
-+        endpoint = self.env['ir.config_parameter'].sudo().get_param('coalroller.endpoint', DEFAULT_ENDPOINT)
-+        jsonrpc(endpoint + '/roll', params=params)
-+        return True
diff --git a/doc/webservices/iap/series b/doc/webservices/iap/series
deleted file mode 100644
index d44682b3..00000000
--- a/doc/webservices/iap/series
+++ /dev/null
@@ -1,3 +0,0 @@
-01-init
-02-button
-03-callback
diff --git a/doc/webservices/iap_service/01-init b/doc/webservices/iap_service/01-init
deleted file mode 100644
index 0ffc9215..00000000
--- a/doc/webservices/iap_service/01-init
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: coalroller_service/coalroller_service/__init__.py
-===================================================================
---- /dev/null
-+++ coalroller_service/coalroller_service/__init__.py
-@@ -0,0 +1 @@
-+# -*- encoding: utf-8 -*-
-Index: coalroller_service/coalroller_service/__manifest__.py
-===================================================================
---- /dev/null
-+++ coalroller_service/coalroller_service/__manifest__.py
-@@ -0,0 +1,5 @@
-+{
-+    'name': "Coal Roller Service",
-+    'category': 'Tools',
-+    'depends': ['iap'],
-+}
diff --git a/doc/webservices/iap_service/02-tnx b/doc/webservices/iap_service/02-tnx
deleted file mode 100644
index 68cfbdc8..00000000
--- a/doc/webservices/iap_service/02-tnx
+++ /dev/null
@@ -1,48 +0,0 @@
-Index: coalroller_service/coalroller_service/controllers/main.py
-===================================================================
---- /dev/null
-+++ coalroller_service/coalroller_service/controllers/main.py
-@@ -0,0 +1,29 @@
-+import time
-+
-+from passlib import pwd, hash
-+
-+from odoo import http
-+from odoo.addons.iap import charge
-+
-+class CoalBurnerController(http.Controller):
-+    @http.route('/roll', type='json', auth='none', csrf='false')
-+    def roll(self, account_token):
-+        # the service key *is a secret*, it should not be committed in
-+        # the source
-+        service_key = self.env['ir.config_parameter'].sudo().get_param('coalroller.service_key')
-+
-+        # we charge 1 credit for 10 seconds of CPU
-+        cost = 1
-+        # TODO: allow the user to specify how many (tens of seconds) of CPU they want to use
-+        with charge(http.request.env, service_key, account_token, cost):
-+
-+            # 10 seconds of CPU per credit
-+            end = time.time() + (10 * cost)
-+            while time.time() < end:
-+                # we will use CPU doing useful things: generating and
-+                # hashing passphrases
-+                p = pwd.genphrase()
-+                h = hash.pbkdf2_sha512.hash(p)
-+        # here we don't have anything useful to the client, an error
-+        # will be raised & transmitted in case of issue, if no error
-+        # is raised we did the job
-Index: coalroller_service/coalroller_service/controllers/__init__.py
-===================================================================
---- /dev/null
-+++ coalroller_service/coalroller_service/controllers/__init__.py
-@@ -0,0 +1,2 @@
-+# -*- encoding: utf-8 -*-
-+from . import main
-Index: coalroller_service/coalroller_service/__init__.py
-===================================================================
---- coalroller_service.orig/coalroller_service/__init__.py
-+++ coalroller_service/coalroller_service/__init__.py
-@@ -1 +1,2 @@
- # -*- encoding: utf-8 -*-
-+from . import controllers
diff --git a/doc/webservices/iap_service/03-template b/doc/webservices/iap_service/03-template
deleted file mode 100644
index 6517181c..00000000
--- a/doc/webservices/iap_service/03-template
+++ /dev/null
@@ -1,56 +0,0 @@
-Index: coalroller_service/coalroller_service/controllers/main.py
-===================================================================
---- coalroller_service.orig/coalroller_service/controllers/main.py
-+++ coalroller_service/coalroller_service/controllers/main.py
-@@ -10,12 +10,14 @@ class CoalBurnerController(http.Controll
-     def roll(self, account_token):
-         # the service key *is a secret*, it should not be committed in
-         # the source
--        service_key = self.env['ir.config_parameter'].sudo().get_param('coalroller.service_key')
-+        service_key = http.request.env['ir.config_parameter'].sudo().get_param('coalroller.service_key')
- 
-         # we charge 1 credit for 10 seconds of CPU
-         cost = 1
-         # TODO: allow the user to specify how many (tens of seconds) of CPU they want to use
--        with charge(http.request.env, service_key, account_token, cost):
-+        with charge(http.request.env, service_key, account_token, cost,
-+                    description="We're just obeying orders",
-+                    credit_template='coalroller_service.no_credit'):
- 
-             # 10 seconds of CPU per credit
-             end = time.time() + (10 * cost)
-Index: coalroller_service/coalroller_service/views/no-credit.xml
-===================================================================
---- /dev/null
-+++ coalroller_service/coalroller_service/views/no-credit.xml
-@@ -0,0 +1,18 @@
-+<odoo>
-+  <template id="no_credit" name="No credit warning">
-+    <div>
-+      <div class="container-fluid">
-+        <div class="row">
-+          <div class="col-sm-7 col-md-offset-1 mt32 mb32">
-+            <h2>Consume electricity doing nothing useful!</h2>
-+            <ul>
-+              <li>Heat our state of the art data center for no reason</li>
-+              <li>Use multiple watts for only 0.1€</li>
-+              <li>Roll coal without going outside</li>
-+            </ul>
-+          </div>
-+        </div>
-+      </div>
-+    </div>
-+  </template>
-+</odoo>
-Index: coalroller_service/coalroller_service/__manifest__.py
-===================================================================
---- coalroller_service.orig/coalroller_service/__manifest__.py
-+++ coalroller_service/coalroller_service/__manifest__.py
-@@ -2,4 +2,7 @@
-     'name': "Coal Roller Service",
-     'category': 'Tools',
-     'depends': ['iap'],
-+    'data': [
-+        'views/no-credit.xml',
-+    ],
- }
diff --git a/doc/webservices/iap_service/series b/doc/webservices/iap_service/series
deleted file mode 100644
index 68544a42..00000000
--- a/doc/webservices/iap_service/series
+++ /dev/null
@@ -1,3 +0,0 @@
-01-init
-02-tnx
-03-template
diff --git a/doc/webservices/images/button.png b/doc/webservices/images/button.png
deleted file mode 100644
index 689abece..00000000
Binary files a/doc/webservices/images/button.png and /dev/null differ
diff --git a/doc/webservices/images/credits.jpg b/doc/webservices/images/credits.jpg
deleted file mode 100644
index 5eb29ea2..00000000
Binary files a/doc/webservices/images/credits.jpg and /dev/null differ
diff --git a/doc/webservices/images/credits2.jpg b/doc/webservices/images/credits2.jpg
deleted file mode 100644
index aa0f0afe..00000000
Binary files a/doc/webservices/images/credits2.jpg and /dev/null differ
diff --git a/doc/webservices/images/flow.png b/doc/webservices/images/flow.png
deleted file mode 100644
index a3edab03..00000000
Binary files a/doc/webservices/images/flow.png and /dev/null differ
diff --git a/doc/webservices/images/no-credit.png b/doc/webservices/images/no-credit.png
deleted file mode 100644
index 5b5763bd..00000000
Binary files a/doc/webservices/images/no-credit.png and /dev/null differ
diff --git a/doc/webservices/images/normal.png b/doc/webservices/images/normal.png
deleted file mode 100644
index 2e9cbcfc..00000000
Binary files a/doc/webservices/images/normal.png and /dev/null differ
diff --git a/doc/webservices/images/package.png b/doc/webservices/images/package.png
deleted file mode 100644
index a1627f9a..00000000
Binary files a/doc/webservices/images/package.png and /dev/null differ
diff --git a/doc/webservices/images/players.png b/doc/webservices/images/players.png
deleted file mode 100644
index 291466c4..00000000
Binary files a/doc/webservices/images/players.png and /dev/null differ
diff --git a/doc/webservices/images/service_create.png b/doc/webservices/images/service_create.png
deleted file mode 100644
index 2163259e..00000000
Binary files a/doc/webservices/images/service_create.png and /dev/null differ
diff --git a/doc/webservices/images/service_packs.png b/doc/webservices/images/service_packs.png
deleted file mode 100644
index f86e9788..00000000
Binary files a/doc/webservices/images/service_packs.png and /dev/null differ
diff --git a/doc/webservices/images/service_select.png b/doc/webservices/images/service_select.png
deleted file mode 100644
index fb5878cd..00000000
Binary files a/doc/webservices/images/service_select.png and /dev/null differ
diff --git a/doc/webservices/images/template.png b/doc/webservices/images/template.png
deleted file mode 100644
index 6f989273..00000000
Binary files a/doc/webservices/images/template.png and /dev/null differ
diff --git a/doc/webservices/localization.rst b/doc/webservices/localization.rst
index e36213d6..d7cc6c78 100644
--- a/doc/webservices/localization.rst
+++ b/doc/webservices/localization.rst
@@ -406,17 +406,4 @@ The creation of an ``account.reconcile.model.template`` record is quite easy:
         <field name="second_amount_type">...</field>
         <field name="second_amount">...</field>
         <field name="second_tax_id" ref="..."/>
-   </record>
-
-How to create a new dynamic report?
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-If you need to add some reports on your localization, you need to create a new module named **l10n_xx_reports**.
-Furthermore, this additional module must be present in the ``enterprise`` repository and must have at least two dependencies,
-one to bring all the stuff for your localization module and one more, ``account_reports``, to design dynamic reports.
-
-.. code-block:: py
-
-    'depends': ['l10n_xx', 'account_reports'],
-
-Once it's done, you can start the creation of your report statements. The documentation is available in the following `slides <https://www.flectra.com/slides/slide/how-to-create-custom-accounting-report-415>`_.
+   </record>
\ No newline at end of file
diff --git a/doc/webservices/upgrade.rst b/doc/webservices/upgrade.rst
deleted file mode 100644
index 4e3a3d92..00000000
--- a/doc/webservices/upgrade.rst
+++ /dev/null
@@ -1,673 +0,0 @@
-:banner: banners/upgrade_api.jpg
-:types: api
-
-
-:code-column:
-
-.. _reference/upgrade-api:
-
-================
-Database Upgrade
-================
-
-Introduction
-~~~~~~~~~~~~
-
-This document describes the API used to upgrade an Flectra database to a
-higher version.
-
-It allows a database to be upgraded without ressorting to the html form at
-https://upgrade.flectra.com
-Although the database will follow the same process described on that form.
-
-
-The required steps are:
-
-* :ref:`creating a request <upgrade-api-create-method>`
-* :ref:`uploading a database dump <upgrade-api-upload-method>`
-* :ref:`running the upgrade process <upgrade-api-process-method>`
-* :ref:`obtaining the status of the database request <upgrade-api-status-method>`
-* :ref:`downloading the upgraded database dump <upgrade-api-download-method>`
-
-The methods
-~~~~~~~~~~~
-
-.. _upgrade-api-create-method:
-
-Creating a database upgrade request
-===================================
-
-This action creates a database request with the following information:
-
-* your contract reference
-* your email address
-* the target version (the Flectra version you want to upgrade to)
-* the purpose of your request (test or production)
-* the database dump name (required but purely informative)
-* optionally the server timezone (for Flectra source version < 6.1)
-
-The ``create`` method
----------------------
-
-.. py:function:: https://upgrade.flectra.com/database/v1/create
-
-    Creates a database upgrade request
-
-    :param str contract: (required) your enterprise contract reference
-    :param str email: (required) your email address
-    :param str target: (required) the Flectra version you want to upgrade to. Valid choices: 6.0, 6.1, 7.0, 8.0
-    :param str aim: (required) the purpose of your upgrade database request. Valid choices: test, production.
-    :param str filename: (required) a purely informative name for you database dump file
-    :param str timezone: (optional) the timezone used by your server. Only for Flectra source version < 6.1
-    :return: request result
-    :rtype: JSON dictionary
-
-The *create* method returns a JSON dictionary containing the following keys:
-
-.. _upgrade-api-json-failure:
-
-``failures``
-''''''''''''
-
-The list of errors.
-
-A list of dictionaries, each dictionary giving information about one particular
-error. Each dictionary can contain various keys depending of the type of error
-but you will always get the ``reason`` and the ``message`` keys:
-
-* ``reason``: the error type
-* ``message``: a human friendly message
-
-Some possible keys:
-
-* ``code``: a faulty value
-* ``value``: a faulty value
-* ``expected``: a list of valid values
-
-See a sample output aside.
-
-.. rst-class:: setup doc-aside
-
-.. switcher::
-
-    .. code-block:: json
-
-            {
-              "failures": [
-                {
-                  "expected": [
-                    "6.0",
-                    "6.1",
-                    "7.0",
-                    "8.0",
-                  ],
-                  "message": "Invalid value \"5.0\"",
-                  "reason": "TARGET:INVALID",
-                  "value": "5.0"
-                },
-                {
-                  "code": "M123456-abcxyz",
-                  "message": "Can not find contract M123456-abcxyz",
-                  "reason": "CONTRACT:NOT_FOUND"
-                }
-              ]
-            }
-
-
-``request``
-'''''''''''
-
-If the *create* method is successful, the value associated to the *request* key
-will be a dictionary containing various information about the created request:
-
-The most important keys are:
-
-* ``id``: the request id
-* ``key``: your private key for this request
-
-These 2 values will be requested by the other methods (upload, process and status)
-
-The other keys will be explained in the section describing the :ref:`status method <upgrade-api-status-method>`.
-
-
-Sample script
-'''''''''''''
-
-Here are 2 examples of database upgrade request creation using:
-
-* one in the python programming language using the pycurl library
-* one in the bash programming language using `curl <http://curl.haxx.se>`_ (tool
-  for transfering data using http) and `jq <https://stedolan.github.io/jq>`_ (JSON processor):
-
-.. rst-class:: setup doc-aside
-
-.. switcher::
-
-    .. code-block:: python
-
-        from urllib import urlencode
-        from io import BytesIO
-        import pycurl
-        import json
-
-        CREATE_URL = "https://upgrade.flectra.com/database/v1/create"
-        CONTRACT = "M123456-abcdef"
-        AIM = "test"
-        TARGET = "8.0"
-        EMAIL = "john.doe@example.com"
-        FILENAME = "db_name.dump"
-
-        fields = dict([
-            ('aim', AIM),
-            ('email', EMAIL),
-            ('filename', DB_SOURCE),
-            ('contract', CONTRACT),
-            ('target', TARGET),
-        ])
-        postfields = urlencode(fields)
-
-        c = pycurl.Curl()
-        c.setopt(pycurl.URL, CREATE_URL)
-        c.setopt(c.POSTFIELDS, postfields)
-        data = BytesIO()
-        c.setopt(c.WRITEFUNCTION, data.write)
-        c.perform()
-
-        # transform output into a dict:
-        response = json.loads(data.getvalue())
-
-        # get http status:
-        http_code = c.getinfo(pycurl.HTTP_CODE)
-        c.close()
-
-    .. code-block:: bash
-
-        CONTRACT=M123456-abcdef
-        AIM=test
-        TARGET=8.0
-        EMAIL=john.doe@example.com
-        FILENAME=db_name.dump
-        CREATE_URL="https://upgrade.flectra.com/database/v1/create"
-        URL_PARAMS="contract=${CONTRACT}&aim=${AIM}&target=${TARGET}&email=${EMAIL}&filename=${FILENAME}"
-        curl -sS "${CREATE_URL}?${URL_PARAMS}" > create_result.json
-
-        # check for failures
-        failures=$(cat create_result.json | jq -r '.failures[]')
-        if [ "$failures" != "" ]; then
-          echo $failures | jq -r '.'
-          exit 1
-        fi
-
-.. _upgrade-api-upload-method:
-
-Uploading your database dump
-============================
-
-There are 2 methods to upload your database dump:
-
-* the ``upload`` method using the HTTPS protocol
-* the ``request_sftp_access`` method using the SFTP protocol
-
-The ``upload`` method
----------------------
-
-It's the most simple and most straightforward way of uploading your database dump.
-It uses the HTTPS protocol.
-
-.. py:function:: https://upgrade.flectra.com/database/v1/upload
-
-    Uploads a database dump
-
-    :param str key: (required) your private key
-    :param str request: (required) your request id
-    :return: request result
-    :rtype: JSON dictionary
-
-The request id and the private key are obtained using the :ref:`create method
-<upgrade-api-create-method>`
-
-The result is a JSON dictionary containing the list of ``failures``, which
-should be empty if everything went fine.
-
-.. rst-class:: setup doc-aside
-
-.. switcher::
-
-    .. code-block:: python
-
-        import os
-        import pycurl
-        from urllib import urlencode
-
-        UPLOAD_URL = "https://upgrade.flectra.com/database/v1/upload"
-        DUMPFILE = "openchs.70.cdump"
-
-        fields = dict([
-            ('request', '10534'),
-            ('key', 'Aw7pItGVKFuZ_FOR3U8VFQ=='),
-        ])
-        headers = {"Content-Type": "application/octet-stream"}
-        postfields = urlencode(fields)
-
-        c = pycurl.Curl()
-        c.setopt(pycurl.URL, UPLOAD_URL+"?"+postfields)
-        c.setopt(pycurl.POST, 1)
-        filesize = os.path.getsize(DUMPFILE)
-        c.setopt(pycurl.POSTFIELDSIZE, filesize)
-        fp = open(DUMPFILE, 'rb')
-        c.setopt(pycurl.READFUNCTION, fp.read)
-        c.setopt(
-            pycurl.HTTPHEADER,
-            ['%s: %s' % (k, headers[k]) for k in headers])
-
-        c.perform()
-        c.close()
-
-    .. code-block:: bash
-
-        UPLOAD_URL="https://upgrade.flectra.com/database/v1/upload"
-        DUMPFILE="openchs.70.cdump"
-        KEY="Aw7pItGVKFuZ_FOR3U8VFQ=="
-        REQUEST_ID="10534"
-        URL_PARAMS="key=${KEY}&request=${REQUEST_ID}"
-        HEADER="Content-Type: application/octet-stream"
-        curl -H $HEADER --data-binary "@${DUMPFILE}" "${UPLOAD_URL}?${URL_PARAMS}"
-
-.. _upgrade-api-request-sftp-access-method:
-
-The ``request_sftp_access`` method
-----------------------------------
-
-This method is recommanded for big database dumps.
-It uses the SFTP protocol and supports resuming.
-
-It will create a temporary SFTP server where you can connect to and allow you
-to upload your database dump using an SFTP client.
-
-.. py:function:: https://upgrade.flectra.com/database/v1/request_sftp_access
-
-    Creates an SFTP server
-
-    :param str key: (required) your private key
-    :param str request: (required) your request id
-    :param str ssh_keys: (required) the path to a file listing the ssh public keys you'd like to use
-    :return: request result
-    :rtype: JSON dictionary
-
-The request id and the private key are obtained using the :ref:`create method
-<upgrade-api-create-method>`
-
-The file listing your ssh public keys should be roughly similar to a standard ``authorized_keys`` file.
-This file should only contains public keys, blank lines or comments (lines starting with the ``#`` character)
-
-Your database upgrade request should be in the ``draft`` state.
-
-The ``request_sftp_access`` method returns a JSON dictionary containing the following keys:
-
-
-.. rst-class:: setup doc-aside
-
-.. switcher::
-
-    .. code-block:: python
-
-        import os
-        import pycurl
-        from urllib import urlencode
-
-        UPLOAD_URL = "https://upgrade.flectra.com/database/v1/request_sftp_access"
-        SSH_KEYS="/path/to/your/authorized_keys"
-
-        fields = dict([
-            ('request', '10534'),
-            ('key', 'Aw7pItGVKFuZ_FOR3U8VFQ=='),
-        ])
-        postfields = urlencode(fields)
-
-        c = pycurl.Curl()
-        c.setopt(pycurl.URL, UPLOAD_URL+"?"+postfields)
-        c.setopt(pycurl.POST, 1)
-        c.setopt(c.HTTPPOST,[("ssh_keys",
-                                (c.FORM_FILE, SSH_KEYS,
-                                c.FORM_CONTENTTYPE, "text/plain"))
-                            ])
-
-        c.perform()
-        c.close()
-
-    .. code-block:: bash
-
-        REQUEST_SFTP_ACCESS_URL="https://upgrade.flectra.com/database/v1/request_sftp_access"
-        SSH_KEYS=/path/to/your/authorized_keys
-        KEY="Aw7pItGVKFuZ_FOR3U8VFQ=="
-        REQUEST_ID="10534"
-        URL_PARAMS="key=${KEY}&request=${REQUEST_ID}"
-
-        curl -sS "${REQUEST_SFTP_ACCESS_URL}?${URL_PARAMS}" -F ssh_keys=@${SSH_KEYS} > request_sftp_result.json
-
-        # check for failures
-        failures=$(cat request_sftp_result.json | jq -r '.failures[]')
-        if [ "$failures" != "" ]; then
-          echo $failures | jq -r '.'
-          exit 1
-        fi
-
-
-``failures``
-''''''''''''
-
-The list of errors. See :ref:`failures <upgrade-api-json-failure>` for an
-explanation about the JSON dictionary returned in case of failure.
-
-``request``
-'''''''''''
-
-If the call is successful, the value associated to the *request* key
-will be a dictionary containing your SFTP connexion parameters:
-
-* ``hostname``: the host address to connect to
-* ``sftp_port``: the port to connect to
-* ``sftp_user``: the SFTP user to use for connecting
-* ``shared_file``: the filename you need to use (identical to the ``filename`` value you have used when creating the request in the :ref:`create method <upgrade-api-create-method>`.)
-* ``request_id``: the related upgrade request id (only informative, ,not required for the connection)
-* ``sample_command``: a sample command using the 'sftp' client
-
-You should normally be able to connect using the sample command as is.
-
-You will only have access to the ``shared_file``. No other files will be
-accessible and you will not be able to create new files in your shared
-environment on the SFTP server.
-
-Using the 'sftp' client
-+++++++++++++++++++++++
-
-Once you have successfully connected using your SFTP client, you can upload
-your database dump. Here is a sample session using the 'sftp' client:
-
-::
-
-    $ sftp -P 2200 user_10534@upgrade.flectra.com
-    Connected to upgrade.flectra.com.
-    sftp> put /path/to/openchs.70.cdump openchs.70.cdump
-    Uploading /path/to/openchs.70.cdump to /openchs.70.cdump
-    sftp> ls -l openchs.70.cdump
-    -rw-rw-rw-    0 0        0          849920 Aug 30 15:58 openchs.70.cdump
-
-If your connection is interrupted, you can continue your file transfer using
-the ``-a`` command line switch:
-
-.. code-block:: text
-
-    sftp> put -a /path/to/openchs.70.cdump openchs.70.cdump
-    Resuming upload of /path/to/openchs.70.cdump to /openchs.70.cdump
-
-If you don't want to manually type the command and need to automate your
-database upgrade using a script, you can use a batch file or pipe your commands to 'sftp':
-
-::
-
-  echo "put /path/to/openchs.70.cdump openchs.70.cdump" | sftp -b - -P 2200 user_10534@upgrade.flectra.com
-
-The ``-b`` parameter takes a filename. If the filename is ``-``, it reads the commands from standard input.
-
-
-.. _upgrade-api-process-method:
-
-Asking to process your request
-==============================
-
-This action ask the Upgrade Platform to process your database dump.
-
-The ``process`` method
-----------------------
-
-.. py:function:: https://upgrade.flectra.com/database/v1/process
-
-    Process a database dump
-
-    :param str key: (required) your private key
-    :param str request: (required) your request id
-    :return: request result
-    :rtype: JSON dictionary
-
-The request id and the private key are obtained using the :ref:`create method
-<upgrade-api-create-method>`
-
-The result is a JSON dictionary containing the list of ``failures``, which
-should be empty if everything went fine.
-
-.. rst-class:: setup doc-aside
-
-.. switcher::
-
-    .. code-block:: python
-
-        from urllib import urlencode
-        from io import BytesIO
-        import pycurl
-        import json
-
-        PROCESS_URL = "https://upgrade.flectra.com/database/v1/process"
-
-        fields = dict([
-            ('request', '10534'),
-            ('key', 'Aw7pItGVKFuZ_FOR3U8VFQ=='),
-        ])
-        postfields = urlencode(fields)
-
-        c = pycurl.Curl()
-        c.setopt(pycurl.URL, PROCESS_URL)
-        c.setopt(c.POSTFIELDS, postfields)
-        data = BytesIO()
-        c.setopt(c.WRITEFUNCTION, data.write)
-        c.perform()
-
-        # transform output into a dict:
-        response = json.loads(data.getvalue())
-
-        # get http status:
-        http_code = c.getinfo(pycurl.HTTP_CODE)
-        c.close()
-
-    .. code-block:: bash
-
-        PROCESS_URL="https://upgrade.flectra.com/database/v1/process"
-        KEY="Aw7pItGVKFuZ_FOR3U8VFQ=="
-        REQUEST_ID="10534"
-        URL_PARAMS="key=${KEY}&request=${REQUEST_ID}"
-        curl -sS "${PROCESS_URL}?${URL_PARAMS}"
-
-.. _upgrade-api-status-method:
-
-Obtaining your request status
-=============================
-
-This action ask the status of your database upgrade request.
-
-The ``status`` method
----------------------
-
-.. py:function:: https://upgrade.flectra.com/database/v1/status
-
-    Ask the status of a database upgrade request
-
-    :param str key: (required) your private key
-    :param str request: (required) your request id
-    :return: request result
-    :rtype: JSON dictionary
-
-The request id and the private key are obtained using the :ref:`create method
-<upgrade-api-create-method>`
-
-The result is a JSON dictionary containing various information about your
-database upgrade request.
-
-.. rst-class:: setup doc-aside
-
-.. switcher::
-
-    .. code-block:: python
-
-        from urllib import urlencode
-        from io import BytesIO
-        import pycurl
-        import json
-
-        STATUS_URL = "https://upgrade.flectra.com/database/v1/status"
-
-        fields = dict([
-            ('request', '10534'),
-            ('key', 'Aw7pItGVKFuZ_FOR3U8VFQ=='),
-        ])
-        postfields = urlencode(fields)
-
-        c = pycurl.Curl()
-        c.setopt(pycurl.URL, PROCESS_URL)
-        c.setopt(c.POSTFIELDS, postfields)
-        data = BytesIO()
-        c.setopt(c.WRITEFUNCTION, data.write)
-        c.perform()
-
-        # transform output into a dict:
-        response = json.loads(data.getvalue())
-
-        c.close()
-
-    .. code-block:: bash
-
-        STATUS_URL="https://upgrade.flectra.com/database/v1/status"
-        KEY="Aw7pItGVKFuZ_FOR3U8VFQ=="
-        REQUEST_ID="10534"
-        URL_PARAMS="key=${KEY}&request=${REQUEST_ID}"
-        curl -sS "${STATUS_URL}?${URL_PARAMS}"
-
-Sample output
--------------
-
-The ``request`` key contains various useful information about your request:
-
-``id``
-    the request id
-``key``
-    your private key
-``email``
-    the email address you supplied when creating the request
-``target``
-    the target Flectra version you supplied when creating the request
-``aim``
-    the purpose (test, production) of your database upgrade request you supplied when creating the request
-``filename``
-    the filename you supplied when creating the request
-``timezone``
-    the timezone you supplied when creating the request
-``state``
-    the state of your request
-``issue_stage``
-    the stage of the issue we have create on Flectra main server
-``issue``
-    the id of the issue we have create on Flectra main server
-``status_url``
-    the URL to access your database upgrade request html page
-``notes_url``
-    the URL to get the notes about your database upgrade
-``original_sql_url``
-    the URL used to get your uploaded (not upgraded) database as an SQL stream
-``original_dump_url``
-    the URL used to get your uploaded (not upgraded) database as an archive file
-``upgraded_sql_url``
-    the URL used to get your upgraded database as an SQL stream
-``upgraded_dump_url``
-    the URL used to get your upgraded database as an archive file
-``modules_url``
-    the URL used to get your custom modules
-``filesize``
-    the size of your uploaded database file
-``database_uuid``
-    the Unique ID of your database
-``created_at``
-    the date when you created the request
-``estimated_time``
-    an estimation of the time it takes to upgrade your database
-``processed_at``
-    time when your database upgrade was started
-``elapsed``
-    the time it takes to upgrade your database
-``filestore``
-    your attachments were converted to the filestore
-``customer_message``
-    an important message related to your request
-``database_version``
-    the guessed Flectra version of your uploaded (not upgraded) database
-``postgresql``
-    the guessed Postgresql version of your uploaded (not upgraded) database
-``compressions``
-    the compression methods used by your uploaded database
-
-.. rst-class:: setup doc-aside
-
-.. switcher::
-
-    .. code-block:: json
-
-        {
-          "failures": [],
-          "request": {
-            "id": 10534,
-            "key": "Aw7pItGVKFuZ_FOR3U8VFQ==",
-            "email": "john.doe@example.com",
-            "target": "8.0",
-            "aim": "test",
-            "filename": "db_name.dump",
-            "timezone": null,
-            "state": "draft",
-            "issue_stage": "new",
-            "issue": 648398,
-            "status_url": "https://upgrade.flectra.com/database/eu1/10534/Aw7pItGVKFuZ_FOR3U8VFQ==/status",
-            "notes_url": "https://upgrade.flectra.com/database/eu1/10534/Aw7pItGVKFuZ_FOR3U8VFQ==/upgraded/notes",
-            "original_sql_url": "https://upgrade.flectra.com/database/eu1/10534/Aw7pItGVKFuZ_FOR3U8VFQ==/original/sql",
-            "original_dump_url": "https://upgrade.flectra.com/database/eu1/10534/Aw7pItGVKFuZ_FOR3U8VFQ==/original/archive",
-            "upgraded_sql_url": "https://upgrade.flectra.com/database/eu1/10534/Aw7pItGVKFuZ_FOR3U8VFQ==/upgraded/sql",
-            "upgraded_dump_url": "https://upgrade.flectra.com/database/eu1/10534/Aw7pItGVKFuZ_FOR3U8VFQ==/upgraded/archive",
-            "modules_url": "https://upgrade.flectra.com/database/eu1/10534/Aw7pItGVKFuZ_FOR3U8VFQ==/modules/archive",
-            "filesize": "912.99 Kb",
-            "database_uuid": null,
-            "created_at": "2015-09-09 07:13:49",
-            "estimated_time": null,
-            "processed_at": null,
-            "elapsed": "00:00",
-            "filestore": false,
-            "customer_message": null,
-            "database_version": null,
-            "postgresql": "9.4",
-            "compressions": [
-              "pgdmp_custom",
-              "sql"
-            ]
-          }
-        }
-
-.. _upgrade-api-download-method:
-
-Downloading your database dump
-==============================
-
-Beside downloading your migrated database using the URL provided by the
-:ref:`status method <upgrade-api-status-method>`, you can also use the SFTP
-protocol as described in the :ref:`request_sftp_access method
-<upgrade-api-request-sftp-access-method>`
-
-The diffence is that you'll only be able to download the migrated database. No
-uploading will be possible.
-
-Your database upgrade request should be in the ``done`` state.
-
-Once you have successfully connected using your SFTP client, you can download
-your database dump. Here is a sample session using the 'sftp' client:
-
-::
-
-    $ sftp -P 2200 user_10534@upgrade.flectra.com
-    Connected to upgrade.flectra.com.
-    sftp> get upgraded_openchs.70.cdump /path/to/upgraded_openchs.70.cdump
-    Downloading /upgraded_openchs.70.cdump to /path/to/upgraded_openchs.70.cdump
-