From a1e5c645d97e4e8f48cec546e858643029b7424a Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Thu, 9 Feb 2012 22:33:17 +0100
Subject: [PATCH 01/38] postgres use postgres instead of template1 and
 template1 instead of template0

bzr revid: al@openerp.com-20120209213317-3tt4o0sj87764ocn
---
 openerp/service/web_services.py | 10 +++++-----
 openerp/tools/config.py         |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/openerp/service/web_services.py b/openerp/service/web_services.py
index 3a9ba89c002..24ec650e432 100644
--- a/openerp/service/web_services.py
+++ b/openerp/service/web_services.py
@@ -117,7 +117,7 @@ class db(netsvc.ExportService):
         return fn(*params)
 
     def _create_empty_database(self, name):
-        db = sql_db.db_connect('template1')
+        db = sql_db.db_connect('postgres')
         cr = db.cursor()
         chosen_template = tools.config['db_template']
         try:
@@ -176,7 +176,7 @@ class db(netsvc.ExportService):
         openerp.modules.registry.RegistryManager.delete(db_name)
         sql_db.close_db(db_name)
 
-        db = sql_db.db_connect('template1')
+        db = sql_db.db_connect('postgres')
         cr = db.cursor()
         cr.autocommit(True) # avoid transaction block
         try:
@@ -278,7 +278,7 @@ class db(netsvc.ExportService):
         openerp.modules.registry.RegistryManager.delete(old_name)
         sql_db.close_db(old_name)
 
-        db = sql_db.db_connect('template1')
+        db = sql_db.db_connect('postgres')
         cr = db.cursor()
         cr.autocommit(True) # avoid transaction block
         try:
@@ -306,7 +306,7 @@ class db(netsvc.ExportService):
             raise openerp.exceptions.AccessDenied()
         chosen_template = tools.config['db_template']
         templates_list = tuple(set(['template0', 'template1', 'postgres', chosen_template]))
-        db = sql_db.db_connect('template1')
+        db = sql_db.db_connect('postgres')
         cr = db.cursor()
         try:
             try:
@@ -544,7 +544,7 @@ GNU Public Licence.
         return http_server.list_http_services()
 
     def exp_check_connectivity(self):
-        return bool(sql_db.db_connect('template1'))
+        return bool(sql_db.db_connect('postgres'))
 
     def exp_get_os_time(self):
         return os.times()
diff --git a/openerp/tools/config.py b/openerp/tools/config.py
index d628447a7a8..a03937601dc 100644
--- a/openerp/tools/config.py
+++ b/openerp/tools/config.py
@@ -223,7 +223,7 @@ class configmanager(object):
                          help="specify the database port", type="int")
         group.add_option("--db_maxconn", dest="db_maxconn", type='int', my_default=64,
                          help="specify the the maximum number of physical connections to posgresql")
-        group.add_option("--db-template", dest="db_template", my_default="template0",
+        group.add_option("--db-template", dest="db_template", my_default="template1",
                          help="specify a custom database template to create a new database")
         parser.add_option_group(group)
 

From 1a2d054b8499a78f6f4f8a2024c3b561502a93e5 Mon Sep 17 00:00:00 2001
From: Jose Patricio Villarreal <>
Date: Wed, 11 Jul 2012 16:59:15 +0530
Subject: [PATCH 02/38] [FIX] added warning message in bank statement
 line,raise when invoice is already canceled

lp bug: https://launchpad.net/bugs/1022677 fixed

bzr revid: rmu@tinyerp.com-20120711112915-ffl9q3nn721hppjt
---
 addons/account_voucher/account_voucher.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index 2cefaf15f0e..dc46ec57722 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -1047,6 +1047,8 @@ class account_voucher(osv.osv):
             # if the amount encoded in voucher is equal to the amount unreconciled, we need to compute the
             # currency rate difference
             if line.amount == line.amount_unreconciled:
+                if not line.move_line_id.amount_residual:
+                    raise osv.except_osv(_('Wrong bank statement line'),_("You must have delete the bank statement line manualy to which the payment was reconcile. Please check the payment of the partner %s by the amount of %s !")%(line.voucher_id.partner_id.name, line.voucher_id.amount))
                 currency_rate_difference = line.move_line_id.amount_residual - amount
             else:
                 currency_rate_difference = 0.0

From 1a60a74aaf9174f2a7f0a82f88f74688587801be Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Fri, 13 Jul 2012 15:33:33 +0530
Subject: [PATCH 03/38] [FIX]portal: remove button which is no more required

bzr revid: kjo@tinyerp.com-20120713100333-dzhz5hjwnflmbjw9
---
 addons/portal/portal_view.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/addons/portal/portal_view.xml b/addons/portal/portal_view.xml
index 21641f45bc7..262b7bda2b9 100644
--- a/addons/portal/portal_view.xml
+++ b/addons/portal/portal_view.xml
@@ -56,9 +56,6 @@ the portal's users.
                             <field name="override_menu"/>
                             <field name="parent_menu_id"
                                 context="{'ir.ui.menu.full_list': True}"/>
-                            <label colspan="1"/>
-                            <button name="do_create_menu" type="object"
-                                string="Create Parent Menu"/>
                             <field name="home_action_id"/>
                         </group>
                     </page>

From 8303bef9ba219c6f4d2633062486b5c611a2a578 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 6 Sep 2012 13:14:44 +0200
Subject: [PATCH 04/38] [IMP] Chatter: added support for attachments.

bzr revid: tde@openerp.com-20120906111444-n7bsjv0f10p9c3x4
---
 addons/mail/mail_message.py                 |   2 +-
 addons/mail/static/src/css/mail.css         |  20 +++-
 addons/mail/static/src/js/mail.js           | 113 +++++++++++++++-----
 addons/mail/static/src/js/mail_followers.js |   2 +-
 addons/mail/static/src/xml/mail.xml         |  32 +++++-
 5 files changed, 135 insertions(+), 34 deletions(-)

diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index e4862ca9fb9..dd499f6f170 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -147,7 +147,7 @@ class mail_message(osv.Model):
 
     def _message_dict_get(self, cr, uid, msg, context=None):
         """ Return a dict representation of the message browse record. """
-        attachment_ids = self.pool.get('ir.attachment').name_get(cr, uid, [x.id for x in msg.attachment_ids], context=context)
+        attachment_ids = [{'id': attach[0], 'name': attach[1]} for attach in self.pool.get('ir.attachment').name_get(cr, uid, [x.id for x in msg.attachment_ids], context=context)]
         author_id = self.pool.get('res.partner').name_get(cr, uid, [msg.author_id.id], context=context)[0]
         author_user_id = self.pool.get('res.users').name_get(cr, uid, [msg.author_id.user_ids[0].id], context=context)[0]
         partner_ids = self.pool.get('res.partner').name_get(cr, uid, [x.id for x in msg.partner_ids], context=context)
diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index 240627c9e6c..34b090cde61 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -307,6 +307,22 @@
     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;
+}
+.openerp .oe_mail_msg_content .oe_mail_compose_message_icons input.oe_form_binary_file {
+    bottom: 0px;
+    top: auto;
+    left: auto;
+    right: 24px;
+    height: 24px;
+    width: 24px;
+    min-width: 24px;
+}
+
 /* ------------------------------------------------------------ */
 /* Messages layout
 /* ------------------------------------------------------------ */
@@ -376,7 +392,7 @@
 }
 
 /* Attachments list */
-.openerp ul.oe_mail_msg_attachments {
+.openerp .oe_mail_msg_content ul.oe_mail_msg_attachments {
     display: none;
     width: 100%;
     border-top: 1px solid #CCC;
@@ -384,7 +400,7 @@
     padding: .5em 0;
     list-style-position: inside;
 }
-.openerp ul.oe_mail_msg_attachments li {
+.openerp .oe_mail_msg_content ul.oe_mail_msg_attachments li {
     float: none;
     margin: 0;
     padding: 0;
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index a5a64a59a8b..1f2d9fda6a6 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -37,6 +37,27 @@ openerp.mail = function(session) {
         },
     });
 
+    /**
+     * ------------------------------------------------------------
+     * Sidebar
+     * ------------------------------------------------------------
+     *
+     * Override of sidebar do_attachment_new method, to catch attachments added
+     * through the sidebar and show them in the Chatter composition form.
+     */
+
+    // session.web.Sidebar = session.web.Sidebar.extend({
+    //     do_attachment_new: function(attachment) {
+    //         this._super(attachment);
+    //         var message_ids = this.getParent().fields.message_ids || undefined;
+    //         if (! message_ids) { return; }
+    //         var compose_message_widget = message_ids.thread.compose_message_widget;
+    //         if (! compose_message_widget) { return; }
+    //         compose_message_widget.attachments.push(attachment);
+    //         compose_message_widget.display_attachments();
+    //     },
+    // });
+
     /**
      * ------------------------------------------------------------
      * ChatterUtils
@@ -60,12 +81,17 @@ openerp.mail = function(session) {
 
     mail.ChatterUtils = {
 
-        /** get an image in /web/binary/image?... */
-        get_image: function(session_prefix, session_id, model, field, id) {
-            return session_prefix + '/web/binary/image?session_id=' + session_id + '&model=' + model + '&field=' + field + '&id=' + (id || '');
+        /** Get an image in /web/binary/image?... */
+        get_image: function(session, model, field, id) {
+            return session.prefix + '/web/binary/image?session_id=' + session.session_id + '&model=' + model + '&field=' + field + '&id=' + (id || '');
         },
 
-        /** check if the current user is the message author */
+        /** Get the url of an attachment {'id': id} */
+        get_attachment_url: function (session, attachment) {
+            return session.origin + '/web/binary/saveas?session_id=' + session.session_id + '&model=ir.attachment&field=datas&filename_field=datas_fname&id=' + attachment['id'];
+        },
+
+        /** Check if the current user is the message author */
         is_author: function (widget, message_user_id) {
             return (widget.session && widget.session.uid != 0 && widget.session.uid == message_user_id);
         },
@@ -111,21 +137,22 @@ openerp.mail = function(session) {
         init: function (parent, options) {
             var self = this;
             this._super(parent);
+            this.attachment_ids = [];
             // 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;
             // debug
-            // console.groupCollapsed('New ComposeMessage: model', this.options.context.default_res_model, ', id', this.options.context.default_res_id);
-            // console.log('context:', this.options.context);
-            // console.groupEnd();
+            console.groupCollapsed('New ComposeMessage: model', this.options.context.default_model, ', id', this.options.context.default_res_id);
+            console.log('context:', this.options.context);
+            console.groupEnd();
         },
 
         start: function () {
             this._super.apply(this, arguments);
             // customize display: add avatar, clean previous content
-            var user_avatar = mail.ChatterUtils.get_image(this.session.prefix, this.session.session_id, 'res.users', 'image_small', this.session.uid);
+            var user_avatar = mail.ChatterUtils.get_image(this.session, 'res.users', 'image_small', this.session.uid);
             this.$el.find('img.oe_mail_icon').attr('src', user_avatar);
             this.$el.find('div.oe_mail_msg_content').empty();
             // create a context for the dataset and default_get of the wizard
@@ -156,10 +183,42 @@ openerp.mail = function(session) {
             });
             // add the form, bind events, activate the form
             var msg_node = this.$el.find('div.oe_mail_msg_content');
-            return $.when(this.form_view.appendTo(msg_node)).pipe(function() {
-                self.bind_events();
-                self.form_view.do_show();
-            });
+            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.$el.find('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.$el.find('input[name=ufile]');
+            button_attach.detach().insertAfter(input_node);
+            // set the function called when attachments are added
+            this.$el.find('input.oe_form_binary_file').change(this.on_attachment_changed);
+            this.bind_events();
+            this.form_view.do_show();
+        },
+
+        /** Called when the user submits a new attachment */
+        on_attachment_changed: function(e) {
+            var $e = $(e.target);
+            if ($e.val() !== '') {
+                this.$el.find('form.oe_form_binary_form').submit();
+                session.web.blockUI();
+            }
+        },
+
+        display_attachments: function () {
+            var attach_node = this.$el.find('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.$el.find('.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, []);
         },
 
         /**
@@ -170,6 +229,7 @@ openerp.mail = function(session) {
         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', [
@@ -184,11 +244,19 @@ openerp.mail = function(session) {
          * in the function. */
         bind_events: function() {
             var self = this;
-            // event: click on 'Attachment' icon-link that opens the dialog to
-            // add an attachment.
+            // event: click on 'Attachment' button that opens the dialog to add an attachment.
             this.$el.on('click', 'button.oe_mail_compose_message_attachment', function (event) {
                 event.stopImmediatePropagation();
             });
+            // 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();
+            });
         },
     }),
 
@@ -407,7 +475,6 @@ openerp.mail = function(session) {
                 }
                 else {
                     self.display_record(record);
-                    // if (self.options.thread_level >= 0) {
                     self.thread = new mail.Thread(self, {
                         'context': {
                             'default_model': record.model,
@@ -419,7 +486,6 @@ openerp.mail = function(session) {
                     });
                     self.$el.find('li.oe_mail_thread_msg:last').append('<div class="oe_mail_thread_subthread"/>');
                     self.thread.appendTo(self.$el.find('div.oe_mail_thread_subthread:last'));
-                    // }
                 }
             });
             if (! _expendable) {
@@ -431,7 +497,7 @@ openerp.mail = function(session) {
          * - record.date: formatting according to the user timezone
          * - record.timerelative: relative time givein by timeago lib
          * - record.avatar: image url
-         * - record.attachments[].url: url of each attachment
+         * - record.attachment_ids[].url: url of each attachment
          * - record.is_author: is the current user the author of the record */
         display_record: function (record) {
             // formatting and additional fields
@@ -440,14 +506,11 @@ openerp.mail = function(session) {
             if (record.type == 'email') {
                 record.avatar = ('/mail/static/src/img/email_icon.png');
             } else {
-                record.avatar = mail.ChatterUtils.get_image(this.session.prefix, this.session.session_id, 'res.partner', 'image_small', record.author_id[0]);
+                record.avatar = mail.ChatterUtils.get_image(this.session, 'res.partner', 'image_small', record.author_id[0]);
             }
-            //TDE: FIX
-            if (record.attachments) {
-                for (var l in record.attachments) {
-                    var url = self.session.origin + '/web/binary/saveas?session_id=' + self.session.session_id + '&model=ir.attachment&field=datas&filename_field=datas_fname&id='+records[k].attachments[l].id;
-                    record.attachments[l].url = url;
-                }
+            for (var l in record.attachment_ids) {
+                var attach = record.attachment_ids[l];
+                attach['url'] = mail.ChatterUtils.get_attachment_url(this.session, attach);
             }
             record.is_author = mail.ChatterUtils.is_author(this, record.author_user_id[0]);
             // render, add the expand feature
@@ -473,7 +536,7 @@ openerp.mail = function(session) {
         },
 
         display_user_avatar: function () {
-            var avatar = mail.ChatterUtils.get_image(this.session.prefix, this.session.session_id, 'res.users', 'image_small', this.options.uid);
+            var avatar = mail.ChatterUtils.get_image(this.session, 'res.users', 'image_small', this.session.uid);
             return this.$el.find('img.oe_mail_icon').attr('src', avatar);
         },
         
diff --git a/addons/mail/static/src/js/mail_followers.js b/addons/mail/static/src/js/mail_followers.js
index e5d216ed3d2..34976269285 100644
--- a/addons/mail/static/src/js/mail_followers.js
+++ b/addons/mail/static/src/js/mail_followers.js
@@ -79,7 +79,7 @@ openerp_mail_followers = function(session, mail) {
             var node_user_list = this.$el.find('ul.oe_mail_followers_display').empty();
             this.$el.find('div.oe_mail_recthread_followers h4').html(this.options.title + ' (' + records.length + ')');
             _(records).each(function (record) {
-                record.avatar_url = mail.ChatterUtils.get_image(self.session.prefix, self.session.session_id, 'res.partner', 'image_small', record.id);
+                record.avatar_url = mail.ChatterUtils.get_image(self.session, 'res.partner', 'image_small', record.id);
                 $(session.web.qweb.render('mail.followers.partner', {'record': record})).appendTo(node_user_list);
             });
             if (this.message_is_follower) {
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index f6be765c603..49e861ac870 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -73,6 +73,20 @@
         </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.options.context.default_model"/>
+            <input type="hidden" name="id" t-att-value="widget.options.context.default_res_id"/>
+            <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
@@ -142,15 +156,23 @@
                     </ul>
                     <t t-if="record.attachment_ids.length > 0">
                         <div class="oe_clear"></div>
-                        <ul class="oe_mail_msg_attachments">
-                            <t t-foreach="record.attachments" t-as="attachment">
-                                <li> <a t-att-href="attachment.url"><t t-raw="attachment.name"/></a> </li>
-                            </t>
-                        </ul>
+                        <t t-call="mail.thread.message.attachments"/>
                     </t>
                 </div>
             </div>
         </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></li>
+            </t>
+        </ul>
+    </t>
+
 </template>

From e34fcc076cdcda1ed6da1cd6ba6aa567eeb0d0c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 6 Sep 2012 14:20:46 +0200
Subject: [PATCH 05/38] [FIX] mail.js: fixed wrong res_id passed into
 subthreads; fixed message_post using a wrong dataset; fixed message_post
 calling message_fetch after posting with a proxy that gave default values,
 use a then without args instead.

bzr revid: tde@openerp.com-20120906122046-g8vqkqlbb2ymb6ad
---
 addons/mail/static/src/js/mail.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 1f2d9fda6a6..94ce41802cc 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -478,7 +478,7 @@ openerp.mail = function(session) {
                     self.thread = new mail.Thread(self, {
                         'context': {
                             'default_model': record.model,
-                            'default_id': record.res_id,
+                            'default_res_id': record.res_id,
                             'default_parent_id': record.id },
                         'message_data': record.child_ids, 'thread_level': self.options.thread_level-1,
                         'show_header_compose': false, 'show_reply': self.options.thread_level > 1,
@@ -547,9 +547,9 @@ openerp.mail = function(session) {
                 var body = comment_node.val();
                 comment_node.val('');
             }
-            return this.ds_post.call('message_post', [
-                [this.options.context.res_id], body, false, 'comment', this.options.context.parent_id]
-                ).then(this.proxy('message_fetch'));
+            return this.ds_thread.call('message_post', [
+                [this.options.context.default_res_id], body, false, 'comment', this.options.context.default_parent_id, undefined]
+                ).then(self.message_fetch());
         },
 
         /** Action: 'shows more' to fetch new messages */

From a1fe4532239a343054e0d3a05df94dd68f7ac359 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 6 Sep 2012 14:52:17 +0200
Subject: [PATCH 06/38] [IMP] mail_message: attachments deleted when unlinking
 are those with model=self._name, not only 'mail.mesage'. This allows to
 remove the unlink override in mail.compose.message.

bzr revid: tde@openerp.com-20120906125217-27nlyveznh12bk63
---
 addons/mail/mail_message.py                | 4 ++--
 addons/mail/wizard/mail_compose_message.py | 6 ------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index dd499f6f170..c76d073c12b 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -310,11 +310,11 @@ class mail_message(osv.Model):
         attachments_to_delete = []
         for mail in self.browse(cr, uid, ids, context=context):
             for attach in mail.attachment_ids:
-                if attach.res_model == 'mail.message' and attach.res_id == mail.id:
+                if attach.res_model == self._name and attach.res_id == mail.id:
                     attachments_to_delete.append(attach.id)
         if attachments_to_delete:
             self.pool.get('ir.attachment').unlink(cr, uid, attachments_to_delete, context=context)
-        return super(mail_message,self).unlink(cr, uid, ids, context=context)
+        return super(mail_message, self).unlink(cr, uid, ids, context=context)
 
     def notify(self, cr, uid, newid, context=None):
         """ Add the related record followers to the destination partner_ids.
diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py
index 3153ccc2069..b62cb11aee2 100644
--- a/addons/mail/wizard/mail_compose_message.py
+++ b/addons/mail/wizard/mail_compose_message.py
@@ -221,12 +221,6 @@ class mail_compose_message(osv.TransientModel):
         res.update(self._verify_partner_email(cr, uid, value[0][2], context=context))
         return res
 
-    def unlink(self, cr, uid, ids, context=None):
-        # Cascade delete all attachments, as they are owned by the composition wizard
-        for wizard in self.read(cr, uid, ids, ['attachment_ids'], context=context):
-            self.pool.get('ir.attachment').unlink(cr, uid, wizard['attachment_ids'], context=context)
-        return super(mail_compose_message, self).unlink(cr, uid, ids, context=context)
-
     def dummy(self, cr, uid, ids, context=None):
         """ TDE: defined to have buttons that do basically nothing. It is
             currently impossible to have buttons that do nothing special

From 9b9bdae9e008e930eaf1cf208b90f66bdbdf4e7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 6 Sep 2012 15:42:01 +0200
Subject: [PATCH 07/38] [IMP] composer: attachments are attached to the
 mail.compose.message record, not the related document anymore. This way, when
 deleting the mail.compose.message, attachments will be unlinked. Added
 deletion cascaded to res_model and res_id = 0, because of attachments added
 on a not-already-saved composer. BTW, cleaned mail/__openerp__.py.

bzr revid: tde@openerp.com-20120906134201-8845xov0mjbxh8mr
---
 addons/mail/__openerp__.py                 | 12 ++++++------
 addons/mail/mail_message.py                |  9 +++++----
 addons/mail/static/src/xml/mail.xml        |  4 ++--
 addons/mail/wizard/mail_compose_message.py |  2 ++
 4 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/addons/mail/__openerp__.py b/addons/mail/__openerp__.py
index 99dd6bda6ac..08a98cb0a02 100644
--- a/addons/mail/__openerp__.py
+++ b/addons/mail/__openerp__.py
@@ -30,27 +30,27 @@ A business oriented Social Networking with a fully-integrated email and message
 ===========================================================================================
 
 The Social Networking module provides an unified social network
-abstraction layer allowing applications to display a complete 
+abstraction layer allowing applications to display a complete
 communication history on documents. It gives the users the possibility
 to read and send messages and emails in an unified way.
 
-It also provides a feeds page combined to a subscription mechanism, that 
+It also provides a feeds page combined to a subscription mechanism, that
 allows to follow documents, and to be constantly updated about recent
 news.
-        
+
 The main features of the module are:
 ------------------------------------
     * a clean and renewed communication history for any OpenERP
       document that can act as a discussion topic,
     * a discussion mean on documents,
-    * a subscription mechanism to be updated about new messages on 
+    * a subscription mechanism to be updated about new messages on
       interesting documents,
-    * an unified feeds page to see recent messages and activity 
+    * an unified feeds page to see recent messages and activity
       on followed documents,
     * user communication through the feeds page,
     * a threaded discussion design,
     * relies on the global outgoing mail server, an integrated email
-      management system allowing to send emails with a configurable 
+      management system allowing to send emails with a configurable
       scheduler-based processing engine
     * includes an extensible generic email composition assistant, that can turn
       into a mass-mailing assistant, and is capable of interpreting
diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index c76d073c12b..5fa9b8c45d7 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -306,11 +306,12 @@ class mail_message(osv.Model):
 
     def unlink(self, cr, uid, ids, context=None):
         # cascade-delete attachments that are directly attached to the message (should only happen
-        # for mail.messages that act as parent for a standalone mail.mail record.
+        # for mail.messages that act as parent for a standalone mail.mail record). Also remove
+        # attachment with a void id, because this can happen with the composer.
         attachments_to_delete = []
-        for mail in self.browse(cr, uid, ids, context=context):
-            for attach in mail.attachment_ids:
-                if attach.res_model == self._name and attach.res_id == mail.id:
+        for message in self.browse(cr, uid, ids, context=context):
+            for attach in message.attachment_ids:
+                if attach.res_model == self._name and (attach.res_id == message.id or attach.res_id == 0):
                     attachments_to_delete.append(attach.id)
         if attachments_to_delete:
             self.pool.get('ir.attachment').unlink(cr, uid, attachments_to_delete, context=context)
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 49e861ac870..161c5e2fcbc 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -81,8 +81,8 @@
         <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.options.context.default_model"/>
-            <input type="hidden" name="id" t-att-value="widget.options.context.default_res_id"/>
+            <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>
diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py
index b62cb11aee2..a112e82b590 100644
--- a/addons/mail/wizard/mail_compose_message.py
+++ b/addons/mail/wizard/mail_compose_message.py
@@ -262,6 +262,8 @@ class mail_compose_message(osv.TransientModel):
                     post_values.update(email_dict)
                 # post the message
                 active_model_pool.message_post(cr, uid, [res_id], type='comment', context=context, **post_values)
+            # post process: update attachments, because id is not necessarily known when adding attachments in Chatter
+            self.pool.get('ir.attachment').write(cr, uid, [attach.id for attach in wizard.attachment_ids], {'res_id': wizard.id}, context=context)
 
         return {'type': 'ir.actions.act_window_close'}
 

From b6eeb581aca218f61d2242929906e25b6ca44cf7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 6 Sep 2012 15:46:52 +0200
Subject: [PATCH 08/38] [REM] mail.css: removed dead css specifications.

bzr revid: tde@openerp.com-20120906134652-qc0br6b4kyxq5bdw
---
 addons/mail/static/src/css/mail.css | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index 34b090cde61..bf272a9fe96 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -338,11 +338,7 @@
     text-decoration: none;
 }
 
-.openerp .oe_mail_msg_subtitle {
-    margin: 0 0 .5em 0;
-}
-.openerp .oe_mail_msg_footer,
-.openerp .oe_mail_msg_subtitle {
+.openerp .oe_mail_msg_footer {
     color: #888;
 }
 
@@ -356,12 +352,12 @@
     text-align: justify;
 }
 
-.openerp .oe_mail_msg_body span.oe_mail_msg_tail {
-    display: inline;
+.openerp .oe_mail_msg_body pre {
+    font-family: "Lucida Grande", Helvetica, Verdana, Arial, sans-serif;
 }
 
-.openerp .oe_mail_oe_bold {
-    font-weight: bold;
+.openerp .oe_mail_msg_body span.oe_mail_msg_tail {
+    display: inline;
 }
 
 /* Read more/less link */

From 07663470e5dda3ef0c61912590286fa6992f8aab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 6 Sep 2012 16:01:31 +0200
Subject: [PATCH 09/38] [FIX] mail.css: messages in 'pre' now use the OpenERP
 fonts, without margins.

bzr revid: tde@openerp.com-20120906140131-72xxfox3c5ctm4pa
---
 addons/mail/static/src/css/mail.css | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index bf272a9fe96..8685ef88d81 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -352,8 +352,9 @@
     text-align: justify;
 }
 
-.openerp .oe_mail_msg_body pre {
+.openerp .oe_mail_msg_record_body pre {
     font-family: "Lucida Grande", Helvetica, Verdana, Arial, sans-serif;
+    margin: 0px;
 }
 
 .openerp .oe_mail_msg_body span.oe_mail_msg_tail {

From 910bc5f00a5ad4838cc3c2693dfd097134921a2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 7 Sep 2012 13:54:22 +0200
Subject: [PATCH 10/38] [REV] Reverted hack about attachments, that was not
 good.

bzr revid: tde@openerp.com-20120907115422-zfynv8pdsxk5p3vg
---
 addons/mail/mail_message.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 5fa9b8c45d7..18a88bb0b61 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -306,12 +306,11 @@ class mail_message(osv.Model):
 
     def unlink(self, cr, uid, ids, context=None):
         # cascade-delete attachments that are directly attached to the message (should only happen
-        # for mail.messages that act as parent for a standalone mail.mail record). Also remove
-        # attachment with a void id, because this can happen with the composer.
+        # for mail.messages that act as parent for a standalone mail.mail record).
         attachments_to_delete = []
         for message in self.browse(cr, uid, ids, context=context):
             for attach in message.attachment_ids:
-                if attach.res_model == self._name and (attach.res_id == message.id or attach.res_id == 0):
+                if attach.res_model == self._name and attach.res_id == message.id:
                     attachments_to_delete.append(attach.id)
         if attachments_to_delete:
             self.pool.get('ir.attachment').unlink(cr, uid, attachments_to_delete, context=context)

From 57f2b2f90960d2883155fdba413d665858d27c8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 11 Sep 2012 14:11:07 +0200
Subject: [PATCH 11/38] [FIX] Fixed conflict that I has not seen.

bzr revid: tde@openerp.com-20120911121107-surc6mwhfldsa541
---
 addons/mail/static/src/js/mail.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 5d80232bc2b..c02b81d0c4f 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -536,11 +536,7 @@ openerp.mail = function(session) {
         },
 
         display_user_avatar: function () {
-<<<<<<< TREE
             var avatar = mail.ChatterUtils.get_image(this.session, 'res.users', 'image_small', this.session.uid);
-=======
-            var avatar = mail.ChatterUtils.get_image(this.session.prefix, this.session.session_id, 'res.users', 'image_small', this.session.uid);
->>>>>>> MERGE-SOURCE
             return this.$el.find('img.oe_mail_icon').attr('src', avatar);
         },
         

From 52a2174a5d6406a2b74b23782e4e193fd34a00a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 11 Sep 2012 14:50:19 +0200
Subject: [PATCH 12/38] [FIX] Chatter: fixed CSS issues with attachments.

bzr revid: tde@openerp.com-20120911125019-9gdi4cjp6iefw5vz
---
 addons/mail/static/src/css/mail.css | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index 8685ef88d81..9aa7bd1dfe3 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -312,15 +312,22 @@
     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: 24px;
-    height: 24px;
-    width: 24px;
-    min-width: 24px;
+    right: 28px;
+    height: 26px;
+    width: 26px;
+    min-width: 22px;
+    font-size: 0px;
+    margin: 0px;
+    padding: 0px;
 }
 
 /* ------------------------------------------------------------ */

From b82a3a2223c2c081b325902067dd2e9e8dbd032c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 11 Sep 2012 15:21:22 +0200
Subject: [PATCH 13/38] [FIX] Wall: fixed search not taken into account in the
 domain given to the displayed threads.

bzr revid: tde@openerp.com-20120911132122-9w5d1jdk0br5khqs
---
 addons/mail/static/src/js/mail.js | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index a4be9456ab3..5a611de0a27 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -684,11 +684,8 @@ openerp.mail = function(session) {
             this.options.domain = options.domain || [];
             this.options.context = options.context || {};
             this.options.thread_level = options.thread_level || 1;
-            this.thread_list = [];
-            this.ds_msg = new session.web.DataSetSearch(this, 'mail.message');
-            // for search view
-            this.search = {'domain': [], 'context': {}, 'groupby': {}}
             this.search_results = {'domain': [], 'context': {}, 'groupby': {}}
+            this.ds_msg = new session.web.DataSetSearch(this, 'mail.message');
         },
 
         start: function () {
@@ -699,7 +696,7 @@ openerp.mail = function(session) {
         },
 
         destroy: function () {
-            for (var i in this.thread_list) { this.thread_list[i].destroy(); }
+            if (this.thread) this.thread.destroy();
             this._super.apply(this, arguments);
         },
 
@@ -746,10 +743,11 @@ openerp.mail = function(session) {
 
         /** Display the Wall threads */
         message_display: function () {
+            var thread_domain = this.options.domain.concat(this.search_results['domain']);
             var render_res = session.web.qweb.render('mail.wall_thread_container', {});
             $('<li class="oe_mail_wall_thread">').html(render_res).appendTo(this.$el.find('ul.oe_mail_wall_threads'));
             var thread = new mail.Thread(this, {
-                'domain': this.options.domain, 'context': this.options.context,
+                'domain': thread_domain, 'context': this.options.context,
                 'thread_level': this.options.thread_level, 'composer': true,
                 // display options
                 'show_header_compose': true,  'show_reply': this.options.thread_level > 0,
@@ -757,7 +755,7 @@ openerp.mail = function(session) {
                 }
             );
             thread.appendTo(this.$el.find('li.oe_mail_wall_thread:last'));
-            this.thread_list.push(thread);
+            this.thread = thread;
         },
     });
 };

From 9c50df8f3160277b5e0615ccce7f2c1292beb5bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 11 Sep 2012 15:22:45 +0200
Subject: [PATCH 14/38] [CLEAN] small cleanup of test_mail.

bzr revid: tde@openerp.com-20120911132245-35ik5ny86b2122zl
---
 addons/mail/tests/test_mail.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/addons/mail/tests/test_mail.py b/addons/mail/tests/test_mail.py
index f45745f31dc..20eb2ad9b91 100644
--- a/addons/mail/tests/test_mail.py
+++ b/addons/mail/tests/test_mail.py
@@ -29,7 +29,7 @@ Received: by mail1.openerp.com (Postfix, from userid 10002)
 From: Sylvie Lelitre <sylvie.lelitre@agrolait.com>
 Subject: {subject}
 MIME-Version: 1.0
-Content-Type: multipart/alternative; 
+Content-Type: multipart/alternative;
     boundary="----=_Part_4200734_24778174.1344608186754"
 Date: Fri, 10 Aug 2012 14:16:26 +0000
 Message-ID: <1198923581.41972151344608186760.JavaMail@agrolait.com>
@@ -52,9 +52,9 @@ Content-Transfer-Encoding: quoted-printable
   <meta http-equiv=3D"Content-Type" content=3D"text/html; charset=3Dutf-8" />
  </head>=20
  <body style=3D"margin: 0; padding: 0; background: #ffffff;-webkit-text-size-adjust: 100%;">=20
-  
+
   <p>Please call me as soon as possible this afternoon!</p>
-  
+
   <p>--<br/>
      Sylvie
   <p>
@@ -153,7 +153,7 @@ class test_mail(common.TransactionCase):
         test_msg_id = '<deadcafe.1337@smtp.agrolait.com>'
         mail_text = MAIL_TEMPLATE_PLAINTEXT.format(to='groups@example.com', subject='frogs', extra='', msg_id=test_msg_id)
         self.mail_thread.message_process(cr, uid, None, mail_text)
-        new_mail = self.mail_message.browse(cr, uid, self.mail_message.search(cr, uid, [('message_id','=',test_msg_id)])[0])
+        new_mail = self.mail_message.browse(cr, uid, self.mail_message.search(cr, uid, [('message_id', '=', test_msg_id)])[0])
         self.assertEqual(new_mail.body, '\n<pre>\nPlease call me as soon as possible this afternoon!\n\n--\nSylvie\n</pre>\n',
                          'plaintext mail incorrectly parsed')
 
@@ -458,6 +458,7 @@ class test_mail(common.TransactionCase):
         # 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')

From 75488f0408199da530ffe06af27c0895409ebe86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 11 Sep 2012 15:37:06 +0200
Subject: [PATCH 15/38] [CLEAN] mail.js: small cleaning.

bzr revid: tde@openerp.com-20120911133706-lhmy7s75b8eappra
---
 addons/mail/static/src/js/mail.js | 63 ++++++-------------------------
 1 file changed, 11 insertions(+), 52 deletions(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 5a611de0a27..9a8de1480de 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -20,10 +20,8 @@ openerp.mail = function(session) {
         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 record_thread = this.fields.message_ids;
-                var thread = record_thread.thread;
+                this.fields && this.fields.message_ids && this.fields.message_ids.view.get("actual_mode") != 'create') {
+                var thread = this.fields.message_ids.thread;
                 thread.refresh_composition_form(action.context);
                 return true;
             }
@@ -33,46 +31,17 @@ openerp.mail = function(session) {
         },
     });
 
-    /**
-     * ------------------------------------------------------------
-     * Sidebar
-     * ------------------------------------------------------------
-     *
-     * Override of sidebar do_attachment_new method, to catch attachments added
-     * through the sidebar and show them in the Chatter composition form.
-     */
-
-    // session.web.Sidebar = session.web.Sidebar.extend({
-    //     do_attachment_new: function(attachment) {
-    //         this._super(attachment);
-    //         var message_ids = this.getParent().fields.message_ids || undefined;
-    //         if (! message_ids) { return; }
-    //         var compose_message_widget = message_ids.thread.compose_message_widget;
-    //         if (! compose_message_widget) { return; }
-    //         compose_message_widget.attachments.push(attachment);
-    //         compose_message_widget.display_attachments();
-    //     },
-    // });
 
     /**
      * ------------------------------------------------------------
      * ChatterUtils
      * ------------------------------------------------------------
      * 
-     * This class holds a few tools method that will be used by
-     * the various Chatter widgets.
-     *
+     * This class holds a few tools method for Chatter.
      * Some regular expressions not used anymore, kept because I want to
      * - (^|\s)@((\w|@|\.)*): @login@log.log
-     *      1. '(void)'
-     *      2. login@log.log
      * - (^|\s)\[(\w+).(\w+),(\d)\|*((\w|[@ .,])*)\]: [ir.attachment,3|My Label],
      *   for internal links
-     *      1. '(void)'
-     *      2. 'ir'
-     *      3. 'attachment'
-     *      4. '3'
-     *      5. 'My Label'
      */
 
     mail.ChatterUtils = {
@@ -139,10 +108,6 @@ openerp.mail = function(session) {
             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;
-            // debug
-            console.groupCollapsed('New ComposeMessage: model', this.options.context.default_model, ', id', this.options.context.default_res_id);
-            console.log('context:', this.options.context);
-            console.groupEnd();
         },
 
         start: function () {
@@ -597,13 +562,11 @@ openerp.mail = function(session) {
      * mail_thread Widget
      * ------------------------------------------------------------
      *
-     * This widget handles the display of the Chatter on documents.
+     * This widget handles the display of messages on a document. Its main
+     * use is to receive a context and a domain, and to delegate the message
+     * fetching and displaying to the Thread widget.
      */
-
-    /* Add mail_thread widget to registry */
     session.web.form.widgets.add('mail_thread', 'openerp.mail.RecordThread');
-
-    /** mail_thread widget: thread of comments */
     mail.RecordThread = session.web.form.AbstractField.extend({
         template: 'mail.record_thread',
 
@@ -616,8 +579,7 @@ openerp.mail = function(session) {
 
         start: function() {
             this._super.apply(this, arguments);
-            // NB: all the widget should be modified to check the actual_mode property on view, not use
-            // any other method to know if the view is in create mode anymore
+            // NB: check the actual_mode property on view to know if the view is in create mode anymore
             this.view.on("change:actual_mode", this, this._check_visibility);
             this._check_visibility();
         },
@@ -646,9 +608,8 @@ openerp.mail = function(session) {
             this.$el.find('div.oe_mail_recthread_main').empty();
             if (this.thread) { this.thread.destroy(); }
             var thread = new mail.Thread(self, {
-                'context': this.options.context,
+                'context': this.options.context, 'message_ids': this.get_value(),
                 'thread_level': this.options.thread_level, 'show_header_compose': true,
-                'message_ids': this.get_value(),
                 'show_delete': true, 'composer': true });
             this.thread = thread;
             return thread.appendTo(this.$el.find('div.oe_mail_recthread_main'));
@@ -661,13 +622,11 @@ openerp.mail = function(session) {
      * Wall Widget
      * ------------------------------------------------------------
      *
-     * This widget handles the display of the Chatter on the Wall.
+     * This widget handles the display of messages on a Wall. Its main
+     * use is to receive a context and a domain, and to delegate the message
+     * fetching and displaying to the Thread widget.
      */
-
-    /* Add WallView widget to registry */
     session.web.client_actions.add('mail.wall', 'session.mail.Wall');
-
-    /* WallView widget: a wall of messages */
     mail.Wall = session.web.Widget.extend({
         template: 'mail.wall',
 

From d25057c49478dd25f96feced23961cb5dbf789f1 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Tue, 11 Sep 2012 15:37:11 +0200
Subject: [PATCH 16/38] [IMP] exception message

bzr revid: abo@openerp.com-20120911133711-jjav8mhrvqi8p4hs
---
 addons/account_voucher/account_voucher.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index dc46ec57722..2e656caca8a 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -1048,7 +1048,7 @@ class account_voucher(osv.osv):
             # currency rate difference
             if line.amount == line.amount_unreconciled:
                 if not line.move_line_id.amount_residual:
-                    raise osv.except_osv(_('Wrong bank statement line'),_("You must have delete the bank statement line manualy to which the payment was reconcile. Please check the payment of the partner %s by the amount of %s !")%(line.voucher_id.partner_id.name, line.voucher_id.amount))
+                    raise osv.except_osv(_('Wrong bank statement line'),_("You have to delete the bank statement line which the payment was reconciled to manually. Please check the payment of the partner %s by the amount of %s.")%(line.voucher_id.partner_id.name, line.voucher_id.amount))
                 currency_rate_difference = line.move_line_id.amount_residual - amount
             else:
                 currency_rate_difference = 0.0

From cd4c6756bfd4f0d11596d6e15974b4c49ed3d823 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 11 Sep 2012 15:44:55 +0200
Subject: [PATCH 17/38] [REM] mail.group: removed max-width.

bzr revid: tde@openerp.com-20120911134455-18kythu9ynjwe2iv
---
 addons/mail/static/src/css/mail_group.css | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/mail/static/src/css/mail_group.css b/addons/mail/static/src/css/mail_group.css
index 8f4ca61d531..b700cb8c80f 100644
--- a/addons/mail/static/src/css/mail_group.css
+++ b/addons/mail/static/src/css/mail_group.css
@@ -12,7 +12,6 @@
   min-height: 0px;
   max-height: none;
   padding: 0px 18px;
-  max-width: 80%;
 }
 
 /* Resize footer width */

From f0a792c565c5e2ebf886da4c9440956efb235c84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 11 Sep 2012 16:16:50 +0200
Subject: [PATCH 18/38] [FIX] purchase, account: updated call to
 mail.compose.message form view, using default values for the form.

bzr revid: tde@openerp.com-20120911141650-krnq836afvwmpln2
---
 addons/account/account_invoice.py | 27 ++++++++++++++++-----------
 addons/purchase/purchase.py       | 11 ++++++++---
 2 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py
index 42d42e7ec1b..ef2ffc5cdbe 100644
--- a/addons/account/account_invoice.py
+++ b/addons/account/account_invoice.py
@@ -395,18 +395,23 @@ class account_invoice(osv.osv):
         template_id = template and template[1] or False
         res = mod_obj.get_object_reference(cr, uid, 'mail', 'email_compose_message_wizard_form')
         res_id = res and res[1] or False
-        ctx = dict(context, active_model='account.invoice', active_id=ids[0])
-        ctx.update({'mail.compose.template_id': template_id})
+        ctx = dict(context)
+        ctx.update({
+            'default_model': 'account.invoice',
+            'default_res_id': ids[0],
+            'default_use_template': True,
+            'default_template_id': template_id,
+            })
         return {
-                'view_type': 'form',
-                'view_mode': 'form',
-                'res_model': 'mail.compose.message',
-                'views': [(res_id, 'form')],
-                'view_id': res_id,
-                'type': 'ir.actions.act_window',
-                'target': 'new',
-                'context': ctx,
-                'nodestroy': True,
+            'view_type': 'form',
+            'view_mode': 'form',
+            'res_model': 'mail.compose.message',
+            'views': [(res_id, 'form')],
+            'view_id': res_id,
+            'type': 'ir.actions.act_window',
+            'target': 'new',
+            'context': ctx,
+            'nodestroy': True,
         }
 
     def confirm_paid(self, cr, uid, ids, context=None):
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 592bf783a64..1f6279af3ad 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -347,13 +347,18 @@ class purchase_order(osv.osv):
         template_id = template and template[1] or False
         res = mod_obj.get_object_reference(cr, uid, 'mail', 'email_compose_message_wizard_form')
         res_id = res and res[1] or False
-        ctx = dict(context, active_model='purchase.order', active_id=ids[0])
-        ctx.update({'mail.compose.template_id': template_id})
+        ctx = dict(context)
+        ctx.update({
+            'default_model': 'purchase.order',
+            'default_res_id': ids[0],
+            'default_use_template': True,
+            'default_template_id': template_id,
+            })
         return {
             'view_type': 'form',
             'view_mode': 'form',
             'res_model': 'mail.compose.message',
-            'views': [(res_id,'form')],
+            'views': [(res_id, 'form')],
             'view_id': res_id,
             'type': 'ir.actions.act_window',
             'target': 'new',

From 0ef0b3df61b32e621bd5e0c07c735378417543e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 11 Sep 2012 16:17:40 +0200
Subject: [PATCH 19/38] [FIX] Chatter: fixed reloading when posting a message;
 added domain for record threads, because there were no default domain on
 model and res_id.

bzr revid: tde@openerp.com-20120911141740-8t43y4hq5s79z34i
---
 addons/mail/static/src/js/mail.js | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 9a8de1480de..6eedabb23b8 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -416,12 +416,12 @@ openerp.mail = function(session) {
             // domain and context: options + additional
             fetch_domain = _.flatten([this.options.domain, additional_domain || []], true)
             fetch_context = _.extend(this.options.context, additional_context || {})
-            // if message_ids is set: try to use it
+            // initial mode: try to use message_data or message_ids
             if (initial_mode && this.options.message_data) {
                 return this.message_display(this.options.message_data);
             }
-            return this.ds_message.call('message_read',
-                [(initial_mode && this.options.message_ids) || false, fetch_domain, this.options.thread_level, undefined, fetch_context]
+            message_ids = initial_mode && this.options.message_ids != null && this.options.message_ids || false;
+            return this.ds_message.call('message_read', [message_ids, fetch_domain, this.options.thread_level, undefined, fetch_context]
                 ).then(this.proxy('message_display'));
         },
 
@@ -604,13 +604,16 @@ openerp.mail = function(session) {
             _.extend(this.options.context, {
                 default_res_id: this.view.datarecord.id,
                 default_model: this.view.model });
+            // update domain
+            var domain = this.options.domain.concat([['model', '=', this.view.model], ['res_id', '=', this.view.datarecord.id]]);
             // create and render Thread widget
             this.$el.find('div.oe_mail_recthread_main').empty();
             if (this.thread) { this.thread.destroy(); }
             var thread = new mail.Thread(self, {
-                'context': this.options.context, 'message_ids': this.get_value(),
-                'thread_level': this.options.thread_level, 'show_header_compose': true,
-                'show_delete': true, 'composer': true });
+                'context': this.options.context, 'domain': domain, 'message_ids': this.get_value(),
+                // display
+                'thread_level': this.options.thread_level, 'show_header_compose': true, 'show_delete': true, 'composer': true,
+            });
             this.thread = thread;
             return thread.appendTo(this.$el.find('div.oe_mail_recthread_main'));
         },
@@ -702,13 +705,13 @@ openerp.mail = function(session) {
 
         /** Display the Wall threads */
         message_display: function () {
-            var thread_domain = this.options.domain.concat(this.search_results['domain']);
+            var domain = this.options.domain.concat(this.search_results['domain']);
             var render_res = session.web.qweb.render('mail.wall_thread_container', {});
             $('<li class="oe_mail_wall_thread">').html(render_res).appendTo(this.$el.find('ul.oe_mail_wall_threads'));
             var thread = new mail.Thread(this, {
-                'domain': thread_domain, 'context': this.options.context,
-                'thread_level': this.options.thread_level, 'composer': true,
+                'context': this.options.context, 'domain': domain,
                 // display options
+                'thread_level': this.options.thread_level, 'composer': true,
                 'show_header_compose': true,  'show_reply': this.options.thread_level > 0,
                 'show_hide': true, 'show_reply_by_email': true,
                 }

From 8aba3e02104ae4ba8551f3895182b457a64a0f02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 11 Sep 2012 18:17:00 +0200
Subject: [PATCH 20/38] [IMP] Chatter: added option to delete attachments in
 composer.

bzr revid: tde@openerp.com-20120911161700-ty7h844h6f0t7nea
---
 addons/mail/static/src/css/mail.css |  3 +++
 addons/mail/static/src/js/mail.js   | 27 ++++++++++++++++++---------
 addons/mail/static/src/xml/mail.xml |  7 ++++++-
 3 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index 9aa7bd1dfe3..ab8e9e7d917 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -410,3 +410,6 @@
     padding: 0;
     list-style-type: square;
 }
+.openerp .oe_mail_msg_content a.oe_mail_attachment_delete {
+    cursor: pointer;
+}
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 6eedabb23b8..bac87753574 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -108,6 +108,7 @@ openerp.mail = function(session) {
             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.show_attachment_delete = true;
         },
 
         start: function () {
@@ -157,20 +158,30 @@ openerp.mail = function(session) {
             var input_node = this.$el.find('input[name=ufile]');
             button_attach.detach().insertAfter(input_node);
             // set the function called when attachments are added
-            this.$el.find('input.oe_form_binary_file').change(this.on_attachment_changed);
+            this.$el.find('input.oe_form_binary_file').change(this.on_attachment_change);
             this.bind_events();
             this.form_view.do_show();
         },
 
-        /** Called when the user submits a new attachment */
-        on_attachment_changed: function(e) {
-            var $e = $(e.target);
-            if ($e.val() !== '') {
+        on_attachment_change: function (event) {
+            var $target = $(event.target);
+            if ($target.val() !== '') {
                 this.$el.find('form.oe_form_binary_form').submit();
                 session.web.blockUI();
             }
         },
 
+        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.$el.find('div.oe_mail_compose_message_attachments');
             var rendered = session.web.qweb.render('mail.thread.message.attachments', {'record': this});
@@ -205,10 +216,6 @@ openerp.mail = function(session) {
          * in the function. */
         bind_events: function() {
             var self = this;
-            // event: click on 'Attachment' button that opens the dialog to add an attachment.
-            this.$el.on('click', 'button.oe_mail_compose_message_attachment', function (event) {
-                event.stopImmediatePropagation();
-            });
             // event: add a new attachment
             $(window).on(this.fileupload_id, function() {
                 var args = [].slice.call(arguments).slice(1);
@@ -218,6 +225,8 @@ 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);
         },
     }),
 
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 18204c05f5b..c3787f50122 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -169,7 +169,12 @@
     <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></li>
+                <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>

From 309e2353c6ddbc1e60d9bd7aac7149a2c5f67b84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 11 Sep 2012 18:24:15 +0200
Subject: [PATCH 21/38] [CLEAN] mail.js: some cleaning in Wall and
 RecordThread.

bzr revid: tde@openerp.com-20120911162415-altimitaw1nz2r03
---
 addons/mail/static/src/js/mail.js   | 17 ++---------------
 addons/mail/static/src/xml/mail.xml |  4 ++--
 2 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index bac87753574..858256ff476 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -597,11 +597,6 @@ openerp.mail = function(session) {
             this.$el.toggle(this.view.get("actual_mode") !== "create");
         },
 
-        destroy: function() {
-            if (this.thread) { this.thread.destroy(); }
-            this._super.apply(this, arguments);
-        },
-
         set_value: function() {
             var self = this;
             this._super.apply(this, arguments);
@@ -617,13 +612,11 @@ openerp.mail = function(session) {
             var domain = this.options.domain.concat([['model', '=', this.view.model], ['res_id', '=', this.view.datarecord.id]]);
             // create and render Thread widget
             this.$el.find('div.oe_mail_recthread_main').empty();
-            if (this.thread) { this.thread.destroy(); }
             var thread = new mail.Thread(self, {
                 'context': this.options.context, 'domain': domain, 'message_ids': this.get_value(),
                 // display
                 'thread_level': this.options.thread_level, 'show_header_compose': true, 'show_delete': true, 'composer': true,
             });
-            this.thread = thread;
             return thread.appendTo(this.$el.find('div.oe_mail_recthread_main'));
         },
     });
@@ -666,11 +659,6 @@ openerp.mail = function(session) {
             return (search_view_ready && thread_displayed);
         },
 
-        destroy: function () {
-            if (this.thread) this.thread.destroy();
-            this._super.apply(this, arguments);
-        },
-
         /**
          * Load the mail.message search view
          * @param {Object} defaults ??
@@ -716,7 +704,7 @@ openerp.mail = function(session) {
         message_display: function () {
             var domain = this.options.domain.concat(this.search_results['domain']);
             var render_res = session.web.qweb.render('mail.wall_thread_container', {});
-            $('<li class="oe_mail_wall_thread">').html(render_res).appendTo(this.$el.find('ul.oe_mail_wall_threads'));
+            $(render_res).appendTo(this.$el.find('ul.oe_mail_wall_threads'));
             var thread = new mail.Thread(this, {
                 'context': this.options.context, 'domain': domain,
                 // display options
@@ -725,8 +713,7 @@ openerp.mail = function(session) {
                 'show_hide': true, 'show_reply_by_email': true,
                 }
             );
-            thread.appendTo(this.$el.find('li.oe_mail_wall_thread:last'));
-            this.thread = thread;
+            return thread.appendTo(this.$el.find('li.oe_mail_wall_thread:last'));
         },
     });
 };
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index c3787f50122..601270cc98f 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -39,8 +39,8 @@
         wall_thread_container template for the wall
         Each discussion thread is contained inside this template
         -->
-    <t t-name="mail.wall_thread_container">
-    </t>
+    <li t-name="mail.wall_thread_container" class="oe_mail_wall_thread">
+    </li>
 
     <!--
         record_thread main template

From 1bd02156eb6aa2f7bfe713c4ba4785310ea1f40c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 11 Sep 2012 18:38:53 +0200
Subject: [PATCH 22/38] [IMP] mail.js: cleaned link behavior (not href anymore,
 delegated function for message_delete and message_read).

bzr revid: tde@openerp.com-20120911163853-y7g769dp53jym028
---
 addons/mail/static/src/css/mail.css |  2 +-
 addons/mail/static/src/js/mail.js   | 55 +++++++++++++----------------
 addons/mail/static/src/xml/mail.xml | 10 +++---
 3 files changed, 31 insertions(+), 36 deletions(-)

diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index ab8e9e7d917..e2aa3451f31 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -410,6 +410,6 @@
     padding: 0;
     list-style-type: square;
 }
-.openerp .oe_mail_msg_content a.oe_mail_attachment_delete {
+.openerp .oe_mail_msg_content a {
     cursor: pointer;
 }
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 858256ff476..ee08ff27d3d 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -316,10 +316,8 @@ openerp.mail = function(session) {
          * in the function. */
         bind_events: function() {
             var self = this;
-            // event: click on 'more' at bottom of thread
-            this.$el.find('button.oe_mail_button_more').click(function () {
-                self.do_message_fetch();
-            });
+            // event: click on 'More' at bottom of thread
+            this.$el.on('click', 'button.oe_mail_button_more', this.do_message_fetch_more);
             // event: writing in basic textarea of composition form (quick reply)
             this.$el.find('textarea.oe_mail_compose_textarea').keyup(function (event) {
                 var charCode = (event.which) ? event.which : window.event.keyCode;
@@ -328,41 +326,21 @@ openerp.mail = function(session) {
             });
             // event: click on 'Reply' in msg
             this.$el.on('click', 'a.oe_mail_msg_reply', function (event) {
-                event.preventDefault();
-                event.stopPropagation();
                 var act_dom = $(this).parents('li.oe_mail_thread_msg').eq(0).find('div.oe_mail_thread_action:first');
                 act_dom.toggle();
             });
-            // event: click on 'attachment(s)' in msg
+            // event: click on 'Attachment(s)' in msg
             this.$el.on('click', 'a.oe_mail_msg_view_attachments', function (event) {
-                event.preventDefault();
-                event.stopPropagation();
                 var act_dom = $(this).parent().parent().parent().find('.oe_mail_msg_attachments');
                 act_dom.toggle();
             });
             // event: click on 'Delete' in msg side menu
-            this.$el.on('click', 'a.oe_mail_msg_delete', function (event) {
-                event.preventDefault();
-                event.stopPropagation();
-                if (! confirm(_t("Do you really want to delete this message?"))) { return false; }
-                var msg_id = event.srcElement.dataset.id;
-                if (! msg_id) return false;
-                $(event.srcElement).parents('li.oe_mail_thread_msg').eq(0).remove();
-                return self.ds_msg.unlink([parseInt(msg_id)]);
-            });
+            this.$el.on('click', 'a.oe_mail_msg_delete', this.on_message_delete);
             // event: click on 'Hide' in msg side menu
-            this.$el.on('click', 'a.oe_mail_msg_hide', function (event) {
-                event.preventDefault();
-                event.stopPropagation();
-                var msg_id = event.srcElement.dataset.id;
-                if (! msg_id) return false;
-                $(event.srcElement).parents('li.oe_mail_thread_msg').eq(0).remove();
-                return self.ds_notif.call('set_message_read', [parseInt(msg_id)]);
-            });
-            // event: click on "Reply by email" in msg side menu (email style)
+            this.$el.on('click', 'a.oe_mail_msg_hide', this.on_message_read);
+            // event: click on 'Reply by email' in msg side menu
             this.$el.on('click', 'a.oe_mail_msg_reply_by_email', function (event) {
-                event.preventDefault();
-                event.stopPropagation();
+                if (! self.compose_message_widget) return true;
                 var msg_id = event.srcElement.dataset.msg_id;
                 if (! msg_id) return false;
                 self.compose_message_widget.refresh({
@@ -372,11 +350,28 @@ openerp.mail = function(session) {
             });
         },
 
+        on_message_delete: function (event) {
+            if (! confirm(_t("Do you really want to delete this message?"))) { return false; }
+            var msg_id = event.srcElement.dataset.id;
+            if (! msg_id) return false;
+            $(event.srcElement).parents('li.oe_mail_thread_msg').eq(0).remove();
+            return this.ds_message.unlink([parseInt(msg_id)]);
+        },
+
+        on_message_read: function (event) {
+            //TDE: TODO
+            var msg_id = event.srcElement.dataset.id;
+            if (! msg_id) return false;
+            $(event.srcElement).parents('li.oe_mail_thread_msg').eq(0).remove();
+            return this.ds_notification.call('set_message_read', [parseInt(msg_id)]);
+        },
+
         /**
          * Override-hack of do_action: automatically reload the chatter.
          * Normally it should be called only when clicking on 'Post/Send'
          * in the composition form. */
         do_action: function(action, on_close) {
+            //TDE: TODO: instead of reloading, push the message ?
             this.message_clean();
             this.message_fetch();
             if (this.compose_message_widget) {
@@ -528,7 +523,7 @@ openerp.mail = function(session) {
         },
 
         /** Action: 'shows more' to fetch new messages */
-        do_message_fetch: function () {
+        do_message_fetch_more: function () {
             return this.message_fetch(false, this.fetch_more_domain, this.fetch_more_context);
         },
 
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 601270cc98f..da1ba28b849 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -115,14 +115,14 @@
                 <span class="oe_dropdown_toggle oe_dropdown_arrow">
                     <ul class="oe_dropdown_menu">
                         <t t-if="record.is_author">
-                            <li t-if="display['show_delete']"><a href="#" class="oe_mail_msg_delete" t-attf-data-id='{record.id}'>Delete</a></li>
+                            <li t-if="display['show_delete']"><a class="oe_mail_msg_delete" t-attf-data-id='{record.id}'>Delete</a></li>
                         </t>
-                        <li t-if="display['show_hide']"><a href="#" class="oe_mail_msg_hide" t-attf-data-id='{record.id}'>Remove notification</a></li>
+                        <li t-if="display['show_hide']"><a class="oe_mail_msg_hide" t-attf-data-id='{record.id}'>Remove notification</a></li>
 <!--                    Uncomment when adding subtype hiding
                         <li t-if="display['show_hide']">
                             <a href="#" class="oe_mail_msg_hide_type" t-attf-data-subtype='{record.subtype}'>Hide '<t t-esc="record.subtype"/>' for this document</a>
                         </li> -->
-                        <li><a href="#" t-attf-data-msg_id="{record.id}" class="oe_mail_msg_reply_by_email">Quote and reply</a></li>
+                        <li><a t-attf-data-msg_id="{record.id}" class="oe_mail_msg_reply_by_email">Quote and reply</a></li>
                         <li t-if="record.type == 'email'"><a t-attf-href="#model=mail.message&amp;id=#{record.id}" class="oe_mail_msg_details">Details</a></li>
                     </ul>
                 </span>
@@ -142,12 +142,12 @@
                       <li t-if="record.subject &amp; params.thread_level > 0"><a t-attf-href="#model=#{record.model}&amp;id=#{record.res_id}"><t t-raw="record.record_name"/></a></li>
                       <li><a t-attf-href="#model=res.partner&amp;id=#{record.author_id[0]}"><t t-raw="record.author_id[1]"/></a></li>
                       <li><span t-att-title="record.date"><t t-raw="record.timerelative"/></span></li>
-                      <li t-if="display['show_reply']"><a href="#" class="oe_mail_msg_reply">Reply</a></li>
+                      <li t-if="display['show_reply']"><a class="oe_mail_msg_reply">Reply</a></li>
                       <!-- uncomment when merging vote
                       <li><a href="#">Like</a></li>
                       -->
                       <li t-if="record.attachment_ids.length > 0">
-                          <a href="#" class="oe_mail_msg_view_attachments">
+                          <a class="oe_mail_msg_view_attachments">
                               <t t-if="record.attachment_ids.length == 1">1 Attachment</t>
                               <t t-if="record.attachment_ids.length > 1"><t t-raw="record.attachment_ids.length"/> Attachments</t>
                           </a>

From 1d3f68006ab010abd0880548e2e48acde4cca913 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Tue, 11 Sep 2012 18:53:45 +0200
Subject: [PATCH 23/38] [IMP] get the portal form view up to date, without the
 'Create Parent Menu' button

bzr revid: abo@openerp.com-20120911165345-8ub81ahb1nn0mi23
---
 addons/portal/portal_view.xml | 108 +++++++++++++++-------------------
 1 file changed, 48 insertions(+), 60 deletions(-)

diff --git a/addons/portal/portal_view.xml b/addons/portal/portal_view.xml
index 262b7bda2b9..fd15a842405 100644
--- a/addons/portal/portal_view.xml
+++ b/addons/portal/portal_view.xml
@@ -2,26 +2,29 @@
 <openerp>
     <data>
 
-        <!-- menu Administration/Portals/Portals -->
-        <record id="portal_list_action" model="ir.actions.act_window">
-            <field name="name">Portals</field>
-            <field name="res_model">res.portal</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <!-- a context is necessary to get the right portal form view -->
-            <field name="context">{'form_view_ref': 'portal.portal_form_view'}</field>
-            <field name="help">
-A portal helps defining specific views and rules for a group of users (the
-portal group).  A portal menu, widgets and specific groups may be assigned to
-the portal's users.
-            </field>
-        </record>
+        <!-- Top menu item -->
+        <menuitem name="Portal"
+            id="portal_menu"
+            groups="base.group_no_one,portal.group_portal_member,auth_anonymous.group_anonymous"
+            sequence="20"/>
+
+            <menuitem name="Our company" id="portal_company" parent="portal_menu" sequence="10"/>
+                <menuitem name="News" id="portal_company_news" parent="portal_company" sequence="10" action="action_news"/>
+                <menuitem name="Jobs" id="portal_jobs" parent="portal_company" sequence="20" action="action_jobs"/>
+
+            <!--
+                Create menu items that we'll leave empty for now - they'll be
+                filled up by other portal modules.
+            -->
+            <menuitem name="Orders" id="portal_orders" parent="portal_menu" sequence="20"/>
+            <menuitem name="Invoices and Payments" id="portal_invoices_payements" parent="portal_menu" sequence="30"/>
+            <menuitem name="Projects" id="portal_projects" parent="portal_menu" sequence="40"/>
+            <menuitem name="After Sale Services" id="portal_after_sales" parent="portal_menu" sequence="50"/>
 
         <!-- portal tree view -->
         <record id="portal_list_view" model="ir.ui.view">
             <field name="name">Portal List</field>
             <field name="model">res.portal</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Portals">
                     <field name="name" string="Portal Name"/>
@@ -33,16 +36,21 @@ the portal's users.
         <record id="portal_form_view" model="ir.ui.view">
             <field name="name">Portal Form</field>
             <field name="model">res.portal</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="base.view_groups_form"/>
             <field name="arch" type="xml">
                 <page string="Users" position="before">
                     <page string="Portal">
-                        <group colspan="4" col="2">
-                            <separator string="Website" colspan="2"/>
-                            <field name="url" widget="url"/>
-                        </group>
-                        <group colspan="2" col="2">
+                        <group>
+                            <group>
+                                <field name="url" widget="url" string="Portal URL"/>
+                                <field name="home_action_id"/>
+                            </group>
+                            <group>
+                                <field name="override_menu"/>
+                                <field name="parent_menu_id"
+                                    context="{'ir.ui.menu.full_list': True}"/>
+                                <label for="partent_menu_id" colspan="1"/>
+                            </group>
                             <separator string="Widgets Assigned to Users" colspan="2"/>
                             <field name="widget_ids" nolabel="1" colspan="2">
                                 <tree string="Widgets" editable="bottom">
@@ -51,53 +59,33 @@ the portal's users.
                                 </tree>
                             </field>
                         </group>
-                        <group colspan="2" col="2">
-                            <separator string="Portal Menu" colspan="2"/>
-                            <field name="override_menu"/>
-                            <field name="parent_menu_id"
-                                context="{'ir.ui.menu.full_list': True}"/>
-                            <field name="home_action_id"/>
-                        </group>
                     </page>
                 </page>
             </field>
         </record>
 
-        <record id="company_news_feed" model="mail.group">
-            <field name="name">Company's news feed</field>
+        <!-- action Administration/Portals/Portals -->
+        <record id="portal_list_action" model="ir.actions.act_window">
+            <field name="name">Portals</field>
+            <field name="res_model">res.portal</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <!-- a context is necessary to get the right portal form view -->
+            <field name="context">{'form_view_ref': 'portal.portal_form_view'}</field>
+            <field name="help" type="html">
+              <p class="oe_view_nocontent_create">
+                Click to create a new portal.
+              </p><p>
+                A portal helps defining specific views and rules for a group of
+                users (the portal group).  A portal menu, widgets and specific
+                groups may be assigned to the portal's users.
+              </p>
+            </field>
         </record>
 
-        <record id="action_news" model="ir.actions.act_window">
-            <field name="name">News</field>
-            <field name="res_model">mail.group</field>
-            <field name="res_id" ref="company_news_feed"/>
-            <field name="view_mode">form</field>
-        </record>
-
-
-        <!-- module's menu -->
-        <!-- menu Administration/Portals -->
-        <menuitem name="Portals Settings" id="portal_menu_settings" parent="base.menu_administration"
-            groups="group_portal_manager"/>
-
+        <!-- menu Administration/Portals/Portals -->
+        <menuitem name="Portals Settings" id="portal_menu_settings" parent="base.menu_administration" groups="group_portal_manager"/>
             <menuitem name="Portals" id="portal_list_menu" parent="portal_menu_settings" action="portal_list_action"/>
 
-            <!-- root menu for portal members (chrooted in this menu) -->
-            <menuitem name="Portal Members Root Menu" id="portal_members_root_menu" parent="portal_menu_settings"/>
-                <menuitem name="Portal Member's Menu" id="menu_portal" parent="portal_members_root_menu"/>
-                <menuitem name="Our company" id="portal_company" 
-                    parent="menu_portal" sequence="10"/>
-                    <menuitem name="News" id="portal_company_news" 
-                        parent="portal_company" sequence="10" action="action_news"/>
-                
-                <menuitem name="Orders" id="portal_orders" 
-                    parent="menu_portal" sequence="20"/>
-                <menuitem name="Invoices and Payments" id="portal_invoices_payements" 
-                    parent="menu_portal" sequence="30"/>
-                <menuitem name="Projects" id="portal_projects"
-                    parent="menu_portal" sequence="40"/>
-                <menuitem name="After Sale Services" id="portal_after_sales" 
-                    parent="menu_portal" sequence="50"/>
-
     </data>
 </openerp>

From ab82f7a9acc6273bdba123083cbd1b0b77f7b6e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 12 Sep 2012 11:21:43 +0200
Subject: [PATCH 24/38] [IMP] mail.js: fixed cleaning of composer after posting
 a comment; cleaned a bit js and css.

bzr revid: tde@openerp.com-20120912092143-7bih2gmoa3tm1jyn
---
 addons/mail/static/src/css/mail.css | 39 +++++++++++-------------
 addons/mail/static/src/js/mail.js   | 47 +++++++++++++++--------------
 addons/mail/static/src/xml/mail.xml |  6 ++--
 3 files changed, 45 insertions(+), 47 deletions(-)

diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index e2aa3451f31..5ca4542b1fe 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -230,6 +230,10 @@
     clear: both; 
 }
 
+.openerp .oe_mail_msg_content a {
+    cursor: pointer;
+}
+
 .openerp img.oe_mail_icon {
     width: 50px;
     height: 50px;
@@ -345,31 +349,20 @@
     text-decoration: none;
 }
 
-.openerp .oe_mail_msg_footer {
-    color: #888;
-}
-
-.openerp .oe_mail_msg_footer li {
-  float: left;
-  margin-right: 3px;
-}
-
-.openerp .oe_mail_msg_body {
+.openerp .oe_mail_msg .oe_mail_msg_body {
     margin-bottom: .5em;
     text-align: justify;
 }
 
-.openerp .oe_mail_msg_record_body pre {
+.openerp .oe_mail_msg .oe_mail_msg_body pre {
     font-family: "Lucida Grande", Helvetica, Verdana, Arial, sans-serif;
     margin: 0px;
-}
-
-.openerp .oe_mail_msg_body span.oe_mail_msg_tail {
+    white-space: pre-wrap;
     display: inline;
 }
 
 /* Read more/less link */
-.openerp .oe_mail_msg_content .oe_mail_reduce {
+.openerp .oe_mail_msg span.oe_mail_reduce {
     position: absolute;
     right: 0;
 }
@@ -387,11 +380,18 @@
     border-top: 4px solid #404040;
 }
 
-.openerp .oe_mail_msg_footer li:after {
+/* Message fopoter */
+.openerp .oe_mail_msg .oe_mail_msg_footer {
+    color: #888;
+}
+.openerp .oe_mail_msg .oe_mail_msg_footer li {
+    float: left;
+    margin-right: 3px;
+}
+.openerp .oe_mail_msg .oe_mail_msg_footer li:after {
     content: " · ";
 }
-
-.openerp .oe_mail_msg_footer li:last-child:after {
+.openerp .oe_mail_msg .oe_mail_msg_footer li:last-child:after {
     content: "";
 }
 
@@ -410,6 +410,3 @@
     padding: 0;
     list-style-type: square;
 }
-.openerp .oe_mail_msg_content a {
-    cursor: pointer;
-}
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index ee08ff27d3d..a9d56e02cb7 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -281,6 +281,7 @@ openerp.mail = function(session) {
             this.ds_message = new session.web.DataSetSearch(this, 'mail.message');
             // display customization vars
             this.display = {
+                show_record_name: true,
                 truncate_limit: options.truncate_limit || 250,
                 show_header_compose: options.show_header_compose || false,
                 show_reply: options.show_reply || false,
@@ -380,7 +381,7 @@ openerp.mail = function(session) {
                     'default_parent_id': this.options.default_parent_id,
                     'default_content_subtype': 'plain'} );
             }
-            return this._super(action, on_close);
+            // return this._super(action, on_close);
         },
 
         /** Instantiate the composition form, with every parameters in context
@@ -486,7 +487,7 @@ openerp.mail = function(session) {
             // render, add the expand feature
             var rendered = session.web.qweb.render('mail.thread.message', {'record': record, 'thread': this, 'params': this.options, 'display': this.display});
             $(rendered).appendTo(this.$el.children('div.oe_mail_thread_display:first'));
-            this.$el.find('div.oe_mail_msg_record_body').expander({
+            this.$el.find('div.oe_mail_msg_body').expander({
                 slicePoint: this.options.msg_more_limit,
                 expandText: 'read more',
                 userCollapseText: '[^]',
@@ -633,9 +634,11 @@ openerp.mail = function(session) {
         /**
          * @param {Object} parent parent
          * @param {Object} [options]
-         * @param {Number} [options.domain] domain on the Wall, is an array.
-         * @param {Number} [options.domain] context, is an object. It should
+         * @param {Array} [options.domain] domain on the Wall
+         * @param {Object} [options.context] context, is an object. It should
          *      contain default_model, default_res_id, to give it to the threads.
+         * @param {Number} [options.thread_level] number of thread levels to display
+         *      0 being flat.
          */
         init: function (parent, options) {
             this._super(parent);
@@ -649,9 +652,9 @@ openerp.mail = function(session) {
 
         start: function () {
             this._super.apply(this, arguments);
-            var search_view_ready = this.load_search_view({}, false);
-            var thread_displayed = this.message_display();
-            return (search_view_ready && thread_displayed);
+            var searchview_ready = this.load_searchview({}, false);
+            var thread_displayed = this.message_render();
+            return (searchview_ready && thread_displayed);
         },
 
         /**
@@ -659,7 +662,7 @@ openerp.mail = function(session) {
          * @param {Object} defaults ??
          * @param {Boolean} hidden some kind of trick we do not care here
          */
-        load_search_view: function (defaults, hidden) {
+        load_searchview: function (defaults, hidden) {
             var self = this;
             this.searchview = new session.web.SearchView(this, this.ds_msg, false, defaults || {}, hidden || false);
             return this.searchview.appendTo(this.$el.find('.oe_view_manager_view_search')).then(function () {
@@ -668,9 +671,8 @@ openerp.mail = function(session) {
         },
 
         /**
-         * Aggregate the domains, contexts and groupbys in parameter
-         * with those from search form, and then calls fetch_comments
-         * to actually fetch comments
+         * Get the domains, contexts and groupbys in parameter from search
+         * view, then render the filtered threads.
          * @param {Array} domains
          * @param {Array} contexts
          * @param {Array} groupbys
@@ -685,27 +687,26 @@ openerp.mail = function(session) {
                 self.search_results['context'] = results.context;
                 self.search_results['domain'] = results.domain;
                 self.search_results['groupby'] = results.group_by;
-                self.message_clean();
-                return self.message_display();
+                return self.message_render();
             });
         },
 
-        /** Clean the wall */
-        message_clean: function() {
+        /** Cleand and display the threads */
+        message_render: function () {
             this.$el.find('ul.oe_mail_wall_threads').empty();
-        },
-
-        /** Display the Wall threads */
-        message_display: function () {
             var domain = this.options.domain.concat(this.search_results['domain']);
             var render_res = session.web.qweb.render('mail.wall_thread_container', {});
             $(render_res).appendTo(this.$el.find('ul.oe_mail_wall_threads'));
             var thread = new mail.Thread(this, {
-                'context': this.options.context, 'domain': domain,
+                'context': this.options.context,
+                'domain': domain,
                 // display options
-                'thread_level': this.options.thread_level, 'composer': true,
-                'show_header_compose': true,  'show_reply': this.options.thread_level > 0,
-                'show_hide': true, 'show_reply_by_email': true,
+                'thread_level': this.options.thread_level,
+                'composer': true,
+                'show_header_compose': true,
+                'show_reply': this.options.thread_level > 0,
+                'show_hide': true,
+                'show_reply_by_email': true,
                 }
             );
             return thread.appendTo(this.$el.find('li.oe_mail_wall_thread:last'));
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index da1ba28b849..09da919a78d 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -132,10 +132,10 @@
                         <t t-raw="record.subject"/>
                     </h1>
                     <div class="oe_mail_msg_body">
-                        <div class="oe_mail_msg_record_body">
+                        <t t-if="display.show_record_name">
                             <a t-attf-href="#model=#{record.model}&amp;id=#{record.res_id}" t-if="(params.thread_level > 0) &amp; (!record.subject)"><t t-raw="record.record_name"/></a>
-                            <t t-raw="record.body"/>
-                        </div>
+                        </t>
+                        <t t-raw="record.body"/>
                     </div>
                     <div class="oe_clear"/>
                     <ul class="oe_mail_msg_footer">

From c938702ff37edbdf6d0b173535a955cc3383f3fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 12 Sep 2012 11:22:14 +0200
Subject: [PATCH 25/38] [CLEAN] mail.compose.message: cleaned a bit the
 comments.

bzr revid: tde@openerp.com-20120912092214-b4x42nv30tok8wdc
---
 addons/mail/wizard/mail_compose_message.py | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py
index a112e82b590..ccb592755cc 100644
--- a/addons/mail/wizard/mail_compose_message.py
+++ b/addons/mail/wizard/mail_compose_message.py
@@ -31,6 +31,7 @@ from tools.translate import _
 # main mako-like expression pattern
 EXPRESSION_PATTERN = re.compile('(\$\{.+?\})')
 
+
 class mail_compose_message(osv.TransientModel):
     """ Generic message composition wizard. You may inherit from this wizard
         at model and view levels to provide specific features.
@@ -115,8 +116,9 @@ class mail_compose_message(osv.TransientModel):
         'composition_mode': 'comment',
         'content_subtype': lambda self, cr, uid, ctx={}: 'plain',
         'body_text': lambda self, cr, uid, ctx={}: False,
-        'body': lambda self, cr, uid, ctx={}: '',
+        'body': lambda self, cr, uid, ctx={}: False,
         'subject': lambda self, cr, uid, ctx={}: False,
+        'partner_ids': lambda self, cr, uid, ctx={}: [],
     }
 
     def notify(self, cr, uid, newid, context=None):
@@ -176,8 +178,8 @@ class mail_compose_message(osv.TransientModel):
         return result
 
     def toggle_content_subtype(self, cr, uid, ids, context=None):
-        """ hit toggle formatting mode button: calls onchange_formatting to
-            emulate an on_change, then writes the value to update the form. """
+        """ toggle content_subtype: calls onchange_formatting to emulate an
+            on_change, then writes the value to update the form. """
         for record in self.browse(cr, uid, ids, context=context):
             content_st_new_value = 'plain' if record.content_subtype == 'html' else 'html'
             onchange_res = self.onchange_content_subtype(cr, uid, ids, content_st_new_value, record.model, record.res_id, context=context)
@@ -185,11 +187,10 @@ class mail_compose_message(osv.TransientModel):
         return True
 
     def onchange_content_subtype(self, cr, uid, ids, value, model, res_id, context=None):
-        """ onchange_content_subtype (values: 'plain' or 'html'). This onchange
-            on the subtype allows to have some specific behavior when switching
-            between text or html mode.
-            This method can be overridden for models that want to have their
-            specific behavior. """
+        """ This onchange allows to have some specific behavior when switching
+            between text or html mode. This method can be overridden.
+            :param values: 'plain' or 'html'
+        """
         return {'value': {'content_subtype': value}}
 
     def _verify_partner_email(self, cr, uid, partner_ids, context=None):
@@ -211,9 +212,9 @@ class mail_compose_message(osv.TransientModel):
                 }
 
     def onchange_partner_ids(self, cr, uid, ids, value, context=None):
-        """ onchange_partner_ids (value format: [[6, 0, [3, 4]]]). The
-            basic purpose of this method is to check that destination partners
+        """ The basic purpose of this method is to check that destination partners
             effectively have email addresses. Otherwise a warning is thrown.
+            :param value: value format: [[6, 0, [3, 4]]]
         """
         res = {'value': {}}
         if not value or not value[0] or not value[0][0] == 6:
@@ -292,6 +293,7 @@ class mail_compose_message(osv.TransientModel):
         """
         if context is None:
             context = {}
+
         def merge(match):
             exp = str(match.group()[2:-1]).strip()
             result = eval(exp, {

From afb49abd3c511a1c59fa6dff305c8fe5bda17e4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 12 Sep 2012 12:21:11 +0200
Subject: [PATCH 26/38] [FIX] mail.compose.message: fixed a crashing test;
 fixed parent_id of created mail.message not set, and added a test for that
 case.

bzr revid: tde@openerp.com-20120912102111-jg5thn4tia92hu4k
---
 addons/mail/tests/test_mail.py             | 4 +++-
 addons/mail/wizard/mail_compose_message.py | 5 +++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/addons/mail/tests/test_mail.py b/addons/mail/tests/test_mail.py
index 20eb2ad9b91..069e1b0d35a 100644
--- a/addons/mail/tests/test_mail.py
+++ b/addons/mail/tests/test_mail.py
@@ -409,12 +409,14 @@ class test_mail(common.TransactionCase):
         self.assertEqual(compose.content_subtype, 'html', 'mail.compose.message incorrect content_subtype')
 
         # 2. Post the comment, get created message
+        parent_id = message.id
         mail_compose.send_mail(cr, uid, [compose_id])
         group_pigs.refresh()
         message = group_pigs.message_ids[0]
-        # Test: mail.message: subject as Re:.., body in html
+        # Test: mail.message: subject as Re:.., body in html, parent_id
         self.assertEqual(message.subject, _msg_reply, 'mail.message incorrect subject')
         self.assertIn('Administrator wrote:<blockquote><pre>Pigs rules</pre></blockquote></div>', message.body, 'mail.message body is incorrect')
+        self.assertEqual(message.parent_id and message.parent_id.id, parent_id, 'mail.message parent_id incorrect')
         # Test: mail.message: attachments
         for attach in message.attachment_ids:
             self.assertEqual(attach.res_model, 'mail.group', 'mail.message attachment res_model incorrect')
diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py
index ccb592755cc..03c5a7cfe8b 100644
--- a/addons/mail/wizard/mail_compose_message.py
+++ b/addons/mail/wizard/mail_compose_message.py
@@ -116,7 +116,7 @@ class mail_compose_message(osv.TransientModel):
         'composition_mode': 'comment',
         'content_subtype': lambda self, cr, uid, ctx={}: 'plain',
         'body_text': lambda self, cr, uid, ctx={}: False,
-        'body': lambda self, cr, uid, ctx={}: False,
+        'body': lambda self, cr, uid, ctx={}: '',
         'subject': lambda self, cr, uid, ctx={}: False,
         'partner_ids': lambda self, cr, uid, ctx={}: [],
     }
@@ -154,7 +154,7 @@ class mail_compose_message(osv.TransientModel):
         # create subject
         re_prefix = _('Re:')
         reply_subject = tools.ustr(message_data.subject or '')
-        if not (reply_subject.startswith('Re:') or reply_subject.startswith(re_prefix)):
+        if not (reply_subject.startswith('Re:') or reply_subject.startswith(re_prefix)) and message_data.subject:
             reply_subject = "%s %s" % (re_prefix, reply_subject)
         # create the reply in the body
         reply_body = _('<div>On %(date)s, %(sender_name)s wrote:<blockquote>%(body)s</blockquote></div>') % {
@@ -250,6 +250,7 @@ class mail_compose_message(osv.TransientModel):
                 post_values = {
                     'subject': wizard.subject if wizard.content_subtype == 'html' else False,
                     'body': wizard.body if wizard.content_subtype == 'html' else '<pre>%s</pre>' % tools.ustr(wizard.body_text),
+                    'parent_id': wizard.parent_id and wizard.parent_id.id,
                     'partner_ids': [(4, partner.id) for partner in wizard.partner_ids],
                     'attachments': [(attach.datas_fname or attach.name, base64.b64decode(attach.datas)) for attach in wizard.attachment_ids],
                 }

From 6de7585204c8d6d7625ee243a7ca0269a0f87da4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 12 Sep 2012 12:22:17 +0200
Subject: [PATCH 27/38] [CLEAN] mail.js: cleaned init of Thread widget (do not
 pass everything in options, but explicitely domain, context, options).
 Cleaned some var names, propagated change in code. Added reply_by_email for a
 reply link that does a quote and reply. Dropdown options are now prefixed
 with a dd.

bzr revid: tde@openerp.com-20120912102217-q6xnkn749how9en4
---
 addons/mail/static/src/js/mail.js   | 110 ++++++++++++++--------------
 addons/mail/static/src/xml/mail.xml |  43 +++++------
 2 files changed, 76 insertions(+), 77 deletions(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index a9d56e02cb7..ae66b4eae86 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -262,34 +262,33 @@ 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
          */
-        init: function(parent, options) {
+        init: function(parent, domain, context, options) {
             this._super(parent);
-            // options
-            this.options = options || {};
-            this.options.domain = options.domain || [];
-            this.options.context = _.extend({
+            this.domain = domain || [];
+            this.context = _.extend({
                 default_model: 'mail.thread',
                 default_res_id:  0,
-                default_parent_id: false }, options.context || {});
-            this.options.thread_level = options.thread_level || 0;
-            this.options.composer = options.composer || false;
-            this.options.message_ids = options.message_ids || null;
-            this.options.message_data = options.message_data || null;
+                default_parent_id: false }, context || {});
+            // options
+            this.options = {
+                message_ids: options.message_ids || null,
+                message_data: options.message_data || null,
+                thread_level: options.thread_level || 0,
+                use_composer: options.use_composer || false,
+                show_header_compose: options.show_header_compose != undefined ? options.show_header_compose: true,
+                show_record_name: options.show_record_name != undefined ? options.show_record_name: true,
+                show_reply: options.show_reply || false,
+                show_reply_by_email: options.show_reply_by_email || false,
+                show_dd_reply_by_email:options.show_dd_reply_by_email != undefined ? options.show_dd_reply_by_email: true,
+                show_dd_delete: options.show_dd_delete || false,
+                show_dd_hide: options.show_dd_hide || false,
+                show_more: options.show_more || false,
+                truncate_limit: options.truncate_limit || 250,
+            }
             // datasets and internal vars
-            this.ds_thread = new session.web.DataSetSearch(this, this.options.context.default_model);
+            this.ds_thread = new session.web.DataSetSearch(this, this.context.default_model);
             this.ds_notification = new session.web.DataSetSearch(this, 'mail.notification');
             this.ds_message = new session.web.DataSetSearch(this, 'mail.message');
-            // display customization vars
-            this.display = {
-                show_record_name: true,
-                truncate_limit: options.truncate_limit || 250,
-                show_header_compose: options.show_header_compose || false,
-                show_reply: options.show_reply || false,
-                show_delete: options.show_delete || false,
-                show_hide: options.show_hide || false,
-                show_reply_by_email: options.show_reply_by_email || false,
-                show_more: options.show_more || false,
-            }
         },
         
         start: function() {
@@ -299,7 +298,7 @@ openerp.mail = function(session) {
             // fetch and display message, using message_ids if set
             var display_done = $.when(this.message_fetch(true, [], {})).then(this.proxy('do_customize_display'));
             // add message composition form view
-            if (this.display.show_header_compose && this.options.composer) {
+            if (this.options.show_header_compose && this.options.use_composer) {
                 var compose_done = this.instantiate_composition_form();
             }
             return display_done && compose_done;
@@ -309,7 +308,9 @@ openerp.mail = function(session) {
          * - show_header_compose: show the composition form in the header */
         do_customize_display: function() {
             this.display_user_avatar();
-            if (this.display.show_header_compose) { this.$el.find('div.oe_mail_thread_action').eq(0).show(); }
+            if (this.options.show_header_compose) {
+                this.$el.find('div.oe_mail_thread_action').eq(0).show();
+            }
         },
 
         /**
@@ -378,7 +379,7 @@ openerp.mail = function(session) {
             if (this.compose_message_widget) {
                 this.compose_message_widget.refresh({
                     'default_composition_mode': 'comment',
-                    'default_parent_id': this.options.default_parent_id,
+                    'default_parent_id': this.context.default_parent_id,
                     'default_content_subtype': 'plain'} );
             }
             // return this._super(action, on_close);
@@ -391,7 +392,7 @@ openerp.mail = function(session) {
                 this.compose_message_widget.destroy();
             }
             this.compose_message_widget = new mail.ComposeMessage(this, {
-                'context': _.extend(context || {}, this.options.context),
+                'context': _.extend(context || {}, this.context),
             });
             var composition_node = this.$el.find('div.oe_mail_thread_action');
             composition_node.empty();
@@ -413,14 +414,14 @@ openerp.mail = function(session) {
          * @param {Bool} initial_mode: initial mode: try to use message_data or
          *  message_ids, if nothing available perform a message_read; otherwise
          *  directly perform a message_read
-         * @param {Array} additional_domain: added to options.domain
-         * @param {Object} additional_context: added to options.context
+         * @param {Array} additional_domain: added to this.domain
+         * @param {Object} additional_context: added to this.context
          */
         message_fetch: function (initial_mode, additional_domain, additional_context) {
             var self = this;
             // domain and context: options + additional
-            fetch_domain = _.flatten([this.options.domain, additional_domain || []], true)
-            fetch_context = _.extend(this.options.context, additional_context || {})
+            fetch_domain = _.flatten([this.domain, additional_domain || []], true)
+            fetch_context = _.extend(this.context, additional_context || {})
             // initial mode: try to use message_data or message_ids
             if (initial_mode && this.options.message_data) {
                 return this.message_display(this.options.message_data);
@@ -446,15 +447,17 @@ openerp.mail = function(session) {
                 }
                 else {
                     self.display_record(record);
-                    self.thread = new mail.Thread(self, {
-                        'context': {
-                            'default_model': record.model,
+                    self.thread = new mail.Thread(self, self.domain,
+                        {   'default_model': record.model,
                             'default_res_id': record.res_id,
                             'default_parent_id': record.id },
-                        'message_data': record.child_ids, 'thread_level': self.options.thread_level-1,
-                        'show_header_compose': false, 'show_reply': self.options.thread_level > 1,
-                        'show_hide': self.display.show_hide, 'show_delete': self.display.show_delete,
-                    });
+                        {   'message_data': record.child_ids,
+                            'thread_level': self.options.thread_level - 1,
+                            'show_header_compose': false,
+                            'show_reply': self.options.show_reply && self.options.thread_level > 1,
+                            'show_reply_by_email': self.options.show_reply_by_email,
+                            'show_dd_hide': self.options.show_dd_hide,
+                            'show_dd_delete': self.options.show_dd_delete });
                     self.$el.find('li.oe_mail_thread_msg:last').append('<div class="oe_mail_thread_subthread"/>');
                     self.thread.appendTo(self.$el.find('div.oe_mail_thread_subthread:last'));
                 }
@@ -485,10 +488,10 @@ openerp.mail = function(session) {
             }
             record.is_author = mail.ChatterUtils.is_author(this, record.author_user_id[0]);
             // render, add the expand feature
-            var rendered = session.web.qweb.render('mail.thread.message', {'record': record, 'thread': this, 'params': this.options, 'display': this.display});
+            var rendered = session.web.qweb.render('mail.thread.message', {'record': record, 'thread': this, 'options': this.options});
             $(rendered).appendTo(this.$el.children('div.oe_mail_thread_display:first'));
             this.$el.find('div.oe_mail_msg_body').expander({
-                slicePoint: this.options.msg_more_limit,
+                slicePoint: this.options.truncate_limit,
                 expandText: 'read more',
                 userCollapseText: '[^]',
                 detailClass: 'oe_mail_msg_tail',
@@ -519,7 +522,7 @@ openerp.mail = function(session) {
                 comment_node.val('');
             }
             return this.ds_thread.call('message_post', [
-                [this.options.context.default_res_id], body, false, 'comment', this.options.context.default_parent_id, undefined]
+                [this.context.default_res_id], body, false, 'comment', this.context.default_parent_id, undefined]
                 ).then(self.message_fetch());
         },
 
@@ -608,11 +611,11 @@ openerp.mail = function(session) {
             var domain = this.options.domain.concat([['model', '=', this.view.model], ['res_id', '=', this.view.datarecord.id]]);
             // create and render Thread widget
             this.$el.find('div.oe_mail_recthread_main').empty();
-            var thread = new mail.Thread(self, {
-                'context': this.options.context, 'domain': domain, 'message_ids': this.get_value(),
-                // display
-                'thread_level': this.options.thread_level, 'show_header_compose': true, 'show_delete': true, 'composer': true,
-            });
+            var thread = new mail.Thread(self, domain, this.options.context,
+                {   'thread_level': this.options.thread_level,
+                    'use_composer': true,
+                    'show_dd_delete': true,
+                    'show_reply_by_email': true });
             return thread.appendTo(this.$el.find('div.oe_mail_recthread_main'));
         },
     });
@@ -691,22 +694,17 @@ openerp.mail = function(session) {
             });
         },
 
-        /** Cleand and display the threads */
+        /** Clean and display the threads */
         message_render: function () {
             this.$el.find('ul.oe_mail_wall_threads').empty();
             var domain = this.options.domain.concat(this.search_results['domain']);
             var render_res = session.web.qweb.render('mail.wall_thread_container', {});
             $(render_res).appendTo(this.$el.find('ul.oe_mail_wall_threads'));
-            var thread = new mail.Thread(this, {
-                'context': this.options.context,
-                'domain': domain,
-                // display options
-                'thread_level': this.options.thread_level,
-                'composer': true,
-                'show_header_compose': true,
-                'show_reply': this.options.thread_level > 0,
-                'show_hide': true,
-                'show_reply_by_email': true,
+            var thread = new mail.Thread(this, domain, this.options.context,
+                {   'thread_level': this.options.thread_level,
+                    'use_composer': true,
+                    'show_reply': this.options.thread_level > 0,
+                    'show_dd_hide': true,
                 }
             );
             return thread.appendTo(this.$el.find('li.oe_mail_wall_thread:last'));
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 09da919a78d..4d3b56cf62f 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -114,16 +114,14 @@
                 <!-- dropdown menu with message options and actions -->
                 <span class="oe_dropdown_toggle oe_dropdown_arrow">
                     <ul class="oe_dropdown_menu">
-                        <t t-if="record.is_author">
-                            <li t-if="display['show_delete']"><a class="oe_mail_msg_delete" t-attf-data-id='{record.id}'>Delete</a></li>
-                        </t>
-                        <li t-if="display['show_hide']"><a class="oe_mail_msg_hide" t-attf-data-id='{record.id}'>Remove notification</a></li>
+                        <li t-if="record.is_author &amp; options.show_dd_delete"><a class="oe_mail_msg_delete" t-attf-data-id='{record.id}'>Delete</a></li>
+                        <li t-if="options.show_dd_hide"><a class="oe_mail_msg_hide" t-attf-data-id='{record.id}'>Remove notification</a></li>
 <!--                    Uncomment when adding subtype hiding
                         <li t-if="display['show_hide']">
                             <a href="#" class="oe_mail_msg_hide_type" t-attf-data-subtype='{record.subtype}'>Hide '<t t-esc="record.subtype"/>' for this document</a>
                         </li> -->
-                        <li><a t-attf-data-msg_id="{record.id}" class="oe_mail_msg_reply_by_email">Quote and reply</a></li>
-                        <li t-if="record.type == 'email'"><a t-attf-href="#model=mail.message&amp;id=#{record.id}" class="oe_mail_msg_details">Details</a></li>
+                        <li t-if="options.show_dd_reply_by_email"><a class="oe_mail_msg_reply_by_email" t-attf-data-msg_id="{record.id}">Quote and reply</a></li>
+                        <li t-if="record.type == 'email'"><a class="oe_mail_msg_details" t-attf-href="#model=mail.message&amp;id=#{record.id}" >Details</a></li>
                     </ul>
                 </span>
                 <!-- message itself -->
@@ -132,26 +130,29 @@
                         <t t-raw="record.subject"/>
                     </h1>
                     <div class="oe_mail_msg_body">
-                        <t t-if="display.show_record_name">
-                            <a t-attf-href="#model=#{record.model}&amp;id=#{record.res_id}" t-if="(params.thread_level > 0) &amp; (!record.subject)"><t t-raw="record.record_name"/></a>
+                        <t t-if="options.show_record_name &amp; (!record.subject) &amp; (options.thread_level > 0)">
+                            <a t-attf-href="#model=#{record.model}&amp;id=#{record.res_id}"><t t-raw="record.record_name"/></a>
                         </t>
                         <t t-raw="record.body"/>
                     </div>
                     <div class="oe_clear"/>
                     <ul class="oe_mail_msg_footer">
-                      <li t-if="record.subject &amp; params.thread_level > 0"><a t-attf-href="#model=#{record.model}&amp;id=#{record.res_id}"><t t-raw="record.record_name"/></a></li>
-                      <li><a t-attf-href="#model=res.partner&amp;id=#{record.author_id[0]}"><t t-raw="record.author_id[1]"/></a></li>
-                      <li><span t-att-title="record.date"><t t-raw="record.timerelative"/></span></li>
-                      <li t-if="display['show_reply']"><a class="oe_mail_msg_reply">Reply</a></li>
-                      <!-- uncomment when merging vote
-                      <li><a href="#">Like</a></li>
-                      -->
-                      <li t-if="record.attachment_ids.length > 0">
-                          <a class="oe_mail_msg_view_attachments">
-                              <t t-if="record.attachment_ids.length == 1">1 Attachment</t>
-                              <t t-if="record.attachment_ids.length > 1"><t t-raw="record.attachment_ids.length"/> Attachments</t>
-                          </a>
-                      </li>
+                        <li t-if="options.show_record_name &amp; record.subject &amp; options.thread_level > 0">
+                            <a t-attf-href="#model=#{record.model}&amp;id=#{record.res_id}"><t t-raw="record.record_name"/></a>
+                        </li>
+                        <li><a t-attf-href="#model=res.partner&amp;id=#{record.author_id[0]}"><t t-raw="record.author_id[1]"/></a></li>
+                        <li><span t-att-title="record.date"><t t-raw="record.timerelative"/></span></li>
+                        <li t-if="options.show_reply"><a class="oe_mail_msg_reply">Reply</a></li>
+                        <li t-if="options.show_reply_by_email"><a class="oe_mail_msg_reply_by_email" t-attf-data-msg_id="{record.id}">Reply</a></li>
+                        <!-- uncomment when merging vote
+                        <li><a href="#">Like</a></li>
+                        -->
+                        <li t-if="record.attachment_ids.length > 0">
+                            <a class="oe_mail_msg_view_attachments">
+                                <t t-if="record.attachment_ids.length == 1">1 Attachment</t>
+                                <t t-if="record.attachment_ids.length > 1"><t t-raw="record.attachment_ids.length"/> Attachments</t>
+                            </a>
+                        </li>
                     </ul>
                     <t t-if="record.attachment_ids.length > 0">
                         <div class="oe_clear"></div>

From 55c236dad7ec6fdde4183eaebcbda92a60b55903 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 12 Sep 2012 12:40:11 +0200
Subject: [PATCH 28/38] [CLEAN] mail.js: cleaned Thread comments.

bzr revid: tde@openerp.com-20120912104011-05qvefxxya8t70iw
---
 addons/mail/static/src/js/mail.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index ae66b4eae86..03c79a6b54b 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -248,15 +248,16 @@ openerp.mail = function(session) {
 
         /**
          * @param {Object} parent parent
-         * @param {Object} [options]
-         * @param {Object} [options.context] context of the thread. It should
+         * @param {Array} [domain]
+         * @param {Object} [context] context of the thread. It should
             contain at least default_model, default_res_id. Please refer to
             the ComposeMessage widget for more information about it.
-         * @param {Number} [options.thread_level=0] number of thread levels
+         * @param {Object} [options]
          * @param {Number} [options.message_ids=null] ids for message_fetch
          * @param {Number} [options.message_data=null] already formatted message
             data, for subthreads getting data from their parent
-         * @param {Boolean} [options.composer] use the advanced composer, or
+         * @param {Number} [options.thread_level=0] number of thread levels
+         * @param {Boolean} [options.use_composer] use the advanced composer, or
             the default basic textarea if not set
          * @param {Number} [options.truncate_limit=250] number of character to
          *      display before having a "show more" link; note that the text

From 66a65ab12b2779acda491c7eede4df726805eeba Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 12 Sep 2012 13:10:57 +0200
Subject: [PATCH 29/38] [FIX] Clicking a card from a kanban view scrolls the
 page down

bzr revid: fme@openerp.com-20120912111057-rlvml5v1cqslgwtq
---
 addons/web_kanban/static/src/js/kanban.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index a4dbae559b7..5f9f3027b65 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -742,7 +742,8 @@ instance.web_kanban.KanbanRecord = instance.web.Widget.extend({
                 .toggleClass('oe_kanban_draghandle', this.view.is_action_enabled('edit'));
         }
 
-        this.$el.find('.oe_kanban_action').click(function() {
+        this.$el.find('.oe_kanban_action').click(function(ev) {
+            ev.preventDefault();
             var $action = $(this),
                 type = $action.data('type') || 'button',
                 method = 'do_action_' + (type === 'action' ? 'object' : type);

From f5ebe79d3898472ec4f2113336d8103268c5daaa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 12 Sep 2012 13:28:32 +0200
Subject: [PATCH 30/38] [FIX] Chatter: attachments are now also cleaned after
 posting.

bzr revid: tde@openerp.com-20120912112832-qy0yhzaee7g0f6p7
---
 addons/mail/static/src/js/mail.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 03c79a6b54b..71665bc69fb 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -205,10 +205,14 @@ openerp.mail = function(session) {
             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', 'attachment_ids', 'partner_ids', 'composition_mode',
+                ['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}, []); });
+            ]).then( function (result) {
+                self.form_view.on_processed_onchange({'value': result}, []);
+                self.attachment_ids = [];
+                self.display_attachments();
+            });
         },
 
         /**

From c680236e8f4b737c1fb8faf584ddd5844c75578e Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Wed, 12 Sep 2012 13:46:51 +0200
Subject: [PATCH 31/38] [IMP] openerp.service.web_services.db: Use a
 contextmanager for the backup/restore functions. Ported from
 lp:~openerp-dev/openobject-server/trunk-dump_and_restore_improvements-xmo

bzr revid: stw@openerp.com-20120912114651-8hcliparft1ep9tc
---
 openerp/service/web_services.py | 51 ++++++++++++++++-----------------
 1 file changed, 25 insertions(+), 26 deletions(-)

diff --git a/openerp/service/web_services.py b/openerp/service/web_services.py
index f6392dff824..1eebac9a7a0 100644
--- a/openerp/service/web_services.py
+++ b/openerp/service/web_services.py
@@ -18,7 +18,8 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-
+from __future__ import with_statement
+import contextlib
 import base64
 import locale
 import logging
@@ -98,8 +99,6 @@ class db(netsvc.ExportService):
         self.id = 0
         self.id_protect = threading.Semaphore()
 
-        self._pg_psw_env_var_is_set = False # on win32, pg_dump need the PGPASSWORD env var
-
     def dispatch(self, method, params):
         if method in [ 'create', 'get_progress', 'drop', 'dump',
             'restore', 'rename',
@@ -205,23 +204,28 @@ class db(netsvc.ExportService):
             cr.close()
         return True
 
+    @contextlib.contextmanager
+    def _set_pg_password_in_environment(self):
+        """ On Win32, pg_dump (and pg_restore) require that
+        :envvar:`PGPASSWORD` be set
 
-    def _set_pg_psw_env_var(self):
-        # see http://www.postgresql.org/docs/8.4/static/libpq-envars.html
-        # FIXME: This is not thread-safe, and should never be enabled for
-        # SaaS (giving SaaS users the super-admin password is not a good idea
-        # anyway)
-        if tools.config['db_password'] and not os.environ.get('PGPASSWORD', ''):
+        This context management method handles setting
+        :envvar:`PGPASSWORD` iif win32 and the envvar is not already
+        set, and removing it afterwards.
+        """
+        if os.name != 'nt' or os.environ.get('PGPASSWORD'):
+            yield
+        else:
             os.environ['PGPASSWORD'] = tools.config['db_password']
-            self._pg_psw_env_var_is_set = True
+            try:
+                yield
+            finally:
+                del os.environ['PGPASSWORD']
 
-    def _unset_pg_psw_env_var(self):
-        if self._pg_psw_env_var_is_set:
-            os.environ['PGPASSWORD'] = ''
 
     def exp_dump(self, db_name):
-        try:
-            self._set_pg_psw_env_var()
+        logger = logging.getLogger('openerp.service.web_services.db.dump')
+        with self._set_pg_password_in_environment():
             cmd = ['pg_dump', '--format=c', '--no-owner']
             if tools.config['db_user']:
                 cmd.append('--username=' + tools.config['db_user'])
@@ -237,23 +241,20 @@ class db(netsvc.ExportService):
             res = stdout.close()
     
             if not data or res:
-                _logger.error(
+                logger.error(
                         'DUMP DB: %s failed! Please verify the configuration of the database password on the server. '
                         'It should be provided as a -w <PASSWD> command-line option, or as `db_password` in the '
                         'server configuration file.\n %s', db_name, data)
                 raise Exception, "Couldn't dump database"
-            _logger.info('DUMP DB successful: %s', db_name)
+            logger.info('DUMP DB successful: %s', db_name)
     
             return base64.encodestring(data)
-        finally:
-            self._unset_pg_psw_env_var()
 
     def exp_restore(self, db_name, data):
-        try:
-            self._set_pg_psw_env_var()
-
+        logger = logging.getLogger('openerp.service.web_services.db.restore')
+        with self._set_pg_password_in_environment():
             if self.exp_db_exist(db_name):
-                _logger.warning('RESTORE DB: %s already exists', db_name)
+                logger.warning('RESTORE DB: %s already exists', db_name)
                 raise Exception, "Database already exists"
 
             self._create_empty_database(db_name)
@@ -282,11 +283,9 @@ class db(netsvc.ExportService):
             res = stdout.close()
             if res:
                 raise Exception, "Couldn't restore database"
-            _logger.info('RESTORE DB: %s', db_name)
+            logger.info('RESTORE DB: %s', db_name)
 
             return True
-        finally:
-            self._unset_pg_psw_env_var()
 
     def exp_rename(self, old_name, new_name):
         openerp.modules.registry.RegistryManager.delete(old_name)

From e905ec4054be35b056f87abb8d91918e3dd14391 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Wed, 12 Sep 2012 14:01:55 +0200
Subject: [PATCH 32/38] [FIX] small bug in m2o

bzr revid: nicolas.vanhoren@openerp.com-20120912120155-sybi0vpw418cx59q
---
 addons/web/static/src/js/view_form.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 08c9b96660e..6c2d6fa1b16 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -2712,8 +2712,10 @@ instance.web.form.CompletionFieldMixin = {
     _create_context: function(name) {
         var tmp = {};
         var field = (this.options || {}).create_name_field;
-        if (field !== false && (this.options || {}).quick_create !== false)
-            tmp["default_" + field] = name || "name";
+        if (field === undefined)
+            field = "name";
+        if (field !== false && name && (this.options || {}).quick_create !== false)
+            tmp["default_" + field] = name;
         return tmp;
     },
 };

From 03427d0ecb98e4faf668f1fbd4d5829ac1a86fa4 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Wed, 12 Sep 2012 14:17:37 +0200
Subject: [PATCH 33/38] [IMP] partner views

bzr revid: fp@tinyerp.com-20120912121737-ck52wn7ps96decvq
---
 openerp/addons/base/res/res_partner_view.xml | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml
index 18b5fd76a49..8bf56105201 100644
--- a/openerp/addons/base/res/res_partner_view.xml
+++ b/openerp/addons/base/res/res_partner_view.xml
@@ -97,7 +97,17 @@
                     <field name="image" widget='image' class="oe_avatar oe_left" options='{"preview_image": "image_medium"}'/>
                     <div class="oe_title">
                         <group>
-                            <field name="name"/>
+                            <div class="oe_edit_only">
+                                <label for="name"/> (
+                                <field name="is_company" on_change="onchange_type(is_company)" class="oe_inline"/> <label for="is_company" string="Is a Company?"/>)
+                            </div>
+                            <h1>
+                                <field name="name" default_focus="1" placeholder="Name" />
+                            </h1>
+                            <field name="parent_id"
+                                placeholder="Company"
+                                domain="[('is_company', '=', True)]" context="{'default_is_company': True}"
+                                attrs="{'invisible': [('is_company','=', True)]}"/>
                             <field name="category_id" widget="many2many_tags" placeholder="Tags..."/>
                             <field name="function" placeholder="e.g. Sales Director"/>
                             <field name="email" required="context.get('force_email', False)"/>
@@ -112,6 +122,7 @@
         <record id="view_partner_form" model="ir.ui.view">
             <field name="name">res.partner.form</field>
             <field name="model">res.partner</field>
+            <field eval="1" name="priority"/>
             <field name="arch" type="xml">
                 <form string="Partners" version="7.0">
                 <sheet>

From 746745e3955be545083558ebbc87ba9a20489407 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 12 Sep 2012 14:32:36 +0200
Subject: [PATCH 34/38] [IMP] When attrs show a notebook tab, select it

bzr revid: fme@openerp.com-20120912123236-q79kqdu8z4x1rphy
---
 addons/web/static/src/js/view_form.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 6c2d6fa1b16..939c8a84de6 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -1399,6 +1399,10 @@ instance.web.form.FormRenderingEngine = instance.web.form.FormRenderingEngineInt
             if (! page.__ic)
                 return;
             page.__ic.on("change:effective_invisible", null, function() {
+                if (!page.__ic.get('effective_invisible')) {
+                    $new_notebook.tabs('select', i);
+                    return;
+                }
                 var current = $new_notebook.tabs("option", "selected");
                 if (! pages[current].__ic || ! pages[current].__ic.get("effective_invisible"))
                     return;

From 24feaeffa10c332f3c5d59319d83e6f9a805d0b6 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Wed, 12 Sep 2012 14:38:48 +0200
Subject: [PATCH 35/38] [IMP] more space for breadcrum

bzr revid: fp@tinyerp.com-20120912123848-iyg7fcv12y003kcx
---
 addons/web/static/src/js/view_form.js | 2 +-
 addons/web/static/src/xml/base.xml    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 939c8a84de6..9cab9e868ad 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -321,7 +321,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
         }
         this.datarecord = record;
         this._actualize_mode();
-        this.set({ 'title' : record.id ? record.display_name : "New record" });
+        this.set({ 'title' : record.id ? record.display_name : "New" });
 
         if (this.qweb) {
             this.kill_current_form();
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index a9f54a846ed..37d2dfab414 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -426,10 +426,10 @@
 <t t-name="ViewManager">
     <div class="oe_view_manager">
         <table class="oe_view_manager_header">
-            <col width="20%"/>
-            <col width="25%"/>
             <col width="20%"/>
             <col width="35%"/>
+            <col width="15%"/>
+            <col width="30%"/>
             <tr class="oe_header_row oe_header_row_top">
                 <td colspan="2">
                         <h2 class="oe_view_title" t-if="widget.flags.display_title !== false">

From 559215872787079d38b2a0432b3655f7dedac6b8 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 12 Sep 2012 14:54:45 +0200
Subject: [PATCH 36/38] [IMP] Crop breadcrumb items

bzr revid: fme@openerp.com-20120912125445-kuk7knes2a9ogzd5
---
 addons/web/static/src/css/base.css  | 7 +++++++
 addons/web/static/src/css/base.sass | 6 ++++++
 addons/web/static/src/js/views.js   | 6 +++---
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 3c3be4bd2ea..679c3b32a18 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1239,6 +1239,13 @@
 .openerp .oe_application > div {
   height: 100%;
 }
+.openerp .oe_application .oe_breadcrumb_item {
+  display: inline-block;
+  max-width: 7em;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
 .openerp .oe_view_manager .oe_view_manager_body {
   height: inherit;
 }
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 4bf122c6146..7eff29d813e 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -987,6 +987,12 @@ $sheet-max-width: 860px
                 text-decoration: underline
         > div
             height: 100%
+        .oe_breadcrumb_item
+            display: inline-block
+            max-width: 7em
+            white-space: nowrap
+            overflow: hidden
+            text-overflow: ellipsis
     // }}}
     // ViewManager common {{{
     .oe_view_manager
diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 2dffe9520a1..0ecb10c7fdc 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -20,7 +20,7 @@ instance.web.ActionManager = instance.web.Widget.extend({
     },
     start: function() {
         this._super.apply(this, arguments);
-        this.$el.on('click', '.oe_breadcrumb_item', this.on_breadcrumb_clicked);
+        this.$el.on('click', 'a.oe_breadcrumb_item', this.on_breadcrumb_clicked);
     },
     dialog_stop: function () {
         if (this.dialog) {
@@ -95,7 +95,7 @@ instance.web.ActionManager = instance.web.Widget.extend({
                 break;
             }
         }
-        var subindex = $e.parent().find('.oe_breadcrumb_item[data-id=' + $e.data('id') + ']').index($e);
+        var subindex = $e.parent().find('a.oe_breadcrumb_item[data-id=' + $e.data('id') + ']').index($e);
         this.select_breadcrumb(index, subindex);
     },
     select_breadcrumb: function(index, subindex) {
@@ -148,7 +148,7 @@ instance.web.ActionManager = instance.web.Widget.extend({
             for (var j = 0; j < tit.length; j += 1) {
                 var label = _.escape(tit[j]);
                 if (i === this.breadcrumbs.length - 1 && j === tit.length - 1) {
-                    titles.push(label);
+                    titles.push(_.str.sprintf('<span class="oe_breadcrumb_item">%s</span>', label));
                 } else {
                     titles.push(_.str.sprintf('<a href="#" class="oe_breadcrumb_item" data-id="%s">%s</a>', item.id, label));
                 }

From ecd3a8a5581922d77b94b55d8df5dfda730acf19 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 12 Sep 2012 15:22:15 +0200
Subject: [PATCH 37/38] [IMP] Do not overflow ellipsis on last breadcrumb item

bzr revid: fme@openerp.com-20120912132215-qftamqpgekx0f3w9
---
 addons/web/static/src/css/base.css  | 2 +-
 addons/web/static/src/css/base.sass | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 679c3b32a18..05cd43db716 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1239,7 +1239,7 @@
 .openerp .oe_application > div {
   height: 100%;
 }
-.openerp .oe_application .oe_breadcrumb_item {
+.openerp .oe_application .oe_breadcrumb_item:not(:last-child) {
   display: inline-block;
   max-width: 7em;
   white-space: nowrap;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 7eff29d813e..bab3d7c6ad4 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -987,7 +987,7 @@ $sheet-max-width: 860px
                 text-decoration: underline
         > div
             height: 100%
-        .oe_breadcrumb_item
+        .oe_breadcrumb_item:not(:last-child)
             display: inline-block
             max-width: 7em
             white-space: nowrap

From 83863d6f20ecc610d098d24011c156b52c57da26 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 12 Sep 2012 15:36:56 +0200
Subject: [PATCH 38/38] [FIX] Prevent window scrolling when opening an m2o
 dialog

bzr revid: fme@openerp.com-20120912133656-z81oo9mi5s4yq22p
---
 addons/web/static/src/js/view_form.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 9cab9e868ad..ff9e0020946 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -2779,7 +2779,8 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc
         this.$drop_down = this.$el.find(".oe_m2o_drop_down_button");
         this.$follow_button = $(".oe_m2o_cm_button", this.$el);
 
-        this.$follow_button.click(function() {
+        this.$follow_button.click(function(ev) {
+            ev.preventDefault();
             if (!self.get('value')) {
                 self.focus();
                 return;