[IMP] account_lock: _check_lock_date is move into account_lock module.

This method is also renamed "_autorise_lock_date_changes" and check
tax_lock_date.

Task ID: 2039160

2 files changed, 71 insertions, 56 deletions

diff --git a/addons/account/models/company.py b/addons/account/models/company.py
index 7116dafff8c..6c98c7ba88f 100644
--- a/addons/account/models/company.py
+++ b/addons/account/models/company.py
@@ -153,59 +153,6 @@ class ResCompany(models.Model):
             'account_setup_coa_state',
         ]
 
-    def _check_lock_dates(self, vals):
-        '''Check the lock dates for the current companies. This can't be done in a api.constrains because we need
-        to perform some comparison between new/old values. This method forces the lock dates to be irreversible.
-
-        * You cannot define stricter conditions on advisors than on users. Then, the lock date on advisor must be set
-        after the lock date for users.
-        * You cannot lock a period that is not finished yet. Then, the lock date for advisors must be set after the
-        last day of the previous month.
-        * The new lock date for advisors must be set after the previous lock date.
-
-        :param vals: The values passed to the write method.
-        '''
-        period_lock_date = vals.get('period_lock_date') and\
-            fields.Date.from_string(vals['period_lock_date'])
-        fiscalyear_lock_date = vals.get('fiscalyear_lock_date') and\
-            fields.Date.from_string(vals['fiscalyear_lock_date'])
-
-        previous_month = fields.Date.today() + relativedelta(months=-1)
-        days_previous_month = calendar.monthrange(previous_month.year, previous_month.month)
-        previous_month = previous_month.replace(day=days_previous_month[1])
-        for company in self:
-            old_fiscalyear_lock_date = company.fiscalyear_lock_date
-
-            # The user attempts to remove the lock date for advisors
-            if old_fiscalyear_lock_date and not fiscalyear_lock_date and 'fiscalyear_lock_date' in vals:
-                raise ValidationError(_('The lock date for advisors is irreversible and can\'t be removed.'))
-
-            # The user attempts to set a lock date for advisors prior to the previous one
-            if old_fiscalyear_lock_date and fiscalyear_lock_date and fiscalyear_lock_date < old_fiscalyear_lock_date:
-                raise ValidationError(_('The new lock date for advisors must be set after the previous lock date.'))
-
-            # In case of no new fiscal year in vals, fallback to the oldest
-            if not fiscalyear_lock_date:
-                if old_fiscalyear_lock_date:
-                    fiscalyear_lock_date = old_fiscalyear_lock_date
-                else:
-                    continue
-
-            # The user attempts to set a lock date for advisors prior to the last day of previous month
-            if fiscalyear_lock_date > previous_month:
-                raise ValidationError(_('You cannot lock a period that is not finished yet. Please make sure that the lock date for advisors is not set after the last day of the previous month.'))
-
-            # In case of no new period lock date in vals, fallback to the one defined in the company
-            if not period_lock_date:
-                if company.period_lock_date:
-                    period_lock_date = company.period_lock_date
-                else:
-                    continue
-
-            # The user attempts to set a lock date for advisors prior to the lock date for users
-            if period_lock_date < fiscalyear_lock_date:
-                raise ValidationError(_('You cannot define stricter conditions on advisors than on users. Please make sure that the lock date on advisor is set before the lock date for users.'))
-
     def compute_fiscalyear_dates(self, current_date):
         '''Computes the start and end dates of the fiscal year where the given 'date' belongs to.
 
diff --git a/addons/account_lock/models/res_company.py b/addons/account_lock/models/res_company.py
index d54679e5dce..c2a0dc30c4f 100644
--- a/addons/account_lock/models/res_company.py
+++ b/addons/account_lock/models/res_company.py
@@ -1,13 +1,81 @@
 # -*- coding: utf-8 -*-
 
-from odoo import models, api
+import calendar
+from dateutil.relativedelta import relativedelta
+
+from odoo import fields, models, api, _
+from odoo.exceptions import UserError
 
 
 class ResCompany(models.Model):
     _inherit = 'res.company'
 
+    def _autorise_lock_date_changes(self, vals):
+        '''Check the lock dates for the current companies. This can't be done in a api.constrains because we need
+        to perform some comparison between new/old values. This method forces the lock dates to be irreversible.
+        * You cannot define stricter conditions on advisors than on users. Then, the lock date on advisor must be set
+        after the lock date for users.
+        * You cannot lock a period that is not finished yet. Then, the lock date for advisors must be set after the
+        last day of the previous month.
+        * The new lock date for advisors must be set after the previous lock date.
+        * You cannot delete a tax lock date, lock a period that is not finished yet or the tax lock date must be set after
+        the last day of the previous month.
+        :param vals: The values passed to the write method.
+        '''
+        period_lock_date = vals.get('period_lock_date') and fields.Date.from_string(vals['period_lock_date'])
+        fiscalyear_lock_date = vals.get('fiscalyear_lock_date') and fields.Date.from_string(vals['fiscalyear_lock_date'])
+        tax_lock_date = vals.get('tax_lock_date') and fields.Date.from_string(vals['tax_lock_date'])
+
+        previous_month = fields.Date.today() + relativedelta(months=-1)
+        days_previous_month = calendar.monthrange(previous_month.year, previous_month.month)
+        previous_month = previous_month.replace(day=days_previous_month[1])
+        for company in self:
+            old_fiscalyear_lock_date = company.fiscalyear_lock_date
+            old_period_lock_date = company.period_lock_date
+            old_tax_lock_date = company.tax_lock_date
+
+            # The user attempts to remove the tax lock date
+            if old_tax_lock_date and not tax_lock_date and 'tax_lock_date' in vals:
+                raise UserError(_('The tax lock date is irreversible and can\'t be removed.'))
+
+            # The user attempts to set a tax lock date prior to the previous one
+            if old_tax_lock_date and tax_lock_date and tax_lock_date < old_tax_lock_date:
+                raise UserError(_('The new tax lock date must be set after the previous lock date.'))
+
+            # In case of no new tax lock date in vals, fallback to the oldest
+            tax_lock_date = tax_lock_date or old_tax_lock_date
+            # The user attempts to set a tax lock date prior to the last day of previous month
+            if tax_lock_date and tax_lock_date > previous_month:
+                raise UserError(_('You cannot lock a period that is not finished yet. Please make sure that the tax lock date is not set after the last day of the previous month.'))
+
+            # The user attempts to remove the lock date for advisors
+            if old_fiscalyear_lock_date and not fiscalyear_lock_date and 'fiscalyear_lock_date' in vals:
+                raise UserError(_('The lock date for advisors is irreversible and can\'t be removed.'))
+
+            # The user attempts to set a lock date for advisors prior to the previous one
+            if old_fiscalyear_lock_date and fiscalyear_lock_date and fiscalyear_lock_date < old_fiscalyear_lock_date:
+                raise UserError(_('The new lock date for advisors must be set after the previous lock date.'))
+
+            # In case of no new fiscal year in vals, fallback to the oldest
+            fiscalyear_lock_date = fiscalyear_lock_date or old_fiscalyear_lock_date
+            if not fiscalyear_lock_date:
+                continue
+
+            # The user attempts to set a lock date for advisors prior to the last day of previous month
+            if fiscalyear_lock_date > previous_month:
+                raise UserError(_('You cannot lock a period that is not finished yet. Please make sure that the lock date for advisors is not set after the last day of the previous month.'))
+
+            # In case of no new period lock date in vals, fallback to the one defined in the company
+            period_lock_date = period_lock_date or old_period_lock_date
+            if not period_lock_date:
+                continue
+
+            # The user attempts to set a lock date for advisors prior to the lock date for users
+            if period_lock_date < fiscalyear_lock_date:
+                raise UserError(_('You cannot define stricter conditions on advisors than on users. Please make sure that the lock date on advisor is set before the lock date for users.'))
+
     def write(self, vals):
         # fiscalyear_lock_date can't be set to a prior date
-        if 'fiscalyear_lock_date' in vals or 'period_lock_date' in vals:
-            self._check_lock_dates(vals)
+        if 'fiscalyear_lock_date' in vals or 'period_lock_date' in vals or 'tax_lock_date' in vals:
+            self._autorise_lock_date_changes(vals)
         return super(ResCompany, self).write(vals)