From c5ac7217a867146f6456978713cfe511c7a41966 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Thu, 4 Oct 2012 11:09:02 +0200
Subject: [PATCH 01/26] [IMP]mail: follower/partners list on wall posting
 message form

bzr revid: chm@openerp.com-20121004090902-p4b3t4zvs9frc3ky
---
 addons/mail/mail_message_view.xml   |  8 +--
 addons/mail/static/src/css/mail.css | 36 +++++++++---
 addons/mail/static/src/js/mail.js   | 89 +++++++++++++++--------------
 addons/mail/static/src/xml/mail.xml | 16 ++++++
 4 files changed, 93 insertions(+), 56 deletions(-)

diff --git a/addons/mail/mail_message_view.xml b/addons/mail/mail_message_view.xml
index 6d854d4d701..2992868bfcf 100644
--- a/addons/mail/mail_message_view.xml
+++ b/addons/mail/mail_message_view.xml
@@ -88,28 +88,28 @@
             <field name="name">Inbox</field>
             <field name="tag">mail.wall</field>
             <field name="params" eval="&quot;{'domain': [('is_private','=',True),('notification_ids.partner_id.user_ids', 'in', [uid]),('unread', '=', True)],
-                'context': {'default_model': 'res.users', 'default_res_id': uid, 'default_is_private':True} }&quot;"/>
+                'context': {'default_model': 'res.partner', 'default_res_id': uid, 'default_is_private':True} }&quot;"/>
         </record>
 
         <record id="action_mail_wall_feeds" model="ir.actions.client">
             <field name="name">Wall</field>
             <field name="tag">mail.wall</field>
             <field name="params" eval="&quot;{'domain': [('is_private','=',False),('notification_ids.partner_id.user_ids', 'in', [uid]),('unread', '=', True)],
-                'context': {'default_model': 'res.users', 'default_res_id': uid, 'default_is_private':False} }&quot;"/>
+                'context': {'default_model': 'res.partner', 'default_res_id': uid, 'default_is_private':False} }&quot;"/>
         </record>
 
         <record id="action_mail_archives_feeds" model="ir.actions.client">
             <field name="name">Archives</field>
             <field name="tag">mail.wall</field>
             <field name="params" eval="&quot;{'domain': [('notification_ids.partner_id.user_ids', 'in', [uid]),('unread', '=', False)],
-                'context': {'default_model': 'res.users', 'default_res_id': uid} }&quot;"/>
+                'context': {'default_model': 'res.partner', 'default_res_id': uid} }&quot;"/>
         </record>
 
         <record id="action_mail_sent_feeds" model="ir.actions.client">
             <field name="name">Sent</field>
             <field name="tag">mail.wall</field>
             <field name="params" eval="&quot;{'domain': [('author_id.user_ids', 'in', [uid])],
-                'context': {'default_model': 'res.users', 'default_res_id': uid} }&quot;"/>
+                'context': {'default_model': 'res.partner', 'default_res_id': uid} }&quot;"/>
         </record>
     </data>
 </openerp>
diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index 4ffb9013496..e5a9ad0c825 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -173,16 +173,41 @@
     clear: both; 
 }
 
+.openerp .oe_mail .oe_mail_compose_textarea .oe_mail_post_header .oe_all_follower {
+    color: blue;
+}
+.openerp .oe_mail .oe_mail_compose_textarea .oe_mail_post_header .oe_partner_follower a {
+    color: red;
+}
+.openerp .oe_mail .oe_mail_compose_textarea .oe_mail_post_header .oe_hidden,
+.openerp .oe_mail .oe_mail_compose_textarea .oe_mail_post_header .oe_more_hidden {
+    display: none;
+}
+
+.openerp .oe_mail .oe_mail_compose_textarea .oe_mail_post_bottom button.post {
+    float: left;
+}
+
+.openerp .oe_mail .oe_mail_compose_textarea .oe_mail_post_bottom span {
+    float: right;
+}
+
 /* default textarea (oe_mail_compose_textarea), and body textarea for compose form view */
-.openerp .oe_mail_msg_content textarea.oe_mail_compose_textarea,
-.openerp .oe_mail_msg_content div.oe_mail_compose_message_body textarea {
+.openerp .oe_mail.oe_semantic_html_override .oe_mail_compose_textarea textarea,
+.openerp .oe_mail div.oe_mail_compose_message_body textarea {
     width: 474px;
-    height: 60px;
+    min-height: 120px;
+    height: auto;
     padding: 4px;
     font-size: 12px;
     border: 1px solid #cccccc;
 }
 
+/* not top textarea */
+.openerp .oe_mail.oe_semantic_html_override .oe_semantic_html_override .oe_mail_compose_textarea textarea {
+    height: 60px;
+}
+
 /* default textarea (oe_mail_compose_textarea), and body textarea for compose form view */
 .openerp .oe_mail_msg_content textarea.oe_mail_compose_textarea:focus,
 .openerp .oe_mail_msg_content div.oe_mail_compose_message_body textarea:focus {
@@ -413,11 +438,6 @@
 }
 
 /* Dropdown menu */
-/*.openerp .oe_mail_msg_content .oe_dropdown_toggle {
-    position: absolute;
-    top: 0px;
-    right: 3px;
-}*/
 
 .openerp .oe_mail .oe_semantic_html_override {
     position: relative;
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 8915f1387e1..b2fa071b191 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -336,13 +336,40 @@ openerp.mail = function(session) {
          */
         init: function(parent, options) {
             this._super(parent);
+
+            // record parameters
+            var param =         options.parameters;
+            for(var i in param){
+                this[i] = param[i];
+            }
+            this.id =           param.id || -1;
+            this.model =        param.model || false;
+            this.parent_id=     param.parent_id || false;
+            this.res_id =       param.res_id || false;
+            this.type =         param.type || false;
+            this.is_author =    param.is_author || false;
+            this.subject =      param.subject || false;
+            this.name =         param.name || false;
+            this.record_name =  param.record_name || false;
+            this.body =         param.body || false;
+            this.vote_user_ids =param.vote_user_ids || [];
+            this.has_voted =    param.has_voted || false;
+
+            this.vote_user_ids = param.vote_user_ids || [];
+
+            this.unread =       param.unread || false;
+            this._date =        param.date;
+            this.author_id =    param.author_id || [];
+            this.attachment_ids = param.attachment_ids || [];
+            
+            // record domain and context
             this.domain = options.domain || [];
             this.context = _.extend({
                 default_model: 'mail.thread',
                 default_res_id:  0,
                 default_parent_id: false }, options.context || {});
 
-            // options
+            // record options
             this.options={
                 'thread' : options.options.thread,
                 'message' : {
@@ -356,31 +383,9 @@ openerp.mail = function(session) {
                     'truncate_limit':         options.options.message.truncate_limit || 250,
                 }
             };
+
             // record options and data
-            this.parent_thread= parent.messages!= undefined ? parent : options.options.thread._parents[0] ;
-
-            var param =         options.parameters;
-            // record parameters
-            this.id =           param.id || -1;
-            this.model =        param.model || false;
-            this.parent_id=     param.parent_id || false;
-            this.res_id =       param.res_id || false;
-            this.type =         param.type || false;
-            this.is_author =    param.is_author || false;
-            this.subject =      param.subject || false;
-            this.name =         param.name || false;
-            this.record_name =  param.record_name || false;
-            this.body =         param.body || false;
-            this.vote_user_ids =param.vote_user_ids || [];
-            this.has_voted =     param.has_voted || false;
-
-            this.vote_user_ids = param.vote_user_ids || [];
-
-            this.unread =       param.unread || false;
-            this._date =        param.date;
-            this.author_id =    param.author_id || [];
-            this.attachment_ids = param.attachment_ids || [];
-
+            this.parent_thread= parent.messages!= undefined ? parent : options.options.thread._parents[0];
             this.thread = false;
 
             if( param.id > 0 ) {
@@ -468,6 +473,7 @@ openerp.mail = function(session) {
             if(this.thread){
                 return false;
             }
+            var param = _.extend(self, {'parent_id': self.id});
             /*create thread*/
             self.thread = new mail.Thread(self, {
                     'domain': self.domain,
@@ -480,11 +486,7 @@ openerp.mail = function(session) {
                         'thread' :  self.options.thread,
                         'message' : self.options.message
                     },
-                    'parameters':{
-                        'model': self.model,
-                        'id': self.id,
-                        'parent_id': self.id
-                    }
+                    'parameters': param
                 }
             );
             /*insert thread in parent message*/
@@ -520,7 +522,7 @@ openerp.mail = function(session) {
         */
         on_message_read_unread: function (event) {
             event.stopPropagation();
-            this.animated_destroy({fadeTime:250});
+            if($(event.srcElement).hasClass("oe_read")) this.animated_destroy({fadeTime:250});
             // if this message is read, all childs message display is read
             var ids = [this.id].concat( this.get_child_ids() );
             this.ds_notification.call('set_message_read', [ids,$(event.srcElement).hasClass("oe_read")]);
@@ -667,6 +669,13 @@ openerp.mail = function(session) {
             this.id=            param.id || false;
             this.model=         param.model || false;
             this.parent_id=     param.parent_id || false;
+            this.is_private =   param.is_private || false;
+            this.partner_ids =  [];
+            for(var i in param.partner_ids){
+                if(param.partner_ids[i][0]!=(param.author_id ? param.author_id[0] : -1)){
+                    this.partner_ids.push(param.partner_ids[i]);
+                }
+            }
 
             this.messages = [];
 
@@ -720,17 +729,9 @@ openerp.mail = function(session) {
          * in the function. */
         bind_events: function() {
             var self = this;
-            // event: writing in basic textarea of composition form (quick reply)
-            // event: onblur for hide 'Reply'
-            this.$('.oe_mail_compose_textarea:first textarea')
-                .keyup(function (event) {
-                    var charCode = (event.which) ? event.which : window.event.keyCode;
-                    if (event.shiftKey && charCode == 13) { this.value = this.value+"\n"; }
-                    else if (charCode == 13) { return self.message_post(); }
-                })
-                .blur(function (event) {
-                    $(this).parents('.oe_mail_thread_action:first').hide();
-                });
+            self.$('.oe_mail_compose_textarea:first button.post').click(function () {return self.message_post();});
+            self.$('.oe_mail_compose_textarea .oe_more').click(function () { var p=$(this).parent(); p.find('.oe_more_hidden, .oe_hidden').show(); p.find('.oe_more').hide(); });
+            self.$('.oe_mail_compose_textarea .oe_more_hidden').click(function () { var p=$(this).parent(); p.find('.oe_more_hidden, .oe_hidden').hide(); p.find('.oe_more').show(); });
         },
 
         /* get all child message/thread id linked
@@ -1037,7 +1038,7 @@ openerp.mail = function(session) {
                     'options':{
                         'thread':{
                             'thread_level': this.options.thread_level,
-                            'show_header_compose': show_header_compose,
+                            'show_header_compose': 0, //show_header_compose,
                             'use_composer': show_header_compose,
                             'display_on_flat':true
                         },
@@ -1142,7 +1143,7 @@ openerp.mail = function(session) {
                         'thread' :{
                             'thread_level': this.options.thread_level,
                             'use_composer': true,
-                            'show_header_compose': 1,
+                            'show_header_compose': 0,
                         },
                         'message': {
                             'show_reply': this.options.thread_level > 0,
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 1e2e6a970b6..b7eebd0b4d1 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -67,7 +67,23 @@
             <div class="oe_mail_msg_content">
                 <!-- contains the composition form -->
                 <!-- default content: old basic textarea -->
+                <div class="oe_mail_post_header">
+                    Post a message to: 
+                    <span i-if="!widget.is_private" class="oe_all_follower">All Followers</span> 
+                    <t t-if="!widget.is_private and widget.partner_ids.length"> and </t>
+                    <t t-set="inc" t-value="0"/>
+                    <t t-if="widget.partner_ids.length" t-foreach="widget.partner_ids" t-as="partner"><span t-attf-class="oe_partner_follower #{inc>=3?'oe_hidden':''}"><t t-if="inc" t-raw="', '"/><a t-attf-href="#model=res.partner&amp;id=#{partner[0]}"><t t-raw="partner[1]"/></a></span><t t-set="inc" t-value="inc+1"/>
+                    </t>
+                    <t t-if="widget.partner_ids.length>=3">
+                        <span class="oe_more">, <a><t t-raw="widget.partner_ids.length-3"/> others...</a></span>
+                        <a class="oe_more_hidden">&lt;&lt;&lt;</a>
+                    </t>
+                </div>
                 <textarea placeholder="Add your comment here..."/>
+                <div class="oe_mail_post_bottom">
+                    <button class="post">Post</button>
+                    <span><a>Compose a full message</a></span>
+                </div>
             </div>
             <div class="oe_clear"/>
         </div>

From df5071c896f9614c6bc478d00236fb1615649c82 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Fri, 5 Oct 2012 12:46:54 +0200
Subject: [PATCH 02/26] [IMP] mail chatter: compose mail in js, less request

bzr revid: chm@openerp.com-20121005104654-t5lholex2gh11y15
---
 .../wizard/mail_compose_message_view.xml      |   2 +-
 addons/mail/mail_message.py                   |  15 +-
 addons/mail/mail_message_view.xml             |  15 +-
 addons/mail/mail_thread.py                    |   6 +-
 addons/mail/mail_thread_view.xml              |   6 -
 addons/mail/static/src/css/mail.css           | 110 +------
 .../static/src/css/mail_compose_message.css   | 142 ++++++++-
 addons/mail/static/src/js/mail.js             | 294 +++++++-----------
 addons/mail/static/src/xml/mail.xml           | 159 ++++++----
 .../mail/wizard/mail_compose_message_view.xml |  56 +---
 10 files changed, 372 insertions(+), 433 deletions(-)

diff --git a/addons/email_template/wizard/mail_compose_message_view.xml b/addons/email_template/wizard/mail_compose_message_view.xml
index 8d5bc26b213..655f5b9d0c2 100644
--- a/addons/email_template/wizard/mail_compose_message_view.xml
+++ b/addons/email_template/wizard/mail_compose_message_view.xml
@@ -39,7 +39,7 @@
                             attrs="{'invisible':[('use_template','=',False)]}"
                             on_change="onchange_template_id(use_template, template_id, composition_mode, model, res_id, context)"/>
                     </xpath>
-                    <xpath expr="//button[@class='oe_mail_compose_message_attachment']" position="before">
+                    <xpath expr="//button[@name='dummy']" position="before">
                         <button icon="/email_template/static/src/img/email_template.png"
                             type="object" name="toggle_template" string=""
                             help="Use a message template"
diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index eeefd730f22..12c5bfbe624 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -151,6 +151,7 @@ class mail_message(osv.Model):
         'date': lambda *a: fields.datetime.now(),
         'author_id': lambda self, cr, uid, ctx={}: self._get_default_author(cr, uid, ctx),
         'body': '',
+        'is_private': True,
     }
 
     #------------------------------------------------------
@@ -495,13 +496,6 @@ class mail_message(osv.Model):
                 self.write(cr, SUPERUSER_ID, [newid], {'partner_ids': [(4, p_id) for p_id in missing_notified]}, context=context)
             partners_to_notify |= extra_notified
 
-        # add myself if I wrote on my wall, 
-        # unless remove myself author
-        if ((message.model=="res.partner" and message.res_id==message.author_id.id)):
-            self.write(cr, SUPERUSER_ID, [newid], {'partner_ids': [(4, message.author_id.id)]}, context=context)
-        else:
-            self.write(cr, SUPERUSER_ID, [newid], {'partner_ids': [(3, message.author_id.id)]}, context=context)
-
     def _notify(self, cr, uid, newid, context=None):
         """ Add the related record followers to the destination partner_ids if is not a private message.
             Call mail_notification.notify to manage the email sending
@@ -510,6 +504,13 @@ class mail_message(osv.Model):
         if message and (message.is_private!=False and message.is_private!=None):
             self._notify_followers(cr, uid, newid, message, context=context)
         
+        # add myself if I wrote on my wall, 
+        # unless remove myself author
+        if ((message.model=="res.partner" and message.res_id==message.author_id.id)):
+            self.write(cr, SUPERUSER_ID, [newid], {'partner_ids': [(4, message.author_id.id)]}, context=context)
+        else:
+            self.write(cr, SUPERUSER_ID, [newid], {'partner_ids': [(3, message.author_id.id)]}, context=context)
+
         self.pool.get('mail.notification')._notify(cr, uid, newid, context=context)
 
     def copy(self, cr, uid, id, default=None, context=None):
diff --git a/addons/mail/mail_message_view.xml b/addons/mail/mail_message_view.xml
index 2992868bfcf..0c572384bb4 100644
--- a/addons/mail/mail_message_view.xml
+++ b/addons/mail/mail_message_view.xml
@@ -87,29 +87,22 @@
         <record id="action_mail_inbox_feeds" model="ir.actions.client">
             <field name="name">Inbox</field>
             <field name="tag">mail.wall</field>
-            <field name="params" eval="&quot;{'domain': [('is_private','=',True),('notification_ids.partner_id.user_ids', 'in', [uid]),('unread', '=', True)],
-                'context': {'default_model': 'res.partner', 'default_res_id': uid, 'default_is_private':True} }&quot;"/>
-        </record>
-
-        <record id="action_mail_wall_feeds" model="ir.actions.client">
-            <field name="name">Wall</field>
-            <field name="tag">mail.wall</field>
-            <field name="params" eval="&quot;{'domain': [('is_private','=',False),('notification_ids.partner_id.user_ids', 'in', [uid]),('unread', '=', True)],
-                'context': {'default_model': 'res.partner', 'default_res_id': uid, 'default_is_private':False} }&quot;"/>
+            <field name="params" eval="&quot;{'domain': [('notification_ids.partner_id.user_ids', 'in', [uid]),('unread', '=', True)],
+                'context': {'default_model': 'res.partner'} }&quot;"/>
         </record>
 
         <record id="action_mail_archives_feeds" model="ir.actions.client">
             <field name="name">Archives</field>
             <field name="tag">mail.wall</field>
             <field name="params" eval="&quot;{'domain': [('notification_ids.partner_id.user_ids', 'in', [uid]),('unread', '=', False)],
-                'context': {'default_model': 'res.partner', 'default_res_id': uid} }&quot;"/>
+                'context': {'default_model': 'res.partner'} }&quot;"/>
         </record>
 
         <record id="action_mail_sent_feeds" model="ir.actions.client">
             <field name="name">Sent</field>
             <field name="tag">mail.wall</field>
             <field name="params" eval="&quot;{'domain': [('author_id.user_ids', 'in', [uid])],
-                'context': {'default_model': 'res.partner', 'default_res_id': uid} }&quot;"/>
+                'context': {'default_model': 'res.partner'} }&quot;"/>
         </record>
     </data>
 </openerp>
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 9215b120361..050c755c7c3 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -696,10 +696,14 @@ class mail_thread(osv.AbstractModel):
 
     def message_post_api(self, cr, uid, thread_id, body='', subject=False, type='notification',
                         subtype=None, parent_id=False, attachments=None, context=None, **kwargs):
+        # if the user write on his wall
+        if self._name=='res.partner' and (not thread_id or not thread_id[0]):
+            user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
+            thread_id = user.partner_id.id
+
         added_message_id = self.message_post(cr, uid, thread_id=thread_id, body=body, subject=subject, type=type,
                         subtype=subtype, parent_id=parent_id, attachments=attachments, context=context)
         added_message = self.pool.get('mail.message').message_read(cr, uid, [added_message_id])
-
         return added_message
 
     def get_message_subtypes(self, cr, uid, ids, context=None):
diff --git a/addons/mail/mail_thread_view.xml b/addons/mail/mail_thread_view.xml
index 4b6709dd2d8..696edde0e15 100644
--- a/addons/mail/mail_thread_view.xml
+++ b/addons/mail/mail_thread_view.xml
@@ -18,12 +18,6 @@
           <field name="action" ref="action_mail_inbox_feeds"/>
           <field name="parent_id" ref="mail_feeds"/>
         </record>
-        <record id="mail_wallfeeds" model="ir.ui.menu">
-          <field name="name">Wall</field>
-          <field name="sequence" eval="11"/>
-          <field name="action" ref="action_mail_wall_feeds"/>
-          <field name="parent_id" ref="mail_feeds"/>
-        </record>
         <record id="mail_archivesfeeds" model="ir.ui.menu">
           <field name="name">Archives</field>
           <field name="sequence" eval="12"/>
diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index e5a9ad0c825..80398613b39 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -173,41 +173,6 @@
     clear: both; 
 }
 
-.openerp .oe_mail .oe_mail_compose_textarea .oe_mail_post_header .oe_all_follower {
-    color: blue;
-}
-.openerp .oe_mail .oe_mail_compose_textarea .oe_mail_post_header .oe_partner_follower a {
-    color: red;
-}
-.openerp .oe_mail .oe_mail_compose_textarea .oe_mail_post_header .oe_hidden,
-.openerp .oe_mail .oe_mail_compose_textarea .oe_mail_post_header .oe_more_hidden {
-    display: none;
-}
-
-.openerp .oe_mail .oe_mail_compose_textarea .oe_mail_post_bottom button.post {
-    float: left;
-}
-
-.openerp .oe_mail .oe_mail_compose_textarea .oe_mail_post_bottom span {
-    float: right;
-}
-
-/* default textarea (oe_mail_compose_textarea), and body textarea for compose form view */
-.openerp .oe_mail.oe_semantic_html_override .oe_mail_compose_textarea textarea,
-.openerp .oe_mail div.oe_mail_compose_message_body textarea {
-    width: 474px;
-    min-height: 120px;
-    height: auto;
-    padding: 4px;
-    font-size: 12px;
-    border: 1px solid #cccccc;
-}
-
-/* not top textarea */
-.openerp .oe_mail.oe_semantic_html_override .oe_semantic_html_override .oe_mail_compose_textarea textarea {
-    height: 60px;
-}
-
 /* default textarea (oe_mail_compose_textarea), and body textarea for compose form view */
 .openerp .oe_mail_msg_content textarea.oe_mail_compose_textarea:focus,
 .openerp .oe_mail_msg_content div.oe_mail_compose_message_body textarea:focus {
@@ -334,76 +299,6 @@
     display: none;
 }
 
-/* ------------------------------------------------------------ */
-/* mail.compose.message form view & OpenERP hacks
-/* ------------------------------------------------------------ */
-
-/* form_view: delete white background */
-.openerp .oe_mail_msg_content div.oe_formview {
-    background-color: transparent;
-}
-
-.openerp .oe_mail_msg_content div.oe_form_nosheet {
-    margin: 0px;
-}
-
-.openerp .oe_mail_msg_content table.oe_form_group {
-    margin: 0px;
-}
-
-.openerp .oe_mail_msg_content table.oe_form_field,
-.openerp .oe_mail_msg_content div.oe_form_field {
-    padding: 0px;
-}
-
-.openerp .oe_mail_msg_content td.oe_form_group_cell {
-    vertical-align: bottom;
-}
-
-/* subject: change width */
-.openerp .oe_mail_msg_content .oe_form .oe_form_field input {
-    width: 472px;
-}
-
-/* body_html: cleditor */
-.openerp .oe_mail_msg_content div.cleditorMain {
-    border: 1px solid #cccccc;
-}
-
-/* destination_partner_ids */
-.openerp .oe_mail_msg_content div.text-core {
-    height: 22px !important;
-    width: 472px;
-}
-
-/* buttons */
-.openerp .oe_mail_msg_content .oe_mail_compose_message_icons button.oe_form_button {
-    padding: 1px;
-}
-
-/* attachment button: override of openerp values */
-.openerp .oe_mail_msg_content .oe_mail_compose_message_icons div.oe_hidden_input_file {
-    display: inline-block;
-    width: 24px;
-    height: 24px;
-    margin: 2px;
-}
-.openerp .oe_mail_msg_content .oe_mail_compose_message_icons div.oe_hidden_input_file button {
-    margin: 0px;
-}
-.openerp .oe_mail_msg_content .oe_mail_compose_message_icons input.oe_form_binary_file {
-    bottom: 0px;
-    top: auto;
-    left: auto;
-    right: 0;
-    height: 26px;
-    width: 26px;
-    min-width: 22px;
-    font-size: 0px;
-    margin: 0px;
-    padding: 0px;
-}
-
 /* ------------------------------------------------------------ */
 /* Messages layout
 /* ------------------------------------------------------------ */
@@ -485,13 +380,14 @@
 
 /* Attachments list */
 .openerp .oe_mail_msg_content ul.oe_mail_msg_attachments {
-    display: none;
     width: 100%;
-    border-top: 1px solid #CCC;
     margin: .5em 0 0 0;
     padding: .5em 0;
     list-style-position: inside;
 }
+.openerp .oe_mail_msg_content ul.oe_mail_msg_attachments.oe_hidden {
+    display: none;
+}
 .openerp .oe_mail_msg_content ul.oe_mail_msg_attachments li {
     float: none;
     margin: 0;
diff --git a/addons/mail/static/src/css/mail_compose_message.css b/addons/mail/static/src/css/mail_compose_message.css
index ba7ed36a695..4f6f8e2b34f 100644
--- a/addons/mail/static/src/css/mail_compose_message.css
+++ b/addons/mail/static/src/css/mail_compose_message.css
@@ -1,12 +1,142 @@
 /* ------------------------------ */
-/* Compose Message Wizard Form */
+/* Compose Message */
 /* ------------------------------ */
 
-.openerp .oe_mail_compose_message_icons {
-    text-align: right;
+.openerp .oe_mail_msg_content .oe_mail_compose_message_footer {
+    height: 24px;
 }
 
-.openerp .oe_mail_compose_message_icons img {
-    width: 20px;
-    height: 20px;
+.openerp .oe_mail_msg_content .oe_mail_compose_message_footer button.oe_mail_compose_message_button_send {
+    float: left;
 }
+
+.openerp .oe_mail .oe_mail_compose_textarea .oe_mail_post_header,
+.openerp .oe_mail .oe_mail_compose_textarea .oe_mail_post_footer,
+ {
+    position: relative;
+}
+
+/* ------------------------------------------------------------ */
+/* mail.compose.message : list_recipients
+/* ------------------------------------------------------------ */
+
+.openerp .oe_mail .oe_mail_list_recipients {
+    display: inline;
+}
+.openerp .oe_mail .oe_mail_list_recipients .oe_all_follower {
+    color: blue;
+}
+.openerp .oe_mail .oe_mail_list_recipients .oe_partner_follower a {
+    color: red;
+}
+.openerp .oe_mail .oe_mail_list_recipients .oe_hidden,
+.openerp .oe_mail .oe_mail_list_recipients .oe_more_hidden {
+    display: none;
+}
+
+/* ------------------------------------------------------------ */
+/* mail.compose.message : attachment
+/* ------------------------------------------------------------ */
+
+.openerp .oe_mail .oe_attachment_file  {
+    display: inline-block;
+}
+
+.openerp .oe_mail .oe_attachment_file .oe_add  {
+    float: left;
+    width: 24px;
+    height: 24px;
+    position: relative;
+    z-index: 10;
+    left: +2px;
+    top: +7px;
+    overflow: hidden;
+}
+
+/* attachment button: override of openerp values */
+.openerp .oe_mail .oe_attachment_file .oe_add button,
+.openerp .oe_mail .oe_attachment_file .oe_add input.oe_insert_file {
+    position: absolute;
+    bottom: +0px;
+    left: +0px;
+    height: 24px;
+    width: 24px;
+    margin: 0px;
+    padding: 0px;
+}
+.openerp .oe_mail .oe_attachment_file .oe_add input.oe_insert_file {
+    z-index:2;
+    width: 300px;
+    left: -100px;
+    background: transparent;
+    border: 0;
+    color: transparent;
+}
+.openerp .oe_mail .oe_attachment_file .oe_add button span {
+    position: relative;
+    bottom: +4px;
+    font-size: 30px;
+}
+
+.openerp .oe_mail .oe_mail_msg_attachments input {
+    visibility: hidden;
+}
+
+/* ------------------------------------------------------------ */
+/* mail.compose.message
+/* ------------------------------------------------------------ */
+
+
+/* default textarea (oe_mail_compose_textarea), and body textarea for compose form view */
+.openerp .oe_mail.oe_semantic_html_override .oe_mail_compose_textarea textarea.field_text,
+.openerp .oe_mail div.oe_mail_compose_message_body textarea.field_text {
+    width: 474px;
+    min-height: 120px;
+    height: auto;
+    padding: 4px;
+    font-size: 12px;
+    border: 1px solid #cccccc;
+}
+
+/* not top textarea */
+.openerp .oe_mail.oe_semantic_html_override .oe_semantic_html_override .oe_mail_compose_textarea textarea.field_text {
+    height: 60px;
+}
+
+/* form_view: delete white background */
+.openerp .oe_mail_msg_content div.oe_formview {
+    background-color: transparent;
+}
+
+.openerp .oe_mail_msg_content div.oe_form_nosheet {
+    margin: 0px;
+}
+
+.openerp .oe_mail_msg_content table.oe_form_group {
+    margin: 0px;
+}
+
+.openerp .oe_mail_msg_content table.oe_form_field,
+.openerp .oe_mail_msg_content div.oe_form_field {
+    padding: 0px;
+}
+
+.openerp .oe_mail_msg_content td.oe_form_group_cell {
+    vertical-align: bottom;
+}
+
+/* subject: change width */
+.openerp .oe_mail_msg_content .oe_form .oe_form_field input[type='text'] {
+    width: 472px;
+}
+
+/* body_html: cleditor */
+.openerp .oe_mail_msg_content div.cleditorMain {
+    border: 1px solid #cccccc;
+}
+
+/* destination_partner_ids */
+.openerp .oe_mail_msg_content div.text-core {
+    height: 22px !important;
+    width: 472px;
+}
\ No newline at end of file
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index b2fa071b191..1070976b756 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -84,16 +84,17 @@ openerp.mail = function(session) {
      * This widget handles the display of a form to compose a new message.
      * This form is a mail.compose.message form_view.
      */
-
+    
     mail.ComposeMessage = session.web.Widget.extend({
         template: 'mail.compose_message',
-        
+
         /**
          * @param {Object} parent parent
          * @param {Object} [options]
-         * @param {Object} [options.context] context passed to the
-         *  mail.compose.message DataSetSearch. Please refer to this model
-         *  for more details about fields and default values.
+         *      @param {Object} [context] context passed to the
+         *          mail.compose.message DataSetSearch. Please refer to this model
+         *          for more details about fields and default values.
+         *      @param {Boolean} [show_attachment_delete] 
          */
         init: function (parent, options) {
             var self = this;
@@ -102,118 +103,43 @@ openerp.mail = function(session) {
             // options
             this.options = options || {};
             this.options.context = options.context || {};
-            this.options.form_xml_id = options.form_xml_id || 'email_compose_message_wizard_form_chatter';
-            this.options.form_view_id = options.form_view_id || false;
+            this.options.show_attachment_delete = options.show_attachment_delete || false;
+
+            this.id =           options.parameters.id;
+            this.model =        options.parameters.model;
+            this.is_private =   options.parameters.is_private;
+            this.partner_ids =  options.parameters.partner_ids;
+
+            this.attachment_ids = [];
             this.show_attachment_delete = true;
+            this.show_attachment_link = false;
         },
 
-        start: function () {
-            this._super.apply(this, arguments);
-            // customize display: add avatar, clean previous content
+        start: function(){
+            var self = this;
+
+            this.display_attachments();
+
+            self.bind_events();
+
             var user_avatar = mail.ChatterUtils.get_image(this.session, 'res.users', 'image_small', this.session.uid);
             this.$('img.oe_mail_icon').attr('src', user_avatar);
-            this.$('div.oe_mail_msg_content').empty();
-            // create a context for the dataset and default_get of the wizard
-            var context = _.extend({}, this.options.context);
-            this.ds_compose = new session.web.DataSetSearch(this, 'mail.compose.message', context);
-            // find the id of the view to display in the chatter form
-            if (this.options.form_view_id) {
-                return this.create_form_view();
-            }
-            else {
-                var data_ds = new session.web.DataSetSearch(this, 'ir.model.data');
-                return data_ds.call('get_object_reference', ['mail', this.options.form_xml_id]).pipe(this.proxy('create_form_view'));
-            }
         },
 
-        /** Create a FormView, then append it to the to widget DOM. */
-        create_form_view: function (new_form_view_id) {
+        display_attachments: function(){
             var self = this;
-            this.options.form_view_id = (new_form_view_id && new_form_view_id[1]) || this.options.form_view_id;
-            // destroy previous form_view if any
-            if (this.form_view) { this.form_view.destroy(); }
-            // create the FormView
-            this.form_view = new session.web.FormView(this, this.ds_compose, this.options.form_view_id, {
-                action_buttons: false,
-                pager: false,
-                initial_mode: 'edit',
-                disable_autofocus: true,
-            });
-            // add the form, bind events, activate the form
-            var msg_node = this.$('div.oe_mail_msg_content');
-            return $.when(this.form_view.appendTo(msg_node)).pipe(this.proxy('postprocess_create_form_view'));
-        },
-
-        postprocess_create_form_view: function () {
-            // handle attachment button
-            this.fileupload_id = _.uniqueId('oe_fileupload');
-            var button_attach = this.$('button.oe_mail_compose_message_attachment');
-            var rendered = $( session.web.qweb.render('mail.compose_message.add_attachment', {'widget': this}) );
-            rendered.insertBefore(button_attach);
-            // move the button inside div.oe_hidden_input_file
-            var input_node = this.$('input[name=ufile]');
-            button_attach.detach().insertAfter(input_node);
-            // set the function called when attachments are added
-            this.$('input.oe_form_binary_file').change(this.on_attachment_change);
-            this.bind_events();
-            this.form_view.do_show();
-        },
-
-        on_attachment_change: function (event) {
-            var $target = $(event.target);
-            if ($target.val() !== '') {
-                this.$('form.oe_form_binary_form').submit();
-                session.web.blockUI();
+            var render = $(session.web.qweb.render('mail.thread.message.attachments', {'widget': self}));
+            if(!this.list_attachment){
+                this.$('.oe_mail_compose_attachment_list').replaceWith( render );
+            } else {
+                this.list_attachment.replaceWith( render );
             }
+            this.list_attachment = this.$("ul.oe_mail_msg_attachments");
+
+            // event: delete an attachment
+            this.$el.on('click', '.oe_mail_attachment_delete', self.on_attachment_delete);
         },
 
-        on_attachment_delete: function (event) {
-            if (event.target.dataset && event.target.dataset.id) {
-                var attachment_id = parseInt(event.target.dataset.id);
-                var idx = _.pluck(this.attachment_ids, 'id').indexOf(attachment_id);
-                if (idx == -1) return false;
-                new session.web.DataSetSearch(this, 'ir.attachment').unlink(attachment_id);
-                this.attachment_ids.splice(idx, 1);
-                this.display_attachments();
-            }
-        },
-
-        display_attachments: function () {
-            var attach_node = this.$('div.oe_mail_compose_message_attachments');
-            var rendered = session.web.qweb.render('mail.thread.message.attachments', {'record': this});
-            attach_node.empty();
-            $(rendered).appendTo(attach_node);
-            this.$('.oe_mail_msg_attachments').show();
-            var composer_attachment_ids = _.pluck(this.attachment_ids, 'id');
-            var onchange_like = {'value': {'attachment_ids': composer_attachment_ids}}
-            this.form_view.on_processed_onchange(onchange_like, []);
-        },
-
-        /**
-         * Reinitialize the widget field values to the default values obtained
-         * using default_get on mail.compose.message. This allows to reinitialize
-         * the widget without having to rebuild a complete form view.
-         * @param {Object} new_context: context of the refresh */
-        refresh: function (new_context) {
-            if (! this.form_view) return;
-            var self = this;
-            this.attachments = [];
-            this.options.context = _.extend(this.options.context, new_context || {});
-            this.ds_compose.context = _.extend(this.ds_compose.context, this.options.context);
-            return this.ds_compose.call('default_get', [
-                ['subject', 'body_text', 'body', 'partner_ids', 'composition_mode',
-                    'use_template', 'template_id', 'model', 'res_id', 'parent_id', 'content_subtype'],
-                this.ds_compose.get_context(),
-            ]).then( function (result) {
-                self.form_view.on_processed_onchange({'value': result}, []);
-                self.attachment_ids = [];
-                self.display_attachments();
-            });
-        },
-
-        /**
-         * Bind events in the widget. Each event is slightly described
-         * in the function. */
         bind_events: function() {
             var self = this;
             // event: add a new attachment
@@ -225,11 +151,54 @@ openerp.mail = function(session) {
                 self.display_attachments();
                 session.web.unblockUI();
             });
-            // event: delete an attachment
-            this.$el.on('click', '.oe_mail_attachment_delete', self.on_attachment_delete);
+
+            // set the function called when attachments are added
+            this.$el.on('change', 'input.oe_insert_file', self.on_attachment_change);
         },
-    }),
-    
+
+        on_attachment_change: function (event) {
+            event.stopPropagation();
+            var $target = $(event.target);
+            if ($target.val() !== '') {
+                //session.web.blockUI();
+                var id = _.uniqueId('oe_fileupload');
+                this.attachment_ids.push({
+                    'url': $target.val(),
+                    'filename' : $target.val().replace(/.*[\/\\]/,''),
+                    'id': id
+                });
+                $newfield = $target.clone();
+                $newfield.insertAfter($target);
+                $target.hide();
+                $target.attr("id",id);
+
+                this.display_attachments();
+            }
+        },
+
+        on_attachment_delete: function (event) {
+            event.stopPropagation();
+            var id=$(event.target).data("id");
+            if (id) {
+                var attachments=[];
+                for(var i in this.attachment_ids){
+                    if(id!=this.attachment_ids[i].id)
+                        attachments.push(this.attachment_ids[i]);
+                }
+                this.attachment_ids = attachments;
+                this.$("input#"+id).remove();
+            /*
+                var attachment_id = parseInt(event.target.dataset.id);
+                var idx = _.pluck(this.attachment_ids, 'id').indexOf(attachment_id);
+                if (idx == -1) return false;
+                new session.web.DataSetSearch(this, 'ir.attachment').unlink(attachment_id);
+                this.attachment_ids.splice(idx, 1);
+            */
+                this.display_attachments();
+            }
+        },
+
+    });
 
     /** 
      * ------------------------------------------------------------
@@ -263,7 +232,6 @@ openerp.mail = function(session) {
 
             // record options and data
             this.parent_thread= parent.messages!= undefined ? parent : options.options.thread._parents[0] ;
-
         },
 
         
@@ -285,7 +253,7 @@ openerp.mail = function(session) {
         * @param {object} mouse envent
         */
         on_expandable: function (event) {
-            event.stopPropagation();
+            if(event)event.stopPropagation();
             this.parent_thread.message_fletch(false, this.domain, this.context);
             this.destroy();
             return false;
@@ -361,7 +329,7 @@ openerp.mail = function(session) {
             this._date =        param.date;
             this.author_id =    param.author_id || [];
             this.attachment_ids = param.attachment_ids || [];
-            
+
             // record domain and context
             this.domain = options.domain || [];
             this.context = _.extend({
@@ -439,21 +407,13 @@ openerp.mail = function(session) {
 
             // event: click on 'Reply' in msg
             this.$el.on('click', 'a.oe_reply', this.on_message_reply);
-            // event: click on 'Reply by email' in msg side menu
-            this.$el.on('click', 'a.oe_reply_by_email', this.on_message_reply_by_mail);
             // event: click on 'Vote' button
             this.$el.on('click', 'button.oe_mail_msg_vote', this.on_vote);
         },
 
         on_message_reply:function(event){
             event.stopPropagation();
-            this.thread.on_compose_message($(event.srcElement).hasClass("oe_full_reply"), false);
-            return false;
-        },
-
-        on_message_reply_by_mail:function(event){
-            event.stopPropagation();
-            this.thread.on_compose_message(true, true);
+            this.thread.on_compose_message();
             return false;
         },
 
@@ -670,6 +630,7 @@ openerp.mail = function(session) {
             this.model=         param.model || false;
             this.parent_id=     param.parent_id || false;
             this.is_private =   param.is_private || false;
+            this.author_id =   param.author_id || false;
             this.partner_ids =  [];
             for(var i in param.partner_ids){
                 if(param.partner_ids[i][0]!=(param.author_id ? param.author_id[0] : -1)){
@@ -694,7 +655,12 @@ openerp.mail = function(session) {
             var display_done = compose_done = false;
             
             // add message composition form view
-            compose_done = this.instantiate_composition_form();
+            this.ComposeMessage = new mail.ComposeMessage(this,{
+                'context': this.context,
+                'parameters': this,
+                'show_attachment_delete': true,
+            });
+            this.ComposeMessage.appendTo(this.$(".oe_mail_thread_action:first"));
 
             this.bind_events();
 
@@ -710,7 +676,6 @@ openerp.mail = function(session) {
         * Normally it should be called only when clicking on 'Post/Send'
         * in the composition form. */
         do_action: function(action, on_close) {
-            this.instantiate_composition_form();
             this.message_fletch(false, false, false, [action.id]);
             return this._super(action, on_close);
         },
@@ -718,10 +683,40 @@ openerp.mail = function(session) {
         /* this method is runing for first parent thread
         */
         on_first_thread: function(){
+            var self=this;
             // fetch and display message, using message_ids if set
             display_done = this.message_fletch(true);
             //show the first write message
-            this.$(">.oe_mail_thread_action").show();
+            self.$(">.oe_mail_thread_action").show();
+
+            $(document).scroll( self.on_scroll );
+            window.setTimeout( self.on_scroll, 500 );
+        },
+
+        /* When the expandable object is visible on screen (with scrolling)
+         * then the on_expandable function is launch
+        */
+        on_scroll: function(event){
+            if(event)event.stopPropagation();
+            var last=this.messages[0];
+            if(last && last.type=="expandable"){
+                var pos = last.$el.position();
+                if(pos.top){
+                    /* bottom of the screen */
+                    var bottom = $(window).scrollTop()+$(window).height()+100;
+                    if(bottom - pos.top > 0){
+                        last.on_expandable();
+                    }
+                }
+            }
+        },
+
+        on_attachment_change: function (event) {
+            var $target = $(event.target);
+            if ($target.val() !== '') {
+                this.$('form.oe_form_binary_form').submit();
+                session.web.blockUI();
+            }
         },
 
         /**
@@ -794,43 +789,9 @@ openerp.mail = function(session) {
                 return this.options.thread._parents[0].messages[0].browse_message(options);
         },
 
-        /** Instantiate the composition form, with every parameters in context
-        *   or in the widget context.
-        *   @param {object}
-        *       @param {boolean} show_header_compose, force to instantiate form
-        */
-        instantiate_composition_form: function(context) {
-            // add message composition form view
-            if ((!context || !context.show_header_compose) &&
-                (!this.options.thread.show_header_compose || !this.options.thread.use_composer ||
-                (this.options.thread.show_header_compose <= this.options.thread._parents.length && this.options.thread._parents[0]!=this))) {
-                this.$("textarea:first").val("");
-                return false;
-            }
-            if (this.compose_message_widget) {
-                this.compose_message_widget.refresh();
-            } else {
-                var context = _.extend(context || {}, this.context);
-                this.compose_message_widget = new mail.ComposeMessage(this, {'context': context});
-                var composition_node = this.$('div.oe_mail_thread_action');
-                composition_node.empty();
-                return this.compose_message_widget.appendTo(composition_node);
-            }
-        },
-
         /* this function is launch when a user click on "Reply" button
         */
-        on_compose_message: function(full_reply, by_mail){
-            if(full_reply){
-                this.instantiate_composition_form({'show_header_compose':true});
-            }
-            if(by_mail){
-                if (!this.compose_message_widget) return true;
-                this.compose_message_widget.refresh({
-                    'default_composition_mode': 'reply',
-                    'default_parent_id': this.id,
-                    'default_content_subtype': 'html'} );
-            }
+        on_compose_message: function(){
             this.$('div.oe_mail_thread_action:first').toggle();
             return false;
         },
@@ -953,19 +914,6 @@ openerp.mail = function(session) {
             return message
         },
 
-        /* Hide messages if they are more message that _expandable_max
-        *  display "show more messages"
-        */
-        display_expandable: function(){
-            if(this.messages.length>this.options._expandable_max){
-                this.list_ul.find('>li:gt('+(this.options._expandable_max-1)+')').hide();
-                this.more_msg.show();
-            } else {
-                this.list_ul.find('>li').show();
-                this.more_msg.hide();
-            }
-        },
-
         display_user_avatar: function () {
             var avatar = mail.ChatterUtils.get_image(this.session, 'res.users', 'image_small', this.session.uid);
             return this.$('img.oe_mail_icon').attr('src', avatar);
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index b7eebd0b4d1..edb5d1fba09 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -1,11 +1,103 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template>
 
+    <!--
+        mail.compose_message template
+        This template holds the composition form to write a note or send
+        an e-mail. It contains by default a textarea, that will be replaced
+        by another composition form in the main wall composition form, or
+        for main thread composition form in document form view.
+        -->
+    <t t-name="mail.compose_message">
+        <div class="oe_mail_compose_textarea">
+            <img class="oe_mail_icon oe_mail_frame oe_left" alt="User img"/>
+            <div class="oe_mail_msg_content">
+                <!-- contains the composition form -->
+                <!-- default content: old basic textarea -->
+                <div class="oe_mail_post_header">
+                    <t t-call="mail.thread.list_recipients"/>
+                </div>
+                <textarea class="field_text" placeholder="Add your comment here..."/>
+                <div class="oe_mail_post_footer">
+                    <span class="oe_mail_compose_attachment_list"/>
+                    <button class="post">Post message</button>
+                    <t t-call="mail.compose_message.add_attachment"/>
+                </div>
+            </div>
+            <div class="oe_clear"/>
+        </div>
+    </t>
+
+    <!--
+        mail.compose_message.add_attachment template
+        Small template to be inserted in the composition for add attachments
+        -->
+    <t t-name="mail.compose_message.add_attachment">
+        <div class="oe_attachment_file">
+            <div class="oe_add">
+                <input type="file" class="oe_insert_file"/>
+                <button><span class="oe_e">p</span></button>
+            </div>
+        </div>
+    </t>
+
+    <!--
+        mail.thread.message.attachments template
+        Template used to display attachments in a mail.message
+        -->
+    <t t-name="mail.thread.message.attachments">
+        <ul t-attf-class="oe_mail_msg_attachments #{widget.attachment_ids[0]?'':'oe_hidden'}">
+            <t t-foreach="widget.attachment_ids" t-as="attachment">
+                <li>
+                    <a t-if="widget.show_attachment_link" t-att-href="attachment.url"><t t-raw="attachment.name || attachment.filename"/></a>
+                    <span t-if="!widget.show_attachment_link"><t t-raw="attachment.name || attachment.filename"/></span>
+                    <t t-if="widget.show_attachment_delete">
+                        <a class="oe_right oe_mail_attachment_delete" title="Delete this attachmentt" t-attf-data-id="{attachment.id}">x</a>
+                    </t>
+                </li>
+            </t>
+        </ul>
+    </t>
+
+
+    <t t-name="mail.thread.message.private">
+        <div>
+            <span class="oe_placeholder_checkbox_private"/>
+            <span class="oe_send_private">This email is private and don't send to all my followers.</span>
+            <span class="oe_send_public">I wrote for contacts and all my followers.</span>
+        </div>
+    </t>
+
+    <!--
+        template to the recipients list
+        -->
+    <t t-name="mail.thread.list_recipients">
+        <div class="oe_mail_list_recipients">
+            Post to: 
+            <span t-if="!widget.is_private" class="oe_all_follower">All Followers</span> 
+            <t t-if="!widget.is_private and widget.partner_ids.length"> and </t>
+            <t t-set="inc" t-value="0"/>
+            <t t-if="widget.partner_ids.length" t-foreach="widget.partner_ids" t-as="partner"><span t-attf-class="oe_partner_follower #{inc>=3?'oe_hidden':''}"><t t-if="inc" t-raw="', '"/><a t-attf-href="#model=res.partner&amp;id=#{partner[0]}"><t t-raw="partner[1]"/></a></span><t t-set="inc" t-value="inc+1"/>
+            </t>
+            <t t-if="widget.partner_ids.length>=3">
+                <span class="oe_more">, <a><t t-raw="widget.partner_ids.length-3"/> others...</a></span>
+                <a class="oe_more_hidden">&lt;&lt;&lt;</a>
+            </t>
+        </div>
+    </t>
+
+
     <!-- 
         wall main template
         Template used to display the communication history in the wall.
         -->
     <div t-name="mail.wall" class="oe_view_manager oe_mail_wall oe_view_manager_current">
+
+        <!--button string="Send Reminder Email" name="%(mail.action_email_compose_message_wizard)d" type="action"
+            states="waiting_answer"
+            context="{'default_body_text': 'Hello,\n\n',
+                        'default_subject': '' }"/-->
+
         <table class="oe_view_manager_header">
           <colgroup>
             <col width="33%"/>
@@ -54,55 +146,6 @@
         </ul>
     </div>
 
-    <!--
-        mail.compose_message template
-        This template holds the composition form to write a note or send
-        an e-mail. It contains by default a textarea, that will be replaced
-        by another composition form in the main wall composition form, or
-        for main thread composition form in document form view.
-        -->
-    <t t-name="mail.compose_message">
-        <div class="oe_mail_compose_textarea">
-            <img class="oe_mail_icon oe_mail_frame oe_left" alt="User img"/>
-            <div class="oe_mail_msg_content">
-                <!-- contains the composition form -->
-                <!-- default content: old basic textarea -->
-                <div class="oe_mail_post_header">
-                    Post a message to: 
-                    <span i-if="!widget.is_private" class="oe_all_follower">All Followers</span> 
-                    <t t-if="!widget.is_private and widget.partner_ids.length"> and </t>
-                    <t t-set="inc" t-value="0"/>
-                    <t t-if="widget.partner_ids.length" t-foreach="widget.partner_ids" t-as="partner"><span t-attf-class="oe_partner_follower #{inc>=3?'oe_hidden':''}"><t t-if="inc" t-raw="', '"/><a t-attf-href="#model=res.partner&amp;id=#{partner[0]}"><t t-raw="partner[1]"/></a></span><t t-set="inc" t-value="inc+1"/>
-                    </t>
-                    <t t-if="widget.partner_ids.length>=3">
-                        <span class="oe_more">, <a><t t-raw="widget.partner_ids.length-3"/> others...</a></span>
-                        <a class="oe_more_hidden">&lt;&lt;&lt;</a>
-                    </t>
-                </div>
-                <textarea placeholder="Add your comment here..."/>
-                <div class="oe_mail_post_bottom">
-                    <button class="post">Post</button>
-                    <span><a>Compose a full message</a></span>
-                </div>
-            </div>
-            <div class="oe_clear"/>
-        </div>
-    </t>
-
-    <!--
-        mail.compose_message.add_attachment template
-        Small template to be inserted in the composition form to add attachments
-        -->
-    <t t-name="mail.compose_message.add_attachment">
-        <t t-call="HiddenInputFile">
-            <t t-set="fileupload_id" t-value="widget.fileupload_id"/>
-            <t t-set="fileupload_action">/web/binary/upload_attachment</t>
-            <input type="hidden" name="model" t-att-value="widget.form_view.model"/>
-            <input type="hidden" name="id" t-att-value="widget.form_view.datarecord.id || 0"/>
-            <input type="hidden" name="session_id" t-att-value="widget.session.session_id"/>
-        </t>
-    </t>
-
     <!--
         thread template
         This template holds a thread of comments. It begins with an actions
@@ -112,7 +155,6 @@
     <div t-name="mail.thread" class="oe_mail oe_mail_thread oe_semantic_html_override">
         <div class="oe_mail_thread_action">
             <!-- contains the composition box (form + image) -->
-            <t t-call="mail.compose_message"/>
         </div>
         <ul class="oe_mail_thread_display">
             <!-- contains the threads -->
@@ -194,23 +236,6 @@
         </div>
     </li>
 
-    <!--
-        mail.thread.message.attachments template
-        Template used to display attachments in a mail.message
-        -->
-    <t t-name="mail.thread.message.attachments">
-        <ul class="oe_mail_msg_attachments">
-            <t t-foreach="record.attachment_ids" t-as="attachment">
-                <li>
-                    <a t-att-href="attachment.url"><t t-raw="attachment.name || attachment.filename"/></a>
-                    <t t-if="record.show_attachment_delete">
-                        <a class="oe_right oe_mail_attachment_delete" title="Delete this attachmentt" t-attf-data-id="{attachment.id}">x</a>
-                    </t>
-                </li>
-            </t>
-        </ul>
-    </t>
-
     <!-- mail.thread.message.vote
         Template used to display Like/Unlike in a mail.message
     -->
diff --git a/addons/mail/wizard/mail_compose_message_view.xml b/addons/mail/wizard/mail_compose_message_view.xml
index 0f384dc5a0d..fcac5b1ea70 100644
--- a/addons/mail/wizard/mail_compose_message_view.xml
+++ b/addons/mail/wizard/mail_compose_message_view.xml
@@ -32,67 +32,15 @@
                         <button string="Send" name="send_mail" type="object" class="oe_highlight"  />
                         or
                         <button string="Cancel" class="oe_link" special="cancel" />
-                        <div class="oe_right">
+                        <!--div class="oe_right">
                             <button string="" name="toggle_content_subtype" type="object" icon="/mail/static/src/img/formatting.png" 
                                 help="Toggle advanced formatting mode"/>
-                        </div>
+                        </div-->
                     </footer>
                 </form>
             </field>
         </record>
 
-        <record model="ir.ui.view" id="email_compose_message_wizard_form_chatter">
-            <field name="name">mail.compose.message.form.chatter</field>
-            <field name="model">mail.compose.message</field>
-            <field name="priority">18</field>
-            <field name="arch" type="xml">
-                <form string="Compose Email" version="7.0" >
-                    <group>
-                        <!-- truly invisible fields for control and options -->
-                        <field name="composition_mode" colspan="2" nolabel="1" invisible="1"/>
-                        <field name="model" colspan="2" nolabel="1" invisible="1"/>
-                        <field name="res_id" colspan="2" nolabel="1" invisible="1"/>
-                        <field name="parent_id" colspan="2" nolabel="1" invisible="1"/>
-                        <field name="content_subtype" colspan="2" nolabel="1" invisible="1"/>
-                        <!-- visible wizard -->
-                        <field name="subject" colspan="2" nolabel="1" placeholder="Subject..."
-                                class="oe_mail_compose_message_subject"
-                                attrs="{'invisible':[('content_subtype', '=', 'plain')]}"/>
-                        <field name="body_text" colspan="2" nolabel="1" placeholder="What are you working on ?"
-                                class="oe_mail_compose_message_body"
-                                attrs="{'invisible':[('content_subtype', '=', 'html')]}"/>
-                        <field name="body" colspan="2" nolabel="1" placeholder="What are you working on ?"
-                                class="oe_mail_compose_message_body_html"
-                                attrs="{'invisible':[('content_subtype', '=', 'plain')]}"/>
-                        <field name="partner_ids" colspan="2" nolabel="1" widget="many2many_tags" placeholder="Add contacts to notify..."
-                                context="{'force_email':True}"
-                                on_change="onchange_partner_ids(partner_ids)"
-                                class="oe_mail_compose_message_partner_ids"/>
-                        <field name="attachment_ids" colspan="2" nolabel="1" widget="many2many_tags"
-                                placeholder="Add attachments..." invisible="1"
-                                class="oe_mail_compose_message_attachment_ids"/>
-                        <!-- void div to display attachments, Chatter-controlled -->
-                        <div colspan="2" class="oe_mail_compose_message_attachments"/>
-                        <!-- buttons, with as few Chatter logic as possible -->
-                        <div>
-                            <button name="send_mail" string="Post message" type="object"
-                                class="oe_mail_compose_message_button_send"/>
-                        </div>
-                        <div class='oe_mail_compose_message_icons'>
-                            <button icon="/mail/static/src/img/attachment.png"
-                                class="oe_mail_compose_message_attachment" string=""
-                                name="dummy"
-                                help="Add an attachment"/>
-                            <button icon="/mail/static/src/img/formatting.png"
-                                class="oe_mail_compose_message_formatting" string=""
-                                type="object" name="toggle_content_subtype"
-                                help="Toggle advanced formatting mode"/>
-                        </div>
-                    </group>
-                </form>
-            </field>
-        </record>
-
         <record id="action_email_compose_message_wizard" model="ir.actions.act_window">
             <field name="name">Compose Email</field>
             <field name="res_model">mail.compose.message</field>

From 9ca47b7f99c1db58d9629e857752213edd059d02 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Fri, 5 Oct 2012 14:27:41 +0200
Subject: [PATCH 03/26] [IMP]mail chatter: wizard liked

bzr revid: chm@openerp.com-20121005122741-a0hwb656ww61qcro
---
 addons/mail/mail_message.py                   |   2 +-
 addons/mail/static/src/css/mail.css           |   1 -
 .../static/src/css/mail_compose_message.css   |  23 +++-
 addons/mail/static/src/js/mail.js             | 116 +++++++++++-------
 addons/mail/static/src/xml/mail.xml           |  14 +--
 .../mail/wizard/mail_compose_message_view.xml |   1 +
 6 files changed, 102 insertions(+), 55 deletions(-)

diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 12c5bfbe624..53811385052 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -313,7 +313,7 @@ class mail_message(osv.Model):
         record = None
 
         # select ids
-        if ids:
+        if ids and ids!=[None]:
             for msg in self.browse(cr, uid, ids, context=context):
                 result.append(self._message_dict_get(cr, uid, msg, context=context))
             return result
diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index 80398613b39..6b28c841f97 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -160,7 +160,6 @@
 /* ------------------------------------------------------------ */
 
 .openerp div.oe_mail_thread_action {
-    display: none;
     white-space: normal;
     padding: 8px;
     z-index:5;
diff --git a/addons/mail/static/src/css/mail_compose_message.css b/addons/mail/static/src/css/mail_compose_message.css
index 4f6f8e2b34f..5788927b080 100644
--- a/addons/mail/static/src/css/mail_compose_message.css
+++ b/addons/mail/static/src/css/mail_compose_message.css
@@ -10,12 +10,27 @@
     float: left;
 }
 
+.openerp .oe_mail .oe_mail_compose_textarea
+{
+   display: none;
+}
+
 .openerp .oe_mail .oe_mail_compose_textarea .oe_mail_post_header,
 .openerp .oe_mail .oe_mail_compose_textarea .oe_mail_post_footer,
- {
+{
     position: relative;
 }
 
+.openerp .oe_mail .oe_mail_compose_textarea a.oe_cancel {
+    position: absolute;
+    right: -8px;
+    top: -8px;
+}
+
+.openerp .oe_mail .oe_mail_compose_textarea button.oe_full {
+    float: right;
+}
+
 /* ------------------------------------------------------------ */
 /* mail.compose.message : list_recipients
 /* ------------------------------------------------------------ */
@@ -82,6 +97,10 @@
     visibility: hidden;
 }
 
+.openerp .oe_mail .oe_mail_compose_attachment_list {
+    clear: both;
+}
+
 /* ------------------------------------------------------------ */
 /* mail.compose.message
 /* ------------------------------------------------------------ */
@@ -90,7 +109,7 @@
 /* default textarea (oe_mail_compose_textarea), and body textarea for compose form view */
 .openerp .oe_mail.oe_semantic_html_override .oe_mail_compose_textarea textarea.field_text,
 .openerp .oe_mail div.oe_mail_compose_message_body textarea.field_text {
-    width: 474px;
+    width: 100%;
     min-height: 120px;
     height: auto;
     padding: 4px;
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 1070976b756..48577bdeb27 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -100,10 +100,8 @@ openerp.mail = function(session) {
             var self = this;
             this._super(parent);
             this.attachment_ids = [];
-            // options
-            this.options = options || {};
-            this.options.context = options.context || {};
-            this.options.show_attachment_delete = options.show_attachment_delete || false;
+
+            this.context = options.context || {};
 
             this.id =           options.parameters.id;
             this.model =        options.parameters.model;
@@ -113,6 +111,8 @@ openerp.mail = function(session) {
             this.attachment_ids = [];
             this.show_attachment_delete = true;
             this.show_attachment_link = false;
+
+            this.parent_thread= parent.messages!= undefined ? parent : false;
         },
 
         start: function(){
@@ -153,7 +153,10 @@ openerp.mail = function(session) {
             });
 
             // set the function called when attachments are added
-            this.$el.on('change', 'input.oe_insert_file', self.on_attachment_change);
+            this.$el.on('change', 'input.oe_insert_file', self.on_attachment_change );
+            this.$el.on('click', 'a.oe_cancel', self.on_cancel );
+            this.$el.on('click', 'button.oe_post', function(){self.on_message_post()} );
+            this.$el.on('click', 'button.oe_full', function(){self.on_open_wizard()} );
         },
 
         on_attachment_change: function (event) {
@@ -170,12 +173,43 @@ openerp.mail = function(session) {
                 $newfield = $target.clone();
                 $newfield.insertAfter($target);
                 $target.hide();
-                $target.attr("id",id);
+                $target.attr("data-id",id);
 
                 this.display_attachments();
             }
         },
 
+        on_open_wizard: function(){
+            var action = {
+                type: 'ir.actions.act_window',
+                res_model: 'mail.compose.message',
+                view_mode: 'form',
+                view_type: 'form',
+                views: [[false, 'form']],
+                target: 'new',
+                context: {
+                    'default_res_model': this.model,
+                    'default_res_id': this.res_id,
+                    'default_content_subtype': 'html',
+                    'default_is_private': true,
+                    'default_parent_id': this.id,
+                    'default_body': this.$('textarea').val().replace(/[\n\r]/g,'<br>'),
+                    'default_attachment_ids': this.attachment_ids
+
+                },
+            };
+            this.do_action(action);
+        },
+
+        on_cancel: function(){
+            event.stopPropagation();
+            this.$('textarea').val("");
+            this.$('input[data-id]').remove();
+            this.attachment_ids=[];
+            this.display_attachments();
+            this.$el.hide();
+        },
+
         on_attachment_delete: function (event) {
             event.stopPropagation();
             var id=$(event.target).data("id");
@@ -186,7 +220,7 @@ openerp.mail = function(session) {
                         attachments.push(this.attachment_ids[i]);
                 }
                 this.attachment_ids = attachments;
-                this.$("input#"+id).remove();
+                this.$("input[data-id='"+id+"'").remove();
             /*
                 var attachment_id = parseInt(event.target.dataset.id);
                 var idx = _.pluck(this.attachment_ids, 'id').indexOf(attachment_id);
@@ -198,6 +232,25 @@ openerp.mail = function(session) {
             }
         },
 
+
+        /*post a message and fletch the message*/
+        on_message_post: function (body) {
+            var self = this;
+            if (! body) {
+                var comment_node = this.$('textarea');
+                var body = comment_node.val();
+                comment_node.val('');
+            }
+            if(body.match(/\S+/)) {
+                this.parent_thread.ds_thread.call('message_post_api', [
+                    [this.context.default_res_id], body, false, 'comment', false, this.context.default_parent_id, undefined])
+                    .then(this.parent_thread.proxy('switch_new_message'));
+                this.on_cancel();
+            }
+            else {
+                return false;
+            }
+        },
     });
 
     /** 
@@ -654,13 +707,7 @@ openerp.mail = function(session) {
             this.display_user_avatar();
             var display_done = compose_done = false;
             
-            // add message composition form view
-            this.ComposeMessage = new mail.ComposeMessage(this,{
-                'context': this.context,
-                'parameters': this,
-                'show_attachment_delete': true,
-            });
-            this.ComposeMessage.appendTo(this.$(".oe_mail_thread_action:first"));
+            this.instantiate_ComposeMessage();
 
             this.bind_events();
 
@@ -671,6 +718,16 @@ openerp.mail = function(session) {
             return display_done && compose_done;
         },
 
+        instantiate_ComposeMessage: function(){
+            // add message composition form view
+            this.ComposeMessage = new mail.ComposeMessage(this,{
+                'context': this.context,
+                'parameters': this,
+                'show_attachment_delete': true,
+            });
+            this.ComposeMessage.appendTo(this.$(".oe_mail_thread_action:first"));
+        },
+
         /**
         * Override-hack of do_action: automatically load message on the chatter.
         * Normally it should be called only when clicking on 'Post/Send'
@@ -691,6 +748,8 @@ openerp.mail = function(session) {
 
             $(document).scroll( self.on_scroll );
             window.setTimeout( self.on_scroll, 500 );
+
+            this.ComposeMessage.$el.show();
         },
 
         /* When the expandable object is visible on screen (with scrolling)
@@ -711,20 +770,11 @@ openerp.mail = function(session) {
             }
         },
 
-        on_attachment_change: function (event) {
-            var $target = $(event.target);
-            if ($target.val() !== '') {
-                this.$('form.oe_form_binary_form').submit();
-                session.web.blockUI();
-            }
-        },
-
         /**
          * Bind events in the widget. Each event is slightly described
          * in the function. */
         bind_events: function() {
             var self = this;
-            self.$('.oe_mail_compose_textarea:first button.post').click(function () {return self.message_post();});
             self.$('.oe_mail_compose_textarea .oe_more').click(function () { var p=$(this).parent(); p.find('.oe_more_hidden, .oe_hidden').show(); p.find('.oe_more').hide(); });
             self.$('.oe_mail_compose_textarea .oe_more_hidden').click(function () { var p=$(this).parent(); p.find('.oe_more_hidden, .oe_hidden').hide(); p.find('.oe_more').show(); });
         },
@@ -792,7 +842,7 @@ openerp.mail = function(session) {
         /* this function is launch when a user click on "Reply" button
         */
         on_compose_message: function(){
-            this.$('div.oe_mail_thread_action:first').toggle();
+            this.ComposeMessage.$el.toggle();
             return false;
         },
 
@@ -802,24 +852,6 @@ openerp.mail = function(session) {
             self.message_fletch();
         },
 
-        /*post a message and fletch the message*/
-        message_post: function (body) {
-            var self = this;
-            if (! body) {
-                var comment_node = this.$('textarea');
-                var body = comment_node.val();
-                comment_node.val('');
-            }
-            if(body.match(/\S+/)) {
-                this.ds_thread.call('message_post_api', [
-                    [this.context.default_res_id], body, false, 'comment', false, this.context.default_parent_id, undefined])
-                    .then(this.proxy('switch_new_message'));
-            }
-            else {
-                return false;
-            }
-        },
-
         /** Fetch messages
          * @param {Bool} initial_mode: initial mode: try to use message_data or
          *  message_ids, if nothing available perform a message_read; otherwise
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index edb5d1fba09..087e14b0330 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -16,11 +16,13 @@
                 <!-- default content: old basic textarea -->
                 <div class="oe_mail_post_header">
                     <t t-call="mail.thread.list_recipients"/>
+                    <a class="oe_cancel oe_e">X</a>
                 </div>
                 <textarea class="field_text" placeholder="Add your comment here..."/>
                 <div class="oe_mail_post_footer">
-                    <span class="oe_mail_compose_attachment_list"/>
-                    <button class="post">Post message</button>
+                    <div class="oe_mail_compose_attachment_list"/>
+                    <button class="oe_full">Full mail message</button>
+                    <button class="oe_post">Post message</button>
                     <t t-call="mail.compose_message.add_attachment"/>
                 </div>
             </div>
@@ -63,7 +65,7 @@
     <t t-name="mail.thread.message.private">
         <div>
             <span class="oe_placeholder_checkbox_private"/>
-            <span class="oe_send_private">This email is private and don't send to all my followers.</span>
+            <span class="oe_send_private">This email is private.</span>
             <span class="oe_send_public">I wrote for contacts and all my followers.</span>
         </div>
     </t>
@@ -92,12 +94,6 @@
         Template used to display the communication history in the wall.
         -->
     <div t-name="mail.wall" class="oe_view_manager oe_mail_wall oe_view_manager_current">
-
-        <!--button string="Send Reminder Email" name="%(mail.action_email_compose_message_wizard)d" type="action"
-            states="waiting_answer"
-            context="{'default_body_text': 'Hello,\n\n',
-                        'default_subject': '' }"/-->
-
         <table class="oe_view_manager_header">
           <colgroup>
             <col width="33%"/>
diff --git a/addons/mail/wizard/mail_compose_message_view.xml b/addons/mail/wizard/mail_compose_message_view.xml
index fcac5b1ea70..c8aaf796311 100644
--- a/addons/mail/wizard/mail_compose_message_view.xml
+++ b/addons/mail/wizard/mail_compose_message_view.xml
@@ -16,6 +16,7 @@
                         <field name="partner_ids" widget="many2many_tags" placeholder="Add contacts to notify..."
                                 context="{'force_email':True}"
                                 on_change="onchange_partner_ids(partner_ids)"/>
+                        <field name="is_private" help="If this message is not private, this message will send to all your followers or all followers of the parented message."/>
                     </group>
                     <notebook>
                         <page string="Body">

From af7e536f24c149f47f96f66a3698764f565bc4f2 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Fri, 5 Oct 2012 15:10:13 +0200
Subject: [PATCH 04/26] [IMP] mail chatter

bzr revid: chm@openerp.com-20121005131013-r00x50m6184ef1ea
---
 addons/mail/static/src/js/mail.js   | 19 +++++++++++--------
 addons/mail/static/src/xml/mail.xml | 11 ++++++++++-
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 48577bdeb27..58cf1b264df 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -156,7 +156,7 @@ openerp.mail = function(session) {
             this.$el.on('change', 'input.oe_insert_file', self.on_attachment_change );
             this.$el.on('click', 'a.oe_cancel', self.on_cancel );
             this.$el.on('click', 'button.oe_post', function(){self.on_message_post()} );
-            this.$el.on('click', 'button.oe_full', function(){self.on_open_wizard()} );
+            this.$el.on('click', 'button.oe_full', function(){self.on_compose_fullmail()} );
         },
 
         on_attachment_change: function (event) {
@@ -179,7 +179,7 @@ openerp.mail = function(session) {
             }
         },
 
-        on_open_wizard: function(){
+        on_compose_fullmail: function(){
             var action = {
                 type: 'ir.actions.act_window',
                 res_model: 'mail.compose.message',
@@ -193,9 +193,8 @@ openerp.mail = function(session) {
                     'default_content_subtype': 'html',
                     'default_is_private': true,
                     'default_parent_id': this.id,
-                    'default_body': this.$('textarea').val().replace(/[\n\r]/g,'<br>'),
+                    'default_body': (this.$('textarea').val() || '').replace(/[\n\r]/g,'<br>'),
                     'default_attachment_ids': this.attachment_ids
-
                 },
             };
             this.do_action(action);
@@ -743,13 +742,9 @@ openerp.mail = function(session) {
             var self=this;
             // fetch and display message, using message_ids if set
             display_done = this.message_fletch(true);
-            //show the first write message
-            self.$(">.oe_mail_thread_action").show();
 
             $(document).scroll( self.on_scroll );
             window.setTimeout( self.on_scroll, 500 );
-
-            this.ComposeMessage.$el.show();
         },
 
         /* When the expandable object is visible on screen (with scrolling)
@@ -1077,6 +1072,7 @@ openerp.mail = function(session) {
             var searchview_ready = this.load_searchview({}, false);
             var thread_displayed = this.message_render();
             this.options.domain = this.options.domain.concat(this.search_results['domain']);
+            this.bind_events();
             return (searchview_ready && thread_displayed);
         },
 
@@ -1139,6 +1135,13 @@ openerp.mail = function(session) {
             $(render_res).appendTo(this.$('ul.oe_mail_wall_threads'));
 
             return this.thread.appendTo( this.$('li.oe_mail_wall_thread:last') );
+
         },
+
+        bind_events: function(){
+            var self=this;
+            this.$("button.oe_write_full:first").click(function(){ self.thread.ComposeMessage.on_compose_fullmail(); });
+            this.$("button.oe_write_onwall:first").click(function(){ self.thread.ComposeMessage.$el.toggle(); });
+        }
     });
 };
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 087e14b0330..d1c7c0a367f 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -88,7 +88,6 @@
         </div>
     </t>
 
-
     <!-- 
         wall main template
         Template used to display the communication history in the wall.
@@ -113,6 +112,16 @@
                 </td>
                 <td><div class="oe_view_manager_view_search" t-opentag="true"/></td>
             </tr>
+            <tr class="oe_header_row">
+                <td colspan="2">
+                    <button type="button" class="oe_write_full oe_highlight">
+                        Compose a new message
+                    </button>
+                    <button type="button" class="oe_write_onwall" help="Your followers can read this message">
+                        Write on your wall
+                    </button>
+                </td>
+            </tr>
           </tbody>
         </table>
         <ul class="oe_mail_wall_threads">

From 4557bf1d506dd71dd757702b72513a35518080ec Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Mon, 8 Oct 2012 16:26:54 +0200
Subject: [PATCH 05/26] [IMP]mail chatter: uploader

bzr revid: chm@openerp.com-20121008142654-pll3vfvjufo1gsr9
---
 addons/mail/mail_thread.py                    |  19 +-
 addons/mail/static/src/css/mail.css           |  29 +--
 .../static/src/css/mail_compose_message.css   |   2 +
 addons/mail/static/src/js/mail.js             | 184 +++++++++---------
 addons/mail/static/src/xml/mail.xml           |  27 ++-
 5 files changed, 144 insertions(+), 117 deletions(-)

diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 050c755c7c3..40fe1c287c2 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -623,7 +623,7 @@ class mail_thread(osv.AbstractModel):
             :param str subject: optional subject
             :param str type: mail_message.type
             :param int parent_id: optional ID of parent message in this thread
-            :param tuple(str,str) attachments: list of attachment tuples in the form
+            :param tuple(str,str) attachments or list id: list of attachment tuples in the form
                 ``(name,content)``, where content is NOT base64 encoded
             :return: ID of newly created mail.message
         """
@@ -634,7 +634,7 @@ class mail_thread(osv.AbstractModel):
         if isinstance(thread_id, (list, tuple)):
             thread_id = thread_id and thread_id[0]
 
-        attachment_ids = []
+        attachment_ids=[]
         for name, content in attachments:
             if isinstance(content, unicode):
                 content = content.encode('utf-8')
@@ -701,8 +701,21 @@ class mail_thread(osv.AbstractModel):
             user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
             thread_id = user.partner_id.id
 
+        if attachments and attachments[0]==None:
+            attachments=[]
+        
         added_message_id = self.message_post(cr, uid, thread_id=thread_id, body=body, subject=subject, type=type,
-                        subtype=subtype, parent_id=parent_id, attachments=attachments, context=context)
+                        subtype=subtype, parent_id=parent_id, attachments=[], context=context)
+
+        attachment_ids=[]
+        if attachments:
+            ir_attachment = self.pool.get('ir.attachment')
+            attachment_ids = ir_attachment.search(cr, 1, [('res_model', '=', ""), ('res_id', '=', ""), ('user_id', '=', uid), ('id', 'in', attachments)], context=context)
+            if attachment_ids:
+                self.pool.get('ir.attachment').write(cr, 1, attachment_ids, { 'res_model': self._name, 'res_id': thread_id }, context=context)
+                self.pool.get('mail.message').write(cr, 1, [added_message_id], {'attachment_ids': attachment_ids} )
+        
+            
         added_message = self.pool.get('mail.message').message_read(cr, uid, [added_message_id])
         return added_message
 
diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index 6b28c841f97..9133078d433 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -195,6 +195,10 @@
     margin-left: 66px;
 }
 
+.openerp li.oe_mail_thread_msg {
+    width: 560px;
+}
+
 .openerp div.oe_thread_placeholder li.oe_mail_thread_msg:last-child {
     margin-bottom: 8px;
 }
@@ -212,13 +216,18 @@
 
 .openerp li.oe_mail_thread_msg.oe_mail_read,
 .openerp li.oe_mail_thread_msg.oe_mail_read div {
-    background-color: #F0F0F0;
+    border-left: #F0F0F0;
 }
 .openerp li.oe_mail_thread_msg.oe_mail_read li.oe_mail_thread_msg.oe_mail_unread,
 .openerp li.oe_mail_thread_msg.oe_mail_read li.oe_mail_thread_msg.oe_mail_unread div {
     background-color: #F6F6F6;
 }
 
+.openerp li.oe_mail_thread_msg.oe_mail_unread>div>ul>li.oe_unread,
+.openerp li.oe_mail_thread_msg.oe_mail_read>div>ul>li.oe_read {
+    display: none;
+}
+
 .openerp li.oe_mail_thread_msg > div:after {
     content: "";
     display: block;
@@ -236,7 +245,6 @@
 .openerp .oe_mail_msg_email {
     padding: 8px;
     background: white;
-    border-top: 1px solid #ebebeb;
 }
 
 .openerp .oe_mail_msg_notification:after, 
@@ -248,7 +256,7 @@
 }
 
 .openerp div.oe_mail_msg_content {
-    float: right;
+    float: left;
     position: relative;
     width: 486px;
 }
@@ -333,33 +341,26 @@
 
 /* Dropdown menu */
 
-.openerp .oe_mail .oe_semantic_html_override {
+.openerp .oe_mail ul.oe_mail_thread_display ul.oe_mail_thread_display {
     position: relative;
+    border-left: 1px #DDD dashed;
 }
 
 .openerp .oe_mail ul.oe_header {
     position: absolute;
     right: 3px;
     top: -6px;
-    display: none;
     z-index: 10;
-    height: 18px;
 }
 
 .openerp .oe_mail ul.oe_header a {
     text-decoration: none;
 }
 
-.openerp .oe_mail .oe_semantic_html_override:hover > ul.oe_header {
-    display: block;
-}
-
 .openerp .oe_mail ul.oe_header>li {
     display: inline-block;
-}
-
-.openerp .oe_mail_msg_content .oe_dropdown_arrow:after {
-    border-top: 4px solid #404040;
+    height: 20px;
+    text-align: right;
 }
 
 /* Message footer */
diff --git a/addons/mail/static/src/css/mail_compose_message.css b/addons/mail/static/src/css/mail_compose_message.css
index 5788927b080..253ce9e8e33 100644
--- a/addons/mail/static/src/css/mail_compose_message.css
+++ b/addons/mail/static/src/css/mail_compose_message.css
@@ -29,6 +29,8 @@
 
 .openerp .oe_mail .oe_mail_compose_textarea button.oe_full {
     float: right;
+    position: relative;
+    right: -10px;
 }
 
 /* ------------------------------------------------------------ */
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 58cf1b264df..bcfc6ba276c 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -18,12 +18,8 @@ openerp.mail = function(session) {
 
     session.web.FormView = session.web.FormView.extend({
         do_action: function(action, on_close) {
-            if (action.res_model == 'mail.compose.message' &&
-                action.context && action.context.redirect == true &&
-                this.fields && this.fields.message_ids && this.fields.message_ids.view.get("actual_mode") != 'create') {
-                var thread = this.fields.message_ids.thread;
-
-                thread.refresh(action.context);
+            if (action.res_model == 'mail.compose.message') {
+                $(".openerp_webclient_container .oe_view_manager_current .oe_mail .oe_mail_wall_button_fletch").click();
                 return false;
             }
             else {
@@ -105,27 +101,31 @@ openerp.mail = function(session) {
 
             this.id =           options.parameters.id;
             this.model =        options.parameters.model;
+            this.res_id =       options.parameters.res_id;
             this.is_private =   options.parameters.is_private;
             this.partner_ids =  options.parameters.partner_ids;
 
             this.attachment_ids = [];
             this.show_attachment_delete = true;
-            this.show_attachment_link = false;
+            this.show_attachment_link = true;
 
             this.parent_thread= parent.messages!= undefined ? parent : false;
+
+            this.fileupload_id = _.uniqueId('oe_fileupload_temp');
+            $(window).on(self.fileupload_id, self.on_attachment_loaded);
         },
 
         start: function(){
-            var self = this;
-
             this.display_attachments();
+            this.bind_events();
 
-            self.bind_events();
-
+            //load avatar img
             var user_avatar = mail.ChatterUtils.get_image(this.session, 'res.users', 'image_small', this.session.uid);
             this.$('img.oe_mail_icon').attr('src', user_avatar);
         },
 
+        /* upload the file on the server, add in the attachments list and reload display
+         */
         display_attachments: function(){
             var self = this;
             var render = $(session.web.qweb.render('mail.thread.message.attachments', {'widget': self}));
@@ -139,47 +139,70 @@ openerp.mail = function(session) {
             // event: delete an attachment
             this.$el.on('click', '.oe_mail_attachment_delete', self.on_attachment_delete);
         },
+        on_attachment_change: function (event) {
+            event.stopPropagation();
+            var self = this;
+            var $target = $(event.target);
+            if ($target.val() !== '') {
+
+                for(var i in this.attachment_ids){
+                    if(this.attachment_ids[i].url == $target.val()){
+                        var ds_attachment = new session.web.DataSetSearch(this, 'ir.attachment');
+                        ds_attachment.unlink(this.attachment_ids.id);
+                    }
+                }
+
+                // submit file
+                session.web.blockUI();
+                var form = self.$('form.oe_form_binary_form');
+                form.submit();
+            }
+        },
+        on_attachment_loaded: function (event, result) {
+            session.web.unblockUI();
+            this.attachment_ids.push({
+                'id': result.id,
+                'name': '',
+                'filename': result.filename,
+                'url': mail.ChatterUtils.get_attachment_url(this.session, result)
+            });
+            this.$('input.oe_form_binary_file').empty();
+            this.display_attachments();
+        },
+        /* unlink the file on the server and reload display
+         */
+        on_attachment_delete: function (event) {
+            event.stopPropagation();
+            var attachment_id=$(event.target).data("id");
+            if (attachment_id) {
+                var attachments=[];
+                for(var i in this.attachment_ids){
+                    if(attachment_id!=this.attachment_ids[i].id)
+                        attachments.push(this.attachment_ids[i]);
+                }
+                this.attachment_ids = attachments;
+                this.display_attachments();
+
+                var ds_attachment = new session.web.DataSetSearch(this, 'ir.attachment');
+                ds_attachment.unlink(attachment_id);
+            }
+        },
 
         bind_events: function() {
             var self = this;
-            // event: add a new attachment
-            $(window).on(this.fileupload_id, function() {
-                var args = [].slice.call(arguments).slice(1);
-                var attachment = args[0];
-                attachment['url'] = mail.ChatterUtils.get_attachment_url(self.session, attachment);
-                self.attachment_ids.push(attachment);
-                self.display_attachments();
-                session.web.unblockUI();
-            });
 
             // set the function called when attachments are added
-            this.$el.on('change', 'input.oe_insert_file', self.on_attachment_change );
+            this.$el.on('change', 'input.oe_form_binary_file', self.on_attachment_change );
             this.$el.on('click', 'a.oe_cancel', self.on_cancel );
             this.$el.on('click', 'button.oe_post', function(){self.on_message_post()} );
             this.$el.on('click', 'button.oe_full', function(){self.on_compose_fullmail()} );
         },
 
-        on_attachment_change: function (event) {
-            event.stopPropagation();
-            var $target = $(event.target);
-            if ($target.val() !== '') {
-                //session.web.blockUI();
-                var id = _.uniqueId('oe_fileupload');
-                this.attachment_ids.push({
-                    'url': $target.val(),
-                    'filename' : $target.val().replace(/.*[\/\\]/,''),
-                    'id': id
-                });
-                $newfield = $target.clone();
-                $newfield.insertAfter($target);
-                $target.hide();
-                $target.attr("data-id",id);
-
-                this.display_attachments();
-            }
-        },
-
         on_compose_fullmail: function(){
+            var attachments=[];
+            for(var i in this.attachment_ids){
+                attachments.push(this.attachment_ids[i].id);
+            }
             var action = {
                 type: 'ir.actions.act_window',
                 res_model: 'mail.compose.message',
@@ -194,7 +217,7 @@ openerp.mail = function(session) {
                     'default_is_private': true,
                     'default_parent_id': this.id,
                     'default_body': (this.$('textarea').val() || '').replace(/[\n\r]/g,'<br>'),
-                    'default_attachment_ids': this.attachment_ids
+                    'default_attachment_ids': attachments
                 },
             };
             this.do_action(action);
@@ -209,40 +232,23 @@ openerp.mail = function(session) {
             this.$el.hide();
         },
 
-        on_attachment_delete: function (event) {
-            event.stopPropagation();
-            var id=$(event.target).data("id");
-            if (id) {
-                var attachments=[];
-                for(var i in this.attachment_ids){
-                    if(id!=this.attachment_ids[i].id)
-                        attachments.push(this.attachment_ids[i]);
-                }
-                this.attachment_ids = attachments;
-                this.$("input[data-id='"+id+"'").remove();
-            /*
-                var attachment_id = parseInt(event.target.dataset.id);
-                var idx = _.pluck(this.attachment_ids, 'id').indexOf(attachment_id);
-                if (idx == -1) return false;
-                new session.web.DataSetSearch(this, 'ir.attachment').unlink(attachment_id);
-                this.attachment_ids.splice(idx, 1);
-            */
-                this.display_attachments();
-            }
-        },
-
-
         /*post a message and fletch the message*/
         on_message_post: function (body) {
-            var self = this;
+
             if (! body) {
                 var comment_node = this.$('textarea');
                 var body = comment_node.val();
                 comment_node.val('');
             }
             if(body.match(/\S+/)) {
+
+                var attachments=[];
+                for(var i in this.attachment_ids){
+                    attachments.push(this.attachment_ids[i].id);
+                }
+
                 this.parent_thread.ds_thread.call('message_post_api', [
-                    [this.context.default_res_id], body, false, 'comment', false, this.context.default_parent_id, undefined])
+                    [this.context.default_res_id], body, false, 'comment', false, this.context.default_parent_id, attachments])
                     .then(this.parent_thread.proxy('switch_new_message'));
                 this.on_cancel();
             }
@@ -537,7 +543,14 @@ openerp.mail = function(session) {
             if($(event.srcElement).hasClass("oe_read")) this.animated_destroy({fadeTime:250});
             // if this message is read, all childs message display is read
             var ids = [this.id].concat( this.get_child_ids() );
-            this.ds_notification.call('set_message_read', [ids,$(event.srcElement).hasClass("oe_read")]);
+            
+            if($(event.srcElement).hasClass("oe_read")) {
+                this.ds_notification.call('set_message_read', [ids,true]);
+                this.$el.removeClass("oe_mail_unread").addClass("oe_mail_read");
+            } else {
+                this.ds_notification.call('set_message_read', [ids,false]);
+                this.$el.removeClass("oe_mail_read").addClass("oe_mail_unread");
+            }
             return false;
         },
 
@@ -727,24 +740,24 @@ openerp.mail = function(session) {
             this.ComposeMessage.appendTo(this.$(".oe_mail_thread_action:first"));
         },
 
-        /**
-        * Override-hack of do_action: automatically load message on the chatter.
-        * Normally it should be called only when clicking on 'Post/Send'
-        * in the composition form. */
-        do_action: function(action, on_close) {
-            this.message_fletch(false, false, false, [action.id]);
-            return this._super(action, on_close);
-        },
-
         /* this method is runing for first parent thread
         */
         on_first_thread: function(){
             var self=this;
             // fetch and display message, using message_ids if set
-            display_done = this.message_fletch(true);
+            this.message_fletch(true);
 
             $(document).scroll( self.on_scroll );
             window.setTimeout( self.on_scroll, 500 );
+
+            $(session.web.qweb.render('mail.wall_no_message', {})).appendTo(this.$('ul.oe_mail_thread_display'));
+
+            var button_flesh = $('<button style="display:none;" class="oe_mail_wall_button_fletch"/>').click(function(event){
+                if(event)event.stopPropagation();
+                self.message_fletch(true);
+            });
+            this.$el.prepend(button_flesh);
+
         },
 
         /* When the expandable object is visible on screen (with scrolling)
@@ -841,12 +854,6 @@ openerp.mail = function(session) {
             return false;
         },
 
-        refresh: function (action_context) {
-            var self=this;
-            _(this.messages).each(function(){ self.destroy(); });
-            self.message_fletch();
-        },
-
         /** Fetch messages
          * @param {Bool} initial_mode: initial mode: try to use message_data or
          *  message_ids, if nothing available perform a message_read; otherwise
@@ -892,6 +899,8 @@ openerp.mail = function(session) {
         insert_message: function (message) {
             var self=this;
 
+            this.$("li.oe_wall_no_message").remove();
+
             if(message.type=='expandable'){
                 var message = new mail.ThreadExpandable(self, {
                     'domain': message.domain,
@@ -1129,12 +1138,7 @@ openerp.mail = function(session) {
                     'parameters': {},
                 }
             );
-
-            this.$('ul.oe_mail_wall_threads').empty();
-            var render_res = session.web.qweb.render('mail.wall_thread_container', {});
-            $(render_res).appendTo(this.$('ul.oe_mail_wall_threads'));
-
-            return this.thread.appendTo( this.$('li.oe_mail_wall_thread:last') );
+            return this.thread.appendTo( this.$('.oe_mail_wall_threads:first') );
 
         },
 
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index d1c7c0a367f..db6935d7af8 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -37,8 +37,15 @@
     <t t-name="mail.compose_message.add_attachment">
         <div class="oe_attachment_file">
             <div class="oe_add">
-                <input type="file" class="oe_insert_file"/>
+                <!-- uploader of file -->
                 <button><span class="oe_e">p</span></button>
+                <t t-call="HiddenInputFile">
+                    <t t-set="fileupload_id" t-value="widget.fileupload_id"/>
+                    <t t-set="fileupload_action">/web/binary/upload_attachment</t>
+                    <input type="hidden" name="model" value=""/>
+                    <input type="hidden" name="id" value="0"/>
+                    <input type="hidden" name="session_id" t-att-value="widget.session.session_id"/>
+                </t>
             </div>
         </div>
     </t>
@@ -92,7 +99,8 @@
         wall main template
         Template used to display the communication history in the wall.
         -->
-    <div t-name="mail.wall" class="oe_view_manager oe_mail_wall oe_view_manager_current">
+    <div t-name="mail.wall" class="oe_view_manager oe_mail_wall oe_view_manag
+        er_current">
         <table class="oe_view_manager_header">
           <colgroup>
             <col width="33%"/>
@@ -124,19 +132,18 @@
             </tr>
           </tbody>
         </table>
-        <ul class="oe_mail_wall_threads">
-            <!-- contains threads -->
-        </ul>
+        <!-- placeholder for the wall threads -->
+        <div class="oe_mail_wall_threads"/>
         <div class="oe_mail_wall_aside">
                 <!-- contains currently nothing -->
         </div>
     </div>
 
     <!--
-        wall_thread_container template for the wall
-        Each discussion thread is contained inside this template
+        display message on the wall when there are no message
         -->
-    <li t-name="mail.wall_thread_container" class="oe_mail_wall_thread">
+    <li t-name="mail.wall_no_message" class="oe_wall_no_message">
+        You have no messages
     </li>
 
     <!--
@@ -172,8 +179,8 @@
             <!-- message actions (read/unread, reply, delete...) -->
             <ul class="oe_header">
                 <li class="placeholder-mail-vote"><t t-call="mail.thread.message.vote"/></li>
-                <li t-if="!widget.options.thread.display_on_flat and widget.unread" title="Read"><a class="oe_read oe_e">W</a></li>
-                <li t-if="!widget.options.thread.display_on_flat and !widget.unread" title="Set back to unread"><a class="oe_unread oe_e">h</a></li>
+                <li t-if="!widget.options.thread.display_on_flat" title="Read" class="oe_read"><a class="oe_read oe_e">W</a></li>
+                <li t-if="!widget.options.thread.display_on_flat" title="Set back to unread" class="oe_unread"><a class="oe_unread oe_e">h</a></li>
                 <li title="Quick reply"><a class="oe_reply oe_e">)</a></li>
                 <t t-if="(widget.options.message.show_reply || widget.options.message.show_reply_by_email || (widget.is_author and widget.options.message.show_dd_delete) || widget.type == 'email')">
                     <li>

From aff7e6d16106e473745159d47f842fa0d9c6f27c Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Mon, 8 Oct 2012 17:20:45 +0200
Subject: [PATCH 06/26] [IMP] mail chatter: upload OK

bzr revid: chm@openerp.com-20121008152045-old4i0hjb5apmf0p
---
 addons/mail/mail_thread.py        |  9 ++---
 addons/mail/static/src/js/mail.js | 55 +++++++++++++++++++------------
 2 files changed, 37 insertions(+), 27 deletions(-)

diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 40fe1c287c2..da4143df909 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -701,19 +701,16 @@ class mail_thread(osv.AbstractModel):
             user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
             thread_id = user.partner_id.id
 
-        if attachments and attachments[0]==None:
-            attachments=[]
-        
         added_message_id = self.message_post(cr, uid, thread_id=thread_id, body=body, subject=subject, type=type,
-                        subtype=subtype, parent_id=parent_id, attachments=[], context=context)
+                        subtype=subtype, parent_id=parent_id, context=context)
 
         attachment_ids=[]
-        if attachments:
+        if attachments and attachments[0]!=None:
             ir_attachment = self.pool.get('ir.attachment')
             attachment_ids = ir_attachment.search(cr, 1, [('res_model', '=', ""), ('res_id', '=', ""), ('user_id', '=', uid), ('id', 'in', attachments)], context=context)
             if attachment_ids:
                 self.pool.get('ir.attachment').write(cr, 1, attachment_ids, { 'res_model': self._name, 'res_id': thread_id }, context=context)
-                self.pool.get('mail.message').write(cr, 1, [added_message_id], {'attachment_ids': attachment_ids} )
+                self.pool.get('mail.message').write(cr, 1, [added_message_id], {'attachment_ids': [(6, 0, [pid for pid in attachment_ids])]} )
         
             
         added_message = self.pool.get('mail.message').message_read(cr, uid, [added_message_id])
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index bcfc6ba276c..599241e598f 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -104,6 +104,8 @@ openerp.mail = function(session) {
             this.res_id =       options.parameters.res_id;
             this.is_private =   options.parameters.is_private;
             this.partner_ids =  options.parameters.partner_ids;
+            this.show_header_compose =  options.parameters.options.thread.show_header_compose;
+            this.display_on_flat =  options.parameters.options.thread.display_on_flat;
 
             this.attachment_ids = [];
             this.show_attachment_delete = true;
@@ -229,7 +231,9 @@ openerp.mail = function(session) {
             this.$('input[data-id]').remove();
             this.attachment_ids=[];
             this.display_attachments();
-            this.$el.hide();
+            if(!this.show_header_compose || !this.display_on_flat){
+                this.$el.hide();
+            }
         },
 
         /*post a message and fletch the message*/
@@ -248,7 +252,7 @@ openerp.mail = function(session) {
                 }
 
                 this.parent_thread.ds_thread.call('message_post_api', [
-                    [this.context.default_res_id], body, false, 'comment', false, this.context.default_parent_id, attachments])
+                    this.context.default_res_id, body, false, 'comment', false, this.context.default_parent_id, attachments])
                     .then(this.parent_thread.proxy('switch_new_message'));
                 this.on_cancel();
             }
@@ -752,12 +756,16 @@ openerp.mail = function(session) {
 
             $(session.web.qweb.render('mail.wall_no_message', {})).appendTo(this.$('ul.oe_mail_thread_display'));
 
+            if(this.options.thread.show_header_compose){
+                this.ComposeMessage.$el.show();
+            }
+
             var button_flesh = $('<button style="display:none;" class="oe_mail_wall_button_fletch"/>').click(function(event){
                 if(event)event.stopPropagation();
                 self.message_fletch(true);
             });
             this.$el.prepend(button_flesh);
-
+            this.$el.addClass("oe_mail_wall_first_thread");
         },
 
         /* When the expandable object is visible on screen (with scrolling)
@@ -932,7 +940,7 @@ openerp.mail = function(session) {
             var parent_older = false;
             for(var i in thread.messages){
                 if(thread.messages[i].id > message.id){
-                    if(!parent_newer || parent_newer.id>thread.messages[i].id)
+                    if(!parent_newer || parent_newer.id>=thread.messages[i].id)
                         parent_newer = thread.messages[i];
                 } else if(thread.messages[i].id>0 && thread.messages[i].id < message.id) {
                     if(!parent_older || parent_older.id<thread.messages[i].id)
@@ -940,13 +948,24 @@ openerp.mail = function(session) {
                 }
             }
 
-            if(parent_older)
-                message.insertBefore(parent_older.$el);
-            else if(parent_newer)
-                message.insertAfter(parent_newer.$el);
-            else 
-                message.prependTo(thread.list_ul);
-
+            if(parent_older){
+                if(self.options.thread.display_on_flat)
+                    message.insertAfter(parent_older.$el);
+                else
+                    message.insertBefore(parent_older.$el);
+            }
+            else if(parent_newer){
+                if(self.options.thread.display_on_flat)
+                    message.insertBefore(parent_newer.$el);
+                else
+                    message.insertAfter(parent_newer.$el);
+            }
+            else {
+                if(self.options.thread.display_on_flat)
+                    message.appendTo(thread.list_ul);
+                else
+                    message.prependTo(thread.list_ul);
+            }
             return message
         },
 
@@ -1022,24 +1041,18 @@ openerp.mail = function(session) {
                     'options':{
                         'thread':{
                             'thread_level': this.options.thread_level,
-                            'show_header_compose': 0, //show_header_compose,
+                            'show_header_compose': show_header_compose,
                             'use_composer': show_header_compose,
                             'display_on_flat':true
                         },
                         'message':{
-                            'show_dd_delete': true,
-                            'show_reply_by_email': show_header_compose,
+                            'show_dd_delete': true
                         }
                     },
                     'parameters': {},
                 }
             );
-
-            this.$('ul.oe_mail_wall_threads').empty();
-            var render_res = session.web.qweb.render('mail.wall_thread_container', {});
-            $(render_res).appendTo(this.$('ul.oe_mail_wall_threads'));
-
-            return this.thread.appendTo( this.$('li.oe_mail_wall_thread:last') );
+            return this.thread.appendTo( this.$('.oe_mail_wall_threads:first') );
         },
     });
 
@@ -1128,7 +1141,7 @@ openerp.mail = function(session) {
                         'thread' :{
                             'thread_level': this.options.thread_level,
                             'use_composer': true,
-                            'show_header_compose': 0,
+                            'show_header_compose': true,
                         },
                         'message': {
                             'show_reply': this.options.thread_level > 0,

From 7a41798d7014adca2c2e91d6eac14e8f6562bc4f Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Tue, 9 Oct 2012 10:08:58 +0200
Subject: [PATCH 07/26] [IMP] mail, document: don't check duplication of file
 for attachment mail

bzr revid: chm@openerp.com-20121009080858-gnpf1893m12jd3mp
---
 addons/document/document.py         | 11 ++++++++---
 addons/mail/mail_thread.py          |  2 +-
 addons/mail/static/src/css/mail.css |  1 +
 addons/mail/static/src/js/mail.js   | 26 ++++++++++++++++----------
 addons/mail/static/src/xml/mail.xml |  9 ++++-----
 5 files changed, 30 insertions(+), 19 deletions(-)

diff --git a/addons/document/document.py b/addons/document/document.py
index 3ae783f49e7..27dde3250e2 100644
--- a/addons/document/document.py
+++ b/addons/document/document.py
@@ -154,6 +154,7 @@ class document_file(osv.osv):
         parent_id = vals.get('parent_id', False)
         res_model = vals.get('res_model', False)
         res_id = vals.get('res_id', 0)
+
         if op == 'write':
             for file in self.browse(cr, uid, ids): # FIXME fields_only
                 if not name:
@@ -164,11 +165,11 @@ class document_file(osv.osv):
                     res_model = file.res_model and file.res_model or False
                 if not res_id:
                     res_id = file.res_id and file.res_id or 0
-                res = self.search(cr, uid, [('id', '<>', file.id), ('name', '=', name), ('parent_id', '=', parent_id), ('res_model', '=', res_model), ('res_id', '=', res_id)])
+                res = self.search(cr, uid, [('id', '<>', file.id), ('name', '=', name), ('parent_id', '=', parent_id), ('res_model', '=', res_model), ('res_model', '!=', ''), ('res_id', '=', res_id)])
                 if len(res):
                     return False
         if op == 'create':
-            res = self.search(cr, uid, [('name', '=', name), ('parent_id', '=', parent_id), ('res_id', '=', res_id), ('res_model', '=', res_model)])
+            res = self.search(cr, uid, [('name', '=', name), ('parent_id', '=', parent_id), ('res_id', '=', res_id), ('res_model', '=', res_model), ('res_model', '!=', '')])
             if len(res):
                 return False
         return True
@@ -219,7 +220,11 @@ class document_file(osv.osv):
         res = self.search(cr, uid, [('id', 'in', ids)])
         if not len(res):
             return False
-        if not self._check_duplication(cr, uid, vals, ids, 'write'):
+
+        # when a user write a mail, there are no model
+        # don't check the duplication for the mails
+        res_mail = self.search(cr, uid, [('id', 'in', ids), ('res_model', '=', '')])
+        if res!=res_mail and not self._check_duplication(cr, uid, vals, ids, 'write'):
             raise osv.except_osv(_('ValidateError'), _('File name must be unique!'))
 
         # if nodes call this write(), they must skip the code below
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index da4143df909..4e8d036d68a 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -697,7 +697,7 @@ class mail_thread(osv.AbstractModel):
     def message_post_api(self, cr, uid, thread_id, body='', subject=False, type='notification',
                         subtype=None, parent_id=False, attachments=None, context=None, **kwargs):
         # if the user write on his wall
-        if self._name=='res.partner' and (not thread_id or not thread_id[0]):
+        if self._name=='res.partner' and not thread_id:
             user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
             thread_id = user.partner_id.id
 
diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index 9133078d433..c2abc6a5882 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -245,6 +245,7 @@
 .openerp .oe_mail_msg_email {
     padding: 8px;
     background: white;
+    position: relative;
 }
 
 .openerp .oe_mail_msg_notification:after, 
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 599241e598f..8fab771fcc0 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -104,12 +104,13 @@ openerp.mail = function(session) {
             this.res_id =       options.parameters.res_id;
             this.is_private =   options.parameters.is_private;
             this.partner_ids =  options.parameters.partner_ids;
-            this.show_header_compose =  options.parameters.options.thread.show_header_compose;
-            this.display_on_flat =  options.parameters.options.thread.display_on_flat;
+            this.options={thread:{}};
+            this.options.thread.show_header_compose =  options.parameters.options.thread.show_header_compose;
+            this.options.thread.display_on_flat =  options.parameters.options.thread.display_on_flat;
 
             this.attachment_ids = [];
-            this.show_attachment_delete = true;
-            this.show_attachment_link = true;
+            this.options.thread.show_attachment_delete = true;
+            this.options.thread.show_attachment_link = true;
 
             this.parent_thread= parent.messages!= undefined ? parent : false;
 
@@ -147,12 +148,17 @@ openerp.mail = function(session) {
             var $target = $(event.target);
             if ($target.val() !== '') {
 
+                // if the files exits for this answer, delete the file before upload
+                var attachments=[];
                 for(var i in this.attachment_ids){
                     if(this.attachment_ids[i].url == $target.val()){
                         var ds_attachment = new session.web.DataSetSearch(this, 'ir.attachment');
-                        ds_attachment.unlink(this.attachment_ids.id);
+                        ds_attachment.unlink([this.attachment_ids.id]);
+                    } else {
+                        attachments.push(this.attachment_ids[i]);
                     }
                 }
+                this.attachment_ids = attachments;
 
                 // submit file
                 session.web.blockUI();
@@ -186,7 +192,7 @@ openerp.mail = function(session) {
                 this.display_attachments();
 
                 var ds_attachment = new session.web.DataSetSearch(this, 'ir.attachment');
-                ds_attachment.unlink(attachment_id);
+                ds_attachment.unlink([attachment_id]);
             }
         },
 
@@ -231,7 +237,7 @@ openerp.mail = function(session) {
             this.$('input[data-id]').remove();
             this.attachment_ids=[];
             this.display_attachments();
-            if(!this.show_header_compose || !this.display_on_flat){
+            if(!this.options.thread.show_header_compose || !this.options.thread.display_on_flat){
                 this.$el.hide();
             }
         },
@@ -455,10 +461,10 @@ openerp.mail = function(session) {
          * in the function. */
         bind_events: function() {
             var self = this;
+
             // event: click on 'Attachment(s)' in msg
-            this.$el.on('click', 'a.oe_mail_msg_view_attachments', function (event) {
-                var act_dom = $(this).parent().parent().parent().find('.oe_mail_msg_attachments');
-                act_dom.toggle();
+            this.$('a.oe_mail_msg_view_attachments:first').on('click', function (event) {
+                self.$('.oe_mail_msg_attachments:first').toggle();
             });
             // event: click on icone 'Read' in header
             this.$el.on('click', 'a.oe_read', this.on_message_read_unread);
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index db6935d7af8..cd14632ec6c 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -55,14 +55,14 @@
         Template used to display attachments in a mail.message
         -->
     <t t-name="mail.thread.message.attachments">
-        <ul t-attf-class="oe_mail_msg_attachments #{widget.attachment_ids[0]?'':'oe_hidden'}">
+        <ul t-attf-class="oe_mail_msg_attachments #{widget.attachment_ids[0] and widget.options.thread.show_attachment_link?'':'oe_hidden'}">
             <t t-foreach="widget.attachment_ids" t-as="attachment">
                 <li>
-                    <a t-if="widget.show_attachment_link" t-att-href="attachment.url"><t t-raw="attachment.name || attachment.filename"/></a>
-                    <span t-if="!widget.show_attachment_link"><t t-raw="attachment.name || attachment.filename"/></span>
-                    <t t-if="widget.show_attachment_delete">
+                    <a t-att-href="attachment.url"><t t-raw="attachment.name || attachment.filename"/></a>
+                    <t t-if="widget.options.thread.show_attachment_delete">
                         <a class="oe_right oe_mail_attachment_delete" title="Delete this attachmentt" t-attf-data-id="{attachment.id}">x</a>
                     </t>
+
                 </li>
             </t>
         </ul>
@@ -214,7 +214,6 @@
                     <ul class="oe_mail_msg_footer">
                         <li t-if="widget.author_id"><a t-attf-href="#model=res.partner&amp;id=#{widget.author_id[0]}"><t t-raw="widget.author_id[1]"/></a></li>
                         <li><span t-att-title="widget.date"><t t-raw="widget.timerelative"/></span></li>
-                        
                         <li t-if="widget.attachment_ids.length > 0">
                             <a class="oe_mail_msg_view_attachments">
                                 <t t-if="widget.attachment_ids.length == 1">1 Attachment</t>

From 52f8ea85c8d0f33004bf74b54a9f1c723a581204 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Tue, 9 Oct 2012 10:44:36 +0200
Subject: [PATCH 08/26] [IMP] mail: get free user attachment

bzr revid: chm@openerp.com-20121009084436-13r1hz3movoupvmh
---
 addons/mail/mail_message.py       | 10 ++++++++++
 addons/mail/mail_thread.py        |  3 +--
 addons/mail/static/src/js/mail.js | 20 ++++++++++++++++----
 3 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 53811385052..89981b99389 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -343,6 +343,16 @@ class mail_message(osv.Model):
 
         return result
 
+    def user_free_attachment(self, cr, uid, context=None):
+        attachment_list = []
+
+        attachment = self.pool.get('ir.attachment')
+        attachment_ids = attachment.search(cr, uid, [('res_model','=',''),('create_uid','=',uid)])
+        if len(attachment_ids):
+            attachment_list = [{'id': attach[0], 'name': attach[1]} for attach in attachment.name_get(cr, uid, attachment_ids, context=context)]
+
+        return attachment_list
+    
     #------------------------------------------------------
     # Email api
     #------------------------------------------------------
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 4e8d036d68a..a4a6f7af2fa 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -711,8 +711,7 @@ class mail_thread(osv.AbstractModel):
             if attachment_ids:
                 self.pool.get('ir.attachment').write(cr, 1, attachment_ids, { 'res_model': self._name, 'res_id': thread_id }, context=context)
                 self.pool.get('mail.message').write(cr, 1, [added_message_id], {'attachment_ids': [(6, 0, [pid for pid in attachment_ids])]} )
-        
-            
+          
         added_message = self.pool.get('mail.message').message_read(cr, uid, [added_message_id])
         return added_message
 
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 8fab771fcc0..7fe3cee8a82 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -164,6 +164,7 @@ openerp.mail = function(session) {
                 session.web.blockUI();
                 var form = self.$('form.oe_form_binary_form');
                 form.submit();
+                $target.after($target.clone(true)).remove();
             }
         },
         on_attachment_loaded: function (event, result) {
@@ -185,17 +186,27 @@ openerp.mail = function(session) {
             if (attachment_id) {
                 var attachments=[];
                 for(var i in this.attachment_ids){
-                    if(attachment_id!=this.attachment_ids[i].id)
+                    if(attachment_id!=this.attachment_ids[i].id){
                         attachments.push(this.attachment_ids[i]);
+                    }
+                    else {
+                        var ds_attachment = new session.web.DataSetSearch(this, 'ir.attachment');
+                        ds_attachment.unlink([attachment_id]);
+                    }
                 }
                 this.attachment_ids = attachments;
                 this.display_attachments();
-
-                var ds_attachment = new session.web.DataSetSearch(this, 'ir.attachment');
-                ds_attachment.unlink([attachment_id]);
             }
         },
 
+        set_free_attachments: function(){
+            var self=this;
+            this.parent_thread.ds_message.call('user_free_attachment').then(function(attachments){
+                self.attachment_ids=attachments;
+                self.display_attachments();
+            });
+        },
+
         bind_events: function() {
             var self = this;
 
@@ -764,6 +775,7 @@ openerp.mail = function(session) {
 
             if(this.options.thread.show_header_compose){
                 this.ComposeMessage.$el.show();
+                this.ComposeMessage.set_free_attachments();
             }
 
             var button_flesh = $('<button style="display:none;" class="oe_mail_wall_button_fletch"/>').click(function(event){

From 2e4a6953c4c9bb04bdc4b0e9cc52413035d16ff9 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Tue, 9 Oct 2012 15:28:24 +0200
Subject: [PATCH 09/26] [IMP] mail: attachment

bzr revid: chm@openerp.com-20121009132824-dsl7f02hxfpypc0w
---
 addons/mail/mail_message.py         |   4 +-
 addons/mail/static/src/css/mail.css |  18 ++++
 addons/mail/static/src/js/mail.js   | 135 ++++++++++++++++++++++------
 addons/mail/static/src/xml/mail.xml |  18 +++-
 4 files changed, 144 insertions(+), 31 deletions(-)

diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 89981b99389..4595dfdfb88 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -349,10 +349,10 @@ class mail_message(osv.Model):
         attachment = self.pool.get('ir.attachment')
         attachment_ids = attachment.search(cr, uid, [('res_model','=',''),('create_uid','=',uid)])
         if len(attachment_ids):
-            attachment_list = [{'id': attach[0], 'name': attach[1]} for attach in attachment.name_get(cr, uid, attachment_ids, context=context)]
+            attachment_list = [{'id': attach.id, 'name': attach.name, 'date': attach.create_date} for attach in attachment.browse(cr, uid, attachment_ids, context=context)]
 
         return attachment_list
-    
+
     #------------------------------------------------------
     # Email api
     #------------------------------------------------------
diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index c2abc6a5882..f16fd4f0587 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -391,7 +391,25 @@
 }
 .openerp .oe_mail_msg_content ul.oe_mail_msg_attachments li {
     float: none;
+    height: 20px;
+    line-height: 20px;
     margin: 0;
     padding: 0;
     list-style-type: square;
 }
+.openerp .oe_mail_msg_content ul.oe_mail_msg_attachments .oe_upload_in_process {
+    float: right;
+    width: 200px;
+    height: 16px;
+}
+.openerp .oe_mail_msg_content ul.oe_mail_msg_attachments .oe_upload_in_process div {
+    float: left;
+    width: 38px;
+    height: 16px;
+    margin-right: 2px;
+    background: #66FF66;
+}
+.openerp .oe_mail_msg_content ul.oe_mail_msg_attachments .oe_upload_in_process span {
+    color: #aaaaaa;
+    position: absolute;
+}
\ No newline at end of file
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 7fe3cee8a82..e8225bb0c0c 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -114,6 +114,8 @@ openerp.mail = function(session) {
 
             this.parent_thread= parent.messages!= undefined ? parent : false;
 
+
+            this.ds_attachment = new session.web.DataSetSearch(this, 'ir.attachment');
             this.fileupload_id = _.uniqueId('oe_fileupload_temp');
             $(window).on(self.fileupload_id, self.on_attachment_loaded);
         },
@@ -148,12 +150,16 @@ openerp.mail = function(session) {
             var $target = $(event.target);
             if ($target.val() !== '') {
 
+                var filename = $target.val().replace(/.*[\\\/]/,'');
+
                 // if the files exits for this answer, delete the file before upload
                 var attachments=[];
                 for(var i in this.attachment_ids){
-                    if(this.attachment_ids[i].url == $target.val()){
-                        var ds_attachment = new session.web.DataSetSearch(this, 'ir.attachment');
-                        ds_attachment.unlink([this.attachment_ids.id]);
+                    if((this.attachment_ids[i].filename || this.attachment_ids[i].name) == filename){
+                        if(this.attachment_ids[i].upload){
+                            return false;
+                        }
+                        this.ds_attachment.unlink([this.attachment_ids[i].id]);
                     } else {
                         attachments.push(this.attachment_ids[i]);
                     }
@@ -161,22 +167,87 @@ openerp.mail = function(session) {
                 this.attachment_ids = attachments;
 
                 // submit file
-                session.web.blockUI();
-                var form = self.$('form.oe_form_binary_form');
-                form.submit();
-                $target.after($target.clone(true)).remove();
+                //session.web.blockUI();
+                self.$('form.oe_form_binary_form').submit();
+                //self.submit_ajax_attachment();
+
+                this.$(".oe_attachment_file").hide();
+
+                this.attachment_ids.push({
+                    'id': 0,
+                    'name': filename,
+                    'filename': filename,
+                    'url': '',
+                    'upload': true
+                });
+                this.display_attachments();
             }
         },
-        on_attachment_loaded: function (event, result) {
-            session.web.unblockUI();
-            this.attachment_ids.push({
-                'id': result.id,
-                'name': '',
-                'filename': result.filename,
-                'url': mail.ChatterUtils.get_attachment_url(this.session, result)
+        
+        submit_ajax_attachment: function(){
+            var self=this;
+            var $form = self.$('form.oe_form_binary_form');
+            var filename = this.$('input.oe_form_binary_file').val().replace(/.*[\\\/]/,'');
+
+            // create form data
+            var fomdata = new FormData();
+            $.each($form.find('input'), function(i, field) {
+                var $field=$(field);
+                if($field.attr('type')!='file'){
+                    fomdata.append($field.attr('name'), $field.val());
+                } else {
+                    fomdata.append($field.attr('name'), field.files[0]);
+                }
             });
-            this.$('input.oe_form_binary_file').empty();
+
+            var progress=function(event) {
+                console.log('xhr progress :', Math.floor(event.loaded / event.total*100), event);
+                self.$("span[name='"+filename+"'] div:lt("+Math.floor(event.loaded / event.total*5)+")").show();
+            };
+
+            $.ajax({
+                url: $form.attr("action"),
+                data: fomdata,
+                cache: false,
+                contentType: false,
+                processData: false,
+                type: 'POST',
+                enctype: 'multipart/form-data',
+                xhr: function() {
+                    // custom xhr
+                    myXhr = $.ajaxSettings.xhr();
+                    if(myXhr.upload){
+                        // for handling the progress of the upload
+                        myXhr.upload.addEventListener('progress', progress, false);
+                    }
+                    myXhr.addEventListener('progress', progress, false);
+                    return myXhr;
+                },
+                success: function(data){
+                    $iframe=$('<iframe style="display:none;"/>').html(data);
+                    $iframe.appendTo(self.$el);
+                    $iframe.remove();
+                }
+            });
+        },
+        
+        on_attachment_loaded: function (event, result) {
+            //session.web.unblockUI();
+            for(var i in this.attachment_ids){
+                if(this.attachment_ids[i].filename == result.filename && this.attachment_ids[i].upload){
+                    this.attachment_ids[i]={
+                        'id': result.id,
+                        'name': result.name,
+                        'filename': result.filename,
+                        'url': mail.ChatterUtils.get_attachment_url(this.session, result)
+                    };
+                }
+            }
             this.display_attachments();
+
+            var $input = this.$('input.oe_form_binary_file');
+            $input.after($input.clone(true)).remove();
+            this.$(".oe_attachment_file").show();
         },
         /* unlink the file on the server and reload display
          */
@@ -190,8 +261,7 @@ openerp.mail = function(session) {
                         attachments.push(this.attachment_ids[i]);
                     }
                     else {
-                        var ds_attachment = new session.web.DataSetSearch(this, 'ir.attachment');
-                        ds_attachment.unlink([attachment_id]);
+                        this.ds_attachment.unlink([attachment_id]);
                     }
                 }
                 this.attachment_ids = attachments;
@@ -199,10 +269,21 @@ openerp.mail = function(session) {
             }
         },
 
+        /* to avoid having unsorted file on the server.
+            we will show the users files of the first message post
+         */
         set_free_attachments: function(){
             var self=this;
             this.parent_thread.ds_message.call('user_free_attachment').then(function(attachments){
-                self.attachment_ids=attachments;
+                this.attachment_ids=[];
+                for(var i in attachments){
+                    self.attachment_ids[i]={
+                        'id': attachments[i].id,
+                        'name': attachments[i].name,
+                        'filename': attachments[i].filename,
+                        'url': mail.ChatterUtils.get_attachment_url(self.session, attachments[i])
+                    };
+                }
                 self.display_attachments();
             });
         },
@@ -246,7 +327,7 @@ openerp.mail = function(session) {
             event.stopPropagation();
             this.$('textarea').val("");
             this.$('input[data-id]').remove();
-            this.attachment_ids=[];
+            //this.attachment_ids=[];
             this.display_attachments();
             if(!this.options.thread.show_header_compose || !this.options.thread.display_on_flat){
                 this.$el.hide();
@@ -261,20 +342,22 @@ openerp.mail = function(session) {
                 var body = comment_node.val();
                 comment_node.val('');
             }
-            if(body.match(/\S+/)) {
 
-                var attachments=[];
-                for(var i in this.attachment_ids){
-                    attachments.push(this.attachment_ids[i].id);
+            var attachments=[];
+            for(var i in this.attachment_ids){
+                if(this.attachment_ids[i].upload){
+                    session.web.dialog($('<div>' + session.web.qweb.render('CrashManager.warning', {message: 'Please, wait while the file is uploading.'}) + '</div>'));
+                    return false;
                 }
+                attachments.push(this.attachment_ids[i].id);
+            }
 
+            if(body.match(/\S+/)) {
                 this.parent_thread.ds_thread.call('message_post_api', [
                     this.context.default_res_id, body, false, 'comment', false, this.context.default_parent_id, attachments])
                     .then(this.parent_thread.proxy('switch_new_message'));
                 this.on_cancel();
-            }
-            else {
-                return false;
+                return true;
             }
         },
     });
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index cd14632ec6c..5842829640a 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -58,8 +58,21 @@
         <ul t-attf-class="oe_mail_msg_attachments #{widget.attachment_ids[0] and widget.options.thread.show_attachment_link?'':'oe_hidden'}">
             <t t-foreach="widget.attachment_ids" t-as="attachment">
                 <li>
-                    <a t-att-href="attachment.url"><t t-raw="attachment.name || attachment.filename"/></a>
-                    <t t-if="widget.options.thread.show_attachment_delete">
+                    <span t-if="(attachment.upload or attachment.percent_loaded&lt;100)" t-attf-title="{(attachment.name || attachment.filename) + (attachment.date?' \n('+attachment.date+')':'' )}" t-attf-name="{attachment.name || attachment.filename}">
+                        <div class="oe_upload_in_process">
+                            <span>...wait upload...</span>
+                            <div t-attf-style="{attachment.percent_loaded&gt;0?'':'display:none;'}"/>
+                            <div t-attf-style="{attachment.percent_loaded&gt;20?'':'display:none;'}"/>
+                            <div t-attf-style="{attachment.percent_loaded&gt;40?'':'display:none;'}"/>
+                            <div t-attf-style="{attachment.percent_loaded&gt;60?'':'display:none;'}"/>
+                            <div t-attf-style="{attachment.percent_loaded&gt;80?'':'display:none;'}"/>
+                        </div>
+                        <t t-raw="attachment.name || attachment.filename"/>
+                    </span>
+                    <a t-if="(!attachment.upload or attachment.percent_loaded&gt;=100)" t-att-href="attachment.url" t-attf-title="{(attachment.name || attachment.filename) + (attachment.date?' \n('+attachment.date+')':'' )}">
+                        <t t-raw="attachment.name || attachment.filename"/>
+                    </a>
+                    <t t-if="widget.options.thread.show_attachment_delete and (!attachment.upload or attachment.percent_loaded&gt;=100)">
                         <a class="oe_right oe_mail_attachment_delete" title="Delete this attachmentt" t-attf-data-id="{attachment.id}">x</a>
                     </t>
 
@@ -68,7 +81,6 @@
         </ul>
     </t>
 
-
     <t t-name="mail.thread.message.private">
         <div>
             <span class="oe_placeholder_checkbox_private"/>

From 7df8ef5d37f28781f47abaac5374cdd916b54ba1 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Tue, 9 Oct 2012 16:03:54 +0200
Subject: [PATCH 10/26] [IMP] mail: sort messages

bzr revid: chm@openerp.com-20121009140354-3ozec5q42ckcg16w
---
 addons/mail/mail_thread.py          |  2 +-
 addons/mail/static/src/js/mail.js   | 33 ++++++++++++-----------------
 addons/mail/static/src/xml/mail.xml |  4 +---
 3 files changed, 15 insertions(+), 24 deletions(-)

diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index a4a6f7af2fa..e7f7ebf3195 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -705,7 +705,7 @@ class mail_thread(osv.AbstractModel):
                         subtype=subtype, parent_id=parent_id, context=context)
 
         attachment_ids=[]
-        if attachments and attachments[0]!=None:
+        if attachments:
             ir_attachment = self.pool.get('ir.attachment')
             attachment_ids = ir_attachment.search(cr, 1, [('res_model', '=', ""), ('res_id', '=', ""), ('user_id', '=', uid), ('id', 'in', attachments)], context=context)
             if attachment_ids:
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index e8225bb0c0c..fe4b69389e3 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -356,6 +356,7 @@ openerp.mail = function(session) {
                 this.parent_thread.ds_thread.call('message_post_api', [
                     this.context.default_res_id, body, false, 'comment', false, this.context.default_parent_id, attachments])
                     .then(this.parent_thread.proxy('switch_new_message'));
+                this.attachment_ids=[];
                 this.on_cancel();
                 return true;
             }
@@ -1034,38 +1035,30 @@ openerp.mail = function(session) {
                 });
             }
 
-            var thread = self.options.thread.display_on_flat ? self.options.thread._parents[0] : this;
+            var thread_messages = (self.options.thread.display_on_flat ? self.options.thread._parents[0].messages : []).concat(self.messages);
+            var thread = (self.options.thread.display_on_flat ? self.options.thread._parents[0] : self);
 
             // check older and newer message for insert
             var parent_newer = false;
             var parent_older = false;
-            for(var i in thread.messages){
-                if(thread.messages[i].id > message.id){
-                    if(!parent_newer || parent_newer.id>=thread.messages[i].id)
-                        parent_newer = thread.messages[i];
-                } else if(thread.messages[i].id>0 && thread.messages[i].id < message.id) {
-                    if(!parent_older || parent_older.id<thread.messages[i].id)
-                        parent_older = thread.messages[i];
+            for(var i in thread_messages){
+                if(thread_messages[i].id > message.id){
+                    if(!parent_newer || parent_newer.id>=thread_messages[i].id)
+                        parent_newer = thread_messages[i];
+                } else if(thread_messages[i].id>0 && thread_messages[i].id < message.id) {
+                    if(!parent_older || parent_older.id<thread_messages[i].id)
+                        parent_older = thread_messages[i];
                 }
             }
 
             if(parent_older){
-                if(self.options.thread.display_on_flat)
-                    message.insertAfter(parent_older.$el);
-                else
-                    message.insertBefore(parent_older.$el);
+                message.insertBefore(parent_older.$el);
             }
             else if(parent_newer){
-                if(self.options.thread.display_on_flat)
-                    message.insertBefore(parent_newer.$el);
-                else
-                    message.insertAfter(parent_newer.$el);
+                message.insertAfter(parent_newer.$el);
             }
             else {
-                if(self.options.thread.display_on_flat)
-                    message.appendTo(thread.list_ul);
-                else
-                    message.prependTo(thread.list_ul);
+                message.prependTo(thread.list_ul);
             }
             return message
         },
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 5842829640a..cb7f3df34e7 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -194,7 +194,7 @@
                 <li t-if="!widget.options.thread.display_on_flat" title="Read" class="oe_read"><a class="oe_read oe_e">W</a></li>
                 <li t-if="!widget.options.thread.display_on_flat" title="Set back to unread" class="oe_unread"><a class="oe_unread oe_e">h</a></li>
                 <li title="Quick reply"><a class="oe_reply oe_e">)</a></li>
-                <t t-if="(widget.options.message.show_reply || widget.options.message.show_reply_by_email || (widget.is_author and widget.options.message.show_dd_delete) || widget.type == 'email')">
+                <t t-if="(widget.is_author and widget.options.message.show_dd_delete) || widget.type == 'email'">
                     <li>
                         <span class="oe_dropdown_toggle">
                             <a class="oe_e" title="More options">í</a>
@@ -204,8 +204,6 @@
                                 <li t-if="display['show_hide']">
                                     <a href="#" class="oe_mail_msg_hide_type" t-attf-data-subtype='{widget.subtype}'>Hide '<t t-esc="widget.subtype"/>' for this document</a>
                                 </li> -->
-                                <li t-if="widget.options.message.show_reply" title="Reply"><a class="oe_reply oe_full_reply">Full reply</a></li>
-                                <li t-if="widget.options.message.show_reply_by_email"><a class="oe_reply_by_email oe_full_reply" title="Reply by mail">Full reply by mail</a></li>
                                 <li t-if="widget.type == 'email'"><a class="oe_mail_msg_details" t-attf-href="#model=mail.message&amp;id=#{widget.id}" >Details</a></li>
                             </ul>
                         </span>

From 6630d57d5ca185fa49c3cbe6b6ae909dcb9e3d41 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Tue, 9 Oct 2012 16:36:45 +0200
Subject: [PATCH 11/26] [IMP] mail: txt2html

bzr revid: chm@openerp.com-20121009143645-8mwnzatpox0wll2k
---
 addons/mail/static/src/js/mail.js   | 27 +++++++++++++++++++--------
 addons/mail/static/src/xml/mail.xml |  2 +-
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index fe4b69389e3..86bb6da8f6b 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -69,6 +69,15 @@ openerp.mail = function(session) {
             }
             return string;
         },
+
+        /* replace textarea text into html text
+         * (add <p>, <a>)
+        */
+        get_text2html: function(text){
+            return text
+                .replace(/[\n\r]/g,'<br/>')
+                .replace(/((?:https?|ftp):\/\/[\S]+)/g,'<a href="$1">$1</a> ')
+        }
     };
 
 
@@ -201,7 +210,6 @@ openerp.mail = function(session) {
             });
 
             var progress=function(event) {
-                console.log('xhr progress :', Math.floor(event.loaded / event.total*100), event);
                 self.$("span[name='"+filename+"'] div:lt("+Math.floor(event.loaded / event.total*5)+")").show();
             };
 
@@ -316,7 +324,7 @@ openerp.mail = function(session) {
                     'default_content_subtype': 'html',
                     'default_is_private': true,
                     'default_parent_id': this.id,
-                    'default_body': (this.$('textarea').val() || '').replace(/[\n\r]/g,'<br>'),
+                    'default_body': mail.ChatterUtils.get_text2html(this.$('textarea').val() || ''),
                     'default_attachment_ids': attachments
                 },
             };
@@ -354,8 +362,14 @@ openerp.mail = function(session) {
 
             if(body.match(/\S+/)) {
                 this.parent_thread.ds_thread.call('message_post_api', [
-                    this.context.default_res_id, body, false, 'comment', false, this.context.default_parent_id, attachments])
-                    .then(this.parent_thread.proxy('switch_new_message'));
+                        this.context.default_res_id, 
+                        mail.ChatterUtils.get_text2html(body), 
+                        false, 
+                        'comment', 
+                        false, 
+                        this.context.default_parent_id, 
+                        attachments]
+                    ).then(this.parent_thread.proxy('switch_new_message'));
                 this.attachment_ids=[];
                 this.on_cancel();
                 return true;
@@ -460,8 +474,6 @@ openerp.mail = function(session) {
          *              display before having a "show more" link; note that the text
          *              will not be truncated if it does not have 110% of the parameter
          *          @param {Boolean} [show_record_name]
-         *          @param {Boolean} [show_reply]
-         *          @param {Boolean} [show_reply_by_email]
          *          @param {Boolean} [show_dd_delete]
          *          @param {Boolean} [show_dd_hide]
          */
@@ -507,8 +519,6 @@ openerp.mail = function(session) {
                     'message_ids':            options.options.message.message_ids || null,
                     'message_data':           options.options.message.message_data || null,
                     'show_record_name':       options.options.message.show_record_name != undefined ? options.options.message.show_record_name: true,
-                    'show_reply':             options.options.message.show_reply || false,
-                    'show_reply_by_email':    options.options.message.show_reply_by_email || false,
                     'show_dd_delete':         options.options.message.show_dd_delete || false,
                     'show_dd_hide':           options.options.message.show_dd_hide || false,
                     'truncate_limit':         options.options.message.truncate_limit || 250,
@@ -1240,6 +1250,7 @@ openerp.mail = function(session) {
                         'message': {
                             'show_reply': this.options.thread_level > 0,
                             'show_dd_hide': true,
+                            'show_dd_delete': true,
                         },
                     },
                     'parameters': {},
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index cb7f3df34e7..7ef47986542 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -194,7 +194,7 @@
                 <li t-if="!widget.options.thread.display_on_flat" title="Read" class="oe_read"><a class="oe_read oe_e">W</a></li>
                 <li t-if="!widget.options.thread.display_on_flat" title="Set back to unread" class="oe_unread"><a class="oe_unread oe_e">h</a></li>
                 <li title="Quick reply"><a class="oe_reply oe_e">)</a></li>
-                <t t-if="(widget.is_author and widget.options.message.show_dd_delete) || widget.type == 'email'">
+                <t t-if="(widget.is_author and widget.options.message.show_dd_delete) or widget.type == 'email'">
                     <li>
                         <span class="oe_dropdown_toggle">
                             <a class="oe_e" title="More options">í</a>

From 8b38e9d1cd053acd5c6df1ab755036b749641e36 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Tue, 9 Oct 2012 17:06:47 +0200
Subject: [PATCH 12/26] [IMP]mail: css

bzr revid: chm@openerp.com-20121009150647-srzt1t1ffkw97y5h
---
 addons/mail/static/src/css/mail.css                 | 5 +++--
 addons/mail/static/src/css/mail_compose_message.css | 3 +++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index f16fd4f0587..c225f8e0414 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -83,7 +83,7 @@
 }
 
 .openerp .oe_mail_record_wall > .oe_mail_wall_threads {
-    float: left;
+    margin: auto;
     width: 560px;
 }
 
@@ -412,4 +412,5 @@
 .openerp .oe_mail_msg_content ul.oe_mail_msg_attachments .oe_upload_in_process span {
     color: #aaaaaa;
     position: absolute;
-}
\ No newline at end of file
+}
+
diff --git a/addons/mail/static/src/css/mail_compose_message.css b/addons/mail/static/src/css/mail_compose_message.css
index 253ce9e8e33..e2f136eb755 100644
--- a/addons/mail/static/src/css/mail_compose_message.css
+++ b/addons/mail/static/src/css/mail_compose_message.css
@@ -26,6 +26,9 @@
     right: -8px;
     top: -8px;
 }
+.openerp .oe_mail .oe_mail_compose_textarea a.oe_cancel:first-of-type {
+    display:none;
+}
 
 .openerp .oe_mail .oe_mail_compose_textarea button.oe_full {
     float: right;

From 01b083e14da64903ee0cf9c17bf9a6e46127d41b Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Wed, 10 Oct 2012 09:31:33 +0200
Subject: [PATCH 13/26] [FIX]mail: wizard view

bzr revid: chm@openerp.com-20121010073133-sd189dd6uc045tp1
---
 .../mail/wizard/mail_compose_message_view.xml | 53 +++++++++++++++++++
 1 file changed, 53 insertions(+)

diff --git a/addons/mail/wizard/mail_compose_message_view.xml b/addons/mail/wizard/mail_compose_message_view.xml
index c8aaf796311..298473cd6e3 100644
--- a/addons/mail/wizard/mail_compose_message_view.xml
+++ b/addons/mail/wizard/mail_compose_message_view.xml
@@ -42,6 +42,59 @@
             </field>
         </record>
 
+        <record model="ir.ui.view" id="email_compose_message_wizard_form_chatter">
+            <field name="name">mail.compose.message.form.chatter</field>
+            <field name="model">mail.compose.message</field>
+            <field name="priority">18</field>
+            <field name="arch" type="xml">
+                <form string="Compose Email" version="7.0" >
+                    <group>
+                        <!-- truly invisible fields for control and options -->
+                        <field name="composition_mode" colspan="2" nolabel="1" invisible="1"/>
+                        <field name="model" colspan="2" nolabel="1" invisible="1"/>
+                        <field name="res_id" colspan="2" nolabel="1" invisible="1"/>
+                        <field name="parent_id" colspan="2" nolabel="1" invisible="1"/>
+                        <field name="content_subtype" colspan="2" nolabel="1" invisible="1"/>
+                        <!-- visible wizard -->
+                        <field name="subject" colspan="2" nolabel="1" placeholder="Subject..."
+                                class="oe_mail_compose_message_subject"
+                                attrs="{'invisible':[('content_subtype', '=', 'plain')]}"/>
+                        <field name="body_text" colspan="2" nolabel="1" placeholder="What are you working on ?"
+                                class="oe_mail_compose_message_body"
+                                attrs="{'invisible':[('content_subtype', '=', 'html')]}"/>
+                        <field name="body" colspan="2" nolabel="1" placeholder="What are you working on ?"
+                                class="oe_mail_compose_message_body_html"
+                                attrs="{'invisible':[('content_subtype', '=', 'plain')]}"/>
+                        <field name="partner_ids" colspan="2" nolabel="1" widget="many2many_tags" placeholder="Add contacts to notify..."
+                                context="{'force_email':True}"
+                                on_change="onchange_partner_ids(partner_ids)"
+                                class="oe_mail_compose_message_partner_ids"/>
+                        <field name="is_private" help="If this message is not private, this message will send to all your followers or all followers of the parented message."/>
+                        <field name="attachment_ids" colspan="2" nolabel="1" widget="many2many_tags"
+                                placeholder="Add attachments..." invisible="1"
+                                class="oe_mail_compose_message_attachment_ids"/>
+                        <!-- void div to display attachments, Chatter-controlled -->
+                        <div colspan="2" class="oe_mail_compose_message_attachments"/>
+                        <!-- buttons, with as few Chatter logic as possible -->
+                        <div>
+                            <button name="send_mail" string="Post message" type="object"
+                                class="oe_mail_compose_message_button_send"/>
+                        </div>
+                        <div class='oe_mail_compose_message_icons'>
+                            <button icon="/mail/static/src/img/attachment.png"
+                                class="oe_mail_compose_message_attachment" string=""
+                                name="dummy"
+                                help="Add an attachment"/>
+                            <button icon="/mail/static/src/img/formatting.png"
+                                class="oe_mail_compose_message_formatting" string=""
+                                type="object" name="toggle_content_subtype"
+                                help="Toggle advanced formatting mode"/>
+                        </div>
+                    </group>
+                </form>
+            </field>
+        </record>
+
         <record id="action_email_compose_message_wizard" model="ir.actions.act_window">
             <field name="name">Compose Email</field>
             <field name="res_model">mail.compose.message</field>

From df873d22a89048ccb67d9f27eea9cbce6970005d Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Wed, 10 Oct 2012 12:15:32 +0200
Subject: [PATCH 14/26] [FIX] mail: context default value error

bzr revid: chm@openerp.com-20121010101532-v2vx6h01x4zeq0ac
---
 addons/document/document.py                   | 49 +---------------
 addons/mail/static/src/css/mail.css           | 10 +++-
 addons/mail/static/src/js/mail.js             | 58 ++++++++++++++-----
 .../mail/wizard/mail_compose_message_view.xml |  2 +-
 4 files changed, 57 insertions(+), 62 deletions(-)

diff --git a/addons/document/document.py b/addons/document/document.py
index 27dde3250e2..b94222fa11c 100644
--- a/addons/document/document.py
+++ b/addons/document/document.py
@@ -149,31 +149,6 @@ class document_file(osv.osv):
     _sql_constraints = [
         # filename_uniq is not possible in pure SQL
     ]
-    def _check_duplication(self, cr, uid, vals, ids=None, op='create'):
-        name = vals.get('name', False)
-        parent_id = vals.get('parent_id', False)
-        res_model = vals.get('res_model', False)
-        res_id = vals.get('res_id', 0)
-
-        if op == 'write':
-            for file in self.browse(cr, uid, ids): # FIXME fields_only
-                if not name:
-                    name = file.name
-                if not parent_id:
-                    parent_id = file.parent_id and file.parent_id.id or False
-                if not res_model:
-                    res_model = file.res_model and file.res_model or False
-                if not res_id:
-                    res_id = file.res_id and file.res_id or 0
-                res = self.search(cr, uid, [('id', '<>', file.id), ('name', '=', name), ('parent_id', '=', parent_id), ('res_model', '=', res_model), ('res_model', '!=', ''), ('res_id', '=', res_id)])
-                if len(res):
-                    return False
-        if op == 'create':
-            res = self.search(cr, uid, [('name', '=', name), ('parent_id', '=', parent_id), ('res_id', '=', res_id), ('res_model', '=', res_model), ('res_model', '!=', '')])
-            if len(res):
-                return False
-        return True
-
     def check(self, cr, uid, ids, mode, context=None, values=None):
         """Check access wrt. res_model, relax the rule of ir.attachment parent
 
@@ -221,12 +196,6 @@ class document_file(osv.osv):
         if not len(res):
             return False
 
-        # when a user write a mail, there are no model
-        # don't check the duplication for the mails
-        res_mail = self.search(cr, uid, [('id', 'in', ids), ('res_model', '=', '')])
-        if res!=res_mail and not self._check_duplication(cr, uid, vals, ids, 'write'):
-            raise osv.except_osv(_('ValidateError'), _('File name must be unique!'))
-
         # if nodes call this write(), they must skip the code below
         from_node = context and context.get('__from_node', False)
         if (('parent_id' in vals) or ('name' in vals)) and not from_node:
@@ -291,22 +260,8 @@ class document_file(osv.osv):
         else:
             if vals.get('file_size'):
                 del vals['file_size']
-        result = self._check_duplication(cr, uid, vals)
-        if not result:
-            domain = [
-                ('res_id', '=', vals['res_id']),
-                ('res_model', '=', vals['res_model']),
-                ('datas_fname', '=', vals['datas_fname']),
-            ]
-            attach_ids = self.search(cr, uid, domain, context=context)
-            super(document_file, self).write(cr, uid, attach_ids,
-                                             {'datas' : vals['datas']},
-                                             context=context)
-            result = attach_ids[0]
-        else:
-            #raise osv.except_osv(_('ValidateError'), _('File name must be unique!'))
-            result = super(document_file, self).create(cr, uid, vals, context)
-        return result
+
+        return super(document_file, self).create(cr, uid, vals, context)
 
     def __get_partner_id(self, cr, uid, res_model, res_id, context=None):
         """ A helper to retrieve the associated partner from any res_model+id
diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index c225f8e0414..1592d79e18d 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -82,11 +82,15 @@
     overflow: auto;
 }
 
-.openerp .oe_mail_record_wall > .oe_mail_wall_threads {
+.openerp .oe_mail_record_wall {
     margin: auto;
     width: 560px;
 }
 
+.openerp .oe_mail_record_wall > .oe_mail_wall_threads {
+    float: left;
+}
+
 .openerp div.oe_mail_recthread_aside {
     float: right;
     width: 250px;
@@ -145,6 +149,10 @@
     z-index: 5;
 }
 .openerp .oe_mouse_subtypes .oe_recthread_subtypes {
+    background: #fff;
+    padding: 2px;
+    border: 1px solid #aaaaaa;
+    border-top: 0px;
     position: absolute;
     z-index: 2;
 }
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 86bb6da8f6b..08ae0197958 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -19,12 +19,39 @@ openerp.mail = function(session) {
     session.web.FormView = session.web.FormView.extend({
         do_action: function(action, on_close) {
             if (action.res_model == 'mail.compose.message') {
-                $(".openerp_webclient_container .oe_view_manager_current .oe_mail .oe_mail_wall_button_fletch").click();
-                return false;
-            }
-            else {
-                return this._super(action, on_close);
+
+                if(action.action_from != 'mail.ThreadComposeMessage' && action.type != 'ir.actions.act_window_close'){
+                    // destroy wall before reload
+                    $('.openerp .oe_mail_wall_threads .oe_mail_thread button.oe_mail_wall_button_destroy').click();
+
+
+                    /* hack for stop context propagation of wrong value
+                     * delete this hack when a global method to clean context is create
+                    */
+                    for(var key in action.context){
+                        if( key!='default_template_id' &&
+                            key!='default_use_template' &&
+                            key!='default_model' &&
+                            key!='default_res_id' &&
+                            key!='default_subtype' &&
+                            key!='active_id' &&
+                            key!='lang' &&
+                            key!='bin_raw' &&
+                            key!='tz' &&
+                            key!='active_model' &&
+                            key!='edi_web_url_view' &&
+                            key!='active_ids')
+                        action.context[key]=null;
+                    };
+                    /* end hack */
+
+
+                } else {
+                    $('.openerp .oe_mail_wall_threads .oe_mail_thread button.oe_mail_wall_button_fletch').click();
+                }
+
             }
+            return this._super(action, on_close);
         },
     });
 
@@ -90,7 +117,7 @@ openerp.mail = function(session) {
      * This form is a mail.compose.message form_view.
      */
     
-    mail.ComposeMessage = session.web.Widget.extend({
+    mail.ThreadComposeMessage = session.web.Widget.extend({
         template: 'mail.compose_message',
 
         /**
@@ -316,11 +343,12 @@ openerp.mail = function(session) {
                 res_model: 'mail.compose.message',
                 view_mode: 'form',
                 view_type: 'form',
+                action_from: 'mail.ThreadComposeMessage',
                 views: [[false, 'form']],
                 target: 'new',
                 context: {
-                    'default_res_model': this.model,
-                    'default_res_id': this.res_id,
+                    'default_res_model': this.context.default_res_model,
+                    'default_res_id': this.context.default_res_id,
                     'default_content_subtype': 'html',
                     'default_is_private': true,
                     'default_parent_id': this.id,
@@ -847,7 +875,7 @@ openerp.mail = function(session) {
 
         instantiate_ComposeMessage: function(){
             // add message composition form view
-            this.ComposeMessage = new mail.ComposeMessage(this,{
+            this.ComposeMessage = new mail.ThreadComposeMessage(this,{
                 'context': this.context,
                 'parameters': this,
                 'show_attachment_delete': true,
@@ -860,7 +888,7 @@ openerp.mail = function(session) {
         on_first_thread: function(){
             var self=this;
             // fetch and display message, using message_ids if set
-            this.message_fletch(true);
+            this.message_fletch();
 
             $(document).scroll( self.on_scroll );
             window.setTimeout( self.on_scroll, 500 );
@@ -872,11 +900,15 @@ openerp.mail = function(session) {
                 this.ComposeMessage.set_free_attachments();
             }
 
-            var button_flesh = $('<button style="display:none;" class="oe_mail_wall_button_fletch"/>').click(function(event){
+            var button_destroy = $('<button style="display:none;" class="oe_mail_wall_button_destroy"/>').click(function(event){
                 if(event)event.stopPropagation();
-                self.message_fletch(true);
+                self.destroy();
             });
-            this.$el.prepend(button_flesh);
+            var button_fletch = $('<button style="display:none;" class="oe_mail_wall_button_fletch"/>').click(function(event){
+                if(event)event.stopPropagation();
+                self.message_fletch();
+            });
+            this.$el.prepend(button_destroy,button_fletch);
             this.$el.addClass("oe_mail_wall_first_thread");
         },
 
diff --git a/addons/mail/wizard/mail_compose_message_view.xml b/addons/mail/wizard/mail_compose_message_view.xml
index 298473cd6e3..89e9d454445 100644
--- a/addons/mail/wizard/mail_compose_message_view.xml
+++ b/addons/mail/wizard/mail_compose_message_view.xml
@@ -69,7 +69,7 @@
                                 context="{'force_email':True}"
                                 on_change="onchange_partner_ids(partner_ids)"
                                 class="oe_mail_compose_message_partner_ids"/>
-                        <field name="is_private" help="If this message is not private, this message will send to all your followers or all followers of the parented message."/>
+                        <!--field name="is_private" help="If this message is not private, this message will send to all your followers or all followers of the parented message."/-->
                         <field name="attachment_ids" colspan="2" nolabel="1" widget="many2many_tags"
                                 placeholder="Add attachments..." invisible="1"
                                 class="oe_mail_compose_message_attachment_ids"/>

From c5615609e5e7c32105af637176dc6ad40b928e76 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Wed, 10 Oct 2012 13:02:03 +0200
Subject: [PATCH 15/26] [IMP]mail : field reload with wizard mail

bzr revid: chm@openerp.com-20121010110203-bs42eg6ie7m79bf3
---
 addons/mail/static/src/js/mail.js | 83 +++++++++++++++----------------
 1 file changed, 41 insertions(+), 42 deletions(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 08ae0197958..d2f2358af5f 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -20,35 +20,28 @@ openerp.mail = function(session) {
         do_action: function(action, on_close) {
             if (action.res_model == 'mail.compose.message') {
 
-                if(action.action_from != 'mail.ThreadComposeMessage' && action.type != 'ir.actions.act_window_close'){
-                    // destroy wall before reload
-                    $('.openerp .oe_mail_wall_threads .oe_mail_thread button.oe_mail_wall_button_destroy').click();
+                /* hack for stop context propagation of wrong value
+                 * delete this hack when a global method to clean context is create
+                */
+                for(var key in action.context){
+                    if( key!='default_template_id' &&
+                        key!='default_use_template' &&
+                        key!='default_is_private' &&
+                        key!='default_model' &&
+                        key!='default_res_id' &&
+                        key!='default_subtype' &&
+                        key!='active_id' &&
+                        key!='lang' &&
+                        key!='bin_raw' &&
+                        key!='tz' &&
+                        key!='active_model' &&
+                        key!='edi_web_url_view' &&
+                        key!='active_ids')
+                    action.context[key]=null;
+                };
+                /* end hack */
 
-
-                    /* hack for stop context propagation of wrong value
-                     * delete this hack when a global method to clean context is create
-                    */
-                    for(var key in action.context){
-                        if( key!='default_template_id' &&
-                            key!='default_use_template' &&
-                            key!='default_model' &&
-                            key!='default_res_id' &&
-                            key!='default_subtype' &&
-                            key!='active_id' &&
-                            key!='lang' &&
-                            key!='bin_raw' &&
-                            key!='tz' &&
-                            key!='active_model' &&
-                            key!='edi_web_url_view' &&
-                            key!='active_ids')
-                        action.context[key]=null;
-                    };
-                    /* end hack */
-
-
-                } else {
-                    $('.openerp .oe_mail_wall_threads .oe_mail_thread button.oe_mail_wall_button_fletch').click();
-                }
+                $('.openerp .oe_mail_wall_threads .oe_mail_thread button.oe_mail_wall_button_fetch').click();
 
             }
             return this._super(action, on_close);
@@ -370,7 +363,7 @@ openerp.mail = function(session) {
             }
         },
 
-        /*post a message and fletch the message*/
+        /*post a message and fetch the message*/
         on_message_post: function (body) {
 
             if (! body) {
@@ -459,7 +452,7 @@ openerp.mail = function(session) {
         */
         on_expandable: function (event) {
             if(event)event.stopPropagation();
-            this.parent_thread.message_fletch(false, this.domain, this.context);
+            this.parent_thread.message_fetch(false, this.domain, this.context);
             this.destroy();
             return false;
         },
@@ -495,7 +488,7 @@ openerp.mail = function(session) {
          * @param {Object} [options]
          *      @param {Object} [thread] read obout mail.Thread object
          *      @param {Object} [message]
-         *          @param {Number} [message_ids=null] ids for message_fletch
+         *          @param {Number} [message_ids=null] ids for message_fetch
          *          @param {Number} [message_data=null] already formatted message data, 
          *              for subthreads getting data from their parent
          *          @param {Number} [truncate_limit=250] number of character to
@@ -804,7 +797,7 @@ openerp.mail = function(session) {
          *          @param {Boolean} [display_on_flat] display all thread
          *              on the wall thread level (no hierarchy)
          *          @param {Array} [parents] liked with the parents thread
-         *              use with browse, fletch... [O]= top parent
+         *              use with browse, fetch... [O]= top parent
          */
         init: function(parent, options) {
             this._super(parent);
@@ -888,7 +881,7 @@ openerp.mail = function(session) {
         on_first_thread: function(){
             var self=this;
             // fetch and display message, using message_ids if set
-            this.message_fletch();
+            this.message_fetch();
 
             $(document).scroll( self.on_scroll );
             window.setTimeout( self.on_scroll, 500 );
@@ -900,15 +893,11 @@ openerp.mail = function(session) {
                 this.ComposeMessage.set_free_attachments();
             }
 
-            var button_destroy = $('<button style="display:none;" class="oe_mail_wall_button_destroy"/>').click(function(event){
+            var button_fetch = $('<button style="display:none;" class="oe_mail_wall_button_fetch"/>').click(function(event){
                 if(event)event.stopPropagation();
-                self.destroy();
+                self.message_fetch();
             });
-            var button_fletch = $('<button style="display:none;" class="oe_mail_wall_button_fletch"/>').click(function(event){
-                if(event)event.stopPropagation();
-                self.message_fletch();
-            });
-            this.$el.prepend(button_destroy,button_fletch);
+            this.$el.prepend(button_fetch);
             this.$el.addClass("oe_mail_wall_first_thread");
         },
 
@@ -1013,7 +1002,7 @@ openerp.mail = function(session) {
          * @param {Array} replace_domain: added to this.domain
          * @param {Object} replace_context: added to this.context
          */
-        message_fletch: function (initial_mode, replace_domain, replace_context, ids) {
+        message_fetch: function (initial_mode, replace_domain, replace_context, ids) {
             var self = this;
 
             // initial mode: try to use message_data or message_ids
@@ -1154,6 +1143,10 @@ openerp.mail = function(session) {
             this.$el.toggle(this.view.get("actual_mode") !== "create");
         },
 
+        /**
+         * Reinitialize the widget field and Display the threads
+         * @param {Object} new_context: context of the refresh
+          */
         set_value: function() {
             var self = this;
             this._super.apply(this, arguments);
@@ -1171,6 +1164,9 @@ openerp.mail = function(session) {
             var show_header_compose = this.view.is_action_enabled('edit') ||
                 (this.getParent().fields.message_is_follower && this.getParent().fields.message_is_follower.get_value());
 
+            if(this.thread){
+                this.thread.destroy();
+            }
             this.thread = new mail.Thread(self, {
                     'domain': domain,
                     'context': this.options.context,
@@ -1268,7 +1264,10 @@ openerp.mail = function(session) {
             });
         },
 
-        /** Clean and display the threads */
+
+        /**
+         * Display the threads
+          */
         message_render: function (search) {
             this.thread = new mail.Thread(this, {
                     'domain' : this.options.domain.concat(this.search_results['domain']),

From 49a174df57354cc045855bb41d6818b83afd162e Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Wed, 10 Oct 2012 20:16:11 +0200
Subject: [PATCH 16/26] [IMP] chatter, follower: html/js for css imp

bzr revid: chm@openerp.com-20121010181611-rl167r9h0ejz8zdu
---
 addons/mail/mail_message.py                   |  1 -
 addons/mail/static/src/js/mail.js             | 52 +++++++++-------
 addons/mail/static/src/js/mail_followers.js   | 45 +++++---------
 addons/mail/static/src/xml/mail.xml           |  4 +-
 addons/mail/static/src/xml/mail_followers.xml |  6 +-
 addons/mail/tests/test_mail.py                | 61 -------------------
 .../mail/wizard/mail_compose_message_view.xml |  5 +-
 7 files changed, 52 insertions(+), 122 deletions(-)

diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index b5f9bc76e76..9631918050a 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -292,7 +292,6 @@ class mail_message(osv.Model):
             well formed threads.
 
             :param domain: optional domain for searching ids
-            :param level: level of threads to display, 0 being flat
             :param limit: number of messages to fetch
             :param parent_id: if parent_id reached, stop searching for
                 further parents
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index d2f2358af5f..15a81be4c54 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -403,8 +403,7 @@ openerp.mail = function(session) {
      * Thread Message Expandable Widget
      * ------------------------------------------------------------
      *
-     * This widget handles the display the expandable message in a thread. The
-     * [thread_level] parameter sets the thread level number:
+     * This widget handles the display the expandable message in a thread.
      * - thread
      * - - visible message
      * - - expandable
@@ -468,7 +467,7 @@ openerp.mail = function(session) {
      * - record.timerelative: relative time givein by timeago lib
      * - record.avatar: image url
      * - record.attachment_ids[].url: url of each attachmentThe
-     * [thread_level] parameter sets the thread level number:
+     * thread view :
      * - root thread
      * - - sub message (parent_id = root message)
      * - - - sub thread
@@ -769,11 +768,13 @@ openerp.mail = function(session) {
      * ------------------------------------------------------------
      *
      * This widget handles the display of a thread of messages. The
-     * [thread_level] parameter sets the thread level number:
-     * - root message
+     * thread view:
+     * - root thread
      * - - sub message (parent_id = root message)
-     * - - - sub sub message (parent id = sub message)
+     * - - - sub thread
+     * - - - - sub sub message (parent id = sub thread)
      * - - sub message (parent_id = root message)
+     * - - - sub thread
      */
     mail.Thread = session.web.Widget.extend({
         template: 'mail.thread',
@@ -787,7 +788,6 @@ openerp.mail = function(session) {
          * @param {Object} [options]
          *      @param {Object} [message] read about mail.ThreadMessage object
          *      @param {Object} [thread]
-         *          @param {Number} [thread_level=0] number of thread levels
          *          @param {Boolean} [use_composer] use the advanced composer, or
          *              the default basic textarea if not set
          *          @param {Number} [expandable_number=5] number message show
@@ -810,7 +810,7 @@ openerp.mail = function(session) {
             // options
             this.options={
                 'thread' : {
-                    'thread_level':         options.options.thread.thread_level || 0,
+                    'thread_level':         (options.options.thread.thread_level+1) || 0,
                     'show_header_compose':  (options.options.thread.show_header_compose != undefined ? options.options.thread.show_header_compose: false),
                     'use_composer':         options.options.thread.use_composer || false,
                     'expandable_number':    options.options.thread.expandable_number || 5,
@@ -890,7 +890,7 @@ openerp.mail = function(session) {
 
             if(this.options.thread.show_header_compose){
                 this.ComposeMessage.$el.show();
-                this.ComposeMessage.set_free_attachments();
+                //this.ComposeMessage.set_free_attachments();
             }
 
             var button_fetch = $('<button style="display:none;" class="oe_mail_wall_button_fetch"/>').click(function(event){
@@ -1014,7 +1014,7 @@ openerp.mail = function(session) {
             fetch_context = replace_context ? replace_context : this.context;
             fetch_context.message_loaded= [this.id||0].concat( self.options.thread._parents[0].get_child_ids() );
 
-            return this.ds_message.call('message_read', [ids, fetch_domain, (this.options.thread.thread_level+1), fetch_context, this.context.default_parent_id || undefined]
+            return this.ds_message.call('message_read', [ids, fetch_domain, fetch_context, 0, this.context.default_parent_id || undefined]
                 ).then(this.proxy('switch_new_message'));
         },
 
@@ -1066,8 +1066,8 @@ openerp.mail = function(session) {
                 });
             }
 
-            var thread_messages = (self.options.thread.display_on_flat ? self.options.thread._parents[0].messages : []).concat(self.messages);
-            var thread = (self.options.thread.display_on_flat ? self.options.thread._parents[0] : self);
+            var thread_messages = (self.options.thread.display_on_flat && self.options.thread.thread_level ? self.options.thread._parents[0].messages : []).concat(self.messages);
+            var thread = (self.options.thread.display_on_flat && self.options.thread.thread_level ? self.options.thread._parents[0] : self);
 
             // check older and newer message for insert
             var parent_newer = false;
@@ -1082,14 +1082,28 @@ openerp.mail = function(session) {
                 }
             }
 
+            var sort = self.options.thread.thread_level==0 || (self.options.thread.display_on_flat && self.options.thread.thread_level<=1);
+
             if(parent_older){
-                message.insertBefore(parent_older.$el);
+                if(sort){
+                    message.insertBefore(parent_older.$el);
+                } else {
+                    message.insertAfter(parent_older.$el);
+                }
             }
             else if(parent_newer){
-                message.insertAfter(parent_newer.$el);
+                if(sort){
+                    message.insertAfter(parent_newer.$el);
+                } else {
+                    message.insertBefore(parent_newer.$el);
+                }
             }
             else {
-                message.prependTo(thread.list_ul);
+                if(sort){
+                    message.prependTo(thread.list_ul);
+                } else {
+                    message.appendTo(thread.list_ul);
+                }
             }
             return message
         },
@@ -1129,7 +1143,6 @@ openerp.mail = function(session) {
             this._super.apply(this, arguments);
             this.options.domain = this.options.domain || [];
             this.options.context = {'default_model': 'mail.thread', 'default_res_id': false};
-            this.options.thread_level = this.options.thread_level || 0;
         },
 
         start: function() {
@@ -1172,7 +1185,6 @@ openerp.mail = function(session) {
                     'context': this.options.context,
                     'options':{
                         'thread':{
-                            'thread_level': this.options.thread_level,
                             'show_header_compose': show_header_compose,
                             'use_composer': show_header_compose,
                             'display_on_flat':true
@@ -1216,7 +1228,6 @@ openerp.mail = function(session) {
             this.options = options || {};
             this.options.domain = options.domain || [];
             this.options.context = options.context || {};
-            this.options.thread_level = options.thread_level || 1;
             this.search_results = {'domain': [], 'context': {}, 'groupby': {}}
             this.ds_msg = new session.web.DataSetSearch(this, 'mail.message');
         },
@@ -1274,12 +1285,11 @@ openerp.mail = function(session) {
                     'context' : _.extend(this.options.context, search&&search.search_results['context'] ? search.search_results['context'] : {}),
                     'options': {
                         'thread' :{
-                            'thread_level': this.options.thread_level,
                             'use_composer': true,
-                            'show_header_compose': true,
+                            'show_header_compose': false,
                         },
                         'message': {
-                            'show_reply': this.options.thread_level > 0,
+                            'show_reply': true,
                             'show_dd_hide': true,
                             'show_dd_delete': true,
                         },
diff --git a/addons/mail/static/src/js/mail_followers.js b/addons/mail/static/src/js/mail_followers.js
index ab6a63ea6fa..236e3081136 100644
--- a/addons/mail/static/src/js/mail_followers.js
+++ b/addons/mail/static/src/js/mail_followers.js
@@ -40,6 +40,7 @@ openerp_mail_followers = function(session, mail) {
             this._check_visibility();
             this.reinit();
             this.bind_events();
+            this.display_subtypes();
         },
 
         _check_visibility: function() {
@@ -53,31 +54,15 @@ openerp_mail_followers = function(session, mail) {
 
         bind_events: function() {
             var self = this;
-            this.$('div.oe_mouse_subtypes')
-                .on('mouseover', function () {
-                    $(this).removeClass('oe_mouseout').addClass('oe_mouseover');
-                    self.display_subtypes();
-                })
-                .on('mouseleave', function () {
-                    $(this).removeClass('oe_mouseover').addClass('oe_mouseout');
-                    self.display_subtypes();
-                });
-
             this.$('button.oe_follower')
                 .on('click', function () {
                     if($(this).hasClass('oe_notfollow'))
                         self.do_follow();
                     else
                         self.do_unfollow();
-                })
-                .on('mouseover', function () {
-                    $(this).removeClass('oe_mouseout').addClass('oe_mouseover');
-                })
-                .on('mouseleave', function () {
-                    $(this).removeClass('oe_mouseover').addClass('oe_mouseout');
                 });
 
-            this.$el.on('click', 'ul.oe_subtypes input', function () { self.do_update_subscription(); })
+            this.$el.on('click', 'ul.oe_subtypes input', self.do_update_subscription );
 
             this.$el.on('click', 'button.oe_invite', function(event) {
                 action = {
@@ -173,7 +158,8 @@ openerp_mail_followers = function(session, mail) {
 
         set_subtypes:function(data){
             var self = this;
-            var records = data[this.view.datarecord.id].message_subtype_data;
+            var records = (data[this.view.datarecord.id] || data[null]).message_subtype_data;
+
             _(records).each(function (record, record_name) {
                 record.name = record_name;
                 record.followed = record.followed || undefined;
@@ -194,16 +180,10 @@ openerp_mail_followers = function(session, mail) {
         },
         
         do_follow: function () {
-            var self =this;
             _(this.$('.oe_msg_subtype_check')).each(function(record){
                 $(record).attr('checked','checked');
             });
-            var context = new session.web.CompoundContext(this.build_context(), {});
-            return this.ds_model.call('message_subscribe_users', [[this.view.datarecord.id], [this.session.uid], undefined, context]).pipe(function(value_){
-                    self.read_value(value_);
-                    if(!self.$('.oe_recthread_subtypes').is(":visible"))
-                        self.display_subtypes(true);
-                });
+            this.do_update_subscription();
         },
         
         do_unfollow: function () {
@@ -214,20 +194,25 @@ openerp_mail_followers = function(session, mail) {
             return this.ds_model.call('message_unsubscribe_users', [[this.view.datarecord.id], [this.session.uid], context]).pipe(this.proxy('read_value'));
         },
 
-        do_update_subscription: function () {
-            var context = new session.web.CompoundContext(this.build_context(), {});
+        do_update_subscription: function (event) {
             var self = this;
 
             var checklist = new Array();
-            _(this.$('.oe_msg_subtype_check')).each(function(record){
+            _(this.$('.oe_mail_recthread_actions input[type="checkbox"]')).each(function(record){
                 if($(record).is(':checked')) {
                     checklist.push(parseInt($(record).data('id')))}
             });
 
             if(!checklist.length)
                 return this.do_unfollow();
-            else
-                return this.ds_model.call('message_subscribe_users',[[self.view.datarecord.id], undefined, checklist, context]).pipe(this.proxy('read_value'));
+            else{
+                var context = new session.web.CompoundContext(this.build_context(), {});
+                return this.ds_model.call('message_subscribe_users', [[this.view.datarecord.id], [this.session.uid], undefined, context]).pipe(function(value_){
+                        self.read_value(value_);
+                        self.display_subtypes(true);
+                    });
+            }
+
         },
 
     });
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 7ef47986542..2fc97154e33 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -138,7 +138,7 @@
                         Compose a new message
                     </button>
                     <button type="button" class="oe_write_onwall" help="Your followers can read this message">
-                        Write on your wall
+                        Write to your followers
                     </button>
                 </td>
             </tr>
@@ -233,7 +233,7 @@
                     </ul>
                     <div class="oe_clear"/>
                     <div class="oe_mail_msg_body">
-                        <t t-if="widget.options.message.show_record_name and widget.record_name and (!widget.subject) and widget.options.thread._parents.length&lt;=widget.options.thread.thread_level and widget.model!='res.partner'">
+                        <t t-if="widget.options.message.show_record_name and widget.record_name and (!widget.subject) and !widget.options.thread.thread_level and !widget.options.thread.display_on_flat and widget.model!='res.partner'">
                             <a class="oe_mail_action_model" t-attf-href="#model=#{widget.model}&amp;id=#{widget.res_id}"><t t-raw="widget.record_name"/></a>
                         </t>
                         <t t-raw="widget.body"/>
diff --git a/addons/mail/static/src/xml/mail_followers.xml b/addons/mail/static/src/xml/mail_followers.xml
index a6df1f0fe8c..f78c91c6305 100644
--- a/addons/mail/static/src/xml/mail_followers.xml
+++ b/addons/mail/static/src/xml/mail_followers.xml
@@ -13,9 +13,9 @@
                     <span class="oe_unfollow">Unfollow</span>
                     <span class="oe_following">Following</span>
                 </button>
-                <div class="oe_recthread_subtypes">
-                    <ul class="oe_subtypes"></ul>
-                </div>
+            </div>
+            <div class="oe_recthread_subtypes">
+                <ul class="oe_subtypes"></ul>
             </div>
         </div>
         <div class="oe_grey">
diff --git a/addons/mail/tests/test_mail.py b/addons/mail/tests/test_mail.py
index 1f17be89604..a94c4fc2c8a 100644
--- a/addons/mail/tests/test_mail.py
+++ b/addons/mail/tests/test_mail.py
@@ -529,67 +529,6 @@ class test_mail(TestMailMockups):
         self.assertEqual(message2.subject, _subject, 'mail.message subject incorrect')
         self.assertEqual(message2.body, group_bird.description, 'mail.message body incorrect')
 
-    # FP Note: to be reviewed to be more generic, not depending on the algorythm of
-    #          message_read
-    #def test_30_message_read(self):
-    #    """ Tests designed for message_read. """
-    #    # TDE NOTE: this test is not finished, as the message_read method is not fully specified.
-    #    # It will be updated as soon as we have fixed specs !
-    #    cr, uid = self.cr, self.uid
-    #    group_pigs = self.mail_group.browse(cr, uid, self.group_pigs_id)
-
-    #    def _compare_structures(struct1, struct2, n=0):
-    #        # print '%scompare structure' % ('\t' * n)
-    #        # self.assertEqual(len(struct1), len(struct2), 'message_read structure number of childs incorrect')
-
-    #        for x in range(len(struct1)):
-    #            if struct1[x].get('type') == 'expandable':
-    #                continue
-    #            # print '%s' % ('\t' * n), struct1[x]['id'], struct1[x]['child_nbr'], struct2[x]['id'], struct2[x].get('child_nbr', 'XX'), struct1[x].get('subject') or ''
-    #            self.assertEqual(struct1[x]['id'], struct2[x]['id'], 'message_read failure %s' % struct1[x].get('subject'))
-    #            _compare_structures(struct1[x]['child_ids'], struct2[x]['child_ids'], n + 1)
-    #        # print '%send compare' % ('\t' * n)
-
-    #    # ----------------------------------------
-    #    # CASE2: message_read test
-    #    # ----------------------------------------
-
-    #    # 1. Add a few messages to pigs group
-    #    msgid1 = group_pigs.message_post(body='1', subject='1', parent_id=False)
-    #    msgid2 = group_pigs.message_post(body='2', subject='1-1', parent_id=msgid1)
-    #    msgid3 = group_pigs.message_post(body='3', subject='1-2', parent_id=msgid1)
-    #    msgid4 = group_pigs.message_post(body='4', subject='2', parent_id=False)
-    #    msgid5 = group_pigs.message_post(body='5', subject='1-1-1', parent_id=msgid2)
-    #    msgid6 = group_pigs.message_post(body='6', subject='2-1', parent_id=msgid4)
-
-    #    # Test: read all messages flat
-    #    tree_test = [{'id': msgid6, 'child_ids': []}, {'id': msgid5, 'child_ids': []},
-    #                    {'id': msgid4, 'child_ids': []}, {'id': msgid3, 'child_ids': []},
-    #                    {'id': msgid2, 'child_ids': []}, {'id': msgid1, 'child_ids': []}]
-    #    tree = self.mail_message.message_read(cr, uid, ids=False, domain=[('model', '=', 'mail.group'), ('res_id', '=', self.group_pigs_id)], level=0, limit=15)
-    #    _compare_structures(tree, tree_test)
-    #    # Test: read with 1 level of thread
-    #    tree_test = [{'id': msgid4, 'child_ids': [{'id': msgid6, 'child_ids': []}, ]},
-    #                {'id': msgid1, 'child_ids': [
-    #                    {'id': msgid5, 'child_ids': []}, {'id': msgid3, 'child_ids': []},
-    #                    {'id': msgid2, 'child_ids': []},
-    #                ]},
-    #                ]
-    #    tree = self.mail_message.message_read(cr, uid, ids=False, domain=[('model', '=', 'mail.group'), ('res_id', '=', self.group_pigs_id)], level=1, limit=15)
-    #    _compare_structures(tree, tree_test)
-    #    # Test: read with 2 levels of thread
-    #    tree_test = [{'id': msgid4, 'child_ids': [{'id': msgid6, 'child_ids': []}, ]},
-    #                {'id': msgid1, 'child_ids': [
-    #                    {'id': msgid3, 'child_ids': []},
-    #                    {'id': msgid2, 'child_ids': [{'id': msgid5, 'child_ids': []}, ]},
-    #                ]},
-    #                ]
-    #    tree = self.mail_message.message_read(cr, uid, ids=False, domain=[('model', '=', 'mail.group'), ('res_id', '=', self.group_pigs_id)], level=2, limit=15)
-    #    _compare_structures(tree, tree_test)
-
-    #    # 2. Test expandables
-    #    # TDE FIXME: add those tests when expandables are specified and implemented
-
     def test_40_needaction(self):
         """ Tests for mail.message needaction. """
         cr, uid = self.cr, self.uid
diff --git a/addons/mail/wizard/mail_compose_message_view.xml b/addons/mail/wizard/mail_compose_message_view.xml
index 89e9d454445..7329992f8ed 100644
--- a/addons/mail/wizard/mail_compose_message_view.xml
+++ b/addons/mail/wizard/mail_compose_message_view.xml
@@ -20,10 +20,7 @@
                     </group>
                     <notebook>
                         <page string="Body">
-                            <field name="body_text" nolabel="1"
-                                attrs="{'invisible':[('content_subtype', '=', 'html')]}"/>
-                            <field name="body" nolabel="1"
-                                attrs="{'invisible':[('content_subtype', '=', 'plain')]}"/>
+                            <field name="body" nolabel="1"/>
                         </page>
                         <page string="Attachments">
                             <field name="attachment_ids" colspan="4" nolabel="1"/>

From 43217cc2b431135a74830b4e1de7ce3d2d621fb7 Mon Sep 17 00:00:00 2001
From: "Vidhin Mehta (OpenERP)" <vme@tinyerp.com>
Date: Thu, 11 Oct 2012 12:34:39 +0530
Subject: [PATCH 17/26] [IMP]replace callbackenable from on_select_elements.

bzr revid: vme@tinyerp.com-20121011070439-vzcua4yoiwlz2evk
---
 addons/web/static/src/js/view_form.js       | 11 ++++++-----
 addons/web_diagram/static/src/js/diagram.js |  5 ++---
 addons/web_gantt/static/src/js/gantt.js     |  2 +-
 addons/web_kanban/static/src/js/kanban.js   |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index afb5e258c0b..6c36cb3d6fe 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -2877,7 +2877,7 @@ instance.web.form.CompletionFieldMixin = {
             self.build_domain(),
             new instance.web.CompoundContext(self.build_context(), context || {})
         );
-        pop.on_select_elements.add(function(element_ids) {
+        pop.on("select_elements",self,function(element_ids) {
             self.add_id(element_ids[0]);
             self.focus();
         });
@@ -3598,7 +3598,7 @@ instance.web.form.One2ManyViewManager = instance.web.ViewManager.extend({
             form_view_options: {'not_interactible_on_create':true},
             readonly: self.o2m.get("effective_readonly")
         });
-        pop.on_select_elements.add_last(function() {
+        pop.on("select_elements", self, function() {
             self.o2m.reload_current_view();
         });
     },
@@ -3684,7 +3684,7 @@ instance.web.form.One2ManyListView = instance.web.ListView.extend({
                 self.o2m.build_domain(),
                 self.o2m.build_context()
             );
-            pop.on_select_elements.add_last(function() {
+            pop.on("select_elements", self, function() {
                 self.o2m.reload_current_view();
             });
         }
@@ -4121,7 +4121,7 @@ instance.web.form.Many2ManyListView = instance.web.ListView.extend(/** @lends in
             this.m2m_field.build_context()
         );
         var self = this;
-        pop.on_select_elements.add(function(element_ids) {
+        pop.on("select_elements", self, function(element_ids) {
             _.each(element_ids, function(one_id) {
                 if(! _.detect(self.dataset.ids, function(x) {return x == one_id;})) {
                     self.dataset.set_ids([].concat(self.dataset.ids, [one_id]));
@@ -4236,7 +4236,7 @@ instance.web.form.FieldMany2ManyKanban = instance.web.form.AbstractField.extend(
                 new instance.web.CompoundDomain(this.build_domain(), ["!", ["id", "in", this.dataset.ids]]),
                 this.build_context()
             );
-            pop.on_select_elements.add(function(element_ids) {
+            pop.on("select_elements", self, function(element_ids) {
                 _.each(element_ids, function(one_id) {
                     if(! _.detect(self.dataset.ids, function(x) {return x == one_id;})) {
                         self.dataset.set_ids([].concat(self.dataset.ids, [one_id]));
@@ -4457,6 +4457,7 @@ instance.web.form.AbstractFormPopup = instance.web.Widget.extend({
         });
     },
     on_select_elements: function(element_ids) {
+        this.trigger("select_elements",element_ids);
     },
     check_exit: function(no_destroy) {
         if (this.created_elements.length > 0) {
diff --git a/addons/web_diagram/static/src/js/diagram.js b/addons/web_diagram/static/src/js/diagram.js
index 9fd74853c3c..5b699fa7870 100644
--- a/addons/web_diagram/static/src/js/diagram.js
+++ b/addons/web_diagram/static/src/js/diagram.js
@@ -273,7 +273,7 @@ instance.web.DiagramView = instance.web.View.extend({
             self.dataset.domain,
             self.context || self.dataset.context
         );
-        pop.on_select_elements.add_last(function(element_ids) {
+        pop.on("select_elements", self, function(element_ids) {
             self.dataset.read_index(_.keys(self.fields_view.fields)).pipe(self.on_diagram_loaded);
         });
 
@@ -325,8 +325,7 @@ instance.web.DiagramView = instance.web.View.extend({
             this.dataset.domain,
             this.context || this.dataset.context
         );
-
-        pop.on_select_elements.add_last(function(element_ids) {
+        pop.on("select_elements", self, function(element_ids) {
             self.dataset.read_index(_.keys(self.fields_view.fields)).pipe(self.on_diagram_loaded);
         });
         // We want to destroy the dummy edge after a creation cancel. This destroys it even if we save the changes.
diff --git a/addons/web_gantt/static/src/js/gantt.js b/addons/web_gantt/static/src/js/gantt.js
index 66d699c2cde..32bfea8e212 100644
--- a/addons/web_gantt/static/src/js/gantt.js
+++ b/addons/web_gantt/static/src/js/gantt.js
@@ -222,7 +222,7 @@ instance.web_gantt.GanttView = instance.web.View.extend({
     on_task_create: function() {
         var self = this;
         var pop = new instance.web.form.SelectCreatePopup(this);
-        pop.on_select_elements.add_last(function() {
+        pop.on("select_elements", self, function() {
             self.reload();
         });
         pop.select_element(
diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index 537325394e9..37aea87e50e 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -1067,7 +1067,7 @@ instance.web_kanban.QuickCreate = instance.web.Widget.extend({
             [],
             {"default_name": self.$input.val()}
         );
-        pop.on_select_elements.add(function(element_ids) {
+        pop.on("select_elements", self, function(element_ids) {
             self.$input.val("");
             self.trigger('added', element_ids[0]);
         });

From 70afbd796e441cce26171af03c26a08f88c3ab52 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 11 Oct 2012 10:52:18 +0200
Subject: [PATCH 18/26] Put back readme and license

bzr revid: nicolas.vanhoren@openerp.com-20121011085218-3vwfiujciex326yx
---
 LICENSE.web | 661 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 README.web  |  11 +
 2 files changed, 672 insertions(+)
 create mode 100644 LICENSE.web
 create mode 100644 README.web

diff --git a/LICENSE.web b/LICENSE.web
new file mode 100644
index 00000000000..dba13ed2ddf
--- /dev/null
+++ b/LICENSE.web
@@ -0,0 +1,661 @@
+                    GNU AFFERO GENERAL PUBLIC LICENSE
+                       Version 3, 19 November 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+our General Public Licenses are intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
+
+  A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate.  Many developers of free software are heartened and
+encouraged by the resulting cooperation.  However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
+
+  The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community.  It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server.  Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
+
+  An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals.  This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU Affero General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Remote Network Interaction; Use with the GNU General Public License.
+
+  Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software.  This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the work with which it is combined will remain governed by version
+3 of the GNU General Public License.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU Affero General Public License from time to time.  Such new versions
+will be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU Affero General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU Affero General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU Affero General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source.  For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code.  There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for the
+specific requirements.
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU AGPL, see
+<http://www.gnu.org/licenses/>.
diff --git a/README.web b/README.web
new file mode 100644
index 00000000000..7aff74c76c4
--- /dev/null
+++ b/README.web
@@ -0,0 +1,11 @@
+OpenERP Web
+-----------
+
+The OpenERP Web Client supports the following web browsers:
+
+* Internet Explorer 9+
+* Google Chrome 22+
+* Firefox 13+
+* Any browser using the latest version of Chrome Frame
+
+

From 5bb6122f73f080f59ca08f310fa7d8e1875d8b4b Mon Sep 17 00:00:00 2001
From: "Vidhin Mehta (OpenERP)" <vme@tinyerp.com>
Date: Thu, 11 Oct 2012 15:58:49 +0530
Subject: [PATCH 19/26] [IMP]change method on_selected_elements to
 elements_selected.

bzr revid: vme@tinyerp.com-20121011102849-yn9nldtgqszp70gq
---
 addons/web/static/src/js/view_form.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 6c36cb3d6fe..377034c0e2a 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -4456,12 +4456,12 @@ instance.web.form.AbstractFormPopup = instance.web.Widget.extend({
             self.view_form.do_show();
         });
     },
-    on_select_elements: function(element_ids) {
+    elements_selected: function(element_ids) {
         this.trigger("select_elements",element_ids);
     },
     check_exit: function(no_destroy) {
         if (this.created_elements.length > 0) {
-            this.on_select_elements(this.created_elements);
+            this.elements_selected(this.created_elements);
             this.created_elements = [];
         }
         this.destroy();
@@ -4572,7 +4572,7 @@ instance.web.form.SelectCreatePopup = instance.web.form.AbstractFormPopup.extend
                 });
                 var $sbutton = self.$buttonpane.find(".oe_selectcreatepopup-search-select");
                 $sbutton.click(function() {
-                    self.on_select_elements(self.selected_ids);
+                    self.elements_selected(self.selected_ids);
                     self.destroy();
                 });
             });
@@ -4614,7 +4614,7 @@ instance.web.form.SelectCreateListView = instance.web.ListView.extend({
         this.popup.new_object();
     },
     select_record: function(index) {
-        this.popup.on_select_elements([this.dataset.ids[index]]);
+        this.popup.elements_selected([this.dataset.ids[index]]);
         this.popup.destroy();
     },
     do_select: function(ids, records) {

From 69fa182342513890f41b7cf5fa16da867eb1c026 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Thu, 11 Oct 2012 13:04:10 +0200
Subject: [PATCH 20/26] [FIX] web/tests: leftover import errors after removal
 of standalone web mode

bzr revid: odo@openerp.com-20121011110410-pzons7v1cqn4dywf
---
 addons/web/tests/test_menu.py | 2 +-
 addons/web/tests/test_view.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/web/tests/test_menu.py b/addons/web/tests/test_menu.py
index 1bfa89d9a64..c5e1b948b67 100644
--- a/addons/web/tests/test_menu.py
+++ b/addons/web/tests/test_menu.py
@@ -4,7 +4,7 @@ import mock
 import unittest2
 
 from ..controllers import main
-from ..common.session import OpenERPSession
+from ..session import OpenERPSession
 
 class Placeholder(object):
     def __init__(self, **kwargs):
diff --git a/addons/web/tests/test_view.py b/addons/web/tests/test_view.py
index beb6996b8e2..a9354d0a6c7 100644
--- a/addons/web/tests/test_view.py
+++ b/addons/web/tests/test_view.py
@@ -6,7 +6,7 @@ import unittest2
 import simplejson
 
 import web.controllers.main
-from ..common import nonliterals, session as s
+from .. import nonliterals, session as s
 
 def field_attrs(fields_view_get, fieldname):
     (field,) =  filter(lambda f: f['attrs'].get('name') == fieldname,

From 9c3d68021472f1b9988fd2eb12bce621ec1a87ea Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Thu, 11 Oct 2012 13:40:58 +0200
Subject: [PATCH 21/26] [FIX] auth_oauth: correct the constraint. How the heck
 did runbot still green?

bzr revid: chs@openerp.com-20121011114058-svvb5fbz8dye12jk
---
 addons/auth_oauth/res_users.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/auth_oauth/res_users.py b/addons/auth_oauth/res_users.py
index 9c1f88bd7f4..115e3136f00 100644
--- a/addons/auth_oauth/res_users.py
+++ b/addons/auth_oauth/res_users.py
@@ -21,7 +21,7 @@ class res_users(osv.Model):
     }
 
     _sql_constraints = [
-        ('uniq_users_oauth_provider_oauht_uid', 'unique(auth_provider_id, auth_uid)', 'OAuth UID must be unique per provider'),
+        ('uniq_users_oauth_provider_oauth_uid', 'unique(oauth_provider_id, oauth_uid)', 'OAuth UID must be unique per provider'),
     ]
 
     def auth_oauth_rpc(self, cr, uid, endpoint, access_token, context=None):

From d1698d2b11e12a0f4418a2c7150b68d0356827d3 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Thu, 11 Oct 2012 13:44:01 +0200
Subject: [PATCH 22/26] [FIX] edi: correct import of web client

bzr revid: chs@openerp.com-20121011114401-yw8pht7t1gn8bizp
---
 addons/edi/controllers/main.py | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/addons/edi/controllers/main.py b/addons/edi/controllers/main.py
index 71560aa9e60..c62fef19cba 100644
--- a/addons/edi/controllers/main.py
+++ b/addons/edi/controllers/main.py
@@ -4,14 +4,8 @@ import textwrap
 import simplejson
 import werkzeug.wrappers
 
-try:
-    # embedded
-    import openerp.addons.web.common.http as openerpweb
-    import openerp.addons.web.controllers.main as webmain
-except ImportError:
-    # standalone
-    import web.common.http as openerpweb
-    import web.controllers.main as webmain
+import openerp.addons.web.http as openerpweb
+import openerp.addons.web.controllers.main as webmain
 
 class EDI(openerpweb.Controller):
     # http://hostname:8069/edi/view?db=XXXX&token=XXXXXXXXXXX

From dcae3b64a3653f3befc1e53fc140eaac85f7b05e Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 11 Oct 2012 14:22:14 +0200
Subject: [PATCH 23/26] [REVERT] removed server-side evaluation of field
 options

bzr revid: nicolas.vanhoren@openerp.com-20121011122214-ab1mqyz9h8jnq7ql
---
 openerp/osv/orm.py | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index 7545fd5f4b2..cf9dc024dcb 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -66,7 +66,6 @@ import openerp.tools as tools
 from openerp.tools.config import config
 from openerp.tools.misc import CountingStream
 from openerp.tools.safe_eval import safe_eval as eval
-from ast import literal_eval
 from openerp.tools.translate import _
 from openerp import SUPERUSER_ID
 from query import Query
@@ -1812,13 +1811,7 @@ class BaseModel(object):
                 field = model_fields.get(node.get('name'))
                 if field:
                     transfer_field_to_modifiers(field, modifiers)
-                #evaluate the options as python code, but send it as json to the client
-                if node.get('options'):
-                    try:
-                        node.set('options', simplejson.dumps(literal_eval(node.get('options'))))
-                    except Exception, e:
-                        _logger.exception('Invalid `options´ attribute, should be a valid python expression: %r', node.get('options'))
-                        raise except_orm('Invalid options', 'Invalid options: %r %s' % (node.get('options'), e))
+
 
         elif node.tag in ('form', 'tree'):
             result = self.view_header_get(cr, user, False, node.tag, context)

From c538db258abdcaa25ff1442c9b4cd3f2bbdb9935 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 11 Oct 2012 14:57:48 +0200
Subject: [PATCH 24/26] [IMP] now uses py.eval for options

bzr revid: nicolas.vanhoren@openerp.com-20121011125748-8au3gmss2436h5lw
---
 addons/web/static/src/js/corelib.js   | 4 ++++
 addons/web/static/src/js/view_form.js | 6 +-----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/web/static/src/js/corelib.js b/addons/web/static/src/js/corelib.js
index b5fbacc7927..8c38724b1d5 100644
--- a/addons/web/static/src/js/corelib.js
+++ b/addons/web/static/src/js/corelib.js
@@ -1440,6 +1440,10 @@ instance.web.JsonRPC = instance.web.CallbackEnabled.extend({
     },
 });
 
+instance.web.py_eval = function(expr, context) {
+    return py.eval(expr, _.extend({}, context || {}, {"true": true, "false": false, "null": null}));
+};
+
 }
 
 // vim:et fdc=0 fdl=0 foldnestmax=3 fdm=syntax:
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index afb5e258c0b..97ad0f220e6 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -2087,11 +2087,7 @@ instance.web.form.AbstractField = instance.web.form.FormWidget.extend(instance.w
         this.field = this.field_manager.get_field_desc(this.name);
         this.widget = this.node.attrs.widget;
         this.string = this.node.attrs.string || this.field.string || this.name;
-        try {
-            this.options = JSON.parse(this.node.attrs.options || '{}');
-        } catch (e) {
-            throw new Error(_.str.sprintf(_t("Widget options for field '%s' are not valid JSON."), this.name));
-        }
+        this.options = instance.web.py_eval(this.node.attrs.options || '{}');
         this.set({'value': false});
 
         this.on("change:value", this, function() {

From d1edeee7f35d3609f3276b69188edf538b32ca15 Mon Sep 17 00:00:00 2001
From: "Vidhin Mehta (OpenERP)" <vme@tinyerp.com>
Date: Thu, 11 Oct 2012 18:30:11 +0530
Subject: [PATCH 25/26] [IMP]replace callbackenable method.

bzr revid: vme@tinyerp.com-20121011130011-haovxmxr3pj10unp
---
 addons/web/static/src/js/view_form.js | 2 +-
 addons/web/static/src/js/views.js     | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index afb5e258c0b..8984c057244 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -956,7 +956,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
         var self = this;
         return this.reload_mutex.exec(function() {
             if (self.dataset.index == null) {
-                self.do_prev_view();
+                self.trigger("previous_view");
                 return $.Deferred().reject().promise();
             }
             if (self.dataset.index == null || self.dataset.index < 0) {
diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index f985e5f6dc8..5f90c4215f7 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -525,8 +525,8 @@ instance.web.ViewManager =  instance.web.Widget.extend({
             controller.set_embedded_view(view.embedded_view);
         }
         controller.on('switch_mode', self, this.switch_mode);
-
-        controller.do_prev_view.add_last(this.on_prev_view);
+        controller.on('previous_view', self, this.prev_view);
+        
         var container = this.$el.find(".oe_view_manager_view_" + view_type);
         var view_promise = controller.appendTo(container);
         this.views[view_type].controller = controller;
@@ -602,7 +602,7 @@ instance.web.ViewManager =  instance.web.Widget.extend({
      * @param {String} [options.default=null] view to switch to if no previous view
      * @returns {$.Deferred} switching end signal
      */
-    on_prev_view: function (options) {
+    prev_view: function (options) {
         options = options || {};
         var current_view = this.views_history.pop();
         var previous_view = this.views_history[this.views_history.length - 1] || options['default'];
@@ -1266,8 +1266,7 @@ instance.web.View = instance.web.Widget.extend({
      * @param {Boolean} [options.created=false] resource was created
      * @param {String} [options.default=null] view to switch to if no previous view
      */
-    do_prev_view: function (options) {
-    },
+
     do_search: function(view) {
     },
     on_sidebar_export: function() {

From 92e7f3f6422a367c695acd87a824b5b8c8746109 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Thu, 11 Oct 2012 16:04:14 +0200
Subject: [PATCH 26/26] [FIX] mail: Unagree is not a word

bzr revid: odo@openerp.com-20121011140414-b8nz90ww6nf9ln9j
---
 addons/mail/static/src/xml/mail.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 2fc97154e33..089447f764a 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -276,7 +276,7 @@
         <button t-attf-class="oe_mail_msg_vote oe_tag">
             <span>
                 <t t-if="!widget.has_voted">Agree</t>
-                <t t-if="widget.has_voted">Unagree</t>
+                <t t-if="widget.has_voted">Undo</t>
             </span>
         </button>
     </span>