From b8a9b420e837cd37aa31fae4fb03ba32cba5bab8 Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Tue, 30 Oct 2012 11:56:58 +0100 Subject: [IMP] mail: -typof_thread option, +check_for_destroy method bzr revid: chm@openerp.com-20121030105658-j5k6zctwmx7wwyfu --- addons/mail/mail_thread_view.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'addons/mail/mail_thread_view.xml') diff --git a/addons/mail/mail_thread_view.xml b/addons/mail/mail_thread_view.xml index 07b24725b05..70a0d7a96aa 100644 --- a/addons/mail/mail_thread_view.xml +++ b/addons/mail/mail_thread_view.xml @@ -5,35 +5,35 @@ Inbox mail.wall + 'context': {'default_model': 'res.users', 'default_res_id': uid} }""/> To: me mail.wall + 'context': {'default_model': 'res.users', 'default_res_id': uid} }""/> Favorites mail.wall + 'context': {'default_model': 'res.users', 'default_res_id': uid} }""/> Archives mail.wall + 'context': {'default_model': 'res.users', 'default_res_id': uid} }""/> Sent mail.wall + 'context': {'default_model': 'res.users', 'default_res_id': uid} }""/> -- cgit v1.2.3 From 1bbc2c00633516a5901de3243ee1fb905a51b916 Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Wed, 31 Oct 2012 15:56:10 +0100 Subject: [IMP] mail: js, compose, expandable and message extend messageglobal bzr revid: chm@openerp.com-20121031145610-e8m9l7lsmzzjru9k --- addons/mail/mail_thread_view.xml | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) (limited to 'addons/mail/mail_thread_view.xml') diff --git a/addons/mail/mail_thread_view.xml b/addons/mail/mail_thread_view.xml index 70a0d7a96aa..50da8d6e5b9 100644 --- a/addons/mail/mail_thread_view.xml +++ b/addons/mail/mail_thread_view.xml @@ -5,35 +5,45 @@ Inbox mail.wall + 'context': {'default_model': 'res.users', 'default_res_id': uid, 'view_mailbox': True} }""/> + +

+ Click to define a new sales tag. +

+ Create specific tags that fit your company's activities + to better classify and analyse your leads and opportunities. + Such categories could for instance reflect your product + structure or the different types of sales you do. +

+ To: me mail.wall + 'context': {'default_model': 'res.users', 'default_res_id': uid, 'view_mailbox': True} }""/> - Favorites + Todo mail.wall + 'context': {'default_model': 'res.users', 'default_res_id': uid, 'view_mailbox': True} }""/> - Archives + Done mail.wall + 'context': {'default_model': 'res.users', 'default_res_id': uid, 'view_mailbox': True} }""/> Sent mail.wall + 'context': {'default_model': 'res.users', 'default_res_id': uid, 'view_mailbox': True} }""/> @@ -61,13 +71,13 @@ - Favorites + Todo - Archives + Done -- cgit v1.2.3 From d0f603bbd8743b92aeff40599535fb2bcaf637b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Wed, 31 Oct 2012 16:55:56 +0100 Subject: [IMP] mail: Emails menu renamed to Messages. bzr revid: tde@openerp.com-20121031155556-tw3bvgcdm08p9i1e --- addons/mail/mail_thread_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons/mail/mail_thread_view.xml') diff --git a/addons/mail/mail_thread_view.xml b/addons/mail/mail_thread_view.xml index 50da8d6e5b9..2156ccd63a8 100644 --- a/addons/mail/mail_thread_view.xml +++ b/addons/mail/mail_thread_view.xml @@ -49,7 +49,7 @@ - -- cgit v1.2.3 From 35ef78f3312fa83865585367657316c310fbb152 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Wed, 31 Oct 2012 17:27:23 +0100 Subject: [IMP] mail: updated domains and contexts for the various mailboxes. bzr revid: tde@openerp.com-20121031162723-u9s5jyijzttvk5f6 --- addons/mail/mail_thread_view.xml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'addons/mail/mail_thread_view.xml') diff --git a/addons/mail/mail_thread_view.xml b/addons/mail/mail_thread_view.xml index 2156ccd63a8..5ca1ac6ec40 100644 --- a/addons/mail/mail_thread_view.xml +++ b/addons/mail/mail_thread_view.xml @@ -4,7 +4,8 @@ Inbox mail.wall -

@@ -21,15 +22,15 @@ To: me mail.wall - + Todo mail.wall + 'context': {'search_default_message_unread': True, 'default_model': 'res.users', 'default_res_id': uid, 'view_mailbox': True} }""/> -- cgit v1.2.3 From fb222404e5c0b2c5d43c57dab931294ad2edd25d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Fri, 2 Nov 2012 14:54:26 +0100 Subject: [IMP] mail: tried to have alwsays read/unread buttons; some code cleaning; added demo data. bzr revid: tde@openerp.com-20121102135426-5np5wtupzdhx0dz4 --- addons/mail/mail_thread_view.xml | 39 +++++++++++++++++++++++++++++---------- 1 file changed, 29 insertions(+), 10 deletions(-) (limited to 'addons/mail/mail_thread_view.xml') diff --git a/addons/mail/mail_thread_view.xml b/addons/mail/mail_thread_view.xml index 5ca1ac6ec40..489295e71da 100644 --- a/addons/mail/mail_thread_view.xml +++ b/addons/mail/mail_thread_view.xml @@ -5,8 +5,14 @@ Inbox mail.wall + 'domain': [ + ('notification_ids.partner_id.user_ids', 'in', [uid]), + ('to_read', '=', True), + ('favorite_user_ids.user_ids', 'not in', [uid]) + ], + 'context': {'default_model': 'res.users', 'default_res_id': uid}, + 'view_mailbox': True, + 'read_action': 'read', }""/>

Click to define a new sales tag. @@ -22,29 +28,42 @@ To: me mail.wall - + Todo mail.wall - + Done mail.wall - + Sent mail.wall - + -- cgit v1.2.3 From cec24819be6352c684f7110255efd799399b1be5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Fri, 2 Nov 2012 15:22:45 +0100 Subject: [FIX] mail: fixed domain of mailboxes. bzr revid: tde@openerp.com-20121102142245-4azfbhbfiankdsqy --- addons/mail/mail_thread_view.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'addons/mail/mail_thread_view.xml') diff --git a/addons/mail/mail_thread_view.xml b/addons/mail/mail_thread_view.xml index 489295e71da..db33a06bd61 100644 --- a/addons/mail/mail_thread_view.xml +++ b/addons/mail/mail_thread_view.xml @@ -8,7 +8,7 @@ 'domain': [ ('notification_ids.partner_id.user_ids', 'in', [uid]), ('to_read', '=', True), - ('favorite_user_ids.user_ids', 'not in', [uid]) + ('favorite_user_ids', 'not in', [uid]) ], 'context': {'default_model': 'res.users', 'default_res_id': uid}, 'view_mailbox': True, @@ -39,7 +39,7 @@ Todo mail.wall -- cgit v1.2.3 From 1db87cc080f79121dbb7bc6493f170fdd0c17f2b Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Mon, 5 Nov 2012 11:04:44 +0100 Subject: [IMP] mail: change check_for_destroy method js into check_for_rerender with rerender option bzr revid: chm@openerp.com-20121105100444-yozpfk4xagf8siau --- addons/mail/mail_thread_view.xml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'addons/mail/mail_thread_view.xml') diff --git a/addons/mail/mail_thread_view.xml b/addons/mail/mail_thread_view.xml index db33a06bd61..5e8cb69f146 100644 --- a/addons/mail/mail_thread_view.xml +++ b/addons/mail/mail_thread_view.xml @@ -15,12 +15,7 @@ 'read_action': 'read', }""/>

- Click to define a new sales tag. -

- Create specific tags that fit your company's activities - to better classify and analyse your leads and opportunities. - Such categories could for instance reflect your product - structure or the different types of sales you do. + There are no message in your mailbox for this search.

-- cgit v1.2.3 From 356fc45fac060faeab2a7bf7ac53df0ff3692cf2 Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Mon, 5 Nov 2012 12:25:17 +0100 Subject: [IMP] mail: add view_inbox options on js. Inside the inbox, when the user mark a message as read/done, don't apply this value, for the stared/favorite message. bzr revid: chm@openerp.com-20121105112517-tfkao2nuukewvm2y --- addons/mail/mail_thread_view.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'addons/mail/mail_thread_view.xml') diff --git a/addons/mail/mail_thread_view.xml b/addons/mail/mail_thread_view.xml index 5e8cb69f146..21746212e3c 100644 --- a/addons/mail/mail_thread_view.xml +++ b/addons/mail/mail_thread_view.xml @@ -12,6 +12,7 @@ ], 'context': {'default_model': 'res.users', 'default_res_id': uid}, 'view_mailbox': True, + 'view_inbox': True, 'read_action': 'read', }""/>

-- cgit v1.2.3 From 662b94aa1ef7c2f2e5a600b63d1adcbcf5d5cb16 Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Mon, 5 Nov 2012 13:59:32 +0100 Subject: [IMP] mail: Message 'Done' box : domain become default search bzr revid: chm@openerp.com-20121105125932-1s82q388rbrb7ulg --- addons/mail/mail_thread_view.xml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'addons/mail/mail_thread_view.xml') diff --git a/addons/mail/mail_thread_view.xml b/addons/mail/mail_thread_view.xml index 21746212e3c..cd671d0954c 100644 --- a/addons/mail/mail_thread_view.xml +++ b/addons/mail/mail_thread_view.xml @@ -45,10 +45,8 @@ Done mail.wall -- cgit v1.2.3 From ad4d823011db3e6e0bd9caba609fa99463ad0b6f Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Mon, 5 Nov 2012 16:54:50 +0100 Subject: [IMP] mail: launch widget with action (action contain params, context...) bzr revid: chm@openerp.com-20121105155450-3uyauk63cc2nakkn --- addons/mail/mail_thread_view.xml | 57 ++++++++++++++++++++++++++++++---------- 1 file changed, 43 insertions(+), 14 deletions(-) (limited to 'addons/mail/mail_thread_view.xml') diff --git a/addons/mail/mail_thread_view.xml b/addons/mail/mail_thread_view.xml index cd671d0954c..2759d252ee6 100644 --- a/addons/mail/mail_thread_view.xml +++ b/addons/mail/mail_thread_view.xml @@ -4,60 +4,89 @@ Inbox mail.wall - { + 'default_model': 'res.users', + 'default_res_id': uid + } + { 'domain': [ - ('notification_ids.partner_id.user_ids', 'in', [uid]), - ('to_read', '=', True), - ('favorite_user_ids', 'not in', [uid]) - ], - 'context': {'default_model': 'res.users', 'default_res_id': uid}, + ('notification_ids.partner_id.user_ids', 'in', [uid]), + ('to_read', '=', True), + ('favorite_user_ids', 'not in', [uid]) + ], 'view_mailbox': True, 'view_inbox': True, - 'read_action': 'read', }""/> - -

+ 'read_action': 'read' + } + There are no message in your mailbox for this search. -

To: me mail.wall + { + 'default_model': 'res.users', + 'default_res_id': uid, + 'search_default_message_unread': True + } + + There are no message in your private mailbox for this search. + Todo mail.wall + { + 'default_model': 'res.users', + 'default_res_id': uid, + 'search_default_message_unread': True + } + + There are no message in your todo mailbox for this search. + Done mail.wall + { + 'default_model': 'res.users', + 'default_res_id': uid, + 'search_default_message_unread': True + } + + There are no message for this search. + Sent mail.wall + { + 'default_model': 'res.users', + 'default_res_id': uid + } + + There are no message for this search. + -- cgit v1.2.3 From af94a6a2c3506dfe66d636bf267e5c33a401e8a7 Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Mon, 5 Nov 2012 18:58:31 +0100 Subject: [FIX] mail: launch widget with action (action contain params, context...) bzr revid: chm@openerp.com-20121105175831-dfgglb63wtoibqy4 --- addons/mail/mail_thread_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons/mail/mail_thread_view.xml') diff --git a/addons/mail/mail_thread_view.xml b/addons/mail/mail_thread_view.xml index 2759d252ee6..7f722d6a586 100644 --- a/addons/mail/mail_thread_view.xml +++ b/addons/mail/mail_thread_view.xml @@ -63,7 +63,7 @@ { 'default_model': 'res.users', 'default_res_id': uid, - 'search_default_message_unread': True + 'search_default_message_read': True } { + There are no message in your mailbox for this search. -- cgit v1.2.3 From 659f5c2210e96f650444e05f7016404f0ffecfaf Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Thu, 8 Nov 2012 13:31:41 +0100 Subject: [IMP] mail: change menu done in Archives bzr revid: chm@openerp.com-20121108123141-7bje750pywdb54p7 --- addons/mail/mail_thread_view.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'addons/mail/mail_thread_view.xml') diff --git a/addons/mail/mail_thread_view.xml b/addons/mail/mail_thread_view.xml index 1f4c75e6bb4..a30c6f8736d 100644 --- a/addons/mail/mail_thread_view.xml +++ b/addons/mail/mail_thread_view.xml @@ -58,7 +58,7 @@ - Done + Archives mail.wall { 'default_model': 'res.users', @@ -120,7 +120,7 @@ - Done + Archives -- cgit v1.2.3 From e093a555016a232a34855a93b55556cfca80440d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Fri, 9 Nov 2012 15:00:20 +0100 Subject: [IMP] mail: messages menus: needaction coutners are back. bzr revid: tde@openerp.com-20121109140020-3zm12k0unkkqhnpi --- addons/mail/mail_thread_view.xml | 3 +++ 1 file changed, 3 insertions(+) (limited to 'addons/mail/mail_thread_view.xml') diff --git a/addons/mail/mail_thread_view.xml b/addons/mail/mail_thread_view.xml index a30c6f8736d..2a13a737d24 100644 --- a/addons/mail/mail_thread_view.xml +++ b/addons/mail/mail_thread_view.xml @@ -4,6 +4,7 @@ Inbox mail.wall + mail.message { 'default_model': 'res.users', 'default_res_id': uid @@ -26,6 +27,7 @@ To: me mail.wall + mail.message { 'default_model': 'res.users', 'default_res_id': uid, @@ -43,6 +45,7 @@ Todo mail.wall + mail.message { 'default_model': 'res.users', 'default_res_id': uid, -- cgit v1.2.3 From 07079344c98be8e661ece5ab1e799095ca17fa20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Fri, 9 Nov 2012 16:04:00 +0100 Subject: [IMP] mail: improved message on void mailboxes. bzr revid: tde@openerp.com-20121109150400-njb8gor1fiizho6u --- addons/mail/mail_thread_view.xml | 45 +++++++++++++++++++++++++++++++--------- 1 file changed, 35 insertions(+), 10 deletions(-) (limited to 'addons/mail/mail_thread_view.xml') diff --git a/addons/mail/mail_thread_view.xml b/addons/mail/mail_thread_view.xml index 2a13a737d24..b568cacfa53 100644 --- a/addons/mail/mail_thread_view.xml +++ b/addons/mail/mail_thread_view.xml @@ -19,8 +19,15 @@ 'view_inbox': True, 'read_action': 'read' }""/> - - There are no message in your mailbox for this search. + +

+ Hurray! No message here! +

+ Congratulations! You have processed all your incoming emails. + Remember that when you receive new messages, you can either + set them as done, or use the star button to send those messages + into your Todo mailbox. +

@@ -37,8 +44,15 @@ 'domain': [('partner_ids.user_ids', 'in', [uid])], 'view_mailbox': True, 'read_action': 'read', }""/> - - There are no message in your private mailbox for this search. + +

+ No message here! +

+ There are no new messages matching the current search + that were directly sent to you. + Remember you can always uncheck the Read filter to see + messages sent to you that you already read. +

@@ -55,8 +69,15 @@ 'domain': [('favorite_user_ids', 'in', [uid])], 'view_mailbox': True, 'read_action': 'read', }""/> - - There are no message in your todo mailbox for this search. + +

+ Hurray! No message here! +

+ Congratulations! You have processed all your messages in + your todo list, or at least those matching your search. + Remember you can always search for read messages by + unchecking the Read filter. +

@@ -72,8 +93,10 @@ 'domain': [('notification_ids.partner_id.user_ids', 'in', [uid])], 'view_mailbox': True, 'read_action': 'unread', }""/> - - There are no message for this search. + +

+ There are no message for this search. +

@@ -87,8 +110,10 @@ - - There are no message for this search. + +

+ There are no message for this search. +

-- cgit v1.2.3 From ccc8069a4c13c8833e4e88bc9bda15af5dad6e3d Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Mon, 12 Nov 2012 19:39:19 +0100 Subject: [IMP] style of empty mail boxes bzr revid: fp@tinyerp.com-20121112183919-oh8ccaz2w3nnvf2h --- addons/mail/mail_thread_view.xml | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-) (limited to 'addons/mail/mail_thread_view.xml') diff --git a/addons/mail/mail_thread_view.xml b/addons/mail/mail_thread_view.xml index b568cacfa53..9e6a9ad1feb 100644 --- a/addons/mail/mail_thread_view.xml +++ b/addons/mail/mail_thread_view.xml @@ -21,12 +21,11 @@ }""/>

- Hurray! No message here! + Good Job! Your inbox is empty.

- Congratulations! You have processed all your incoming emails. - Remember that when you receive new messages, you can either - set them as done, or use the star button to send those messages - into your Todo mailbox. + Your inbox contains private messages or emails sent to you + as well as information related to documents or people you + follow.

@@ -46,12 +45,9 @@ 'read_action': 'read', }""/>

- No message here! + No private message.

- There are no new messages matching the current search - that were directly sent to you. - Remember you can always uncheck the Read filter to see - messages sent to you that you already read. + This list contains messages sent to you.

@@ -71,12 +67,9 @@ 'read_action': 'read', }""/>

- Hurray! No message here! + You did it!

- Congratulations! You have processed all your messages in - your todo list, or at least those matching your search. - Remember you can always search for read messages by - unchecking the Read filter. + No more todo.

@@ -95,7 +88,7 @@ 'read_action': 'unread', }""/>

- There are no message for this search. + No message found.

@@ -112,7 +105,10 @@ 'view_mailbox': True, }""/>

- There are no message for this search. + No message sent yet. +

+ Click on the top-right icon to compose a message. This + message will be sent by email if it's an internal contact.

-- cgit v1.2.3 From 52bd8f0ef86bb4755bdf50f5b9bd4de09bf3ccf8 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Mon, 12 Nov 2012 23:03:32 +0100 Subject: imp bzr revid: fp@openerp.com-20121112220332-mfvcak06div08y7c --- addons/mail/mail_thread_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons/mail/mail_thread_view.xml') diff --git a/addons/mail/mail_thread_view.xml b/addons/mail/mail_thread_view.xml index 9e6a9ad1feb..484fe2006d9 100644 --- a/addons/mail/mail_thread_view.xml +++ b/addons/mail/mail_thread_view.xml @@ -21,7 +21,7 @@ }""/>

- Good Job! Your inbox is empty. + Good Job! Your inbox is empty.

Your inbox contains private messages or emails sent to you as well as information related to documents or people you -- cgit v1.2.3 From e64269daacb1cf0d6ae7a247d872c1e9e2042064 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Mon, 12 Nov 2012 23:21:19 +0100 Subject: imp bzr revid: fp@openerp.com-20121112222119-r5j5xj55d5px114x --- addons/mail/mail_thread_view.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'addons/mail/mail_thread_view.xml') diff --git a/addons/mail/mail_thread_view.xml b/addons/mail/mail_thread_view.xml index 484fe2006d9..2c44f503293 100644 --- a/addons/mail/mail_thread_view.xml +++ b/addons/mail/mail_thread_view.xml @@ -67,9 +67,10 @@ 'read_action': 'read', }""/>

- You did it! + No todo!

- No more todo. + When you process messages in your inbox, you can mark some + as todo. From this menu, you can process all your todo.

-- cgit v1.2.3 From 569f64d45a86a9a104428a597209c213658ad7d7 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Tue, 13 Nov 2012 00:09:36 +0100 Subject: [IMP] Messages -> MEssaging bzr revid: fp@openerp.com-20121112230936-vazxpy35qoszz8vf --- addons/mail/mail_thread_view.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'addons/mail/mail_thread_view.xml') diff --git a/addons/mail/mail_thread_view.xml b/addons/mail/mail_thread_view.xml index 2c44f503293..cdeade04d84 100644 --- a/addons/mail/mail_thread_view.xml +++ b/addons/mail/mail_thread_view.xml @@ -117,13 +117,13 @@ - - + -- cgit v1.2.3 From 25c684b1712796fad879596d19fa27cafbe03846 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Thu, 15 Nov 2012 10:54:00 +0100 Subject: [FIX] Chatter: fixed posting on user/partner. Cleaned a bit default options of mail.js. bzr revid: tde@openerp.com-20121115095400-u7h6rw8ltp0xprtt --- addons/mail/mail_thread_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons/mail/mail_thread_view.xml') diff --git a/addons/mail/mail_thread_view.xml b/addons/mail/mail_thread_view.xml index cdeade04d84..3a37218c813 100644 --- a/addons/mail/mail_thread_view.xml +++ b/addons/mail/mail_thread_view.xml @@ -7,7 +7,7 @@ mail.message { 'default_model': 'res.users', - 'default_res_id': uid + 'default_res_id': uid, }