From eaee797afd6e7b784a986eaa3de95e8dbd562d2a Mon Sep 17 00:00:00 2001 From: "Julien Alardot (jual)" Date: Fri, 30 Sep 2022 08:14:56 +0000 Subject: [PATCH] [FIX] account: Clarify lock date message MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The current message may make you believe the date on the invoice will be changed when it's the accounting date This aims to clarify that the move.invoice_date will stay the same when it's the move.date that will be changed closes odoo/odoo#101820 X-original-commit: 5f5dbbcc66f4ded1388949386faf90e0d406a4b2 Signed-off-by: Julien Alardot (jual) Signed-off-by: William André (wan) --- addons/account/i18n/account.pot | 22 +++++++++++----------- addons/account/models/account_move.py | 4 ++-- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/addons/account/i18n/account.pot b/addons/account/i18n/account.pot index 17aee7d0107..bc2474c08b0 100644 --- a/addons/account/i18n/account.pot +++ b/addons/account/i18n/account.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 16.0beta\n" +"Project-Id-Version: Odoo Server 16.0beta+e\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-09-27 15:11+0000\n" -"PO-Revision-Date: 2022-09-27 15:11+0000\n" +"POT-Creation-Date: 2022-09-30 10:54+0000\n" +"PO-Revision-Date: 2022-09-30 10:54+0000\n" "Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -12735,14 +12735,6 @@ msgid "" "currency. You should remove the secondary currency on the account." msgstr "" -#. module: account -#: code:addons/account/models/account_move.py:0 -#, python-format -msgid "" -"The accounting date being set prior to the %(lock_type)s lock date " -"%(lock_date)s, it will be changed to %(accounting_date)s upon posting." -msgstr "" - #. module: account #: model:ir.model.fields,help:account.field_account_setup_bank_manual_config__journal_id #: model:ir.model.fields,help:account.field_res_partner_bank__journal_id @@ -12917,6 +12909,14 @@ msgid "" "invoice/bill, you can adjust its lines or the expected Total (tax inc.)." msgstr "" +#. module: account +#: code:addons/account/models/account_move.py:0 +#, python-format +msgid "" +"The date is being set prior to the %(lock_type)s lock date %(lock_date)s. " +"The Journal Entry will be accounted on %(accounting_date)s upon posting." +msgstr "" + #. module: account #: code:addons/account/wizard/account_automatic_entry_wizard.py:0 #, python-format diff --git a/addons/account/models/account_move.py b/addons/account/models/account_move.py index 231f9345f6a..1e66826f0c7 100644 --- a/addons/account/models/account_move.py +++ b/addons/account/models/account_move.py @@ -1292,8 +1292,8 @@ class AccountMove(models.Model): accounting_date = move._get_accounting_date(invoice_date, affects_tax_report) lock_date, lock_type = lock_dates[-1] tax_lock_date_message = _( - "The accounting date being set prior to the %(lock_type)s lock date %(lock_date)s," - " it will be changed to %(accounting_date)s upon posting.", + "The date is being set prior to the %(lock_type)s lock date %(lock_date)s. " + "The Journal Entry will be accounted on %(accounting_date)s upon posting.", lock_type=lock_type, lock_date=format_date(move.env, lock_date), accounting_date=format_date(move.env, accounting_date))