Merge lp:~invitu/project-service/7.0-issue_task-dr-synctaskissue into lp:~project-core-editors/project-service/trunk

Proposed by invitu
Status: Needs review
Proposed branch: lp:~invitu/project-service/7.0-issue_task-dr-synctaskissue
Merge into: lp:~project-core-editors/project-service/trunk
Diff against target: 52 lines (+17/-2)
3 files modified
project_issue_task/project_issue.py (+1/-0)
project_issue_task/project_issue_view.xml (+5/-2)
project_issue_task/project_task.py (+11/-0)
To merge this branch: bzr merge lp:~invitu/project-service/7.0-issue_task-dr-synctaskissue
Reviewer Review Type Date Requested Status
Project Core Editors Pending
Review via email: mp+224596@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Daniel Reis (dreis-pt) wrote :

This project is now hosted on https://github.com/OCA/project-service. Please move your proposal there.
This guide may help you https://github.com/OCA/maintainers-tools/wiki/How-to-move-a-Merge-Proposal-to-GitHub

Unmerged revisions

32. By invitu

[IMP] add priority field to new task + synchronize stage from task to issue

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'project_issue_task/project_issue.py'
--- project_issue_task/project_issue.py 2014-04-25 13:39:22 +0000
+++ project_issue_task/project_issue.py 2014-06-26 11:31:34 +0000
@@ -37,6 +37,7 @@
37 if hasattr(rec, x) and getattr(rec, x)])37 if hasattr(rec, x) and getattr(rec, x)])
38 task_data['name'] = _('Report for %s') % rec.name38 task_data['name'] = _('Report for %s') % rec.name
39 task_data['issue_id'] = rec.id39 task_data['issue_id'] = rec.id
40 task_data['priority'] = rec.priority
40 task_data['categ_ids'] = [(6, 0, [x.id for x in rec.categ_ids])]41 task_data['categ_ids'] = [(6, 0, [x.id for x in rec.categ_ids])]
4142
42 task_model = self.pool.get('project.task')43 task_model = self.pool.get('project.task')
4344
=== modified file 'project_issue_task/project_issue_view.xml'
--- project_issue_task/project_issue_view.xml 2013-11-20 15:38:29 +0000
+++ project_issue_task/project_issue_view.xml 2014-06-26 11:31:34 +0000
@@ -9,9 +9,12 @@
9 <field name="inherit_id" ref="project_issue.project_issue_form_view"/>9 <field name="inherit_id" ref="project_issue.project_issue_form_view"/>
10 <field name="arch" type="xml">10 <field name="arch" type="xml">
1111
12 <field name="task_id" position="after">12 <field name="task_id" position="after">
13 <button type="object" name="action_create_task" string="Task Report" attrs="{'invisible': [('task_id', '!=', False)]}"/>13 <button type="object" name="action_create_task" string="Task Report" attrs="{'invisible': [('task_id', '!=', False)]}"/>
14 </field>14 </field>
15 <xpath expr="//field[@name='stage_id']" position="replace">
16 <field name="stage_id" widget="statusbar" attrs="{'readonly':True}"/>
17 </xpath>
1518
16 </field>19 </field>
17 </record>20 </record>
1821
=== modified file 'project_issue_task/project_task.py'
--- project_issue_task/project_task.py 2014-01-23 18:31:24 +0000
+++ project_issue_task/project_task.py 2014-06-26 11:31:34 +0000
@@ -44,6 +44,17 @@
44 'reason_id': fields.many2one('project.task.cause', 'Problem Cause'),44 'reason_id': fields.many2one('project.task.cause', 'Problem Cause'),
45 }45 }
4646
47 def write(self, cr, uid, ids, vals, context=None):
48 if 'stage_id' in vals:
49 project_issue_obj = self.pool.get('project.issue')
50 task_obj = self.pool.get('project.task')
51 for x in task_obj.browse(cr, uid, ids, context=context):
52 val2 = {'stage_id': vals['stage_id']}
53 project_issue_obj.write(cr, uid, [x.issue_id.id], val2, context=context)
54
55 return super(task, self).write(cr, uid, ids, vals, context=context)
56
57
47 def action_close(self, cr, uid, ids, context=None):58 def action_close(self, cr, uid, ids, context=None):
48 """ On Task Close, also close Issue """59 """ On Task Close, also close Issue """
49 issue_ids = [x.issue_id.id60 issue_ids = [x.issue_id.id

Subscribers

People subscribed via source and target branches