diff --git a/account_move_reconcile_helper/models/account_move_line.py b/account_move_reconcile_helper/models/account_move_line.py index 5e17213d..0e36461b 100644 --- a/account_move_reconcile_helper/models/account_move_line.py +++ b/account_move_reconcile_helper/models/account_move_line.py @@ -17,7 +17,6 @@ class AccountMoveLine(models.Model): string="Reconciled lines", ) - @api.multi @api.depends("matched_debit_ids", "matched_credit_ids") def _compute_partial_reconciliation_in_progress(self): for rec in self: @@ -25,12 +24,10 @@ class AccountMoveLine(models.Model): rec.matched_debit_ids ) or bool(rec.matched_credit_ids) - @api.multi def _compute_reconciled_lines(self): for rec in self: rec.reconcile_line_ids = rec._get_reconciled_lines() - @api.multi def _get_reconciled_lines(self, move_lines=None): """ Returns lines which were reconciled directly or indirectly with @@ -64,7 +61,6 @@ class AccountMoveLine(models.Model): return move_lines - @api.multi def open_full_reconcile_view(self): action = self.env.ref("account.action_account_moves_all_a").read()[0] action["domain"] = [("id", "in", self.mapped("reconcile_line_ids").ids)] diff --git a/account_move_reconcile_helper/readme/DESCRIPTION.rst b/account_move_reconcile_helper/readme/DESCRIPTION.rst index 90a4a8e1..98478376 100644 --- a/account_move_reconcile_helper/readme/DESCRIPTION.rst +++ b/account_move_reconcile_helper/readme/DESCRIPTION.rst @@ -1,14 +1,10 @@ Provides tools to facilitate reconciliation. -* Display a button on Journal entries list to show reconciled lines. -* Added Balance field in Journal entries list (this feature +* Display a button on Journal Items to show reconciled lines. +* Added Balance field in Journal Items (this feature is provided by account_balance_line). -.. image:: ./static/docs/journal_entries_1.png - :alt: Journal entries - :scale: 50 % - -.. image:: ./static/docs/journal_entries_2.png - :alt: Reconciled lines view +.. image:: ./static/docs/journal_items.png + :alt: Journal items :scale: 50 % diff --git a/account_move_reconcile_helper/static/docs/journal_entries_1.png b/account_move_reconcile_helper/static/docs/journal_entries_1.png deleted file mode 100644 index abad0b04..00000000 Binary files a/account_move_reconcile_helper/static/docs/journal_entries_1.png and /dev/null differ diff --git a/account_move_reconcile_helper/static/docs/journal_entries_2.png b/account_move_reconcile_helper/static/docs/journal_entries_2.png deleted file mode 100644 index 0d4e995f..00000000 Binary files a/account_move_reconcile_helper/static/docs/journal_entries_2.png and /dev/null differ diff --git a/account_move_reconcile_helper/static/docs/journal_items.png b/account_move_reconcile_helper/static/docs/journal_items.png new file mode 100644 index 00000000..0baef654 Binary files /dev/null and b/account_move_reconcile_helper/static/docs/journal_items.png differ diff --git a/account_move_reconcile_helper/tests/test_account_move_reconcile_helper.py b/account_move_reconcile_helper/tests/test_account_move_reconcile_helper.py index 3aafadde..27ef0be3 100644 --- a/account_move_reconcile_helper/tests/test_account_move_reconcile_helper.py +++ b/account_move_reconcile_helper/tests/test_account_move_reconcile_helper.py @@ -84,6 +84,8 @@ class TestAccountMoveReconcileHelper(TransactionCase): ) lines.reconcile() + # For v13, need to force compute + lines._compute_reconciled_lines() for line in lines: self.assertEquals(line.reconcile_line_ids, lines) @@ -102,6 +104,8 @@ class TestAccountMoveReconcileHelper(TransactionCase): ) lines.reconcile() + # For v13, need to force compute + lines._compute_reconciled_lines() for line in lines: self.assertEquals(line.reconcile_line_ids, lines) diff --git a/account_move_reconcile_helper/views/account_move_line.xml b/account_move_reconcile_helper/views/account_move_line.xml index 829960f2..7c6c6e82 100644 --- a/account_move_reconcile_helper/views/account_move_line.xml +++ b/account_move_reconcile_helper/views/account_move_line.xml @@ -1,23 +1,24 @@ - + - - - account.move.line.tree (in account_move_reconcile_helper) + account.move.line.tree (in account_move_reconcile_helper) account.move.line - + - - -