diff options
Diffstat (limited to 'addons/account/views/account_journal_dashboard_view.xml')
| -rw-r--r-- | addons/account/views/account_journal_dashboard_view.xml | 40 |
1 files changed, 19 insertions, 21 deletions
diff --git a/addons/account/views/account_journal_dashboard_view.xml b/addons/account/views/account_journal_dashboard_view.xml index c15fe61be4b..b70357f607e 100644 --- a/addons/account/views/account_journal_dashboard_view.xml +++ b/addons/account/views/account_journal_dashboard_view.xml @@ -233,8 +233,8 @@ <!-- On the left, display : - A button corresponding to the bank_statements_source, if it wasn't configured, a button for each of them - If there are statements to reconcile, a link to reconcile them --> - <div class="col-12 col-sm-5 mb-3 mb-sm-0 o_kanban_primary_left"> - <t t-if="journal_type == 'bank'" id="journal_body_bank_cash_left"> + <div id="dashboard_bank_cash_left" class="col-12 col-sm-5 mb-3 mb-sm-0 o_kanban_primary_left"> + <t t-if="journal_type == 'bank'"> <button t-if="dashboard.bank_statements_source == 'undefined'" name="action_configure_bank_journal" type="object" class="btn btn-primary" groups="account.group_account_invoice">Configure</button> <div name="bank_journal_cta" class="mt-3 mt-sm-0"> <div name="bank_statement_create_button" groups="account.group_account_invoice"> @@ -250,16 +250,24 @@ </t> </div> <!-- On the right, show other common informations/actions --> - <div class="col-12 col-sm-7 o_kanban_primary_right"> - <t t-if="dashboard.last_balance != dashboard.account_balance"> - <div class="row"> - <div class="col overflow-hidden text-left"> - <span title="Balance in General Ledger">Balance in GL</span> - </div> - <div class="col-auto text-right"> - <span><t t-esc="dashboard.account_balance"/></span> - </div> + <div id="dashboard_bank_cash_right" class="col-12 col-sm-7 o_kanban_primary_right"> + <div class="row" t-if="dashboard.nb_lines_bank_account_balance > 0"> + <div id="dashboard_bank_cash_balance" class="col overflow-hidden text-left"> + <span title="Balance in General Ledger">Balance in GL</span> + </div> + <div class="col-auto text-right"> + <span><t t-esc="dashboard.account_balance"/></span> + </div> + </div> + <div class="row" t-if="dashboard.nb_lines_outstanding_pay_account_balance > 0"> + <div id="dashboard_bank_cash_outstanding_balance" class="col overflow-hidden text-left"> + <span title="Outstanding Payments/Receipts">Outstanding Payments/Receipts</span> </div> + <div class="col-auto text-right"> + <span><t t-esc="dashboard.outstanding_pay_account_balance"/></span> + </div> + </div> + <t t-if="dashboard.has_at_least_one_statement and dashboard.account_balance != dashboard.last_balance"> <div class="row" name="latest_statement"> <div class="col overflow-hidden text-left"> <span title="Latest Statement">Latest Statement</span> @@ -269,16 +277,6 @@ </div> </div> </t> - <t t-else="" id="journal_body_bank_cash_right"> - <div class="row"> - <div class="col overflow-hidden text-left"> - <span title="Balance in General Ledger">Balance in GL</span> - </div> - <div class="col-auto text-right"> - <span><t t-esc="dashboard.account_balance"/></span> - </div> - </div> - </t> </div> <div t-if="dashboard.is_sample_data"> <span class="badge badge-warning text-uppercase o_sample_data_label">Sample data</span> |