diff options
| author | Rajesh Prajapati (OpenERP) <rpr@tinyerp.com> | 2012-10-05 17:35:03 +0530 |
|---|---|---|
| committer | Rajesh Prajapati (OpenERP) <rpr@tinyerp.com> | 2012-10-05 17:35:03 +0530 |
| commit | cdff4611b0a588546afb9b706bbd2d0fbda7bf2f (patch) | |
| tree | 0a0a99b33e52547987ab69b2a29f3ec23c188142 /addons/mail/mail_thread_view.xml | |
| parent | 7202b8f7efbc76e2a40b1a4a8d7a95ed0d2ce573 (diff) | |
| parent | ba97319054728490e4d8a601382dd6fd2ab4f970 (diff) | |
[MERGE] merge with main addons
bzr revid: rpr@tinyerp.com-20121005120503-07e0zo8ucv8k0q3s
Diffstat (limited to 'addons/mail/mail_thread_view.xml')
| -rw-r--r-- | addons/mail/mail_thread_view.xml | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/addons/mail/mail_thread_view.xml b/addons/mail/mail_thread_view.xml index b4b1aade755..3507e7c449f 100644 --- a/addons/mail/mail_thread_view.xml +++ b/addons/mail/mail_thread_view.xml @@ -12,16 +12,22 @@ <menuitem id="mail_feeds" name="Feeds" parent="mail.mail_feeds_main" groups="base.group_user" sequence="10"/> <menuitem id="mail_my_stuff" name="Organizer" parent="mail.mail_feeds_main"/> - <record id="mail_wallfeeds" model="ir.ui.menu"> - <field name="name">My Feeds</field> + <record id="mail_inboxfeeds" model="ir.ui.menu"> + <field name="name">Inbox</field> <field name="sequence" eval="10"/> - <field name="action" ref="action_mail_all_feeds"/> + <field name="action" ref="action_mail_inbox_feeds"/> <field name="parent_id" ref="mail_feeds"/> </record> - <record id="mail_myfeeds" model="ir.ui.menu"> - <field name="name">My Posts</field> + <record id="mail_archivesfeeds" model="ir.ui.menu"> + <field name="name">Archives</field> <field name="sequence" eval="11"/> - <field name="action" ref="action_mail_my_feeds"/> + <field name="action" ref="action_mail_archives_feeds"/> + <field name="parent_id" ref="mail_feeds"/> + </record> + <record id="mail_sentfeeds" model="ir.ui.menu"> + <field name="name">Sent</field> + <field name="sequence" eval="12"/> + <field name="action" ref="action_mail_sent_feeds"/> <field name="parent_id" ref="mail_feeds"/> </record> |