[MERGE] forward port of branch 8.0 up to ea54d4a

2 files changed, 17 insertions, 19 deletions

diff --git a/addons/account/static/src/css/account_bank_statement_reconciliation.css b/addons/account/static/src/css/account_bank_statement_reconciliation.css
index 818e3e537d8..cd217914e68 100644
--- a/addons/account/static/src/css/account_bank_statement_reconciliation.css
+++ b/addons/account/static/src/css/account_bank_statement_reconciliation.css
@@ -163,10 +163,6 @@
       width: 100%; }
       .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .accounting_view tr, .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .match table tr {
         cursor: pointer; }
-        .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .accounting_view tr.created_line, .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .match table tr.created_line {
-          cursor: default !important; }
-          .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .accounting_view tr.created_line .line_remove_button, .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .match table tr.created_line .line_remove_button {
-            cursor: pointer; }
       .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .accounting_view td, .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .match table td {
         padding: 1px 8px;
         vertical-align: middle; }
@@ -225,10 +221,14 @@
           padding-bottom: 3px; }
       .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .accounting_view caption {
         text-align: left;
-        font-size: 1.1em;
-        font-weight: bold;
         height: 26px;
         margin: 0 15px 4px 15px; }
+        .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .accounting_view caption .partner_name {
+          font-size: 1.1em;
+          font-weight: bold; }
+        .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .accounting_view caption .tip_reconciliation_not_balanced {
+          float: right;
+          padding-right: 7px; }
         .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .accounting_view caption button {
           float: right;
           position: relative;
@@ -238,8 +238,7 @@
         .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .accounting_view caption > span, .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .accounting_view caption > input {
           position: relative;
           top: 7px;
-          /* meh */
-          font-weight: bold; }
+          /* meh */ }
       .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .accounting_view td.cell_credit {
         border-left: 1px solid #000; }
     .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .match .match_controls {
diff --git a/addons/account/static/src/css/account_bank_statement_reconciliation.scss b/addons/account/static/src/css/account_bank_statement_reconciliation.scss
index 938965a896d..1fcdeac3389 100644
--- a/addons/account/static/src/css/account_bank_statement_reconciliation.scss
+++ b/addons/account/static/src/css/account_bank_statement_reconciliation.scss
@@ -267,14 +267,6 @@ $aestetic_animation_speed: 300ms;
 
             tr {
                 cursor: pointer;
-
-                &.created_line {
-                    cursor: default !important;
-
-                    .line_remove_button {
-                        cursor: pointer;
-                    }
-                }
             }
 
             td {
@@ -373,11 +365,19 @@ $aestetic_animation_speed: 300ms;
 
             caption {
                 text-align: left;
-                font-size: 1.1em;
-                font-weight: bold;
                 height: 26px;
                 margin: 0 $actionColWidth 4px $actionColWidth;
 
+                .partner_name {
+                    font-size: 1.1em;
+                    font-weight: bold;
+                }
+
+                .tip_reconciliation_not_balanced {
+                    float: right;
+                    padding-right: 7px;
+                }
+
                 button {
                     float: right;
                     position: relative;
@@ -390,7 +390,6 @@ $aestetic_animation_speed: 300ms;
 
                 > span, > input {
                     position: relative; top: 7px; /* meh */
-                    font-weight: bold;
                 }
             }