diff --git a/addons/account/models/account_journal_dashboard.py b/addons/account/models/account_journal_dashboard.py index 80797ed9edd..8db08f9ff60 100644 --- a/addons/account/models/account_journal_dashboard.py +++ b/addons/account/models/account_journal_dashboard.py @@ -80,8 +80,10 @@ class account_journal(models.Model): SELECT move.journal_id, move.sequence_prefix FROM account_move move + JOIN res_company company ON company.id = move.company_id WHERE move.journal_id = ANY(%(journal_ids)s) AND move.state = 'posted' + AND (company.fiscalyear_lock_date IS NULL OR move.date >= company.fiscalyear_lock_date) GROUP BY move.journal_id, move.sequence_prefix HAVING COUNT(*) != MAX(move.sequence_number) - MIN(move.sequence_number) + 1 """, { diff --git a/addons/account/models/account_move.py b/addons/account/models/account_move.py index ebb108a1f95..bc7dca61325 100644 --- a/addons/account/models/account_move.py +++ b/addons/account/models/account_move.py @@ -745,6 +745,7 @@ class AccountMove(models.Model): self.env.cr.execute(""" SELECT this.id FROM account_move this + JOIN res_company company ON company.id = this.company_id LEFT JOIN account_move other ON this.journal_id = other.journal_id AND this.sequence_prefix = other.sequence_prefix AND this.sequence_number = other.sequence_number + 1 @@ -752,6 +753,7 @@ class AccountMove(models.Model): AND this.sequence_number != 1 AND this.name != '/' AND this.id = ANY(%(move_ids)s) + AND (company.fiscalyear_lock_date IS NULL OR this.date >= company.fiscalyear_lock_date) """, { 'move_ids': self.ids, }) diff --git a/addons/account/views/account_journal_dashboard_view.xml b/addons/account/views/account_journal_dashboard_view.xml index 82e4a2f50a4..4355a305763 100644 --- a/addons/account/views/account_journal_dashboard_view.xml +++ b/addons/account/views/account_journal_dashboard_view.xml @@ -79,7 +79,7 @@ - + Gaps in the sequence