summaryrefslogtreecommitdiff
path: root/addons
diff options
context:
space:
mode:
authorArthur Maniet <me@whisno.be>2014-12-05 15:07:01 +0100
committerArthur Maniet <me@whisno.be>2014-12-10 14:00:20 +0100
commitcc703c736cbf09da6e31859ba988ff03ad415faa (patch)
tree95869dfb7ae47e3d33b99d510630804c0274d29f /addons
parent3695886531a66aa93f31e979c6d23b8865cbef0f (diff)
[IMP] account: bank statement reconciliation widget: remove a created line by clicking on it
Diffstat (limited to 'addons')
-rw-r--r--addons/account/static/src/css/account_bank_statement_reconciliation.css4
-rw-r--r--addons/account/static/src/css/account_bank_statement_reconciliation.scss8
-rw-r--r--addons/account/static/src/js/account_widgets.js4
-rw-r--r--addons/account/static/src/xml/account_bank_statement_reconciliation.xml2
4 files changed, 3 insertions, 15 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 fb7de387b00..6ce216410e7 100644
--- a/addons/account/static/src/css/account_bank_statement_reconciliation.css
+++ b/addons/account/static/src/css/account_bank_statement_reconciliation.css
@@ -162,10 +162,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; }
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 f8fcc7c0b4d..ced682034a6 100644
--- a/addons/account/static/src/css/account_bank_statement_reconciliation.scss
+++ b/addons/account/static/src/css/account_bank_statement_reconciliation.scss
@@ -264,14 +264,6 @@ $aestetic_animation_speed: 300ms;
tr {
cursor: pointer;
-
- &.created_line {
- cursor: default !important;
-
- .line_remove_button {
- cursor: pointer;
- }
- }
}
td {
diff --git a/addons/account/static/src/js/account_widgets.js b/addons/account/static/src/js/account_widgets.js
index 2656545994b..2e896b6e3a6 100644
--- a/addons/account/static/src/js/account_widgets.js
+++ b/addons/account/static/src/js/account_widgets.js
@@ -1177,7 +1177,7 @@ openerp.account = function (instance) {
var self = this;
$.each(self.$(".tbody_matched_lines .bootstrap_popover"), function(){ $(this).popover('destroy') });
self.$(".tbody_matched_lines").empty();
-
+
_(self.get("mv_lines_selected")).each(function(line){
var $line = $(QWeb.render("bank_statement_reconciliation_move_line", {line: line, selected: true}));
self.bindPopoverTo($line.find(".line_info_button"));
@@ -1194,7 +1194,7 @@ openerp.account = function (instance) {
_(self.getCreatedLines()).each(function(line){
var $line = $(QWeb.render("bank_statement_reconciliation_created_line", {line: line}));
- $line.find(".line_remove_button").click(function(){ self.removeLine($(this).closest(".created_line")) });
+ $line.click(function(){ self.removeLine($(this)) });
self.$(".tbody_created_lines").append($line);
if (line.no_remove_action) {
// Then the previous line's remove button deletes this line too
diff --git a/addons/account/static/src/xml/account_bank_statement_reconciliation.xml b/addons/account/static/src/xml/account_bank_statement_reconciliation.xml
index a85a8f1f6b3..1a0653494b7 100644
--- a/addons/account/static/src/xml/account_bank_statement_reconciliation.xml
+++ b/addons/account/static/src/xml/account_bank_statement_reconciliation.xml
@@ -175,7 +175,7 @@
<t t-name="bank_statement_reconciliation_created_line">
<tr class="created_line" t-att-data-lineid="line.id">
- <td class="cell_action"><t t-if="! line.no_remove_action"><span class="line_remove_button glyphicon glyphicon-remove"></span></t></td>
+ <td class="cell_action"><t t-if="! line.no_remove_action"><span class="glyphicon glyphicon-remove"></span></t></td>
<td class="cell_account_code"><t t-esc="line.account_num"/></td>
<td class="cell_due_date"></td>
<td class="cell_label"><t t-esc="line.label"/></td>