pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] hr_timesheet: fix traceback in portal view

Browse Source 
Opening the task portal view while having the timesheet encoding in days
and having no timesheets linked to the viewed task would cause a
traceback.

This was caused by an index out of range exception.
The function called has been changed to a `api.model` function instead
and all calls have been changed to be compliant with that change.

Closes: odoo/odoo#75452

Task ID: 2630244

Signed-off-by: Yannick Tivisse (yti) <yti@odoo.com>
This commit is contained in:
William Braeckman
2021-08-30 21:05:23 +00:00
parent 2cb659aa7c
commit 96bd3e4dc9
5 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/hr_timesheet/models/hr_timesheet.py
+1
View File
@@ -238,6 +238,7 @@ class AccountAnalyticLine(models.Model):
company_uom = self.env.company.timesheet_encode_uom_id
return company_uom == self.env.ref('uom.product_uom_day')
@api.model
def _convert_hours_to_days(self, time):
uom_hour = self.env.ref('uom.product_uom_hour')
uom_day = self.env.ref('uom.product_uom_day')
addons/hr_timesheet/models/project.py
+1
View File
@@ -325,6 +325,7 @@ class Task(models.Model):
warning_msg, self.env.ref('hr_timesheet.timesheet_action_task').id,
_('See timesheet entries'), {'active_ids': tasks_with_timesheets.ids})
@api.model
def _convert_hours_to_days(self, time):
uom_hour = self.env.ref('uom.product_uom_hour')
uom_day = self.env.ref('uom.product_uom_day')
addons/hr_timesheet/views/hr_timesheet_portal_templates.xml
+5 -5
View File
@@ -45,7 +45,7 @@
</th>
<th colspan="1" class="text-right text-muted">
<t t-if="is_uom_day">
Total: <span class="text-muted" t-esc="timesheets[0]._convert_hours_to_days(hours_spent)" t-options='{"widget": "timesheet_uom"}'/>
Total: <span class="text-muted" t-esc="timesheets._convert_hours_to_days(hours_spent)" t-options='{"widget": "timesheet_uom"}'/>
</t>
<t t-else="">
Total: <span class="text-muted" t-esc="hours_spent" t-options='{"widget": "float_time"}'/>
@@ -59,7 +59,7 @@
</th>
<th colspan="1" class="text-right text-muted">
<t t-if="is_uom_day">
Total: <span t-esc="timesheets[0]._convert_hours_to_days(hours_spent)" t-options='{"widget": "timesheet_uom"}'/>
Total: <span t-esc="timesheets._convert_hours_to_days(hours_spent)" t-options='{"widget": "timesheet_uom"}'/>
</t>
<t t-else="">
Total: <span t-esc="hours_spent" t-options='{"widget": "float_time"}'/>
@@ -73,7 +73,7 @@
</th>
<th colspan="1" class="text-right text-muted">
<t t-if="is_uom_day">
Total: <span t-esc="timesheets[0]._convert_hours_to_days(hours_spent)" t-options='{"widget": "timesheet_uom"}'/>
Total: <span t-esc="timesheets._convert_hours_to_days(hours_spent)" t-options='{"widget": "timesheet_uom"}'/>
</t>
<t t-else="">
Total: <span t-esc="hours_spent" t-options='{"widget": "float_time"}'/>
@@ -87,7 +87,7 @@
</th>
<th colspan="1" class="text-right text-muted">
<t t-if="is_uom_day">
Total: <span t-esc="timesheets[0]._convert_hours_to_days(hours_spent)" t-options='{"widget": "timesheet_uom"}'/>
Total: <span t-esc="timesheets._convert_hours_to_days(hours_spent)" t-options='{"widget": "timesheet_uom"}'/>
</t>
<t t-else="">
Total: <span t-esc="hours_spent" t-options='{"widget": "float_time"}'/>
@@ -98,7 +98,7 @@
<tr t-else="">
<div style="text-align: right;" class="mr-2 mb-1 text-muted">
<t t-if="is_uom_day">
Total: <span t-esc="timesheets[0]._convert_hours_to_days(hours_spent)" t-options='{"widget": "timesheet_uom"}'/>
Total: <span t-esc="timesheets._convert_hours_to_days(hours_spent)" t-options='{"widget": "timesheet_uom"}'/>
</t>
<t t-else="">
Total: <span t-esc="hours_spent" t-options='{"widget": "float_time"}'/>
addons/hr_timesheet/views/project_portal_templates.xml
+2 -2
View File
@@ -18,8 +18,8 @@
</template>
<template id="portal_my_task_planned_hours_template">
<t t-if="is_uom_day and timesheets[0]._convert_hours_to_days(task.planned_hours) > 0">
<strong>Planned Days:</strong> <span t-esc="timesheets[0]._convert_hours_to_days(task.planned_hours)" t-options='{"widget": "timesheet_uom"}'/>
<t t-if="is_uom_day and timesheets._convert_hours_to_days(task.planned_hours) > 0">
<strong>Planned Days:</strong> <span t-esc="timesheets._convert_hours_to_days(task.planned_hours)" t-options='{"widget": "timesheet_uom"}'/>
</t>
<t t-if="not is_uom_day and task.planned_hours > 0" t-call="project.portal_my_task_planned_hours_template"></t>
</template>
addons/sale_timesheet/views/sale_timesheet_portal_templates.xml
+4 -4
View File
@@ -35,7 +35,7 @@
</th>
<th colspan="1" class="text-right text-muted font-weight-normal">
<t t-if="is_uom_day">
Total: <span t-esc="timesheets[0]._convert_hours_to_days(hours_spent)" t-options='{"widget": "timesheet_uom"}'/>
Total: <span t-esc="timesheets._convert_hours_to_days(hours_spent)" t-options='{"widget": "timesheet_uom"}'/>
</t>
<t t-else="">
Total: <span t-esc="hours_spent" t-options='{"widget": "float_time"}'/>
@@ -52,7 +52,7 @@
</th>
<th colspan="1" class="text-right text-muted">
<t t-if="is_uom_day">
Total: <span t-esc="timesheets[0]._convert_hours_to_days(hours_spent)" t-options='{"widget": "timesheet_uom"}'/>
Total: <span t-esc="timesheets._convert_hours_to_days(hours_spent)" t-options='{"widget": "timesheet_uom"}'/>
</t>
<t t-else="">
Total: <span t-esc="hours_spent" t-options='{"widget": "float_time"}'/>
@@ -60,7 +60,7 @@
</th>
</t>
<t t-elif="groupby == 'invoice'">
<t t-set="invoice" t-value="timesheets[0].timesheet_invoice_id"/>
<t t-set="invoice" t-value="timesheets.timesheet_invoice_id"/>
<th colspan="6">
<t t-if="invoice">
<em class="font-weight-normal text-muted">Timesheets for Invoice:</em>
@@ -69,7 +69,7 @@
</th>
<th colspan="1" class="text-right text-muted">
<t t-if="is_uom_day">
Total: <span t-esc="timesheets[0]._convert_hours_to_days(hours_spent)" t-options='{"widget": "timesheet_uom"}'/>
Total: <span t-esc="timesheets._convert_hours_to_days(hours_spent)" t-options='{"widget": "timesheet_uom"}'/>
</t>
<t t-else="">
Total: <span t-esc="hours_spent" t-options='{"widget": "float_time"}'/>