From c9d08fb3ef86d5cb074634a898696bd80e8b11e8 Mon Sep 17 00:00:00 2001 From: Jorge Pinna Puissant Date: Tue, 19 Nov 2019 11:13:21 +0000 Subject: [PATCH] [FIX] sale_timesheet: remove key from translation terms Before this commit, the key from the sales_timesheet.progressbar was in the translation terms, if one of this was translated, then an error was raised, the translated key wasn't expected into the function. Now, only the labels can be translated. opw-2123570 closes odoo/odoo#40541 X-original-commit: 8b4a647c94a4ec334327de72af9594a8de183006 Signed-off-by: Jorge Pinna Puissant (jpp) --- addons/sale_timesheet/i18n/sale_timesheet.pot | 25 ------------------- .../views/hr_timesheet_templates.xml | 10 ++++---- 2 files changed, 5 insertions(+), 30 deletions(-) diff --git a/addons/sale_timesheet/i18n/sale_timesheet.pot b/addons/sale_timesheet/i18n/sale_timesheet.pot index ffeed107029..b766f701f9d 100644 --- a/addons/sale_timesheet/i18n/sale_timesheet.pot +++ b/addons/sale_timesheet/i18n/sale_timesheet.pot @@ -1339,28 +1339,3 @@ msgstr "" msgid "" "You have to unlink the task from the sale order item in order to delete it." msgstr "" - -#. module: sale_timesheet -#: model_terms:ir.ui.view,arch_db:sale_timesheet.timesheet_plan -msgid "billable_fixed" -msgstr "" - -#. module: sale_timesheet -#: model_terms:ir.ui.view,arch_db:sale_timesheet.timesheet_plan -msgid "billable_time" -msgstr "" - -#. module: sale_timesheet -#: model_terms:ir.ui.view,arch_db:sale_timesheet.timesheet_plan -msgid "canceled" -msgstr "" - -#. module: sale_timesheet -#: model_terms:ir.ui.view,arch_db:sale_timesheet.timesheet_plan -msgid "non_billable" -msgstr "" - -#. module: sale_timesheet -#: model_terms:ir.ui.view,arch_db:sale_timesheet.timesheet_plan -msgid "non_billable_project" -msgstr "" diff --git a/addons/sale_timesheet/views/hr_timesheet_templates.xml b/addons/sale_timesheet/views/hr_timesheet_templates.xml index 858239ebd0a..1c65ecfbc07 100644 --- a/addons/sale_timesheet/views/hr_timesheet_templates.xml +++ b/addons/sale_timesheet/views/hr_timesheet_templates.xml @@ -236,23 +236,23 @@ Billed on Timesheets - billable_time + billable_time Billed at a Fixed price - billable_fixed + billable_fixed No task found - non_billable_project + non_billable_project Non billable tasks - non_billable + non_billable Cancelled - canceled + canceled