odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] [FIX] project.task: state cancel -> back to cancelled, to be coherent with the project states (inherited from analytic.account, therefore difficult to change). Also updated default data: project_default -> case_default. 

bzr revid: tde@openerp.com-20120529092424-mpz8824y14e1txhr
This commit is contained in:
Thibault Delavallée 2012-05-29 11:24:24 +02:00
parent ad1e88ed95
commit 0a3e7b9c18
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/project/project.py
View File

@ -27,7 +27,7 @@ from openerp.addons.resource.faces import task as Task
import time
from tools.translate import _
_TASK_STATE = [('draft', 'New'),('open', 'In Progress'),('pending', 'Pending'), ('done', 'Done'), ('cancel', 'Cancelled')]
_TASK_STATE = [('draft', 'New'),('open', 'In Progress'),('pending', 'Pending'), ('done', 'Done'), ('cancelled', 'Cancelled')]
class project_task_type(osv.osv):
_name = 'project.task.type'
@ -981,7 +981,7 @@ class task(crm_case, osv.osv):
'ref_doc2': 'project.project,%d' % project.id,
}, context=context)
# cancel task
self.case_set(cr, uid, [task.id], 'cancel', {'remaining_hours': 0.0}, context=context)
self.case_set(cr, uid, [task.id], 'cancelled', {'remaining_hours': 0.0}, context=context)
self.case_cancel_send_note(cr, uid, [task.id], context=context)
return True

14
addons/project/project_data.xml
View File

@ -28,37 +28,37 @@
<field name="sequence">1</field>
<field name="name">Design</field>
<field name="state">draft</field>
<field name="project_default" eval="1"/>
<field name="case_default" eval="1"/>
</record>
<record id="project_tt_development" model="project.task.type">
<field name="sequence">2</field>
<field name="name">Development</field>
<field name="state">open</field>
<field name="project_default" eval="1"/>
<field name="case_default" eval="1"/>
</record>
<record id="project_tt_testing" model="project.task.type">
<field name="sequence">3</field>
<field name="name">Testing</field>
<field name="state">open</field>
<field name="project_default" eval="1"/>
<field name="case_default" eval="1"/>
</record>
<record id="project_tt_pending" model="project.task.type">
<field name="sequence">4</field>
<field name="name">Pending</field>
<field name="state">pending</field>
<field name="project_default" eval="1"/>
<field name="case_default" eval="1"/>
</record>
<record id="project_tt_merge" model="project.task.type">
<field name="sequence">5</field>
<field name="name">Deployment</field>
<field name="state">done</field>
<field name="project_default" eval="1"/>
<field name="case_default" eval="1"/>
</record>
<record id="project_tt_cancel" model="project.task.type">
<field name="sequence">6</field>
<field name="name">Cancelled</field>
<field name="state">cancel</field>
<field name="project_default" eval="1"/>
<field name="state">cancelled</field>
<field name="case_default" eval="1"/>
<field name="fold" eval="True"/>
</record>
</data>

4
addons/project/project_view.xml
View File

@ -659,7 +659,7 @@
<field name="arch" type="xml">
<search string="Tasks Stages">
<group>
<filter icon="terp-check" string="Common" name="common" domain="[('project_default', '=', 1)]" help="Stages common to all projects"/>
<filter icon="terp-check" string="Common" name="common" domain="[('case_default', '=', 1)]" help="Stages common to all projects"/>
<separator orientation="vertical"/>
<field name="name"/>
</group>
@ -675,7 +675,7 @@
<form string="Task Stage">
<group colspan="4" col="6">
<field name="name"/>
<field name="project_default"/>
<field name="case_default"/>
<field name="sequence"/>
<field name="state"/>
</group>