diff --git a/addons/account/models/account_bank_statement.py b/addons/account/models/account_bank_statement.py index 761a53ee998..f9e152065ce 100644 --- a/addons/account/models/account_bank_statement.py +++ b/addons/account/models/account_bank_statement.py @@ -13,6 +13,7 @@ class AccountBankStatement(models.Model): name = fields.Char( string='Reference', + compute='_compute_name', store=True, readonly=False, copy=False, ) @@ -104,6 +105,12 @@ class AccountBankStatement(models.Model): # ------------------------------------------------------------------------- # COMPUTE METHODS # ------------------------------------------------------------------------- + + @api.depends('create_date') + def _compute_name(self): + for stmt in self: + stmt.name = _("%s Statement %s", stmt.journal_id.code, stmt.date) + @api.depends('line_ids.internal_index', 'line_ids.state') def _compute_date_index(self): for stmt in self: diff --git a/addons/account/models/account_bank_statement_line.py b/addons/account/models/account_bank_statement_line.py index 16c359fdaf3..a1b6b08ffba 100644 --- a/addons/account/models/account_bank_statement_line.py +++ b/addons/account/models/account_bank_statement_line.py @@ -140,6 +140,13 @@ class AccountBankStatementLine(models.Model): statement_valid = fields.Boolean( related='statement_id.is_valid', ) + statement_balance_end_real = fields.Monetary( + related='statement_id.balance_end_real', + ) + statement_name = fields.Char( + string="Statement Name", + related='statement_id.name', + ) # Technical field to store details about the bank statement line transaction_details = fields.Json(readonly=True) diff --git a/addons/account/models/account_journal_dashboard.py b/addons/account/models/account_journal_dashboard.py index f4398ca01df..cf118e2c9b8 100644 --- a/addons/account/models/account_journal_dashboard.py +++ b/addons/account/models/account_journal_dashboard.py @@ -378,6 +378,7 @@ class account_journal(models.Model): 'outstanding_pay_account_balance': currency.format(outstanding_pay_account_balance), 'nb_lines_outstanding_pay_account_balance': has_outstanding, 'last_balance': currency.format(last_statement.balance_end_real), + 'last_statement_id': last_statement.id, 'bank_statements_source': journal.bank_statements_source, 'is_sample_data': journal.has_statement_lines, }) diff --git a/addons/account/views/account_journal_dashboard_view.xml b/addons/account/views/account_journal_dashboard_view.xml index 7bfc4e1810a..7d237093a9f 100644 --- a/addons/account/views/account_journal_dashboard_view.xml +++ b/addons/account/views/account_journal_dashboard_view.xml @@ -241,7 +241,7 @@ -
+
@@ -249,44 +249,44 @@ - New Transaction - + + New Transaction
-
+
- Running Balance + Balance
-
-
- Outstanding Payments/Receipts -
-
- -
-
- Latest Statement + Last Statement
+
+
+ Payments +
+
+ +
+
diff --git a/addons/account/views/account_payment_view.xml b/addons/account/views/account_payment_view.xml index a51bed16d2a..017b295c542 100644 --- a/addons/account/views/account_payment_view.xml +++ b/addons/account/views/account_payment_view.xml @@ -351,6 +351,13 @@ + + Payments + account.payment + tree,kanban,form,graph,activity + + + Customer Payments account.payment