Merge branch 'master' into master-pos-new-payment-screen-fva

Conflicts:
	addons/point_of_sale/point_of_sale.py
	addons/point_of_sale/point_of_sale_view.xml

2 files changed, 30 insertions, 32 deletions

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index b76bee29a59..06b1e844792 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -8,6 +8,7 @@
   font-weight: normal;
   font-style: normal;
 }
+
 @font-face {
   font-family: "EntypoRegular";
   src: url("/web/static/src/font/entypo-webfont.eot") format("eot");
@@ -18,6 +19,7 @@
   font-weight: normal;
   font-style: normal;
 }
+
 #oe_main_menu_navbar {
   min-height: 34px;
   z-index: 1001;
@@ -134,7 +136,6 @@
   vertical-align: top;
 }
 .openerp .oe_title {
-  width: 38%;
   float: left;
 }
 .openerp .oe_title:after {
@@ -369,6 +370,16 @@
 .openerp .oe_form_dirty button.oe_highlight_on_dirty:hover {
   background: #ed6f6a;
 }
+.openerp .oe_warning_redirect {
+  border: none !important;
+  padding: 0 !important;
+  margin-left: 20px !important;
+  background: #f5f7f9 !important;
+  box-shadow: none !important;
+}
+.openerp .oe_warning_redirect:hover {
+  text-decoration: underline !important;
+}
 .openerp .oe_stat_button {
   font-weight: normal;
   width: 132px !important;
@@ -407,16 +418,6 @@
   display: inline;
   vertical-align: middle;
 }
-.openerp .oe_warning_redirect {
-  border: none !important;
-  padding: 0 !important;
-  margin-left: 20px !important;
-  background: #f5f7f9 !important;
-  box-shadow: none !important;
-}
-.openerp .oe_warning_redirect:hover {
-  text-decoration: underline !important;
-}
 .openerp .oe_stat_button:hover {
   background: #7c7bad;
   color: white;
@@ -583,9 +584,10 @@
   height: 16px;
 }
 .openerp .oe_form_field_radio.oe_vertical label {
-  margin-left: 4px;
+  display: inline-block;
+  margin-left: 20px;
 }
-.openerp .oe_form_field_radio.oe_form_required .oe_radio_input {
+.openerp .oe_form_field_radio .oe_radio_input {
   border: 2px solid transparent;
   display: inline-block;
   height: 12px;
@@ -593,6 +595,7 @@
   vertical-align: top;
   border-radius: 10px;
   margin: 1px 0;
+  position: absolute;
 }
 .openerp .oe_form_field_radio.oe_form_required.oe_form_invalid .oe_radio_input {
   border-color: red;
@@ -2147,9 +2150,6 @@
 .openerp .oe_form .oe_form_field_boolean {
   width: auto;
 }
-.openerp .oe_form .oe_datepicker_container {
-  display: none;
-}
 .openerp .oe_form .oe_datepicker_root {
   display: inline-block;
 }
@@ -3001,6 +3001,7 @@
     top: 0px;
   }
 }
+
 .kitten-mode-activated {
   background-size: cover;
   background-attachment: fixed;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index f1f948170e5..38e3ebf40ce 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -239,8 +239,7 @@ $sheet-padding: 16px
     td
         vertical-align: top
     .oe_title
-        width: 38%
-        float: left    
+        float: left
     .oe_title:after
         content: "."
         display: block
@@ -529,19 +528,19 @@ $sheet-padding: 16px
                 height: 16px
         &.oe_vertical
             label
-                margin-left: 4px
-        &.oe_form_required
-            .oe_radio_input
-                border: 2px solid transparent
                 display: inline-block
-                height: 12px
-                width: 12px
-                vertical-align: top
-                border-radius: 10px
-                margin: 1px 0
-            &.oe_form_invalid
-                .oe_radio_input
-                    border-color: red
+                margin-left: 20px
+        .oe_radio_input
+            border: 2px solid transparent
+            display: inline-block
+            height: 12px
+            width: 12px
+            vertical-align: top
+            border-radius: 10px
+            margin: 1px 0
+            position: absolute
+        &.oe_form_required.oe_form_invalid .oe_radio_input
+            border-color: red
     .oe_tags
         &.oe_inline
             min-width: 250px
@@ -1762,8 +1761,6 @@ $sheet-padding: 16px
             white-space: nowrap
         .oe_form_field_boolean
             width: auto
-        .oe_datepicker_container
-            display: none
         .oe_datepicker_root
             display: inline-block
         .oe_form_required