diff options
| author | Rucha (Open ERP) <rpa@tinyerp.com> | 2011-09-22 11:44:19 +0530 |
|---|---|---|
| committer | Rucha (Open ERP) <rpa@tinyerp.com> | 2011-09-22 11:44:19 +0530 |
| commit | 0e861ae34aa073dedb1df70000af8d1d25d085ee (patch) | |
| tree | c998fedd13e8a0f0fc33f5e7d95a8ed6d72b6908 /addons/project_issue/project_issue_view.xml | |
| parent | db8ba59c907e0ef8d0063e714290e8a2c33a42af (diff) | |
| parent | 3b643521330363310a330c22aab0de161870939b (diff) | |
[MERGE]: Merge with latest trunk-addons and resolved conflicts in bank statement as new state was added in statement
bzr revid: rpa@tinyerp.com-20110922061419-cvaza3f5050o0b85
Diffstat (limited to 'addons/project_issue/project_issue_view.xml')
| -rw-r--r-- | addons/project_issue/project_issue_view.xml | 43 |
1 files changed, 20 insertions, 23 deletions
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml index 6f213ec61e2..963cd054a53 100644 --- a/addons/project_issue/project_issue_view.xml +++ b/addons/project_issue/project_issue_view.xml @@ -100,11 +100,11 @@ <tree string="History"> <field name="display_text" string="History Information"/> <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" /> + <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"> @@ -118,13 +118,13 @@ <page string="Details"> <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"/> + <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': [('email_from', '!=', False)]}"> - <field name="display_text" colspan="4" nolabel="1" height="250"/> + <field name="body_text" colspan="4" nolabel="1" height="250"/> </group> </page> <page string="Attachments"> @@ -138,9 +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="%(mail.action_email_compose_message_wizard)d" - 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"> @@ -214,12 +214,9 @@ <filter string="To Do" domain="[('state','=','open')]" help="To Do Issues" icon="terp-camera_test"/> <filter string="Pending" domain="[('state','=','pending')]" help="Pending Issues" icon="terp-gtk-media-pause"/> <separator orientation="vertical"/> - <filter icon="terp-go-today" string="Today" separator="1" domain="[('create_date','>=',time.strftime('%%Y-%%m-%%d')),('create_date','<', (datetime.date.today() + datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d'))]" help="Today's bugs" /> - <separator orientation="vertical"/> - <field name="name"/> - <field name="partner_id" groups="base.group_extended"/> + <field name="name" string="Issue / Partner" filter_domain="['|', '|', ('partner_id','ilike',self), ('email_from','ilike',self), ('name','ilike',self)]"/> <field name="user_id"> - <filter domain="[('user_id','=',False)]" help="Unassigned Issues" icon="terp-personal-" separator="1"/> + <filter domain="[('user_id','=',False)]" help="Unassigned Issues" icon="terp-personal-" /> </field> <field name="project_id"/> <field name="id"/> @@ -301,17 +298,17 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Feature Tracker Search"> - <filter icon="terp-go-today" string="Today" separator="1" + <filter icon="terp-go-today" string="Today" domain="[('date','=',time.strftime('%%Y-%%m-%%d'))]" help="Today's features"/> <separator orientation="vertical"/> <group> - <field name="name" select='1' string="Feature description"/> - <field name="user_id" select="1"/> - <field name="state" select="1"> + <field name="name" string="Feature description"/> + <field name="user_id"/> + <field name="state"> <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"/> </field> - <field name="project_id" select="1" string="Project"/> + <field name="project_id" string="Project"/> </group> </search> </field> |