[MERGE]Latest trunk
bzr revid: dle@openerp.com-20121129170352-m8hpklzkuhbfxvev
This commit is contained in:
@@ -225,7 +225,7 @@ class project_issue(base_stage, osv.osv):
|
||||
Define Responsible user and Email account for mail gateway.'),
|
||||
'partner_id': fields.many2one('res.partner', 'Contact', select=1),
|
||||
'company_id': fields.many2one('res.company', 'Company'),
|
||||
'description': fields.text('Description'),
|
||||
'description': fields.text('Private Note'),
|
||||
'state': fields.related('stage_id', 'state', type="selection", store=True,
|
||||
selection=_ISSUE_STATE, string="Status", readonly=True,
|
||||
help='The status is set to \'Draft\', when a case is created.\
|
||||
|
||||
@@ -111,26 +111,26 @@
|
||||
<field name="user_id"/>
|
||||
<field name="partner_id" on_change="onchange_partner_id(partner_id, email_from)"/>
|
||||
<field name="email_from"/>
|
||||
</group>
|
||||
<group>
|
||||
<field name="priority" groups="base.group_user"/>
|
||||
<label for="project_id" groups="base.group_user"/>
|
||||
<div groups="base.group_user">
|
||||
<field name="project_id" on_change="on_change_project(project_id)" class="oe_inline" context="{'default_use_issues':1}"/>
|
||||
<button name="case_escalate" string="Escalate" type="object" states="draft,open,pending" class="oe_inline"/>
|
||||
<button name="case_escalate" string="⇒ Escalate" type="object" states="draft,open,pending" class="oe_link"/>
|
||||
</div>
|
||||
</group>
|
||||
<group>
|
||||
<field name="categ_ids" widget="many2many_tags"/>
|
||||
<field name="version_id" groups="base.group_user"/>
|
||||
<field name="priority" groups="base.group_user"/>
|
||||
<label for="task_id" groups="base.group_user"/>
|
||||
<div groups="base.group_user">
|
||||
<field name="task_id" on_change="onchange_task_id(task_id)" class="oe_inline" context="{'default_project_id':project_id}"/>
|
||||
<field name="progress" widget="progressbar" attrs="{'invisible':[('task_id','=',False)]}" class="oe_inline"/>
|
||||
</div>
|
||||
<field name="categ_ids" widget="many2many_tags"/>
|
||||
<field name="version_id" groups="base.group_user"/>
|
||||
</group>
|
||||
</group>
|
||||
<notebook>
|
||||
<page string="Description">
|
||||
<field name="description" placeholder="Add a description..."/>
|
||||
<field name="description" placeholder="Add an internal note..." groups="base.group_user"/>
|
||||
</page>
|
||||
<page string="Extra Info" groups="base.group_no_one">
|
||||
<group col="4" colspan="4">
|
||||
|
||||
Reference in New Issue
Block a user