Skip to content

Commit 97c1b90

Browse files
committed
[MIG][15.0]hr_utilization_report:Migration to 15.0
1 parent 3bc5495 commit 97c1b90

File tree

5 files changed

+13
-26
lines changed

5 files changed

+13
-26
lines changed

hr_utilization_report/README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Task Logs Utilization Report
77
!! This file is generated by oca-gen-addon-readme !!
88
!! changes will be overwritten. !!
99
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
10-
!! source digest: sha256:0e6930e3625dcc77dd034b168f08a54d02c1134a1ec7bd3d2c430ac494fd9d8d
10+
!! source digest: sha256:b4a5a465d48033e71533315bdb6ad12390720451691afe7dae8997edc695dcc2
1111
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
1212
1313
.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png

hr_utilization_report/__manifest__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
{
66
"name": "Task Logs Utilization Report",
7-
"version": "14.0.1.0.1",
7+
"version": "15.0.1.0.0",
88
"category": "Human Resources",
99
"website": "https://github.com/OCA/timesheet",
1010
"author": "CorporateHub, " "Odoo Community Association (OCA)",

hr_utilization_report/report/hr_utilization_report.py

Lines changed: 10 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ class HrUtilizationReport(models.TransientModel):
2828
required=True,
2929
)
3030
only_active_employees = fields.Boolean(
31-
string="Only Active Employees",
3231
default=True,
3332
)
3433
employee_ids = fields.Many2many(
@@ -84,7 +83,6 @@ class HrUtilizationReport(models.TransientModel):
8483
store=True,
8584
)
8685
total_capacity = fields.Float(
87-
string="Total Capacity",
8886
compute="_compute_total_capacity",
8987
store=True,
9088
)
@@ -292,7 +290,7 @@ def get_action(self, report_type="qweb-html"):
292290
self.ensure_one()
293291

294292
if report_type not in self._supported_report_types():
295-
raise UserError(_('"%s" report type is not supported' % (report_type)))
293+
raise UserError(_('"%s" report type is not supported') % report_type)
296294

297295
report_name = "hr_utilization_report.report"
298296

@@ -306,11 +304,15 @@ def get_action(self, report_type="qweb-html"):
306304
)
307305
if not action:
308306
raise UserError(
309-
_('"%s" report with "%s" type not found' % (report_name, report_type))
307+
_('"%(report_name)s" report with "%(report_type)s" type not found')
308+
% {
309+
"report_name": report_name,
310+
"report_type": report_type,
311+
}
310312
)
311313

312314
context = dict(self.env.context)
313-
return action.with_context(context).report_action(self)
315+
return action.with_context(**context).report_action(self)
314316

315317

316318
class HrUtilizationReportAbstractField(models.AbstractModel):
@@ -325,7 +327,6 @@ class HrUtilizationReportAbstractField(models.AbstractModel):
325327
ondelete="cascade",
326328
)
327329
sequence = fields.Integer(
328-
string="Sequence",
329330
required=True,
330331
)
331332
field_name = fields.Char(
@@ -337,14 +338,12 @@ class HrUtilizationReportAbstractField(models.AbstractModel):
337338
required=True,
338339
)
339340
field_type = fields.Char(
340-
string="Field type",
341+
"Field type",
341342
required=True,
342343
)
343-
aggregation = fields.Char(
344-
string="Aggregation",
345-
)
344+
aggregation = fields.Char()
346345
groupby = fields.Char(
347-
string="Group-by expression",
346+
"Group-by expression",
348347
compute="_compute_groupby",
349348
)
350349

@@ -404,11 +403,9 @@ class HrUtilizationReportGroup(models.TransientModel):
404403
ondelete="cascade",
405404
)
406405
sequence = fields.Integer(
407-
string="Sequence",
408406
required=True,
409407
)
410408
scope = fields.Char(
411-
string="Scope",
412409
required=True,
413410
)
414411
name = fields.Char()
@@ -425,7 +422,6 @@ class HrUtilizationReportGroup(models.TransientModel):
425422
store=True,
426423
)
427424
total_capacity = fields.Float(
428-
string="Total Capacity",
429425
compute="_compute_total_capacity",
430426
store=True,
431427
)
@@ -516,11 +512,9 @@ class HrUtilizationReportBlock(models.TransientModel):
516512
ondelete="cascade",
517513
)
518514
sequence = fields.Integer(
519-
string="Sequence",
520515
required=True,
521516
)
522517
employee_id = fields.Many2one(
523-
string="Employee",
524518
comodel_name="hr.employee",
525519
required=True,
526520
)
@@ -537,7 +531,6 @@ class HrUtilizationReportBlock(models.TransientModel):
537531
store=True,
538532
)
539533
capacity = fields.Float(
540-
string="Capacity",
541534
compute="_compute_capacity",
542535
store=True,
543536
)
@@ -683,15 +676,12 @@ class HrUtilizationReportEntry(models.TransientModel):
683676
ondelete="cascade",
684677
)
685678
sequence = fields.Integer(
686-
string="Sequence",
687679
required=True,
688680
)
689681
scope = fields.Char(
690-
string="Scope",
691682
required=True,
692683
)
693684
any_line_id = fields.Many2one(
694-
string="Account Analytics Lines",
695685
comodel_name="account.analytic.line",
696686
compute="_compute_any_line_id",
697687
)
@@ -815,7 +805,6 @@ def _emit_report(self, workbook, report, report_index):
815805

816806
group_row_indices = []
817807
for group in report.group_ids:
818-
819808
if report.groupby_field_ids:
820809
group_row_indices.append(rows_emitted)
821810
rows_emitted += self._emit_group_header(

hr_utilization_report/static/description/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@ <h1 class="title">Task Logs Utilization Report</h1>
367367
!! This file is generated by oca-gen-addon-readme !!
368368
!! changes will be overwritten. !!
369369
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
370-
!! source digest: sha256:0e6930e3625dcc77dd034b168f08a54d02c1134a1ec7bd3d2c430ac494fd9d8d
370+
!! source digest: sha256:b4a5a465d48033e71533315bdb6ad12390720451691afe7dae8997edc695dcc2
371371
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
372372
<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/timesheet/tree/15.0/hr_utilization_report"><img alt="OCA/timesheet" src="https://img.shields.io/badge/github-OCA%2Ftimesheet-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/timesheet-15-0/timesheet-15-0-hr_utilization_report"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/timesheet&amp;target_branch=15.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
373373
<p>This module allows to generate Utilization Report from Task Logs.</p>

hr_utilization_report/wizards/hr_utilization_report_wizard.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ class HrUtilizationReportWizard(models.TransientModel):
1818
required=True,
1919
)
2020
only_active_employees = fields.Boolean(
21-
string="Only Active Employees",
2221
default=True,
2322
)
2423
employee_ids = fields.Many2many(
@@ -194,7 +193,6 @@ class HrUtilizationReportWizardField(models.AbstractModel):
194193
ondelete="cascade",
195194
)
196195
sequence = fields.Integer(
197-
string="Sequence",
198196
required=True,
199197
default=10,
200198
)

0 commit comments

Comments
 (0)