summaryrefslogtreecommitdiff
path: root/addons/account/static/src/js
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2019-08-06 18:29:20 +0200
committerChristophe Simonis <chs@odoo.com>2019-08-06 18:48:24 +0200
commit7d04dc1c7c51dfd18951912628b14bee446a2b01 (patch)
treee89601e493bea092239df55a5ef406b2e05d7d7b /addons/account/static/src/js
parentb091014686d86ad793e2d1cbf0e7ffea8fbde361 (diff)
parent9e74730a26b09fa4e516bc0d76550f7c7c502fac (diff)
[MERGE] forward port branch saas-12.2 up to 9e74730a26b
Diffstat (limited to 'addons/account/static/src/js')
-rw-r--r--addons/account/static/src/js/reconciliation/reconciliation_model.js2
-rw-r--r--addons/account/static/src/js/reconciliation/reconciliation_renderer.js1
2 files changed, 2 insertions, 1 deletions
diff --git a/addons/account/static/src/js/reconciliation/reconciliation_model.js b/addons/account/static/src/js/reconciliation/reconciliation_model.js
index 985bcd15496..f7f29efb011 100644
--- a/addons/account/static/src/js/reconciliation/reconciliation_model.js
+++ b/addons/account/static/src/js/reconciliation/reconciliation_model.js
@@ -932,7 +932,7 @@ var StatementModel = BasicModel.extend({
'link': prop.id,
'tax_ids': [tax.id],
'amount': tax.amount,
- 'label': tax.name,
+ 'label': prop.label ? prop.label + " " + tax.name : tax.name,
'date': prop.date,
'account_id': tax.account_id ? [tax.account_id, null] : prop.account_id,
'analytic': tax.analytic,
diff --git a/addons/account/static/src/js/reconciliation/reconciliation_renderer.js b/addons/account/static/src/js/reconciliation/reconciliation_renderer.js
index e6be300714d..7103e3f7d71 100644
--- a/addons/account/static/src/js/reconciliation/reconciliation_renderer.js
+++ b/addons/account/static/src/js/reconciliation/reconciliation_renderer.js
@@ -794,6 +794,7 @@ var LineRenderer = Widget.extend(FieldManagerMixin, {
*/
_onSelectMoveLine: function (event) {
var $el = $(event.target);
+ $el.prop('disabled', true);
this._destroyPopover($el);
var moveLineId = $el.closest('.mv_line').data('line-id');
this.trigger_up('add_proposition', {'data': moveLineId});