Merge branch 'new/15.0/H11043_project_acceptance__created_email_template_added_fields_and_buttons' into '15.0-test'

new/15.0/H11043_project_acceptance__created_email_template_added_fields_and_buttons into 15.0-test

See merge request hibou-io/hibou-odoo/suite!1495

project_acceptance/__manifest__.py

@@ -15,10 +15,12 @@
         'data/mail_template_data.xml',
         # 'report/project_report.xml',
         # 'report/project_report_template.xml',
-        # 'security/project_acceptance_security.xml',
+        'security/project_acceptance_security.xml',
         'views/project_portal_templates.xml',
         'views/project_views.xml',
     ],
+    'demo': [
+    ],
     'installable': True,
     'auto_install': False,
 }

project_acceptance/models/project.py

@@ -1,13 +1,11 @@
 from odoo import api, fields, models
 
 
-class ProjectProjectStage(models.Model):
-    _inherit = 'project.project.stage'
-
-    requires_acceptance = fields.Boolean('Require Acceptance')
-
-class ProjectTask(models.Model):
-    _inherit = 'project.task'    
-    
+class Task(models.Model):
+    _inherit = 'project.task'        
     task_acceptance = fields.Selection([('accept', 'Accepted'), ('decline', 'Decline'), ('feedback', 'Feedback Provided')],'Task Acceptance', traking=True)
-    
+    
+
+class ProjectTaskType(models.Model):
+    _inherit = 'project.task.type'
+    requires_acceptance = fields.Boolean('Require Acceptance')

project_acceptance/security/project_acceptance_security.xml

@@ -2,17 +2,13 @@
 <!-- <odoo noupdate="1"> -->
 <odoo>
 
-    <record id="task_acceptance_rule_" model="exception.rule">
-        <field name="name">Task Acceptance Exception Rule</field>
-        <field name="description">Task Acceptance Exception Rule</field>
+    <record id="except_no_project_id" model="exception.rule">
+        <field name="name">Task Acceptance is Blank</field>
+        <field name="description">When task stage changes and requires acceptance and task acceptance is blank</field>
         <field name="sequence">50</field>
         <field name="model">project.task</field>
-        <field name="code">
-<!-- if task.stage_id.name == 'Accept Required' and task.task_acceptance == False: failed=True  -->
-        </field>
+        <field name="code">if not task.task_acceptance and task.stage_id.requires_acceptance: failed=True</field>
         <field name="active" eval="False"/>
-        <!-- if task.stage_id.name == 'In progress' and task.task_acceptance == False: failed=True  -->
-        <!-- stage_id == 'Accept Required'  -->
     </record>
 
-</odoo>
+</odoo>

project_acceptance/views/project_views.xml

@@ -12,4 +12,15 @@
         </field>
     </record>
 
+    <record id="view_task_type_tree" model="ir.ui.view">
+        <field name="name">project.task.type.tree.inherit.exception</field>
+        <field name="model">project.task.type</field>
+        <field name="inherit_id" ref="project.task_type_tree"/>
+        <field name="arch" type="xml">
+            <field name="user_id" position="after">
+                <field name="requires_acceptance"/>
+            </field>
+        </field>
+    </record>
+
 </odoo>