diff --git a/addons/hr_fleet/i18n/hr_fleet.pot b/addons/hr_fleet/i18n/hr_fleet.pot index e428166fdb1..1b378c13bd7 100644 --- a/addons/hr_fleet/i18n/hr_fleet.pot +++ b/addons/hr_fleet/i18n/hr_fleet.pot @@ -99,28 +99,21 @@ msgstr "" msgid "Employee Name" msgstr "" -#. module: hr_fleet -#. odoo-python -#: code:addons/hr_fleet/models/mail_activity_plan_template.py:0 -#, python-format -msgid "Employee's vehicle %s is not linked to a fleet manager." -msgstr "" - #. module: hr_fleet #: model:ir.model.fields.selection,name:hr_fleet.selection__mail_activity_plan_template__responsible_type__fleet_manager msgid "Fleet Manager" msgstr "" -#. module: hr_fleet -#: model_terms:ir.ui.view,arch_db:hr_fleet.view_employee_form -msgid "Fleet Mobility Card" -msgstr "" - #. module: hr_fleet #. odoo-python #: code:addons/hr_fleet/models/mail_activity_plan_template.py:0 #, python-format -msgid "Fleet manager responsible is limited to Employee plans." +msgid "Fleet Manager is limited to Employee plans." +msgstr "" + +#. module: hr_fleet +#: model_terms:ir.ui.view,arch_db:hr_fleet.view_employee_form +msgid "Fleet Mobility Card" msgstr "" #. module: hr_fleet @@ -177,6 +170,13 @@ msgstr "" msgid "Services for vehicles" msgstr "" +#. module: hr_fleet +#. odoo-python +#: code:addons/hr_fleet/models/mail_activity_plan_template.py:0 +#, python-format +msgid "The vehicle of employee %(employee)s is not linked to a fleet manager." +msgstr "" + #. module: hr_fleet #. odoo-javascript #: code:addons/hr_fleet/static/src/views/hr_fleet_kanban/hr_fleet_kanban_controller.xml:0 diff --git a/addons/hr_fleet/models/mail_activity_plan_template.py b/addons/hr_fleet/models/mail_activity_plan_template.py index 02f757ceb9d..5312ae52db5 100644 --- a/addons/hr_fleet/models/mail_activity_plan_template.py +++ b/addons/hr_fleet/models/mail_activity_plan_template.py @@ -17,7 +17,7 @@ class MailActivityPlanTemplate(models.Model): """ Ensure that hr types are used only on employee model """ for template in self.filtered(lambda tpl: tpl.plan_id.res_model != 'hr.employee'): if template.responsible_type == 'fleet_manager': - raise exceptions.ValidationError(_('Fleet manager responsible is limited to Employee plans.')) + raise exceptions.ValidationError(_("Fleet Manager is limited to Employee plans.")) def _determine_responsible(self, on_demand_responsible, employee): if self.responsible_type == 'fleet_manager' and self.plan_id.res_model == 'hr.employee': @@ -27,7 +27,7 @@ class MailActivityPlanTemplate(models.Model): if not vehicle: error = _('Employee %s is not linked to a vehicle.', employee_id.name) if vehicle and not vehicle.manager_id: - error = _("Employee's vehicle %s is not linked to a fleet manager.", employee_id.name) + error = _("The vehicle of employee %(employee)s is not linked to a fleet manager.", employee=employee_id.name) return { 'responsible': vehicle.manager_id, 'error': error, diff --git a/addons/hr_fleet/tests/test_mail_activity_plan.py b/addons/hr_fleet/tests/test_mail_activity_plan.py index ddf4ae92864..50d40785059 100644 --- a/addons/hr_fleet/tests/test_mail_activity_plan.py +++ b/addons/hr_fleet/tests/test_mail_activity_plan.py @@ -60,7 +60,7 @@ class TestActivitySchedule(ActivityScheduleHRCase): self.assertTrue(form.has_error) n_error = form.error.count('
  • ') self.assertEqual(n_error, 1) - self.assertIn(f"Employee's vehicle {self.employee_1.name} is not linked to a fleet manager.", form.error) + self.assertIn(f"The vehicle of employee {self.employee_1.name} is not linked to a fleet manager.", form.error) with self.assertRaises(ValidationError): form.save() diff --git a/addons/payment/i18n/payment.pot b/addons/payment/i18n/payment.pot index f019ccc90bf..d3733e4c841 100644 --- a/addons/payment/i18n/payment.pot +++ b/addons/payment/i18n/payment.pot @@ -159,7 +159,7 @@ msgstr "" #. module: payment #: model_terms:ir.ui.view,arch_db:payment.pay msgid "" -"Warning Make sure your are logged in as the\n" +"Warning Make sure you are logged in as the\n" " correct partner before making this payment." msgstr "" @@ -355,6 +355,11 @@ msgstr "" msgid "Availability" msgstr "" +#. module: payment +#: model_terms:ir.ui.view,arch_db:payment.payment_method_search +msgid "Available methods" +msgstr "" + #. module: payment #. odoo-python #: code:addons/payment/wizards/payment_onboarding_wizard.py:0 @@ -604,7 +609,6 @@ msgstr "" #. module: payment #: model:ir.model.fields.selection,name:payment.selection__payment_provider_onboarding_wizard__payment_method__stripe -#: model:ir.model.fields.selection,name:payment.selection__sale_payment_provider_onboarding_wizard__payment_method__stripe msgid "Credit & Debit card (via Stripe)" msgstr "" @@ -623,7 +627,6 @@ msgstr "" #. module: payment #: model:ir.model.fields.selection,name:payment.selection__payment_provider_onboarding_wizard__payment_method__manual -#: model:ir.model.fields.selection,name:payment.selection__sale_payment_provider_onboarding_wizard__payment_method__manual msgid "Custom payment instructions" msgstr "" @@ -731,15 +734,11 @@ msgid "Full Only" msgstr "" #. module: payment +#: model:ir.model,name:payment.model_payment_link_wizard #: model_terms:ir.ui.view,arch_db:payment.payment_link_wizard_view_form msgid "Generate Payment Link" msgstr "" -#. module: payment -#: model:ir.model,name:payment.model_payment_link_wizard -msgid "Generate Sales Payment Link" -msgstr "" - #. module: payment #: model_terms:ir.ui.view,arch_db:payment.payment_link_wizard_view_form msgid "Generate and Copy Payment Link" @@ -1116,7 +1115,6 @@ msgstr "" #. module: payment #: model:ir.model.fields.selection,name:payment.selection__payment_provider_onboarding_wizard__payment_method__paypal #: model:ir.model.fields.selection,name:payment.selection__res_company__payment_onboarding_payment_method__paypal -#: model:ir.model.fields.selection,name:payment.selection__sale_payment_provider_onboarding_wizard__payment_method__paypal #: model:payment.provider,name:payment.payment_provider_paypal msgid "PayPal" msgstr "" @@ -1890,6 +1888,15 @@ msgid "" " Setting an email for this partner is advised." msgstr "" +#. module: payment +#. odoo-python +#: code:addons/payment/models/payment_method.py:0 +#, python-format +msgid "" +"This payment method needs a partner in crime; you should enable a payment " +"provider supporting this method first." +msgstr "" + #. module: payment #. odoo-python #: code:addons/payment/models/payment_transaction.py:0 @@ -2124,6 +2131,7 @@ msgstr "" #: model_terms:payment.provider,pending_msg:payment.payment_provider_sepa_direct_debit #: model_terms:payment.provider,pending_msg:payment.payment_provider_sips #: model_terms:payment.provider,pending_msg:payment.payment_provider_stripe +#: model_terms:payment.provider,pending_msg:payment.payment_provider_transfer #, python-format msgid "" "Your payment has been successfully processed but is waiting for approval." diff --git a/addons/payment/views/portal_templates.xml b/addons/payment/views/portal_templates.xml index 3db33042f23..cbdc5c9a370 100644 --- a/addons/payment/views/portal_templates.xml +++ b/addons/payment/views/portal_templates.xml @@ -64,7 +64,7 @@
    - Warning Make sure your are logged in as the + Warning Make sure you are logged in as the correct partner before making this payment.