diff options
| -rw-r--r-- | addons/account_lock/__manifest__.py | 12 | ||||
| -rw-r--r-- | addons/account_lock/i18n/account_lock.pot | 28 | ||||
| -rw-r--r-- | addons/account_lock/models/res_company.py | 18 | ||||
| -rw-r--r-- | odoo/addons/base/i18n/base.pot | 6 |
4 files changed, 33 insertions, 31 deletions
diff --git a/addons/account_lock/__manifest__.py b/addons/account_lock/__manifest__.py index 59ae0bd4db9..f744fea1b54 100644 --- a/addons/account_lock/__manifest__.py +++ b/addons/account_lock/__manifest__.py @@ -1,16 +1,16 @@ # -*- coding: utf-8 -*- # Part of Odoo. See LICENSE file for full copyright and licensing details. { - 'name' : 'Irreversible Lock Date', - 'version' : '1.0', + 'name': 'Irreversible Lock Date', + 'version': '1.0', 'category': 'Accounting/Accounting', 'description': """ Make the lock date irreversible: - * You cannot define stricter conditions on advisors than on users. Then, the lock date on advisor must be set before the lock date for users. - * You cannot lock a period that is not finished yet. Then, the lock date for advisors must be set before the last day of the previous month. - * The new lock date for advisors must be set after the previous lock date. + * You cannot set stricter restrictions on advisors than on users. Therefore, the All Users Lock Date must be anterior (or equal) to the Invoice/Bills Lock Date. + * You cannot lock a period that has not yet ended. Therefore, the All Users Lock Date must be anterior (or equal) to the last day of the previous month. + * Any new All Users Lock Date must be posterior (or equal) to the previous one. """, - 'depends' : ['account'], + 'depends': ['account'], 'data': [], } diff --git a/addons/account_lock/i18n/account_lock.pot b/addons/account_lock/i18n/account_lock.pot index fbb92fd0863..209ce16ed2d 100644 --- a/addons/account_lock/i18n/account_lock.pot +++ b/addons/account_lock/i18n/account_lock.pot @@ -16,6 +16,14 @@ msgstr "" "Plural-Forms: \n" #. module: account_lock +#: code:addons/account_lock/models/res_company.py:0 +#, python-format +msgid "" +"Any new All Users Lock Date must be posterior (or equal) to the previous " +"one." +msgstr "" + +#. module: account_lock #: model:ir.model,name:account_lock.model_res_company msgid "Companies" msgstr "" @@ -44,13 +52,6 @@ msgstr "" #. module: account_lock #: code:addons/account_lock/models/res_company.py:0 #, python-format -msgid "" -"The new lock date for advisors must be set after the previous lock date." -msgstr "" - -#. module: account_lock -#: code:addons/account_lock/models/res_company.py:0 -#, python-format msgid "The new tax lock date must be set after the previous lock date." msgstr "" @@ -64,22 +65,23 @@ msgstr "" #: code:addons/account_lock/models/res_company.py:0 #, python-format msgid "" -"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." +"You cannot lock a period that has not yet ended. Therefore, the All Users " +"Lock Date must be anterior (or equal) to the last day of the previous month." msgstr "" #. module: account_lock #: code:addons/account_lock/models/res_company.py:0 #, python-format msgid "" -"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." +"You cannot lock a period that has not yet ended. Therefore, the tax lock " +"date must be anterior (or equal) to the last day of the previous month." msgstr "" #. module: account_lock #: code:addons/account_lock/models/res_company.py:0 #, python-format msgid "" -"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." +"You cannot set stricter restrictions on advisors than on users. Therefore, " +"the All Users Lock Date must be anterior (or equal) to the Invoice/Bills " +"Lock Date." msgstr "" diff --git a/addons/account_lock/models/res_company.py b/addons/account_lock/models/res_company.py index c2a0dc30c4f..9aeab2287d1 100644 --- a/addons/account_lock/models/res_company.py +++ b/addons/account_lock/models/res_company.py @@ -13,11 +13,11 @@ class ResCompany(models.Model): 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 set stricter restrictions on advisors than on users. + Therefore, the All Users Lock Date must be anterior (or equal) to the Invoice/Bills Lock Date. + * You cannot lock a period that has not yet ended. + Therefore, the All Users Lock Date must be anterior (or equal) to the last day of the previous month. + * Any new All Users Lock Date must be posterior (or equal) to the previous one. * 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. @@ -46,7 +46,7 @@ class ResCompany(models.Model): 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.')) + raise UserError(_('You cannot lock a period that has not yet ended. Therefore, the tax lock date must be anterior (or equal) to 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: @@ -54,7 +54,7 @@ class ResCompany(models.Model): # 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.')) + raise UserError(_('Any new All Users Lock Date must be posterior (or equal) to the previous one.')) # In case of no new fiscal year in vals, fallback to the oldest fiscalyear_lock_date = fiscalyear_lock_date or old_fiscalyear_lock_date @@ -63,7 +63,7 @@ class ResCompany(models.Model): # 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.')) + raise UserError(_('You cannot lock a period that has not yet ended. Therefore, the All Users Lock Date must be anterior (or equal) to 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 @@ -72,7 +72,7 @@ class ResCompany(models.Model): # 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.')) + raise UserError(_('You cannot set stricter restrictions on advisors than on users. Therefore, the All Users Lock Date must be anterior (or equal) to the Invoice/Bills Lock Date.')) def write(self, vals): # fiscalyear_lock_date can't be set to a prior date diff --git a/odoo/addons/base/i18n/base.pot b/odoo/addons/base/i18n/base.pot index 7575d7cba03..d52ad9bec96 100644 --- a/odoo/addons/base/i18n/base.pot +++ b/odoo/addons/base/i18n/base.pot @@ -999,9 +999,9 @@ msgid "" "\n" " Make the lock date irreversible:\n" "\n" -" * You cannot define stricter conditions on advisors than on users. Then, the lock date on advisor must be set before the lock date for users.\n" -" * You cannot lock a period that is not finished yet. Then, the lock date for advisors must be set before the last day of the previous month.\n" -" * The new lock date for advisors must be set after the previous lock date.\n" +" * You cannot set stricter restrictions on advisors than on users. Therefore, the All Users Lock Date must be anterior (or equal) to the Invoice/Bills Lock Date.\n" +" * You cannot lock a period that has not yet ended. Therefore, the All Users Lock Date must be anterior (or equal) to the last day of the previous month.\n" +" * Any new All Users Lock Date must be posterior (or equal) to the previous one.\n" " " msgstr "" |