From 0f10589eb445519a7ff89914fa55859c66cbc85f Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Wed, 8 Nov 2017 14:24:47 +0100 Subject: [PATCH] [FIX] base,sale_timesheet: English Thoses -> those Add model description Courtesy of translators for report --- addons/sale_timesheet/i18n/sale_timesheet.pot | 2 +- addons/sale_timesheet/models/product.py | 3 +- odoo/addons/base/i18n/base.pot | 34 ++++++++----------- odoo/addons/base/ir/ir_cron.py | 3 +- 4 files changed, 20 insertions(+), 22 deletions(-) diff --git a/addons/sale_timesheet/i18n/sale_timesheet.pot b/addons/sale_timesheet/i18n/sale_timesheet.pot index 813d8661dbd..4c3e7c22f09 100644 --- a/addons/sale_timesheet/i18n/sale_timesheet.pot +++ b/addons/sale_timesheet/i18n/sale_timesheet.pot @@ -214,7 +214,7 @@ msgstr "" #. module: sale_timesheet #: model:ir.model.fields,help:sale_timesheet.field_product_product_service_tracking #: model:ir.model.fields,help:sale_timesheet.field_product_template_service_tracking -msgid "On Sales order confirmation, this product can generate project and/or task. From thoses, you can track the service you are selling." +msgid "On Sales order confirmation, this product can generate a project and/or task. From those, you can track the service you are selling." msgstr "" #. module: sale_timesheet diff --git a/addons/sale_timesheet/models/product.py b/addons/sale_timesheet/models/product.py index 3fe382701d3..aeddf1bd2ce 100644 --- a/addons/sale_timesheet/models/product.py +++ b/addons/sale_timesheet/models/product.py @@ -20,7 +20,8 @@ class ProductTemplate(models.Model): ('task_global_project', 'Create a task in an existing project'), ('task_new_project', 'Create a task in a new project'), ('project_only', 'Create a new project but no task'), - ], string="Service Tracking", default="no", help="On Sales order confirmation, this product can generate project and/or task. From thoses, you can track the service you are selling.") + ], string="Service Tracking", default="no", + help="On Sales order confirmation, this product can generate a project and/or task. From those, you can track the service you are selling.") project_id = fields.Many2one( 'project.project', 'Project', company_dependent=True, domain=[('sale_line_id', '=', False)], help='Select a non billable project on which tasks can be created. This setting must be set for each company.') diff --git a/odoo/addons/base/i18n/base.pot b/odoo/addons/base/i18n/base.pot index 7051c741b79..ab99d591de7 100644 --- a/odoo/addons/base/i18n/base.pot +++ b/odoo/addons/base/i18n/base.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 11.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-10-24 09:14+0000\n" -"PO-Revision-Date: 2017-10-24 09:14+0000\n" +"POT-Creation-Date: 2017-11-08 13:21+0000\n" +"PO-Revision-Date: 2017-11-08 13:21+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -5868,6 +5868,12 @@ msgstr "" msgid "Before Amount" msgstr "" +#. module: base +#: code:addons/base/res/res_users.py:954 +#, python-format +msgid "Before clicking on 'Change Password', you have to write a new password." +msgstr "" + #. module: base #: model:res.country,name:base.by msgid "Belarus" @@ -6220,6 +6226,7 @@ msgstr "" #: model:ir.ui.view,arch_db:base.view_base_module_update #: model:ir.ui.view,arch_db:base.view_base_module_upgrade #: model:ir.ui.view,arch_db:base.view_base_module_upgrade_install +#: model:ir.ui.view,arch_db:base.view_company_report_form #: model:ir.ui.view,arch_db:base.view_model_menu_create #: model:ir.ui.view,arch_db:base.view_users_form_simple_modif #: model:ir.ui.view,arch_db:base.wizard_lang_export @@ -6558,7 +6565,6 @@ msgstr "" #. module: base #: model:ir.ui.view,arch_db:base.view_base_language_install #: model:ir.ui.view,arch_db:base.view_base_module_update -#: model:ir.ui.view,arch_db:base.view_company_report_form #: model:ir.ui.view,arch_db:base.wizard_lang_export msgid "Close" msgstr "" @@ -7381,11 +7387,6 @@ msgstr "" msgid "Croatia - RRIF 2012 COA - Accounting Reports" msgstr "" -#. module: base -#: model:ir.model.fields,field_description:base.field_ir_cron_user_id -msgid "Cron User" -msgstr "" - #. module: base #: model:res.country,name:base.cu msgid "Cuba" @@ -15835,6 +15836,7 @@ msgstr "" #. module: base #: model:ir.actions.act_window,name:base.ir_cron_act +#: model:ir.model,name:base.model_ir_cron #: model:ir.ui.menu,name:base.menu_ir_cron_act #: model:ir.ui.view,arch_db:base.ir_cron_view_calendar #: model:ir.ui.view,arch_db:base.ir_cron_view_search @@ -15842,6 +15844,11 @@ msgstr "" msgid "Scheduled Actions" msgstr "" +#. module: base +#: model:ir.model.fields,field_description:base.field_ir_cron_user_id +msgid "Scheduler User" +msgstr "" + #. module: base #: model:res.partner.industry,name:base.res_partner_industry_M msgid "Scientific" @@ -19329,11 +19336,6 @@ msgstr "" msgid "ir.config_parameter" msgstr "" -#. module: base -#: model:ir.model,name:base.model_ir_cron -msgid "ir.cron" -msgstr "" - #. module: base #: model:ir.model,name:base.model_ir_default msgid "ir.default" @@ -19704,12 +19706,6 @@ msgstr "" msgid "yes" msgstr "" -#. module: base -#: code:addons/base/res/res_users.py:955 -#, python-format -msgid "Before clicking on 'Change Password', you have to write a new password." -msgstr "" - #. module: base #: model:res.country,name:base.ax msgid "Åland Islands" diff --git a/odoo/addons/base/ir/ir_cron.py b/odoo/addons/base/ir/ir_cron.py index 17b92cae609..4a4d0bc6f5f 100644 --- a/odoo/addons/base/ir/ir_cron.py +++ b/odoo/addons/base/ir/ir_cron.py @@ -37,12 +37,13 @@ class ir_cron(models.Model): _name = "ir.cron" _order = 'cron_name' + _description = 'Scheduled Actions' ir_actions_server_id = fields.Many2one( 'ir.actions.server', 'Server action', delegate=True, ondelete='restrict', required=True) cron_name = fields.Char('Name', related='ir_actions_server_id.name', store=True) - user_id = fields.Many2one('res.users', string='Cron User', default=lambda self: self.env.user, required=True) + user_id = fields.Many2one('res.users', string='Scheduler User', default=lambda self: self.env.user, required=True) active = fields.Boolean(default=True) interval_number = fields.Integer(default=1, help="Repeat every x.") interval_type = fields.Selection([('minutes', 'Minutes'),