Skip to content

Commit

Permalink
[IMP] account: use singular description
Browse files Browse the repository at this point in the history
The description of the model is used in sentences like
This <model> has been created from: <link>
All model descriptions should be singular

Courtesy of Erwin van der Ploeg for raising the issue

closes odoo#51837

X-original-commit: e0acef7
Signed-off-by: Martin Trigaux (mat) <[email protected]>
  • Loading branch information
mart-e committed May 26, 2020
1 parent 6394c62 commit 4dbab5a
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 36 deletions.
42 changes: 8 additions & 34 deletions addons/account/i18n/account.pot
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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 "&amp;nbsp;<span>on</span>"
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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion addons/account/models/account_move.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion addons/account/tests/test_portal_attachment.py
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ def test_01_portal_attachment(self):
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()
Expand Down

0 comments on commit 4dbab5a

Please sign in to comment.