diff options
| author | pso (OpenERP) <pso@tinyerp.com> | 2012-07-25 18:23:32 +0530 |
|---|---|---|
| committer | pso (OpenERP) <pso@tinyerp.com> | 2012-07-25 18:23:32 +0530 |
| commit | e5da0e191b1c3d778f7d6d2ba4f2ff0fc726ecbd (patch) | |
| tree | 4314f65784b65fdcbdd88f3c556c57ccdc4db3d8 /addons/mail | |
| parent | 082513a80587c3732f13a89edda7c5ba4fcd8410 (diff) | |
| parent | ac580aeae09c2bc76e7c5c090567b7bc7ba24b25 (diff) | |
[MERGE] Merged with main branch
bzr revid: pso@tinyerp.com-20120725125332-7qe6b3l0fjryast2
Diffstat (limited to 'addons/mail')
| -rw-r--r-- | addons/mail/__openerp__.py | 8 | ||||
| -rw-r--r-- | addons/mail/mail_message_view.xml | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/addons/mail/__openerp__.py b/addons/mail/__openerp__.py index abb290332a7..ee22b0c153f 100644 --- a/addons/mail/__openerp__.py +++ b/addons/mail/__openerp__.py @@ -29,19 +29,19 @@ A bussiness oriented Social Networking with a fully-integrated email and message management. ===================================================================== + The Social Networking module provides an unified social network abstraction layer allowing applications to display a complete -communication history on documents.It gives the users the possibility +communication history on documents. It gives the users the possibility to read and send messages and emails in an unified way. It also provides a feeds page combined to a subscription mechanism, that allows to follow documents, and to be constantly updated about recent news. -The main features of the module are : - +The main features of the module are: * a clean and renewed communication history for any OpenERP - document that can act as a discussion topic, + document that can act as a discussion topic, * a discussion mean on documents, * a subscription mechanism to be updated about new messages on interesting documents, diff --git a/addons/mail/mail_message_view.xml b/addons/mail/mail_message_view.xml index 634b5317d27..eb68ab70a3b 100644 --- a/addons/mail/mail_message_view.xml +++ b/addons/mail/mail_message_view.xml @@ -82,7 +82,7 @@ <search string="Messages Search"> <field name="user_id"/> <field name="body"/> - <field name="subject"/> + <field name="subject" filter_domain="['|', ('subject', 'ilike', self), ('record_name', 'ilike', self)]" /> <field name="type"/> <filter icon="terp-personal+" string="My Feeds" name="my_feeds" help="My Feeds" |