From 4dbab5a70ba02b145396ecc1326ec64cb45c481c Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Tue, 26 May 2020 06:02:29 +0000 Subject: [PATCH] [IMP] account: use singular description The description of the model is used in sentences like This has been created from: All model descriptions should be singular Courtesy of Erwin van der Ploeg for raising the issue closes odoo/odoo#51837 X-original-commit: e0acef778272abb748dacfe4460b3536b3c30a82 Signed-off-by: Martin Trigaux (mat) --- addons/account/i18n/account.pot | 42 ++++--------------- addons/account/models/account_move.py | 2 +- .../account/tests/test_portal_attachment.py | 2 +- 3 files changed, 10 insertions(+), 36 deletions(-) diff --git a/addons/account/i18n/account.pot b/addons/account/i18n/account.pot index 37d365cd771..33280efd5dc 100644 --- a/addons/account/i18n/account.pot +++ b/addons/account/i18n/account.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server saas~13.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-04-21 10:46+0000\n" -"PO-Revision-Date: 2020-04-21 10:46+0000\n" +"POT-Creation-Date: 2020-05-26 06:05+0000\n" +"PO-Revision-Date: 2020-05-26 06:05+0000\n" "Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -123,11 +123,6 @@ msgstr "" msgid "%s is not a stored field" msgstr "" -#. module: account -#: model_terms:ir.ui.view,arch_db:account.report_invoice_document -msgid " on" -msgstr "" - #. module: account #: model:ir.actions.report,print_report_name:account.account_invoices #: model:ir.actions.report,print_report_name:account.account_invoices_without_payment @@ -6108,7 +6103,6 @@ msgstr "" #: code:addons/account/models/account_bank_statement.py:0 #: code:addons/account/static/src/js/mail_activity.js:0 #: model:ir.actions.act_window,name:account.action_move_journal_line -#: model:ir.model,name:account.model_account_move #: model:ir.ui.menu,name:account.menu_action_move_journal_line_form #: model_terms:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view #: model_terms:ir.ui.view,arch_db:account.view_account_journal_form @@ -6127,6 +6121,7 @@ msgstr "" #. module: account #. openerp-web #: code:addons/account/static/src/js/mail_activity.js:0 +#: model:ir.model,name:account.model_account_move #: model:ir.model.fields,field_description:account.field_account_move_line__move_id #: model:ir.model.fields.selection,name:account.selection__account_move__move_type__entry #: model_terms:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view @@ -6748,11 +6743,6 @@ msgstr "" msgid "Mail Activity Type" msgstr "" -#. module: account -#: model:ir.model.fields,field_description:account.field_account_invoice_send__mailing_list_ids -msgid "Mailing List" -msgstr "" - #. module: account #: model:ir.model.fields,field_description:account.field_account_bank_statement__message_main_attachment_id #: model:ir.model.fields,field_description:account.field_account_journal__message_main_attachment_id @@ -6837,21 +6827,6 @@ msgstr "" msgid "Mark invoice as fully paid" msgstr "" -#. module: account -#: model:ir.model.fields,field_description:account.field_account_invoice_send__mass_mailing_id -msgid "Mass Mailing" -msgstr "" - -#. module: account -#: model:ir.model.fields,field_description:account.field_account_invoice_send__campaign_id -msgid "Mass Mailing Campaign" -msgstr "" - -#. module: account -#: model:ir.model.fields,field_description:account.field_account_invoice_send__mass_mailing_name -msgid "Mass Mailing Name" -msgstr "" - #. module: account #: model:ir.model.fields.selection,name:account.selection__account_reconcile_model__match_label__match_regex #: model:ir.model.fields.selection,name:account.selection__account_reconcile_model__match_note__match_regex @@ -12608,12 +12583,6 @@ msgid "" "journal." msgstr "" -#. module: account -#: code:addons/account/models/account.py:0 -#, python-format -msgid "You must first define an opening move." -msgstr "" - #. module: account #: code:addons/account/models/account_move.py:0 #, python-format @@ -12774,6 +12743,11 @@ msgstr "" msgid "of the following month" msgstr "" +#. module: account +#: model_terms:ir.ui.view,arch_db:account.report_invoice_document +msgid "on" +msgstr "" + #. module: account #: model_terms:ir.ui.view,arch_db:account.view_move_form msgid "outstanding debits" diff --git a/addons/account/models/account_move.py b/addons/account/models/account_move.py index c9f642350c5..fd6d382c335 100644 --- a/addons/account/models/account_move.py +++ b/addons/account/models/account_move.py @@ -32,7 +32,7 @@ def calc_check_digits(number): class AccountMove(models.Model): _name = "account.move" _inherit = ['portal.mixin', 'mail.thread', 'mail.activity.mixin', 'sequence.mixin'] - _description = "Journal Entries" + _description = "Journal Entry" _order = 'date desc, name desc, id desc' _mail_post_access = 'read' _check_company_auto = True diff --git a/addons/account/tests/test_portal_attachment.py b/addons/account/tests/test_portal_attachment.py index 7598ca2b98f..6d6ab3c319c 100644 --- a/addons/account/tests/test_portal_attachment.py +++ b/addons/account/tests/test_portal_attachment.py @@ -141,7 +141,7 @@ class TestUi(tests.HttpCase): post_data['attachment_tokens'] = attachment.access_token res = self.url_open(url=post_url, data=post_data) self.assertEqual(res.status_code, 403) - self.assertIn("Sorry, you are not allowed to access documents of type 'Journal Entries' (account.move).", res.text) + self.assertIn("Sorry, you are not allowed to access documents of type 'Journal Entry' (account.move).", res.text) # Test attachment can't be associated if not "pending" state post_data['token'] = invoice._portal_ensure_token()