From dca79a966a7f2ef34ddb1d25aa7bb9b5d561653c Mon Sep 17 00:00:00 2001 From: "Nicolas (vin)" Date: Thu, 24 Jun 2021 09:35:25 +0000 Subject: [PATCH] [IMP] account: Update journal accounts tooltips on config To bring more clarity to the uses of the accounts that can be set in the accounting settings, update their tooltips. Task id #2573145 closes odoo/odoo#73844 X-original-commit: 5367fc1a4faa0cae1e4e3125aa7ab7d3022be72b Signed-off-by: Laurent Smet Signed-off-by: Nicolas Viseur --- addons/account/i18n/account.pot | 21 ++++++++++++------- addons/account/models/res_config_settings.py | 17 ++++++++++----- .../views/res_config_settings_views.xml | 2 +- 3 files changed, 27 insertions(+), 13 deletions(-) diff --git a/addons/account/i18n/account.pot b/addons/account/i18n/account.pot index 8235b3b01ab..7e9db1039a8 100644 --- a/addons/account/i18n/account.pot +++ b/addons/account/i18n/account.pot @@ -539,7 +539,9 @@ msgstr "" #. module: account #: model_terms:ir.ui.view,arch_db:account.res_config_settings_view_form -msgid "Post Payments and Money Transfers in:" +msgid "" +"The following default accounts are used with " +"certain features." msgstr "" #. module: account @@ -1376,17 +1378,23 @@ msgstr "" #. module: account #: model:ir.model.fields,help:account.field_res_config_settings__account_journal_payment_debit_account_id -msgid "Account used as automatic counterpart account to payments received" +msgid "" +"Incoming payments are posted on an Outstanding Receipts Account. In the bank reconciliation widget, they appear as blue lines.\n" +"Bank transactions are then reconciled on the Outstanding Receipts Accounts rather than the Receivable Account." msgstr "" #. module: account #: model:ir.model.fields,help:account.field_res_config_settings__account_journal_payment_credit_account_id -msgid "Account used as automatic counterpart account to payments sent" +msgid "" +"Outgoing Payments are posted on an Outstanding Payments Account. In the bank reconciliation widget, they appear as blue lines.\n" +"Bank transactions are then reconciled on the Outstanding Payments Account rather the Payable Account." msgstr "" #. module: account #: model:ir.model.fields,help:account.field_res_config_settings__account_journal_suspense_account_id -msgid "Account used as automatic counterpart to bank/cash transactions" +msgid "" +"Bank Transactions are posted immediately after import or synchronization. Their counterparty is the bank suspense account.\n" +"Reconciliation replaces the latter by the definitive account(s)." msgstr "" #. module: account @@ -2595,6 +2603,7 @@ msgstr "" #. module: account #: code:addons/account/models/chart_template.py:0 +#: model:ir.model.fields,field_description:account.field_res_config_settings__account_journal_suspense_account_id #, python-format msgid "Bank Suspense Account" msgstr "" @@ -6393,8 +6402,7 @@ msgstr "" #. module: account #: model:ir.model.fields,help:account.field_res_config_settings__transfer_account_id msgid "" -"Intermediary account used to transfer money from one bank/cash account to " -"another bank/cash account" +"Intermediary account used when moving from a liquidity account to another." msgstr "" #. module: account @@ -11297,7 +11305,6 @@ msgstr "" #. module: account #: model:ir.model.fields,field_description:account.field_account_journal__suspense_account_id -#: model:ir.model.fields,field_description:account.field_res_config_settings__account_journal_suspense_account_id msgid "Suspense Account" msgstr "" diff --git a/addons/account/models/res_config_settings.py b/addons/account/models/res_config_settings.py index 11e41b2faa5..f453da0e86d 100644 --- a/addons/account/models/res_config_settings.py +++ b/addons/account/models/res_config_settings.py @@ -40,29 +40,36 @@ class ResConfigSettings(models.TransientModel): related='company_id.tax_calculation_rounding_method', string='Tax calculation rounding method', readonly=False) account_journal_suspense_account_id = fields.Many2one( comodel_name='account.account', - string='Suspense Account', + string='Bank Suspense Account', readonly=False, related='company_id.account_journal_suspense_account_id', domain=lambda self: "[('deprecated', '=', False), ('company_id', '=', company_id), ('user_type_id.type', 'not in', ('receivable', 'payable')), ('user_type_id', '=', %s)]" % self.env.ref('account.data_account_type_current_liabilities').id, - help='Account used as automatic counterpart to bank/cash transactions') + help='Bank Transactions are posted immediately after import or synchronization. ' + 'Their counterparty is the bank suspense account.\n' + 'Reconciliation replaces the latter by the definitive account(s).') account_journal_payment_debit_account_id = fields.Many2one( comodel_name='account.account', string='Outstanding Receipts Account', readonly=False, related='company_id.account_journal_payment_debit_account_id', domain=lambda self: "[('deprecated', '=', False), ('company_id', '=', company_id), ('user_type_id.type', 'not in', ('receivable', 'payable')), ('user_type_id', '=', %s)]" % self.env.ref('account.data_account_type_current_assets').id, - help='Account used as automatic counterpart account to payments received') + help='Incoming payments are posted on an Outstanding Receipts Account. ' + 'In the bank reconciliation widget, they appear as blue lines.\n' + 'Bank transactions are then reconciled on the Outstanding Receipts Accounts rather than the Receivable ' + 'Account.') account_journal_payment_credit_account_id = fields.Many2one( comodel_name='account.account', string='Outstanding Payments Account', readonly=False, related='company_id.account_journal_payment_credit_account_id', domain=lambda self: "[('deprecated', '=', False), ('company_id', '=', company_id), ('user_type_id.type', 'not in', ('receivable', 'payable')), ('user_type_id', '=', %s)]" % self.env.ref('account.data_account_type_current_assets').id, - help='Account used as automatic counterpart account to payments sent') + help='Outgoing Payments are posted on an Outstanding Payments Account. ' + 'In the bank reconciliation widget, they appear as blue lines.\n' + 'Bank transactions are then reconciled on the Outstanding Payments Account rather the Payable Account.') transfer_account_id = fields.Many2one('account.account', string="Internal Transfer Account", related='company_id.transfer_account_id', readonly=False, domain=lambda self: [('reconcile', '=', True), ('user_type_id.id', '=', self.env.ref('account.data_account_type_current_assets').id)], - help="Intermediary account used to transfer money from one bank/cash account to another bank/cash account") + help="Intermediary account used when moving from a liquidity account to another.") module_account_accountant = fields.Boolean(string='Accounting') group_analytic_accounting = fields.Boolean(string='Analytic Accounting', implied_group='analytic.group_analytic_accounting') diff --git a/addons/account/views/res_config_settings_views.xml b/addons/account/views/res_config_settings_views.xml index 94adb60b6ad..f2f24316ca0 100644 --- a/addons/account/views/res_config_settings_views.xml +++ b/addons/account/views/res_config_settings_views.xml @@ -474,7 +474,7 @@
- Post Payments and Money Transfers in: + The following default accounts are used with certain features.