temp rebasing PR 130 (eb2bd70)

roboadhoc · web-flow · commit 3117c25eb413 · 2025-02-05T15:38:58.000-03:00
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -4,7 +4,7 @@
 
 exclude: |
   (?x)
-  
+
   # We don't want to mess with tool-generated files
   .svg$|/tests/([^/]+/)?cassettes/|^.copier-answers.yml$|^.github/|^eslint.config.cjs|^prettier.config.cjs|
   # Library files can have extraneous formatting (even minimized)
diff --git a/project_my_tasks_by_stage/__manifest__.py b/project_my_tasks_by_stage/__manifest__.py
@@ -1,21 +1,20 @@
 {
-    'name': 'Project My Tasks By Stage',
-    'version': "18.0.1.0.0",
-    'category': 'Services/Project',
-    'sequence': 50,
-    'summary': '',
-    'author': 'ADHOC SA',
-    'website': 'www.adhoc.com.ar',
-    'license': 'AGPL-3',
-    'images': [
+    "name": "Project My Tasks By Stage",
+    "version": "18.0.1.0.0",
+    "category": "Services/Project",
+    "sequence": 50,
+    "summary": "",
+    "author": "ADHOC SA",
+    "website": "www.adhoc.com.ar",
+    "license": "AGPL-3",
+    "images": [],
+    "depends": [
+        "project",
     ],
-    'depends': [
-        'project',
+    "data": [
+        "views/project_task_views.xml",
     ],
-    'data': [
-        'views/project_task_views.xml',
-    ],
-    'installable': True,
-    'auto_install': False,
-    'application': False,
+    "installable": True,
+    "auto_install": False,
+    "application": False,
 }
diff --git a/project_ux/__manifest__.py b/project_ux/__manifest__.py
@@ -18,27 +18,25 @@
 #
 ##############################################################################
 {
-    'name': 'Project UX',
-    'version': "18.0.1.0.0",
-    'category': 'Project Management',
-    'sequence': 14,
-    'author': 'ADHOC SA',
-    'website': 'www.adhoc.com.ar',
-    'license': 'AGPL-3',
-    'images': [
+    "name": "Project UX",
+    "version": "18.0.1.0.0",
+    "category": "Project Management",
+    "sequence": 14,
+    "author": "ADHOC SA",
+    "website": "www.adhoc.com.ar",
+    "license": "AGPL-3",
+    "images": [],
+    "depends": [
+        "project",
+        "project_enterprise",
     ],
-    'depends': [
-        'project',
-        'project_enterprise',
+    "data": [
+        "views/project_task_views.xml",
+        "views/project_project_views.xml",
+        "views/project_task_type_views.xml",
     ],
-    'data': [
-        'views/project_task_views.xml',
-        'views/project_project_views.xml',
-        'views/project_task_type_views.xml',
-    ],
-    'demo': [
-    ],
-    'installable': True,
-    'auto_install': False,
-    'application': False,
+    "demo": [],
+    "installable": True,
+    "auto_install": False,
+    "application": False,
 }
diff --git a/project_ux/models/project_task.py b/project_ux/models/project_task.py
@@ -2,52 +2,59 @@
 # For copyright and license notices, see __manifest__.py file in module root
 # directory
 ##############################################################################
-from odoo import models, fields, api
+from odoo import api, fields, models
 
 CLOSED_STATES = {
-    '1_done': 'Done',
-    '1_canceled': 'Canceled',
+    "1_done": "Done",
+    "1_canceled": "Canceled",
 }
 
+
 class Task(models.Model):
-    _inherit = 'project.task'
+    _inherit = "project.task"
 
     dont_send_stage_email = fields.Boolean(
         string="Don't Send Stage Email",
         default=False,
         help="When the task's stage changes, if the stage has an automatic template set, "
         "no email will be send. After the stage changes, this value returns to False so that "
-        "new stage changes will send emails."
+        "new stage changes will send emails.",
     )
     is_closed = fields.Boolean(related="stage_id.fold", string="Folded in Kanban", index=True)
 
     def _track_template(self, changes):
         task = self[0]
         res = super()._track_template(changes)
-        if 'stage_id' in changes and task.stage_id.mail_template_id:
-            res['stage_id'] = (task.stage_id.mail_template_id, {
-                'message_type': 'comment',
-                'auto_delete_keep_log': False,
-                'subtype_id': self.env['ir.model.data']._xmlid_to_res_id('mail.mt_comment'),
-                'email_layout_xmlid': 'mail.mail_notification_light'})
-        if 'stage_id' in res and task.dont_send_stage_email and task.stage_id.mail_template_id:
-            res.pop('stage_id')
+        if "stage_id" in changes and task.stage_id.mail_template_id:
+            res["stage_id"] = (
+                task.stage_id.mail_template_id,
+                {
+                    "message_type": "comment",
+                    "auto_delete_keep_log": False,
+                    "subtype_id": self.env["ir.model.data"]._xmlid_to_res_id("mail.mt_comment"),
+                    "email_layout_xmlid": "mail.mail_notification_light",
+                },
+            )
+        if "stage_id" in res and task.dont_send_stage_email and task.stage_id.mail_template_id:
+            res.pop("stage_id")
             task.dont_send_stage_email = False
         return res
 
-    @api.depends('stage_id', 'depend_on_ids.state', 'project_id.allow_task_dependencies')
+    @api.depends("stage_id", "depend_on_ids.state", "project_id.allow_task_dependencies")
     def _compute_state(self):
         for task in self:
             dependent_open_tasks = []
             if task.allow_task_dependencies:
-                dependent_open_tasks = [dependent_task for dependent_task in task.depend_on_ids if dependent_task.state not in CLOSED_STATES]
+                dependent_open_tasks = [
+                    dependent_task for dependent_task in task.depend_on_ids if dependent_task.state not in CLOSED_STATES
+                ]
             # if one of the blocking task is in a blocking state
             if dependent_open_tasks:
                 # here we check that the blocked task is not already in a closed state (if the task is already done we don't put it in waiting state)
                 if task.state not in CLOSED_STATES:
-                    task.state = '04_waiting_normal'
+                    task.state = "04_waiting_normal"
             # if the task as no blocking dependencies and is in waiting_normal, the task goes back to in progress
             elif task.state not in CLOSED_STATES:
-                task.state = '01_in_progress'
+                task.state = "01_in_progress"
             if task.stage_id.task_state:
                 task.state = task.stage_id.task_state
diff --git a/project_ux/models/project_task_type.py b/project_ux/models/project_task_type.py
@@ -2,21 +2,26 @@
 # For copyright and license notices, see __manifest__.py file in module root
 # directory
 ##############################################################################
-from odoo import models, fields, api
+from odoo import api, fields, models
 from odoo.exceptions import UserError
 
+
 class ProjectTaskType(models.Model):
-    _inherit = 'project.task.type'
+    _inherit = "project.task.type"
 
     state_change = fields.Boolean(
         default=False,
-        help="When the task's stage changes, if the state change is checked it will change the state of the task into the state selected"
+        help="When the task's stage changes, if the state change is checked it will change the state of the task into the state selected",
     )
 
-    task_state = fields.Selection(selection=lambda self: self.env['project.task'].fields_get(allfields=['state'])['state']['selection'])
+    task_state = fields.Selection(
+        selection=lambda self: self.env["project.task"].fields_get(allfields=["state"])["state"]["selection"]
+    )
 
-    @api.constrains('state_change', 'task_state')
+    @api.constrains("state_change", "task_state")
     def _check_task_state(self):
         for record in self:
             if record.state_change and not record.task_state:
-                raise UserError("The state to which the task should change cannot be empty if 'state change' is checked")
+                raise UserError(
+                    "The state to which the task should change cannot be empty if 'state change' is checked"
+                )
diff --git a/project_ux/tests/test_project_task.py b/project_ux/tests/test_project_task.py
@@ -1,41 +1,40 @@
 from odoo.tests.common import TransactionCase
 
-class TestTaskModel(TransactionCase):
 
+class TestTaskModel(TransactionCase):
     def setUp(self):
         super(TestTaskModel, self).setUp()
-        self.Task = self.env['project.task']
-        self.Stage = self.env['project.task.type']
-        self.Template = self.env['mail.template']
+        self.Task = self.env["project.task"]
+        self.Stage = self.env["project.task.type"]
+        self.Template = self.env["mail.template"]
 
-        mail_template = self.Template.create({
-            'name': 'Test Template',
-            'email_from': 'test@example.com',
-            'subject': 'Test Subject',
-            'body_html': '<p>Test Body</p>'
-        })
+        mail_template = self.Template.create(
+            {
+                "name": "Test Template",
+                "email_from": "test@example.com",
+                "subject": "Test Subject",
+                "body_html": "<p>Test Body</p>",
+            }
+        )
 
-        self.test_stage = self.Stage.create({
-            'name': 'Test Stage',
-            'mail_template_id': mail_template.id
-        })
+        self.test_stage = self.Stage.create({"name": "Test Stage", "mail_template_id": mail_template.id})
 
-        self.test_task = self.Task.create({
-            'name': 'Test Task',
-            'stage_id': self.test_stage.id,
-            'state': '01_in_progress',
-        })
+        self.test_task = self.Task.create(
+            {
+                "name": "Test Task",
+                "stage_id": self.test_stage.id,
+                "state": "01_in_progress",
+            }
+        )
 
     def test_compute_state_with_dependencies(self):
         """Test _compute_state method when dependencies are present"""
-        dependent_task = self.Task.create({
-            'name': 'Dependent Task',
-            'stage_id': self.test_stage.id,
-            'state': '01_in_progress'
-        })
-        self.test_task.write({'depend_on_ids': [(4, dependent_task.id)], 'allow_task_dependencies': True})
+        dependent_task = self.Task.create(
+            {"name": "Dependent Task", "stage_id": self.test_stage.id, "state": "01_in_progress"}
+        )
+        self.test_task.write({"depend_on_ids": [(4, dependent_task.id)], "allow_task_dependencies": True})
         self.test_task._compute_state()
-        self.assertEqual(self.test_task.state, '04_waiting_normal')
-        dependent_task.state = '1_done'
+        self.assertEqual(self.test_task.state, "04_waiting_normal")
+        dependent_task.state = "1_done"
         self.test_task._compute_state()
-        self.assertEqual(self.test_task.state, '01_in_progress')
+        self.assertEqual(self.test_task.state, "01_in_progress")
diff --git a/project_ux/tests/test_project_task_type.py b/project_ux/tests/test_project_task_type.py
@@ -1,17 +1,13 @@
-from odoo.tests.common import TransactionCase
 from odoo.exceptions import UserError
+from odoo.tests.common import TransactionCase
 
-class TestProjectTaskType(TransactionCase):
 
+class TestProjectTaskType(TransactionCase):
     def setUp(self):
         super(TestProjectTaskType, self).setUp()
-        self.ProjectTaskType = self.env['project.task.type']
+        self.ProjectTaskType = self.env["project.task.type"]
 
     def test_state_change_constraint_error(self):
         """Test that UserError is raised when state_change is True and task_state is empty"""
         with self.assertRaises(UserError):
-            self.ProjectTaskType.create({
-                'name': 'Test Task Type',
-                'state_change': True,
-                'task_state': ''
-            })
+            self.ProjectTaskType.create({"name": "Test Task Type", "state_change": True, "task_state": ""})
