summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXavier Alt <xal@openerp.com>2018-07-02 09:40:45 +0200
committerqdp-odoo <qdp@odoo.com>2018-07-02 09:40:45 +0200
commit21b2617d6fea4e2f220b13d0623996045a2b7b9d (patch)
treed47c3d3b1c2ae6519dac7c03a9ea337a1625e7c0
parent2ab3fa86fe83d507e9e1152ad2a44811af7f55cd (diff)
[FIX] account: show statement line info popover on reconciliation widget
This popover is the only way to get extra information like the note or the reference of the bank statement line. Was PR #25543
-rw-r--r--addons/account/static/src/js/reconciliation/reconciliation_renderer.js4
-rw-r--r--addons/account/static/src/less/account_reconciliation.less3
-rw-r--r--addons/account/static/src/xml/account_reconciliation.xml2
3 files changed, 7 insertions, 2 deletions
diff --git a/addons/account/static/src/js/reconciliation/reconciliation_renderer.js b/addons/account/static/src/js/reconciliation/reconciliation_renderer.js
index d409ad64c39..df34443435d 100644
--- a/addons/account/static/src/js/reconciliation/reconciliation_renderer.js
+++ b/addons/account/static/src/js/reconciliation/reconciliation_renderer.js
@@ -298,7 +298,9 @@ var LineRenderer = Widget.extend(FieldManagerMixin, {
};
self.fields.partner_id.appendTo(self.$('.accounting_view caption'));
});
- this.$('thead .line_info_button').attr("data-content", qweb.render('reconciliation.line.statement_line.details', {'state': this._initialState}));
+ $('<span class="line_info_button fa fa-info-circle"/>')
+ .appendTo(this.$('thead .cell_info_popover'))
+ .attr("data-content", qweb.render('reconciliation.line.statement_line.details', {'state': this._initialState}));
this.$el.popover({
'selector': '.line_info_button',
'placement': 'left',
diff --git a/addons/account/static/src/less/account_reconciliation.less b/addons/account/static/src/less/account_reconciliation.less
index fb2aac8e7af..e4a6a121aea 100644
--- a/addons/account/static/src/less/account_reconciliation.less
+++ b/addons/account/static/src/less/account_reconciliation.less
@@ -159,6 +159,9 @@
}
/* info popover */
+ .popover {
+ max-width: none;
+ }
table.details {
vertical-align: top;
diff --git a/addons/account/static/src/xml/account_reconciliation.xml b/addons/account/static/src/xml/account_reconciliation.xml
index 94bef90a6f5..0c59c6a9730 100644
--- a/addons/account/static/src/xml/account_reconciliation.xml
+++ b/addons/account/static/src/xml/account_reconciliation.xml
@@ -251,7 +251,7 @@
<tr><td>Description</td><td><t t-esc="state.st_line.name"/></td></tr>
<tr><td>Amount</td><td><t t-raw="state.st_line.amount_str"/><t t-if="state.st_line.amount_currency_str"> (<t t-esc="state.st_line.amount_currency_str"/>)</t></td></tr>
<tr><td>Account</td><td><t t-esc="state.st_line.account_code"/> <t t-esc="state.st_line.account_name"/></td></tr>
- <tr t-if="state.st_line.note"><td>Note</td><td><t t-esc="state.st_line.note"/></td></tr>
+ <tr t-if="state.st_line.note"><td>Note</td><td style="white-space: pre;"><t t-esc="state.st_line.note"/></td></tr>
</table>
</t>