From cb4281fe7518435d648e24bca23c79d8bd3e9187 Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Thu, 2 Aug 2018 10:11:07 +0200 Subject: [PATCH] [FIX] *: typos or missing words --- addons/hr_timesheet/i18n/hr_timesheet.pot | 4 ++-- addons/hr_timesheet/models/hr_timesheet.py | 2 +- addons/hr_timesheet/models/project.py | 2 +- addons/purchase_requisition/i18n/purchase_requisition.pot | 2 +- addons/purchase_requisition/models/purchase_requisition.py | 2 +- addons/sale_timesheet/i18n/sale_timesheet.pot | 4 ++-- .../report/project_profitability_report_analysis.py | 4 ++-- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/addons/hr_timesheet/i18n/hr_timesheet.pot b/addons/hr_timesheet/i18n/hr_timesheet.pot index bc7b3a9dfef..ee8625a51c4 100644 --- a/addons/hr_timesheet/i18n/hr_timesheet.pot +++ b/addons/hr_timesheet/i18n/hr_timesheet.pot @@ -346,7 +346,7 @@ msgstr "" #. module: hr_timesheet #: code:addons/hr_timesheet/models/hr_timesheet.py:78 #, python-format -msgid "The project you are timesheeting on is not linked to a active analytic account. Please the project configuration." +msgid "The project you are timesheeting on is not linked to a active analytic account. Set one on the project configuration." msgstr "" #. module: hr_timesheet @@ -468,7 +468,7 @@ msgstr "" #. module: hr_timesheet #: code:addons/hr_timesheet/models/project.py:51 #, python-format -msgid "Unkwon Analytic Account" +msgid "Unknown Analytic Account" msgstr "" #. module: hr_timesheet diff --git a/addons/hr_timesheet/models/hr_timesheet.py b/addons/hr_timesheet/models/hr_timesheet.py index 1e8e3429206..894c6419e42 100644 --- a/addons/hr_timesheet/models/hr_timesheet.py +++ b/addons/hr_timesheet/models/hr_timesheet.py @@ -75,7 +75,7 @@ class AccountAnalyticLine(models.Model): vals['account_id'] = project.analytic_account_id.id vals['company_id'] = project.analytic_account_id.company_id.id if not project.analytic_account_id.active: - raise UserError(_('The project you are timesheeting on is not linked to a active analytic account. Please the project configuration.')) + raise UserError(_('The project you are timesheeting on is not linked to an active analytic account. Set one on the project configuration.')) # employee implies user if vals.get('employee_id') and not vals.get('user_id'): employee = self.env['hr.employee'].browse(vals['employee_id']) diff --git a/addons/hr_timesheet/models/project.py b/addons/hr_timesheet/models/project.py index f58f49a3218..69d19c4a340 100644 --- a/addons/hr_timesheet/models/project.py +++ b/addons/hr_timesheet/models/project.py @@ -48,7 +48,7 @@ class Project(models.Model): allow_timesheets = values['allow_timesheets'] if 'allow_timesheets' in values else self.default_get(['allow_timesheets'])['allow_timesheets'] if allow_timesheets and not values.get('analytic_account_id'): analytic_account = self.env['account.analytic.account'].create({ - 'name': values.get('name', _('Unkwon Analytic Account')), + 'name': values.get('name', _('Unknown Analytic Account')), 'company_id': values.get('company_id', self.env.user.company_id.id), 'partner_id': values.get('partner_id'), 'active': True, diff --git a/addons/purchase_requisition/i18n/purchase_requisition.pot b/addons/purchase_requisition/i18n/purchase_requisition.pot index 08a31bbf635..88de2f3dc2c 100644 --- a/addons/purchase_requisition/i18n/purchase_requisition.pot +++ b/addons/purchase_requisition/i18n/purchase_requisition.pot @@ -751,7 +751,7 @@ msgstr "" #. module: purchase_requisition #: code:addons/purchase_requisition/models/purchase_requisition.py:122 #, python-format -msgid "You cannot confirm agreement because there is no product line." +msgid "You cannot confirm agreement '%s' because there is no product line." msgstr "" #. module: purchase_requisition diff --git a/addons/purchase_requisition/models/purchase_requisition.py b/addons/purchase_requisition/models/purchase_requisition.py index 03196f5d9f8..85e9b6238ca 100644 --- a/addons/purchase_requisition/models/purchase_requisition.py +++ b/addons/purchase_requisition/models/purchase_requisition.py @@ -119,7 +119,7 @@ class PurchaseRequisition(models.Model): def action_in_progress(self): self.ensure_one() if not all(obj.line_ids for obj in self): - raise UserError(_('You cannot confirm agreement because there is no product line.')) + raise UserError(_("You cannot confirm agreement '%s' because there is no product line.") % self.name) if self.type_id.quantity_copy == 'none' and self.vendor_id: for requisition_line in self.line_ids: if requisition_line.price_unit <= 0.0: diff --git a/addons/sale_timesheet/i18n/sale_timesheet.pot b/addons/sale_timesheet/i18n/sale_timesheet.pot index 2adda5e4f40..116fafa48f7 100644 --- a/addons/sale_timesheet/i18n/sale_timesheet.pot +++ b/addons/sale_timesheet/i18n/sale_timesheet.pot @@ -774,12 +774,12 @@ msgstr "" #. module: sale_timesheet #: model:ir.model.fields,field_description:sale_timesheet.field_project_profitability_report__amount_untaxed_invoiced -msgid "Untaxed Amout Invoiced" +msgid "Untaxed Amount Invoiced" msgstr "" #. module: sale_timesheet #: model:ir.model.fields,field_description:sale_timesheet.field_project_profitability_report__amount_untaxed_to_invoice -msgid "Untaxed Amout To Invoice" +msgid "Untaxed Amount To Invoice" msgstr "" #. module: sale_timesheet diff --git a/addons/sale_timesheet/report/project_profitability_report_analysis.py b/addons/sale_timesheet/report/project_profitability_report_analysis.py index 50eb685d103..363a873a587 100644 --- a/addons/sale_timesheet/report/project_profitability_report_analysis.py +++ b/addons/sale_timesheet/report/project_profitability_report_analysis.py @@ -25,8 +25,8 @@ class ProfitabilityAnalysis(models.Model): sale_line_id = fields.Many2one('sale.order.line', string='Sale Order Line', readonly=True) sale_order_id = fields.Many2one('sale.order', string='Sale Order', readonly=True) product_id = fields.Many2one('product.product', string='Product', readonly=True) - amount_untaxed_to_invoice = fields.Float("Untaxed Amout To Invoice", digits=(16, 2), readonly=True, group_operator="sum") - amount_untaxed_invoiced = fields.Float("Untaxed Amout Invoiced", digits=(16, 2), readonly=True, group_operator="sum") + amount_untaxed_to_invoice = fields.Float("Untaxed Amount To Invoice", digits=(16, 2), readonly=True, group_operator="sum") + amount_untaxed_invoiced = fields.Float("Untaxed Amount Invoiced", digits=(16, 2), readonly=True, group_operator="sum") def init(self): tools.drop_view_if_exists(self._cr, self._table)