diff --git a/addons/account/models/account_move.py b/addons/account/models/account_move.py index 1cb08747d8e..923893e659a 100644 --- a/addons/account/models/account_move.py +++ b/addons/account/models/account_move.py @@ -228,6 +228,8 @@ class AccountMove(models.Model): compute='_compute_amount', currency_field='company_currency_id') amount_total_signed = fields.Monetary(string='Total Signed', store=True, readonly=True, compute='_compute_amount', currency_field='company_currency_id') + amount_total_in_currency_signed = fields.Monetary(string='Total in Currency Signed', store=True, readonly=True, + compute='_compute_amount', currency_field='currency_id') amount_residual_signed = fields.Monetary(string='Amount Due Signed', store=True, compute='_compute_amount', currency_field='company_currency_id') amount_by_group = fields.Binary(string="Tax amount by group", @@ -1309,6 +1311,7 @@ class AccountMove(models.Model): move.amount_tax_signed = -total_tax move.amount_total_signed = abs(total) if move.move_type == 'entry' else -total move.amount_residual_signed = total_residual + move.amount_total_in_currency_signed = abs(move.amount_total) if move.move_type == 'entry' else -(sign * move.amount_total) currency = len(currencies) == 1 and currencies.pop() or move.company_id.currency_id diff --git a/addons/account/views/account_move_views.xml b/addons/account/views/account_move_views.xml index 2f0d085706d..860d3c8a626 100644 --- a/addons/account/views/account_move_views.xml +++ b/addons/account/views/account_move_views.xml @@ -432,18 +432,20 @@ + - + + - + @@ -462,6 +464,21 @@ /account/account_invoice_onboarding + + Invoice Currency + + + + + + account.out.invoice.tree + account.move + + primary + + + Credit Note Currency + @@ -481,6 +498,42 @@ + + account.out.invoice.tree + account.move + + primary + + + Bill Currency + + + + + + account.out.invoice.tree + account.move + + primary + + + Refund Currency + + + + + + account.out.invoice.tree + account.move + + primary + + + Receipt Currency + + + + account.move.kanban account.move @@ -1234,6 +1287,7 @@ + Credit Notes account.move tree,kanban,form - + [('move_type', '=', 'out_refund')] {'default_move_type': 'out_refund'} @@ -1413,7 +1467,7 @@ Bills account.move tree,kanban,form - + [('move_type', '=', 'in_invoice')] {'default_move_type': 'in_invoice'} @@ -1430,7 +1484,7 @@ Refunds account.move tree,kanban,form - + [('move_type', '=', 'in_refund')] {'default_move_type': 'in_refund'} @@ -1465,7 +1519,7 @@ Receipts account.move tree,kanban,form - + [('move_type', '=', 'in_receipt')] {'default_move_type': 'in_receipt'}