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

[IMP] hr_timesheet: improve 'Timesheet Entries' Report

Browse Source 
- If the Timesheet entries all belong to the same project, the report
  title should be
  "Timesheet Entries for the name of the project Project" and here in
  this case no need to show the project column.
- Split the Project - Task column into two separate ones: one for the
  Project and one for the Task

task-2027729

closes odoo/odoo#38684

X-original-commit: 96d3bd7560f43847c758d149eaab14ecc9206058
Signed-off-by: Jérome Maes (jem) <jem@openerp.com>
This commit is contained in:
Jinal Patel
2019-10-14 09:08:52 +00:00
committed by fw-bot
parent 67a222cab6
commit 5288816bae
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/hr_timesheet/report/report_timesheet_templates.xml
+13 -6
View File
@@ -6,15 +6,19 @@
<t t-set="show_project" t-value="len(docs.mapped('project_id')) > 1"/>
<div class="page">
<div class="oe_structure"/>
<div class="row">
<div class="row" style="margin-top:10px;">
<div class="col-lg-12">
<h2>
<span>Timesheet Entries</span>
<span>Timesheet Entries
<t t-if="len(docs.mapped('project_id')) == 1">
for the <t t-esc="docs.mapped('project_id')[0].name"/> Project
</t>
</span>
</h2>
</div>
</div>
<div class="row">
<div class="row" style="margin-top:10px;">
<div class="col-lg-12">
<table class="table table-sm">
<thead>
@@ -22,7 +26,8 @@
<th><span>Date</span></th>
<th><span>Responsible</span></th>
<th><span>Description</span></th>
<th t-if="show_task"><t t-if="show_project">Project - </t>Task</th>
<th t-if="show_project">Project</th>
<th t-if="show_task">Task</th>
<th class="text-right"><span>Time</span></th>
</tr>
</thead>
@@ -37,9 +42,10 @@
<td >
<span t-field="l.name" t-options="{'widget': 'text'}"/>
</td>
<td t-if="show_project">
<span t-field="l.project_id.name"/>
</td>
<td t-if="show_task">
<t t-if="show_project"><span t-field="l.project_id.name"/></t>
<t t-if="show_project and l.task_id"> - </t>
<t t-if="l.task_id"><span t-field="l.task_id.name"/></t>
</td>
<td class="text-right">
@@ -49,6 +55,7 @@
<tr>
<td />
<td />
<td t-if="show_project"/>
<td t-if="show_task"/>
<td class="text-right"><strong>Total</strong></td>
<td class="text-right"><strong t-esc="sum(docs.mapped('unit_amount'))" t-options="{'widget': 'duration', 'digital': True, 'unit': 'hour', 'round': 'minute'}"/></td>