Elabore/project-tools
8
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Releases Activity

[CLN] global: apply ruff

Browse Source
This commit is contained in:
Stéphan Sainléger
2025-07-08 15:09:51 +02:00
parent 92577de600
commit ff07b3aa17
43 changed files with 192 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
project_working_time_task_portal/__init__.py
View File

@@ -1 +1 @@
from . import models
from . import models

2
project_working_time_task_portal/__manifest__.py
View File

@@ -25,7 +25,7 @@
"data": [
"views/hr_timesheet_portal.xml",
"views/hr_timesheet_view_task_form2.xml",
"views/portal_tasks_list.xml"
"views/portal_tasks_list.xml",
],
"assets": {
"web.assets_frontend": [

5
project_working_time_task_portal/models/account_analytic_line.py
View File

@@ -5,9 +5,10 @@
from odoo import models
from odoo.osv import expression
class AccountAnalyticLine(models.Model):
_inherit = 'account.analytic.line'
_inherit = "account.analytic.line"
def _timesheet_get_portal_domain(self):
domain = super()._timesheet_get_portal_domain()
return expression.AND([domain, [('exclude_from_sale_order', '=', False)]])
return expression.AND([domain, [("exclude_from_sale_order", "=", False)]])

81
project_working_time_task_portal/models/project_task.py
View File

@@ -22,7 +22,7 @@ class Task(models.Model):
compute="_compute_billable_remaining_hours",
string="Billable Remaining Hours",
store=True,
help="Total Billable remaining time (without exclude_from_sale_order timesheet lines), can be re-estimated periodically by the assignee of the task."
help="Total Billable remaining time (without exclude_from_sale_order timesheet lines), can be re-estimated periodically by the assignee of the task.",
)
billable_progress = fields.Float(
@@ -40,48 +40,83 @@ class Task(models.Model):
recursive=True,
)
@api.depends('timesheet_ids.unit_amount')
@api.depends("timesheet_ids.unit_amount")
def _compute_billable_effective_hours(self):
if not any(self._ids):
for task in self:
filtered_timesheets = task.timesheet_ids.filtered(lambda t: not t.exclude_from_sale_order)
task.billable_effective_hours = sum(filtered_timesheets.mapped('unit_amount'))
filtered_timesheets = task.timesheet_ids.filtered(
lambda t: not t.exclude_from_sale_order
)
task.billable_effective_hours = sum(
filtered_timesheets.mapped("unit_amount")
)
return
timesheet_read_group = self.env['account.analytic.line'].read_group(
[('task_id', 'in', self.ids), ('exclude_from_sale_order', '=', False)], # We exclude the lines (timesheet) which are excluded from billing
['unit_amount', 'task_id'],
['task_id']
timesheet_read_group = self.env["account.analytic.line"].read_group(
[
("task_id", "in", self.ids),
("exclude_from_sale_order", "=", False),
], # We exclude the lines (timesheet) which are excluded from billing
["unit_amount", "task_id"],
["task_id"],
)
timesheets_per_task = {res['task_id'][0]: res['unit_amount'] for res in timesheet_read_group}
timesheets_per_task = {
res["task_id"][0]: res["unit_amount"] for res in timesheet_read_group
}
for task in self:
task.billable_effective_hours = timesheets_per_task.get(task.id, 0.0)
@api.depends('effective_hours','billable_effective_hours')
@api.depends("effective_hours", "billable_effective_hours")
def _compute_non_billable_effective_hours(self):
for task in self:
task.non_billable_effective_hours = task.effective_hours - task.billable_effective_hours
task.non_billable_effective_hours = (
task.effective_hours - task.billable_effective_hours
)
@api.depends('billable_effective_hours', 'subtask_billable_effective_hours', 'planned_hours')
@api.depends(
"billable_effective_hours", "subtask_billable_effective_hours", "planned_hours"
)
def _compute_billable_remaining_hours(self):
for task in self:
task.billable_remaining_hours = task.planned_hours - task.billable_effective_hours - task.subtask_billable_effective_hours
task.billable_remaining_hours = (
task.planned_hours
- task.billable_effective_hours
- task.subtask_billable_effective_hours
)
@api.depends('child_ids.billable_effective_hours', 'child_ids.subtask_billable_effective_hours')
@api.depends(
"child_ids.billable_effective_hours",
"child_ids.subtask_billable_effective_hours",
)
def _compute_subtask_billable_effective_hours(self):
for task in self:
task.subtask_billable_effective_hours = sum(child_task.billable_effective_hours + child_task.subtask_billable_effective_hours for child_task in task.child_ids)
task.subtask_billable_effective_hours = sum(
child_task.billable_effective_hours
+ child_task.subtask_billable_effective_hours
for child_task in task.child_ids
)
@api.depends('billable_effective_hours', 'subtask_billable_effective_hours', 'planned_hours')
@api.depends(
"billable_effective_hours", "subtask_billable_effective_hours", "planned_hours"
)
def _compute_billable_progress_hours(self):
for task in self:
if (task.planned_hours > 0.0):
task_total_hours = task.billable_effective_hours + task.subtask_billable_effective_hours
if float_compare(task_total_hours, task.planned_hours, precision_digits=2) >= 0:
if task.planned_hours > 0.0:
task_total_hours = (
task.billable_effective_hours
+ task.subtask_billable_effective_hours
)
if (
float_compare(
task_total_hours, task.planned_hours, precision_digits=2
)
>= 0
):
task.billable_progress = 100
else:
task.billable_progress = round(100.0 * task_total_hours / task.planned_hours, 2)
task.billable_progress = round(
100.0 * task_total_hours / task.planned_hours, 2
)
else:
task.billable_progress = 0.0
task.billable_progress = 0.0