[MERGE] forward port branch 13.0 up to f4105eb9c70

11 files changed, 261 insertions, 222 deletions

diff --git a/addons/project_timesheet_holidays/i18n/da.po b/addons/project_timesheet_holidays/i18n/da.po
index b6a2278a32e..8ac4d787793 100644
--- a/addons/project_timesheet_holidays/i18n/da.po
+++ b/addons/project_timesheet_holidays/i18n/da.po
@@ -1,20 +1,19 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
-# * project_timesheet_holidays
+# 	* project_timesheet_holidays
 # 
 # Translators:
-# Martin Trigaux, 2018
-# Ejner Sønniksen <ejner@vkdata.dk>, 2018
-# lhmflexerp <lhm@flexerp.dk>, 2018
-# Sanne Kristensen <sanne@vkdata.dk>, 2018
+# Martin Trigaux, 2019
+# Sanne Kristensen <sanne@vkdata.dk>, 2019
+# Ejner Sønniksen <ejner@vkdata.dk>, 2019
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server saas~11.5\n"
+"Project-Id-Version: Odoo Server saas~12.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-09-21 13:17+0000\n"
-"PO-Revision-Date: 2018-08-24 09:23+0000\n"
-"Last-Translator: Sanne Kristensen <sanne@vkdata.dk>, 2018\n"
+"POT-Creation-Date: 2019-08-26 08:17+0000\n"
+"PO-Revision-Date: 2019-08-26 09:13+0000\n"
+"Last-Translator: Ejner Sønniksen <ejner@vkdata.dk>, 2019\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,19 +24,20 @@ msgstr ""
 #. module: project_timesheet_holidays
 #: model:ir.model,name:project_timesheet_holidays.model_account_analytic_line
 msgid "Analytic Line"
-msgstr "Analytisk linie"
+msgstr "Analytisk linje"
 
 #. module: project_timesheet_holidays
 #: model:ir.model.fields,field_description:project_timesheet_holidays.field_hr_leave__timesheet_ids
 msgid "Analytic Lines"
-msgstr "Analyse linjer"
+msgstr "Analyselinjer"
 
 #. module: project_timesheet_holidays
-#: code:addons/project_timesheet_holidays/models/hr_holidays.py:38
+#: code:addons/project_timesheet_holidays/models/hr_holidays.py:0
 #, python-format
 msgid ""
-"Both the internal project and task are required to generate timesheet for "
-"the leaves."
+"Both the internal project and task are required to generate a timesheet for "
+"the time off. If you don't want a timesheet, you should leave the internal "
+"project and task empty."
 msgstr ""
 
 #. module: project_timesheet_holidays
@@ -53,39 +53,28 @@ msgstr "Konfigurer opsætning"
 #. module: project_timesheet_holidays
 #: model:ir.model.fields,help:project_timesheet_holidays.field_res_company__leave_timesheet_project_id
 #: model:ir.model.fields,help:project_timesheet_holidays.field_res_config_settings__leave_timesheet_project_id
-msgid "Default project value for timesheet generated from leave type."
+msgid "Default project value for timesheet generated from time off type."
 msgstr ""
 
 #. module: project_timesheet_holidays
 #: model:ir.model.fields,field_description:project_timesheet_holidays.field_hr_leave_type__timesheet_generate
 msgid "Generate Timesheet"
-msgstr "Generér Timeseddel"
+msgstr "Generér timeseddel"
 
 #. module: project_timesheet_holidays
 #: model:ir.model.fields,help:project_timesheet_holidays.field_hr_leave_type__timesheet_generate
 msgid ""
-"If checked, when validating a leave, timesheet will be generated in the "
+"If checked, when validating a time off, timesheet will be generated in the "
 "Vacation Project of the company."
 msgstr ""
 
 #. module: project_timesheet_holidays
-#: code:addons/project_timesheet_holidays/models/res_company.py:30
-#: model:ir.model.fields,field_description:project_timesheet_holidays.field_hr_leave_type__timesheet_project_id
+#: code:addons/project_timesheet_holidays/models/res_company.py:0
 #: model:ir.model.fields,field_description:project_timesheet_holidays.field_res_company__leave_timesheet_project_id
 #: model:ir.model.fields,field_description:project_timesheet_holidays.field_res_config_settings__leave_timesheet_project_id
 #, python-format
 msgid "Internal Project"
-msgstr "Internt Projekt"
-
-#. module: project_timesheet_holidays
-#: model:ir.model.fields,field_description:project_timesheet_holidays.field_hr_leave_type__timesheet_task_id
-msgid "Internal Task for timesheet"
-msgstr ""
-
-#. module: project_timesheet_holidays
-#: model:ir.model,name:project_timesheet_holidays.model_hr_leave
-msgid "Leave"
-msgstr "Ferie"
+msgstr "Internt projekt"
 
 #. module: project_timesheet_holidays
 #: model:ir.model.fields,field_description:project_timesheet_holidays.field_account_analytic_line__holiday_id
@@ -93,23 +82,7 @@ msgid "Leave Request"
 msgstr "Anmodning om ferie"
 
 #. module: project_timesheet_holidays
-#: model:ir.model.fields,field_description:project_timesheet_holidays.field_res_company__leave_timesheet_task_id
-#: model:ir.model.fields,field_description:project_timesheet_holidays.field_res_config_settings__leave_timesheet_task_id
-msgid "Leave Task"
-msgstr ""
-
-#. module: project_timesheet_holidays
-#: model:ir.model,name:project_timesheet_holidays.model_hr_leave_type
-msgid "Leave Type"
-msgstr "Type af ferie"
-
-#. module: project_timesheet_holidays
-#: code:addons/project_timesheet_holidays/models/res_company.py:40
-#, python-format
-msgid "Leaves"
-msgstr "Ferier"
-
-#. module: project_timesheet_holidays
+#: model:ir.model.fields,field_description:project_timesheet_holidays.field_hr_leave_type__timesheet_project_id
 #: model_terms:ir.ui.view,arch_db:project_timesheet_holidays.res_config_settings_view_form
 msgid "Project"
 msgstr "Projekt"
@@ -120,13 +93,48 @@ msgid "Task"
 msgstr "Opgave"
 
 #. module: project_timesheet_holidays
+#: model:ir.model.fields,field_description:project_timesheet_holidays.field_hr_leave_type__timesheet_task_id
+msgid "Task for timesheet"
+msgstr ""
+
+#. module: project_timesheet_holidays
+#: code:addons/project_timesheet_holidays/models/res_company.py:0
+#, python-format
+msgid "The Internal Project of a company should be in that company."
+msgstr ""
+
+#. module: project_timesheet_holidays
 #: model:ir.model.fields,help:project_timesheet_holidays.field_hr_leave_type__timesheet_project_id
 msgid ""
-"The project will contain the timesheet generated when a leave is validated."
+"The project will contain the timesheet generated when a time off is "
+"validated."
+msgstr ""
+
+#. module: project_timesheet_holidays
+#: code:addons/project_timesheet_holidays/models/res_company.py:0
+#: model:ir.model,name:project_timesheet_holidays.model_hr_leave
+#, python-format
+msgid "Time Off"
 msgstr ""
 
 #. module: project_timesheet_holidays
-#: code:addons/project_timesheet_holidays/models/account_analytic.py:16
+#: model:ir.model.fields,field_description:project_timesheet_holidays.field_res_company__leave_timesheet_task_id
+#: model:ir.model.fields,field_description:project_timesheet_holidays.field_res_config_settings__leave_timesheet_task_id
+msgid "Time Off Task"
+msgstr ""
+
+#. module: project_timesheet_holidays
+#: model:ir.model,name:project_timesheet_holidays.model_hr_leave_type
+msgid "Time Off Type"
+msgstr ""
+
+#. module: project_timesheet_holidays
+#: model_terms:ir.ui.view,arch_db:project_timesheet_holidays.hr_holiday_status_view_form_inherit
+msgid "Timesheet"
+msgstr "Tidsskema"
+
+#. module: project_timesheet_holidays
+#: code:addons/project_timesheet_holidays/models/account_analytic.py:0
 #, python-format
 msgid ""
 "You cannot delete timesheet lines attached to a leaves. Please cancel the "
diff --git a/addons/project_timesheet_holidays/i18n/es.po b/addons/project_timesheet_holidays/i18n/es.po
index 3b6069a1542..1413f6bb9ab 100644
--- a/addons/project_timesheet_holidays/i18n/es.po
+++ b/addons/project_timesheet_holidays/i18n/es.po
@@ -5,6 +5,7 @@
 # Translators:
 # Martin Trigaux, 2019
 # Cristopher Cravioto <ccr@odoo.com>, 2019
+# Jesse Garza <jga@odoo.com>, 2019
 # 
 msgid ""
 msgstr ""
@@ -12,7 +13,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-08-26 08:17+0000\n"
 "PO-Revision-Date: 2019-08-26 09:13+0000\n"
-"Last-Translator: Cristopher Cravioto <ccr@odoo.com>, 2019\n"
+"Last-Translator: Jesse Garza <jga@odoo.com>, 2019\n"
 "Language-Team: Spanish (https://www.transifex.com/odoo/teams/41243/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -114,7 +115,7 @@ msgstr ""
 #: model:ir.model,name:project_timesheet_holidays.model_hr_leave
 #, python-format
 msgid "Time Off"
-msgstr ""
+msgstr "Ausencias"
 
 #. module: project_timesheet_holidays
 #: model:ir.model.fields,field_description:project_timesheet_holidays.field_res_company__leave_timesheet_task_id
diff --git a/addons/project_timesheet_holidays/i18n/he.po b/addons/project_timesheet_holidays/i18n/he.po
index e1517770804..2f09633b48f 100644
--- a/addons/project_timesheet_holidays/i18n/he.po
+++ b/addons/project_timesheet_holidays/i18n/he.po
@@ -1,19 +1,19 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
-# * project_timesheet_holidays
+# 	* project_timesheet_holidays
 # 
 # Translators:
-# Martin Trigaux, 2018
-# Yihya Hugirat <hugirat@gmail.com>, 2018
-# hed shefetr <hed@laylinetech.com>, 2018
+# Martin Trigaux, 2019
+# Yihya Hugirat <hugirat@gmail.com>, 2019
+# hed shefetr <hed@laylinetech.com>, 2019
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server saas~11.5\n"
+"Project-Id-Version: Odoo Server saas~12.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-09-21 13:17+0000\n"
-"PO-Revision-Date: 2018-08-24 09:23+0000\n"
-"Last-Translator: hed shefetr <hed@laylinetech.com>, 2018\n"
+"POT-Creation-Date: 2019-08-26 08:17+0000\n"
+"PO-Revision-Date: 2019-08-26 09:13+0000\n"
+"Last-Translator: hed shefetr <hed@laylinetech.com>, 2019\n"
 "Language-Team: Hebrew (https://www.transifex.com/odoo/teams/41243/he/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -32,11 +32,12 @@ msgid "Analytic Lines"
 msgstr "שורות אנליטית"
 
 #. module: project_timesheet_holidays
-#: code:addons/project_timesheet_holidays/models/hr_holidays.py:38
+#: code:addons/project_timesheet_holidays/models/hr_holidays.py:0
 #, python-format
 msgid ""
-"Both the internal project and task are required to generate timesheet for "
-"the leaves."
+"Both the internal project and task are required to generate a timesheet for "
+"the time off. If you don't want a timesheet, you should leave the internal "
+"project and task empty."
 msgstr ""
 
 #. module: project_timesheet_holidays
@@ -52,7 +53,7 @@ msgstr "הגדרות תצורה"
 #. module: project_timesheet_holidays
 #: model:ir.model.fields,help:project_timesheet_holidays.field_res_company__leave_timesheet_project_id
 #: model:ir.model.fields,help:project_timesheet_holidays.field_res_config_settings__leave_timesheet_project_id
-msgid "Default project value for timesheet generated from leave type."
+msgid "Default project value for timesheet generated from time off type."
 msgstr ""
 
 #. module: project_timesheet_holidays
@@ -63,13 +64,12 @@ msgstr ""
 #. module: project_timesheet_holidays
 #: model:ir.model.fields,help:project_timesheet_holidays.field_hr_leave_type__timesheet_generate
 msgid ""
-"If checked, when validating a leave, timesheet will be generated in the "
+"If checked, when validating a time off, timesheet will be generated in the "
 "Vacation Project of the company."
 msgstr ""
 
 #. module: project_timesheet_holidays
-#: code:addons/project_timesheet_holidays/models/res_company.py:30
-#: model:ir.model.fields,field_description:project_timesheet_holidays.field_hr_leave_type__timesheet_project_id
+#: code:addons/project_timesheet_holidays/models/res_company.py:0
 #: model:ir.model.fields,field_description:project_timesheet_holidays.field_res_company__leave_timesheet_project_id
 #: model:ir.model.fields,field_description:project_timesheet_holidays.field_res_config_settings__leave_timesheet_project_id
 #, python-format
@@ -77,55 +77,64 @@ msgid "Internal Project"
 msgstr ""
 
 #. module: project_timesheet_holidays
-#: model:ir.model.fields,field_description:project_timesheet_holidays.field_hr_leave_type__timesheet_task_id
-msgid "Internal Task for timesheet"
+#: model:ir.model.fields,field_description:project_timesheet_holidays.field_account_analytic_line__holiday_id
+msgid "Leave Request"
 msgstr ""
 
 #. module: project_timesheet_holidays
-#: model:ir.model,name:project_timesheet_holidays.model_hr_leave
-msgid "Leave"
-msgstr ""
+#: model:ir.model.fields,field_description:project_timesheet_holidays.field_hr_leave_type__timesheet_project_id
+#: model_terms:ir.ui.view,arch_db:project_timesheet_holidays.res_config_settings_view_form
+msgid "Project"
+msgstr "פרוייקט"
 
 #. module: project_timesheet_holidays
-#: model:ir.model.fields,field_description:project_timesheet_holidays.field_account_analytic_line__holiday_id
-msgid "Leave Request"
+#: model_terms:ir.ui.view,arch_db:project_timesheet_holidays.res_config_settings_view_form
+msgid "Task"
+msgstr "משימה"
+
+#. module: project_timesheet_holidays
+#: model:ir.model.fields,field_description:project_timesheet_holidays.field_hr_leave_type__timesheet_task_id
+msgid "Task for timesheet"
 msgstr ""
 
 #. module: project_timesheet_holidays
-#: model:ir.model.fields,field_description:project_timesheet_holidays.field_res_company__leave_timesheet_task_id
-#: model:ir.model.fields,field_description:project_timesheet_holidays.field_res_config_settings__leave_timesheet_task_id
-msgid "Leave Task"
+#: code:addons/project_timesheet_holidays/models/res_company.py:0
+#, python-format
+msgid "The Internal Project of a company should be in that company."
 msgstr ""
 
 #. module: project_timesheet_holidays
-#: model:ir.model,name:project_timesheet_holidays.model_hr_leave_type
-msgid "Leave Type"
+#: model:ir.model.fields,help:project_timesheet_holidays.field_hr_leave_type__timesheet_project_id
+msgid ""
+"The project will contain the timesheet generated when a time off is "
+"validated."
 msgstr ""
 
 #. module: project_timesheet_holidays
-#: code:addons/project_timesheet_holidays/models/res_company.py:40
+#: code:addons/project_timesheet_holidays/models/res_company.py:0
+#: model:ir.model,name:project_timesheet_holidays.model_hr_leave
 #, python-format
-msgid "Leaves"
+msgid "Time Off"
 msgstr ""
 
 #. module: project_timesheet_holidays
-#: model_terms:ir.ui.view,arch_db:project_timesheet_holidays.res_config_settings_view_form
-msgid "Project"
-msgstr "פרוייקט"
+#: model:ir.model.fields,field_description:project_timesheet_holidays.field_res_company__leave_timesheet_task_id
+#: model:ir.model.fields,field_description:project_timesheet_holidays.field_res_config_settings__leave_timesheet_task_id
+msgid "Time Off Task"
+msgstr ""
 
 #. module: project_timesheet_holidays
-#: model_terms:ir.ui.view,arch_db:project_timesheet_holidays.res_config_settings_view_form
-msgid "Task"
-msgstr "משימה"
+#: model:ir.model,name:project_timesheet_holidays.model_hr_leave_type
+msgid "Time Off Type"
+msgstr ""
 
 #. module: project_timesheet_holidays
-#: model:ir.model.fields,help:project_timesheet_holidays.field_hr_leave_type__timesheet_project_id
-msgid ""
-"The project will contain the timesheet generated when a leave is validated."
+#: model_terms:ir.ui.view,arch_db:project_timesheet_holidays.hr_holiday_status_view_form_inherit
+msgid "Timesheet"
 msgstr ""
 
 #. module: project_timesheet_holidays
-#: code:addons/project_timesheet_holidays/models/account_analytic.py:16
+#: code:addons/project_timesheet_holidays/models/account_analytic.py:0
 #, python-format
 msgid ""
 "You cannot delete timesheet lines attached to a leaves. Please cancel the "
diff --git a/addons/project_timesheet_holidays/i18n/hr.po b/addons/project_timesheet_holidays/i18n/hr.po
index a1f8e01be41..fab681ff3f2 100644
--- a/addons/project_timesheet_holidays/i18n/hr.po
+++ b/addons/project_timesheet_holidays/i18n/hr.po
@@ -6,6 +6,7 @@
 # Martin Trigaux, 2019
 # Bole <bole@dajmi5.com>, 2019
 # Vladimir Olujić <olujic.vladimir@storm.hr>, 2019
+# Milan Tribuson <one.mile.code@gmail.com>, 2019
 # 
 msgid ""
 msgstr ""
@@ -13,7 +14,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-08-26 08:17+0000\n"
 "PO-Revision-Date: 2019-08-26 09:13+0000\n"
-"Last-Translator: Vladimir Olujić <olujic.vladimir@storm.hr>, 2019\n"
+"Last-Translator: Milan Tribuson <one.mile.code@gmail.com>, 2019\n"
 "Language-Team: Croatian (https://www.transifex.com/odoo/teams/41243/hr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -115,7 +116,7 @@ msgstr ""
 #: model:ir.model,name:project_timesheet_holidays.model_hr_leave
 #, python-format
 msgid "Time Off"
-msgstr ""
+msgstr "Odsustva"
 
 #. module: project_timesheet_holidays
 #: model:ir.model.fields,field_description:project_timesheet_holidays.field_res_company__leave_timesheet_task_id
@@ -126,7 +127,7 @@ msgstr ""
 #. module: project_timesheet_holidays
 #: model:ir.model,name:project_timesheet_holidays.model_hr_leave_type
 msgid "Time Off Type"
-msgstr ""
+msgstr "Vrsta odsustva"
 
 #. module: project_timesheet_holidays
 #: model_terms:ir.ui.view,arch_db:project_timesheet_holidays.hr_holiday_status_view_form_inherit
diff --git a/addons/project_timesheet_holidays/i18n/it.po b/addons/project_timesheet_holidays/i18n/it.po
index 7ad2ed48ca9..5fd7cba4ffa 100644
--- a/addons/project_timesheet_holidays/i18n/it.po
+++ b/addons/project_timesheet_holidays/i18n/it.po
@@ -3,9 +3,9 @@
 # 	* project_timesheet_holidays
 # 
 # Translators:
-# Sergio Zanchetta <primes2h@gmail.com>, 2019
 # Martin Trigaux, 2019
 # Léonie Bouchat <lbo@odoo.com>, 2019
+# Sergio Zanchetta <primes2h@gmail.com>, 2019
 # 
 msgid ""
 msgstr ""
@@ -13,7 +13,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-08-26 08:17+0000\n"
 "PO-Revision-Date: 2019-08-26 09:13+0000\n"
-"Last-Translator: Léonie Bouchat <lbo@odoo.com>, 2019\n"
+"Last-Translator: Sergio Zanchetta <primes2h@gmail.com>, 2019\n"
 "Language-Team: Italian (https://www.transifex.com/odoo/teams/41243/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -115,18 +115,18 @@ msgstr ""
 #: model:ir.model,name:project_timesheet_holidays.model_hr_leave
 #, python-format
 msgid "Time Off"
-msgstr ""
+msgstr "Ferie"
 
 #. module: project_timesheet_holidays
 #: model:ir.model.fields,field_description:project_timesheet_holidays.field_res_company__leave_timesheet_task_id
 #: model:ir.model.fields,field_description:project_timesheet_holidays.field_res_config_settings__leave_timesheet_task_id
 msgid "Time Off Task"
-msgstr ""
+msgstr "Lavoro ferie"
 
 #. module: project_timesheet_holidays
 #: model:ir.model,name:project_timesheet_holidays.model_hr_leave_type
 msgid "Time Off Type"
-msgstr ""
+msgstr "Tipologia ferie"
 
 #. module: project_timesheet_holidays
 #: model_terms:ir.ui.view,arch_db:project_timesheet_holidays.hr_holiday_status_view_form_inherit
diff --git a/addons/project_timesheet_holidays/i18n/pt.po b/addons/project_timesheet_holidays/i18n/pt.po
index 159a1760b8b..184d93880f0 100644
--- a/addons/project_timesheet_holidays/i18n/pt.po
+++ b/addons/project_timesheet_holidays/i18n/pt.po
@@ -1,19 +1,13 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
-# * project_timesheet_holidays
+# 	* project_timesheet_holidays
 # 
-# Translators:
-# Martin Trigaux, 2018
-# MS, 2018
-# Nuno Silva <nuno.silva@arxi.pt>, 2018
-# Diogo Fonseca <dsf@thinkopensolutions.pt>, 2018
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server saas~11.5\n"
+"Project-Id-Version: Odoo Server saas~12.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-09-21 13:17+0000\n"
-"PO-Revision-Date: 2018-09-21 13:17+0000\n"
-"Last-Translator: Diogo Fonseca <dsf@thinkopensolutions.pt>, 2018\n"
+"POT-Creation-Date: 2019-08-26 08:17+0000\n"
+"PO-Revision-Date: 2019-08-26 09:13+0000\n"
 "Language-Team: Portuguese (https://www.transifex.com/odoo/teams/41243/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,52 +18,52 @@ msgstr ""
 #. module: project_timesheet_holidays
 #: model:ir.model,name:project_timesheet_holidays.model_account_analytic_line
 msgid "Analytic Line"
-msgstr "Linha de Analítica"
+msgstr ""
 
 #. module: project_timesheet_holidays
 #: model:ir.model.fields,field_description:project_timesheet_holidays.field_hr_leave__timesheet_ids
 msgid "Analytic Lines"
-msgstr "Linhas de Analítica"
+msgstr ""
 
 #. module: project_timesheet_holidays
-#: code:addons/project_timesheet_holidays/models/hr_holidays.py:38
+#: code:addons/project_timesheet_holidays/models/hr_holidays.py:0
 #, python-format
 msgid ""
-"Both the internal project and task are required to generate timesheet for "
-"the leaves."
+"Both the internal project and task are required to generate a timesheet for "
+"the time off. If you don't want a timesheet, you should leave the internal "
+"project and task empty."
 msgstr ""
 
 #. module: project_timesheet_holidays
 #: model:ir.model,name:project_timesheet_holidays.model_res_company
 msgid "Companies"
-msgstr "Empresas"
+msgstr ""
 
 #. module: project_timesheet_holidays
 #: model:ir.model,name:project_timesheet_holidays.model_res_config_settings
 msgid "Config Settings"
-msgstr "config configurações"
+msgstr ""
 
 #. module: project_timesheet_holidays
 #: model:ir.model.fields,help:project_timesheet_holidays.field_res_company__leave_timesheet_project_id
 #: model:ir.model.fields,help:project_timesheet_holidays.field_res_config_settings__leave_timesheet_project_id
-msgid "Default project value for timesheet generated from leave type."
+msgid "Default project value for timesheet generated from time off type."
 msgstr ""
 
 #. module: project_timesheet_holidays
 #: model:ir.model.fields,field_description:project_timesheet_holidays.field_hr_leave_type__timesheet_generate
 msgid "Generate Timesheet"
-msgstr "Gerar Registo de Horas"
+msgstr ""
 
 #. module: project_timesheet_holidays
 #: model:ir.model.fields,help:project_timesheet_holidays.field_hr_leave_type__timesheet_generate
 msgid ""
-"If checked, when validating a leave, timesheet will be generated in the "
+"If checked, when validating a time off, timesheet will be generated in the "
 "Vacation Project of the company."
 msgstr ""
 
 #. module: project_timesheet_holidays
-#: code:addons/project_timesheet_holidays/models/res_company.py:30
-#: model:ir.model.fields,field_description:project_timesheet_holidays.field_hr_leave_type__timesheet_project_id
+#: code:addons/project_timesheet_holidays/models/res_company.py:0
 #: model:ir.model.fields,field_description:project_timesheet_holidays.field_res_company__leave_timesheet_project_id
 #: model:ir.model.fields,field_description:project_timesheet_holidays.field_res_config_settings__leave_timesheet_project_id
 #, python-format
@@ -77,55 +71,64 @@ msgid "Internal Project"
 msgstr ""
 
 #. module: project_timesheet_holidays
-#: model:ir.model.fields,field_description:project_timesheet_holidays.field_hr_leave_type__timesheet_task_id
-msgid "Internal Task for timesheet"
-msgstr "Tarefa interna para o registo de horas"
+#: model:ir.model.fields,field_description:project_timesheet_holidays.field_account_analytic_line__holiday_id
+msgid "Leave Request"
+msgstr ""
 
 #. module: project_timesheet_holidays
-#: model:ir.model,name:project_timesheet_holidays.model_hr_leave
-msgid "Leave"
-msgstr "Baixa"
+#: model:ir.model.fields,field_description:project_timesheet_holidays.field_hr_leave_type__timesheet_project_id
+#: model_terms:ir.ui.view,arch_db:project_timesheet_holidays.res_config_settings_view_form
+msgid "Project"
+msgstr ""
 
 #. module: project_timesheet_holidays
-#: model:ir.model.fields,field_description:project_timesheet_holidays.field_account_analytic_line__holiday_id
-msgid "Leave Request"
-msgstr "Pedido de Ausência"
+#: model_terms:ir.ui.view,arch_db:project_timesheet_holidays.res_config_settings_view_form
+msgid "Task"
+msgstr ""
 
 #. module: project_timesheet_holidays
-#: model:ir.model.fields,field_description:project_timesheet_holidays.field_res_company__leave_timesheet_task_id
-#: model:ir.model.fields,field_description:project_timesheet_holidays.field_res_config_settings__leave_timesheet_task_id
-msgid "Leave Task"
-msgstr "Tarefa de Ausência"
+#: model:ir.model.fields,field_description:project_timesheet_holidays.field_hr_leave_type__timesheet_task_id
+msgid "Task for timesheet"
+msgstr ""
 
 #. module: project_timesheet_holidays
-#: model:ir.model,name:project_timesheet_holidays.model_hr_leave_type
-msgid "Leave Type"
-msgstr "Tipo de Ausência"
+#: code:addons/project_timesheet_holidays/models/res_company.py:0
+#, python-format
+msgid "The Internal Project of a company should be in that company."
+msgstr ""
 
 #. module: project_timesheet_holidays
-#: code:addons/project_timesheet_holidays/models/res_company.py:40
+#: model:ir.model.fields,help:project_timesheet_holidays.field_hr_leave_type__timesheet_project_id
+msgid ""
+"The project will contain the timesheet generated when a time off is "
+"validated."
+msgstr ""
+
+#. module: project_timesheet_holidays
+#: code:addons/project_timesheet_holidays/models/res_company.py:0
+#: model:ir.model,name:project_timesheet_holidays.model_hr_leave
 #, python-format
-msgid "Leaves"
-msgstr "Ausências"
+msgid "Time Off"
+msgstr ""
 
 #. module: project_timesheet_holidays
-#: model_terms:ir.ui.view,arch_db:project_timesheet_holidays.res_config_settings_view_form
-msgid "Project"
-msgstr "Projeto"
+#: model:ir.model.fields,field_description:project_timesheet_holidays.field_res_company__leave_timesheet_task_id
+#: model:ir.model.fields,field_description:project_timesheet_holidays.field_res_config_settings__leave_timesheet_task_id
+msgid "Time Off Task"
+msgstr ""
 
 #. module: project_timesheet_holidays
-#: model_terms:ir.ui.view,arch_db:project_timesheet_holidays.res_config_settings_view_form
-msgid "Task"
-msgstr "Tarefa"
+#: model:ir.model,name:project_timesheet_holidays.model_hr_leave_type
+msgid "Time Off Type"
+msgstr ""
 
 #. module: project_timesheet_holidays
-#: model:ir.model.fields,help:project_timesheet_holidays.field_hr_leave_type__timesheet_project_id
-msgid ""
-"The project will contain the timesheet generated when a leave is validated."
+#: model_terms:ir.ui.view,arch_db:project_timesheet_holidays.hr_holiday_status_view_form_inherit
+msgid "Timesheet"
 msgstr ""
 
 #. module: project_timesheet_holidays
-#: code:addons/project_timesheet_holidays/models/account_analytic.py:16
+#: code:addons/project_timesheet_holidays/models/account_analytic.py:0
 #, python-format
 msgid ""
 "You cannot delete timesheet lines attached to a leaves. Please cancel the "
diff --git a/addons/project_timesheet_holidays/i18n/ro.po b/addons/project_timesheet_holidays/i18n/ro.po
index 65f6cbd2640..ad4461f2c65 100644
--- a/addons/project_timesheet_holidays/i18n/ro.po
+++ b/addons/project_timesheet_holidays/i18n/ro.po
@@ -1,16 +1,13 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
-# * project_timesheet_holidays
+# 	* project_timesheet_holidays
 # 
-# Translators:
-# Martin Trigaux, 2018
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server saas~11.5\n"
+"Project-Id-Version: Odoo Server saas~12.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-09-21 13:17+0000\n"
-"PO-Revision-Date: 2018-09-21 13:17+0000\n"
-"Last-Translator: Martin Trigaux, 2018\n"
+"POT-Creation-Date: 2019-08-26 08:17+0000\n"
+"PO-Revision-Date: 2019-08-26 09:13+0000\n"
 "Language-Team: Romanian (https://www.transifex.com/odoo/teams/41243/ro/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,25 +18,26 @@ msgstr ""
 #. module: project_timesheet_holidays
 #: model:ir.model,name:project_timesheet_holidays.model_account_analytic_line
 msgid "Analytic Line"
-msgstr "Linie analitica"
+msgstr ""
 
 #. module: project_timesheet_holidays
 #: model:ir.model.fields,field_description:project_timesheet_holidays.field_hr_leave__timesheet_ids
 msgid "Analytic Lines"
-msgstr "Linii Analitice"
+msgstr ""
 
 #. module: project_timesheet_holidays
-#: code:addons/project_timesheet_holidays/models/hr_holidays.py:38
+#: code:addons/project_timesheet_holidays/models/hr_holidays.py:0
 #, python-format
 msgid ""
-"Both the internal project and task are required to generate timesheet for "
-"the leaves."
+"Both the internal project and task are required to generate a timesheet for "
+"the time off. If you don't want a timesheet, you should leave the internal "
+"project and task empty."
 msgstr ""
 
 #. module: project_timesheet_holidays
 #: model:ir.model,name:project_timesheet_holidays.model_res_company
 msgid "Companies"
-msgstr "Companii"
+msgstr ""
 
 #. module: project_timesheet_holidays
 #: model:ir.model,name:project_timesheet_holidays.model_res_config_settings
@@ -49,7 +47,7 @@ msgstr ""
 #. module: project_timesheet_holidays
 #: model:ir.model.fields,help:project_timesheet_holidays.field_res_company__leave_timesheet_project_id
 #: model:ir.model.fields,help:project_timesheet_holidays.field_res_config_settings__leave_timesheet_project_id
-msgid "Default project value for timesheet generated from leave type."
+msgid "Default project value for timesheet generated from time off type."
 msgstr ""
 
 #. module: project_timesheet_holidays
@@ -60,13 +58,12 @@ msgstr ""
 #. module: project_timesheet_holidays
 #: model:ir.model.fields,help:project_timesheet_holidays.field_hr_leave_type__timesheet_generate
 msgid ""
-"If checked, when validating a leave, timesheet will be generated in the "
+"If checked, when validating a time off, timesheet will be generated in the "
 "Vacation Project of the company."
 msgstr ""
 
 #. module: project_timesheet_holidays
-#: code:addons/project_timesheet_holidays/models/res_company.py:30
-#: model:ir.model.fields,field_description:project_timesheet_holidays.field_hr_leave_type__timesheet_project_id
+#: code:addons/project_timesheet_holidays/models/res_company.py:0
 #: model:ir.model.fields,field_description:project_timesheet_holidays.field_res_company__leave_timesheet_project_id
 #: model:ir.model.fields,field_description:project_timesheet_holidays.field_res_config_settings__leave_timesheet_project_id
 #, python-format
@@ -74,55 +71,64 @@ msgid "Internal Project"
 msgstr ""
 
 #. module: project_timesheet_holidays
-#: model:ir.model.fields,field_description:project_timesheet_holidays.field_hr_leave_type__timesheet_task_id
-msgid "Internal Task for timesheet"
+#: model:ir.model.fields,field_description:project_timesheet_holidays.field_account_analytic_line__holiday_id
+msgid "Leave Request"
 msgstr ""
 
 #. module: project_timesheet_holidays
-#: model:ir.model,name:project_timesheet_holidays.model_hr_leave
-msgid "Leave"
-msgstr "Părăsește"
+#: model:ir.model.fields,field_description:project_timesheet_holidays.field_hr_leave_type__timesheet_project_id
+#: model_terms:ir.ui.view,arch_db:project_timesheet_holidays.res_config_settings_view_form
+msgid "Project"
+msgstr ""
 
 #. module: project_timesheet_holidays
-#: model:ir.model.fields,field_description:project_timesheet_holidays.field_account_analytic_line__holiday_id
-msgid "Leave Request"
-msgstr "Cerere de concediu"
+#: model_terms:ir.ui.view,arch_db:project_timesheet_holidays.res_config_settings_view_form
+msgid "Task"
+msgstr ""
 
 #. module: project_timesheet_holidays
-#: model:ir.model.fields,field_description:project_timesheet_holidays.field_res_company__leave_timesheet_task_id
-#: model:ir.model.fields,field_description:project_timesheet_holidays.field_res_config_settings__leave_timesheet_task_id
-msgid "Leave Task"
+#: model:ir.model.fields,field_description:project_timesheet_holidays.field_hr_leave_type__timesheet_task_id
+msgid "Task for timesheet"
 msgstr ""
 
 #. module: project_timesheet_holidays
-#: model:ir.model,name:project_timesheet_holidays.model_hr_leave_type
-msgid "Leave Type"
-msgstr "Tipul plecării"
+#: code:addons/project_timesheet_holidays/models/res_company.py:0
+#, python-format
+msgid "The Internal Project of a company should be in that company."
+msgstr ""
+
+#. module: project_timesheet_holidays
+#: model:ir.model.fields,help:project_timesheet_holidays.field_hr_leave_type__timesheet_project_id
+msgid ""
+"The project will contain the timesheet generated when a time off is "
+"validated."
+msgstr ""
 
 #. module: project_timesheet_holidays
-#: code:addons/project_timesheet_holidays/models/res_company.py:40
+#: code:addons/project_timesheet_holidays/models/res_company.py:0
+#: model:ir.model,name:project_timesheet_holidays.model_hr_leave
 #, python-format
-msgid "Leaves"
-msgstr "Libere"
+msgid "Time Off"
+msgstr ""
 
 #. module: project_timesheet_holidays
-#: model_terms:ir.ui.view,arch_db:project_timesheet_holidays.res_config_settings_view_form
-msgid "Project"
-msgstr "Proiect"
+#: model:ir.model.fields,field_description:project_timesheet_holidays.field_res_company__leave_timesheet_task_id
+#: model:ir.model.fields,field_description:project_timesheet_holidays.field_res_config_settings__leave_timesheet_task_id
+msgid "Time Off Task"
+msgstr ""
 
 #. module: project_timesheet_holidays
-#: model_terms:ir.ui.view,arch_db:project_timesheet_holidays.res_config_settings_view_form
-msgid "Task"
-msgstr "Sarcină"
+#: model:ir.model,name:project_timesheet_holidays.model_hr_leave_type
+msgid "Time Off Type"
+msgstr ""
 
 #. module: project_timesheet_holidays
-#: model:ir.model.fields,help:project_timesheet_holidays.field_hr_leave_type__timesheet_project_id
-msgid ""
-"The project will contain the timesheet generated when a leave is validated."
+#: model_terms:ir.ui.view,arch_db:project_timesheet_holidays.hr_holiday_status_view_form_inherit
+msgid "Timesheet"
 msgstr ""
 
 #. module: project_timesheet_holidays
-#: code:addons/project_timesheet_holidays/models/account_analytic.py:16
+#: code:addons/project_timesheet_holidays/models/account_analytic.py:0
 #, python-format
 msgid ""
 "You cannot delete timesheet lines attached to a leaves. Please cancel the "
diff --git a/addons/project_timesheet_holidays/i18n/tr.po b/addons/project_timesheet_holidays/i18n/tr.po
index bfb81c7281e..608df89c3b4 100644
--- a/addons/project_timesheet_holidays/i18n/tr.po
+++ b/addons/project_timesheet_holidays/i18n/tr.po
@@ -3,11 +3,11 @@
 # 	* project_timesheet_holidays
 # 
 # Translators:
-# Ediz Duman <neps1192@gmail.com>, 2019
 # Martin Trigaux, 2019
 # Murat Kaplan <muratk@projetgrup.com>, 2019
 # Umur Akın <umura@projetgrup.com>, 2019
 # Buket Şeker <buket_skr@hotmail.com>, 2019
+# Ediz Duman <neps1192@gmail.com>, 2019
 # 
 msgid ""
 msgstr ""
@@ -15,7 +15,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-08-26 08:17+0000\n"
 "PO-Revision-Date: 2019-08-26 09:13+0000\n"
-"Last-Translator: Buket Şeker <buket_skr@hotmail.com>, 2019\n"
+"Last-Translator: Ediz Duman <neps1192@gmail.com>, 2019\n"
 "Language-Team: Turkish (https://www.transifex.com/odoo/teams/41243/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -117,7 +117,7 @@ msgstr ""
 #: model:ir.model,name:project_timesheet_holidays.model_hr_leave
 #, python-format
 msgid "Time Off"
-msgstr ""
+msgstr "İzinler"
 
 #. module: project_timesheet_holidays
 #: model:ir.model.fields,field_description:project_timesheet_holidays.field_res_company__leave_timesheet_task_id
@@ -128,7 +128,7 @@ msgstr ""
 #. module: project_timesheet_holidays
 #: model:ir.model,name:project_timesheet_holidays.model_hr_leave_type
 msgid "Time Off Type"
-msgstr ""
+msgstr "İzin Türü"
 
 #. module: project_timesheet_holidays
 #: model_terms:ir.ui.view,arch_db:project_timesheet_holidays.hr_holiday_status_view_form_inherit
diff --git a/addons/project_timesheet_holidays/i18n/uk.po b/addons/project_timesheet_holidays/i18n/uk.po
index 465e954fca2..44a3ace8a84 100644
--- a/addons/project_timesheet_holidays/i18n/uk.po
+++ b/addons/project_timesheet_holidays/i18n/uk.po
@@ -38,6 +38,9 @@ msgid ""
 "the time off. If you don't want a timesheet, you should leave the internal "
 "project and task empty."
 msgstr ""
+"Обидва внутрішні проекти та завдання вимагають створення табелів для "
+"відпусток. Якщо ви не хочете табель, вам необхідно залишити внутрішній "
+"проект та завдання пустими."
 
 #. module: project_timesheet_holidays
 #: model:ir.model,name:project_timesheet_holidays.model_res_company
@@ -103,7 +106,7 @@ msgstr "Завдання для табеля"
 #: code:addons/project_timesheet_holidays/models/res_company.py:0
 #, python-format
 msgid "The Internal Project of a company should be in that company."
-msgstr ""
+msgstr "Внутрішній проект компанії повинен бути у тій же компанії."
 
 #. module: project_timesheet_holidays
 #: model:ir.model.fields,help:project_timesheet_holidays.field_hr_leave_type__timesheet_project_id
diff --git a/addons/project_timesheet_holidays/i18n/zh_CN.po b/addons/project_timesheet_holidays/i18n/zh_CN.po
index f89451b6f51..982ed5304a0 100644
--- a/addons/project_timesheet_holidays/i18n/zh_CN.po
+++ b/addons/project_timesheet_holidays/i18n/zh_CN.po
@@ -6,6 +6,7 @@
 # Martin Trigaux, 2019
 # Jeffery CHEN <jeffery9@gmail.com>, 2019
 # inspur qiuguodong <qiuguodong@inspur.com>, 2019
+# Felix Yuen <fyu@odoo.com>, 2019
 # 
 msgid ""
 msgstr ""
@@ -13,7 +14,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-08-26 08:17+0000\n"
 "PO-Revision-Date: 2019-08-26 09:13+0000\n"
-"Last-Translator: inspur qiuguodong <qiuguodong@inspur.com>, 2019\n"
+"Last-Translator: Felix Yuen <fyu@odoo.com>, 2019\n"
 "Language-Team: Chinese (China) (https://www.transifex.com/odoo/teams/41243/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -38,7 +39,7 @@ msgid ""
 "Both the internal project and task are required to generate a timesheet for "
 "the time off. If you don't want a timesheet, you should leave the internal "
 "project and task empty."
-msgstr ""
+msgstr "内部项目和任务都需要生成关闭时间的时间表。如果您不想要时间表，则应将内部项目和任务留空。"
 
 #. module: project_timesheet_holidays
 #: model:ir.model,name:project_timesheet_holidays.model_res_company
@@ -115,7 +116,7 @@ msgstr ""
 #: model:ir.model,name:project_timesheet_holidays.model_hr_leave
 #, python-format
 msgid "Time Off"
-msgstr ""
+msgstr "休息时间"
 
 #. module: project_timesheet_holidays
 #: model:ir.model.fields,field_description:project_timesheet_holidays.field_res_company__leave_timesheet_task_id
@@ -126,7 +127,7 @@ msgstr ""
 #. module: project_timesheet_holidays
 #: model:ir.model,name:project_timesheet_holidays.model_hr_leave_type
 msgid "Time Off Type"
-msgstr ""
+msgstr "休假类型"
 
 #. module: project_timesheet_holidays
 #: model_terms:ir.ui.view,arch_db:project_timesheet_holidays.hr_holiday_status_view_form_inherit
diff --git a/addons/project_timesheet_holidays/models/hr_holidays.py b/addons/project_timesheet_holidays/models/hr_holidays.py
index fc4c60b9a89..03c061ebbef 100644
--- a/addons/project_timesheet_holidays/models/hr_holidays.py
+++ b/addons/project_timesheet_holidays/models/hr_holidays.py
@@ -65,29 +65,36 @@ class Holidays(models.Model):
                 lambda request: request.holiday_type == 'employee' and
                                 request.holiday_status_id.timesheet_project_id and
                                 request.holiday_status_id.timesheet_task_id):
-            holiday_project = holiday.holiday_status_id.timesheet_project_id
-            holiday_task = holiday.holiday_status_id.timesheet_task_id
-
-            work_hours_data = holiday.employee_id.list_work_time_per_day(
-                fields.Datetime.from_string(holiday.date_from),
-                fields.Datetime.from_string(holiday.date_to),
-            )
-            for index, (day_date, work_hours_count) in enumerate(work_hours_data):
-                self.env['account.analytic.line'].sudo().create({
-                    'name': "%s (%s/%s)" % (holiday.name or '', index + 1, len(work_hours_data)),
-                    'project_id': holiday_project.id,
-                    'task_id': holiday_task.id,
-                    'account_id': holiday_project.analytic_account_id.id,
-                    'unit_amount': work_hours_count,
-                    'user_id': holiday.employee_id.user_id.id,
-                    'date': fields.Date.to_string(day_date),
-                    'holiday_id': holiday.id,
-                    'employee_id': holiday.employee_id.id,
-                    'company_id': holiday_task.company_id.id or holiday_project.company_id.id,
-                })
+            holiday._timesheet_create_lines()
 
         return super(Holidays, self)._validate_leave_request()
 
+    def _timesheet_create_lines(self):
+        self.ensure_one()
+        work_hours_data = self.employee_id.list_work_time_per_day(
+            self.date_from,
+            self.date_to,
+        )
+        timesheets = self.env['account.analytic.line']
+        for index, (day_date, work_hours_count) in enumerate(work_hours_data):
+            timesheets |= self.env['account.analytic.line'].sudo().create(self._timesheet_prepare_line_values(index, work_hours_data, day_date, work_hours_count))
+        return timesheets
+
+    def _timesheet_prepare_line_values(self, index, work_hours_data, day_date, work_hours_count):
+        self.ensure_one()
+        return {
+            'name': "%s (%s/%s)" % (self.holiday_status_id.name or '', index + 1, len(work_hours_data)),
+            'project_id': self.holiday_status_id.timesheet_project_id.id,
+            'task_id': self.holiday_status_id.timesheet_task_id.id,
+            'account_id': self.holiday_status_id.timesheet_project_id.analytic_account_id.id,
+            'unit_amount': work_hours_count,
+            'user_id': self.employee_id.user_id.id,
+            'date': day_date,
+            'holiday_id': self.id,
+            'employee_id': self.employee_id.id,
+            'company_id': self.holiday_status_id.timesheet_task_id.company_id.id or self.holiday_status_id.timesheet_project_id.company_id.id,
+        }
+
     def action_refuse(self):
         """ Remove the timesheets linked to the refused holidays """
         result = super(Holidays, self).action_refuse()