diff options
| author | Mayur Maheshwari (OpenERP) <mma@tinyerp.com> | 2012-10-10 10:49:17 +0530 |
|---|---|---|
| committer | Mayur Maheshwari (OpenERP) <mma@tinyerp.com> | 2012-10-10 10:49:17 +0530 |
| commit | 79a84ffc5d2afaec71225b0e70dcccb79ecc8239 (patch) | |
| tree | 0e6b2ae62ba8d02d7c1d987b438a02ed7baea07f /addons/project_issue | |
| parent | 9487c2d9ba9381e04c677d861864e29895f48e8e (diff) | |
| parent | 49b102b54a860e655156fced1940ae6b913a7458 (diff) | |
[MERGE]: Merge with lp:openobject-addons
bzr revid: mma@tinyerp.com-20121010051917-0ep6z3xy0ff92kzo
Diffstat (limited to 'addons/project_issue')
| -rw-r--r-- | addons/project_issue/project_issue.py | 6 | ||||
| -rw-r--r-- | addons/project_issue/project_issue_view.xml | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py index 2004e1310f0..9e434078d2f 100644 --- a/addons/project_issue/project_issue.py +++ b/addons/project_issue/project_issue.py @@ -27,6 +27,7 @@ from tools.translate import _ import binascii import time import tools +from tools import html2plaintext class project_issue_version(osv.osv): _name = "project.issue.version" @@ -462,9 +463,11 @@ class project_issue(base_stage, osv.osv): if context is None: context = {} context['state_to'] = 'draft' + desc = html2plaintext(msg.get('body')) if msg.get('body') else '' + custom_values.update({ 'name': msg.get('subject') or _("No Subject"), - 'description': msg.get('body'), + 'description': desc, 'email_from': msg.get('from'), 'email_cc': msg.get('cc'), 'user_id': False, @@ -486,7 +489,6 @@ class project_issue(base_stage, osv.osv): if update_vals is None: update_vals = {} # Update doc values according to the message - update_vals['description'] = msg.get('body', '') if msg.get('priority'): update_vals['priority'] = msg.get('priority') # Parse 'body' to find values to update diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml index 3214b93c8d3..4cd9e2c19ff 100644 --- a/addons/project_issue/project_issue_view.xml +++ b/addons/project_issue/project_issue_view.xml @@ -198,7 +198,7 @@ <search string="Issue Tracker Search"> <field name="name" string="Issue" filter_domain="['|', '|',('partner_id','ilike',self),('email_from','ilike',self),('name','ilike',self)]"/> <field name="id"/> - <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="message_unread" domain="[('message_unread','=',True)]"/> + <filter icon="terp-mail-message-new" string="Unread Messages" name="message_unread" domain="[('message_unread','=',True)]"/> <separator/> <filter string="New" icon="terp-document-new" domain="[('state','=','draft')]" help="New Issues"/> <filter string="To Do" domain="[('state','=','open')]" help="To Do Issues" icon="terp-check"/> |