version 1.2

Author: HaojunZou

project_scrum/project_scrum.py

@@ -116,10 +116,7 @@ class project_task(models.Model):
     us_id = fields.Many2one(comodel_name = 'project.scrum.us', string = 'User Stories')
     date_start = fields.Date(string = 'Starting Date', required=False, default=date.today())
     date_end = fields.Date(string = 'Ending Date', required=False, default=date.today())
-<<<<<<< HEAD
     use_scrum = fields.Boolean(related='project_id.use_scrum', default=False)
-=======
->>>>>>> 789a3f7b28591c11423d314fcf1d5c18b5e98a19
 
     @api.model
     def _read_group_sprint_id(self, present_ids, domain, **kwargs):
@@ -160,7 +157,6 @@ class scrum_meeting(models.Model):
     sprint_id = fields.Many2one(comodel_name = 'project.scrum.sprint', string = 'Sprint')
     date_meeting = fields.Date(string = 'Date', required=True)
     user_id_meeting = fields.Many2one(comodel_name = 'res.users', string = 'Name', required=True)
-    scrum_master_id_meeting = fields.Many2one(comodel_name = 'res.users', string = 'Scrum Master', required=True)
     question_yesterday = fields.Text(string = 'Description', required=True)
     question_today = fields.Text(string = 'Description', required=True)
     question_blocks = fields.Text(string = 'Description', required=True)

project_scrum/project_scrum_view.xml

@@ -777,7 +777,7 @@
             <field name="subject"> ${object.date_meeting or ''}</field>
             <field name="model_id" ref="project_scrum.model_project_scrum_meeting"/>
             <field name="auto_delete" eval="True"/>
-            <field name="email_to">${object.scrum_master_id_meeting or ''}</field>
+            <field name="email_to">${object.user_id_meeting or ''}</field>
             <field name="body_html">
                 <![CDATA[
                 <div style="font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;