Skip to content

Commit 0f9258d

Browse files
committed
[LINT]
1 parent 8fd9284 commit 0f9258d

File tree

13 files changed

+23
-13
lines changed

13 files changed

+23
-13
lines changed

project_workload/models/project_task_workload.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ def week_name(value):
1717
return None
1818

1919

20-
week_merge_re = re.compile((r"(\d{4})-(\d{2}) - (\1)-(\d{2})"))
20+
week_merge_re = re.compile(r"(\d{4})-(\d{2}) - (\1)-(\d{2})")
2121

2222

2323
class ProjectTaskWorkload(models.Model):

project_workload_additions/models/project_task.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ def _get_new_workloads(self):
3131
return rv
3232

3333
def _get_updated_workloads(self):
34-
# We sort the workloads by additional_workload_id to ensure that the first workload is the main one
34+
# We sort the workloads by additional_workload_id to ensure that the
35+
# first workload is the main one
3536
self.workload_ids = self.workload_ids.sorted(
3637
key=lambda w: w.additional_workload_id
3738
)

project_workload_additions/models/project_workload_unit.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ def name_get(self):
1515
for unit_id, name in result:
1616
unit = self.browse(unit_id)
1717
if unit.workload_id.additional_workload_id:
18-
name = f"{unit.workload_id.additional_workload_id.task_id.name} {_('of')} {name}"
18+
name = f"{unit.workload_id.additional_workload_id.task_id.name} "
19+
f"{_('of')} {name}"
1920
units_names[unit_id] = name
2021

2122
return list(units_names.items())

project_workload_additions/views/project_task_workload_view.xml

+4-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@
33

44
<record id="project_task_workload_view_form" model="ir.ui.view">
55
<field name="model">project.task.workload</field>
6-
<field name="inherit_id" ref="project_workload.project_task_workload_view_form" />
6+
<field
7+
name="inherit_id"
8+
ref="project_workload.project_task_workload_view_form"
9+
/>
710
<field name="arch" type="xml">
811
<field name="unit_ids" position="after">
912
<group>

project_workload_milestone/models/project_milestone.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -46,4 +46,5 @@ def _compute_milestone_start_date(self):
4646
limit=1,
4747
)
4848
# The start date will be the end date of the previous milestone
49-
record.start_date = previous_milestones.target_date + timedelta(days=1)
49+
if previous_milestones.target_date:
50+
record.start_date = previous_milestones.target_date + timedelta(days=1)

project_workload_milestone/views/project_milestone.xml

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
<record id="project_milestone_view_form" model="ir.ui.view">
88
<field name="model">project.milestone</field>
99
<field name="inherit_id" ref="project_milestone.project_milestone_view_form" />
10+
<field name="priority" eval="100" />
1011
<field name="arch" type="xml">
1112
<field name="project_id" position="replace" />
1213
<field name="target_date" position="before">

project_workload_timesheet/models/account_analytic_line.py

+1-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@
22
# @author Florian Mounier <florian.mounier@akretion.com>
33
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
44

5-
from odoo import _, api, fields, models
6-
from odoo.exceptions import UserError, ValidationError
7-
5+
from odoo import api, fields, models
86

97
from odoo.addons.project_workload.models.project_task_workload import week_name
108

project_workload_timesheet/models/project_workload_unit.py

-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ def action_timesheet_time(self):
8383

8484
def action_timesheet_done(self):
8585
self.done = True
86-
pass
8786

8887
def _get_timesheeting_task(self):
8988
# For overrides

project_workload_timesheet/views/hr_timesheet_sheet_views.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
widget="progressbar"
7575
optional="show"
7676
/>
77-
77+
7878
<field
7979
name="timesheeted_hours"
8080
string="Timesheeted"

project_workload_timesheet_additions/models/account_analytic_line.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
# @author Florian Mounier <florian.mounier@akretion.com>
33
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
44

5-
from odoo import _, api, fields, models
6-
from odoo.exceptions import UserError, ValidationError
5+
from odoo import fields, models
76

87

98
class AccountAnalyticLine(models.Model):

project_workload_timesheet_additions/models/hr_timesheet_sheet.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Copyright 2024 Akretion (https://www.akretion.com).
22
# @author Florian Mounier <florian.mounier@akretion.com>
33
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
4-
from odoo import api, fields, models
4+
from odoo import models
55

66

77
class Sheet(models.Model):
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../../../project_workload_timesheet_additions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
import setuptools
2+
3+
setuptools.setup(
4+
setup_requires=['setuptools-odoo'],
5+
odoo_addon=True,
6+
)

0 commit comments

Comments
 (0)