diff options
Diffstat (limited to 'addons/project_issue/project_issue_view.xml')
| -rw-r--r-- | addons/project_issue/project_issue_view.xml | 56 |
1 files changed, 26 insertions, 30 deletions
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml index 1154579960e..860dd73216b 100644 --- a/addons/project_issue/project_issue_view.xml +++ b/addons/project_issue/project_issue_view.xml @@ -55,8 +55,7 @@ <field name="name"/> <field name="project_id" required="True" on_change="on_change_project(project_id)"/> <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'project.issue')]"/> - <field name="user_id" invisible="1" /> - <field name="assigned_to"/> + <field name="user_id"/> <field name="version_id" colspan="2" widget="selection"/> <group colspan="2" col="4"> <field name="type_id" string="Resolution" /> @@ -97,15 +96,15 @@ <group colspan="4"> <field colspan="4" name="email_cc" string="Global CC" widget="url"/> </group> - <field name="message_ids" colspan="4" nolabel="1" mode="tree,form"> + <field name="message_ids" colspan="4" nolabel="1" mode="tree,form" readonly="1"> <tree string="History"> <field name="display_text" string="History Information"/> - <field name="history" invisible="1"/> - <button - string="Reply" attrs="{'invisible': [('history', '!=', True)]}" - name="%(crm.action_crm_send_mail)d" - context="{'mail':'reply', 'model': 'project.issue', 'include_original' : True}" - icon="terp-mail-replied" type="action" /> + <field name="email_from" invisible="1"/> + <button + string="Reply" attrs="{'invisible': [('email_from', '=', False)]}" + name="%(mail.action_email_compose_message_wizard)d" + context="{'mail.compose.message.mode':'reply', 'message_id':active_id}" + icon="terp-mail-replied" type="action" /> </tree> <form string="History"> <group col="4" colspan="4"> @@ -113,20 +112,18 @@ <field name="date"/> <field name="email_to" widget="char" size="512"/> <field name="email_cc" widget="char" size="512"/> - <field name="name" colspan="4" widget="char" size="512"/> - <field name="history" invisible="1"/> + <field name="subject" colspan="4" widget="char" size="512"/> </group> <notebook colspan="4"> <page string="Details"> - <group attrs="{'invisible': [('history', '!=', True)]}"> - <field name="description" colspan="4" nolabel="1" height="250"/> - <button colspan="4" - string="Reply" - name="%(crm.action_crm_send_mail)d" - context="{'mail':'reply', 'model': 'project.issue', 'include_original' : True}" - icon="terp-mail-replied" type="action" /> + <group attrs="{'invisible': [('email_from', '=', False)]}"> + <field name="body_text" colspan="4" nolabel="1" height="250"/> + <button colspan="4" string="Reply" + name="%(mail.action_email_compose_message_wizard)d" + context="{'mail.compose.message.mode':'reply', 'message_id':active_id}" + icon="terp-mail-replied" type="action"/> </group> - <group attrs="{'invisible': [('history', '=', True)]}"> + <group attrs="{'invisible': [('email_from', '!=', False)]}"> <field name="display_text" colspan="4" nolabel="1" height="250"/> </group> </page> @@ -141,10 +138,9 @@ name="%(crm.action_crm_add_note)d" context="{'model': 'crm.lead' }" icon="terp-document-new" type="action" /> - <button string="Send New Email" - name="%(crm.action_crm_send_mail)d" - context="{'mail':'new', 'model': 'project.issue'}" - icon="terp-mail-message-new" type="action" /> + <button string="Send New Email" + name="%(mail.action_email_compose_message_wizard)d" + icon="terp-mail-message-new" type="action"/> </page> <page string="Extra Info" groups="base.group_extended"> <group col="2" colspan="2"> @@ -191,7 +187,7 @@ <button name="prev_type" string="Previous" type="object" icon="gtk-go-back" help="Change to Previous Stage"/> <button name="next_type" string="Next" type="object" icon="gtk-go-forward" help="Change to Next Stage"/> <field name="version_id" widget="selection"/> - <field name="assigned_to"/> + <field name="user_id"/> <field name="progress" widget="progressbar" attrs="{'invisible':[('task_id','=',False)]}"/> <field name="state"/> <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel"/> @@ -219,8 +215,8 @@ <filter string="Pending" domain="[('state','=','pending')]" help="Pending Issues" icon="terp-gtk-media-pause"/> <separator orientation="vertical"/> <field name="name" string="Issue / Partner" filter_domain="['|', '|', ('partner_id','ilike',self), ('email_from','ilike',self), ('name','ilike',self)]"/> - <field name="assigned_to"> - <filter domain="[('assigned_to','=',False)]" help="Unassigned Issues" icon="terp-personal-" separator="1"/> + <field name="user_id"> + <filter domain="[('user_id','=',False)]" help="Unassigned Issues" icon="terp-personal-" separator="1"/> </field> <field name="project_id"/> <field name="id"/> @@ -228,7 +224,7 @@ <newline/> <group expand="0" string="Group By..." groups="base.group_extended"> <filter string="Responsible" icon="terp-personal" - domain="[]" context="{'group_by':'assigned_to'}" /> + domain="[]" context="{'group_by':'user_id'}" /> <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}" /> <separator orientation="vertical"/> @@ -259,7 +255,7 @@ <field name="type">calendar</field> <field name="priority" eval="2"/> <field name="arch" type="xml"> - <calendar string="Issues" date_start="date" color="assigned_to" date_delay="duration"> + <calendar string="Issues" date_start="date" color="user_id" date_delay="duration"> <field name="name"/> <field name="partner_id"/> </calendar> @@ -284,7 +280,7 @@ <button name="prev_type" string="Previous" type="object" icon="gtk-go-back" help="Change to Previous Stage"/> <button name="next_type" string="Next" type="object" icon="gtk-go-forward" help="Change to Next Stage"/> <field name="version_id"/> - <field name="assigned_to"/> + <field name="user_id"/> <field name="state"/> <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel"/> <button name="case_close" string="Done" states="open,draft,pending" type="object" icon="gtk-jump-to"/> @@ -307,7 +303,7 @@ <separator orientation="vertical"/> <group> <field name="name" select='1' string="Feature description"/> - <field name="assigned_to" select="1"/> + <field name="user_id" select="1"/> <field name="state" select="1"> <filter icon="terp-check" domain="[('state','in',('open','draft'))]" help="Current Features" name="current_feature"/> <filter icon="terp-camera_test" domain="[('state','=','open')]" help="Open Features"/> |