diff options
| author | Christophe Simonis <chs@odoo.com> | 2018-07-02 15:16:20 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2018-07-02 15:16:20 +0200 |
| commit | a0c5b58d5d2c9ed39995c8dbc65b68152d9facff (patch) | |
| tree | 30ca7622fcc14c3a8a91deb2bdad5ef855a07108 /addons/account/static/src | |
| parent | 683b0746beda2a2e89afc401be8baebba0583129 (diff) | |
| parent | 4846c30c90abdd32bdc16715892e46ec1797c25c (diff) | |
[MERGE] forward port branch saas-11.3 up to 4846c30c90a
Diffstat (limited to 'addons/account/static/src')
3 files changed, 8 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 ec27bc54d2f..cdbc5a0ebf3 100644 --- a/addons/account/static/src/js/reconciliation/reconciliation_renderer.js +++ b/addons/account/static/src/js/reconciliation/reconciliation_renderer.js @@ -315,7 +315,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/scss/account_reconciliation.scss b/addons/account/static/src/scss/account_reconciliation.scss index 204337c5808..605774d22f2 100644 --- a/addons/account/static/src/scss/account_reconciliation.scss +++ b/addons/account/static/src/scss/account_reconciliation.scss @@ -160,6 +160,9 @@ } /* info popover */ + .popover { + max-width: none; + } table.details { vertical-align: top; @@ -200,6 +203,7 @@ } &[data-mode="match"] > .match { max-height: none; + overflow: visible; @include o-transition(max-height, 400ms); } &[data-mode="create"] > .create { diff --git a/addons/account/static/src/xml/account_reconciliation.xml b/addons/account/static/src/xml/account_reconciliation.xml index a367feb03c0..9b9df5dab7d 100644 --- a/addons/account/static/src/xml/account_reconciliation.xml +++ b/addons/account/static/src/xml/account_reconciliation.xml @@ -260,7 +260,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> |