diff --git a/addons/website/static/src/css/website.css b/addons/website/static/src/css/website.css
index 345a9ecd277..fb0c2d081b8 100644
--- a/addons/website/static/src/css/website.css
+++ b/addons/website/static/src/css/website.css
@@ -20,6 +20,17 @@
   font-style: normal;
 }
 
+@media print {
+  .oe_website {
+    padding-top: 0 !important;
+  }
+  .oe_website .oe_website_editorbar, .oe_website .css_noprint, .oe_website .oe_snippet_editor, .oe_website .oe_website_footer {
+    display: none !important;
+  }
+  .oe_website .oe_website_header > .container > .row, .oe_website .oe_website_body > .container > .row {
+    margin-left: 0px !important;
+  }
+}
 .oe_website {
   background: #e9e9e9;
   color: #646464;
diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass
index aed003cda82..8e17378851b 100644
--- a/addons/website/static/src/css/website.sass
+++ b/addons/website/static/src/css/website.sass
@@ -131,6 +131,14 @@
         color: $color
 
 // }}}
+@media print
+    .oe_website
+        padding-top: 0 !important
+        .oe_website_editorbar, .css_noprint, .oe_snippet_editor, .oe_website_footer
+            display: none !important
+        .oe_website_header, .oe_website_body
+            > .container > .row
+                margin-left: 0px !important
 
 .oe_website
     background: #e9e9e9
diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py
index 0431964b4c3..e000195ccf7 100644
--- a/addons/website_sale/controllers/main.py
+++ b/addons/website_sale/controllers/main.py
@@ -31,10 +31,11 @@ class Ecommerce(http.Controller):
         cr, uid, partner_id = self.get_cr_uid()
         order_obj = request.registry.get('sale.order')
         # check if order allready exists
-        try:
-            order_obj.browse(cr, uid, order_id).pricelist_id
-        except:
-            order_id = None
+        if order_id:
+            try:
+                order_obj.browse(cr, uid, order_id).pricelist_id
+            except:
+                order_id = None
         if not order_id:
             fields = [k for k, v in order_obj._columns.items()]
             order_value = order_obj.default_get(cr, uid, fields)
@@ -316,8 +317,8 @@ class Ecommerce(http.Controller):
     def confirmed(self, **post):
         cr, uid, partner_id = self.get_cr_uid()
 
-        if request.httprequest.session['ecommerce_order']:
-            order = self.get_order(request.httprequest.session.get('ecommerce_order_old'))
+        if request.httprequest.session.get('ecommerce_order'):
+            order = self.get_order(request.httprequest.session.get('ecommerce_order'))
             if order.state != 'draft':
                 request.httprequest.session['ecommerce_order_old'] = order.id
                 request.httprequest.session['ecommerce_order'] = None
diff --git a/addons/website_sale/views/ecommerce.xml b/addons/website_sale/views/ecommerce.xml
index bd74a374901..94fb16d3d42 100644
--- a/addons/website_sale/views/ecommerce.xml
+++ b/addons/website_sale/views/ecommerce.xml
@@ -33,7 +33,7 @@
             <t t-set="title">Shop - <t t-raw="title">Categories</t></t>
             <div class="container oe_ecommerce">
                 <div class="row">
-                    <div class="span4">
+                    <div class="span4 css_noprint">
                         <ul class="nav nav-list">
                         <t t-foreach="categories" t-as="category">
                             <t t-call="website_sale.categories_recursive"/>
@@ -277,26 +277,24 @@
         <t t-call="website_sale.page">
             <t t-set="title">Order</t>
             <t t-set="shop_content">
-                <div class="oe_total">
-                    <table class="table table-condensed" t-if="order.order_line">
-                        <thead>
-                            <tr><th>Product</th><th>Qty.</th><th>Price</th></tr>
-                        </thead>
-                        <tbody>
-                            <t t-foreach="order.order_line or []" t-as="line">
-                                <tr>
-                                    <td><t t-esc="line.product_id.name"/></td>
-                                    <td><t t-esc="int(line.product_uom_qty)"/></td>
-                                    <td class="css_alignright"><t t-esc="line.product_id.list_price"/> €</td>
-                                </tr>
-                            </t>
-                            <tr><td colspan="3" style="visibility: hidden; border: 0">-</td></tr>
-                            <tr><th>Untaxed Amount</th><td></td><td><t t-esc="order.amount_untaxed"/> €</td></tr>
-                            <tr><th>Taxes</th><td></td><td><t t-esc="order.amount_tax"/> €</td></tr>
-                            <tr><th>Total</th><td></td><td><t t-esc="order.amount_total"/> €</td></tr>
-                        </tbody>
-                    </table>
-                </div>
+                <table class="table table-condensed" t-if="order.order_line">
+                    <thead>
+                        <tr><th>Product</th><th>Qty.</th><th>Price</th></tr>
+                    </thead>
+                    <tbody>
+                        <t t-foreach="order.order_line or []" t-as="line">
+                            <tr>
+                                <td><t t-esc="line.product_id.name"/></td>
+                                <td><t t-esc="int(line.product_uom_qty)"/></td>
+                                <td class="css_alignright"><t t-esc="line.product_id.list_price"/> €</td>
+                            </tr>
+                        </t>
+                        <tr><td colspan="3" style="visibility: hidden; border: 0">-</td></tr>
+                        <tr><th>Untaxed Amount</th><td></td><td><t t-esc="order.amount_untaxed"/> €</td></tr>
+                        <tr><th>Taxes</th><td></td><td><t t-esc="order.amount_tax"/> €</td></tr>
+                        <tr><th>Total</th><td></td><td><t t-esc="order.amount_total"/> €</td></tr>
+                    </tbody>
+                </table>
             </t>
         </t>
     </template>