From c984e286f65bb7b46f2a437f71e3c1ccdfc89d62 Mon Sep 17 00:00:00 2001
From: "ajay javiya (OpenERP)" <aja@tinyerp.com>
Date: Mon, 19 Nov 2012 14:56:52 +0530
Subject: [PATCH 1/3] [FIX]:fix issue for  launch security and user message

bzr revid: aja@tinyerp.com-20121119092652-69f58c4au9rlei95
---
 addons/lunch/security/lunch_security.xml | 1 +
 addons/mail/static/src/js/mail.js        | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/lunch/security/lunch_security.xml b/addons/lunch/security/lunch_security.xml
index 75ab0836b12..3d7d6fd5c28 100644
--- a/addons/lunch/security/lunch_security.xml
+++ b/addons/lunch/security/lunch_security.xml
@@ -3,6 +3,7 @@
     <data>
         <record id="group_lunch_manager" model="res.groups">
             <field name="name">Lunch / Manager</field>
+            <field name="implied_ids" eval="[(4, ref('group_lunch_user'))]"/>
         </record>
         <record id="group_lunch_user" model="res.groups">
             <field name="name">Lunch / User</field>
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index dc265a343d5..e1793d02223 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -274,7 +274,7 @@ openerp.mail = function (session) {
             //formating and add some fields for render
             if (this._date) {
                 this.date = session.web.format_value(this._date, {type:"datetime"});
-                this.timerelative = $.timeago(this.date);
+                this.timerelative = $.timeago(this._date);
             } 
             if (this.type == 'email' && (!this.author_id || !this.author_id[0])) {
                 this.avatar = ('/mail/static/src/img/email_icon.png');

From 4b368fa865a18dc13395b1bed4cca904310e4bfa Mon Sep 17 00:00:00 2001
From: Jigar Amin <jam@tinyerp.com>
Date: Mon, 19 Nov 2012 15:45:37 +0530
Subject: [PATCH 2/3] [FIX] lunch security reorder the reocrd load  sequence

bzr revid: jam@tinyerp.com-20121119101537-649dj46kjrhra4fc
---
 addons/lunch/security/lunch_security.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/lunch/security/lunch_security.xml b/addons/lunch/security/lunch_security.xml
index 3d7d6fd5c28..ad45ec92511 100644
--- a/addons/lunch/security/lunch_security.xml
+++ b/addons/lunch/security/lunch_security.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" ?>
 <openerp>
     <data>
+        <record id="group_lunch_user" model="res.groups">
+            <field name="name">Lunch / User</field>
+        </record>
         <record id="group_lunch_manager" model="res.groups">
             <field name="name">Lunch / Manager</field>
             <field name="implied_ids" eval="[(4, ref('group_lunch_user'))]"/>
         </record>
-        <record id="group_lunch_user" model="res.groups">
-            <field name="name">Lunch / User</field>
-        </record>
     </data>
 </openerp>

From 1387cd9bcaa413068e26db2d66000ca1c22261f6 Mon Sep 17 00:00:00 2001
From: Jigar Amin <jam@tinyerp.com>
Date: Tue, 20 Nov 2012 11:30:30 +0530
Subject: [PATCH 3/3] [IMP] Fix the timeagolib timezone conversion and passing
 timezone datetime string

bzr revid: jam@tinyerp.com-20121120060030-33w2u9v72kazd3ns
---
 addons/mail/static/src/js/mail.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index e1793d02223..d389bea801c 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -270,11 +270,9 @@ openerp.mail = function (session) {
 
         /* Convert date, timerelative and avatar in displayable data. */
         format_data: function () {
-
             //formating and add some fields for render
             if (this._date) {
-                this.date = session.web.format_value(this._date, {type:"datetime"});
-                this.timerelative = $.timeago(this._date);
+                this.timerelative = $.timeago(this._date+"Z");
             } 
             if (this.type == 'email' && (!this.author_id || !this.author_id[0])) {
                 this.avatar = ('/mail/static/src/img/email_icon.png');