Skip to content

Commit

Permalink
[FIX] fixed some problems after initial migration
Browse files Browse the repository at this point in the history
  • Loading branch information
mathiasfrancke committed Nov 20, 2023
1 parent f458e27 commit 4c98cde
Show file tree
Hide file tree
Showing 6 changed files with 34 additions and 40 deletions.
2 changes: 1 addition & 1 deletion project_scrum/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"base_setup",
"project",
"project_task_code",
"project_stage_state",
"project_task_stage_state",
"mail",
"hr_timesheet",
],
Expand Down
2 changes: 2 additions & 0 deletions project_scrum/models/project_task.py
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,8 @@ def _get_kano_field(self):
risk = fields.Selection("_get_risk_field")
kano = fields.Selection("_get_kano_field")
color = fields.Integer(related="project_id.color")
user_id = fields.Many2one('res.users', string = 'User')


@api.depends("sprint_id")
def _compute_current_sprint(self):
Expand Down
60 changes: 26 additions & 34 deletions project_scrum/views/mail_template.xml
Original file line number Diff line number Diff line change
@@ -1,37 +1,29 @@
<?xml version="1.0" encoding="utf-8" ?>
<odoo>

<record id="email_template_id" model="mail.template">
<field name="name">Email
Template for Meeting
</field>
<field name="email_from">{{object.user_id_meeting
or ''}}
</field>
<field name="subject">{{object.datetime_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.user_id_meeting
or ''}}
</field>
<field name="body_html">
<div
style="font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-serif; font-size: 16px; color: rgb(34, 34, 34); background-color: rgb(255, 255, 255); "
>
<p>Name: <t t-out="object.user_id_meeting" /></p>
<p>Date: <t t-out="object.datetime_meeting" /></p> <br />
<p
style="color:blue; font-size:14"
> What did you do since the last meeting?</p>
<t t-out="object.question_yesterday" /> <br /><br />
<p
style="color:blue; font-size:14"
>What do you plan to do till the next meeting?</p>
<t t-out="object.question_today" /> <br /><br />
<p style="color:blue; font-size:14">Are there anything blocking you?</p>
<t t-out="object.question_blocks" /> <br /><br />
</div>
</field>
</record>

<record id="email_template_id" model="mail.template">
<field name="name">Email Template for Meeting</field>
<field name="email_from">{{object.user_id_meeting or ''}}</field>
<field name="subject">{{object.datetime_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.user_id_meeting or ''}}</field>
<field name="body_html" type="html">
<div
style="font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-serif; font-size: 16px; color: rgb(34, 34, 34); background-color: rgb(255, 255, 255); "
>
<p>Name: <t t-out="object.user_id_meeting" /></p>
<p>Date: <t t-out="object.datetime_meeting" /></p> <br />
<p
style="color:blue; font-size:14"
> What did you do since the last meeting?</p>
<t t-out="object.question_yesterday" /> <br /><br />
<p
style="color:blue; font-size:14"
>What do you plan to do till the next meeting?</p>
<t t-out="object.question_today" /> <br /><br />
<p style="color:blue; font-size:14">Are there anything blocking you?</p>
<t t-out="object.question_blocks" /> <br /><br />
</div>
</field>
</record>
</odoo>
4 changes: 2 additions & 2 deletions project_scrum/views/project_project.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<field name="model">project.project</field>
<field name="inherit_id" ref="project.edit_project" />
<field name="arch" type="xml">
<xpath expr="//div[@name='options_active']" position="inside">
<xpath expr="//field[@name='tag_ids']" position="after">
<div>
<field name="use_scrum" class="oe_inline" />
<label for="use_scrum" string="Use Scrum" />
Expand Down Expand Up @@ -70,7 +70,7 @@
<field name="priority">99</field>
<field name="inherit_id" ref="project.edit_project" />
<field name="arch" type="xml">
<button name="attachment_tree_view" position="before">
<button name="%(project.project_share_wizard_action)d" position="before">
<button
class="oe_inline oe_stat_button"
type="action"
Expand Down
2 changes: 1 addition & 1 deletion project_scrum/views/project_scrum_us.xml
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@
<tree>
<field name="sequence" widget="handle" />
<field name="name" />
<field name="user_id" />
<!-- <field name="user_id" />-->
<field name="date_deadline" />
<field name="stage_id" />
</tree>
Expand Down
4 changes: 2 additions & 2 deletions project_scrum/views/project_task.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
<field name="mode">primary</field>
<field name="priority">99</field>
<field name="arch" type="xml">
<field name="project_id" position="after">
<field name="parent_id" position="after">
<field name="sprint_id" />
</field>
<filter name="project" position="after">
<filter name="unassigned" position="after">
<filter
string="Sprint"
name="group_by_sprint"
Expand Down

0 comments on commit 4c98cde

Please sign in to comment.