diff options
| author | Christophe Simonis <chs@odoo.com> | 2019-01-03 15:31:05 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2019-01-03 15:31:05 +0100 |
| commit | d96c42ea88cc9cf69bb850cc8d21ee18ee7f16dd (patch) | |
| tree | 90f5281ae69d9a5369ae7e6a1f4e5b87469f8949 | |
| parent | a23e8c081a75a4fd18e95cf4a631bb91e8daf5eb (diff) | |
| parent | 22637aadecd98c803146573604532254a3136769 (diff) | |
[MERGE] forward port branch 11.0 up to 22637aadecd
| -rw-r--r-- | addons/account/static/src/js/reconciliation/reconciliation_renderer.js | 4 | ||||
| -rw-r--r-- | addons/account_check_printing/models/account_payment.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/addons/account/static/src/js/reconciliation/reconciliation_renderer.js b/addons/account/static/src/js/reconciliation/reconciliation_renderer.js index f7ffbecc967..bdb26830e3d 100644 --- a/addons/account/static/src/js/reconciliation/reconciliation_renderer.js +++ b/addons/account/static/src/js/reconciliation/reconciliation_renderer.js @@ -401,8 +401,8 @@ var LineRenderer = Widget.extend(FieldManagerMixin, { if (line.already_paid === false && (((state.balance.amount_currency < 0 || line.partial_reconcile) && line.amount > 0 && state.st_line.amount > 0 && targetLineAmount < line.amount && partialDebitProps <= 1) || - ((state.balance.amount_currency > 0 || line.partial_reconcile)) - && line.amount < 0 && state.st_line.amount < 0 && targetLineAmount > line.amount && partialCreditProps <= 1)) { + ((state.balance.amount_currency > 0 || line.partial_reconcile) + && line.amount < 0 && state.st_line.amount < 0 && targetLineAmount > line.amount && partialCreditProps <= 1))) { var $cell = $line.find(line.amount > 0 ? '.cell_right' : '.cell_left'); var text; if (line.partial_reconcile) { diff --git a/addons/account_check_printing/models/account_payment.py b/addons/account_check_printing/models/account_payment.py index 51870ebeeb3..28e9f285c1d 100644 --- a/addons/account_check_printing/models/account_payment.py +++ b/addons/account_check_printing/models/account_payment.py @@ -51,7 +51,7 @@ class AccountPayment(models.Model): @api.onchange('amount','currency_id') def _onchange_amount(self): res = super(AccountPayment, self)._onchange_amount() - self.check_amount_in_words = self.currency_id.amount_to_text(self.amount) + self.check_amount_in_words = self.currency_id.amount_to_text(self.amount) if self.currency_id else '' return res def _check_communication(self, payment_method_id, communication): |