diff options
| author | Thibault Delavallée <tde@openerp.com> | 2013-03-15 12:43:38 +0100 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2013-03-15 12:43:38 +0100 |
| commit | 4484a3197ca558341ce595df41ffdc072a8d05d2 (patch) | |
| tree | 160895b3cd052ef5a0661ed2ee02a53494dab207 /addons/mail/mail_thread_view.xml | |
| parent | 4387187b8bdac6223979e9a652b6ef6a19096804 (diff) | |
| parent | d0f5b28bd0da703e3d5a23cb68db91a6a87482dc (diff) | |
[MERGE] Sync with trunk, resolved conflicts due to forward port of 7.0
bzr revid: tde@openerp.com-20130315114338-54scb00rkp7zwr30
Diffstat (limited to 'addons/mail/mail_thread_view.xml')
| -rw-r--r-- | addons/mail/mail_thread_view.xml | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/addons/mail/mail_thread_view.xml b/addons/mail/mail_thread_view.xml index 6769fb0d063..75c86e4645d 100644 --- a/addons/mail/mail_thread_view.xml +++ b/addons/mail/mail_thread_view.xml @@ -6,7 +6,7 @@ <field name="tag">mail.wall</field> <field name="res_model">mail.message</field> <field name="context">{ - 'default_model': 'res.users', + 'default_model': 'res.users', 'default_res_id': uid, }</field> <field name="params" eval=""{ @@ -34,8 +34,8 @@ <field name="tag">mail.wall</field> <field name="res_model">mail.message</field> <field name="context">{ - 'default_model': 'res.users', - 'default_res_id': uid, + 'default_model': 'res.users', + 'default_res_id': uid, 'search_default_message_unread': True }</field> <field name="params" eval=""{ @@ -44,7 +44,8 @@ ], 'view_mailbox': True, 'read_action': 'read', - 'show_compose_message': False }""/> + 'show_compose_message': False + }""/> <field name="help" type="html"> <p> <b>No private message.</b> @@ -59,8 +60,8 @@ <field name="tag">mail.wall</field> <field name="res_model">mail.message</field> <field name="context">{ - 'default_model': 'res.users', - 'default_res_id': uid, + 'default_model': 'res.users', + 'default_res_id': uid, 'search_default_message_unread': True }</field> <field name="params" eval=""{ @@ -69,7 +70,8 @@ ], 'view_mailbox': True, 'read_action': 'read', - 'compose_as_todo': True }""/> + 'compose_as_todo': True + }""/> <field name="help" type="html"> <p> <b>No todo.</b> @@ -84,7 +86,7 @@ <field name="name">Archives</field> <field name="tag">mail.wall</field> <field name="context">{ - 'default_model': 'res.users', + 'default_model': 'res.users', 'default_res_id': uid }</field> <field name="params" eval=""{ @@ -94,7 +96,8 @@ ('author_id.user_ids', 'in', [uid]), ], 'view_mailbox': True, - 'show_compose_message': False }""/> + 'show_compose_message': False + }""/> <field name="help" type="html"> <p> No message found and no message sent yet. |