[MERGE] forward port of branch saas-6 up to cea0a8025234c5649aa03c4987758c45fe5b1d57

14 files changed, 32 insertions, 1021 deletions

diff --git a/addons/account_asset/report/account_asset_report.py b/addons/account_asset/report/account_asset_report.py
index 938da73efd5..1cafe349079 100644
--- a/addons/account_asset/report/account_asset_report.py
+++ b/addons/account_asset/report/account_asset_report.py
@@ -33,9 +33,7 @@ class AssetAssetReport(models.Model):
                     dl.name as name,
                     dl.depreciation_date as depreciation_date,
                     a.date as date,
-                    (CASE WHEN (select min(d.id) from account_asset_depreciation_line as d
-                                left join account_asset_asset as ac ON (ac.id=d.asset_id)
-                                where a.id=ac.id) = min(dl.id)
+                    (CASE WHEN dlmin.id = min(dl.id)
                       THEN a.value
                       ELSE 0
                       END) as gross_value,
@@ -59,8 +57,9 @@ class AssetAssetReport(models.Model):
                     a.company_id as company_id
                 from account_asset_depreciation_line dl
                     left join account_asset_asset a on (dl.asset_id=a.id)
+                    left join (select min(d.id) as id,ac.id as ac_id from account_asset_depreciation_line as d inner join account_asset_asset as ac ON (ac.id=d.asset_id) group by ac_id) as dlmin on dlmin.ac_id=a.id
                 group by
                     dl.amount,dl.asset_id,dl.depreciation_date,dl.name,
                     a.date, dl.move_check, a.state, a.category_id, a.partner_id, a.company_id,
-                    a.value, a.id, a.salvage_value
+                    a.value, a.id, a.salvage_value, dlmin.id
         )""")
diff --git a/addons/google_spreadsheet/google_spreadsheet_view.xml b/addons/google_spreadsheet/google_spreadsheet_view.xml
index 1f014edb8be..60284478c5e 100644
--- a/addons/google_spreadsheet/google_spreadsheet_view.xml
+++ b/addons/google_spreadsheet/google_spreadsheet_view.xml
@@ -42,7 +42,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="context">{}</field>
-            <field name="domain">[('url', 'like', '/spreadsheet/')]</field>
+            <field name="domain">[('url', '=ilike', '%google%/spreadsheet%')]</field>
             <field name="help">Google Spreadsheets</field>
         </record>
 
diff --git a/addons/hw_posbox_homepage/controllers/main.py b/addons/hw_posbox_homepage/controllers/main.py
index 09095fe2adc..11d7a9d2f30 100644
--- a/addons/hw_posbox_homepage/controllers/main.py
+++ b/addons/hw_posbox_homepage/controllers/main.py
@@ -44,7 +44,8 @@ index_template = """
         </p>
         <p>
         For more information on how to setup the Point of Sale with
-        the PosBox, please refer to <a href='/hw_proxy/static/doc/manual.pdf'>the manual</a>.
+        the PosBox, please refer to
+        <a href='https://www.odoo.com/documentation/user/point_of_sale/posbox/index.html'>the manual</a>.
         </p>
         <p>
         To see the status of the connected hardware, please refer 
diff --git a/addons/hw_posbox_upgrade/controllers/main.py b/addons/hw_posbox_upgrade/controllers/main.py
index 42811820e74..667156ee06e 100644
--- a/addons/hw_posbox_upgrade/controllers/main.py
+++ b/addons/hw_posbox_upgrade/controllers/main.py
@@ -70,7 +70,8 @@ upgrade_template = """
 	<p></p>
         However the preferred method to upgrade the posbox is to flash the sd-card with
         the <a href='http://nightly.odoo.com/trunk/posbox/'>latest image</a>. The upgrade
-        procedure is explained into to the <a href='/hw_proxy/static/doc/manual.pdf'>PosBox manual</a>
+        procedure is explained into to the
+        <a href='https://www.odoo.com/documentation/user/point_of_sale/posbox/index.html'>PosBox manual</a>
         </p>
         <p>
         To upgrade the posbox, click on the upgrade button. The upgrade will take a few minutes. <b>Do not reboot</b> the PosBox during the upgrade.
diff --git a/addons/hw_proxy/doc/_images/posbox_doc_schema.png b/addons/hw_proxy/doc/_images/posbox_doc_schema.png
deleted file mode 100644
index 929675db9e8..00000000000
--- a/addons/hw_proxy/doc/_images/posbox_doc_schema.png
+++ /dev/null
diff --git a/addons/hw_proxy/doc/_images/posbox_doc_schema.svg b/addons/hw_proxy/doc/_images/posbox_doc_schema.svg
deleted file mode 100644
index 92d02849cf0..00000000000
--- a/addons/hw_proxy/doc/_images/posbox_doc_schema.svg
+++ /dev/null
@@ -1,548 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="1600px"
-   height="1200px"
-   id="svg2985"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="posbox_doc_schema.svg"
-   inkscape:export-filename="/home/fva/Code/openerp/posbox_doc_schema.png"
-   inkscape:export-xdpi="67.5"
-   inkscape:export-ydpi="67.5">
-  <defs
-     id="defs2987">
-    <marker
-       inkscape:stockid="DotL"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="DotL"
-       style="overflow:visible">
-      <path
-         id="path6730"
-         d="M -2.5,-1.0 C -2.5,1.7600000 -4.7400000,4.0 -7.5,4.0 C -10.260000,4.0 -12.5,1.7600000 -12.5,-1.0 C -12.5,-3.7600000 -10.260000,-6.0 -7.5,-6.0 C -4.7400000,-6.0 -2.5,-3.7600000 -2.5,-1.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt"
-         transform="scale(0.8) translate(7.4, 1)" />
-    </marker>
-    <marker
-       inkscape:stockid="DotM"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="DotM"
-       style="overflow:visible">
-      <path
-         id="path6733"
-         d="M -2.5,-1.0 C -2.5,1.7600000 -4.7400000,4.0 -7.5,4.0 C -10.260000,4.0 -12.5,1.7600000 -12.5,-1.0 C -12.5,-3.7600000 -10.260000,-6.0 -7.5,-6.0 C -4.7400000,-6.0 -2.5,-3.7600000 -2.5,-1.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt"
-         transform="scale(0.4) translate(7.4, 1)" />
-    </marker>
-    <pattern
-       inkscape:collect="always"
-       xlink:href="#Strips1_3"
-       id="pattern6512"
-       patternTransform="matrix(1.4070053,-1.4070053,10.196067,10.196067,0,0)" />
-    <pattern
-       inkscape:stockid="Stripes 1:3"
-       id="Strips1_3"
-       patternTransform="translate(0,0) scale(10,10)"
-       height="1"
-       width="4"
-       patternUnits="userSpaceOnUse"
-       inkscape:collect="always">
-      <rect
-         id="rect4622"
-         height="2"
-         width="1"
-         y="-0.5"
-         x="0"
-         style="fill:black;stroke:none" />
-    </pattern>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.45254834"
-     inkscape:cx="679.01909"
-     inkscape:cy="813.9637"
-     inkscape:current-layer="layer1"
-     inkscape:document-units="px"
-     showgrid="false"
-     inkscape:window-width="1920"
-     inkscape:window-height="991"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata2990">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <g
-       id="g7313">
-      <g
-         transform="translate(0,35.355339)"
-         id="g6566">
-        <g
-           id="g6514"
-           transform="translate(-10.9375,-57.8125)">
-          <path
-             inkscape:connector-curvature="0"
-             id="path6489"
-             d="m 905,179.59375 -34.8125,31.34375 -118.78125,0 c -5.54,0 -10,4.46 -10,10 l 0,102.5 -157.5,0 c -16.62,0 -30,13.38 -30,30 l 0,632.3125 -27.4375,24.9375 33.25,44.2813 c 0.10609,0.1442 0.2039,0.2952 0.3125,0.4374 l 2.125,2.8126 0.21875,-0.125 c 5.44486,5.6076 13.06148,9.0937 21.53125,9.0937 l 463.43755,0 c 16.6199,0 30,-13.38 30,-30 l 0,-683.75 c 0,-10.90688 -5.7475,-20.40588 -14.4063,-25.65625 l -41.125,-31 -27.3125,26.65625 -45.28125,0 0,-102.5 c 0,-2.89877 -1.22955,-5.48931 -3.1875,-7.3125 l 0.25,-0.375 L 905,179.59375 z"
-             style="opacity:0.25;fill:url(#pattern6512);fill-opacity:1;stroke:none" />
-          <g
-             transform="translate(-2.2097087,75.130096)"
-             id="g3823">
-            <g
-               id="g3847">
-              <rect
-                 ry="5.274591"
-                 y="106.16312"
-                 x="711.8349"
-                 height="151.06096"
-                 width="194.27489"
-                 id="rect3843"
-                 style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:8.48901749;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-                 rx="5.274591" />
-              <rect
-                 rx="5.274591"
-                 style="fill:none;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-                 id="rect3845"
-                 width="175.41872"
-                 height="151.06096"
-                 x="721.263"
-                 y="106.16312"
-                 ry="5.274591" />
-            </g>
-            <rect
-               rx="5.274591"
-               ry="5.274591"
-               y="869.83844"
-               x="746.01172"
-               height="110.99157"
-               width="131.81378"
-               id="rect3765"
-               style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:8.48901749;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-            <rect
-               style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:8.48901749;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-               id="rect6618"
-               width="125.18465"
-               height="53.539146"
-               x="938.25635"
-               y="571.52777"
-               ry="5.274591"
-               rx="5.274591" />
-            <rect
-               rx="34.723557"
-               style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:8;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-               id="rect2993"
-               width="509.11688"
-               height="730.677"
-               x="525.61603"
-               y="217.12157"
-               ry="34.723557" />
-            <rect
-               rx="21.787001"
-               ry="21.787001"
-               y="235.37366"
-               x="543.0672"
-               height="694.12708"
-               width="474.21454"
-               id="rect3763"
-               style="fill:none;stroke:#000000;stroke-width:1.99425566;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-            <rect
-               style="fill:none;stroke:#000000;stroke-width:1.99425554;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-               id="rect3767"
-               width="160.64433"
-               height="9.1270761"
-               x="562.84052"
-               y="740.37366"
-               rx="5.3000002"
-               ry="5.3000002" />
-            <rect
-               ry="5.3000002"
-               rx="5.2999997"
-               y="667.30597"
-               x="828.00549"
-               height="9.1270761"
-               width="73.434502"
-               id="rect3769"
-               style="fill:none;stroke:#000000;stroke-width:1.99399996;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-            <rect
-               ry="5.3000002"
-               rx="5.3000002"
-               y="313.75256"
-               x="693.65527"
-               height="9.1270761"
-               width="160.64433"
-               id="rect3771"
-               style="fill:none;stroke:#000000;stroke-width:1.99425554;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-            <g
-               id="g3783">
-              <rect
-                 ry="5.3000002"
-                 rx="5.3000002"
-                 y="245.39903"
-                 x="962.35583"
-                 height="271.93509"
-                 width="43.971706"
-                 id="rect3773"
-                 style="fill:none;stroke:#000000;stroke-width:1.99425554;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-              <rect
-                 ry="5.3000002"
-                 rx="5.3000002"
-                 y="374.20874"
-                 x="952.03491"
-                 height="7.0710678"
-                 width="21.213203"
-                 id="rect3775"
-                 style="fill:#ffffff;fill-opacity:1;stroke:none" />
-              <rect
-                 style="fill:#ffffff;fill-opacity:1;stroke:none"
-                 id="rect3777"
-                 width="21.213203"
-                 height="7.0710678"
-                 x="992.86823"
-                 y="373.3754"
-                 rx="5.3000002"
-                 ry="5.3000002" />
-              <rect
-                 transform="matrix(0,-1,1,0,0,0)"
-                 ry="5.3000002"
-                 rx="5.3000002"
-                 y="981.60596"
-                 x="-260.01752"
-                 height="7.0710678"
-                 width="21.213203"
-                 id="rect3779"
-                 style="fill:#ffffff;fill-opacity:1;stroke:none" />
-              <rect
-                 style="fill:#ffffff;fill-opacity:1;stroke:none"
-                 id="rect3781"
-                 width="21.213203"
-                 height="7.0710678"
-                 x="-526.6842"
-                 y="981.60596"
-                 rx="5.3000002"
-                 ry="5.3000002"
-                 transform="matrix(0,-1,1,0,0,0)" />
-            </g>
-            <path
-               inkscape:connector-curvature="0"
-               style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-               d="m 958.1875,822.25 c -9.01707,3.59482 -15.375,12.41301 -15.375,22.71875 0,13.50563 10.93187,24.46875 24.4375,24.46875 13.50563,0 24.46875,-10.96312 24.46875,-24.46875 0,-10.17788 -6.2141,-18.91637 -15.0625,-22.59375 l 0,8.8125 c 4.63325,2.9517 7.6875,8.02222 7.6875,13.78125 0,9.11223 -7.65608,16.5 -17.09375,16.5 -9.43767,0 -17.0625,-7.38777 -17.0625,-16.5 0,-5.88681 3.20248,-11.04837 8,-13.96875 l 0,-8.75 z"
-               id="path3792" />
-            <g
-               id="g3818"
-               transform="translate(0,-1.767767)">
-              <rect
-                 ry="5.3000002"
-                 rx="5.2999992"
-                 y="879.66095"
-                 x="943.13324"
-                 height="8.7558908"
-                 width="46.827415"
-                 id="rect3794"
-                 style="fill:none;stroke:#000000;stroke-width:1.99399996;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-              <rect
-                 style="fill:none;stroke:#000000;stroke-width:1.99399996;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-                 id="rect3798"
-                 width="46.827415"
-                 height="8.7558908"
-                 x="943.13324"
-                 y="895.68982"
-                 rx="5.2999992"
-                 ry="5.3000002" />
-              <rect
-                 ry="5.3000002"
-                 rx="5.2999992"
-                 y="910.22754"
-                 x="943.13324"
-                 height="8.7558908"
-                 width="46.827415"
-                 id="rect3800"
-                 style="fill:none;stroke:#000000;stroke-width:1.99399996;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-            </g>
-            <rect
-               ry="5.3000002"
-               rx="5.2999992"
-               y="963.05292"
-               x="-845.58075"
-               height="8.7558908"
-               width="32.390652"
-               id="rect3812"
-               style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.99400008;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-               transform="matrix(0,-1,1,0,0,0)" />
-          </g>
-        </g>
-        <g
-           id="g6559"
-           transform="translate(0,-7.7339804)">
-          <path
-             transform="matrix(1,0,0,0.85333333,0,117.03125)"
-             d="m 1119.5313,856.64062 c 0,5.82488 -4.1974,10.54688 -9.375,10.54688 -5.1777,0 -9.375,-4.722 -9.375,-10.54688 0,-5.82487 4.1973,-10.54687 9.375,-10.54687 5.1776,0 9.375,4.722 9.375,10.54687 z"
-             sodipodi:ry="10.546875"
-             sodipodi:rx="9.375"
-             sodipodi:cy="856.64062"
-             sodipodi:cx="1110.1562"
-             id="path6539"
-             style="fill:#00fd28;fill-opacity:1;stroke:#000000;stroke-width:2.16506362;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-             sodipodi:type="arc" />
-          <path
-             sodipodi:type="arc"
-             style="fill:#ff0d0d;fill-opacity:1;stroke:#000000;stroke-width:2.16506362;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-             id="path6541"
-             sodipodi:cx="1110.1562"
-             sodipodi:cy="856.64062"
-             sodipodi:rx="9.375"
-             sodipodi:ry="10.546875"
-             d="m 1119.5313,856.64062 c 0,5.82488 -4.1974,10.54688 -9.375,10.54688 -5.1777,0 -9.375,-4.722 -9.375,-10.54688 0,-5.82487 4.1973,-10.54687 9.375,-10.54687 5.1776,0 9.375,4.722 9.375,10.54687 z"
-             transform="matrix(1,0,0,0.85333333,0,141.44531)" />
-          <path
-             transform="matrix(1,0,0,0.85333333,0,165.85937)"
-             d="m 1119.5313,856.64062 c 0,5.82488 -4.1974,10.54688 -9.375,10.54688 -5.1777,0 -9.375,-4.722 -9.375,-10.54688 0,-5.82487 4.1973,-10.54687 9.375,-10.54687 5.1776,0 9.375,4.722 9.375,10.54687 z"
-             sodipodi:ry="10.546875"
-             sodipodi:rx="9.375"
-             sodipodi:cy="856.64062"
-             sodipodi:cx="1110.1562"
-             id="path6543"
-             style="fill:#00fd28;fill-opacity:1;stroke:#000000;stroke-width:2.16506362;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-             sodipodi:type="arc" />
-          <path
-             sodipodi:type="arc"
-             style="fill:#00fd28;fill-opacity:1;stroke:#000000;stroke-width:2.16506362;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-             id="path6545"
-             sodipodi:cx="1110.1562"
-             sodipodi:cy="856.64062"
-             sodipodi:rx="9.375"
-             sodipodi:ry="10.546875"
-             d="m 1119.5313,856.64062 c 0,5.82488 -4.1974,10.54688 -9.375,10.54688 -5.1777,0 -9.375,-4.722 -9.375,-10.54688 0,-5.82487 4.1973,-10.54687 9.375,-10.54687 5.1776,0 9.375,4.722 9.375,10.54687 z"
-             transform="matrix(1,0,0,0.85333333,0,190.27344)" />
-          <path
-             transform="matrix(1,0,0,0.85333333,0,214.6875)"
-             d="m 1119.5313,856.64062 c 0,5.82488 -4.1974,10.54688 -9.375,10.54688 -5.1777,0 -9.375,-4.722 -9.375,-10.54688 0,-5.82487 4.1973,-10.54687 9.375,-10.54687 5.1776,0 9.375,4.722 9.375,10.54687 z"
-             sodipodi:ry="10.546875"
-             sodipodi:rx="9.375"
-             sodipodi:cy="856.64062"
-             sodipodi:cx="1110.1562"
-             id="path6547"
-             style="fill:#fff90d;fill-opacity:1;stroke:#000000;stroke-width:2.16506362;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-             sodipodi:type="arc" />
-        </g>
-      </g>
-      <text
-         sodipodi:linespacing="125%"
-         id="text6598"
-         y="178.8759"
-         x="514.01447"
-         style="font-size:36.98903275px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
-         xml:space="preserve"><tspan
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Droid Sans;-inkscape-font-specification:Droid Sans"
-           y="178.8759"
-           x="514.01447"
-           id="tspan6600"
-           sodipodi:role="line">2A Power</tspan></text>
-      <text
-         xml:space="preserve"
-         style="font-size:36.98903275px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
-         x="724.2699"
-         y="127.21583"
-         id="text6602"
-         sodipodi:linespacing="125%"><tspan
-           sodipodi:role="line"
-           id="tspan6604"
-           x="724.2699"
-           y="127.21583"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Droid Sans;-inkscape-font-specification:Droid Sans">SD Card</tspan></text>
-      <text
-         sodipodi:linespacing="125%"
-         id="text6606"
-         y="626.60999"
-         x="319.89322"
-         style="font-size:36.98903275px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
-         xml:space="preserve"><tspan
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Droid Sans;-inkscape-font-specification:Droid Sans"
-           y="626.60999"
-           x="319.89322"
-           id="tspan6608"
-           sodipodi:role="line">HDMI</tspan></text>
-      <text
-         xml:space="preserve"
-         style="font-size:36.98903275px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
-         x="761.83496"
-         y="1097.278"
-         id="text6610"
-         sodipodi:linespacing="125%"><tspan
-           sodipodi:role="line"
-           id="tspan6612"
-           x="761.83496"
-           y="1097.278"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Droid Sans;-inkscape-font-specification:Droid Sans">USB</tspan></text>
-      <text
-         sodipodi:linespacing="125%"
-         id="text6614"
-         y="1097.278"
-         x="596.10681"
-         style="font-size:36.98903275px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
-         xml:space="preserve"><tspan
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Droid Sans;-inkscape-font-specification:Droid Sans"
-           y="1097.278"
-           x="596.10681"
-           id="tspan6616"
-           sodipodi:role="line">RJ45</tspan></text>
-      <text
-         xml:space="preserve"
-         style="font-size:36.98903275px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
-         x="1135.8894"
-         y="660.90717"
-         id="text6620"
-         sodipodi:linespacing="125%"><tspan
-           sodipodi:role="line"
-           id="tspan6622"
-           x="1135.8894"
-           y="660.90717"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Droid Sans;-inkscape-font-specification:Droid Sans">Composite</tspan></text>
-      <text
-         sodipodi:linespacing="125%"
-         id="text6624"
-         y="774.18842"
-         x="1135.8894"
-         style="font-size:36.98903275px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
-         xml:space="preserve"><tspan
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Droid Sans;-inkscape-font-specification:Droid Sans"
-           y="774.18842"
-           x="1135.8894"
-           id="tspan6626"
-           sodipodi:role="line">Audio</tspan></text>
-      <text
-         xml:space="preserve"
-         style="font-size:36.98903275px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
-         x="1135.8894"
-         y="774.18842"
-         id="text6628"
-         sodipodi:linespacing="125%"><tspan
-           sodipodi:role="line"
-           id="tspan6630"
-           x="1135.8894"
-           y="774.18842"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Droid Sans;-inkscape-font-specification:Droid Sans">Audio</tspan></text>
-      <text
-         sodipodi:linespacing="125%"
-         id="text6632"
-         y="891.37592"
-         x="1212.4519"
-         style="font-size:36.98903275px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
-         xml:space="preserve"><tspan
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Droid Sans;-inkscape-font-specification:Droid Sans"
-           y="891.37592"
-           x="1212.4519"
-           id="tspan6634"
-           sodipodi:role="line">Ready</tspan></text>
-      <text
-         xml:space="preserve"
-         style="font-size:36.98903275px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
-         x="1212.4519"
-         y="940.45667"
-         id="text6636"
-         sodipodi:linespacing="125%"><tspan
-           sodipodi:role="line"
-           id="tspan6638"
-           x="1212.4519"
-           y="940.45667"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Droid Sans;-inkscape-font-specification:Droid Sans">Power</tspan></text>
-      <text
-         sodipodi:linespacing="125%"
-         id="text6640"
-         y="986.97278"
-         x="1212.4519"
-         style="font-size:36.98903275px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
-         xml:space="preserve"><tspan
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Droid Sans;-inkscape-font-specification:Droid Sans"
-           y="986.97278"
-           x="1212.4519"
-           id="tspan6642"
-           sodipodi:role="line">Network</tspan></text>
-      <path
-         inkscape:connector-curvature="0"
-         id="path6663"
-         d="m 437.5,614.15728 54.6875,0"
-         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-start:url(#DotL)" />
-      <path
-         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-start:url(#DotL)"
-         d="m 601.86625,199.79103 0,54.6875"
-         id="path7295"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path7297"
-         d="m 1113.1075,650.87603 -54.6875,0"
-         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-start:url(#DotL)" />
-      <path
-         sodipodi:nodetypes="cc"
-         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-start:url(#DotL)"
-         d="m 1113.1075,761.81353 -76.5625,0"
-         id="path7299"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-start:url(#DotL)"
-         d="m 1192.657,876.26632 -54.6875,0"
-         id="path7301"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         id="path7303"
-         d="m 1192.657,927.08963 -54.6875,-27.62136"
-         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-start:url(#DotL)" />
-      <path
-         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-start:url(#DotL)"
-         d="m 1192.657,974.04593 -54.6875,0"
-         id="path7305"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         id="path7307"
-         d="m 1192.657,974.04593 -54.6875,-24.85922"
-         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-start:url(#DotL)" />
-      <path
-         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-start:url(#DotL)"
-         d="m 1192.657,974.04593 -54.6875,-49.16602"
-         id="path7309"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <path
-         sodipodi:nodetypes="cc"
-         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-start:url(#DotL)"
-         d="m 630.03792,1053.883 0,-32.0313"
-         id="path7311"
-         inkscape:connector-curvature="0" />
-    </g>
-  </g>
-</svg>
diff --git a/addons/hw_proxy/doc/index.rst b/addons/hw_proxy/doc/index.rst
deleted file mode 100644
index 76eb27f6070..00000000000
--- a/addons/hw_proxy/doc/index.rst
+++ /dev/null
@@ -1,447 +0,0 @@
-====================
-PosBox Documentation
-====================
-
-Posbox Setup Guide
-==================
-
-Prerequisites
--------------
-
-Before you start setting up your PosPox make sure you have everything.
-You will need :
-
--  The PosBox
--  A 2A Power adapter
--  A computer or tablet with an up to date Firefox, Chrome or Safari web
-   browser (we recommend Chrome)
--  A running SaaS or V8.0 OpenERP Instance with the Point of Sale
-   Installed.
--  A local network set up with DHCP ( this is the default setting )
--  A RJ45 Ethrnet Cable
--  An Epson USB TM-T20 Printer or another compatible printer.
--  A Honeywell Eclipse USB Barcode Scanner or another compatible scanner.
--  An Epson compatible cash drawer.
-
-Step By Step Setup Guide
-------------------------
-
-.. image:: _images/posbox_doc_schema.png
-    :width: 100%
-    :align: center
-
-Power the PosBox
-~~~~~~~~~~~~~~~~
-
-Plug the PosBox to the 2A Power Adapter, a bright red status led should
-light up.
-
-Connect it to the Local Network
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Connect the PosBox to the Local Network with the RJ45 Cable. Make sure
-You connect the PosBox to the same Network as your POS device. Once
-connected a bright yellow status led should light up, and a green status
-led should flash.
-
-Connect the USB Printer
-~~~~~~~~~~~~~~~~~~~~~~~
-
-Put a paper roll in the printer, power it up, then connect it to one of
-the PosBox's USB port
-
-Connect the cash drawer
-~~~~~~~~~~~~~~~~~~~~~~~
-
-The cash drawer should be connected to the printer with the RJ25 cable
-
-Connect the USB Barcode Scanner
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Connect the usb barcode scanner to one of the PosBox's USB port. The
-Barcode Scanner should immediately light up and emit a loud beep.
-
-Configure the USB Barcode Scanner
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-The barcode scanner should be configured in QWERTY and emit a new line /
-return symbol after each scan. This is most likely the default
-configuration of your barcode scanner.
-
-Make sure the PosBox is ready
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Once powered, The PosBox needs less than a minute to boot. Once the
-PosBox is ready, it should print a status receipt with its IP Adress.
-Also, the last status led, just after the red power status led, should
-be permanently lit green.
-
-Setup the Point of Sale
-~~~~~~~~~~~~~~~~~~~~~~~~
-
-Make sure to activate the 'Print via Proxy', 'Remote Scanning' or
-'Cashdrawer' options in the Point of Sale configuration. If you are
-using firefox, you must manually specify the PosBox's IP address which
-was printed on the status receipt.
-
-If you are running multiple Point of Sales on the same PosBox, make sure
-that only one of them has Remote Scanning activated.
-
-If you manually specify the PosBox's IP address, you must configure your
-network to make sure the PosBox's IP address doesn't change. Please
-refer to your Router documentation.
-
-Launch the Point of Sale.
-~~~~~~~~~~~~~~~~~~~~~~~~~
-
-If you didn't spcecify the PosBox's IP address in the config, the POS
-will need some time to perform a network scan to find the PosBox. This
-is only done once.
-
-The Point of Sale is now connected to the PosBox and your Hardware
-should be ready to use.
-
-Multi-Pos Configuration
------------------------
-The advised way to setup a multi Point-of-Sale shop is to have one PosBox
-per Point-of-Sale. In this case it is mandatory to manually specify the
-IP address of each PosBox in each Point of Sale. You must also configure
-your network to make sure the PosBox's IP address doesn't change. Please
-refer to your Router documentation.
-
-PosBoxless Setup Guide
-======================
-
-If you are running your Point of Sale on a debian-based linux
-distribution, you do not need the PosBox as you can run its software
-locally. However the installation process is not foolproof. You'll need
-at least to know how to install and run openerp. You may also run into
-issues specific to your distribution or to your particular setup and
-hardware configuration.
-
-Prerequisites
--------------
-
--  A debian based linux distribution (Debian, Ubuntu, Mint, etc.)
--  A running OpenERP server (version trunk or saas-3 or 8.0 or later) 
--  You must uninstall any esc-pos printer driver as it will conflict
-   with OpenERP's built-in driver.
-
-Step By Step Setup Guide
-------------------------
-
-Extra dependencies
-~~~~~~~~~~~~~~~~~~
-
-Because Odoo is running on Python 2, you need to check which version of pip you need to use.
-
-    $ sudo pip --version
-    
-If it returns something like :
-   pip 1.5.6 from /usr/local/lib/python3.3/dist-packages/pip-1.5.6-py3.3.egg (python 3.3)
-You need to try pip2 instead
-
-If it returns something like :
-   pip 1.4.1 from /usr/lib/python2.7/dist-packages (python 2.7)
-You can use pip
-
-The driver modules requires the installation of new python modules::
-
-    $ sudo pip install pyserial
-    $ sudo pip install --pre pyusb
-    $ sudo pip install qrcode
-    
-Database Setup
-~~~~~~~~~~~~~~
-
-You must create a database called ``posbox`` with the modules
-``hw_proxy``, ``hw_escpos``, and ``hw_scanner`` installed.
-
-Access Rights
-~~~~~~~~~~~~~
-
-The drivers need raw access to the printer and barcode scanner devices.
-Doing so requires a bit system administration. First we are going to
-create a group that has haccess to usb devices::
-
-    $ sudo groupadd usbusers
-
-Then we add the user who will run the OpenERP server to ``usbusers``::
-
-    $ sudo useradd -G usbusers USERNAME
-
-Then we need to create a udev rule that will automatically allow members
-of ``usbusers`` to access raw usb devices. To do so create a file called
-``99-usbusers.rule`` in the ``/etc/udev/rules.d/`` directory with the
-following content::
-
-    SUBSYSTEM=="usb", GROUP="usbusers", MODE="0660"
-    SUBSYSTEMS=="usb", GROUP="usbusers", MODE="0660"
-
-Then you need to reboot your machine.
-
-Start the local OpenERP Installl
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-We must launch the OpenERP server on the port ``8069`` with the correct
-database settings::
-
-    $ ./server/openerp-server --addons-path=addons,web/addons --db-filter='^posbox$' \
-            --xmlrpc-port=8069 -d posbox
-
-Check that everything works
-~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Plug all your hardware to your machine's USB ports, and go to
-``http://localhost:8069/hw_proxy/status`` refresh the page a few times and
-see if all your devices are indicated as *Connected*. Possible source of
-errors are: The paths on the distribution differ from the paths expected
-by the drivers, another process has grabbed exclusive access to the
-devices, the udev rules do not apply or a superceeded by others.
-
-Automatically Start OpenERP
-~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-You must now make sure that this OpenERP install is automatically
-started after boot. There are various ways to do so, and how to do it
-depends on your particular setup. We use *systemd* on the PosBox, but
-*upstart* or *sysvinit* are other options.
-
-Setup the Point of Sale
-~~~~~~~~~~~~~~~~~~~~~~~~
-
-The IP Adress field in the POS Config must be either ``127.0.0.1`` 
-or ``localhost``. You can also leave it empty.
-
-PosBox Technical Documentation
-==============================
-
-Technical Overview
-------------------
-
-The PosBox Hardware
-~~~~~~~~~~~~~~~~~~~
-
-The PosBox's Hardware is based on a model B Raspberry Pi, a popular
-open-source micro-computer. The Raspberry Pi is powered with a 2A
-micro-usb power adapter. 2A is needed to give enough power to the
-barcode scanners. And we recommend Samsung power adapters for their
-availability and reliability ( but beware of counterfeits ). The
-Raspberry is protected by a ModMyPi Raspberry Pi Case. The Software is
-installed on a 8Gb Class 10 or Higher SD Card. The SD Card's class is
-important to ensure good performances. All this hardware is easily
-available worldwide from independant vendors.
-
-Compatible Peripherals
-~~~~~~~~~~~~~~~~~~~~~~
-
--  Printers:
-
-   -  Epson TM-T20
-   -  Support for Other Esc-Pos compatible printers can be easily added
-      on a case-by-case basis, please see the *Unsupported Printers*
-      chapter of this manual.
-
--  Barcode Scannners:
-
-   -  Metapace S61
-   -  Honeywell Eclipse or Voyager 95x0 Series.
-   -  Most other barcode scanners should work out of the box. Some
-      barcode scanners need more power than the PosBox can provide and
-      must be plugged in a self-powered USB HUB. This is the case for
-      Datalogic Barcode Scanners.
-
--  Cash Drawers:
-
-   -  As the cash drawers are connected to the printer, All Epson
-      compatible cash drawers should work out of the Box.
-
-The PosBox Software
-~~~~~~~~~~~~~~~~~~~
-
-The PosBox runs a Raspbian Linux distribution, a Debian derivative
-optimized for the Raspberry Pi. It also runs a barebones install of
-OpenERP which provides the webserver and the drivers. The printer &
-scanner drivers are implemented as openerp modules. Those modules are
-named ``hw_proxy``, ``hw_escpos``, ``hw_scanner`` and are the only
-modules installed and running. OpenERP is only used for the framework it
-provides. No business data is processed or stored on the PosBox. The
-OpenERP install is a full bazaar clone of the ``trunk`` branch, and can
-thus be updated trough the usual means.
-
-We use systemd to manage the Openerp server. Systemd makes sure OpenERP
-starts up at boot and is always up and running. Its systemd unit file is
-called ``openerp.service``, and can be found in
-``/etc/systemd/system/openerp.service``. The systemd version used is
-quite old and thus ``journalctl`` is not available. All logs can be
-found in instead ``/var/logs/syslog``
-
-We removed all graphical software from the default install to reduce to
-image size but nothing prevents you from reinstalling them.
-
-Accessing the PosBox
---------------------
-
-Local Access
-~~~~~~~~~~~~
-
-If you plug a QWERTY USB keyboard into one of the PosBox's USB ports,
-and if you connect a computer monitor to the *HDMI* port of the PosBox,
-you can use it as a small UNIX computer and perform various
-administration tasks.
-
-Once the PosBox is ready press ``ALT-F2`` to access the login prompt.
-The login is ``pi`` and the password ``admin``. The OpenERP install is
-in the ``~/openerp`` directory along with a few scripts to help with
-debugging and administration.
-
-Remote Access
-~~~~~~~~~~~~~
-
-If you have the PosBox's IP address and a SSH client you can access the
-PosBox's system remotely. The login / password are ``pi``/``admin``
-
-Getting Unsupported Printers to Work
-------------------------------------
-
-The PosBox should be able to print to any ESC-POS printer, not just the
-Epson TM-T20. If You have such a printer, you can activate it with the
-following steps:
-
--  Get local or remote access to the PosBox.
--  Plug in your printer
--  type ``lsusb`` in a prompt
--  Find your printer in the list of connected USB devices
--  Find your printer's vendor id: It consists of two hexadecimal numbers
-   separated by a colon.
--  Edit ``~/openerp/addons/hw_escpos/escpos/supported_devices.py`` and
-   add an entry for your printer.
--  Restart the PosBox.
--  If everything works properly you can send your printer's name and
-   vendor ID to ``support@openerp.com`` and we'll add it to the list of
-   supported devices.
-
-Updating The PosBox Software
-----------------------------
-
-The best way to update the PosBox software is to download a new version
-of the image and flash the SD-Card with it. This operation is described
-in details on the following tutorial
-``http://elinux.org/RPi_Easy_SD_Card_Setup``, just replace the standard
-raspberry pi image to the latest one found at
-``http://nightly.openerp.com/trunk/posbox/``
-
-Troubleshoot
-============
-
-The POS cannot connect to the PosBox.
--------------------------------------
-
--  The easiest way to make sure the PosBox is properly set-up is to turn
-   it on with the printer plugged in as it will print a receipt
-   indicating any error if encountered or the PosBox's IP adress in case
-   of success. If no receipt is printed, check the following steps:
--  Make sure the PosBox is powered on, indicated by a brightly lid red
-   status LED.
--  Make sure the PosBox is ready, this is indicated by a brightly lid
-   green status LED just above the red power status LED. The PosBox
-   should be ready one minute after it is powered on.
--  Make sure the PosBox is connected to the Network. This is indicated
-   by a brightly lid yellow status LED.
--  Make sure the PosBox is connected to the same network as your POS
-   device. Both the device and the posbox should be visible in the list
-   of connected devices on your network router.
--  Make sure that your LAN is set up with DHCP, and gives ip Address in
-   the range 192.168.0.X, 192.168.1.X, 10.0.0.X. If you cannot setup
-   your LAN that way, you must manually set up your PosBox's ip-address.
-   See the relevant paragraph in the Setup chapter of this documentation
--  If you have specified the PosBox's IP address in the config, make
-   sure it correspond to the printed on the PosBox's status receipt.
--  Make sure that the POS is not loaded over HTTPS.
--  A bug in Firefox's HTTP implementation prevents the autodiscovery
-   from working reliably. When using Firefox you should manually set up
-   the PosBox's ip address in the POS config.
-
-The Barcode Scanner is not working
-----------------------------------
-
--  The PosBox needs a 2A power supply to work with some barcode
-   scanners. If you are not using the provided power supply, make sure
-   the one you use has enough power.
--  Some barcode scanners will need more than 2A and will not work, or
-   will work unreliably, even with the provided power supply. In those
-   case you can plug the barcode scanner in a self-powered USB Hub.
--  Some poorly built barcode scanners do not advertise themselves as
-   barcode scanners but as a usb keyboard instead, and will not be
-   recognized by the PosBox.
--  The barcode scanner must be configured in US QWERTY and emit a linefeed
-   after each codebar. 
-
-The Barcode Scanner is not working reliably
--------------------------------------------
-
--  Make sure that no more than one device with 'Scan via Proxy' enabled
-   are connected to the PosBox at the same time.
-
-Printing the receipt takes too much time.
------------------------------------------
-
--  A small delay before the first print is expected, as the PosBox will
-   do some preprocessing to speed up the next printings. If you suffer
-   delays afterwards it is most likely due to poor network connection
-   between the POS and the PosBox.
-
-Some characters are not correctly printed on the receipt.
----------------------------------------------------------
-
--  The PosBox does not support all languages and characters. It
-   currently supports latin and cyrillic based scripts, with basic
-   japanese support.
-
-The Printer is Offline
-----------------------
-
--  The PosBox only supports EPSON TM-T20 printers. Make sure the printer
-   is connected, powered, has enough paper and has its lid closed, and
-   does is not in an error status. If the error persists, please contact
-   support.
-
-The Cashdrawer does not open.
------------------------------
-
--  The cashdrawer should be connected to the printer and should be
-   activated in the POS Configuration
-
-Credits
-=======
-The PosBox project was developped by Frédéric van der Essen with the 
-kind help of Gary Malherbe, Fabien Meghazi, Nicolas Wisniewsky, 
-Dimitri Del Marmol and Antony Lesuisse.
-
-This development would not have been possible without the Indiegogo
-campaign and those who contributed to it. Special thanks goes to the
-partners who backed the campaign with founding partner bundles:
-
-- Camptocamp 
-- BHC
-- openBig 
-- Eeezee-IT
-- Solarsis LDA
-- ACSONE
-- Vauxoo
-- Ekomurz
-- Datalp
-- Dao Systems
-- Eggs Solutions
-- OpusVL
-
-And also the partners who've backed the development with the Founding
-PosBox Bundle: 
-
-- Willow IT
-- E\. Akhalwaya & Sons
-- Multibase
-- Mindesa
-- bpso.biz
-- Shine IT.
-
diff --git a/addons/hw_proxy/doc/manual.pdf b/addons/hw_proxy/doc/manual.pdf
deleted file mode 100644
index 5a55c56654d..00000000000
--- a/addons/hw_proxy/doc/manual.pdf
+++ /dev/null
diff --git a/addons/hw_proxy/static/doc/manual.pdf b/addons/hw_proxy/static/doc/manual.pdf
deleted file mode 100644
index 5a55c56654d..00000000000
--- a/addons/hw_proxy/static/doc/manual.pdf
+++ /dev/null
diff --git a/addons/stock_account/wizard/stock_valuation_history.py b/addons/stock_account/wizard/stock_valuation_history.py
index 4eefeb95b80..46a72f01ad4 100644
--- a/addons/stock_account/wizard/stock_valuation_history.py
+++ b/addons/stock_account/wizard/stock_valuation_history.py
@@ -133,8 +133,7 @@ class stock_history(osv.osv):
                 serial_number
                 FROM
                 ((SELECT
-                    stock_move.id::text || '-' || quant.id::text AS id,
-                    quant.id AS quant_id,
+                    stock_move.id AS id,
                     stock_move.id AS move_id,
                     dest_location.id AS location_id,
                     dest_location.company_id AS company_id,
@@ -148,19 +147,19 @@ class stock_history(osv.osv):
                     stock_production_lot.name AS serial_number
                 FROM
                     stock_quant as quant
-                LEFT JOIN
+                JOIN
                     stock_quant_move_rel ON stock_quant_move_rel.quant_id = quant.id
-                LEFT JOIN
+                JOIN
                     stock_move ON stock_move.id = stock_quant_move_rel.move_id
                 LEFT JOIN
                     stock_production_lot ON stock_production_lot.id = quant.lot_id
-                LEFT JOIN
+                JOIN
                     stock_location dest_location ON stock_move.location_dest_id = dest_location.id
-                LEFT JOIN
+                JOIN
                     stock_location source_location ON stock_move.location_id = source_location.id
-                LEFT JOIN
+                JOIN
                     product_product ON product_product.id = stock_move.product_id
-                LEFT JOIN
+                JOIN
                     product_template ON product_template.id = product_product.product_tmpl_id
                 WHERE quant.qty>0 AND stock_move.state = 'done' AND dest_location.usage in ('internal', 'transit')
                 AND (
@@ -168,10 +167,9 @@ class stock_history(osv.osv):
                     (source_location.company_id is not null and dest_location.company_id is null) or
                     source_location.company_id != dest_location.company_id or
                     source_location.usage not in ('internal', 'transit'))
-                ) UNION
+                ) UNION ALL
                 (SELECT
-                    '-' || stock_move.id::text || '-' || quant.id::text AS id,
-                    quant.id AS quant_id,
+                    (-1) * stock_move.id AS id,
                     stock_move.id AS move_id,
                     source_location.id AS location_id,
                     source_location.company_id AS company_id,
@@ -185,19 +183,19 @@ class stock_history(osv.osv):
                     stock_production_lot.name AS serial_number
                 FROM
                     stock_quant as quant
-                LEFT JOIN
+                JOIN
                     stock_quant_move_rel ON stock_quant_move_rel.quant_id = quant.id
-                LEFT JOIN
+                JOIN
                     stock_move ON stock_move.id = stock_quant_move_rel.move_id
                 LEFT JOIN
                     stock_production_lot ON stock_production_lot.id = quant.lot_id
-                LEFT JOIN
+                JOIN
                     stock_location source_location ON stock_move.location_id = source_location.id
-                LEFT JOIN
+                JOIN
                     stock_location dest_location ON stock_move.location_dest_id = dest_location.id
-                LEFT JOIN
+                JOIN
                     product_product ON product_product.id = stock_move.product_id
-                LEFT JOIN
+                JOIN
                     product_template ON product_template.id = product_product.product_tmpl_id
                 WHERE quant.qty>0 AND stock_move.state = 'done' AND source_location.usage in ('internal', 'transit')
                 AND (
diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index 176b7881c0f..f66f9d25043 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -69,7 +69,7 @@
     </li>
     <li t-if="submenu.child_id" t-attf-class="dropdown #{
         (submenu.url and submenu.url != '/' and any([request.httprequest.path == child.url.replace('/page/website.', '/page/') for child in submenu.child_id]) or
-         request.httprequest.path == submenu.url.replace('/page/website.', '/page/')) and 'active'
+         (submenu.url and request.httprequest.path == submenu.url.replace('/page/website.', '/page/'))) and 'active'
         }">
         <a class="dropdown-toggle" data-toggle="dropdown" href="#">
             <span t-field="submenu.name"/> <span class="caret" t-ignore="true"></span>
diff --git a/addons/website_blog/controllers/main.py b/addons/website_blog/controllers/main.py
index c498209f6e7..e59da8736b9 100644
--- a/addons/website_blog/controllers/main.py
+++ b/addons/website_blog/controllers/main.py
@@ -157,6 +157,7 @@ class WebsiteBlog(http.Controller):
         values = {
             'blog': blog,
             'blogs': blogs,
+            'main_object': blog,
             'tags': all_tags,
             'active_tag_ids': active_tag_ids,
             'tags_list' : tags_list,
diff --git a/addons/website_quote/controllers/main.py b/addons/website_quote/controllers/main.py
index 2a282855813..af0115aa9a2 100644
--- a/addons/website_quote/controllers/main.py
+++ b/addons/website_quote/controllers/main.py
@@ -196,6 +196,12 @@ class sale_quote(http.Controller):
                 'callback_eval': "self.env['sale.order']._confirm_online_quote(self.sale_order_id.id, self)"
             }, context=context)
             tx = transaction_obj.browse(cr, SUPERUSER_ID, tx_id, context=context)
+            # update quotation
+            request.registry['sale.order'].write(
+                cr, SUPERUSER_ID, [order.id], {
+                    'payment_acquirer_id': acquirer_id,
+                    'payment_tx_id': tx_id
+                }, context=context)
 
         # confirm the quotation
         if tx.acquirer_id.auto_confirm == 'at_pay_now':
diff --git a/addons/website_sale_delivery/views/website_sale_delivery.xml b/addons/website_sale_delivery/views/website_sale_delivery.xml
index 9708cd0d335..6ab363db5c6 100644
--- a/addons/website_sale_delivery/views/website_sale_delivery.xml
+++ b/addons/website_sale_delivery/views/website_sale_delivery.xml
@@ -38,7 +38,7 @@
                                     <span class="badge" t-field="delivery.price"
                                         t-field-options='{
                                             "widget": "monetary",
-                                            "from_currency": "website.currency_id",
+                                            "from_currency": "delivery.product_id.company_id.currency_id",
                                             "display_currency": "website_sale_order.currency_id"
                                         }'/>
                                     <div t-field="delivery.website_description" class="text-muted"/>