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

2 files changed, 33 insertions, 0 deletions

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 805790930e2..81a1460b0bd 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -52,6 +52,7 @@
   box-shadow: 0 0 1px black;
   left: 50%;
   transform: translate(-50%, 0);
+  -webkit-filter: blur(0);
 }
 
 .oe_notification {
@@ -3048,6 +3049,12 @@ body.oe_single_form .oe_single_form_container {
 @media print {
   body {
     height: auto !important;
+    overflow: visible !important;
+  }
+
+  tr, td {
+    page-break-inside: avoid;
+    page-break-after: auto;
   }
 
   .openerp#announcement_bar_table {
@@ -3057,6 +3064,13 @@ body.oe_single_form .oe_single_form_container {
   .openerp {
     text-shadow: none;
   }
+  .openerp.openerp_webclient_container {
+    display: block;
+    height: auto !important;
+  }
+  .openerp .oe-view-manager {
+    display: block;
+  }
   .openerp .oe_application, .openerp .oe_view_manager_wrapper {
     height: auto !important;
   }
@@ -3082,6 +3096,9 @@ body.oe_single_form .oe_single_form_container {
   .openerp .oe_notebook > li.ui-tabs-selected {
     display: block;
   }
+  .openerp .oe_application {
+    width: auto;
+  }
   .openerp .oe_application .oe_form_sheet, .openerp .oe_application .oe_form_sheetbg {
     border: 0px !important;
     box-shadow: 0px 0px 0px;
@@ -3099,6 +3116,9 @@ body.oe_single_form .oe_single_form_container {
   .openerp .openerp div.oe_mail_wall {
     overflow: hidden !important;
   }
+  .openerp .oe-view-manager .oe-view-manager-content {
+    overflow: visible;
+  }
 
   .openerp.openerp_webclient_container {
     overflow: visible;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index d848bbe6fc0..1f7a0c1560f 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -161,6 +161,7 @@ $sheet-padding: 16px
     box-shadow: 0 0 1px black
     left: 50%
     transform: translate(-50%, 0)
+    -webkit-filter: blur(0)
 
 .oe_notification
     z-index: 1600
@@ -2520,9 +2521,18 @@ body.oe_single_form
 @media print
     body
         height: auto !important
+        overflow: visible !important
+    tr, td
+        page-break-inside: avoid
+        page-break-after: auto
     .openerp#announcement_bar_table
         display: none
     .openerp
+        &.openerp_webclient_container
+            display: block
+            height: auto !important
+        .oe-view-manager
+            display: block
         .oe_application, .oe_view_manager_wrapper
             height: auto !important
         .oe_application > div > .oe_view_manager > .oe_view_manager_wrapper > div > .oe_view_manager_body
@@ -2550,6 +2560,7 @@ body.oe_single_form
                 box-shadow: 0px 0px 0px
                 .oe_list
                     overflow-x: visible
+            width: auto
         .oe-control-panel, .oe-o2m-control-panel
             border: 0px !important
             box-shadow: 0px 0px 0px
@@ -2558,6 +2569,8 @@ body.oe_single_form
             background: none
         .openerp div.oe_mail_wall
             overflow: hidden !important
+        .oe-view-manager .oe-view-manager-content
+            overflow: visible
     .openerp.openerp_webclient_container
         overflow: visible
 // }}}