From 3715244a51a2aa382e98da69905a4aa6759b50e0 Mon Sep 17 00:00:00 2001 From: Grzegorz Krukar Date: Sat, 10 Feb 2018 15:38:45 +0100 Subject: [PATCH] [FIX] account: missing 'Enterprise' labels in Invoicing settings This patch is a workaround waiting for the real patch in upgrade field widget. Export source to match recent changes in account module Closes #22984 Fixes #20030 --- addons/account/i18n/account.pot | 50 +++++++++---------- addons/account/models/res_config_settings.py | 6 +-- .../views/res_config_settings_views.xml | 6 +-- 3 files changed, 30 insertions(+), 32 deletions(-) diff --git a/addons/account/i18n/account.pot b/addons/account/i18n/account.pot index 8757ba82276..d5ea6de0d6e 100644 --- a/addons/account/i18n/account.pot +++ b/addons/account/i18n/account.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 11.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-02-19 13:42+0000\n" -"PO-Revision-Date: 2018-02-19 13:42+0000\n" +"POT-Creation-Date: 2018-03-12 15:37+0000\n" +"PO-Revision-Date: 2018-03-12 15:37+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -156,7 +156,7 @@ msgstr "" #: model:mail.template,body_html:account.mail_template_data_payment_receipt msgid "\n" "

Dear ${object.partner_id.name},

\n" -"

Thank you for your payment.
Here is your payment receipt ${(object.name or '').replace('/','-')} amounting to ${object.amount} ${object.currency_id.name} from ${object.company_id.name}.

\n" +"

Thank you for your payment.
Here is your payment receipt ${(object.name or '').replace('/','-')} amounting to ${format_amount(object.amount, object.currency_id)} from ${object.company_id.name}.

\n" "

If you have any questions, please do not hesitate to contact us.

\n" "

Best regards,\n" "% if user and user.signature:\n" @@ -256,7 +256,7 @@ msgid "

\n" "% if object.origin:\n" "(with reference: ${object.origin})\n" "% endif\n" -"amounting in ${object.amount_total} ${object.currency_id.name}\n" +"amounting in ${format_amount(object.amount_total, object.currency_id)}\n" "from ${object.company_id.name}.\n" "

\n" "\n" @@ -1617,11 +1617,6 @@ msgstr "" msgid "Allow Cancelling Entries" msgstr "" -#. module: account -#: model:ir.model.fields,field_description:account.field_res_config_settings_module_currency_rate_live -msgid "Allow Currency Rate Live" -msgstr "" - #. module: account #: model:ir.model.fields,field_description:account.field_account_account_template_reconcile msgid "Allow Invoices & payments Matching" @@ -1664,6 +1659,7 @@ msgstr "" #: code:addons/account/static/src/xml/account_reconciliation.xml:252 #: model:ir.model.fields,field_description:account.field_account_bank_statement_line_amount #: model:ir.model.fields,field_description:account.field_account_invoice_line_price_subtotal +#: model:ir.model.fields,field_description:account.field_account_invoice_line_price_total #: model:ir.model.fields,field_description:account.field_account_invoice_tax_amount #: model:ir.model.fields,field_description:account.field_account_invoice_tax_amount_total #: model:ir.model.fields,field_description:account.field_account_move_amount @@ -1966,14 +1962,14 @@ msgid "Automated Entries" msgstr "" #. module: account -#: code:addons/account/models/company.py:349 +#: code:addons/account/models/company.py:354 #: code:addons/account/wizard/setup_wizards.py:79 #, python-format msgid "Automatic Balancing Line" msgstr "" #. module: account -#: model:ir.ui.view,arch_db:account.res_config_settings_view_form +#: model:ir.model.fields,field_description:account.field_res_config_settings_module_currency_rate_live msgid "Automatic Currency Rates" msgstr "" @@ -4133,11 +4129,6 @@ msgstr "" msgid "Enable Comparison" msgstr "" -#. module: account -#: model:ir.model.fields,field_description:account.field_res_config_settings_module_account_reports_followup -msgid "Enable payment followup management" -msgstr "" - #. module: account #: model:ir.ui.view,arch_db:account.account_planner msgid "End" @@ -4480,7 +4471,7 @@ msgid "Follow-up" msgstr "" #. module: account -#: model:ir.ui.view,arch_db:account.res_config_settings_view_form +#: model:ir.model.fields,field_description:account.field_res_config_settings_module_account_reports_followup msgid "Follow-up Levels" msgstr "" @@ -8089,7 +8080,7 @@ msgid "Rounding Tree" msgstr "" #. module: account -#: model:ir.ui.view,arch_db:account.res_config_settings_view_form +#: model:ir.model.fields,field_description:account.field_res_config_settings_module_account_sepa msgid "SEPA Credit Transfer (SCT)" msgstr "" @@ -9288,6 +9279,12 @@ msgstr "" msgid "The partner reference of this invoice." msgstr "" +#. module: account +#: code:addons/account/models/account.py:522 +#, python-format +msgid "The partners of the journal's company and the related bank account mismatch." +msgstr "" + #. module: account #: code:addons/account/models/account_payment.py:60 #, python-format @@ -9992,11 +9989,6 @@ msgstr "" msgid "Use SEPA Direct Debit" msgstr "" -#. module: account -#: model:ir.model.fields,field_description:account.field_res_config_settings_module_account_sepa -msgid "Use SEPA payments" -msgstr "" - #. module: account #: model:ir.model.fields,field_description:account.field_account_move_reversal_journal_id msgid "Use Specific Journal" @@ -10415,23 +10407,29 @@ msgid "You can set up here the format you want this record to be displayed. If y msgstr "" #. module: account -#: code:addons/account/models/account_move.py:207 +#: code:addons/account/models/account_move.py:209 #, python-format msgid "You cannot add/modify entries prior to and inclusive of the lock date %s" msgstr "" #. module: account -#: code:addons/account/models/account_move.py:209 +#: code:addons/account/models/account_move.py:211 #, python-format msgid "You cannot add/modify entries prior to and inclusive of the lock date %s. Check the company settings or ask someone with the 'Adviser' role" msgstr "" #. module: account -#: code:addons/account/models/account_invoice.py:1208 +#: code:addons/account/models/account_invoice.py:1193 #, python-format msgid "You cannot cancel an invoice which is partially paid. You need to unreconcile related payment entries first." msgstr "" +#. module: account +#: code:addons/account/models/company.py:143 +#, python-format +msgid "You cannot change the currency of the company since some journal items already exist" +msgstr "" + #. module: account #: code:addons/account/models/account.py:235 #, python-format diff --git a/addons/account/models/res_config_settings.py b/addons/account/models/res_config_settings.py index 44182604d5c..fe1606a087b 100644 --- a/addons/account/models/res_config_settings.py +++ b/addons/account/models/res_config_settings.py @@ -34,7 +34,7 @@ class ResConfigSettings(models.TransientModel): module_account_budget = fields.Boolean(string='Budget Management') module_account_payment = fields.Boolean(string='Online Payment') module_account_reports = fields.Boolean("Dynamic Reports") - module_account_reports_followup = fields.Boolean("Enable payment followup management") + module_account_reports_followup = fields.Boolean("Follow-up Levels") default_sale_tax_id = fields.Many2one('account.tax', string="Default Sale Tax", company_dependent=True, oldname="default_sale_tax") default_purchase_tax_id = fields.Many2one('account.tax', string="Default Purchase Tax", @@ -43,7 +43,7 @@ class ResConfigSettings(models.TransientModel): module_account_batch_deposit = fields.Boolean(string='Use batch deposit', help='This allows you to group received checks before you deposit them to the bank.\n' '-This installs the module account_batch_deposit.') - module_account_sepa = fields.Boolean(string='Use SEPA payments') + module_account_sepa = fields.Boolean(string='SEPA Credit Transfer (SCT)') module_account_sepa_direct_debit = fields.Boolean(string='Use SEPA Direct Debit') module_account_plaid = fields.Boolean(string="Plaid Connector") module_account_yodlee = fields.Boolean("Bank Interface - Sync your bank feeds automatically") @@ -51,7 +51,7 @@ class ResConfigSettings(models.TransientModel): module_account_bank_statement_import_ofx = fields.Boolean("Import in .ofx format") module_account_bank_statement_import_csv = fields.Boolean("Import in .csv format") module_account_bank_statement_import_camt = fields.Boolean("Import in CAMT.053 format") - module_currency_rate_live = fields.Boolean(string="Allow Currency Rate Live") + module_currency_rate_live = fields.Boolean(string="Automatic Currency Rates") module_print_docsaway = fields.Boolean(string="Docsaway") module_product_margin = fields.Boolean(string="Allow Product Margin") module_l10n_eu_service = fields.Boolean(string="EU Digital Goods VAT") diff --git a/addons/account/views/res_config_settings_views.xml b/addons/account/views/res_config_settings_views.xml index f61cf860d84..90cfb10004a 100644 --- a/addons/account/views/res_config_settings_views.xml +++ b/addons/account/views/res_config_settings_views.xml @@ -176,7 +176,7 @@
-
-
-