From e46502580a5c9e19c31e15dd308e99307bbb68ed Mon Sep 17 00:00:00 2001
From: "Bharat Devnani (OpenERP)" <bde@tinyerp.com>
Date: Wed, 25 Jul 2012 16:43:27 +0530
Subject: [PATCH 001/143] [IMP] changed the condition in def create_move of
 account_asset/account_asset.py

bzr revid: bde@tinyerp.com-20120725111327-rd1se9de0yoj8wgg
---
 addons/account_asset/account_asset.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account_asset/account_asset.py b/addons/account_asset/account_asset.py
index 8cd73c60aa7..fe0ee8b3922 100644
--- a/addons/account_asset/account_asset.py
+++ b/addons/account_asset/account_asset.py
@@ -366,8 +366,6 @@ class account_asset_depreciation_line(osv.osv):
         currency_obj = self.pool.get('res.currency')
         created_move_ids = []
         for line in self.browse(cr, uid, ids, context=context):
-            if currency_obj.is_zero(cr, uid, line.asset_id.currency_id, line.remaining_value):
-                can_close = True
             depreciation_date = line.asset_id.prorata and line.asset_id.purchase_date or time.strftime('%Y-%m-%d')
             period_ids = period_obj.find(cr, uid, depreciation_date, context=context)
             company_currency = line.asset_id.company_id.currency_id.id
@@ -419,6 +417,8 @@ class account_asset_depreciation_line(osv.osv):
             })
             self.write(cr, uid, line.id, {'move_id': move_id}, context=context)
             created_move_ids.append(move_id)
+            if currency_obj.is_zero(cr, uid, line.asset_id.currency_id, line.asset_id.value_residual):
+               can_close = True
             if can_close:
                 asset_obj.write(cr, uid, [line.asset_id.id], {'state': 'close'}, context=context)
         return created_move_ids

From 83a0a252b9400dc152381ff9d0c66409477be857 Mon Sep 17 00:00:00 2001
From: Vo Minh Thu <vmt@openerp.com>
Date: Fri, 19 Oct 2012 12:12:59 +0200
Subject: [PATCH 002/143] [IMP] database management: added `duplicate`
 operation.

bzr revid: vmt@openerp.com-20121019101259-f32m2wlf6xugk2vi
---
 addons/web/controllers/main.py     | 11 +++++++++++
 addons/web/static/src/js/chrome.js | 13 +++++++++++++
 addons/web/static/src/xml/base.xml | 27 +++++++++++++++++++++++++++
 3 files changed, 51 insertions(+)

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 72ffd9567f6..3980fc34aed 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -816,6 +816,17 @@ class Database(openerpweb.Controller):
 
         return req.session.proxy("db").create_database(*create_attrs)
 
+    @openerpweb.jsonrequest
+    def duplicate(self, req, fields):
+        params = dict(map(operator.itemgetter('name', 'value'), fields))
+        duplicate_attrs = (
+            params['super_admin_pwd'],
+            params['db_original_name'],
+            params['db_name'],
+        )
+
+        return req.session.proxy("db").duplicate_database(*duplicate_attrs)
+
     @openerpweb.jsonrequest
     def drop(self, req, fields):
         password, db = operator.itemgetter(
diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index a298ac67159..cbff398f0a3 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -326,6 +326,7 @@ instance.web.DatabaseManager = instance.web.Widget.extend({
         self.$el.find("tr td:first-child").addClass("oe_form_group_cell_label");
         self.$el.find("label").addClass("oe_form_label");
         self.$el.find("form[name=create_db_form]").validate({ submitHandler: self.do_create });
+        self.$el.find("form[name=duplicate_db_form]").validate({ submitHandler: self.do_duplicate });
         self.$el.find("form[name=drop_db_form]").validate({ submitHandler: self.do_drop });
         self.$el.find("form[name=backup_db_form]").validate({ submitHandler: self.do_backup });
         self.$el.find("form[name=restore_db_form]").validate({ submitHandler: self.do_restore });
@@ -411,6 +412,18 @@ instance.web.DatabaseManager = instance.web.Widget.extend({
             self.do_action(client_action);
         });
     },
+    do_duplicate: function(form) {
+        var self = this;
+        var fields = $(form).serializeArray();
+        self.rpc("/web/database/duplicate", {'fields': fields}).then(function(result) {
+            if (result.error) {
+                self.display_error(result);
+                return;
+            }
+            self.do_notify("Duplicating database", "The database has been duplicated.");
+            self.start();
+        });
+    },
     do_drop: function(form) {
         var self = this;
         var $form = $(form),
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index b031ee172e2..f57e5e47c47 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -152,6 +152,32 @@
                     </tr>
                 </table>
             </form>
+            <form id="db_duplicate" name="duplicate_db_form" style="display: none;">
+                <div class="oe_view_manager oe_view_manager_current">
+                    <div class="oe_view_manager_header" style="padding: 8px;">
+                        <div class="oe_header_row">
+                            <h2 class="oe_view_title">
+                                <span class="oe_view_title_text oe_breadcrumb_title">Duplicate Database</span>
+                            </h2>
+                            <button type="submit" class="oe_button oe_highlight db_duplicate">Duplicate</button>
+                        </div>
+                    </div>
+                </div>
+                <table align="center" class="db_option_table">
+                    <tr>
+                        <td><label for="super_admin_pwd">Master password:</label></td>
+                        <td><input type="password" name="super_admin_pwd" class="required" value="admin" /></td>
+                    </tr>
+                    <tr>
+                        <td><label for="db_original_name">Original database name:</label></td>
+                        <td><input type="text" name="db_original_name" class="required" matches="^[a-zA-Z][a-zA-Z0-9_-]+$" autofocus="true"/></td>
+                    </tr>
+                    <tr>
+                        <td><label for="db_name">New database name:</label></td>
+                        <td><input type="text" name="db_name" class="required" matches="^[a-zA-Z][a-zA-Z0-9_-]+$" /></td>
+                    </tr>
+                </table>
+            </form>
             <form id="db_drop" name="drop_db_form" style="display: none; ">
                 <div class="oe_view_manager oe_view_manager_current">
                     <div class="oe_view_manager_header" style="padding: 8px;">
@@ -279,6 +305,7 @@
     <div class="oe_secondary_menu_section">Database Management</div>
     <ul class="oe_secondary_submenu">
         <li><a href="#db_create">Create</a></li>
+        <li><a href="#db_duplicate">Duplicate</a></li>
         <li><a href="#db_drop">Drop</a></li>
         <li><a href="#db_backup">Backup</a></li>
         <li><a href="#db_restore">Restore</a></li>

From e0e1aa5d15fcf206ba1d5c55f96ad8a9b72654d6 Mon Sep 17 00:00:00 2001
From: Vo Minh Thu <vmt@openerp.com>
Date: Fri, 19 Oct 2012 12:13:49 +0200
Subject: [PATCH 003/143] [IMP] database management: added `duplicate`
 operation.

bzr revid: vmt@openerp.com-20121019101349-dt43p6da7avdsmk2
---
 openerp/service/web_services.py | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/openerp/service/web_services.py b/openerp/service/web_services.py
index 1eebac9a7a0..f4bcae81d03 100644
--- a/openerp/service/web_services.py
+++ b/openerp/service/web_services.py
@@ -103,7 +103,7 @@ class db(netsvc.ExportService):
         if method in [ 'create', 'get_progress', 'drop', 'dump',
             'restore', 'rename',
             'change_admin_password', 'migrate_databases',
-            'create_database' ]:
+            'create_database', 'duplicate_database' ]:
             passwd = params[0]
             params = params[1:]
             security.check_super(passwd)
@@ -157,6 +157,17 @@ class db(netsvc.ExportService):
         _initialize_db(self, id, db_name, demo, lang, user_password)
         return True
 
+    def exp_duplicate_database(self, db_original_name, db_name):
+        _logger.info('Duplicate database %s', db_name.lower())
+        db = sql_db.db_connect('postgres')
+        cr = db.cursor()
+        try:
+            cr.autocommit(True) # avoid transaction block
+            cr.execute("""CREATE DATABASE "%s" ENCODING 'unicode' TEMPLATE "%s" """ % (db_name, db_original_name))
+        finally:
+            cr.close()
+        return True
+
     def exp_get_progress(self, id):
         if self.actions[id]['thread'].isAlive():
 #           return openerp.modules.init_progress[db_name]

From 6ea4181244579279fde119a79ac214531922870d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 23 Oct 2012 17:56:31 +0200
Subject: [PATCH 004/143] [FIX] mail: incoming emails are not correctly set
 with email type.

bzr revid: tde@openerp.com-20121023155631-h7gbhrmgpg3mwj0f
---
 addons/mail/mail_thread.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 04da686b49d..273e0edaa36 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -554,7 +554,7 @@ class mail_thread(osv.AbstractModel):
                                       ('file2', 'bytes')}
                     }
         """
-        msg_dict = {}
+        msg_dict = {'type': 'email'}
         if not isinstance(message, Message):
             if isinstance(message, unicode):
                 # Warning: message_from_string doesn't always work correctly on unicode,

From a8da0fbef74cf71d934140c3b9a27b2846b1ebc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 23 Oct 2012 17:57:10 +0200
Subject: [PATCH 005/143] [IMP] mail: res_partner override: incoming emails are
 set as private, by setting thread_id to False. In message_post, this will set
 model and res_id of the message to False, leading to a private message.

bzr revid: tde@openerp.com-20121023155710-j6ugemc60khdqk74
---
 addons/mail/res_partner.py | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/addons/mail/res_partner.py b/addons/mail/res_partner.py
index 6b13fe6ad20..46b250328f8 100644
--- a/addons/mail/res_partner.py
+++ b/addons/mail/res_partner.py
@@ -42,4 +42,21 @@ class res_partner_mail(osv.Model):
         'notification_email_send': lambda *args: 'comment'
     }
 
+    def message_post(self, cr, uid, thread_id, body='', subject=None, type='notification',
+                        subtype=None, parent_id=False, attachments=None, context=None, **kwargs):
+        """ Override related to res.partner. In case of email message, set it as
+            private:
+            - add the target partner in the message partner_ids
+            - set thread_id as None, because this will trigger the 'private'
+                aspect of the message (model=False, res_is=False)
+        """
+        if isinstance(thread_id, (list, tuple)):
+            thread_id = thread_id[0]
+        if type == 'email':
+            partner_ids = kwargs.get('partner_ids', [])
+            partner_ids.append(thread_id)
+            kwargs['partner_ids'] = partner_ids
+            return super(res_partner_mail, self).message_post(cr, uid, False, body=body, subject=subject,
+                type=type, subtype=subtype, parent_id=parent_id, attachments=attachments, context=context, **kwargs)
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From f579cc927f2a392e9db3772f1fbc3f0f81cf9a23 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 24 Oct 2012 12:54:54 +0200
Subject: [PATCH 006/143] [FIX] files filtering when loading... stuff.

also, cleanup module file (remove extra imports, extra default key in manifest)

bzr revid: xmo@openerp.com-20121024105454-nqw9taxladjofz2v
---
 openerp/modules/loading.py |  5 ++++-
 openerp/modules/module.py  | 10 ----------
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/openerp/modules/loading.py b/openerp/modules/loading.py
index 57fb92a6ee0..ceb87afc67f 100644
--- a/openerp/modules/loading.py
+++ b/openerp/modules/loading.py
@@ -113,6 +113,7 @@ def load_module_graph(cr, graph, status=None, perform_checks=True, skip_modules=
             if kind in ('demo', 'demo_xml'):
                 noupdate = True
             try:
+                ext = ext.lower()
                 if ext == '.csv':
                     if kind in ('init', 'init_xml'):
                         noupdate = True
@@ -121,8 +122,10 @@ def load_module_graph(cr, graph, status=None, perform_checks=True, skip_modules=
                     process_sql_file(cr, fp)
                 elif ext == '.yml':
                     tools.convert_yaml_import(cr, module_name, fp, kind, idref, mode, noupdate, report)
-                else:
+                elif ext == '.xml':
                     tools.convert_xml_import(cr, module_name, fp, idref, mode, noupdate, report)
+                else:
+                    _logger.debug("Ignoring %s due to unknown type", filename)
             finally:
                 fp.close()
 
diff --git a/openerp/modules/module.py b/openerp/modules/module.py
index 6ec9e86340c..39c9817a878 100644
--- a/openerp/modules/module.py
+++ b/openerp/modules/module.py
@@ -28,15 +28,9 @@ import sys
 import types
 import zipimport
 
-import openerp
-
-import openerp.osv as osv
 import openerp.tools as tools
 import openerp.tools.osutil as osutil
 from openerp.tools.safe_eval import safe_eval as eval
-from openerp.tools.translate import _
-
-import openerp.netsvc as netsvc
 
 import zipfile
 import openerp.release as release
@@ -48,9 +42,6 @@ from cStringIO import StringIO
 
 import logging
 
-import openerp.modules.db
-import openerp.modules.graph
-
 _logger = logging.getLogger(__name__)
 
 _ad = os.path.join(os.path.dirname(os.path.dirname(__file__)), 'addons') # default addons path (base)
@@ -335,7 +326,6 @@ def load_information_from_description_file(module):
                 'description': '',
                 'icon': get_module_icon(module),
                 'installable': True,
-                'auto_install': False,
                 'license': 'AGPL-3',
                 'name': False,
                 'post_load': None,

From 124480d095c0c8559eab7f7ea134b0bc106d590a Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 24 Oct 2012 12:55:31 +0200
Subject: [PATCH 007/143] [FIX] reference to invalid and non-existant js file

bzr revid: xmo@openerp.com-20121024105531-c0uou49k828wc01t
---
 addons/base_setup/__openerp__.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/base_setup/__openerp__.py b/addons/base_setup/__openerp__.py
index de2d8236ece..e74238ba59c 100644
--- a/addons/base_setup/__openerp__.py
+++ b/addons/base_setup/__openerp__.py
@@ -44,7 +44,6 @@ Shows you a list of applications features to install from.
     'installable': True,
     'auto_install': False,
     'images': ['images/base_setup1.jpeg','images/base_setup2.jpeg','images/base_setup3.jpeg','images/base_setup4.jpeg',],
-    'js': ['static/src/js/base_setup.js'],
     'css': ['static/src/css/base_setup.css'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From 403d2ec6d1952a5b846ed8e4c9422893ec0574fd Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 24 Oct 2012 12:55:48 +0200
Subject: [PATCH 008/143] [FIX] process: dependencies

bzr revid: xmo@openerp.com-20121024105548-tmcpidjteuf2uwei
---
 addons/process/__openerp__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/process/__openerp__.py b/addons/process/__openerp__.py
index fcae18c5490..c998288a614 100644
--- a/addons/process/__openerp__.py
+++ b/addons/process/__openerp__.py
@@ -35,7 +35,7 @@ This module shows the basic processes involved in the selected modules and in th
     """,
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
-    'depends': ['base'],
+    'depends': ['web'],
     'data': [
         'security/ir.model.access.csv',
         'process_view.xml'

From b2e32b21faf1362a718d9e07106394c5eef77b40 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 24 Oct 2012 12:56:12 +0200
Subject: [PATCH 009/143] [FIX] base_import: dummy test file

bzr revid: xmo@openerp.com-20121024105612-84fb2gav0jpp2hkc
---
 addons/base_import/__openerp__.py        | 3 ++-
 addons/base_import/static/test/states.js | 6 ++++++
 2 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 addons/base_import/static/test/states.js

diff --git a/addons/base_import/__openerp__.py b/addons/base_import/__openerp__.py
index f5a707650d8..559031f4b4f 100644
--- a/addons/base_import/__openerp__.py
+++ b/addons/base_import/__openerp__.py
@@ -24,7 +24,7 @@ Re-implement openerp's file import system:
     'category': 'Uncategorized',
     'website': 'http://www.openerp.com',
     'author': 'OpenERP SA',
-    'depends': ['base'],
+    'depends': ['web'],
     'installable': True,
     'auto_install': True,
     'css': [
@@ -37,4 +37,5 @@ Re-implement openerp's file import system:
         'static/src/js/import.js',
     ],
     'qweb': ['static/src/xml/import.xml'],
+    'test': ['static/test/states.js'],
 }
diff --git a/addons/base_import/static/test/states.js b/addons/base_import/static/test/states.js
new file mode 100644
index 00000000000..3e349907a6f
--- /dev/null
+++ b/addons/base_import/static/test/states.js
@@ -0,0 +1,6 @@
+$(document).ready(function () {
+    module('foo');
+    test('dummy', function () {
+        ok(42);
+    });
+});

From f49be0fd1029d989bc7fad70876ec12eb224d866 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Wed, 31 Oct 2012 12:32:07 +0530
Subject: [PATCH 010/143] [FIX]audittrail : Fixed the problem of recursion if
 object contains o2m or m2m field of same object

bzr revid: mma@tinyerp.com-20121031070207-079wcftajl19htmo
---
 addons/audittrail/audittrail.py | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/addons/audittrail/audittrail.py b/addons/audittrail/audittrail.py
index 9232a696da8..4af516e66f0 100644
--- a/addons/audittrail/audittrail.py
+++ b/addons/audittrail/audittrail.py
@@ -346,8 +346,13 @@ class audittrail_objects_proxy(object_proxy):
                         x2m_model_id = x2m_model_ids and x2m_model_ids[0] or False
                         assert x2m_model_id, _("'%s' Model does not exist..." %(field_obj._obj))
                         x2m_model = pool.get('ir.model').browse(cr, SUPERUSER_ID, x2m_model_id)
-                        #recursive call on x2m fields that need to be checked too
-                        data.update(self.get_data(cr, SUPERUSER_ID, pool, resource[field], x2m_model, method))
+                        field_resource_ids = list(set(resource[field]))
+                        if model.model == x2m_model.model:
+                            # we need to remove current resource_id from the many2many to prevent an infinit loop
+                            if resource_id in field_resource_ids:
+                                field_resource_ids.remove(resource_id)
+                        data.update(self.get_data(cr, SUPERUSER_ID, pool, field_resource_ids, x2m_model, method))
+    
             data[(model.id, resource_id)] = {'text':values_text, 'value': values}
         return data
 
@@ -406,6 +411,10 @@ class audittrail_objects_proxy(object_proxy):
                     x2m_new_values_ids = new_values.get(key, {'value': {}})['value'].get(field_name, [])
                     # We use list(set(...)) to remove duplicates.
                     res_ids = list(set(x2m_old_values_ids + x2m_new_values_ids))
+                    if model.model == x2m_model.model:
+                        # we need to remove current resource_id from the many2many to prevent an infinit loop
+                        if resource_id in res_ids:
+                            res_ids.remove(resource_id)
                     for res_id in res_ids:
                         lines.update(self.prepare_audittrail_log_line(cr, SUPERUSER_ID, pool, x2m_model, res_id, method, old_values, new_values, field_list))
             # if the value value is different than the old value: record the change

From cebb924738f25b209c1f2e5d17da13da7208061c Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Wed, 31 Oct 2012 12:47:00 +0530
Subject: [PATCH 011/143] [FIX]stock : Set correct condition for color in tree
 view.

bzr revid: mma@tinyerp.com-20121031071700-baqyc8u8ipsk85ts
---
 addons/stock/stock_view.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 2321cfe3718..1832ff18755 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -283,10 +283,11 @@
             <field name="model">stock.tracking</field>
             <field name="field_parent">child_ids</field>
             <field name="arch" type="xml">
-                <tree colors="grey:not active" string="Packs">
+                <tree colors="grey:active == False" string="Packs">
                     <field name="name"/>
                     <field name="serial"/>
                     <field name="date"/>
+                    <field name="active" invisible="1"/>
                 </tree>
             </field>
         </record>

From d5cc7caf9c0923f5226591dab990cd496b010a2e Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Wed, 31 Oct 2012 14:11:44 +0530
Subject: [PATCH 012/143] [FIX]account_bank_statement_extensions :  Removed use
 of parent in bank statement line and improved usability

bzr revid: mma@tinyerp.com-20121031084144-9qqm7piox5qb7i0k
---
 .../account_bank_statement_view.xml                    | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/account_bank_statement_extensions/account_bank_statement_view.xml b/addons/account_bank_statement_extensions/account_bank_statement_view.xml
index 9164c00373f..62cc74858b4 100644
--- a/addons/account_bank_statement_extensions/account_bank_statement_view.xml
+++ b/addons/account_bank_statement_extensions/account_bank_statement_view.xml
@@ -72,12 +72,12 @@
           <field name="date" readonly="1"/>
           <field name="val_date" readonly="1"/>
           <field name="name"/>
-          <field name="statement_id" readonly="1"/>
+          <field name="statement_id"/>
           <field name="ref" readonly="1"/>
           <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
           <field name="type" on_change="onchange_type(partner_id, type)"/>
-          <field name="account_id" domain="[('journal_id','=',journal_id)]"/>
-          <field name="analytic_account_id" groups="analytic.group_analytic_accounting" domain="[('company_id', '=', parent.company_id), ('type', '&lt;&gt;', 'view')]"/>
+          <field name="account_id"/>
+          <field name="analytic_account_id" groups="analytic.group_analytic_accounting" domain="[('type', '&lt;&gt;', 'view')]"/>
           <field name="amount" readonly="1" sum="Total Amount"/>
           <field name="globalisation_id" string="Glob. Id"/>
           <field name="globalisation_amount" string="Glob. Am."/>
@@ -100,8 +100,8 @@
               <field name="ref" readonly="0"/>
               <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
               <field name="type" on_change="onchange_type(partner_id, type)"/>
-              <field domain="[('journal_id', '=', journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id"/>
-              <field name="analytic_account_id" groups="analytic.group_analytic_accounting" domain="[('company_id', '=', parent.company_id), ('type', '&lt;&gt;', 'view')]"/>
+              <field domain="[('type', '&lt;&gt;', 'view')]" name="account_id"/>
+              <field name="analytic_account_id" groups="analytic.group_analytic_accounting" domain="[('type', '&lt;&gt;', 'view')]"/>
               <field name="amount"/>
               <field name="globalisation_id"/>
               <field name="sequence" readonly="0"/>

From 96e097e1dca6780fae4b6d6a31c383132ef2db11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 31 Oct 2012 16:10:40 +0100
Subject: [PATCH 013/143] [FIX] mail: in init, load vote and favorite models
 before others, to avoid issues about not existing columns.

bzr revid: tde@openerp.com-20121031151040-6bx8y910cn9q1fk1
---
 addons/mail/__init__.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/mail/__init__.py b/addons/mail/__init__.py
index aea7ee62cbc..b34993ffd32 100644
--- a/addons/mail/__init__.py
+++ b/addons/mail/__init__.py
@@ -22,12 +22,12 @@
 import mail_message_subtype
 import mail_alias
 import mail_followers
+import mail_vote
+import mail_favorite
 import mail_message
 import mail_mail
 import mail_thread
 import mail_group
-import mail_vote
-import mail_favorite
 import res_partner
 import res_users
 import report

From 96f20a75fef07a32435cbc2dca21e785ec88c509 Mon Sep 17 00:00:00 2001
From: Georges Racinet <gracinet@ishtar.anybox.fr>
Date: Thu, 1 Nov 2012 21:39:35 +0100
Subject: [PATCH 014/143] [TEST] starting unit tests for taxes

bzr revid: gracinet@ishtar.anybox.fr-20121101203935-jbcp6cwikhn56ahm
---
 addons/account/tests/__init__.py |  4 +++
 addons/account/tests/test_tax.py | 49 ++++++++++++++++++++++++++++++++
 2 files changed, 53 insertions(+)
 create mode 100644 addons/account/tests/__init__.py
 create mode 100644 addons/account/tests/test_tax.py

diff --git a/addons/account/tests/__init__.py b/addons/account/tests/__init__.py
new file mode 100644
index 00000000000..11fe4186db6
--- /dev/null
+++ b/addons/account/tests/__init__.py
@@ -0,0 +1,4 @@
+from . import test_tax
+
+fast_suite = [test_tax,
+              ]
diff --git a/addons/account/tests/test_tax.py b/addons/account/tests/test_tax.py
new file mode 100644
index 00000000000..a172a17e30d
--- /dev/null
+++ b/addons/account/tests/test_tax.py
@@ -0,0 +1,49 @@
+from openerp.tests.common import TransactionCase
+
+class TestTax(TransactionCase):
+    """Tests for taxes (account.tax)
+
+    We don't really need at this point to link taxes to tax codes
+    (account.tax.code) nor to companies (base.company) to check computation
+    results.
+    """
+
+    def setUp(self):
+        super(TestTax, self).setUp()
+        self.tax_model = self.registry('account.tax')
+
+    def test_programmatic_tax(self):
+        cr, uid = self.cr, self.uid
+        tax_id = self.tax_model.create(cr, uid, dict(
+                name="Programmatic tax",
+                type='code',
+                python_compute='result = 12.0',
+                python_compute_inv='result = 11.0',
+                ))
+
+        tax_records = self.tax_model.browse(cr, uid, [tax_id])
+        res = self.tax_model.compute_all(cr, uid, tax_records, 50.0, 2)
+
+        tax_detail = res['taxes'][0]
+        self.assertEquals(tax_detail['amount'], 24.0)
+        self.assertEquals(res['total_included'], 124.0)
+
+    def test_percent_tax(self):
+        """Test computations done by a 10 percent tax."""
+        cr, uid = self.cr, self.uid
+        tax_id = self.tax_model.create(cr, uid, dict(
+                name="Percent tax",
+                type='percent',
+                amount='0.1',
+                ))
+
+        tax_records = self.tax_model.browse(cr, uid, [tax_id])
+        res = self.tax_model.compute_all(cr, uid, tax_records, 50.0, 2)
+
+        tax_detail = res['taxes'][0]
+        self.assertEquals(tax_detail['amount'], 10.0)
+        self.assertEquals(res['total_included'], 110.0)
+
+        # now the inverse computation
+        res = self.tax_model.compute_inv(cr, uid, tax_records, 55.0, 2)
+        self.assertEquals(res[0]['amount'], 10.0)

From 1dde3091d2f10249f263abd1feb9066eb9434f4c Mon Sep 17 00:00:00 2001
From: "Somesh Khare(OpenERP)" <>
Date: Mon, 5 Nov 2012 12:21:06 +0530
Subject: [PATCH 015/143] [FIX]account_voucher : journal entry not balancing
 from purchase reciept

bzr revid: mma@tinyerp.com-20121105065106-195oyhgl3x266r9t
---
 addons/account_voucher/account_voucher.py | 40 ++++++++++++-----------
 1 file changed, 21 insertions(+), 19 deletions(-)

diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index e1caf190316..1cb4c17f33a 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -381,8 +381,9 @@ class account_voucher(osv.osv):
             total_tax = 0.0
 
             if not tax[0].price_include:
-                for tax_line in tax_pool.compute_all(cr, uid, tax, voucher_amount, 1).get('taxes', []):
-                    total_tax += tax_line.get('amount', 0.0)
+                for line in voucher.line_ids:
+                    for tax_line in tax_pool.compute_all(cr, uid, tax, line.amount, 1).get('taxes', []):
+                        total_tax += tax_line.get('amount', 0.0)
                 total += total_tax
             else:
                 for line in voucher.line_ids:
@@ -413,31 +414,32 @@ class account_voucher(osv.osv):
 
         line_ids = resolve_o2m_operations(cr, uid, line_pool, line_ids, ["amount"], context)
 
+        total_tax = 0.0
+        net_tax = 0.0
         for line in line_ids:
             line_amount = 0.0
             line_amount = line.get('amount',0.0)
+
+            if tax_id:
+                tax = [tax_pool.browse(cr, uid, tax_id, context=context)]
+                if partner_id:
+                    partner = partner_pool.browse(cr, uid, partner_id, context=context) or False
+                    taxes = position_pool.map_tax(cr, uid, partner and partner.property_account_position or False, tax)
+                    tax = tax_pool.browse(cr, uid, taxes, context=context)
+
+                if not tax[0].price_include:
+                    for tax_line in tax_pool.compute_all(cr, uid, tax, voucher_total, 1).get('taxes', []):
+                        total_tax += tax_line.get('amount')
+                        total += total_tax
             voucher_total += line_amount
-
-        total = voucher_total
-        total_tax = 0.0
-        if tax_id:
-            tax = [tax_pool.browse(cr, uid, tax_id, context=context)]
-            if partner_id:
-                partner = partner_pool.browse(cr, uid, partner_id, context=context) or False
-                taxes = position_pool.map_tax(cr, uid, partner and partner.property_account_position or False, tax)
-                tax = tax_pool.browse(cr, uid, taxes, context=context)
-
-            if not tax[0].price_include:
-                for tax_line in tax_pool.compute_all(cr, uid, tax, voucher_total, 1).get('taxes', []):
-                    total_tax += tax_line.get('amount')
-                total += total_tax
+        total = voucher_total + total_tax
 
         res.update({
-            'amount':total or voucher_total,
-            'tax_amount':total_tax
+            'amount': total or voucher_total,
+            'tax_amount': total_tax
         })
         return {
-            'value':res
+            'value': res
         }
 
     def onchange_term_id(self, cr, uid, ids, term_id, amount):

From 7637a134e267bc680c44d2ac9072a752bfbb2fd7 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Mon, 5 Nov 2012 12:23:27 +0530
Subject: [PATCH 016/143] [FIX]account_voucher : removed un-used variable

bzr revid: mma@tinyerp.com-20121105065327-3x4xqyf88d1tdgwb
---
 addons/account_voucher/account_voucher.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index 1cb4c17f33a..32e8f79777f 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -415,7 +415,6 @@ class account_voucher(osv.osv):
         line_ids = resolve_o2m_operations(cr, uid, line_pool, line_ids, ["amount"], context)
 
         total_tax = 0.0
-        net_tax = 0.0
         for line in line_ids:
             line_amount = 0.0
             line_amount = line.get('amount',0.0)

From fd8f46b39a29066cbb42f4090bd6a62770131e44 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Mon, 5 Nov 2012 12:50:21 +0530
Subject: [PATCH 017/143] [FIX]account_voucher : improved some code

bzr revid: mma@tinyerp.com-20121105072021-236ci5s510fx5deq
---
 addons/account_voucher/account_voucher.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index 32e8f79777f..cb4d702a750 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -384,7 +384,7 @@ class account_voucher(osv.osv):
                 for line in voucher.line_ids:
                     for tax_line in tax_pool.compute_all(cr, uid, tax, line.amount, 1).get('taxes', []):
                         total_tax += tax_line.get('amount', 0.0)
-                total += total_tax
+                    total += total_tax
             else:
                 for line in voucher.line_ids:
                     line_total = 0.0
@@ -427,9 +427,9 @@ class account_voucher(osv.osv):
                     tax = tax_pool.browse(cr, uid, taxes, context=context)
 
                 if not tax[0].price_include:
-                    for tax_line in tax_pool.compute_all(cr, uid, tax, voucher_total, 1).get('taxes', []):
+                    for tax_line in tax_pool.compute_all(cr, uid, tax, line_amount, 1).get('taxes', []):
                         total_tax += tax_line.get('amount')
-                        total += total_tax
+
             voucher_total += line_amount
         total = voucher_total + total_tax
 

From 973d784810d1024e912a6d3b6ac032cd993bda26 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Mon, 5 Nov 2012 14:10:37 +0530
Subject: [PATCH 018/143] [FIX]account_voucher : improved code

bzr revid: mma@tinyerp.com-20121105084037-iuqq0l9lln1o9e4j
---
 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 cb4d702a750..2952809e02b 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -384,7 +384,7 @@ class account_voucher(osv.osv):
                 for line in voucher.line_ids:
                     for tax_line in tax_pool.compute_all(cr, uid, tax, line.amount, 1).get('taxes', []):
                         total_tax += tax_line.get('amount', 0.0)
-                    total += total_tax
+                total += total_tax
             else:
                 for line in voucher.line_ids:
                     line_total = 0.0

From 17eeb7e7405deb78567d30f1233d129bd91e21ea Mon Sep 17 00:00:00 2001
From: Vijaykumar Baladaniya <vba@tinyerp.com>
Date: Mon, 5 Nov 2012 14:22:13 +0530
Subject: [PATCH 019/143] [FIX]Give a access rule.

bzr revid: vba@tinyerp.com-20121105085213-26mi5y3t134o80ci
---
 addons/note/security/ir.rule.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/addons/note/security/ir.rule.xml b/addons/note/security/ir.rule.xml
index 1195314cc9e..b0c79561355 100644
--- a/addons/note/security/ir.rule.xml
+++ b/addons/note/security/ir.rule.xml
@@ -6,6 +6,10 @@
     <field model="ir.model" ref="model_note_note" name="model_id"/>
     <field name="domain_force">[('message_follower_ids','=',user.partner_id.id)]</field>
     <field eval="True" name="global"/>
+    <field eval="1" name="perm_unlink"/>
+    <field eval="0" name="perm_write"/>
+    <field eval="1" name="perm_read"/>
+    <field eval="0" name="perm_create"/>
   </record>
 
   <record id="note_stage_rule_global" model="ir.rule">

From 94b2c85d2a44382fad53b815ef65237f219f87e1 Mon Sep 17 00:00:00 2001
From: "Rifakat (OpenERP)" <>
Date: Mon, 5 Nov 2012 16:02:27 +0530
Subject: [PATCH 020/143] [FIX]l10n_be_coda :  added spaces in account number
 while doing the check, systems stores account number with spaces and coda
 file account number does not have space

bzr revid: mma@tinyerp.com-20121105103227-9465j8pqr1ludw8u
---
 addons/l10n_be_coda/wizard/account_coda_import.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/l10n_be_coda/wizard/account_coda_import.py b/addons/l10n_be_coda/wizard/account_coda_import.py
index ca89cf78325..46c545f0f48 100644
--- a/addons/l10n_be_coda/wizard/account_coda_import.py
+++ b/addons/l10n_be_coda/wizard/account_coda_import.py
@@ -28,6 +28,7 @@ import logging
 import re
 from traceback import format_exception
 from sys import exc_info
+from base_iban import base_iban
 _logger = logging.getLogger(__name__)
 
 class account_coda_import(osv.osv_memory):
@@ -398,6 +399,7 @@ class account_coda_import(osv.osv_memory):
                                 st_line['account_id'] = transfer_acc
                                 match = True
                             elif find_partner:
+                                counterparty_number = base_iban._pretty_iban(base_iban._format_iban(counterparty_number))
                                 bank_ids = partner_bank_obj.search(cr,uid,[('acc_number','=', counterparty_number)])
                         if not match and find_partner and bank_ids:
                             if len(bank_ids) > 1:

From ffe51235d3f29c65e998083f497bd28139fa5ec8 Mon Sep 17 00:00:00 2001
From: "Rifakat (OpenERP)" <>
Date: Mon, 5 Nov 2012 16:06:12 +0530
Subject: [PATCH 021/143] [FIX]product_margin :fix computation of
 expected_margin and normal_cost in query, it shows wrong value while product
 id and product_tmpl_id are different

bzr revid: mma@tinyerp.com-20121105103612-hoxabvlk083tqsr5
---
 addons/product_margin/product_margin.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/addons/product_margin/product_margin.py b/addons/product_margin/product_margin.py
index 4c033a4a6ca..c06c4971474 100644
--- a/addons/product_margin/product_margin.py
+++ b/addons/product_margin/product_margin.py
@@ -56,11 +56,12 @@ class product_product(osv.osv):
                     sum(l.price_unit * l.quantity)/sum(l.quantity) as avg_unit_price,
                     sum(l.quantity) as num_qty,
                     sum(l.quantity * (l.price_subtotal/l.quantity)) as total,
-                    sum(l.quantity * product.list_price) as sale_expected,
-                    sum(l.quantity * product.standard_price) as normal_cost
+                    sum(l.quantity * pt.list_price) as sale_expected,
+                    sum(l.quantity * pt.standard_price) as normal_cost
                 from account_invoice_line l
                 left join account_invoice i on (l.invoice_id = i.id)
-                left join product_template product on (product.id=l.product_id)
+                left join product_product product on (product.id=l.product_id)
+                left join product_template pt on (pt.id=product.product_tmpl_id)
                 where l.product_id = %s and i.state in %s and i.type IN %s and (i.date_invoice IS NULL or (i.date_invoice>=%s and i.date_invoice<=%s))
                 """
             invoice_types = ('out_invoice', 'in_refund')

From ff270a57805cc5c65bf245fbb8e8c42f3de49982 Mon Sep 17 00:00:00 2001
From: "Rifakat (OpenERP)" <>
Date: Mon, 5 Nov 2012 18:19:00 +0530
Subject: [PATCH 022/143] [FIX]stock :  translation for string INV is there in
 Dutch language but it does not displayed for Journal entries posted through
 inventory

bzr revid: mma@tinyerp.com-20121105124900-6arlp9og3d9jef9e
---
 addons/stock/stock.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 9fb0c9b68aa..2dfa843bf2c 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -2875,7 +2875,7 @@ class stock_inventory(osv.osv):
                 if change:
                     location_id = line.product_id.product_tmpl_id.property_stock_inventory.id
                     value = {
-                        'name': 'INV:' + str(line.inventory_id.id) + ':' + line.inventory_id.name,
+                        'name': _('INV: %s') % str(line.inventory_id.id) + ':' + line.inventory_id.name,
                         'product_id': line.product_id.id,
                         'product_uom': line.product_uom.id,
                         'prodlot_id': lot_id,

From 3e2017b8c066ec31346b07a617945d7056cb295b Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Tue, 6 Nov 2012 14:36:18 +0530
Subject: [PATCH 023/143] [IMP] account: did proper formating for comparison
 tab on wizard

bzr revid: cha@tinyerp.com-20121106090618-4fnxr5ld15x5mtxx
---
 .../wizard/account_financial_report_view.xml  | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/addons/account/wizard/account_financial_report_view.xml b/addons/account/wizard/account_financial_report_view.xml
index 8388284be4a..507809e1961 100644
--- a/addons/account/wizard/account_financial_report_view.xml
+++ b/addons/account/wizard/account_financial_report_view.xml
@@ -14,15 +14,19 @@
                 </xpath>
                 <xpath expr="//notebook/page[@string='Filters']" position="after">
                     <page string="Comparison" attrs="{'invisible': [('enable_filter','=',False)]}">
-                        <field name="label_filter" attrs="{'required': [('enable_filter', '=', True)]}"/>
-                        <field name="fiscalyear_id_cmp"/><newline/>
-                        <field name="filter_cmp"/>
-                        <separator string="Dates" colspan="4"/>
-                        <field name="date_from_cmp" attrs="{'readonly':[('filter_cmp', '!=', 'filter_date')], 'required':[('filter_cmp', '=', 'filter_date')]}" colspan="4"/>
-                        <field name="date_to_cmp" attrs="{'readonly':[('filter_cmp', '!=', 'filter_date')], 'required':[('filter_cmp', '=', 'filter_date')]}"  colspan="4"/>
-                        <separator string="Periods" colspan="4"/>
-                        <field name="period_from_cmp" domain="[('fiscalyear_id', '=', fiscalyear_id_cmp)]" attrs="{'readonly':[('filter_cmp','!=','filter_period')], 'required':[('filter_cmp', '=', 'filter_period')]}" colspan="4"/>
-                        <field name="period_to_cmp" domain="[('fiscalyear_id', '=', fiscalyear_id_cmp)]" attrs="{'readonly':[('filter_cmp','!=','filter_period')], 'required':[('filter_cmp', '=', 'filter_period')]}" colspan="4"/>
+                        <group>
+                            <field name="label_filter" attrs="{'required': [('enable_filter', '=', True)]}"/>
+                            <field name="fiscalyear_id_cmp"/><newline/>
+                            <field name="filter_cmp"/>
+                        </group>
+                        <group string="Dates" attrs="{'invisible':[('filter_cmp', '!=', 'filter_date')]}">
+                            <field name="date_from_cmp" attrs="{'required':[('filter_cmp', '=', 'filter_date')]}"/>
+                            <field name="date_to_cmp" attrs="{'required':[('filter_cmp', '=', 'filter_date')]}"/>
+                        </group>
+                        <group string="Periods" attrs="{'invisible':[('filter_cmp', '!=', 'filter_period')]}">
+                            <field name="period_from_cmp" domain="[('fiscalyear_id', '=', fiscalyear_id_cmp)]" attrs="{'required':[('filter_cmp', '=', 'filter_period')]}"/>
+                            <field name="period_to_cmp" domain="[('fiscalyear_id', '=', fiscalyear_id_cmp)]" attrs="{'required':[('filter_cmp', '=', 'filter_period')]}"/>
+                        </group>
                    </page>
                 </xpath>
                 <xpath expr="//notebook/page[@string='Journals']" position="replace">

From 0ede04eb0ca8a1b570105d79b27fc87d3d29fc49 Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Tue, 6 Nov 2012 16:10:23 +0530
Subject: [PATCH 024/143] [IMP] account: hide journal tab from trial balance
 wizard

bzr revid: cha@tinyerp.com-20121106104023-sxjez34gdctem7vt
---
 addons/account/wizard/account_report_account_balance_view.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/account/wizard/account_report_account_balance_view.xml b/addons/account/wizard/account_report_account_balance_view.xml
index b2c8ccd3011..3609ee3b4de 100644
--- a/addons/account/wizard/account_report_account_balance_view.xml
+++ b/addons/account/wizard/account_report_account_balance_view.xml
@@ -9,8 +9,7 @@
           <field name="inherit_id" ref="account_common_report_view" />
           <field name="arch" type="xml">
             <data>
-            <xpath expr="//field[@name='journal_ids']" position="replace">
-                <field name="journal_ids" colspan="4" nolabel="1" required="0" readonly="1"/>
+            <xpath expr="//notebook/page[@string='Journals']" position="replace">
             </xpath>
             <xpath expr="//field[@name='target_move']" position="after">
                 <field name="display_account"/>

From 207675a1743cdd60ba459d4e119af953096dbf87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 6 Nov 2012 12:54:20 +0100
Subject: [PATCH 025/143] [REN] html_sanitize -> mail, to have a central file
 for methods about mail (html sanitizing, html management, emails related
 functions, ...).

bzr revid: tde@openerp.com-20121106115420-1h8mvzohol9zjysa
---
 openerp/tests/__init__.py                     |  4 +--
 .../{test_html_sanitize.py => test_mail.py}   | 36 ++++++++++++++++---
 openerp/tools/__init__.py                     |  2 +-
 openerp/tools/{html_sanitize.py => mail.py}   |  0
 4 files changed, 35 insertions(+), 7 deletions(-)
 rename openerp/tests/{test_html_sanitize.py => test_mail.py} (67%)
 rename openerp/tools/{html_sanitize.py => mail.py} (100%)

diff --git a/openerp/tests/__init__.py b/openerp/tests/__init__.py
index c4b77a606a9..8f16fc76650 100644
--- a/openerp/tests/__init__.py
+++ b/openerp/tests/__init__.py
@@ -8,7 +8,7 @@ Tests can be explicitely added to the `fast_suite` or `checks` lists or not.
 See the :ref:`test-framework` section in the :ref:`features` list.
 """
 
-from . import test_expression, test_html_sanitize, test_ir_sequence, test_orm,\
+from . import test_expression, test_mail, test_ir_sequence, test_orm,\
               test_fields, test_basecase, \
               test_view_validation, test_uninstall, test_misc, test_db_cursor
 
@@ -18,7 +18,7 @@ fast_suite = [
 
 checks = [
     test_expression,
-    test_html_sanitize,
+    test_mail,
     test_db_cursor,
     test_orm,
     test_fields,
diff --git a/openerp/tests/test_html_sanitize.py b/openerp/tests/test_mail.py
similarity index 67%
rename from openerp/tests/test_html_sanitize.py
rename to openerp/tests/test_mail.py
index cb46b325144..14d49a3eefc 100755
--- a/openerp/tests/test_html_sanitize.py
+++ b/openerp/tests/test_mail.py
@@ -1,5 +1,25 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Business Applications
+#    Copyright (c) 2012-TODAY OpenERP S.A. <http://openerp.com>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
 import unittest
 from openerp.tools.html_sanitize import html_sanitize
 
@@ -21,21 +41,29 @@ test12</font></div><div><font color="#1f1f1f" face="monospace" size="2"><br></fo
 <a href="javascript:alert('malicious code')">test link</a>
 """
 
+
 class TestSanitizer(unittest.TestCase):
+    # TDE note: could be improved by actually checking the output
 
     def test_simple(self):
         x = "yop"
         self.assertEqual(x, html_sanitize(x))
-        
+
     def test_trailing_text(self):
         x = 'lala<p>yop</p>xxx'
         self.assertEqual(x, html_sanitize(x))
-    
+
     def test_no_exception(self):
         html_sanitize(test_case)
-        
+
     def test_unicode(self):
         html_sanitize("Merci à l'intérêt pour notre produit.nous vous contacterons bientôt. Merci")
 
+
+class TestCleaner(unittest.TestCase):
+
+    def test(self):
+        print 'poinpoinpoinponi'
+
 if __name__ == '__main__':
-    unittest.main()
\ No newline at end of file
+    unittest.main()
diff --git a/openerp/tools/__init__.py b/openerp/tools/__init__.py
index a0ca411a9df..af14189bbae 100644
--- a/openerp/tools/__init__.py
+++ b/openerp/tools/__init__.py
@@ -33,7 +33,7 @@ from pdf_utils import *
 from yaml_import import *
 from sql import *
 from float_utils import *
-from html_sanitize import *
+from mail import *
 
 #.apidoc title: Tools
 
diff --git a/openerp/tools/html_sanitize.py b/openerp/tools/mail.py
similarity index 100%
rename from openerp/tools/html_sanitize.py
rename to openerp/tools/mail.py

From da6ad1e27c827d08e35099e051559dd09c0f8fc6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 6 Nov 2012 12:57:44 +0100
Subject: [PATCH 026/143] [REF] tools: moved email and mail related functions
 from misc to mail.

bzr revid: tde@openerp.com-20121106115744-pcxgyqv3lf8zfedw
---
 openerp/tools/mail.py | 163 +++++++++++++++++++++++++++++++++++++++++
 openerp/tools/misc.py | 167 ------------------------------------------
 2 files changed, 163 insertions(+), 167 deletions(-)

diff --git a/openerp/tools/mail.py b/openerp/tools/mail.py
index 6ea7b90e2ba..6509c508900 100644
--- a/openerp/tools/mail.py
+++ b/openerp/tools/mail.py
@@ -90,3 +90,166 @@ def append_to(elements, dest_node):
                 children[-1].tail = element
         else:
             dest_node.append(element)
+
+
+#----------------------------------------------------------
+# Emails
+#----------------------------------------------------------
+
+email_re = re.compile(r"""
+    ([a-zA-Z][\w\.-]*[a-zA-Z0-9]     # username part
+    @                                # mandatory @ sign
+    [a-zA-Z0-9][\w\.-]*              # domain must start with a letter ... Ged> why do we include a 0-9 then?
+     \.
+     [a-z]{2,3}                      # TLD
+    )
+    """, re.VERBOSE)
+res_re = re.compile(r"\[([0-9]+)\]", re.UNICODE)
+command_re = re.compile("^Set-([a-z]+) *: *(.+)$", re.I + re.UNICODE)
+
+# Updated in 7.0 to match the model name as well
+# Typical form of references is <timestamp-openerp-record_id-model_name@domain>
+# group(1) = the record ID ; group(2) = the model (if any) ; group(3) = the domain
+reference_re = re.compile("<.*-open(?:object|erp)-(\\d+)(?:-([\w.]+))?.*@(.*)>", re.UNICODE)
+
+def html2plaintext(html, body_id=None, encoding='utf-8'):
+    """ From an HTML text, convert the HTML to plain text.
+    If @param body_id is provided then this is the tag where the
+    body (not necessarily <body>) starts.
+    """
+    ## (c) Fry-IT, www.fry-it.com, 2007
+    ## <peter@fry-it.com>
+    ## download here: http://www.peterbe.com/plog/html2plaintext
+
+    html = ustr(html)
+
+    from lxml.etree import tostring, fromstring, HTMLParser
+    tree = fromstring(html, parser=HTMLParser())
+
+    if body_id is not None:
+        source = tree.xpath('//*[@id=%s]'%(body_id,))
+    else:
+        source = tree.xpath('//body')
+    if len(source):
+        tree = source[0]
+
+    url_index = []
+    i = 0
+    for link in tree.findall('.//a'):
+        url = link.get('href')
+        if url:
+            i += 1
+            link.tag = 'span'
+            link.text = '%s [%s]' % (link.text, i)
+            url_index.append(url)
+
+    html = ustr(tostring(tree, encoding=encoding))
+
+    html = html.replace('<strong>','*').replace('</strong>','*')
+    html = html.replace('<b>','*').replace('</b>','*')
+    html = html.replace('<h3>','*').replace('</h3>','*')
+    html = html.replace('<h2>','**').replace('</h2>','**')
+    html = html.replace('<h1>','**').replace('</h1>','**')
+    html = html.replace('<em>','/').replace('</em>','/')
+    html = html.replace('<tr>', '\n')
+    html = html.replace('</p>', '\n')
+    html = re.sub('<br\s*/?>', '\n', html)
+    html = re.sub('<.*?>', ' ', html)
+    html = html.replace(' ' * 2, ' ')
+
+    # strip all lines
+    html = '\n'.join([x.strip() for x in html.splitlines()])
+    html = html.replace('\n' * 2, '\n')
+
+    for i, url in enumerate(url_index):
+        if i == 0:
+            html += '\n\n'
+        html += ustr('[%s] %s\n') % (i+1, url)
+
+    return html
+
+def generate_tracking_message_id(res_id):
+    """Returns a string that can be used in the Message-ID RFC822 header field
+    
+       Used to track the replies related to a given object thanks to the "In-Reply-To"
+       or "References" fields that Mail User Agents will set.
+    """
+    try:
+        rnd = random.SystemRandom().random()
+    except NotImplementedError:
+        rnd = random.random()
+    rndstr = ("%.15f" % rnd)[2:] 
+    return "<%.15f.%s-openerp-%s@%s>" % (time.time(), rndstr, res_id, socket.gethostname())
+
+def email_send(email_from, email_to, subject, body, email_cc=None, email_bcc=None, reply_to=False,
+               attachments=None, message_id=None, references=None, openobject_id=False, debug=False, subtype='plain', headers=None,
+               smtp_server=None, smtp_port=None, ssl=False, smtp_user=None, smtp_password=None, cr=None, uid=None):
+    """Low-level function for sending an email (deprecated).
+
+    :deprecate: since OpenERP 6.1, please use ir.mail_server.send_email() instead. 
+    :param email_from: A string used to fill the `From` header, if falsy,
+                       config['email_from'] is used instead.  Also used for
+                       the `Reply-To` header if `reply_to` is not provided
+    :param email_to: a sequence of addresses to send the mail to.
+    """
+
+    # If not cr, get cr from current thread database
+    if not cr:
+        db_name = getattr(threading.currentThread(), 'dbname', None)
+        if db_name:
+            cr = pooler.get_db_only(db_name).cursor()
+        else:
+            raise Exception("No database cursor found, please pass one explicitly")
+
+    # Send Email
+    try:
+        mail_server_pool = pooler.get_pool(cr.dbname).get('ir.mail_server')
+        res = False
+        # Pack Message into MIME Object
+        email_msg = mail_server_pool.build_email(email_from, email_to, subject, body, email_cc, email_bcc, reply_to,
+                   attachments, message_id, references, openobject_id, subtype, headers=headers)
+
+        res = mail_server_pool.send_email(cr, uid or 1, email_msg, mail_server_id=None,
+                       smtp_server=smtp_server, smtp_port=smtp_port, smtp_user=smtp_user, smtp_password=smtp_password,
+                       smtp_encryption=('ssl' if ssl else None), smtp_debug=debug)
+    except Exception:
+        _logger.exception("tools.email_send failed to deliver email")
+        return False
+    finally:
+        cr.close()
+    return res
+
+def email_split(text):
+    """ Return a list of the email addresses found in ``text`` """
+    if not text: return []
+    return re.findall(r'([^ ,<@]+@[^> ,]+)', text)
+
+def append_content_to_html(html, content, plaintext=True):
+    """Append extra content at the end of an HTML snippet, trying
+       to locate the end of the HTML document (</body>, </html>, or
+       EOF), and wrapping the provided content in a <pre/> block
+       unless ``plaintext`` is False. A side-effect of this
+       method is to coerce all HTML tags to lowercase in ``html``,
+       and strip enclosing <html> or <body> tags in content if
+       ``plaintext`` is False.
+       
+       :param str html: html tagsoup (doesn't have to be XHTML)
+       :param str content: extra content to append
+       :param bool plaintext: whether content is plaintext and should
+           be wrapped in a <pre/> tag.
+    """
+    html = ustr(html)
+    if plaintext:
+        content = u'\n<pre>%s</pre>\n' % ustr(content)
+    else:
+        content = re.sub(r'(?i)(</?html.*>|</?body.*>|<!\W*DOCTYPE.*>)', '', content)
+        content = u'\n%s\n'% ustr(content)
+    # Force all tags to lowercase
+    html = re.sub(r'(</?)\W*(\w+)([ >])',
+        lambda m: '%s%s%s' % (m.group(1),m.group(2).lower(),m.group(3)), html)
+    insert_location = html.find('</body>')
+    if insert_location == -1:
+        insert_location = html.find('</html>')
+    if insert_location == -1:
+        return '%s%s' % (html, content)
+    return '%s%s%s' % (html[:insert_location], content, html[insert_location:])  
diff --git a/openerp/tools/misc.py b/openerp/tools/misc.py
index caf28e54481..73c5315d4ed 100644
--- a/openerp/tools/misc.py
+++ b/openerp/tools/misc.py
@@ -43,12 +43,7 @@ from itertools import islice, izip
 from lxml import etree
 from which import which
 from threading import local
-try:
-    from html2text import html2text
-except ImportError:
-    html2text = None
 
-import openerp.loglevels as loglevels
 import openerp.pooler as pooler
 from config import config
 from cache import *
@@ -274,168 +269,6 @@ def reverse_enumerate(l):
     """
     return izip(xrange(len(l)-1, -1, -1), reversed(l))
 
-#----------------------------------------------------------
-# Emails
-#----------------------------------------------------------
-email_re = re.compile(r"""
-    ([a-zA-Z][\w\.-]*[a-zA-Z0-9]     # username part
-    @                                # mandatory @ sign
-    [a-zA-Z0-9][\w\.-]*              # domain must start with a letter ... Ged> why do we include a 0-9 then?
-     \.
-     [a-z]{2,3}                      # TLD
-    )
-    """, re.VERBOSE)
-res_re = re.compile(r"\[([0-9]+)\]", re.UNICODE)
-command_re = re.compile("^Set-([a-z]+) *: *(.+)$", re.I + re.UNICODE)
-
-# Updated in 7.0 to match the model name as well
-# Typical form of references is <timestamp-openerp-record_id-model_name@domain>
-# group(1) = the record ID ; group(2) = the model (if any) ; group(3) = the domain
-reference_re = re.compile("<.*-open(?:object|erp)-(\\d+)(?:-([\w.]+))?.*@(.*)>", re.UNICODE)
-
-def html2plaintext(html, body_id=None, encoding='utf-8'):
-    """ From an HTML text, convert the HTML to plain text.
-    If @param body_id is provided then this is the tag where the
-    body (not necessarily <body>) starts.
-    """
-    ## (c) Fry-IT, www.fry-it.com, 2007
-    ## <peter@fry-it.com>
-    ## download here: http://www.peterbe.com/plog/html2plaintext
-
-    html = ustr(html)
-
-    from lxml.etree import tostring, fromstring, HTMLParser
-    tree = fromstring(html, parser=HTMLParser())
-
-    if body_id is not None:
-        source = tree.xpath('//*[@id=%s]'%(body_id,))
-    else:
-        source = tree.xpath('//body')
-    if len(source):
-        tree = source[0]
-
-    url_index = []
-    i = 0
-    for link in tree.findall('.//a'):
-        url = link.get('href')
-        if url:
-            i += 1
-            link.tag = 'span'
-            link.text = '%s [%s]' % (link.text, i)
-            url_index.append(url)
-
-    html = ustr(tostring(tree, encoding=encoding))
-
-    html = html.replace('<strong>','*').replace('</strong>','*')
-    html = html.replace('<b>','*').replace('</b>','*')
-    html = html.replace('<h3>','*').replace('</h3>','*')
-    html = html.replace('<h2>','**').replace('</h2>','**')
-    html = html.replace('<h1>','**').replace('</h1>','**')
-    html = html.replace('<em>','/').replace('</em>','/')
-    html = html.replace('<tr>', '\n')
-    html = html.replace('</p>', '\n')
-    html = re.sub('<br\s*/?>', '\n', html)
-    html = re.sub('<.*?>', ' ', html)
-    html = html.replace(' ' * 2, ' ')
-
-    # strip all lines
-    html = '\n'.join([x.strip() for x in html.splitlines()])
-    html = html.replace('\n' * 2, '\n')
-
-    for i, url in enumerate(url_index):
-        if i == 0:
-            html += '\n\n'
-        html += ustr('[%s] %s\n') % (i+1, url)
-
-    return html
-
-def generate_tracking_message_id(res_id):
-    """Returns a string that can be used in the Message-ID RFC822 header field
-    
-       Used to track the replies related to a given object thanks to the "In-Reply-To"
-       or "References" fields that Mail User Agents will set.
-    """
-    try:
-        rnd = random.SystemRandom().random()
-    except NotImplementedError:
-        rnd = random.random()
-    rndstr = ("%.15f" % rnd)[2:] 
-    return "<%.15f.%s-openerp-%s@%s>" % (time.time(), rndstr, res_id, socket.gethostname())
-
-def email_send(email_from, email_to, subject, body, email_cc=None, email_bcc=None, reply_to=False,
-               attachments=None, message_id=None, references=None, openobject_id=False, debug=False, subtype='plain', headers=None,
-               smtp_server=None, smtp_port=None, ssl=False, smtp_user=None, smtp_password=None, cr=None, uid=None):
-    """Low-level function for sending an email (deprecated).
-
-    :deprecate: since OpenERP 6.1, please use ir.mail_server.send_email() instead. 
-    :param email_from: A string used to fill the `From` header, if falsy,
-                       config['email_from'] is used instead.  Also used for
-                       the `Reply-To` header if `reply_to` is not provided
-    :param email_to: a sequence of addresses to send the mail to.
-    """
-
-    # If not cr, get cr from current thread database
-    if not cr:
-        db_name = getattr(threading.currentThread(), 'dbname', None)
-        if db_name:
-            cr = pooler.get_db_only(db_name).cursor()
-        else:
-            raise Exception("No database cursor found, please pass one explicitly")
-
-    # Send Email
-    try:
-        mail_server_pool = pooler.get_pool(cr.dbname).get('ir.mail_server')
-        res = False
-        # Pack Message into MIME Object
-        email_msg = mail_server_pool.build_email(email_from, email_to, subject, body, email_cc, email_bcc, reply_to,
-                   attachments, message_id, references, openobject_id, subtype, headers=headers)
-
-        res = mail_server_pool.send_email(cr, uid or 1, email_msg, mail_server_id=None,
-                       smtp_server=smtp_server, smtp_port=smtp_port, smtp_user=smtp_user, smtp_password=smtp_password,
-                       smtp_encryption=('ssl' if ssl else None), smtp_debug=debug)
-    except Exception:
-        _logger.exception("tools.email_send failed to deliver email")
-        return False
-    finally:
-        cr.close()
-    return res
-
-def email_split(text):
-    """ Return a list of the email addresses found in ``text`` """
-    if not text: return []
-    return re.findall(r'([^ ,<@]+@[^> ,]+)', text)
-
-def append_content_to_html(html, content, plaintext=True):
-    """Append extra content at the end of an HTML snippet, trying
-       to locate the end of the HTML document (</body>, </html>, or
-       EOF), and wrapping the provided content in a <pre/> block
-       unless ``plaintext`` is False. A side-effect of this
-       method is to coerce all HTML tags to lowercase in ``html``,
-       and strip enclosing <html> or <body> tags in content if
-       ``plaintext`` is False.
-       
-       :param str html: html tagsoup (doesn't have to be XHTML)
-       :param str content: extra content to append
-       :param bool plaintext: whether content is plaintext and should
-           be wrapped in a <pre/> tag.
-    """
-    html = ustr(html)
-    if plaintext:
-        content = u'\n<pre>%s</pre>\n' % ustr(content)
-    else:
-        content = re.sub(r'(?i)(</?html.*>|</?body.*>|<!\W*DOCTYPE.*>)', '', content)
-        content = u'\n%s\n'% ustr(content)
-    # Force all tags to lowercase
-    html = re.sub(r'(</?)\W*(\w+)([ >])',
-        lambda m: '%s%s%s' % (m.group(1),m.group(2).lower(),m.group(3)), html)
-    insert_location = html.find('</body>')
-    if insert_location == -1:
-        insert_location = html.find('</html>')
-    if insert_location == -1:
-        return '%s%s' % (html, content)
-    return '%s%s%s' % (html[:insert_location], content, html[insert_location:])  
-
-
 #----------------------------------------------------------
 # SMS
 #----------------------------------------------------------

From 5f53f5253bba48a4ee52724317d3117b1c0dbca2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 6 Nov 2012 12:58:51 +0100
Subject: [PATCH 027/143] [FIX] tools: some import cleaning and fixing.

bzr revid: tde@openerp.com-20121106115851-5f5sfhtp2g3qrm1o
---
 openerp/tools/mail.py | 2 ++
 openerp/tools/misc.py | 3 ---
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/openerp/tools/mail.py b/openerp/tools/mail.py
index 6509c508900..87e5e069fd8 100644
--- a/openerp/tools/mail.py
+++ b/openerp/tools/mail.py
@@ -20,7 +20,9 @@
 ##############################################################################
 
 import lxml.html
+import openerp.pooler as pooler
 import operator
+import random
 import re
 
 from openerp.loglevels import ustr
diff --git a/openerp/tools/misc.py b/openerp/tools/misc.py
index 73c5315d4ed..15af8967409 100644
--- a/openerp/tools/misc.py
+++ b/openerp/tools/misc.py
@@ -30,8 +30,6 @@ from functools import wraps
 import subprocess
 import logging
 import os
-import random
-import re
 import socket
 import sys
 import threading
@@ -44,7 +42,6 @@ from lxml import etree
 from which import which
 from threading import local
 
-import openerp.pooler as pooler
 from config import config
 from cache import *
 

From 53a6056a352fc2b476a128bfa583836dab6f73ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 6 Nov 2012 13:11:34 +0100
Subject: [PATCH 028/143] =?UTF-8?q?[FIX]=20email=5Ftemplate:=20html=5Fsani?=
 =?UTF-8?q?tize=20not=20in=20html=5Fsanitize,=20but=20in=20mail.=C3=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

bzr revid: tde@openerp.com-20121106121134-8tws1ckwh0mhpiwm
---
 addons/email_template/email_template.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py
index 73337d92ab0..6965fa0c222 100644
--- a/addons/email_template/email_template.py
+++ b/addons/email_template/email_template.py
@@ -28,7 +28,7 @@ from osv import osv
 from osv import fields
 import tools
 from tools.translate import _
-from tools.html_sanitize import html_sanitize
+from tools.mail import html_sanitize
 from tools import append_content_to_html
 from urllib import quote as quote
 _logger = logging.getLogger(__name__)

From 92c97ecd904fa407d4fd462cd3b818cdc2f6aa9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 6 Nov 2012 13:15:31 +0100
Subject: [PATCH 029/143] [REF] mail: tests: moved test class with mockup in a
 dedicated file, to clean the directoy structure.

bzr revid: tde@openerp.com-20121106121531-0bmki7skb8b1xc8y
---
 addons/mail/tests/__init__.py         |  1 +
 addons/mail/tests/test_mail.py        | 37 ++----------------
 addons/mail/tests/test_mail_mockup.py | 54 +++++++++++++++++++++++++++
 3 files changed, 58 insertions(+), 34 deletions(-)
 create mode 100644 addons/mail/tests/test_mail_mockup.py

diff --git a/addons/mail/tests/__init__.py b/addons/mail/tests/__init__.py
index 2d48fa233c4..3dcddf769e8 100644
--- a/addons/mail/tests/__init__.py
+++ b/addons/mail/tests/__init__.py
@@ -18,6 +18,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+
 from . import test_mail, test_mail_access_rights
 
 checks = [
diff --git a/addons/mail/tests/test_mail.py b/addons/mail/tests/test_mail.py
index 6af0aba633c..5e19a8f0ce4 100644
--- a/addons/mail/tests/test_mail.py
+++ b/addons/mail/tests/test_mail.py
@@ -21,8 +21,9 @@
 
 import tools
 
+from openerp.addons.mail.tests import test_mail
 from openerp.tests import common
-from openerp.tools.html_sanitize import html_sanitize
+from openerp.tools.mail import html_sanitize
 
 MAIL_TEMPLATE = """Return-Path: <whatever-2a840@postmaster.twitter.com>
 To: {to}
@@ -84,39 +85,7 @@ Sylvie
 """
 
 
-class TestMailMockups(common.TransactionCase):
-
-    def _mock_smtp_gateway(self, *args, **kwargs):
-        return True
-
-    def _init_mock_build_email(self):
-        self._build_email_args_list = []
-        self._build_email_kwargs_list = []
-
-    def _mock_build_email(self, *args, **kwargs):
-        """ Mock build_email to be able to test its values. Store them into
-            some internal variable for latter processing. """
-        self._build_email_args_list.append(args)
-        self._build_email_kwargs_list.append(kwargs)
-        return self._build_email(*args, **kwargs)
-
-    def setUp(self):
-        super(TestMailMockups, self).setUp()
-        # Install mock SMTP gateway
-        self._init_mock_build_email()
-        self._build_email = self.registry('ir.mail_server').build_email
-        self.registry('ir.mail_server').build_email = self._mock_build_email
-        self._send_email = self.registry('ir.mail_server').send_email
-        self.registry('ir.mail_server').send_email = self._mock_smtp_gateway
-
-    def tearDown(self):
-        # Remove mocks
-        self.registry('ir.mail_server').build_email = self._build_email
-        self.registry('ir.mail_server').send_email = self._send_email
-        super(TestMailMockups, self).tearDown()
-
-
-class test_mail(TestMailMockups):
+class test_mail(test_mail.TestMailMockups):
 
     def _mock_send_get_mail_body(self, *args, **kwargs):
         # def _send_get_mail_body(self, cr, uid, mail, partner=None, context=None)
diff --git a/addons/mail/tests/test_mail_mockup.py b/addons/mail/tests/test_mail_mockup.py
new file mode 100644
index 00000000000..cba04a0c6b3
--- /dev/null
+++ b/addons/mail/tests/test_mail_mockup.py
@@ -0,0 +1,54 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Business Applications
+#    Copyright (c) 2012-TODAY OpenERP S.A. <http://openerp.com>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from openerp.tests import common
+
+
+class TestMailMockups(common.TransactionCase):
+
+    def _mock_smtp_gateway(self, *args, **kwargs):
+        return True
+
+    def _init_mock_build_email(self):
+        self._build_email_args_list = []
+        self._build_email_kwargs_list = []
+
+    def _mock_build_email(self, *args, **kwargs):
+        """ Mock build_email to be able to test its values. Store them into
+            some internal variable for latter processing. """
+        self._build_email_args_list.append(args)
+        self._build_email_kwargs_list.append(kwargs)
+        return self._build_email(*args, **kwargs)
+
+    def setUp(self):
+        super(TestMailMockups, self).setUp()
+        # Install mock SMTP gateway
+        self._init_mock_build_email()
+        self._build_email = self.registry('ir.mail_server').build_email
+        self.registry('ir.mail_server').build_email = self._mock_build_email
+        self._send_email = self.registry('ir.mail_server').send_email
+        self.registry('ir.mail_server').send_email = self._mock_smtp_gateway
+
+    def tearDown(self):
+        # Remove mocks
+        self.registry('ir.mail_server').build_email = self._build_email
+        self.registry('ir.mail_server').send_email = self._send_email
+        super(TestMailMockups, self).tearDown()

From 1d52a68dd95ff6add09966ac0ed807fda498e3b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 6 Nov 2012 13:17:37 +0100
Subject: [PATCH 030/143] [IMP] tools: mail: added html_cleaner, to clean html
 code to display in chatter (remove quotes, signatures, ...).

bzr revid: tde@openerp.com-20121106121737-ej57bijc7ypksu8v
---
 openerp/tools/mail.py | 58 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 58 insertions(+)

diff --git a/openerp/tools/mail.py b/openerp/tools/mail.py
index 87e5e069fd8..abd5d5e736a 100644
--- a/openerp/tools/mail.py
+++ b/openerp/tools/mail.py
@@ -19,6 +19,8 @@
 #
 ##############################################################################
 
+from lxml.html.soupparser import fromstring
+from lxml.etree import tostring
 import lxml.html
 import openerp.pooler as pooler
 import operator
@@ -94,6 +96,62 @@ def append_to(elements, dest_node):
             dest_node.append(element)
 
 
+#----------------------------------------------------------
+# HTML Cleaner
+#----------------------------------------------------------
+
+def html_email_clean(html):
+    """ html_email_clean: clean the html to display in the web client.
+        - strip email quotes (remove blockquote nodes)
+        - strip signatures (remove --\n{\n)Blahblah), by replacing <br> by
+            \n to avoid ignoring signatures converted into html
+    """
+    modified_html = ''
+
+    # 1. <br[ /]> -> \n, because otherwise the tree is obfuscated
+    br_tags = re.compile(r'([<]\s*br\s*\/?[>])')
+    idx = 0
+    for item in re.finditer(br_tags, html):
+        modified_html += html[idx:item.start()] + '\n'
+        idx = item.end()
+    modified_html += html[idx:]
+
+    # 2. form a tree, handle (currently ?) pure-text by enclosing them in a pre
+    root = fromstring(modified_html)
+    if not len(root) and root.text is None and root.tail is None:
+        modified_html = '<div>%s</div>' % modified_html
+        root = fromstring(modified_html)
+
+    # 3. remove blockquotes
+    quotes = [el for el in root.iterchildren(tag='blockquote')]
+    for node in quotes:
+        node.getparent().remove(node)
+
+    # 4. strip signatures
+    signature = re.compile(r'([-]{2}[\s]?[\r\n]{1,2}[^\z]+)')
+    for elem in root.getiterator():
+        if elem.text:
+            match = re.search(signature, elem.text)
+            if match:
+                elem.text = elem.text[:match.start()] + elem.text[match.end():]
+        if elem.tail:
+            match = re.search(signature, elem.tail)
+            if match:
+                elem.tail = elem.tail[:match.start()] + elem.tail[match.end():]
+
+    # 5. \n back to <br/>
+    for el in root.iterchildren():
+        if el.tag == 'pre':
+            continue
+        if el.text:
+            el.text = el.text.replace('\n', '<br />')
+        if el.tail:
+            el.tail = el.tail.replace('\n', '<br />')
+
+    new_html = tostring(root, pretty_print=True)
+    return new_html
+
+
 #----------------------------------------------------------
 # Emails
 #----------------------------------------------------------

From 56b0b518a22267f182155166beb8288286d94368 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 6 Nov 2012 13:18:24 +0100
Subject: [PATCH 031/143] [IMP] tests: moved append_to_html into right test
 file. Added basic struct and templates for testing html_email_clean.

bzr revid: tde@openerp.com-20121106121824-wb8qf9snma7qffqe
---
 openerp/tests/test_mail.py | 190 +++++++++++++++++++++++++++++++++++--
 openerp/tests/test_misc.py |  12 ---
 2 files changed, 183 insertions(+), 19 deletions(-)

diff --git a/openerp/tests/test_mail.py b/openerp/tests/test_mail.py
index 14d49a3eefc..26ccdd39b28 100755
--- a/openerp/tests/test_mail.py
+++ b/openerp/tests/test_mail.py
@@ -1,5 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
+# This test can be run stand-alone with something like:
+# > PYTHONPATH=. python2 openerp/tests/test_misc.py
 ##############################################################################
 #
 #    OpenERP, Open Source Business Applications
@@ -20,8 +22,8 @@
 #
 ##############################################################################
 
-import unittest
-from openerp.tools.html_sanitize import html_sanitize
+import unittest2
+from openerp.tools.mail import html_sanitize, html_email_clean, append_content_to_html
 
 test_case = """
 <font size="2" style="color: rgb(31, 31, 31); font-family: monospace; font-variant: normal; line-height: normal; ">test1</font>
@@ -41,8 +43,180 @@ test12</font></div><div><font color="#1f1f1f" face="monospace" size="2"><br></fo
 <a href="javascript:alert('malicious code')">test link</a>
 """
 
+GMAIL_REPLY = """<html>
+  <head>
+    <meta content="text/html; charset=ISO-8859-1"
+      http-equiv="Content-Type">
+  </head>
+  <body text="#000000" bgcolor="#FFFFFF">
+    <div class="moz-cite-prefix">R&eacute;ponse via thunderbird, classique.<br>
+      <br>
+      On 11/05/2012 10:51 AM, Thibault Delavall&eacute;e wrote:<br>
+    </div>
+    <blockquote
+cite="mid:CAP76m_WwG6=dY1aYYBJpJHvFtFk31YYjMoHoZaDRpPmacn+Ohw@mail.gmail.com"
+      type="cite">
+      <div>Plop !</div>
+      <ul>
+        <li>Vive les lapins rapides !<br>
+        </li>
+        <li>Nouille</li>
+        <li>Frites</li>
+      </ul>
+      <div><br>
+      </div>
+      <div>Clairement, hein ?</div>
+      -- <br>
+      Thibault Delavall&eacute;e<br>
+    </blockquote>
+    <br>
+    <br>
+    <pre class="moz-signature" cols="72">-- 
+Thibault Delavall&eacute;e
+</pre>
+  </body>
+</html>"""
 
-class TestSanitizer(unittest.TestCase):
+GAMIL_REPLY_SAN = """<div>R&#233;ponse via thunderbird, classique.<br><br>
+      On 11/05/2012 10:51 AM, Thibault Delavall&#233;e wrote:<br></div>
+    <blockquote>
+      <div>Plop !</div>
+      <ul><li>Vive les lapins rapides !<br></li>
+        <li>Nouille</li>
+        <li>Frites</li>
+      </ul><div><br></div>
+      <div>Clairement, hein ?</div>
+      -- <br>
+      Thibault Delavall&#233;e<br></blockquote>
+    <br><br><pre>-- 
+Thibault Delavall&#233;e
+</pre>"""
+
+
+
+
+GMAIL_REPLY2_SAN = """<div>Je r&#233;ponds, hop, via thunderbird. Mais
+      je vais r&#233;podnre aussi au milieu du thread.<br><br>
+      On 11/05/2012 10:53 AM, Thibault Delavall&#233;e wrote:<br></div>
+    <blockquote>Reply rapide de gmail.</blockquote>
+    <br>
+    Jamais.<br><br><blockquote>
+      <div><br><br><div>2012/11/5 Thibault Delavall&#233;e <span>&lt;<a href="mailto:tde@openerp.com">tde@openerp.com</a>&gt;</span><br><blockquote>
+            <div>
+              <div>R&#233;ponse via thunderbird, classique.
+                <div>
+                  <div><br><br>
+                    On 11/05/2012 10:51 AM, Thibault Delavall&#233;e wrote:<br></div>
+                </div>
+              </div>
+              <div>
+                <div>
+                  <blockquote>
+                    <div>Plop !</div>
+                    <ul><li>Vive les lapins rapides !<br></li>
+                      <li>Nouille</li>
+                    </ul></blockquote>
+                </div>
+              </div>
+            </div>
+          </blockquote>
+        </div>
+      </div>
+    </blockquote>
+    je rajotuerais bien pommes de terre dans la liste.<br><blockquote>
+      <div>
+        <div>
+          <blockquote>
+            <div>
+              <div>
+                <div>
+                  <blockquote>
+                    <ul><li>Frites</li>
+                    </ul><div><br></div>
+                    <div>Clairement, hein ?</div>
+                    -- <br>
+                    Thibault Delavall&#233;e<br></blockquote>
+                  <br><br></div>
+              </div>
+              <span><font>
+                  <pre>-- 
+Thibault Delavall&#233;e
+</pre>
+                </font></span></div>
+          </blockquote>
+        </div>
+        <br><br><div><br></div>
+        -- <br>
+        Thibault Delavall&#233;e<br></div>
+    </blockquote>
+    <br><br><pre>-- 
+Thibault Delavall&#233;e
+</pre>"""
+
+
+
+MAIL_TEMPLATE = """Hey XYZ,
+
+I've fixed that error and tested it a couple of times, it seems to be working
+fine now.
+
+On Fri, Feb 18, 2011 at 7:44 AM, Joe David <joe@david.com> wrote:
+Initial thread starts here...
+
+--
+Thanks
+joe@david.com
+"""
+
+GMAIL_TPL = """Salut Bob!
+Le 28 oct. 2012 à 00:02, Thibault Delavallée a écrit :
+
+> MatrixPlus le 22/02 ? Si c'est ce que tu dis, je suis intéressé, oui !
+
+Non, pas MatrixPlus, juste Matrix.
+
+Et oui, le 22/02 est la date qui doit vous convenir le deux.
+
+Bon, on tente de s’organiser un truc se samedi-là et je réserve des places.
+
+En passant, t’as contacté les gens du KdM pour le truc pour Bénisexe ?
+
+> 2012/10/27 Édouard Gilbert :
+>> Diantre, me disè-je en envoyant un message similaire à Koukouiles, que ne voilà un concert qui pourrait intéresser Thibault ?
+>> 
+>> L’ONL donne, en février et à Lille, Matrix en ciné-concert. Il passe le film sans musique mais c’est pas grave parce qu’il y a un orchestre qui la joue en même temps. Intéressé ?
+>> 
+>> On peut trouver plus d’info sur le site de l’ONL, onlille.com , mais il est tellement mal foutu que je ne trouve pas de lien direct. Je te laisse chercher.
+>> 
+>> Édouard GILBERT
+>> edouard.gilbert@gmail.com
+>> 
+> 
+> 
+> 
+> -- 
+> Thibault Delavallée
+
+Édouard GILBERT
+edouard.gilbert@gmail.com
+"""
+
+
+class TestAppendContentToHtml(unittest2.TestCase):
+    """ Test some of our generic utility functions """
+
+    def test_append_to_html(self):
+        test_samples = [
+            ('<!DOCTYPE...><HTML encoding="blah">some <b>content</b></HtMl>', '--\nYours truly', True,
+             '<!DOCTYPE...><html encoding="blah">some <b>content</b>\n<pre>--\nYours truly</pre>\n</html>'),
+            ('<html><body>some <b>content</b></body></html>', '<!DOCTYPE...>\n<html><body>\n<p>--</p>\n<p>Yours truly</p>\n</body>\n</html>', False,
+             '<html><body>some <b>content</b>\n\n\n<p>--</p>\n<p>Yours truly</p>\n\n\n</body></html>'),
+        ]
+        for html, content, flag, expected in test_samples:
+            self.assertEqual(append_content_to_html(html, content, flag), expected, 'append_content_to_html is broken')
+
+
+class TestSanitizer(unittest2.TestCase):
     # TDE note: could be improved by actually checking the output
 
     def test_simple(self):
@@ -60,10 +234,12 @@ class TestSanitizer(unittest.TestCase):
         html_sanitize("Merci à l'intérêt pour notre produit.nous vous contacterons bientôt. Merci")
 
 
-class TestCleaner(unittest.TestCase):
+class TestCleaner(unittest2.TestCase):
+
+    def test_gmail(self):
+        test_case = """youplaboum"""
+        html_email_clean(test_case)
 
-    def test(self):
-        print 'poinpoinpoinponi'
 
 if __name__ == '__main__':
-    unittest.main()
+    unittest2.main()
diff --git a/openerp/tests/test_misc.py b/openerp/tests/test_misc.py
index 54ae69899a6..9540c0222f3 100644
--- a/openerp/tests/test_misc.py
+++ b/openerp/tests/test_misc.py
@@ -4,18 +4,6 @@
 import unittest2
 from ..tools import misc
 
-class append_content_to_html(unittest2.TestCase):
-    """ Test some of our generic utility functions """
-
-    def test_append_to_html(self):
-        test_samples = [
-            ('<!DOCTYPE...><HTML encoding="blah">some <b>content</b></HtMl>', '--\nYours truly', True,
-             '<!DOCTYPE...><html encoding="blah">some <b>content</b>\n<pre>--\nYours truly</pre>\n</html>'),
-            ('<html><body>some <b>content</b></body></html>', '<!DOCTYPE...>\n<html><body>\n<p>--</p>\n<p>Yours truly</p>\n</body>\n</html>', False,
-             '<html><body>some <b>content</b>\n\n\n<p>--</p>\n<p>Yours truly</p>\n\n\n</body></html>'),
-        ]
-        for html, content, flag, expected in test_samples:
-            self.assertEqual(misc.append_content_to_html(html,content,flag), expected, 'append_content_to_html is broken')
 
 class test_countingstream(unittest2.TestCase):
     def test_empty_stream(self):

From ffc23f22f06160645dc0e6fba44aceffd175dd5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 6 Nov 2012 13:19:49 +0100
Subject: [PATCH 032/143] [CLEAN] Removed unused variables.

bzr revid: tde@openerp.com-20121106121949-2u577j7f1guq4tyu
---
 addons/mail/mail_thread.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index f3203336615..a7ebefdce25 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -682,7 +682,6 @@ class mail_thread(osv.AbstractModel):
             # avoid loops when finding ancestors
             processed_list = []
             if message_ids:
-                _counter, _counter_max = 0, 200
                 message = mail_message.browse(cr, SUPERUSER_ID, message_ids[0], context=context)
                 while (message.parent_id and message.parent_id.id not in processed_list):
                     processed_list.append(message.parent_id.id)

From 8a1a612fbae9f86f4cb3af2920e59e3802f1840e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 6 Nov 2012 13:27:58 +0100
Subject: [PATCH 033/143] [FIX] fields.py: html_sanitize now in mail file.

bzr revid: tde@openerp.com-20121106122758-iwyxmedgnznpjyna
---
 openerp/osv/fields.py | 2 +-
 openerp/osv/osv.py    | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/openerp/osv/fields.py b/openerp/osv/fields.py
index 2d51ad7d6db..ee95cece722 100644
--- a/openerp/osv/fields.py
+++ b/openerp/osv/fields.py
@@ -45,7 +45,7 @@ import openerp.tools as tools
 from openerp.tools.translate import _
 from openerp.tools import float_round, float_repr
 import simplejson
-from openerp.tools.html_sanitize import html_sanitize
+from openerp.tools.mail import html_sanitize
 from openerp import SUPERUSER_ID
 
 _logger = logging.getLogger(__name__)
diff --git a/openerp/osv/osv.py b/openerp/osv/osv.py
index 94f179c7897..d59998193a2 100644
--- a/openerp/osv/osv.py
+++ b/openerp/osv/osv.py
@@ -120,6 +120,7 @@ class object_proxy(object):
                     raise except_osv('Database not ready', 'Currently, this database is not fully loaded and can not be used.')
                 return f(self, dbname, *args, **kwargs)
             except orm.except_orm, inst:
+                raise
                 raise except_osv(inst.name, inst.value)
             except except_osv:
                 raise

From c596792bc26f4068e926140c3f737053ec6a7e53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 6 Nov 2012 13:34:07 +0100
Subject: [PATCH 034/143] [FIX] tools: re-added html2text import, because of
 its use in ir_mail_server. Not sure it belongs here.

bzr revid: tde@openerp.com-20121106123407-2s4ya7ln7detui6y
---
 openerp/tools/misc.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/openerp/tools/misc.py b/openerp/tools/misc.py
index 15af8967409..4e3db23bc2d 100644
--- a/openerp/tools/misc.py
+++ b/openerp/tools/misc.py
@@ -41,6 +41,10 @@ from itertools import islice, izip
 from lxml import etree
 from which import which
 from threading import local
+try:
+    from html2text import html2text
+except ImportError:
+    html2text = None
 
 from config import config
 from cache import *

From f00ae8a73b36a41b9ed40b182dc285aed1b80d3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 6 Nov 2012 13:34:42 +0100
Subject: [PATCH 035/143] [FIX] Addons: fixed some import due to renaming.

bzr revid: tde@openerp.com-20121106123442-jqiq5myhal6ouodr
---
 addons/note/note.py                   | 4 +---
 addons/pad/pad.py                     | 2 +-
 addons/portal/wizard/portal_wizard.py | 3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/addons/note/note.py b/addons/note/note.py
index fe5eca5efd7..9e1a9187095 100644
--- a/addons/note/note.py
+++ b/addons/note/note.py
@@ -20,9 +20,7 @@
 ##############################################################################
 
 from openerp.osv import osv, fields
-from tools.translate import _
-import re
-from openerp.tools.misc import html2plaintext
+from openerp.tools import html2plaintext
 
 class note_stage(osv.osv):
     """ Category of Note """
diff --git a/addons/pad/pad.py b/addons/pad/pad.py
index e5b36e5f64c..03286f7eab9 100644
--- a/addons/pad/pad.py
+++ b/addons/pad/pad.py
@@ -6,7 +6,7 @@ import string
 import urllib2
 import logging
 from tools.translate import _
-from openerp.tools.misc import html2plaintext
+from openerp.tools import html2plaintext
 from py_etherpad import EtherpadLiteClient
 
 _logger = logging.getLogger(__name__)
diff --git a/addons/portal/wizard/portal_wizard.py b/addons/portal/wizard/portal_wizard.py
index c94d6509f63..bf8353c92c1 100644
--- a/addons/portal/wizard/portal_wizard.py
+++ b/addons/portal/wizard/portal_wizard.py
@@ -24,10 +24,9 @@ import random
 
 from osv import osv, fields
 from tools.translate import _
-from tools.misc import email_re
+from tools import email_re
 from openerp import SUPERUSER_ID
 
-from base.res.res_partner import _lang_get
 _logger = logging.getLogger(__name__)
 
 # welcome email sent to portal users

From 92c20ba1d303980d51ced3d5a2e886dcb6186b14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 6 Nov 2012 13:40:42 +0100
Subject: [PATCH 036/143] [FIX] mail: fixed some wrong name due to file
 renaming.

bzr revid: tde@openerp.com-20121106124042-r7tak3o340w9gzol
---
 addons/mail/tests/test_mail.py               | 5 ++---
 addons/mail/tests/test_mail_access_rights.py | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/addons/mail/tests/test_mail.py b/addons/mail/tests/test_mail.py
index 5e19a8f0ce4..6b045a60ff4 100644
--- a/addons/mail/tests/test_mail.py
+++ b/addons/mail/tests/test_mail.py
@@ -21,8 +21,7 @@
 
 import tools
 
-from openerp.addons.mail.tests import test_mail
-from openerp.tests import common
+from openerp.addons.mail.tests import test_mail_mockup
 from openerp.tools.mail import html_sanitize
 
 MAIL_TEMPLATE = """Return-Path: <whatever-2a840@postmaster.twitter.com>
@@ -85,7 +84,7 @@ Sylvie
 """
 
 
-class test_mail(test_mail.TestMailMockups):
+class test_mail(test_mail_mockup.TestMailMockups):
 
     def _mock_send_get_mail_body(self, *args, **kwargs):
         # def _send_get_mail_body(self, cr, uid, mail, partner=None, context=None)
diff --git a/addons/mail/tests/test_mail_access_rights.py b/addons/mail/tests/test_mail_access_rights.py
index 7b90e07b9b5..ec08d257efe 100644
--- a/addons/mail/tests/test_mail_access_rights.py
+++ b/addons/mail/tests/test_mail_access_rights.py
@@ -19,11 +19,11 @@
 #
 ##############################################################################
 
-from openerp.addons.mail.tests import test_mail
+from openerp.addons.mail.tests import test_mail_mockup
 from osv.orm import except_orm
 
 
-class test_mail_access_rights(test_mail.TestMailMockups):
+class test_mail_access_rights(test_mail_mockup.TestMailMockups):
 
     def setUp(self):
         super(test_mail_access_rights, self).setUp()

From f2d53fd215d54abbfa8ee578a96d7271e6806784 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 6 Nov 2012 13:41:09 +0100
Subject: [PATCH 037/143] [FIX] tools: mail: fixed some import, cleaned some
 code.

bzr revid: tde@openerp.com-20121106124109-63svzi72lx2a13yq
---
 openerp/tools/mail.py | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/openerp/tools/mail.py b/openerp/tools/mail.py
index abd5d5e736a..b4e5754bfe4 100644
--- a/openerp/tools/mail.py
+++ b/openerp/tools/mail.py
@@ -21,14 +21,21 @@
 
 from lxml.html.soupparser import fromstring
 from lxml.etree import tostring
+import logging
 import lxml.html
 import openerp.pooler as pooler
 import operator
 import random
 import re
+import socket
+import threading
+import time
 
 from openerp.loglevels import ustr
 
+_logger = logging.getLogger(__name__)
+
+
 def html_sanitize(src):
     if not src:
         return src
@@ -230,7 +237,7 @@ def html2plaintext(html, body_id=None, encoding='utf-8'):
 
 def generate_tracking_message_id(res_id):
     """Returns a string that can be used in the Message-ID RFC822 header field
-    
+
        Used to track the replies related to a given object thanks to the "In-Reply-To"
        or "References" fields that Mail User Agents will set.
     """
@@ -238,7 +245,7 @@ def generate_tracking_message_id(res_id):
         rnd = random.SystemRandom().random()
     except NotImplementedError:
         rnd = random.random()
-    rndstr = ("%.15f" % rnd)[2:] 
+    rndstr = ("%.15f" % rnd)[2:]
     return "<%.15f.%s-openerp-%s@%s>" % (time.time(), rndstr, res_id, socket.gethostname())
 
 def email_send(email_from, email_to, subject, body, email_cc=None, email_bcc=None, reply_to=False,
@@ -246,7 +253,7 @@ def email_send(email_from, email_to, subject, body, email_cc=None, email_bcc=Non
                smtp_server=None, smtp_port=None, ssl=False, smtp_user=None, smtp_password=None, cr=None, uid=None):
     """Low-level function for sending an email (deprecated).
 
-    :deprecate: since OpenERP 6.1, please use ir.mail_server.send_email() instead. 
+    :deprecate: since OpenERP 6.1, please use ir.mail_server.send_email() instead.
     :param email_from: A string used to fill the `From` header, if falsy,
                        config['email_from'] is used instead.  Also used for
                        the `Reply-To` header if `reply_to` is not provided
@@ -281,7 +288,8 @@ def email_send(email_from, email_to, subject, body, email_cc=None, email_bcc=Non
 
 def email_split(text):
     """ Return a list of the email addresses found in ``text`` """
-    if not text: return []
+    if not text:
+        return []
     return re.findall(r'([^ ,<@]+@[^> ,]+)', text)
 
 def append_content_to_html(html, content, plaintext=True):
@@ -292,7 +300,7 @@ def append_content_to_html(html, content, plaintext=True):
        method is to coerce all HTML tags to lowercase in ``html``,
        and strip enclosing <html> or <body> tags in content if
        ``plaintext`` is False.
-       
+
        :param str html: html tagsoup (doesn't have to be XHTML)
        :param str content: extra content to append
        :param bool plaintext: whether content is plaintext and should
@@ -303,13 +311,13 @@ def append_content_to_html(html, content, plaintext=True):
         content = u'\n<pre>%s</pre>\n' % ustr(content)
     else:
         content = re.sub(r'(?i)(</?html.*>|</?body.*>|<!\W*DOCTYPE.*>)', '', content)
-        content = u'\n%s\n'% ustr(content)
+        content = u'\n%s\n' % ustr(content)
     # Force all tags to lowercase
     html = re.sub(r'(</?)\W*(\w+)([ >])',
-        lambda m: '%s%s%s' % (m.group(1),m.group(2).lower(),m.group(3)), html)
+        lambda m: '%s%s%s' % (m.group(1), m.group(2).lower(), m.group(3)), html)
     insert_location = html.find('</body>')
     if insert_location == -1:
         insert_location = html.find('</html>')
     if insert_location == -1:
         return '%s%s' % (html, content)
-    return '%s%s%s' % (html[:insert_location], content, html[insert_location:])  
+    return '%s%s%s' % (html[:insert_location], content, html[insert_location:])

From ff24a250f86c3024a437e0c55f9b21effe857ee5 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Tue, 6 Nov 2012 18:31:31 +0530
Subject: [PATCH 038/143] [IMP] Improved the Cancel Opening Entries Wizard.

bzr revid: mdi@tinyerp.com-20121106130131-f462qb5s6pfduv6p
---
 addons/account/wizard/account_open_closed_fiscalyear.py     | 4 ++--
 .../account/wizard/account_open_closed_fiscalyear_view.xml  | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/addons/account/wizard/account_open_closed_fiscalyear.py b/addons/account/wizard/account_open_closed_fiscalyear.py
index b8d64fac0b5..1b5622a589d 100644
--- a/addons/account/wizard/account_open_closed_fiscalyear.py
+++ b/addons/account/wizard/account_open_closed_fiscalyear.py
@@ -27,7 +27,7 @@ class account_open_closed_fiscalyear(osv.osv_memory):
     _description = "Choose Fiscal Year"
     _columns = {
        'fyear_id': fields.many2one('account.fiscalyear', \
-                                 'Fiscal Year to Open', required=True, help='Select Fiscal Year which you want to remove entries for its End of year entries journal'),
+                                 'Fiscal Year', required=True, help='Select Fiscal Year which you want to remove entries for its End of year entries journal'),
     }
 
     def remove_entries(self, cr, uid, ids, context=None):
@@ -36,7 +36,7 @@ class account_open_closed_fiscalyear(osv.osv_memory):
         data = self.browse(cr, uid, ids, context=context)[0]
         period_journal = data.fyear_id.end_journal_period_id or False
         if not period_journal:
-            raise osv.except_osv(_('Error!'), _('You have to set the end of the fiscal year for this journal.'))
+            raise osv.except_osv(_('Error!'), _("You have to set the 'End  of Year Entries Journal' for this Fiscal Year which is set after generating opening entries from 'Generate Opening Entries'."))
 
         ids_move = move_obj.search(cr, uid, [('journal_id','=',period_journal.journal_id.id),('period_id','=',period_journal.period_id.id)])
         if ids_move:
diff --git a/addons/account/wizard/account_open_closed_fiscalyear_view.xml b/addons/account/wizard/account_open_closed_fiscalyear_view.xml
index c2c271af41b..ff927549a68 100644
--- a/addons/account/wizard/account_open_closed_fiscalyear_view.xml
+++ b/addons/account/wizard/account_open_closed_fiscalyear_view.xml
@@ -5,9 +5,11 @@
             <field name="name">account.open.closed.fiscalyear.form</field>
             <field name="model">account.open.closed.fiscalyear</field>
             <field name="arch" type="xml">
-                <form string="Choose Fiscal Year " version="7.0">
+                <form string="Cancel Fiscal Year Opening Entries" version="7.0">
+                    <separator string="Cancel Fiscal Year Opening Entries"/>
+                    <label string="This wizard will remove the end of year journal entries of selected fiscal year. Note that you can run this wizard many times for the same fiscal year."/>
                     <group>
-                        <field name="fyear_id" domain="[('state','=','draft')]"/>
+                        <field name="fyear_id" domain="[('state','=','draft'), ('end_journal_period_id', '!=', False)]"/>
                     </group>
                     <footer>
                         <button string="Open" name="remove_entries" type="object" class="oe_highlight"/>

From a80fab63036d43f71e971bbbe5c2aa1263da4ff0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 6 Nov 2012 14:37:51 +0100
Subject: [PATCH 039/143] [FIX] tools: mail: use beautifulsoup parser, if not
 present, html parser.

bzr revid: tde@openerp.com-20121106133751-ds0g2c7k8pu4d6rl
---
 openerp/tools/mail.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/openerp/tools/mail.py b/openerp/tools/mail.py
index b4e5754bfe4..2cbb094bf8e 100644
--- a/openerp/tools/mail.py
+++ b/openerp/tools/mail.py
@@ -19,8 +19,11 @@
 #
 ##############################################################################
 
-from lxml.html.soupparser import fromstring
-from lxml.etree import tostring
+from lxml.etree import tostring, Element
+try:
+    from lxml.html.soupparser import fromstring as parser_fromstring
+except ImportError:
+    from lxml.html import fromstring as parser_fromstring
 import logging
 import lxml.html
 import openerp.pooler as pooler
@@ -124,10 +127,10 @@ def html_email_clean(html):
     modified_html += html[idx:]
 
     # 2. form a tree, handle (currently ?) pure-text by enclosing them in a pre
-    root = fromstring(modified_html)
+    root = parser_fromstring(modified_html)
     if not len(root) and root.text is None and root.tail is None:
         modified_html = '<div>%s</div>' % modified_html
-        root = fromstring(modified_html)
+        root = parser_fromstring(modified_html)
 
     # 3. remove blockquotes
     quotes = [el for el in root.iterchildren(tag='blockquote')]

From 5cb888e7473dd39c9d5ec97953adc261365f1ba0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 6 Nov 2012 16:32:49 +0100
Subject: [PATCH 040/143] [IMP] mail: mail_message body for chatter now calls
 the html_email_clean method; some var cleaning in mail.js.

bzr revid: tde@openerp.com-20121106153249-63xhbuiy8h0rww6c
---
 addons/mail/static/src/js/mail.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 9133e5de257..6d9b21d272a 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -432,7 +432,6 @@ openerp.mail = function (session) {
 
             // data of this expandable message
             this.id = datasets.id || -1,
-            this.model = datasets.model || false,
             this.parent_id = datasets.parent_id || false,
             this.nb_messages = datasets.nb_messages || 0,
             this.thread_level = datasets.thread_level || 0,
@@ -565,6 +564,7 @@ openerp.mail = function (session) {
             this.author_id = datasets.author_id ||  [],
             this.attachment_ids = datasets.attachment_ids ||  [],
             this._date = datasets.date;
+            this.partner_ids = datasets.partner_ids;
 
 
             this.show_reply_button = this.options.show_compose_message && this.options.show_reply_button > this.thread_level;

From 3ba739cbf510bf1ed164d1439d85d412fe77a0ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 7 Nov 2012 09:58:07 +0100
Subject: [PATCH 041/143] [IMP] tools: mail: improved basic html_email_clean.

bzr revid: tde@openerp.com-20121107085807-td2okmbr61pm4g1e
---
 openerp/tools/mail.py | 42 ++++++++++++++++++++++++------------------
 1 file changed, 24 insertions(+), 18 deletions(-)

diff --git a/openerp/tools/mail.py b/openerp/tools/mail.py
index 2cbb094bf8e..0ae4b373fee 100644
--- a/openerp/tools/mail.py
+++ b/openerp/tools/mail.py
@@ -19,11 +19,11 @@
 #
 ##############################################################################
 
-from lxml.etree import tostring, Element
-try:
-    from lxml.html.soupparser import fromstring as parser_fromstring
-except ImportError:
-    from lxml.html import fromstring as parser_fromstring
+from lxml import etree
+# try:
+#     from lxml.html.soupparser import fromstring as parser_fromstring
+# except ImportError:
+#     from lxml.html import fromstring as parser_fromstring
 import logging
 import lxml.html
 import openerp.pooler as pooler
@@ -122,15 +122,16 @@ def html_email_clean(html):
     br_tags = re.compile(r'([<]\s*br\s*\/?[>])')
     idx = 0
     for item in re.finditer(br_tags, html):
-        modified_html += html[idx:item.start()] + '\n'
+        modified_html += html[idx:item.start()] + '__BR_TAG__'
         idx = item.end()
     modified_html += html[idx:]
+    html = modified_html
 
     # 2. form a tree, handle (currently ?) pure-text by enclosing them in a pre
-    root = parser_fromstring(modified_html)
+    root = lxml.html.fromstring(html)
     if not len(root) and root.text is None and root.tail is None:
-        modified_html = '<div>%s</div>' % modified_html
-        root = parser_fromstring(modified_html)
+        html = '<div>%s</div>' % html
+        root = lxml.html.fromstring(html)
 
     # 3. remove blockquotes
     quotes = [el for el in root.iterchildren(tag='blockquote')]
@@ -150,16 +151,21 @@ def html_email_clean(html):
                 elem.tail = elem.tail[:match.start()] + elem.tail[match.end():]
 
     # 5. \n back to <br/>
-    for el in root.iterchildren():
-        if el.tag == 'pre':
-            continue
-        if el.text:
-            el.text = el.text.replace('\n', '<br />')
-        if el.tail:
-            el.tail = el.tail.replace('\n', '<br />')
+    html = etree.tostring(root, pretty_print=True)
+    html = html.replace('__BR_TAG__', '<br />')
 
-    new_html = tostring(root, pretty_print=True)
-    return new_html
+    # 6. Misc cleaning :
+    # - ClEditor seems to love using <div><br /><div> -> replace with <br />
+    modified_html = ''
+    br_div_tags = re.compile(r'(<div>\s*<br\s*\/>\s*<\/div>)')
+    idx = 0
+    for item in re.finditer(br_div_tags, html):
+        modified_html += html[idx:item.start()] + '<br />'
+        idx = item.end()
+    modified_html += html[idx:]
+    html = modified_html
+
+    return html
 
 
 #----------------------------------------------------------

From c0e139bd4bdbd5e5feb9b3595a67655302be840c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 7 Nov 2012 09:59:26 +0100
Subject: [PATCH 042/143] [IMP] mail: displayed messages now goe through
 html_email_clean to clean their content; added a css because we now have lots
 of <p> in chatter messages, and default margin is quite big (to be improved
 maybe); updated demo data.

bzr revid: tde@openerp.com-20121107085926-9g609zgmkg4kieqc
---
 addons/mail/data/mail_demo.xml       | 15 ++++++++-------
 addons/mail/data/mail_group_data.xml | 11 +++++------
 addons/mail/mail_message.py          |  3 ++-
 addons/mail/static/src/css/mail.css  |  4 ++++
 4 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/addons/mail/data/mail_demo.xml b/addons/mail/data/mail_demo.xml
index bda93fc485d..889a3381135 100644
--- a/addons/mail/data/mail_demo.xml
+++ b/addons/mail/data/mail_demo.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0"?>
 <openerp>
-    <data noupdate="1">
+    <!-- <data noupdate="1"> -->
+    <data>
 
         <record id="message_blogpost0" model="mail.message">
             <field name="model">mail.group</field>
             <field name="res_id" ref="mail.group_all_employees"/>
-            <field name="body">Your monthly meal vouchers arrived. You can get them at Christine's office.
-This month you also get 250 EUR of eco-vouchers if you have been in the company for more than a year.</field>
+            <field name="body"><![CDATA[<p>Your monthly meal vouchers arrived. You can get them at Christine's office.
+This month you also get 250 EUR of eco-vouchers if you have been in the company for more than a year.</p>]]></field>
             <field name="type">comment</field>
             <field name="subtype_id" ref="mt_comment"/>
         </record>
@@ -14,7 +15,7 @@ This month you also get 250 EUR of eco-vouchers if you have been in the company
         <record id="message_blogpost0_comment0" model="mail.message">
             <field name="model">mail.group</field>
             <field name="res_id" ref="group_all_employees"/>
-            <field name="body"><![CDATA[Great.]]></field>
+            <field name="body"><![CDATA[<p>Great.</p>]]></field>
             <field name="parent_id" ref="message_blogpost0"/>
             <field name="type">comment</field>
             <field name="subtype_id" ref="mt_comment"/>
@@ -23,7 +24,7 @@ This month you also get 250 EUR of eco-vouchers if you have been in the company
         <record id="message_blogpost0_comment1" model="mail.message">
             <field name="model">mail.group</field>
             <field name="res_id" ref="group_all_employees"/>
-            <field name="body">Thanks, but where is Christine's office, if I may ask? (I'm new here)</field>
+            <field name="body"><![CDATA[<p>Thanks, but where is Christine's office, if I may ask? (I'm new here)</p>]]></field>
             <field name="parent_id" ref="message_blogpost0"/>
             <field name="type">comment</field>
             <field name="subtype_id" ref="mt_comment"/>
@@ -32,7 +33,7 @@ This month you also get 250 EUR of eco-vouchers if you have been in the company
         <record id="message_blogpost0_comment2" model="mail.message">
             <field name="model">mail.group</field>
             <field name="res_id" ref="group_all_employees"/>
-            <field name="body">Building B3, second floor on the right :-)</field>
+            <field name="body"><![CDATA[<p>Building B3, second floor on the right :-)</p>]]></field>
             <field name="parent_id" ref="message_blogpost0"/>
             <field name="type">comment</field>
             <field name="subtype_id" ref="mt_comment"/>
@@ -41,7 +42,7 @@ This month you also get 250 EUR of eco-vouchers if you have been in the company
         <record id="message_blogpost0_comment3" model="mail.message">
             <field name="model">mail.group</field>
             <field name="res_id" ref="group_all_employees"/>
-            <field name="body">Great news, I need to buy a new fridge, I think I can pay it with the eco-vouchers!</field>
+            <field name="body"><![CDATA[<p>Great news, I need to buy a new fridge, I think I can pay it with the eco-vouchers!</p>]]></field>
             <field name="parent_id" ref="message_blogpost0"/>
             <field name="type">comment</field>
             <field name="subtype_id" ref="mt_comment"/>
diff --git a/addons/mail/data/mail_group_data.xml b/addons/mail/data/mail_group_data.xml
index 11d0ee7d04b..fe24f0b8661 100644
--- a/addons/mail/data/mail_group_data.xml
+++ b/addons/mail/data/mail_group_data.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data noupdate="1">
+    <!-- <data noupdate="1"> -->
+    <data>
 
         <record model="mail.group" id="group_sales">
             <field name="name">Sales</field>
@@ -18,11 +19,9 @@
             <field name="res_id" ref="mail.group_all_employees"/>
             <field name="type">notification</field>
             <field name="subject">Welcome to OpenERP!</field>
-            <field name="body">Your homepage is a summary of messages you received and key information about documents you follow.
-
-The top menu bar contains all applications you installed. You can use this &lt;i&gt;Settings&lt;/i&gt; menu to install more applications, activate others features or give access to new users.
-
-To setup your preferences (name, email signature, avatar), click on the top right corner.</field>
+            <field name="body"><![CDATA[<p>Your homepage is a summary of messages you received and key information about documents you follow.<br />
+The top menu bar contains all applications you installed. You can use this &lt;i&gt;Settings&lt;/i&gt; menu to install more applications, activate others features or give access to new users.<br />
+To setup your preferences (name, email signature, avatar), click on the top right corner.</p>]]></field>
         </record>
     </data>
 </openerp>
diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index bd0ade31b68..3637bb371dc 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -25,6 +25,7 @@ import tools
 from email.header import decode_header
 from openerp import SUPERUSER_ID
 from openerp.osv import osv, orm, fields
+from openerp.tools import html_email_clean
 from openerp.tools.translate import _
 
 _logger = logging.getLogger(__name__)
@@ -242,7 +243,7 @@ class mail_message(osv.Model):
             'id': message['id'],
             'type': message['type'],
             'attachment_ids': attachment_ids,
-            'body': message['body'],
+            'body': html_email_clean(message['body']),
             'model': message['model'],
             'res_id': message['res_id'],
             'record_name': message['record_name'],
diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index af3cc3ed359..652714bffd7 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -57,6 +57,10 @@
     margin-bottom: 0px;
     margin-top: 2px;
 }
+.openerp .oe_mail .oe_msg .oe_msg_content .oe_msg_body p{
+    margin-top: 0px;
+    margin-bottom: 0px;
+}
 
 /* a) Indented Messages */
 

From 4d89845de6efc17a6f8dc0e5f5c446043d884793 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 7 Nov 2012 10:32:01 +0100
Subject: [PATCH 043/143] [IMP] tools: tests: cleaner: cleaned a bit test data.
 Will have to be improved.

bzr revid: tde@openerp.com-20121107093201-s0pco15msilt4erz
---
 openerp/tests/test_mail.py | 110 ++++++++++---------------------------
 openerp/tools/mail.py      |   4 ++
 2 files changed, 33 insertions(+), 81 deletions(-)

diff --git a/openerp/tests/test_mail.py b/openerp/tests/test_mail.py
index 26ccdd39b28..ab82fc39caf 100755
--- a/openerp/tests/test_mail.py
+++ b/openerp/tests/test_mail.py
@@ -43,42 +43,8 @@ test12</font></div><div><font color="#1f1f1f" face="monospace" size="2"><br></fo
 <a href="javascript:alert('malicious code')">test link</a>
 """
 
-GMAIL_REPLY = """<html>
-  <head>
-    <meta content="text/html; charset=ISO-8859-1"
-      http-equiv="Content-Type">
-  </head>
-  <body text="#000000" bgcolor="#FFFFFF">
-    <div class="moz-cite-prefix">R&eacute;ponse via thunderbird, classique.<br>
-      <br>
-      On 11/05/2012 10:51 AM, Thibault Delavall&eacute;e wrote:<br>
-    </div>
-    <blockquote
-cite="mid:CAP76m_WwG6=dY1aYYBJpJHvFtFk31YYjMoHoZaDRpPmacn+Ohw@mail.gmail.com"
-      type="cite">
-      <div>Plop !</div>
-      <ul>
-        <li>Vive les lapins rapides !<br>
-        </li>
-        <li>Nouille</li>
-        <li>Frites</li>
-      </ul>
-      <div><br>
-      </div>
-      <div>Clairement, hein ?</div>
-      -- <br>
-      Thibault Delavall&eacute;e<br>
-    </blockquote>
-    <br>
-    <br>
-    <pre class="moz-signature" cols="72">-- 
-Thibault Delavall&eacute;e
-</pre>
-  </body>
-</html>"""
-
-GAMIL_REPLY_SAN = """<div>R&#233;ponse via thunderbird, classique.<br><br>
-      On 11/05/2012 10:51 AM, Thibault Delavall&#233;e wrote:<br></div>
+GMAIL_REPLY_SAN = """<div>R&#233;ponse via thunderbird, classique.<br><br>
+      On 11/05/2012 10:51 AM, Raoul Tartopoils wrote:<br></div>
     <blockquote>
       <div>Plop !</div>
       <ul><li>Vive les lapins rapides !<br></li>
@@ -87,17 +53,14 @@ GAMIL_REPLY_SAN = """<div>R&#233;ponse via thunderbird, classique.<br><br>
       </ul><div><br></div>
       <div>Clairement, hein ?</div>
       -- <br>
-      Thibault Delavall&#233;e<br></blockquote>
+      Raoul Tartopoils<br></blockquote>
     <br><br><pre>-- 
-Thibault Delavall&#233;e
+Raoul Tartopoils
 </pre>"""
 
-
-
-
 GMAIL_REPLY2_SAN = """<div>Je r&#233;ponds, hop, via thunderbird. Mais
       je vais r&#233;podnre aussi au milieu du thread.<br><br>
-      On 11/05/2012 10:53 AM, Thibault Delavall&#233;e wrote:<br></div>
+      On 11/05/2012 10:53 AM, Raoul Tartopoils wrote:<br></div>
     <blockquote>Reply rapide de gmail.</blockquote>
     <br>
     Jamais.<br><br><blockquote>
@@ -106,7 +69,7 @@ GMAIL_REPLY2_SAN = """<div>Je r&#233;ponds, hop, via thunderbird. Mais
               <div>R&#233;ponse via thunderbird, classique.
                 <div>
                   <div><br><br>
-                    On 11/05/2012 10:51 AM, Thibault Delavall&#233;e wrote:<br></div>
+                    On 11/05/2012 10:51 AM, Raoul Tartopoils wrote:<br></div>
                 </div>
               </div>
               <div>
@@ -135,70 +98,52 @@ GMAIL_REPLY2_SAN = """<div>Je r&#233;ponds, hop, via thunderbird. Mais
                     </ul><div><br></div>
                     <div>Clairement, hein ?</div>
                     -- <br>
-                    Thibault Delavall&#233;e<br></blockquote>
+                    Raoul Tartopoils<br></blockquote>
                   <br><br></div>
               </div>
               <span><font>
                   <pre>-- 
-Thibault Delavall&#233;e
+Raoul Tartopoils
 </pre>
                 </font></span></div>
           </blockquote>
         </div>
         <br><br><div><br></div>
         -- <br>
-        Thibault Delavall&#233;e<br></div>
+        Raoul Tartopoils<br></div>
     </blockquote>
     <br><br><pre>-- 
-Thibault Delavall&#233;e
+Raoul Tartopoils
 </pre>"""
 
 
+TEXT_TPL = """Salut Raoul!
+Le 28 oct. 2012 à 00:02, Raoul Grosbedon a écrit :
 
-MAIL_TEMPLATE = """Hey XYZ,
+> C'est sûr que je suis intéressé (quote)!
 
-I've fixed that error and tested it a couple of times, it seems to be working
-fine now.
+Trouloulou pouet pouet.
 
-On Fri, Feb 18, 2011 at 7:44 AM, Joe David <joe@david.com> wrote:
-Initial thread starts here...
+Je ne vais quand même pas écrire de vrais mails, non mais ho.
 
---
-Thanks
-joe@david.com
-"""
-
-GMAIL_TPL = """Salut Bob!
-Le 28 oct. 2012 à 00:02, Thibault Delavallée a écrit :
-
-> MatrixPlus le 22/02 ? Si c'est ce que tu dis, je suis intéressé, oui !
-
-Non, pas MatrixPlus, juste Matrix.
-
-Et oui, le 22/02 est la date qui doit vous convenir le deux.
-
-Bon, on tente de s’organiser un truc se samedi-là et je réserve des places.
-
-En passant, t’as contacté les gens du KdM pour le truc pour Bénisexe ?
-
-> 2012/10/27 Édouard Gilbert :
->> Diantre, me disè-je en envoyant un message similaire à Koukouiles, que ne voilà un concert qui pourrait intéresser Thibault ?
+> 2012/10/27 Bert Tartopoils :
+>> Diantre, me disè-je en envoyant un message similaire à Martine, mais comment vas-tu (quote)?
 >> 
->> L’ONL donne, en février et à Lille, Matrix en ciné-concert. Il passe le film sans musique mais c’est pas grave parce qu’il y a un orchestre qui la joue en même temps. Intéressé ?
+>> A la base le contenu était un vrai mail, mais je l'ai quand même réécrit pour ce test, histoire de dire que, quand même, on ne met pas n'importe quoi ici. (quote)
 >> 
->> On peut trouver plus d’info sur le site de l’ONL, onlille.com , mais il est tellement mal foutu que je ne trouve pas de lien direct. Je te laisse chercher.
+>> Et sinon bon courage pour trouver tes clefs (quote).
 >> 
->> Édouard GILBERT
->> edouard.gilbert@gmail.com
+>> Bert TARTOPOILS
+>> bert.tartopoils@miam.miam
 >> 
 > 
 > 
 > 
 > -- 
-> Thibault Delavallée
+> Raoul Grosbedon
 
-Édouard GILBERT
-edouard.gilbert@gmail.com
+Bert TARTOPOILS
+bert.tartopoils@miam.miam
 """
 
 
@@ -237,8 +182,11 @@ class TestSanitizer(unittest2.TestCase):
 class TestCleaner(unittest2.TestCase):
 
     def test_gmail(self):
-        test_case = """youplaboum"""
-        html_email_clean(test_case)
+        # Test1: blahblah
+        new_html = html_email_clean(GMAIL_REPLY_SAN)
+        self.assertNotIn(new_html, 'blockquote')
+        self.assertNotIn(new_html, 'Vive les lapins rapides !')
+        self.assertNotIn(new_html, 'Bert Tartopoils')
 
 
 if __name__ == '__main__':
diff --git a/openerp/tools/mail.py b/openerp/tools/mail.py
index 0ae4b373fee..d95d47c3b91 100644
--- a/openerp/tools/mail.py
+++ b/openerp/tools/mail.py
@@ -115,6 +115,10 @@ def html_email_clean(html):
         - strip email quotes (remove blockquote nodes)
         - strip signatures (remove --\n{\n)Blahblah), by replacing <br> by
             \n to avoid ignoring signatures converted into html
+
+        :param string html: sanitized html; tags like html or head should not
+            be present in the html string. This method therefore takes as input
+            html code coming from a sanitized source, like fields.html.
     """
     modified_html = ''
 

From c983fba3c3ad75f367d3b06bf131ff51e76f3b04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 7 Nov 2012 11:02:06 +0100
Subject: [PATCH 044/143] [FIX] mail: demo data back as noupdate.

bzr revid: tde@openerp.com-20121107100206-bi39ap6821woug8x
---
 addons/mail/data/mail_demo.xml       | 3 +--
 addons/mail/data/mail_group_data.xml | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/addons/mail/data/mail_demo.xml b/addons/mail/data/mail_demo.xml
index 889a3381135..3244e047da4 100644
--- a/addons/mail/data/mail_demo.xml
+++ b/addons/mail/data/mail_demo.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 <openerp>
-    <!-- <data noupdate="1"> -->
-    <data>
+    <data noupdate="1">
 
         <record id="message_blogpost0" model="mail.message">
             <field name="model">mail.group</field>
diff --git a/addons/mail/data/mail_group_data.xml b/addons/mail/data/mail_group_data.xml
index fe24f0b8661..6f039d64c0d 100644
--- a/addons/mail/data/mail_group_data.xml
+++ b/addons/mail/data/mail_group_data.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <!-- <data noupdate="1"> -->
-    <data>
+    <data noupdate="1">
 
         <record model="mail.group" id="group_sales">
             <field name="name">Sales</field>

From 688b6babed38acd00ad68a190fe980bba9f66bef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 7 Nov 2012 11:50:31 +0100
Subject: [PATCH 045/143] [FIX] tools: html_email_clean: remove blockquote in
 any node, not just firs childs of root.

bzr revid: tde@openerp.com-20121107105031-xf0u71q3chx0chnv
---
 openerp/tools/mail.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/tools/mail.py b/openerp/tools/mail.py
index d95d47c3b91..1290ebbdec6 100644
--- a/openerp/tools/mail.py
+++ b/openerp/tools/mail.py
@@ -138,7 +138,7 @@ def html_email_clean(html):
         root = lxml.html.fromstring(html)
 
     # 3. remove blockquotes
-    quotes = [el for el in root.iterchildren(tag='blockquote')]
+    quotes = [el for el in root.getiterator(tag='blockquote')]
     for node in quotes:
         node.getparent().remove(node)
 

From f9829bbb93d6fee682cb78df93b00548a4de2b2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 7 Nov 2012 11:51:48 +0100
Subject: [PATCH 046/143] [FIX] mail_thread: in message_parse, correctly set
 partner_ids of the message dict. By the way small things in amil module.

bzr revid: tde@openerp.com-20121107105148-6o1dvu7f4ms24rbx
---
 addons/mail/mail_message.py | 2 +-
 addons/mail/mail_thread.py  | 2 +-
 addons/mail/res_partner.py  | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 3637bb371dc..4f1c0a00e77 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -730,7 +730,7 @@ class mail_message(osv.Model):
                 ], context=context)
             fol_objs = fol_obj.read(cr, uid, fol_ids, ['partner_id'], context=context)
             partners_to_notify |= set(fol['partner_id'][0] for fol in fol_objs)
-        # when writing to a wall
+        # remove me from notified partners, unless the message is written on my own wall
         if message.get('author_id') and message.get('model') == "res.partner" and message.get('res_id') == message.get('author_id')[0]:
             partners_to_notify |= set([message.get('author_id')[0]])
         elif message.get('author_id'):
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index a7ebefdce25..4790fb3393f 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -588,7 +588,7 @@ class mail_thread(osv.AbstractModel):
             else:
                 msg_dict['email_from'] = message.get('from')
         partner_ids = self._message_find_partners(cr, uid, message, ['From', 'To', 'Cc'], context=context)
-        msg_dict['partner_ids'] = partner_ids
+        msg_dict['partner_ids'] = [(4, partner_id) for partner_id in partner_ids]
 
         if 'Date' in message:
             date_hdr = decode(message.get('Date'))
diff --git a/addons/mail/res_partner.py b/addons/mail/res_partner.py
index 46b250328f8..6f291f62f1b 100644
--- a/addons/mail/res_partner.py
+++ b/addons/mail/res_partner.py
@@ -54,7 +54,8 @@ class res_partner_mail(osv.Model):
             thread_id = thread_id[0]
         if type == 'email':
             partner_ids = kwargs.get('partner_ids', [])
-            partner_ids.append(thread_id)
+            if thread_id not in partner_ids:
+                partner_ids.append(thread_id)
             kwargs['partner_ids'] = partner_ids
             return super(res_partner_mail, self).message_post(cr, uid, False, body=body, subject=subject,
                 type=type, subtype=subtype, parent_id=parent_id, attachments=attachments, context=context, **kwargs)

From 48cec81235101034eea33cfe92ce0812159bde32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 7 Nov 2012 16:21:26 +0100
Subject: [PATCH 047/143] [IMP] Chatter widget: display email icon only when
 sender is unknown.

bzr revid: tde@openerp.com-20121107152126-71yzsy1nb0tj549w
---
 addons/mail/static/src/js/mail.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index ece8e65144d..6be6693d8d8 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -590,7 +590,7 @@ openerp.mail = function (session) {
             //formating and add some fields for render
             this.date = session.web.format_value(this._date, {type:"datetime"});
             this.timerelative = $.timeago(this.date);
-            if (this.type == 'email') {
+            if (this.type == 'email' && !this.author_id[0]) {
                 this.avatar = ('/mail/static/src/img/email_icon.png');
             } else {
                 this.avatar = mail.ChatterUtils.get_image(this.session, 'res.partner', 'image_small', this.author_id[0]);

From 2799ba172c260ce220e2e57ace2ed541e210c0e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 7 Nov 2012 16:21:58 +0100
Subject: [PATCH 048/143] [FIX] portal: fixed class name and imports.

bzr revid: tde@openerp.com-20121107152158-ze50vqj673nvavib
---
 addons/portal/tests/test_portal.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/addons/portal/tests/test_portal.py b/addons/portal/tests/test_portal.py
index 83b10b39c28..be32b015743 100644
--- a/addons/portal/tests/test_portal.py
+++ b/addons/portal/tests/test_portal.py
@@ -19,12 +19,11 @@
 #
 ##############################################################################
 
-from openerp.addons.mail.tests import test_mail
-from openerp.tools import append_content_to_html
+from openerp.addons.mail.tests import test_mail_mockup
 from osv.orm import except_orm
 
 
-class test_portal(test_mail.TestMailMockups):
+class test_portal(test_mail_mockup.TestMailMockups):
 
     def setUp(self):
         super(test_portal, self).setUp()

From 281a4d08014514e768a6b5354c1324602a58ead2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 7 Nov 2012 16:38:22 +0100
Subject: [PATCH 049/143] [FIX] mail: notifications: fixed access rights issues
 when setting as read/unread for lambda users.

bzr revid: tde@openerp.com-20121107153822-j7f1a63a2ix66e5n
---
 addons/mail/mail_followers.py            | 15 ++++++++-------
 addons/mail/security/ir.model.access.csv |  7 ++++---
 addons/mail/security/mail_security.xml   | 10 +++++++++-
 3 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/addons/mail/mail_followers.py b/addons/mail/mail_followers.py
index e8cf2648f29..31220b7c348 100644
--- a/addons/mail/mail_followers.py
+++ b/addons/mail/mail_followers.py
@@ -84,11 +84,13 @@ class mail_notification(osv.Model):
         return False
 
     def set_message_read(self, cr, uid, msg_ids, read=None, context=None):
-        """ Set a message and its child messages as (un)read for uid.
+        """ Set messages as (un)read. Technically, the notifications related
+            to uid are set to (un)read. If for some msg_ids there are missing
+            notifications (i.e. due to load more or thread parent fetching),
+            they are created.
 
-            :param bool read: read / unread
+            :param bool read: (un)read notification
         """
-        # TDE note: use child_of or front-end send correct values ?
         user_pid = self.pool.get('res.users').read(cr, uid, uid, ['partner_id'], context=context)['partner_id'][0]
         notif_ids = self.search(cr, uid, [
             ('partner_id', '=', user_pid),
@@ -100,10 +102,9 @@ class mail_notification(osv.Model):
             return self.write(cr, uid, notif_ids, {'read': read}, context=context)
 
         # some messages do not have notifications: find which one, create notification, update read status
-        exist_notification = dict.fromkeys(msg_ids, False)
-        for notification in self.browse(cr, uid, notif_ids, context=context):
-            exist_notification[notification.message_id] = True
-        for msg_id in exist_notification.keys():
+        notified_msg_ids = [notification.message_id.id for notification in self.browse(cr, uid, notif_ids, context=context)]
+        to_create_msg_ids = list(set(msg_ids) - set(notified_msg_ids))
+        for msg_id in to_create_msg_ids:
             self.create(cr, uid, {'partner_id': user_pid, 'read': read, 'message_id': msg_id}, context=context)
         return self.write(cr, uid, notif_ids, {'read': read}, context=context)
 
diff --git a/addons/mail/security/ir.model.access.csv b/addons/mail/security/ir.model.access.csv
index 4d68b7e3aef..b87c323b53d 100644
--- a/addons/mail/security/ir.model.access.csv
+++ b/addons/mail/security/ir.model.access.csv
@@ -7,12 +7,13 @@ access_mail_mail_system,mail.mail.system,model_mail_mail,base.group_system,1,1,1
 access_mail_followers_all,mail.followers.all,model_mail_followers,,1,0,0,0
 access_mail_followers_system,mail.followers.system,model_mail_followers,base.group_system,1,1,1,1
 access_mail_notification_all,mail.notification.all,model_mail_notification,,1,0,0,0
-access_mail_notification_aystem,mail.notification.system,model_mail_notification,base.group_system,1,1,1,1
+access_mail_notification_group_user,mail.notification.user,model_mail_notification,base.group_user,1,1,1,0
+access_mail_notification_system,mail.notification.system,model_mail_notification,base.group_system,1,1,1,1
 access_mail_group_all,mail.group.all,model_mail_group,,1,0,0,0
 access_mail_group_user,mail.group.user,model_mail_group,base.group_user,1,1,1,1
 access_mail_alias_all,mail.alias.all,model_mail_alias,,1,0,0,0
-access_mail_alias_user,mail.alias,model_mail_alias,base.group_user,1,1,1,0
-access_mail_alias_system,mail.alias,model_mail_alias,base.group_system,1,1,1,1
+access_mail_alias_user,mail.alias.user,model_mail_alias,base.group_user,1,1,1,0
+access_mail_alias_system,mail.alias.system,model_mail_alias,base.group_system,1,1,1,1
 access_mail_message_subtype_all,mail.message.subtype.all,model_mail_message_subtype,,1,0,0,0
 access_mail_vote_all,mail.vote.all,model_mail_vote,,1,1,1,1
 access_mail_favorite_all,mail.favorite.all,model_mail_favorite,,1,1,1,1
diff --git a/addons/mail/security/mail_security.xml b/addons/mail/security/mail_security.xml
index 3f2b7bf3e9a..525425c2aa0 100644
--- a/addons/mail/security/mail_security.xml
+++ b/addons/mail/security/mail_security.xml
@@ -10,7 +10,7 @@
             <field name="domain_force">['|', '|', ('public', '=', 'public'), ('message_follower_ids', 'in', [user.partner_id.id]), '&amp;', ('public','=','groups'), ('group_public_id','in', [g.id for g in user.groups_id])]</field>
         </record>
 
-        <record id="mail_followers_read_own" model="ir.rule">
+        <record id="mail_followers_read_write_own" model="ir.rule">
             <field name="name">mail.followers: read and write its own entries</field>
             <field name="model_id" ref="model_mail_followers"/>
             <field name="domain_force">[('partner_id', '=', user.partner_id.id)]</field>
@@ -18,6 +18,14 @@
             <field name="perm_unlink" eval="False"/>
         </record>
 
+        <record id="mail_notification_read_write_own" model="ir.rule">
+            <field name="name">mail.notification: read and write its own entries</field>
+            <field name="model_id" ref="model_mail_notification"/>
+            <field name="domain_force">[('partner_id', '=', user.partner_id.id)]</field>
+            <field name="perm_create" eval="False"/>
+            <field name="perm_unlink" eval="False"/>
+        </record>
+
         <!--
         This rule can not be uncommented, because we have a more wide method in mail.message. When we implement a many2one_variable field, we will be able to uncomment this.
         <record id="mail_message_read_partner_or_author" model="ir.rule">

From da6ee587e3464ed2dbfe5f9acd10cd286ae615d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 7 Nov 2012 16:39:10 +0100
Subject: [PATCH 050/143] [CLEAN] Misc cleaning in comments and domain for
 mailboxes.

bzr revid: tde@openerp.com-20121107153910-uo22t1ahd9qoo1ub
---
 addons/mail/mail_thread.py       | 3 ++-
 addons/mail/mail_thread_view.xml | 2 +-
 addons/mail/res_partner.py       | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 4790fb3393f..ca598ce3a93 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -629,7 +629,8 @@ class mail_thread(osv.AbstractModel):
             mail.message ID. Extra keyword arguments will be used as default
             column values for the new mail.message record.
             Auto link messages for same id and object
-            :param int thread_id: thread ID to post into, or list with one ID
+            :param int thread_id: thread ID to post into, or list with one ID;
+                if False/0, mail.message model will also be set as False
             :param str body: body of the message, usually raw HTML that will
                 be sanitized
             :param str subject: optional subject
diff --git a/addons/mail/mail_thread_view.xml b/addons/mail/mail_thread_view.xml
index 07b24725b05..9737d93dd8f 100644
--- a/addons/mail/mail_thread_view.xml
+++ b/addons/mail/mail_thread_view.xml
@@ -11,7 +11,7 @@
         <record id="action_mail_to_me_feeds" model="ir.actions.client">
             <field name="name">To: me</field>
             <field name="tag">mail.wall</field>
-            <field name="params" eval="&quot;{'domain': [('partner_ids.user_ids', 'in', [uid]), ('to_read', '=', True), ('author_id.user_ids', 'in', [uid])],
+            <field name="params" eval="&quot;{'domain': [('partner_ids.user_ids', 'in', [uid])],
                 'context': {'default_model': 'res.users', 'default_res_id': uid, 'typeof_thread': 'inbox'} }&quot;"/>
         </record>
 
diff --git a/addons/mail/res_partner.py b/addons/mail/res_partner.py
index 6f291f62f1b..df85ac3f17f 100644
--- a/addons/mail/res_partner.py
+++ b/addons/mail/res_partner.py
@@ -48,7 +48,7 @@ class res_partner_mail(osv.Model):
             private:
             - add the target partner in the message partner_ids
             - set thread_id as None, because this will trigger the 'private'
-                aspect of the message (model=False, res_is=False)
+                aspect of the message (model=False, res_id=False)
         """
         if isinstance(thread_id, (list, tuple)):
             thread_id = thread_id[0]

From b36547e3efca8d799c7250cd2549325a4a18f7bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 7 Nov 2012 16:41:29 +0100
Subject: [PATCH 051/143] [CLEAN] tools: mail: removed commented code; moved
 some code.

bzr revid: tde@openerp.com-20121107154129-nhz7qjv1ksq521ur
---
 openerp/tools/mail.py | 48 ++++++++++++++++++++++++-------------------
 1 file changed, 27 insertions(+), 21 deletions(-)

diff --git a/openerp/tools/mail.py b/openerp/tools/mail.py
index 1290ebbdec6..cebc6313b08 100644
--- a/openerp/tools/mail.py
+++ b/openerp/tools/mail.py
@@ -20,10 +20,7 @@
 ##############################################################################
 
 from lxml import etree
-# try:
-#     from lxml.html.soupparser import fromstring as parser_fromstring
-# except ImportError:
-#     from lxml.html import fromstring as parser_fromstring
+import cgi
 import logging
 import lxml.html
 import openerp.pooler as pooler
@@ -39,6 +36,10 @@ from openerp.loglevels import ustr
 _logger = logging.getLogger(__name__)
 
 
+#----------------------------------------------------------
+# HTML Sanitizer
+#----------------------------------------------------------
+
 def html_sanitize(src):
     if not src:
         return src
@@ -173,25 +174,9 @@ def html_email_clean(html):
 
 
 #----------------------------------------------------------
-# Emails
+# HTML/Text management
 #----------------------------------------------------------
 
-email_re = re.compile(r"""
-    ([a-zA-Z][\w\.-]*[a-zA-Z0-9]     # username part
-    @                                # mandatory @ sign
-    [a-zA-Z0-9][\w\.-]*              # domain must start with a letter ... Ged> why do we include a 0-9 then?
-     \.
-     [a-z]{2,3}                      # TLD
-    )
-    """, re.VERBOSE)
-res_re = re.compile(r"\[([0-9]+)\]", re.UNICODE)
-command_re = re.compile("^Set-([a-z]+) *: *(.+)$", re.I + re.UNICODE)
-
-# Updated in 7.0 to match the model name as well
-# Typical form of references is <timestamp-openerp-record_id-model_name@domain>
-# group(1) = the record ID ; group(2) = the model (if any) ; group(3) = the domain
-reference_re = re.compile("<.*-open(?:object|erp)-(\\d+)(?:-([\w.]+))?.*@(.*)>", re.UNICODE)
-
 def html2plaintext(html, body_id=None, encoding='utf-8'):
     """ From an HTML text, convert the HTML to plain text.
     If @param body_id is provided then this is the tag where the
@@ -248,6 +233,27 @@ def html2plaintext(html, body_id=None, encoding='utf-8'):
 
     return html
 
+
+#----------------------------------------------------------
+# Emails
+#----------------------------------------------------------
+
+email_re = re.compile(r"""
+    ([a-zA-Z][\w\.-]*[a-zA-Z0-9]     # username part
+    @                                # mandatory @ sign
+    [a-zA-Z0-9][\w\.-]*              # domain must start with a letter ... Ged> why do we include a 0-9 then?
+     \.
+     [a-z]{2,3}                      # TLD
+    )
+    """, re.VERBOSE)
+res_re = re.compile(r"\[([0-9]+)\]", re.UNICODE)
+command_re = re.compile("^Set-([a-z]+) *: *(.+)$", re.I + re.UNICODE)
+
+# Updated in 7.0 to match the model name as well
+# Typical form of references is <timestamp-openerp-record_id-model_name@domain>
+# group(1) = the record ID ; group(2) = the model (if any) ; group(3) = the domain
+reference_re = re.compile("<.*-open(?:object|erp)-(\\d+)(?:-([\w.]+))?.*@(.*)>", re.UNICODE)
+
 def generate_tracking_message_id(res_id):
     """Returns a string that can be used in the Message-ID RFC822 header field
 

From e6a90846779dade003230c1ceccdc42485dc70d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 7 Nov 2012 17:41:17 +0100
Subject: [PATCH 052/143] [IMP] tools: added text2html function, basically
 turning plaintext into html. Added a test for this function. Updated
 signature for demo data.

bzr revid: tde@openerp.com-20121107164117-2caoqna2aclzowpk
---
 openerp/addons/base/base_data.xml |  2 +-
 openerp/addons/base/base_demo.xml |  2 +-
 openerp/tests/test_mail.py        | 14 +++++++++-
 openerp/tools/mail.py             | 45 +++++++++++++++++++++++++------
 4 files changed, 52 insertions(+), 11 deletions(-)

diff --git a/openerp/addons/base/base_data.xml b/openerp/addons/base/base_data.xml
index 4c429fe56ff..943ae73435d 100644
--- a/openerp/addons/base/base_data.xml
+++ b/openerp/addons/base/base_data.xml
@@ -76,7 +76,7 @@
             <field name="company_id" ref="main_company"/>
             <field name="company_ids" eval="[(4, ref('main_company'))]"/>
             <field name="menu_id" ref="action_menu_admin"/>
-            <field name="signature">Administrator</field>
+            <field name="signature">--\nAdministrator</field>
         </record>
 
         <record id="main_partner" model="res.partner">
diff --git a/openerp/addons/base/base_demo.xml b/openerp/addons/base/base_demo.xml
index ce675ebb99e..e1ef2009f71 100644
--- a/openerp/addons/base/base_demo.xml
+++ b/openerp/addons/base/base_demo.xml
@@ -10,7 +10,7 @@
             <field name="partner_id" ref="base.partner_demo"/>
             <field name="login">demo</field>
             <field name="password">demo</field>
-            <field name="signature">Mr Demo</field>
+            <field name="signature">--\nMr Demo</field>
             <field name="company_id" ref="main_company"/>
             <field name="groups_id" eval="[(6,0,[ref('base.group_user')])]"/>
         </record>
diff --git a/openerp/tests/test_mail.py b/openerp/tests/test_mail.py
index ab82fc39caf..5a0c062b3a0 100755
--- a/openerp/tests/test_mail.py
+++ b/openerp/tests/test_mail.py
@@ -23,7 +23,7 @@
 ##############################################################################
 
 import unittest2
-from openerp.tools.mail import html_sanitize, html_email_clean, append_content_to_html
+from openerp.tools.mail import html_sanitize, html_email_clean, append_content_to_html, text2html
 
 test_case = """
 <font size="2" style="color: rgb(31, 31, 31); font-family: monospace; font-variant: normal; line-height: normal; ">test1</font>
@@ -189,5 +189,17 @@ class TestCleaner(unittest2.TestCase):
         self.assertNotIn(new_html, 'Bert Tartopoils')
 
 
+class TestText2Html(unittest2.TestCase):
+
+    def test_text2html(self):
+        cases = [
+            ("First \nSecond \nThird\n \nParagraph\n\r--\nSignature paragraph", 'div',
+             "<div><p>First <br/>Second <br/>Third</p><p>Paragraph</p><p>--<br/>Signature paragraph</p></div>"),
+        ]
+        for content, container_tag, expected in cases:
+            html = text2html(content, container_tag)
+            self.assertEqual(html, expected, 'text2html is broken')
+
+
 if __name__ == '__main__':
     unittest2.main()
diff --git a/openerp/tools/mail.py b/openerp/tools/mail.py
index cebc6313b08..861f6d82243 100644
--- a/openerp/tools/mail.py
+++ b/openerp/tools/mail.py
@@ -192,7 +192,7 @@ def html2plaintext(html, body_id=None, encoding='utf-8'):
     tree = fromstring(html, parser=HTMLParser())
 
     if body_id is not None:
-        source = tree.xpath('//*[@id=%s]'%(body_id,))
+        source = tree.xpath('//*[@id=%s]' % (body_id,))
     else:
         source = tree.xpath('//body')
     if len(source):
@@ -210,12 +210,12 @@ def html2plaintext(html, body_id=None, encoding='utf-8'):
 
     html = ustr(tostring(tree, encoding=encoding))
 
-    html = html.replace('<strong>','*').replace('</strong>','*')
-    html = html.replace('<b>','*').replace('</b>','*')
-    html = html.replace('<h3>','*').replace('</h3>','*')
-    html = html.replace('<h2>','**').replace('</h2>','**')
-    html = html.replace('<h1>','**').replace('</h1>','**')
-    html = html.replace('<em>','/').replace('</em>','/')
+    html = html.replace('<strong>', '*').replace('</strong>', '*')
+    html = html.replace('<b>', '*').replace('</b>', '*')
+    html = html.replace('<h3>', '*').replace('</h3>', '*')
+    html = html.replace('<h2>', '**').replace('</h2>', '**')
+    html = html.replace('<h1>', '**').replace('</h1>', '**')
+    html = html.replace('<em>', '/').replace('</em>', '/')
     html = html.replace('<tr>', '\n')
     html = html.replace('</p>', '\n')
     html = re.sub('<br\s*/?>', '\n', html)
@@ -229,10 +229,39 @@ def html2plaintext(html, body_id=None, encoding='utf-8'):
     for i, url in enumerate(url_index):
         if i == 0:
             html += '\n\n'
-        html += ustr('[%s] %s\n') % (i+1, url)
+        html += ustr('[%s] %s\n') % (i + 1, url)
 
     return html
 
+def text2html(text, container_tag='div'):
+    """ Convert plaintext into html. Content of the text is escaped to manage
+        html entities, using cgi.escape().
+        - all \n,\r are replaced by <br />
+        - enclose content into <p>
+        - 2 or more consecutive <br /> are considered as paragraph breaks
+
+        :param string container_tag: container of the html; by default the
+            content is embedded into a <div>
+    """
+    text = cgi.escape(text)
+
+    # 1. replace \n and \r
+    text = text.replace('\n', '<br/>')
+    text = text.replace('\r', '<br/>')
+
+    # 2-3: form paragraphs
+    idx = 0
+    final = '<p>'
+    br_tags = re.compile(r'(([<]\s*[bB][rR]\s*\/?[>]\s*){2,})')
+    for item in re.finditer(br_tags, text):
+        final += text[idx:item.start()] + '</p><p>'
+        idx = item.end()
+    final += text[idx:] + '</p>'
+
+    # 4. container
+    if container_tag:
+        final = '<%s>%s</%s>' % (container_tag, final, container_tag)
+    return final
 
 #----------------------------------------------------------
 # Emails

From b7188293d72f2c5cfd562881a2bf6414a989f818 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 7 Nov 2012 17:42:54 +0100
Subject: [PATCH 053/143] [IMP] Portal: updated demo data.

bzr revid: tde@openerp.com-20121107164254-0ypt3sltc5e2vfkl
---
 addons/portal/portal_demo.xml | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/addons/portal/portal_demo.xml b/addons/portal/portal_demo.xml
index e8d0fb4159b..d40837d4c0b 100644
--- a/addons/portal/portal_demo.xml
+++ b/addons/portal/portal_demo.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <openerp>
-    <data>
+    <data noupdate="1">
 
         <!-- Create a portal member attached to a partner -->
         <record id="demo_user0" model="res.users">
@@ -24,14 +24,11 @@
             <field name="subject">Our company's first blog-post !</field>
             <field name="model">mail.group</field>
             <field name="res_id" ref="company_news_feed"/>
-            <field name="body"><![CDATA[Hello, and welcome to our company's portal !
-
-Lorem ipsum <b>sit amet</b>, consectetur <em>adipiscing elit</em>. Pellentesque et quam sapien, in sagittis tellus.
-Praesent vel massa sed massa consequat egestas in tristique orci. Praesent iaculis libero et neque vehicula iaculis. Vivamus placerat tincidunt orci ac ornare. Proin ut dolor fringilla velit ultricies consequat. Maecenas sit amet ipsum non leo interdum imperdiet. Donec sapien mi.
-
-Fusce tempus elit volutpat mi auctor adipiscing. Nam congue luctus suscipit. Sed tellus libero, venenatis ut mollis ut, luctus quis dui. Sed rhoncus pulvinar orci in consectetur.
-
-Nulla turpis leo, rhoncus ut egestas sit amet, consectetur vitae urna. Mauris in dolor in sapien tempus vehicula.]]></field>
+            <field name="body"><![CDATA[<p>Hello, and welcome to our company's portal !</p>
+<p>Lorem ipsum <b>sit amet</b>, consectetur <em>adipiscing elit</em>. Pellentesque et quam sapien, in sagittis tellus.
+Praesent vel massa sed massa consequat egestas in tristique orci. Praesent iaculis libero et neque vehicula iaculis. Vivamus placerat tincidunt orci ac ornare. Proin ut dolor fringilla velit ultricies consequat. Maecenas sit amet ipsum non leo interdum imperdiet. Donec sapien mi.</p>
+<p>Fusce tempus elit volutpat mi auctor adipiscing. Nam congue luctus suscipit. Sed tellus libero, venenatis ut mollis ut, luctus quis dui. Sed rhoncus pulvinar orci in consectetur.</p>
+<p>Nulla turpis leo, rhoncus ut egestas sit amet, consectetur vitae urna. Mauris in dolor in sapien tempus vehicula.</p>]]></field>
             <field name="type">comment</field>
             <field name="author_id" ref="base.partner_root"/>
         </record>
@@ -39,7 +36,7 @@ Nulla turpis leo, rhoncus ut egestas sit amet, consectetur vitae urna. Mauris in
         <record id="message_company_news0_comment0" model="mail.message">
             <field name="model">mail.group</field>
             <field name="res_id" ref="company_news_feed"/>
-            <field name="body"><![CDATA[Great first blogpost !  (first comment)]]></field>
+            <field name="body"><![CDATA[<p>Great first blogpost!</p>]]></field>
             <field name="parent_id" ref="message_company_news0"/>
             <field name="type">comment</field>
             <field name="author_id" ref="base.res_partner_1"/>
@@ -48,7 +45,7 @@ Nulla turpis leo, rhoncus ut egestas sit amet, consectetur vitae urna. Mauris in
         <record id="message_company_news0_comment1" model="mail.message">
             <field name="model">mail.group</field>
             <field name="res_id" ref="company_news_feed"/>
-            <field name="body"><![CDATA[Thanks !  (second comment)]]></field>
+            <field name="body"><![CDATA[<p>Thanks!</p>]]></field>
             <field name="parent_id" ref="message_company_news0"/>
             <field name="type">comment</field>
             <field name="author_id" ref="base.partner_demo"/>

From 3027b749ba9561b5b83fb2477ef30f6547471171 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 7 Nov 2012 18:02:41 +0100
Subject: [PATCH 054/143] [IMP] mail: signature in send notifications is now
 plaintext (as before), but htmlized (not inside a pre, but inside div and p,
 with entities escaped). Updated mail tests. Same for portal URL. Updated
 portal tests.

bzr revid: tde@openerp.com-20121107170241-0gjwraxkuhe0fm6p
---
 addons/mail/mail_followers.py  | 10 ++++++----
 addons/mail/tests/test_mail.py | 10 +++++-----
 addons/portal/mail_mail.py     |  2 +-
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/addons/mail/mail_followers.py b/addons/mail/mail_followers.py
index 31220b7c348..7406108229a 100644
--- a/addons/mail/mail_followers.py
+++ b/addons/mail/mail_followers.py
@@ -151,16 +151,18 @@ class mail_notification(osv.Model):
 
         # add the context in the email
         # TDE FIXME: commented, to be improved in a future branch
-        # quote_context = self.pool.get('mail.message').message_quote_context(cr, uid, msg_id, context=context)
+        quote_context = self.pool.get('mail.message').message_quote_context(cr, uid, msg_id, context=context)
 
         mail_mail = self.pool.get('mail.mail')
         # add signature
         body_html = msg.body
-        # if quote_context:
-        #     body_html = tools.append_content_to_html(body_html, quote_context, plaintext=False)
+        if quote_context:
+            pass
+            # print quote_context
+            # body_html = tools.append_content_to_html(body_html, quote_context, plaintext=False)
         signature = msg.author_id and msg.author_id.user_ids[0].signature or ''
         if signature:
-            body_html = tools.append_content_to_html(body_html, signature)
+            body_html = tools.append_content_to_html(body_html, tools.text2html(signature), plaintext=False)
 
         mail_values = {
             'mail_message_id': msg.id,
diff --git a/addons/mail/tests/test_mail.py b/addons/mail/tests/test_mail.py
index b15c699f09c..bd0509fb22c 100644
--- a/addons/mail/tests/test_mail.py
+++ b/addons/mail/tests/test_mail.py
@@ -88,7 +88,7 @@ class test_mail(test_mail_mockup.TestMailMockups):
 
     def _mock_send_get_mail_body(self, *args, **kwargs):
         # def _send_get_mail_body(self, cr, uid, mail, partner=None, context=None)
-        body = tools.append_content_to_html(args[2].body_html, kwargs.get('partner').name if kwargs.get('partner') else 'No specific partner')
+        body = tools.append_content_to_html(args[2].body_html, kwargs.get('partner').name if kwargs.get('partner') else 'No specific partner', plaintext=False)
         return body
 
     def setUp(self):
@@ -343,10 +343,10 @@ class test_mail(test_mail_mockup.TestMailMockups):
         _subject = 'Pigs'
         _mail_subject = '%s posted on %s' % (user_admin.name, group_pigs.name)
         _body1 = 'Pigs rules'
-        _mail_body1 = 'Pigs rules\n<pre>Admin</pre>\n'
-        _mail_bodyalt1 = 'Pigs rules\nAdmin'
+        _mail_body1 = 'Pigs rules\n<div><p>Admin</p></div>\n'
+        _mail_bodyalt1 = 'Pigs rules\nAdmin\n'
         _body2 = '<html>Pigs rules</html>'
-        _mail_body2 = html_sanitize('<html>Pigs rules\n<pre>Admin</pre>\n</html>')
+        _mail_body2 = html_sanitize('<html>Pigs rules\n<div><p>Admin</p></div>\n</html>')
         _mail_bodyalt2 = 'Pigs rules\nAdmin'
         _attachments = [('First', 'My first attachment'), ('Second', 'My second attachment')]
 
@@ -367,7 +367,7 @@ class test_mail(test_mail_mockup.TestMailMockups):
         # Test: sent_email: email send by server: correct subject, body, body_alternative
         for sent_email in sent_emails:
             self.assertEqual(sent_email['subject'], _subject, 'sent_email subject incorrect')
-            self.assertEqual(sent_email['body'], _mail_body1 + '\n<pre>Bert Tartopoils</pre>\n', 'sent_email body incorrect')
+            self.assertEqual(sent_email['body'], _mail_body1 + '\nBert Tartopoils\n', 'sent_email body incorrect')
             # the html2plaintext uses etree or beautiful soup, so the result may be slighly different
             # depending if you have installed beautiful soup.
             self.assertIn(sent_email['body_alternative'], _mail_bodyalt1 + '\nBert Tartopoils\n', 'sent_email body_alternative is incorrect')
diff --git a/addons/portal/mail_mail.py b/addons/portal/mail_mail.py
index f57170ed67b..0dc7348f2c8 100644
--- a/addons/portal/mail_mail.py
+++ b/addons/portal/mail_mail.py
@@ -36,5 +36,5 @@ class mail_mail(osv.Model):
         if partner:
             context = dict(context or {}, signup_valid=True)
             partner = self.pool.get('res.partner').browse(cr, uid, partner.id, context)
-            body = tools.append_content_to_html(body, "Log in our portal at: %s" % partner.signup_url)
+            body = tools.append_content_to_html(body, ("<div><p>Log in our portal at: %s</p></div>" % partner.signup_url), plaintext=False)
         return body

From ead36dfd9a4d6f65327e951825c35859649c74fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 7 Nov 2012 18:03:05 +0100
Subject: [PATCH 055/143] [TMP] mail.compose.message wizard: set some fields
 visible for debug purpose. Will have to be reverted when merging.

bzr revid: tde@openerp.com-20121107170305-1ukzn33bak8y0irl
---
 addons/mail/wizard/mail_compose_message_view.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/mail/wizard/mail_compose_message_view.xml b/addons/mail/wizard/mail_compose_message_view.xml
index b9c3d237e78..2ba774f50fc 100644
--- a/addons/mail/wizard/mail_compose_message_view.xml
+++ b/addons/mail/wizard/mail_compose_message_view.xml
@@ -8,11 +8,11 @@
                 <form string="Compose Email" version="7.0">
                     <group>
                         <!-- truly invisible fields for control and options -->
-                        <field name="composition_mode" invisible="1"/>
-                        <field name="model" invisible="1"/>
-                        <field name="res_id" invisible="1"/>
-                        <field name="parent_id" invisible="1"/>
-                        <field name="content_subtype" invisible="1"/>
+                        <field name="composition_mode" invisible="0"/>
+                        <field name="model" invisible="0"/>
+                        <field name="res_id" invisible="0"/>
+                        <field name="parent_id" invisible="0"/>
+                        <field name="content_subtype" invisible="0"/>
                         <!-- visible wizard -->
                         <field name="partner_ids" widget="many2many_tags_email" placeholder="Add contacts to notify..."
                                 context="{'force_email':True}" required="1"/>

From 389b502b63c4ebfe5386dc8bacd5e2e5b5bdc1cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 7 Nov 2012 18:15:21 +0100
Subject: [PATCH 056/143] [FIX] mail: posting from mailboxes now correctly
 handles recipients of replies message. Body is now converted into html.

bzr revid: tde@openerp.com-20121107171521-whwcjefpjvt91ye6
---
 addons/mail/mail_thread.py | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index ca598ce3a93..c483fca9537 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -710,12 +710,24 @@ class mail_thread(osv.AbstractModel):
     def message_post_api(self, cr, uid, thread_id, body='', subject=False, parent_id=False, attachment_ids=None, context=None):
         """ Wrapper on message_post, used only in Chatter (JS). The purpose is
             to handle attachments.
-            # TDE FIXME: body is plaintext: convert it into html
+            - body is plaintext: convert it into html
+            - handle reply to a previous message
         """
-        new_message_id = self.message_post(cr, uid, thread_id=thread_id, body=body, subject=subject, type='comment',
-                        subtype='mail.mt_comment', parent_id=parent_id, context=context)
+        # 1. handle body
+        body = tools.text2html(body)
 
-        # HACK FIXME: Chatter: attachments linked to the document (not done JS-side), load the message
+        # 2. handle message partner_ids
+        if parent_id:
+            parent_data = self.pool.get('mail.message').browse(cr, uid, parent_id, context=context)
+            partner_ids = [(4, partner.id) for partner in parent_data.partner_ids]
+        else:
+            partner_ids = []
+
+        # 3. post message
+        new_message_id = self.message_post(cr, uid, thread_id=thread_id, body=body, subject=subject, type='comment',
+                        subtype='mail.mt_comment', parent_id=parent_id, context=context, partner_ids=partner_ids)
+
+        # 4. HACK FIXME: Chatter: attachments linked to the document (not done JS-side), load the message
         if attachment_ids:
             ir_attachment = self.pool.get('ir.attachment')
             mail_message = self.pool.get('mail.message')

From 935964a7100c8d3992c39ee7cb3a7162263c8c9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 7 Nov 2012 18:22:37 +0100
Subject: [PATCH 057/143] [IMP] mail: mail_message: some string made more
 understandable.

bzr revid: tde@openerp.com-20121107172237-iqe5ay844eh2zsm5
---
 addons/mail/mail_message.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 4f1c0a00e77..08c14dbc4d1 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -125,7 +125,7 @@ class mail_message(osv.Model):
             help="Author of the message. If not set, email_from may hold an email address that did not match any partner."),
         'partner_ids': fields.many2many('res.partner', string='Recipients'),
         'notified_partner_ids': fields.many2many('res.partner', 'mail_notification',
-            'message_id', 'partner_id', 'Recipients'),
+            'message_id', 'partner_id', 'Notified partners'),
         'attachment_ids': fields.many2many('ir.attachment', 'message_attachment_rel',
             'message_id', 'attachment_id', 'Attachments'),
         'parent_id': fields.many2one('mail.message', 'Parent Message', select=True, ondelete='set null', help="Initial thread message."),

From 46eb09b933ccc6544c29a37eac67f343bd903471 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 8 Nov 2012 10:07:33 +0100
Subject: [PATCH 058/143] [FIX] mail: needaction counter on mailboxes.

bzr revid: tde@openerp.com-20121108090733-nhjug1ysn22tnjvw
---
 addons/mail/mail_thread_view.xml | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/addons/mail/mail_thread_view.xml b/addons/mail/mail_thread_view.xml
index 9737d93dd8f..768bbc25b75 100644
--- a/addons/mail/mail_thread_view.xml
+++ b/addons/mail/mail_thread_view.xml
@@ -4,6 +4,7 @@
         <record id="action_mail_inbox_feeds" model="ir.actions.client">
             <field name="name">Inbox</field>
             <field name="tag">mail.wall</field>
+            <field name="res_model">mail.message</field>
             <field name="params" eval="&quot;{'domain': [('notification_ids.partner_id.user_ids', 'in', [uid]), ('to_read', '=', True)],
                 'context': {'default_model': 'res.users', 'default_res_id': uid, 'typeof_thread': 'inbox'} }&quot;"/>
         </record>
@@ -11,29 +12,33 @@
         <record id="action_mail_to_me_feeds" model="ir.actions.client">
             <field name="name">To: me</field>
             <field name="tag">mail.wall</field>
+            <field name="res_model">mail.message</field>
             <field name="params" eval="&quot;{'domain': [('partner_ids.user_ids', 'in', [uid])],
-                'context': {'default_model': 'res.users', 'default_res_id': uid, 'typeof_thread': 'inbox'} }&quot;"/>
+                'context': {'default_model': 'res.users', 'default_res_id': uid, 'typeof_thread': 'inbox'}, }&quot;"/>
         </record>
 
         <record id="action_mail_star_feeds" model="ir.actions.client">
             <field name="name">Favorites</field>
             <field name="tag">mail.wall</field>
+            <field name="res_model">mail.message</field>
             <field name="params" eval="&quot;{'domain': [('favorite_user_ids.user_ids', 'in', [uid])],
-                'context': {'default_model': 'res.users', 'default_res_id': uid, 'typeof_thread': 'stared'} }&quot;"/>
+                'context': {'default_model': 'res.users', 'default_res_id': uid, 'typeof_thread': 'stared'}, }&quot;"/>
         </record>
 
         <record id="action_mail_archives_feeds" model="ir.actions.client">
             <field name="name">Archives</field>
             <field name="tag">mail.wall</field>
+            <field name="res_model">mail.message</field>
             <field name="params" eval="&quot;{'domain': [('notification_ids.partner_id.user_ids', 'in', [uid]), ('to_read', '=', False)],
-                'context': {'default_model': 'res.users', 'default_res_id': uid, 'typeof_thread': 'archives'} }&quot;"/>
+                'context': {'default_model': 'res.users', 'default_res_id': uid, 'typeof_thread': 'archives'}, }&quot;"/>
         </record>
 
         <record id="action_mail_sent_feeds" model="ir.actions.client">
             <field name="name">Sent</field>
             <field name="tag">mail.wall</field>
+            <field name="res_model">mail.message</field>
             <field name="params" eval="&quot;{'domain': [('author_id.user_ids', 'in', [uid])],
-                'context': {'default_model': 'res.users', 'default_res_id': uid, 'typeof_thread': 'send'} }&quot;"/>
+                'context': {'default_model': 'res.users', 'default_res_id': uid, 'typeof_thread': 'send'}, }&quot;"/>
         </record>
 
         <!-- MENU -->

From 89083480fa2dd3fa6eb9ebd549867eaa838e2e27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 8 Nov 2012 11:17:15 +0100
Subject: [PATCH 059/143] [IMP] [DEMO] admin, demo: updated demo data (email,
 signature).

bzr revid: tde@openerp.com-20121108101715-3ipopg5otdq9u0vx
---
 openerp/addons/base/base_data.xml | 4 +++-
 openerp/addons/base/base_demo.xml | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/openerp/addons/base/base_data.xml b/openerp/addons/base/base_data.xml
index 943ae73435d..9bd9b9ef19c 100644
--- a/openerp/addons/base/base_data.xml
+++ b/openerp/addons/base/base_data.xml
@@ -67,6 +67,7 @@
 
         <record model="res.partner" id="base.partner_root">
             <field name="name">Administrator</field>
+            <field name="email">admin@example.com</field>
             <field name="company_id" ref="main_company"/>
             <field name="customer" eval="False"/>
         </record>
@@ -76,7 +77,8 @@
             <field name="company_id" ref="main_company"/>
             <field name="company_ids" eval="[(4, ref('main_company'))]"/>
             <field name="menu_id" ref="action_menu_admin"/>
-            <field name="signature">--\nAdministrator</field>
+            <field name="signature">--
+Administrator</field>
         </record>
 
         <record id="main_partner" model="res.partner">
diff --git a/openerp/addons/base/base_demo.xml b/openerp/addons/base/base_demo.xml
index e1ef2009f71..1dc27a3d05e 100644
--- a/openerp/addons/base/base_demo.xml
+++ b/openerp/addons/base/base_demo.xml
@@ -3,6 +3,7 @@
     <data noupdate="1">
         <record id="partner_demo" model="res.partner">
             <field name="name">Demo User</field>
+            <field name="email">demo@example.com</field>
             <field name="company_id" ref="main_company"/>
             <field name="customer" eval="False"/>
         </record>
@@ -10,7 +11,8 @@
             <field name="partner_id" ref="base.partner_demo"/>
             <field name="login">demo</field>
             <field name="password">demo</field>
-            <field name="signature">--\nMr Demo</field>
+            <field name="signature">--
+Mr Demo</field>
             <field name="company_id" ref="main_company"/>
             <field name="groups_id" eval="[(6,0,[ref('base.group_user')])]"/>
         </record>

From 03cfda4febad3034524fd2dabf6eb073fb95ac4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 8 Nov 2012 11:18:05 +0100
Subject: [PATCH 060/143] [IMP] [DEMO] mail, portal: updated demo data.

bzr revid: tde@openerp.com-20121108101805-1sb1gcatj2oztq39
---
 addons/mail/data/mail_demo.xml | 16 +++++++-----
 addons/portal/portal_demo.xml  | 46 +++++++++++++++++++++++-----------
 2 files changed, 41 insertions(+), 21 deletions(-)

diff --git a/addons/mail/data/mail_demo.xml b/addons/mail/data/mail_demo.xml
index 3244e047da4..f196b1c48a4 100644
--- a/addons/mail/data/mail_demo.xml
+++ b/addons/mail/data/mail_demo.xml
@@ -5,46 +5,50 @@
         <record id="message_blogpost0" model="mail.message">
             <field name="model">mail.group</field>
             <field name="res_id" ref="mail.group_all_employees"/>
-            <field name="body"><![CDATA[<p>Your monthly meal vouchers arrived. You can get them at Christine's office.
-This month you also get 250 EUR of eco-vouchers if you have been in the company for more than a year.</p>]]></field>
+            <field name="body"><![CDATA[<p>Your monthly meal vouchers arrived. You can get them at Christine's office.</p>]]></field>
             <field name="type">comment</field>
             <field name="subtype_id" ref="mt_comment"/>
+            <field name="author_id" ref="base.partner_root"/>
         </record>
 
         <record id="message_blogpost0_comment0" model="mail.message">
             <field name="model">mail.group</field>
             <field name="res_id" ref="group_all_employees"/>
-            <field name="body"><![CDATA[<p>Great.</p>]]></field>
+            <field name="body"><![CDATA[<p>Oh, I had forgotten. This month you also get 250 EUR of eco-vouchers if you have been in the company for more than a year.</p>]]></field>
             <field name="parent_id" ref="message_blogpost0"/>
             <field name="type">comment</field>
             <field name="subtype_id" ref="mt_comment"/>
+            <field name="author_id" ref="base.partner_root"/>
         </record>
 
         <record id="message_blogpost0_comment1" model="mail.message">
             <field name="model">mail.group</field>
             <field name="res_id" ref="group_all_employees"/>
-            <field name="body"><![CDATA[<p>Thanks, but where is Christine's office, if I may ask? (I'm new here)</p>]]></field>
+            <field name="body"><![CDATA[<p>Thanks! Could you please remind me where is Christine's office, if I may ask? I'm new here!</p>]]></field>
             <field name="parent_id" ref="message_blogpost0"/>
             <field name="type">comment</field>
             <field name="subtype_id" ref="mt_comment"/>
+            <field name="author_id" ref="base.partner_demo"/>
         </record>
 
         <record id="message_blogpost0_comment2" model="mail.message">
             <field name="model">mail.group</field>
             <field name="res_id" ref="group_all_employees"/>
-            <field name="body"><![CDATA[<p>Building B3, second floor on the right :-)</p>]]></field>
+            <field name="body"><![CDATA[<p>Building B3, second floor on the right :-).</p>]]></field>
             <field name="parent_id" ref="message_blogpost0"/>
             <field name="type">comment</field>
             <field name="subtype_id" ref="mt_comment"/>
+            <field name="author_id" ref="base.partner_root"/>
         </record>
 
         <record id="message_blogpost0_comment3" model="mail.message">
             <field name="model">mail.group</field>
             <field name="res_id" ref="group_all_employees"/>
-            <field name="body"><![CDATA[<p>Great news, I need to buy a new fridge, I think I can pay it with the eco-vouchers!</p>]]></field>
+            <field name="body"><![CDATA[<p>Many thanks. Actually that's good news, next year I'll have to buy a new fridge, I think I will pay it with the eco-vouchers!</p>]]></field>
             <field name="parent_id" ref="message_blogpost0"/>
             <field name="type">comment</field>
             <field name="subtype_id" ref="mt_comment"/>
+            <field name="author_id" ref="base.partner_demo"/>
         </record>
 
     </data>
diff --git a/addons/portal/portal_demo.xml b/addons/portal/portal_demo.xml
index d40837d4c0b..5ab4bdd7365 100644
--- a/addons/portal/portal_demo.xml
+++ b/addons/portal/portal_demo.xml
@@ -2,21 +2,26 @@
 <openerp>
     <data noupdate="1">
 
-        <!-- Create a portal member attached to a partner -->
-        <record id="demo_user0" model="res.users">
+        <!-- Create a partner, that is also a portal user -->
+        <record id="partner_demo_portal" model="res.partner">
             <field name="name">Demo Portal User</field>
-            <field name="login">portal</field>
-            <field name="password">portal</field>
-            <!-- Avoid auto-including this user in any default group -->
-            <field name="groups_id" eval="[(5,)]"/>
+            <field name="email">demo@portal.example.com</field>
             <field name="supplier" eval="False"/>
             <field name="customer" eval="True"/>
-            <field name="email">demo@portal.wrong.address</field>
+        </record>
+        <record id="user_demo_portal" model="res.users">
+            <field name="partner_id" ref="partner_demo_portal"/>
+            <field name="login">portal</field>
+            <field name="password">portal</field>
+            <field name="signature">--
+Mr Demo Portal</field>
+            <!-- Avoid auto-including this user in any default group -->
+            <field name="groups_id" eval="[(5,)]"/>
         </record>
 
         <!-- Add the demo user to the portal (and therefore to the portal member group) -->
         <record id="group_portal" model="res.groups">
-            <field name="users" eval="[(4,ref('demo_user0'))]"/>
+            <field name="users" eval="[(4,ref('user_demo_portal'))]"/>
         </record>
 
         <!-- Company news and comments -->
@@ -25,29 +30,40 @@
             <field name="model">mail.group</field>
             <field name="res_id" ref="company_news_feed"/>
             <field name="body"><![CDATA[<p>Hello, and welcome to our company's portal !</p>
-<p>Lorem ipsum <b>sit amet</b>, consectetur <em>adipiscing elit</em>. Pellentesque et quam sapien, in sagittis tellus.
-Praesent vel massa sed massa consequat egestas in tristique orci. Praesent iaculis libero et neque vehicula iaculis. Vivamus placerat tincidunt orci ac ornare. Proin ut dolor fringilla velit ultricies consequat. Maecenas sit amet ipsum non leo interdum imperdiet. Donec sapien mi.</p>
-<p>Fusce tempus elit volutpat mi auctor adipiscing. Nam congue luctus suscipit. Sed tellus libero, venenatis ut mollis ut, luctus quis dui. Sed rhoncus pulvinar orci in consectetur.</p>
-<p>Nulla turpis leo, rhoncus ut egestas sit amet, consectetur vitae urna. Mauris in dolor in sapien tempus vehicula.</p>]]></field>
+<p>It is a great pleasure to announce you the creation of our portal by writing this first news! As you may have seen, a new discussion group is now present under your 'My groups' menu: <b>Company's News</b>. We will post news about the company and its employees in this discussion group. Moreover, we will be able to communicate with our partners that are given the opportunity to join us in our portal.</p>
+<p>A new era of communication has begun! <b>Feel free to post your feelings about our portal by replying on this message!</b></p>]]></field>
             <field name="type">comment</field>
+            <field name="subtype_id" ref="mail.mt_comment"/>
             <field name="author_id" ref="base.partner_root"/>
         </record>
 
         <record id="message_company_news0_comment0" model="mail.message">
             <field name="model">mail.group</field>
             <field name="res_id" ref="company_news_feed"/>
-            <field name="body"><![CDATA[<p>Great first blogpost!</p>]]></field>
+            <field name="body"><![CDATA[<p>As your first portal member, I am very pleased to be able to be able to communicate directly with you. Be sure I'll read all news carefully!</p>]]></field>
             <field name="parent_id" ref="message_company_news0"/>
             <field name="type">comment</field>
-            <field name="author_id" ref="base.res_partner_1"/>
+            <field name="subtype_id" ref="mail.mt_comment"/>
+            <field name="author_id" ref="partner_demo_portal"/>
         </record>
 
         <record id="message_company_news0_comment1" model="mail.message">
             <field name="model">mail.group</field>
             <field name="res_id" ref="company_news_feed"/>
-            <field name="body"><![CDATA[<p>Thanks!</p>]]></field>
+            <field name="body"><![CDATA[<p>That's good news! As said by <i>Demo Portal User</i> in the previous post, I'm looking forward to hearing from you!</p>]]></field>
             <field name="parent_id" ref="message_company_news0"/>
             <field name="type">comment</field>
+            <field name="subtype_id" ref="mail.mt_comment"/>
+            <field name="author_id" ref="base.res_partner_1"/>
+        </record>
+
+        <record id="message_company_news0_comment2" model="mail.message">
+            <field name="model">mail.group</field>
+            <field name="res_id" ref="company_news_feed"/>
+            <field name="body"><![CDATA[<p>This feature is realy great! We will be able to communicate directly to our partners!</p>]]></field>
+            <field name="parent_id" ref="message_company_news0"/>
+            <field name="type">comment</field>
+            <field name="subtype_id" ref="mail.mt_comment"/>
             <field name="author_id" ref="base.partner_demo"/>
         </record>
 

From 72f218bd24a64acc5f6c573199a20d4d88e7c9fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 8 Nov 2012 11:18:19 +0100
Subject: [PATCH 061/143] [IMP] mail: css: small tweak.

bzr revid: tde@openerp.com-20121108101819-qsuhbo0qk3u5j92k
---
 addons/mail/static/src/css/mail.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index 652714bffd7..c9d2a3fd52d 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -58,8 +58,8 @@
     margin-top: 2px;
 }
 .openerp .oe_mail .oe_msg .oe_msg_content .oe_msg_body p{
-    margin-top: 0px;
-    margin-bottom: 0px;
+    margin-top: 2px;
+    margin-bottom: 2px;
 }
 
 /* a) Indented Messages */

From d5d7dced4d3f2b27c14f8925ca98dff8f9f30b50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 8 Nov 2012 16:25:02 +0100
Subject: [PATCH 062/143] [FIX] mail: message_process now handles replies to
 messages without model, thread_id. Based on in-reply-to, it finds the parent
 message. mail_thread.message_post_user_api is called to create a new
 mail.message, bypassing message_new / message_update in this case. Some
 improvements added to partner_ids when using the chatter or message
 processing.

bzr revid: tde@openerp.com-20121108152502-aow7vhu4erx7fb9l
---
 addons/mail/mail_thread.py        | 110 ++++++++++++++++++++----------
 addons/mail/static/src/js/mail.js |   2 +-
 2 files changed, 74 insertions(+), 38 deletions(-)

diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index c483fca9537..b3e5423ae4d 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -319,10 +319,12 @@ class mail_thread(osv.AbstractModel):
         """
         assert isinstance(message, Message), 'message must be an email.message.Message at this point'
         message_id = message.get('Message-Id')
+        references = decode_header(message, 'References')
+        in_reply_to = decode_header(message, 'In-Reply-To')
 
         # 1. Verify if this is a reply to an existing thread
-        references = decode_header(message, 'References') or decode_header(message, 'In-Reply-To')
-        ref_match = references and tools.reference_re.search(references)
+        thread_references = references or in_reply_to
+        ref_match = thread_references and tools.reference_re.search(thread_references)
         if ref_match:
             thread_id = int(ref_match.group(1))
             model = ref_match.group(2) or model
@@ -333,6 +335,15 @@ class mail_thread(osv.AbstractModel):
                               message_id, model, thread_id, custom_values, uid)
                 return [(model, thread_id, custom_values, uid)]
 
+        # Verify this is a reply to a private message
+        message_ids = self.pool.get('mail.message').search(cr, uid, [('message_id', 'ilike', in_reply_to)], limit=1, context=context)
+        if message_ids:
+            message = self.pool.get('mail.message').browse(cr, uid, message_ids[0], context=context)
+            _logger.debug('Routing mail with Message-Id %s: reply to a private message: %s, custom_values: %s, uid: %s',
+                            message_id, message.id, custom_values, uid)
+            return [(False, 0, custom_values, uid)]
+
+
         # 2. Look for a matching mail.alias entry
         # Delivered-To is a safe bet in most modern MTAs, but we have to fallback on To + Cc values
         # for all the odd MTAs out there, as there is no standard header for the envelope's `rcpt_to` value.
@@ -376,14 +387,19 @@ class mail_thread(osv.AbstractModel):
     def message_process(self, cr, uid, model, message, custom_values=None,
                         save_original=False, strip_attachments=False,
                         thread_id=None, context=None):
-        """Process an incoming RFC2822 email message, relying on
-           ``mail.message.parse()`` for the parsing operation,
-           and ``message_route()`` to figure out the target model.
+        """ Process an incoming RFC2822 email message, relying on
+            ``mail.message.parse()`` for the parsing operation,
+            and ``message_route()`` to figure out the target model.
 
-           Once the target model is known, its ``message_new`` method
-           is called with the new message (if the thread record did not exist)
+            Once the target model is known, its ``message_new`` method
+            is called with the new message (if the thread record did not exist)
             or its ``message_update`` method (if it did).
 
+            There is a special case where the target model is False: a reply
+            to a private message. In this case, we skip the message_new /
+            message_update step, to just post a new message using mail_thread
+            message_post.
+
            :param string model: the fallback model to use if the message
                does not match any of the currently configured mail aliases
                (may be None if a matching alias is supposed to be present)
@@ -425,15 +441,18 @@ class mail_thread(osv.AbstractModel):
         for model, thread_id, custom_values, user_id in routes:
             if self._name != model:
                 context.update({'thread_model': model})
-            model_pool = self.pool.get(model)
-            assert thread_id and hasattr(model_pool, 'message_update') or hasattr(model_pool, 'message_new'), \
-                "Undeliverable mail with Message-Id %s, model %s does not accept incoming emails" % \
-                    (msg['message_id'], model)
-            if thread_id and hasattr(model_pool, 'message_update'):
-                model_pool.message_update(cr, user_id, [thread_id], msg, context=context)
+            if model:
+                model_pool = self.pool.get(model)
+                assert thread_id and hasattr(model_pool, 'message_update') or hasattr(model_pool, 'message_new'), \
+                    "Undeliverable mail with Message-Id %s, model %s does not accept incoming emails" % \
+                        (msg['message_id'], model)
+                if thread_id and hasattr(model_pool, 'message_update'):
+                    model_pool.message_update(cr, user_id, [thread_id], msg, context=context)
+                else:
+                    thread_id = model_pool.message_new(cr, user_id, msg, custom_values, context=context)
             else:
-                thread_id = model_pool.message_new(cr, user_id, msg, custom_values, context=context)
-            model_pool.message_post(cr, uid, [thread_id], context=context, **msg)
+                model_pool = self.pool.get('mail.thread')
+            model_pool.message_post_user_api(cr, uid, [thread_id], context=context, **msg)
         return thread_id
 
     def message_new(self, cr, uid, msg_dict, custom_values=None, context=None):
@@ -556,7 +575,6 @@ class mail_thread(osv.AbstractModel):
         """
         msg_dict = {
             'type': 'email',
-            'subtype': 'mail.mt_comment',
             'author_id': False,
         }
         if not isinstance(message, Message):
@@ -640,10 +658,13 @@ class mail_thread(osv.AbstractModel):
                 ``(name,content)``, where content is NOT base64 encoded
             :return: ID of newly created mail.message
         """
-        context = context or {}
-        attachments = attachments or []
+        if context is None:
+            context = {}
+        if attachments is None:
+            attachments = {}
+
         assert (not thread_id) or isinstance(thread_id, (int, long)) or \
-            (isinstance(thread_id, (list, tuple)) and len(thread_id) == 1), "Invalid thread_id"
+            (isinstance(thread_id, (list, tuple)) and len(thread_id) == 1), "Invalid thread_id; should be 0, False, an ID or a list with one ID"
         if isinstance(thread_id, (list, tuple)):
             thread_id = thread_id and thread_id[0]
         mail_message = self.pool.get('mail.message')
@@ -707,30 +728,45 @@ class mail_thread(osv.AbstractModel):
 
         return mail_message.create(cr, uid, values, context=context)
 
-    def message_post_api(self, cr, uid, thread_id, body='', subject=False, parent_id=False, attachment_ids=None, context=None):
-        """ Wrapper on message_post, used only in Chatter (JS). The purpose is
-            to handle attachments.
-            - body is plaintext: convert it into html
-            - handle reply to a previous message
+    def message_post_user_api(self, cr, uid, thread_id, body='', subject=False, parent_id=False,
+                                attachment_ids=None, context=None, content_subtype='plaintext', **kwargs):
+        """ Wrapper on message_post, used for user input :
+            - mail gateway
+            - quick reply in Chatter (refer to mail.js), not
+                the mail.compose.message wizard
+            The purpose is to perform some pre- and post-processing:
+            - if body is plaintext: convert it into html
+            - if parent_id: handle reply to a previous message by adding the
+                parent partners to the message
+            - type and subtype: comment and mail.mt_comment by default
+            - attachment_ids: supposed not attached to any document; attach them
+                to the related document. Should only be set by Chatter.
         """
-        # 1. handle body
-        body = tools.text2html(body)
+        ir_attachment = self.pool.get('ir.attachment')
+        mail_message = self.pool.get('mail.message')
 
-        # 2. handle message partner_ids
+        # 1. Pre-processing: body, partner_ids, type and subtype
+        if content_subtype == 'plaintext':
+            body = tools.text2html(body)
+
+        partner_ids = kwargs.pop('partner_ids', [])
         if parent_id:
-            parent_data = self.pool.get('mail.message').browse(cr, uid, parent_id, context=context)
-            partner_ids = [(4, partner.id) for partner in parent_data.partner_ids]
-        else:
-            partner_ids = []
+            parent_message = self.pool.get('mail.message').browse(cr, uid, parent_id, context=context)
+            partner_ids += [(4, partner.id) for partner in parent_message.partner_ids]
+            # TDE FIXME HACK: mail.thread -> private message
+            if self._name == 'mail.thread' and parent_message.author_id.id:
+                partner_ids.append((4, parent_message.author_id.id))
 
-        # 3. post message
-        new_message_id = self.message_post(cr, uid, thread_id=thread_id, body=body, subject=subject, type='comment',
-                        subtype='mail.mt_comment', parent_id=parent_id, context=context, partner_ids=partner_ids)
+        message_type = kwargs.pop('type', 'comment')
+        message_subtype = kwargs.pop('type', 'mail.mt_comment')
 
-        # 4. HACK FIXME: Chatter: attachments linked to the document (not done JS-side), load the message
+        # 2. Post message
+        new_message_id = self.message_post(cr, uid, thread_id=thread_id, body=body, subject=subject, type=message_type,
+                        subtype=message_subtype, parent_id=parent_id, context=context, partner_ids=partner_ids, **kwargs)
+
+        # 3. Post-processing
+        # HACK TDE FIXME: Chatter: attachments linked to the document (not done JS-side), load the message
         if attachment_ids:
-            ir_attachment = self.pool.get('ir.attachment')
-            mail_message = self.pool.get('mail.message')
             filtered_attachment_ids = ir_attachment.search(cr, SUPERUSER_ID, [
                 ('res_model', '=', 'mail.compose.message'),
                 ('res_id', '=', 0),
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 6be6693d8d8..91b16aeed45 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -350,7 +350,7 @@ openerp.mail = function (session) {
 
             if (body.match(/\S+/)) {
                 //session.web.blockUI();
-                this.parent_thread.ds_thread.call('message_post_api', [
+                this.parent_thread.ds_thread.call('message_post_user_api', [
                         this.context.default_res_id, 
                         mail.ChatterUtils.get_text2html(body), 
                         false, 

From 7e1369cca827680a37ea83ae32ac772723bb8e7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 8 Nov 2012 17:08:26 +0100
Subject: [PATCH 063/143] [FIX] fetchmail: fixed a bug about
 fetchmail_server_id when sending an email.

bzr revid: tde@openerp.com-20121108160826-40dj27zvmqxf4im7
---
 addons/fetchmail/fetchmail.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/fetchmail/fetchmail.py b/addons/fetchmail/fetchmail.py
index e0023697594..68f05dfeee2 100644
--- a/addons/fetchmail/fetchmail.py
+++ b/addons/fetchmail/fetchmail.py
@@ -243,20 +243,20 @@ class mail_mail(osv.osv):
 
     def create(self, cr, uid, values, context=None):
         if context is None:
-            context={}
+            context = {}
         fetchmail_server_id = context.get('fetchmail_server_id')
         if fetchmail_server_id:
             values['fetchmail_server_id'] = fetchmail_server_id
-        res = super(mail_mail,self).create(cr, uid, values, context=context)
+        res = super(mail_mail, self).create(cr, uid, values, context=context)
         return res
 
     def write(self, cr, uid, ids, values, context=None):
         if context is None:
-            context={}
+            context = {}
         fetchmail_server_id = context.get('fetchmail_server_id')
         if fetchmail_server_id:
-            values['fetchmail_server_id'] = server_id
-        res = super(mail_mail,self).write(cr, uid, ids, values, context=context)
+            values['fetchmail_server_id'] = fetchmail_server_id
+        res = super(mail_mail, self).write(cr, uid, ids, values, context=context)
         return res
 
 

From 95f07f7773e3ce672a2cc7ae66e4554af1bd96d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 8 Nov 2012 17:10:36 +0100
Subject: [PATCH 064/143] [FIX] demo data: moved email address of admin from
 data to demo.

bzr revid: tde@openerp.com-20121108161036-97lynkhqdhpjbfa8
---
 openerp/addons/base/base_data.xml | 1 -
 openerp/addons/base/base_demo.xml | 4 ++++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/openerp/addons/base/base_data.xml b/openerp/addons/base/base_data.xml
index 9bd9b9ef19c..1b253b82041 100644
--- a/openerp/addons/base/base_data.xml
+++ b/openerp/addons/base/base_data.xml
@@ -67,7 +67,6 @@
 
         <record model="res.partner" id="base.partner_root">
             <field name="name">Administrator</field>
-            <field name="email">admin@example.com</field>
             <field name="company_id" ref="main_company"/>
             <field name="customer" eval="False"/>
         </record>
diff --git a/openerp/addons/base/base_demo.xml b/openerp/addons/base/base_demo.xml
index 1dc27a3d05e..65ade7ec3b9 100644
--- a/openerp/addons/base/base_demo.xml
+++ b/openerp/addons/base/base_demo.xml
@@ -17,6 +17,10 @@ Mr Demo</field>
             <field name="groups_id" eval="[(6,0,[ref('base.group_user')])]"/>
         </record>
 
+        <record model="res.partner" id="base.partner_root">
+            <field name="email">admin@example.com</field>
+        </record>
+
         <!-- new rate for demo transactions in multi currency -->
         <record id="rateUSDbis" model="res.currency.rate">
             <field name="rate">1.5289</field>

From acb1156ee5c0da47a251616a61dede91bb1066b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 8 Nov 2012 17:41:38 +0100
Subject: [PATCH 065/143] [FIX] mail: fixed bug adding signature of partners
 without users, therefore without signature field; fixed message_id of
 mail.message without model,res_id, that were not granted a message_id,
 therefore generated when sending a mail.mail, therefore breaking parent
 relationship based on message_id. Also fixed content_subtype of message
 coming from message_process.

bzr revid: tde@openerp.com-20121108164138-8jp2340t6s2sa9hd
---
 addons/mail/mail_followers.py | 2 +-
 addons/mail/mail_message.py   | 2 ++
 addons/mail/mail_thread.py    | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/mail/mail_followers.py b/addons/mail/mail_followers.py
index 7406108229a..375ed9243a7 100644
--- a/addons/mail/mail_followers.py
+++ b/addons/mail/mail_followers.py
@@ -160,7 +160,7 @@ class mail_notification(osv.Model):
             pass
             # print quote_context
             # body_html = tools.append_content_to_html(body_html, quote_context, plaintext=False)
-        signature = msg.author_id and msg.author_id.user_ids[0].signature or ''
+        signature = msg.author_id and msg.author_id.user_id and msg.author_id.user_ids[0].signature or ''
         if signature:
             body_html = tools.append_content_to_html(body_html, tools.text2html(signature), plaintext=False)
 
diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 08c14dbc4d1..935350fdeb8 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -600,6 +600,8 @@ class mail_message(osv.Model):
     def create(self, cr, uid, values, context=None):
         if not values.get('message_id') and values.get('res_id') and values.get('model'):
             values['message_id'] = tools.generate_tracking_message_id('%(res_id)s-%(model)s' % values)
+        elif not values.get('message_id'):
+            values['message_id'] = tools.generate_tracking_message_id('private')
         newid = super(mail_message, self).create(cr, uid, values, context)
         self._notify(cr, SUPERUSER_ID, newid, context=context)
         return newid
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index b3e5423ae4d..1c27c6ce658 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -452,7 +452,7 @@ class mail_thread(osv.AbstractModel):
                     thread_id = model_pool.message_new(cr, user_id, msg, custom_values, context=context)
             else:
                 model_pool = self.pool.get('mail.thread')
-            model_pool.message_post_user_api(cr, uid, [thread_id], context=context, **msg)
+            model_pool.message_post_user_api(cr, uid, [thread_id], context=context, content_subtype='html', **msg)
         return thread_id
 
     def message_new(self, cr, uid, msg_dict, custom_values=None, context=None):

From 78959edc483fee88286d8bc147d47fcc97597f28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 9 Nov 2012 10:51:22 +0100
Subject: [PATCH 066/143] [IMP] email_template: cleaned a bit tools imports.

bzr revid: tde@openerp.com-20121109095122-pifpwr5u1hhyjakw
---
 addons/email_template/email_template.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py
index 6965fa0c222..889a1c3c584 100644
--- a/addons/email_template/email_template.py
+++ b/addons/email_template/email_template.py
@@ -28,8 +28,6 @@ from osv import osv
 from osv import fields
 import tools
 from tools.translate import _
-from tools.mail import html_sanitize
-from tools import append_content_to_html
 from urllib import quote as quote
 _logger = logging.getLogger(__name__)
 
@@ -292,10 +290,10 @@ class email_template(osv.osv):
                                                  or False
         if template.user_signature:
             signature = self.pool.get('res.users').browse(cr, uid, uid, context).signature
-            values['body_html'] = append_content_to_html(values['body_html'], signature)
+            values['body_html'] = tools.append_content_to_html(values['body_html'], signature)
 
         if values['body_html']:
-            values['body'] = html_sanitize(values['body_html'])
+            values['body'] = tools.html_sanitize(values['body_html'])
 
         values.update(mail_server_id=template.mail_server_id.id or False,
                       auto_delete=template.auto_delete,

From b1a5db6a912190ab2a39a4bd578ad186d9e14d94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 9 Nov 2012 11:09:00 +0100
Subject: [PATCH 067/143] [FIX] message_process: fixed wrong domain for finding
 parent message based on in-reply-to.

bzr revid: tde@openerp.com-20121109100900-ri2126fe0ejb8c8w
---
 addons/mail/mail_thread.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 1c27c6ce658..bb944a48860 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -336,14 +336,13 @@ class mail_thread(osv.AbstractModel):
                 return [(model, thread_id, custom_values, uid)]
 
         # Verify this is a reply to a private message
-        message_ids = self.pool.get('mail.message').search(cr, uid, [('message_id', 'ilike', in_reply_to)], limit=1, context=context)
+        message_ids = self.pool.get('mail.message').search(cr, uid, [('message_id', '=', in_reply_to)], limit=1, context=context)
         if message_ids:
             message = self.pool.get('mail.message').browse(cr, uid, message_ids[0], context=context)
             _logger.debug('Routing mail with Message-Id %s: reply to a private message: %s, custom_values: %s, uid: %s',
                             message_id, message.id, custom_values, uid)
             return [(False, 0, custom_values, uid)]
 
-
         # 2. Look for a matching mail.alias entry
         # Delivered-To is a safe bet in most modern MTAs, but we have to fallback on To + Cc values
         # for all the odd MTAs out there, as there is no standard header for the envelope's `rcpt_to` value.

From 62c419e66fe49484dc51060d41cff5280ea83597 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 9 Nov 2012 13:35:21 +0100
Subject: [PATCH 068/143] [IMP] tools: mail: improved append_content_to_html,
 including plaintext2html. Updated tests.

bzr revid: tde@openerp.com-20121109123521-e04g4zrhtv947l1r
---
 openerp/addons/base/base_demo.xml |   1 -
 openerp/osv/fields.py             |   2 +-
 openerp/tests/test_mail.py        | 195 +++++++++++++++---------------
 openerp/tools/mail.py             | 101 ++++++++++------
 4 files changed, 161 insertions(+), 138 deletions(-)

diff --git a/openerp/addons/base/base_demo.xml b/openerp/addons/base/base_demo.xml
index e0013289928..89176d1811b 100644
--- a/openerp/addons/base/base_demo.xml
+++ b/openerp/addons/base/base_demo.xml
@@ -3,7 +3,6 @@
     <data noupdate="1">
         <record id="partner_demo" model="res.partner">
             <field name="name">Demo User</field>
-            <field name="email">demo@example.com</field>
             <field name="company_id" ref="main_company"/>
             <field name="customer" eval="False"/>
             <field name="email">demo@example.com</field>
diff --git a/openerp/osv/fields.py b/openerp/osv/fields.py
index ee95cece722..0d12a9a8bc3 100644
--- a/openerp/osv/fields.py
+++ b/openerp/osv/fields.py
@@ -44,8 +44,8 @@ import openerp
 import openerp.tools as tools
 from openerp.tools.translate import _
 from openerp.tools import float_round, float_repr
+from openerp.tools import html_sanitize
 import simplejson
-from openerp.tools.mail import html_sanitize
 from openerp import SUPERUSER_ID
 
 _logger = logging.getLogger(__name__)
diff --git a/openerp/tests/test_mail.py b/openerp/tests/test_mail.py
index 5a0c062b3a0..0d6c72ff915 100755
--- a/openerp/tests/test_mail.py
+++ b/openerp/tests/test_mail.py
@@ -23,9 +23,9 @@
 ##############################################################################
 
 import unittest2
-from openerp.tools.mail import html_sanitize, html_email_clean, append_content_to_html, text2html
+from openerp.tools import html_sanitize, html_email_clean, append_content_to_html, plaintext2html
 
-test_case = """
+HTML_SOURCE = """
 <font size="2" style="color: rgb(31, 31, 31); font-family: monospace; font-variant: normal; line-height: normal; ">test1</font>
 <div style="color: rgb(31, 31, 31); font-family: monospace; font-variant: normal; line-height: normal; font-size: 12px; font-style: normal; ">
 <b>test2</b></div><div style="color: rgb(31, 31, 31); font-family: monospace; font-variant: normal; line-height: normal; font-size: 12px; ">
@@ -43,88 +43,65 @@ test12</font></div><div><font color="#1f1f1f" face="monospace" size="2"><br></fo
 <a href="javascript:alert('malicious code')">test link</a>
 """
 
-GMAIL_REPLY_SAN = """<div>R&#233;ponse via thunderbird, classique.<br><br>
-      On 11/05/2012 10:51 AM, Raoul Tartopoils wrote:<br></div>
-    <blockquote>
-      <div>Plop !</div>
-      <ul><li>Vive les lapins rapides !<br></li>
-        <li>Nouille</li>
-        <li>Frites</li>
-      </ul><div><br></div>
-      <div>Clairement, hein ?</div>
-      -- <br>
-      Raoul Tartopoils<br></blockquote>
-    <br><br><pre>-- 
-Raoul Tartopoils
-</pre>"""
+TEXT_MAIL1 = """I contact you about our meeting for tomorrow. Here is the schedule I propose:
+9 AM: brainstorming about our new amazing business app</span></li>
+9.45 AM: summary
+10 AM: meeting with Fabien to present our app
+Is everything ok for you ?
+--
+Administrator"""
 
-GMAIL_REPLY2_SAN = """<div>Je r&#233;ponds, hop, via thunderbird. Mais
-      je vais r&#233;podnre aussi au milieu du thread.<br><br>
-      On 11/05/2012 10:53 AM, Raoul Tartopoils wrote:<br></div>
-    <blockquote>Reply rapide de gmail.</blockquote>
-    <br>
-    Jamais.<br><br><blockquote>
-      <div><br><br><div>2012/11/5 Thibault Delavall&#233;e <span>&lt;<a href="mailto:tde@openerp.com">tde@openerp.com</a>&gt;</span><br><blockquote>
-            <div>
-              <div>R&#233;ponse via thunderbird, classique.
-                <div>
-                  <div><br><br>
-                    On 11/05/2012 10:51 AM, Raoul Tartopoils wrote:<br></div>
-                </div>
-              </div>
-              <div>
-                <div>
-                  <blockquote>
-                    <div>Plop !</div>
-                    <ul><li>Vive les lapins rapides !<br></li>
-                      <li>Nouille</li>
-                    </ul></blockquote>
-                </div>
-              </div>
-            </div>
-          </blockquote>
-        </div>
+HTML_MAIL1 = """<div>
+<font><span>I contact you about our meeting for tomorrow. Here is the schedule I propose:</span></font>
+</div>
+<div><ul>
+<li><span>9 AM: brainstorming about our new amazing business app</span></li>
+<li><span>9.45 AM: summary</span></li>
+<li><span>10 AM: meeting with Fabien to present our app</span></li>
+</ul></div>
+<div><font><span>Is everything ok for you ?</span></font></div>"""
+
+GMAIL_REPLY1_SAN = """Hello,<div><br></div><div>Ok for me. I am replying directly in gmail, without signature.</div><div><br></div><div>Kind regards,</div><div><br></div><div>Demo.<br><br><div>On Thu, Nov 8, 2012 at 5:29 PM,  <span>&lt;<a href="mailto:dummy@example.com">dummy@example.com</a>&gt;</span> wrote:<br><blockquote><div>I contact you about our meeting for tomorrow. Here is the schedule I propose:</div><div><ul><li>9 AM: brainstorming about our new amazing business app&lt;/span&gt;&lt;/li&gt;</li>
+<li>9.45 AM: summary</li><li>10 AM: meeting with Fabien to present our app</li></ul></div><div>Is everything ok for you ?</div>
+<div><p>--<br>Administrator</p></div>
+
+<div><p>Log in our portal at: <a href="http://localhost:8069#action=login&amp;db=mail_1&amp;login=demo">http://localhost:8069#action=login&amp;db=mail_1&amp;login=demo</a></p></div>
+</blockquote></div><br></div>"""
+
+THUNDERBIRD_16_REPLY1_SAN = """    <div>On 11/08/2012 05:29 PM,
+      <a href="mailto:dummy@example.com">dummy@example.com</a> wrote:<br></div>
+    <blockquote>
+      <div>I contact you about our meeting for tomorrow. Here is the
+        schedule I propose:</div>
+      <div>
+        <ul><li>9 AM: brainstorming about our new amazing business
+            app&lt;/span&gt;&lt;/li&gt;</li>
+          <li>9.45 AM: summary</li>
+          <li>10 AM: meeting with Fabien to present our app</li>
+        </ul></div>
+      <div>Is everything ok for you ?</div>
+      <div>
+        <p>--<br>
+          Administrator</p>
+      </div>
+      <div>
+        <p>Log in our portal at:
+<a href="http://localhost:8069#action=login&amp;db=mail_1&amp;token=rHdWcUART5PhEnJRaXjH">http://localhost:8069#action=login&amp;db=mail_1&amp;token=rHdWcUART5PhEnJRaXjH</a></p>
       </div>
     </blockquote>
-    je rajotuerais bien pommes de terre dans la liste.<br><blockquote>
-      <div>
-        <div>
-          <blockquote>
-            <div>
-              <div>
-                <div>
-                  <blockquote>
-                    <ul><li>Frites</li>
-                    </ul><div><br></div>
-                    <div>Clairement, hein ?</div>
-                    -- <br>
-                    Raoul Tartopoils<br></blockquote>
-                  <br><br></div>
-              </div>
-              <span><font>
-                  <pre>-- 
-Raoul Tartopoils
-</pre>
-                </font></span></div>
-          </blockquote>
-        </div>
-        <br><br><div><br></div>
-        -- <br>
-        Raoul Tartopoils<br></div>
-    </blockquote>
-    <br><br><pre>-- 
-Raoul Tartopoils
+    Ok for me. I am replying directly below your mail, using
+    Thunderbird, with a signature.<br><br>
+    Did you receive my email about my new laptop, by the way ?<br><br>
+    Raoul.<br><pre>-- 
+Raoul Grosbedonn&#233;e
 </pre>"""
 
-
 TEXT_TPL = """Salut Raoul!
 Le 28 oct. 2012 à 00:02, Raoul Grosbedon a écrit :
 
 > C'est sûr que je suis intéressé (quote)!
 
-Trouloulou pouet pouet.
-
-Je ne vais quand même pas écrire de vrais mails, non mais ho.
+Trouloulou pouet pouet. Je ne vais quand même pas écrire de vrais mails, non mais ho.
 
 > 2012/10/27 Bert Tartopoils :
 >> Diantre, me disè-je en envoyant un message similaire à Martine, mais comment vas-tu (quote)?
@@ -138,7 +115,6 @@ Je ne vais quand même pas écrire de vrais mails, non mais ho.
 >> 
 > 
 > 
-> 
 > -- 
 > Raoul Grosbedon
 
@@ -147,21 +123,8 @@ bert.tartopoils@miam.miam
 """
 
 
-class TestAppendContentToHtml(unittest2.TestCase):
-    """ Test some of our generic utility functions """
-
-    def test_append_to_html(self):
-        test_samples = [
-            ('<!DOCTYPE...><HTML encoding="blah">some <b>content</b></HtMl>', '--\nYours truly', True,
-             '<!DOCTYPE...><html encoding="blah">some <b>content</b>\n<pre>--\nYours truly</pre>\n</html>'),
-            ('<html><body>some <b>content</b></body></html>', '<!DOCTYPE...>\n<html><body>\n<p>--</p>\n<p>Yours truly</p>\n</body>\n</html>', False,
-             '<html><body>some <b>content</b>\n\n\n<p>--</p>\n<p>Yours truly</p>\n\n\n</body></html>'),
-        ]
-        for html, content, flag, expected in test_samples:
-            self.assertEqual(append_content_to_html(html, content, flag), expected, 'append_content_to_html is broken')
-
-
 class TestSanitizer(unittest2.TestCase):
+    """ Test the html sanitizer """
     # TDE note: could be improved by actually checking the output
 
     def test_simple(self):
@@ -173,33 +136,67 @@ class TestSanitizer(unittest2.TestCase):
         self.assertEqual(x, html_sanitize(x))
 
     def test_no_exception(self):
-        html_sanitize(test_case)
+        html_sanitize(HTML_SOURCE)
 
     def test_unicode(self):
         html_sanitize("Merci à l'intérêt pour notre produit.nous vous contacterons bientôt. Merci")
 
 
 class TestCleaner(unittest2.TestCase):
+    """ Test the email cleaner function that filter the content of incoming emails """
 
-    def test_gmail(self):
-        # Test1: blahblah
-        new_html = html_email_clean(GMAIL_REPLY_SAN)
-        self.assertNotIn(new_html, 'blockquote')
-        self.assertNotIn(new_html, 'Vive les lapins rapides !')
-        self.assertNotIn(new_html, 'Bert Tartopoils')
+    def test_html_email_clean(self):
+        # Test1: reply through gmail: quote in blockquote, signature --\nAdministrator
+        new_html = html_email_clean(GMAIL_REPLY1_SAN)
+        self.assertNotIn('blockquote', new_html, 'html_email_cleaner did not remove a blockquote')
+        self.assertNotIn('I contact you about our meeting', new_html, 'html_email_cleaner wrongly removed the quoted content')
+        self.assertNotIn('Administrator', new_html, 'html_email_cleaner did not erase the signature')
+        self.assertIn('Ok for me', new_html, 'html_email_cleaner erased too much content')
+
+        # Test2: reply through Tunderbird 16.0.2
+        new_html = html_email_clean(THUNDERBIRD_16_REPLY1_SAN)
+        self.assertNotIn('blockquote', new_html, 'html_email_cleaner did not remove a blockquote')
+        self.assertNotIn('I contact you about our meeting', new_html, 'html_email_cleaner wrongly removed the quoted content')
+        self.assertNotIn('Administrator', new_html, 'html_email_cleaner did not erase the signature')
+        self.assertNotIn('Grosbedonn', new_html, 'html_email_cleaner did not erase the signature')
+        self.assertIn('Ok for me', new_html, 'html_email_cleaner erased too much content')
+
+        # Test3: text email
+        new_html = html_email_clean(TEXT_MAIL1)
+        self.assertIn('I contact you about our meeting', new_html, 'html_email_cleaner wrongly removed the quoted content')
+        self.assertNotIn('Administrator', new_html, 'html_email_cleaner did not erase the signature')
+
+        # Test4: more complex text email
+        new_html = html_email_clean(TEXT_TPL)
+        self.assertNotIn('quote', new_html, 'html_email_cleaner did not remove correctly plaintext quotes')
 
 
-class TestText2Html(unittest2.TestCase):
+class TestAppendContentToHtml(unittest2.TestCase):
+    """ Test some of our generic utility functions about html """
 
-    def test_text2html(self):
+    def test_plaintext2html(self):
         cases = [
             ("First \nSecond \nThird\n \nParagraph\n\r--\nSignature paragraph", 'div',
              "<div><p>First <br/>Second <br/>Third</p><p>Paragraph</p><p>--<br/>Signature paragraph</p></div>"),
+            ("First<p>It should be escaped</p>\nSignature", False,
+             "<p>First&lt;p&gt;It should be escaped&lt;/p&gt;<br/>Signature</p>")
         ]
         for content, container_tag, expected in cases:
-            html = text2html(content, container_tag)
+            html = plaintext2html(content, container_tag)
             self.assertEqual(html, expected, 'text2html is broken')
 
+    def test_append_to_html(self):
+        test_samples = [
+            ('<!DOCTYPE...><HTML encoding="blah">some <b>content</b></HtMl>', '--\nYours truly', True, True, False,
+             '<!DOCTYPE...><html encoding="blah">some <b>content</b>\n<pre>--\nYours truly</pre>\n</html>'),
+            ('<!DOCTYPE...><HTML encoding="blah">some <b>content</b></HtMl>', '--\nYours truly', True, False, False,
+             '<!DOCTYPE...><html encoding="blah">some <b>content</b>\n<p>--<br/>Yours truly</p>\n</html>'),
+            ('<html><body>some <b>content</b></body></html>', '<!DOCTYPE...>\n<html><body>\n<p>--</p>\n<p>Yours truly</p>\n</body>\n</html>', False, False, False,
+             '<html><body>some <b>content</b>\n\n\n<p>--</p>\n<p>Yours truly</p>\n\n\n</body></html>'),
+        ]
+        for html, content, plaintext_flag, preserve_flag, container_tag, expected in test_samples:
+            self.assertEqual(append_content_to_html(html, content, plaintext_flag, preserve_flag, container_tag), expected, 'append_content_to_html is broken')
+
 
 if __name__ == '__main__':
     unittest2.main()
diff --git a/openerp/tools/mail.py b/openerp/tools/mail.py
index 861f6d82243..020ab2313b4 100644
--- a/openerp/tools/mail.py
+++ b/openerp/tools/mail.py
@@ -121,6 +121,7 @@ def html_email_clean(html):
             be present in the html string. This method therefore takes as input
             html code coming from a sanitized source, like fields.html.
     """
+    html = ustr(html)
     modified_html = ''
 
     # 1. <br[ /]> -> \n, because otherwise the tree is obfuscated
@@ -131,6 +132,7 @@ def html_email_clean(html):
         idx = item.end()
     modified_html += html[idx:]
     html = modified_html
+    # TDE note: seems to have lots of <div><br></div> in emails... needs to be checks, could be cleaned
 
     # 2. form a tree, handle (currently ?) pure-text by enclosing them in a pre
     root = lxml.html.fromstring(html)
@@ -138,9 +140,28 @@ def html_email_clean(html):
         html = '<div>%s</div>' % html
         root = lxml.html.fromstring(html)
 
+    # 2.5 remove quoted text in nodes
+    quote_tags = re.compile(r'(\n(>)+[^\n\r]*)')
+    for node in root.getiterator():
+        if not node.text:
+            continue
+        idx = 0
+        text = ''
+        for item in re.finditer(quote_tags, node.text):
+            print item
+            text += node.text[idx:item.start()]
+            idx = item.end()
+        text += node.text[idx:]
+        node.text = text
+
     # 3. remove blockquotes
     quotes = [el for el in root.getiterator(tag='blockquote')]
     for node in quotes:
+        # copy the node tail into parent text
+        if node.tail:
+            parent = node.getparent()
+            parent.text = parent.text or '' + node.tail
+        # remove the node
         node.getparent().remove(node)
 
     # 4. strip signatures
@@ -187,9 +208,7 @@ def html2plaintext(html, body_id=None, encoding='utf-8'):
     ## download here: http://www.peterbe.com/plog/html2plaintext
 
     html = ustr(html)
-
-    from lxml.etree import tostring, fromstring, HTMLParser
-    tree = fromstring(html, parser=HTMLParser())
+    tree = etree.fromstring(html, parser=etree.HTMLParser())
 
     if body_id is not None:
         source = tree.xpath('//*[@id=%s]' % (body_id,))
@@ -208,7 +227,7 @@ def html2plaintext(html, body_id=None, encoding='utf-8'):
             link.text = '%s [%s]' % (link.text, i)
             url_index.append(url)
 
-    html = ustr(tostring(tree, encoding=encoding))
+    html = ustr(etree.tostring(tree, encoding=encoding))
 
     html = html.replace('<strong>', '*').replace('</strong>', '*')
     html = html.replace('<b>', '*').replace('</b>', '*')
@@ -233,7 +252,7 @@ def html2plaintext(html, body_id=None, encoding='utf-8'):
 
     return html
 
-def text2html(text, container_tag='div'):
+def plaintext2html(text, container_tag=False):
     """ Convert plaintext into html. Content of the text is escaped to manage
         html entities, using cgi.escape().
         - all \n,\r are replaced by <br />
@@ -243,7 +262,7 @@ def text2html(text, container_tag='div'):
         :param string container_tag: container of the html; by default the
             content is embedded into a <div>
     """
-    text = cgi.escape(text)
+    text = cgi.escape(ustr(text))
 
     # 1. replace \n and \r
     text = text.replace('\n', '<br/>')
@@ -261,7 +280,45 @@ def text2html(text, container_tag='div'):
     # 4. container
     if container_tag:
         final = '<%s>%s</%s>' % (container_tag, final, container_tag)
-    return final
+    return ustr(final)
+
+def append_content_to_html(html, content, plaintext=True, preserve=False, container_tag=False):
+    """ Append extra content at the end of an HTML snippet, trying
+        to locate the end of the HTML document (</body>, </html>, or
+        EOF), and converting the provided content in html unless ``plaintext``
+        is False.
+        Content conversion can be done in two ways:
+        - wrapping it into a pre (preserve=True)
+        - use plaintext2html (preserve=False, using container_tag to wrap the
+            whole content)
+        A side-effect of this method is to coerce all HTML tags to
+        lowercase in ``html``, and strip enclosing <html> or <body> tags in
+        content if ``plaintext`` is False.
+
+        :param str html: html tagsoup (doesn't have to be XHTML)
+        :param str content: extra content to append
+        :param bool plaintext: whether content is plaintext and should
+            be wrapped in a <pre/> tag.
+        :param bool preserve: if content is plaintext, wrap it into a <pre>
+            instead of converting it into html
+    """
+    html = ustr(html)
+    if plaintext and preserve:
+        content = u'\n<pre>%s</pre>\n' % ustr(content)
+    elif plaintext:
+        content = '\n%s\n' % plaintext2html(content, container_tag)
+    else:
+        content = re.sub(r'(?i)(</?html.*>|</?body.*>|<!\W*DOCTYPE.*>)', '', content)
+        content = u'\n%s\n' % ustr(content)
+    # Force all tags to lowercase
+    html = re.sub(r'(</?)\W*(\w+)([ >])',
+        lambda m: '%s%s%s' % (m.group(1), m.group(2).lower(), m.group(3)), html)
+    insert_location = html.find('</body>')
+    if insert_location == -1:
+        insert_location = html.find('</html>')
+    if insert_location == -1:
+        return '%s%s' % (html, content)
+    return '%s%s%s' % (html[:insert_location], content, html[insert_location:])
 
 #----------------------------------------------------------
 # Emails
@@ -339,33 +396,3 @@ def email_split(text):
     if not text:
         return []
     return re.findall(r'([^ ,<@]+@[^> ,]+)', text)
-
-def append_content_to_html(html, content, plaintext=True):
-    """Append extra content at the end of an HTML snippet, trying
-       to locate the end of the HTML document (</body>, </html>, or
-       EOF), and wrapping the provided content in a <pre/> block
-       unless ``plaintext`` is False. A side-effect of this
-       method is to coerce all HTML tags to lowercase in ``html``,
-       and strip enclosing <html> or <body> tags in content if
-       ``plaintext`` is False.
-
-       :param str html: html tagsoup (doesn't have to be XHTML)
-       :param str content: extra content to append
-       :param bool plaintext: whether content is plaintext and should
-           be wrapped in a <pre/> tag.
-    """
-    html = ustr(html)
-    if plaintext:
-        content = u'\n<pre>%s</pre>\n' % ustr(content)
-    else:
-        content = re.sub(r'(?i)(</?html.*>|</?body.*>|<!\W*DOCTYPE.*>)', '', content)
-        content = u'\n%s\n' % ustr(content)
-    # Force all tags to lowercase
-    html = re.sub(r'(</?)\W*(\w+)([ >])',
-        lambda m: '%s%s%s' % (m.group(1), m.group(2).lower(), m.group(3)), html)
-    insert_location = html.find('</body>')
-    if insert_location == -1:
-        insert_location = html.find('</html>')
-    if insert_location == -1:
-        return '%s%s' % (html, content)
-    return '%s%s%s' % (html[:insert_location], content, html[insert_location:])

From ad450406c3f06b29ddf8a6c4aa261f4710df043a Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Mon, 12 Nov 2012 15:07:07 +0530
Subject: [PATCH 069/143] [IMP]stock:product has been selected by default when
 creating serial number from wizard

bzr revid: kbh@tinyerp.com-20121112093707-0npy0mvrm9654pk3
---
 addons/stock/wizard/stock_change_product_qty_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/stock/wizard/stock_change_product_qty_view.xml b/addons/stock/wizard/stock_change_product_qty_view.xml
index 20114301ab2..807a0a15df5 100644
--- a/addons/stock/wizard/stock_change_product_qty_view.xml
+++ b/addons/stock/wizard/stock_change_product_qty_view.xml
@@ -10,7 +10,7 @@
                         <field name="new_quantity" />
                         <field name="product_id" invisible="1"/>
                         <field name="location_id" groups="stock.group_locations"/>
-                        <field name="prodlot_id" groups="stock.group_tracking_lot"/>
+                        <field name="prodlot_id"  context="{'search_default_product_id':product_id,'default_product_id':product_id}" groups="stock.group_tracking_lot"/>
                     </group>
                     <footer>
                         <button name="change_product_qty" string="_Apply" type="object" class="oe_highlight"/>

From 82cba0604f12c10b86d76871dc1303674f1d50f4 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Tue, 13 Nov 2012 15:32:20 +0100
Subject: [PATCH 070/143] [IMP] web menu: add a context value for reload one
 submenus of a parent id menu. If no default_menu, load all menus

bzr revid: chm@openerp.com-20121113143220-zhwo06j7pl8rt2wi
---
 addons/web/controllers/main.py     |  7 ++++++-
 addons/web/static/src/js/chrome.js | 12 ++++++++++--
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index ffabe97661b..8068748f72d 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -1047,8 +1047,13 @@ class Menu(openerpweb.Controller):
 
         # menus are loaded fully unlike a regular tree view, cause there are a
         # limited number of items (752 when all 6.1 addons are installed)
-        menu_ids = Menus.search([], 0, False, False, context)
+        if req.context and 'default_menu' in req.context and int(req.context['default_menu']):
+            # for load only one sub menu
+            menu_ids = Menus.search([['id', 'child_of', req.context['default_menu']]], 0, False, False, context)
+        else:
+            menu_ids = Menus.search([], 0, False, False, context)
         menu_items = Menus.read(menu_ids, ['name', 'sequence', 'parent_id', 'action', 'needaction_enabled', 'needaction_counter'], context)
+        
         # adds roots at the end of the sequence, so that they will overwrite
         # equivalent menu items from full menu read when put into id:item
         # mapping, resulting in children being correctly set on the roots.
diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 69dafa08c02..093368dc6ff 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -708,9 +708,17 @@ instance.web.Menu =  instance.web.Widget.extend({
         this.$secondary_menus.on('click', 'a[data-menu]', this.on_menu_click);
         return this.do_reload();
     },
-    do_reload: function() {
+    do_reload: function(id) {
         var self = this;
-        return this.rpc("/web/menu/load", {}).done(function(r) {
+        return this.rpc("/web/menu/load", id ? {'context': {'default_menu': id}} : {}).done(function(r) {
+            if (id) {
+                _.each(self.data.data.children, function (val) {
+                    if (val.id == id) {
+                        val.children = _.find(r.data.children, function (r_val) {return r_val.id == id;}).children;
+                    }
+                });
+                var r = self.data;
+            }
             self.menu_loaded(r);
         });
     },

From 0cf93f912b35bbbedc8e3a60316d104392ec8ee0 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Tue, 13 Nov 2012 17:02:48 +0100
Subject: [PATCH 071/143] [IMP] mail & web menu: code review for reload menu

bzr revid: chm@openerp.com-20121113160248-1p2003uc9f5nnxnm
---
 addons/web/controllers/main.py     | 10 +++++-----
 addons/web/static/src/js/chrome.js | 12 ++----------
 2 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 8068748f72d..42e242b79c3 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -1002,8 +1002,8 @@ class Menu(openerpweb.Controller):
     _cp_path = "/web/menu"
 
     @openerpweb.jsonrequest
-    def load(self, req):
-        return {'data': self.do_load(req)}
+    def load(self, req, menu_id=None):
+        return {'data': self.do_load(req=req, menu_id=menu_id)}
 
     @openerpweb.jsonrequest
     def get_user_roots(self, req):
@@ -1031,7 +1031,7 @@ class Menu(openerpweb.Controller):
 
         return Menus.search(menu_domain, 0, False, False, context)
 
-    def do_load(self, req):
+    def do_load(self, req, menu_id=None):
         """ Loads all menu items (all applications and their sub-menus).
 
         :param req: A request object, with an OpenERP session attribute
@@ -1047,9 +1047,9 @@ class Menu(openerpweb.Controller):
 
         # menus are loaded fully unlike a regular tree view, cause there are a
         # limited number of items (752 when all 6.1 addons are installed)
-        if req.context and 'default_menu' in req.context and int(req.context['default_menu']):
+        if menu_id:
             # for load only one sub menu
-            menu_ids = Menus.search([['id', 'child_of', req.context['default_menu']]], 0, False, False, context)
+            menu_ids = Menus.search([['id', 'child_of', menu_id]], 0, False, False, context)
         else:
             menu_ids = Menus.search([], 0, False, False, context)
         menu_items = Menus.read(menu_ids, ['name', 'sequence', 'parent_id', 'action', 'needaction_enabled', 'needaction_counter'], context)
diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 093368dc6ff..69dafa08c02 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -708,17 +708,9 @@ instance.web.Menu =  instance.web.Widget.extend({
         this.$secondary_menus.on('click', 'a[data-menu]', this.on_menu_click);
         return this.do_reload();
     },
-    do_reload: function(id) {
+    do_reload: function() {
         var self = this;
-        return this.rpc("/web/menu/load", id ? {'context': {'default_menu': id}} : {}).done(function(r) {
-            if (id) {
-                _.each(self.data.data.children, function (val) {
-                    if (val.id == id) {
-                        val.children = _.find(r.data.children, function (r_val) {return r_val.id == id;}).children;
-                    }
-                });
-                var r = self.data;
-            }
+        return this.rpc("/web/menu/load", {}).done(function(r) {
             self.menu_loaded(r);
         });
     },

From 0fb44bd06cccf600d0bb5822faaeaa49912114fe Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Wed, 14 Nov 2012 04:40:31 +0000
Subject: [PATCH 072/143] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20121114044031-2vwgqs6jlwz2c8oe
---
 openerp/addons/base/i18n/fa.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/addons/base/i18n/fa.po b/openerp/addons/base/i18n/fa.po
index ed79ae62a70..347abf02cbf 100644
--- a/openerp/addons/base/i18n/fa.po
+++ b/openerp/addons/base/i18n/fa.po
@@ -9,7 +9,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-13 05:11+0000\n"
+"X-Launchpad-Export-Date: 2012-11-14 04:40+0000\n"
 "X-Generator: Launchpad (build 16251)\n"
 "X-Poedit-Country: IRAN, ISLAMIC REPUBLIC OF\n"
 "X-Poedit-Language: Persian\n"

From 9d8a2ea8e9d75bcc284a19e10173314b80d78eda Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Wed, 14 Nov 2012 04:40:52 +0000
Subject: [PATCH 073/143] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20121114044052-9z7ql9gtqnfz7ay0
---
 addons/account/i18n/es_AR.po |  33 ++--
 addons/base_tools/i18n/hu.po |  30 ++++
 addons/l10n_ar/i18n/es_AR.po |  20 +--
 addons/note/i18n/pt_BR.po    | 334 +++++++++++++++++++++++++++++++++++
 4 files changed, 391 insertions(+), 26 deletions(-)
 create mode 100644 addons/base_tools/i18n/hu.po
 create mode 100644 addons/note/i18n/pt_BR.po

diff --git a/addons/account/i18n/es_AR.po b/addons/account/i18n/es_AR.po
index b0c29e28c5d..15a06669417 100644
--- a/addons/account/i18n/es_AR.po
+++ b/addons/account/i18n/es_AR.po
@@ -7,20 +7,20 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2011-03-17 20:16+0000\n"
+"PO-Revision-Date: 2012-11-13 15:01+0000\n"
 "Last-Translator: jpdborgna <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-30 05:06+0000\n"
-"X-Generator: Launchpad (build 16206)\n"
+"X-Launchpad-Export-Date: 2012-11-14 04:40+0000\n"
+"X-Generator: Launchpad (build 16251)\n"
 
 #. module: account
 #: view:account.invoice.report:0
 #: view:analytic.entries.report:0
 msgid "last month"
-msgstr ""
+msgstr "Ultimo mes"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -146,7 +146,7 @@ msgstr "Referencia"
 #. module: account
 #: view:account.open.closed.fiscalyear:0
 msgid "Choose Fiscal Year "
-msgstr ""
+msgstr "Seleccione el año fiscal "
 
 #. module: account
 #: help:account.payment.term,active:0
@@ -159,7 +159,7 @@ msgstr ""
 #: code:addons/account/account_invoice.py:1430
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "¡Advertencia!"
 
 #. module: account
 #: code:addons/account/account.py:3129
@@ -187,7 +187,7 @@ msgstr ""
 #: code:addons/account/wizard/account_move_journal.py:95
 #, python-format
 msgid "Journal: %s"
-msgstr ""
+msgstr "Diario: %s"
 
 #. module: account
 #: help:account.analytic.journal,type:0
@@ -228,6 +228,7 @@ msgstr ""
 #, python-format
 msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
 msgstr ""
+"La factura '%s' está parcialmente pagada: %s%s de %s%s (%s%s pendiente)"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_supplierentriesreconcile0
@@ -268,7 +269,7 @@ msgstr ""
 #. module: account
 #: view:account.fiscalyear.close.state:0
 msgid "Close Fiscalyear"
-msgstr ""
+msgstr "Cerrar ejercicio fiscal"
 
 #. module: account
 #: field:account.automatic.reconcile,allow_write_off:0
@@ -335,7 +336,7 @@ msgstr ""
 #. module: account
 #: view:account.installer:0
 msgid "Configure"
-msgstr ""
+msgstr "Configurar"
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -344,7 +345,7 @@ msgstr ""
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "June"
-msgstr ""
+msgstr "Junio"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_moves_bank
@@ -378,12 +379,12 @@ msgstr "Fecha de creación"
 #. module: account
 #: selection:account.journal,type:0
 msgid "Purchase Refund"
-msgstr ""
+msgstr "Devolución de compra"
 
 #. module: account
 #: selection:account.journal,type:0
 msgid "Opening/Closing Situation"
-msgstr ""
+msgstr "Situación de apertura/cierre"
 
 #. module: account
 #: help:account.journal,currency:0
@@ -393,7 +394,7 @@ msgstr "La moneda utilizada para el extracto"
 #. module: account
 #: field:account.open.closed.fiscalyear,fyear_id:0
 msgid "Fiscal Year to Open"
-msgstr "Año fiscal para abrir"
+msgstr "Ejercicio fiscal a abrir"
 
 #. module: account
 #: help:account.journal,sequence_id:0
@@ -495,7 +496,7 @@ msgstr ""
 #. module: account
 #: field:account.bank.statement,account_id:0
 msgid "Account used in this journal"
-msgstr ""
+msgstr "Cuenta utilizada en este diario"
 
 #. module: account
 #: help:account.aged.trial.balance,chart_account_id:0
@@ -557,7 +558,7 @@ msgstr "Cerrar un año fiscal"
 #. module: account
 #: model:process.transition,note:account.process_transition_confirmstatementfromdraft0
 msgid "The accountant confirms the statement."
-msgstr ""
+msgstr "El contador confirma la declaración."
 
 #. module: account
 #: report:account.account.balance:0
@@ -8156,7 +8157,7 @@ msgstr ""
 #: field:account.bank.statement,balance_end_real:0
 #: field:account.treasury.report,ending_balance:0
 msgid "Ending Balance"
-msgstr "Balance final"
+msgstr "Saldo Final"
 
 #. module: account
 #: help:account.move.line,blocked:0
diff --git a/addons/base_tools/i18n/hu.po b/addons/base_tools/i18n/hu.po
new file mode 100644
index 00000000000..64e4ab45ab5
--- /dev/null
+++ b/addons/base_tools/i18n/hu.po
@@ -0,0 +1,30 @@
+# Hungarian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2012-11-13 16:00+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hungarian <hu@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-11-14 04:40+0000\n"
+"X-Generator: Launchpad (build 16251)\n"
+
+#. module: base_tools
+#: model:ir.module.module,shortdesc:base_tools.module_meta_information
+msgid "Common base for tools modules"
+msgstr ""
+
+#. module: base_tools
+#: model:ir.module.module,description:base_tools.module_meta_information
+msgid ""
+"\n"
+"    "
+msgstr ""
diff --git a/addons/l10n_ar/i18n/es_AR.po b/addons/l10n_ar/i18n/es_AR.po
index 2260a43cf74..1f2b2dd250a 100644
--- a/addons/l10n_ar/i18n/es_AR.po
+++ b/addons/l10n_ar/i18n/es_AR.po
@@ -1,21 +1,21 @@
-# Spanish (Paraguay) translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# Spanish (Argentina) translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
 # This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-03-21 16:23+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Spanish (Paraguay) <es_PY@li.org>\n"
+"PO-Revision-Date: 2012-11-13 15:04+0000\n"
+"Last-Translator: Eduardo Alberto Calvo <Unknown>\n"
+"Language-Team: Spanish (Argentina) <es_AR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-03-22 04:36+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2012-11-14 04:40+0000\n"
+"X-Generator: Launchpad (build 16251)\n"
 
 #. module: l10n_ar
 #: model:ir.module.module,description:l10n_ar.module_meta_information
@@ -31,7 +31,7 @@ msgstr ""
 #. module: l10n_ar
 #: model:ir.module.module,shortdesc:l10n_ar.module_meta_information
 msgid "Argentinian Chart of Account"
-msgstr "Plan de cuentas de la Argentina"
+msgstr "Plan de cuentas de Argentina"
 
 #. module: l10n_ar
 #: model:ir.actions.todo,note:l10n_ar.config_call_account_template_in_minimal
@@ -45,7 +45,7 @@ msgid ""
 "Chart of Accounts from a Chart Template."
 msgstr ""
 "Generar el plan contable a partir de una plantilla de plan contable. Se le "
-"pedirá el nombre de la compañía, la plantilla de plan contable a utilizar, "
+"pedirá el nombre de la compañia, la plantilla de plan contable a utilizar, "
 "el número de dígitos para generar el código de las cuentas y de la cuenta "
 "bancaria, la moneda para crear los diarios. Así pues, se genere una copia "
 "exacta de la plantilla de plan contable.\n"
diff --git a/addons/note/i18n/pt_BR.po b/addons/note/i18n/pt_BR.po
new file mode 100644
index 00000000000..fca285578ed
--- /dev/null
+++ b/addons/note/i18n/pt_BR.po
@@ -0,0 +1,334 @@
+# Brazilian Portuguese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-11-02 12:54+0000\n"
+"PO-Revision-Date: 2012-11-14 04:29+0000\n"
+"Last-Translator: Guilherme R. Santos <Unknown>\n"
+"Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-11-14 04:40+0000\n"
+"X-Generator: Launchpad (build 16251)\n"
+
+#. module: note
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "Você não pode ter dois usuários com o mesmo login!"
+
+#. module: note
+#: field:note.note,memo:0
+msgid "Note Content"
+msgstr "Conteúdo da Nota"
+
+#. module: note
+#: view:note.stage:0
+msgid "Stages of Notes"
+msgstr "Estágio das Notas"
+
+#. module: note
+#: model:ir.model,name:note.model_base_config_settings
+msgid "base.config.settings"
+msgstr "base.config.settings"
+
+#. module: note
+#: model:ir.model,name:note.model_note_tag
+msgid "Note Tag"
+msgstr "Tag da Nota"
+
+#. module: note
+#: model:res.groups,name:note.group_note_fancy
+msgid "Notes / Fancy mode"
+msgstr "Notas / Modo fantasia"
+
+#. module: note
+#: model:ir.model,name:note.model_note_note
+#: view:note.note:0
+msgid "Note"
+msgstr "Nota"
+
+#. module: note
+#: view:note.note:0
+msgid "Group By..."
+msgstr "Agrupar Por..."
+
+#. module: note
+#: field:note.note,message_summary:0
+msgid "Summary"
+msgstr "Resumo"
+
+#. module: note
+#: field:note.note,message_follower_ids:0
+msgid "Followers"
+msgstr "Seguidores"
+
+#. module: note
+#: model:ir.actions.act_window,help:note.action_note_note
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to add a personal note.\n"
+"          </p><p>\n"
+"            Use notes to organize personal tasks or notes. All\n"
+"            notes are private; no one else will be able to see them. "
+"However\n"
+"            you can share some notes with other people by inviting "
+"followers\n"
+"            on the note. (Useful for meeting minutes, especially if\n"
+"            you activate the pad feature for collaborative writings).\n"
+"          </p><p>\n"
+"            You can customize how you process your notes/tasks by adding,\n"
+"            removing or modifying columns.\n"
+"          </p>\n"
+"        "
+msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Clique para adicionar nota pessoal.\n"
+"          </p><p>\n"
+"            Use notas para organizar tarefas ou notas pessoais. Todas\n"
+"            notas são privadas; ninguém mais é capaz de vê-las. Contudo\n"
+"            você pode compartilhar algumas notas com outras pessoas "
+"convidando seguidores\n"
+"            na nota. (Útil para atas de reunião, especialmente se\n"
+"            você ativar o recurso \"PAD\" para textos colaborativos).\n"
+"          </p><p>\n"
+"            Você pode customizar a forma como você processa suas "
+"notas/tarefas adicionando,\n"
+"            removendo ou modificando colunas.\n"
+"          </p>\n"
+"        "
+
+#. module: note
+#: view:note.note:0
+msgid "kanban note"
+msgstr "nota kanban"
+
+#. module: note
+#: model:note.stage,name:note.demo_note_stage_01
+#: model:note.stage,name:note.note_stage_01
+msgid "Today"
+msgstr "Hoje"
+
+#. module: note
+#: model:ir.model,name:note.model_res_users
+msgid "Users"
+msgstr "Usuários"
+
+#. module: note
+#: view:note.note:0
+msgid "í"
+msgstr "í"
+
+#. module: note
+#: view:note.stage:0
+msgid "Stage of Notes"
+msgstr "Estágios das Notas"
+
+#. module: note
+#: field:note.note,message_unread:0
+msgid "Unread Messages"
+msgstr "Mensagens não lidas"
+
+#. module: note
+#: field:note.note,current_partner_id:0
+msgid "unknown"
+msgstr "desconhecido"
+
+#. module: note
+#: view:note.note:0
+msgid "By sticky note Category"
+msgstr ""
+
+#. module: note
+#: help:note.note,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr "Se marcado novas mensagens requerem sua atenção"
+
+#. module: note
+#: field:note.stage,name:0
+msgid "Stage Name"
+msgstr "Nome do Estágio"
+
+#. module: note
+#: field:note.note,message_is_follower:0
+msgid "Is a Follower"
+msgstr "É um seguidor"
+
+#. module: note
+#: view:note.note:0
+msgid "title"
+msgstr "título"
+
+#. module: note
+#: model:note.stage,name:note.demo_note_stage_02
+#: model:note.stage,name:note.note_stage_02
+msgid "Tomorrow"
+msgstr "Amanhã"
+
+#. module: note
+#: view:note.note:0
+#: field:note.note,open:0
+msgid "Active"
+msgstr "Ativo"
+
+#. module: note
+#: help:note.stage,user_id:0
+msgid "Owner of the note stage."
+msgstr "Proprietário do estágio da nota."
+
+#. module: note
+#: model:ir.ui.menu,name:note.menu_notes_stage
+msgid "Categories"
+msgstr "Categorias"
+
+#. module: note
+#: field:note.note,message_comment_ids:0
+#: help:note.note,message_comment_ids:0
+msgid "Comments and emails"
+msgstr "Comentários e emails"
+
+#. module: note
+#: field:note.tag,name:0
+msgid "Tag Name"
+msgstr "Nome da Tag"
+
+#. module: note
+#: field:note.note,message_ids:0
+msgid "Messages"
+msgstr "Mensagens"
+
+#. module: note
+#: view:base.config.settings:0
+#: model:ir.actions.act_window,name:note.action_note_note
+#: model:ir.ui.menu,name:note.menu_note_notes
+#: view:note.note:0
+#: model:note.stage,name:note.note_stage_04
+msgid "Notes"
+msgstr "Notas"
+
+#. module: note
+#: model:note.stage,name:note.demo_note_stage_03
+#: model:note.stage,name:note.note_stage_03
+msgid "Later"
+msgstr "Mais tarde"
+
+#. module: note
+#: model:ir.model,name:note.model_note_stage
+msgid "Note Stage"
+msgstr "Estágio da Nota"
+
+#. module: note
+#: view:note.note:0
+msgid "dropdown menu"
+msgstr "dropdown menu"
+
+#. module: note
+#: model:note.stage,name:note.demo_note_stage_04
+msgid "Morning"
+msgstr "Manhã"
+
+#. module: note
+#: help:note.stage,sequence:0
+msgid "Used to order the note stages"
+msgstr "Usado para ordenar os estágios das notas"
+
+#. module: note
+#: view:note.note:0
+msgid "W"
+msgstr "W"
+
+#. module: note
+#: field:note.note,stage_ids:0
+msgid "Stages of Users"
+msgstr "Estágios de Usuários"
+
+#. module: note
+#: field:note.note,name:0
+msgid "Note Summary"
+msgstr "Resumo da Nota"
+
+#. module: note
+#: model:ir.actions.act_window,name:note.action_note_stage
+#: view:note.note:0
+msgid "Stages"
+msgstr "Estágios"
+
+#. module: note
+#: help:note.note,message_ids:0
+msgid "Messages and communication history"
+msgstr "Histórico de mensagens e comunicação"
+
+#. module: note
+#: view:note.note:0
+msgid "Delete"
+msgstr "Excluir"
+
+#. module: note
+#: field:note.note,color:0
+msgid "Color Index"
+msgstr "Índice de Cores"
+
+#. module: note
+#: field:note.note,sequence:0
+#: field:note.stage,sequence:0
+msgid "Sequence"
+msgstr "Sequencia"
+
+#. module: note
+#: field:note.note,tag_ids:0
+msgid "Tags"
+msgstr "Tags"
+
+#. module: note
+#: view:note.note:0
+msgid "Archive"
+msgstr "Arquivo"
+
+#. module: note
+#: field:base.config.settings,module_note_pad:0
+msgid "Use collaborative pads (etherpad)"
+msgstr "Usar pads colaborativos (etherpad)"
+
+#. module: note
+#: help:note.note,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
+
+#. module: note
+#: field:base.config.settings,group_note_fancy:0
+msgid "Use fancy layouts for notes"
+msgstr "Usar leiautes fantasia para notas"
+
+#. module: note
+#: field:note.stage,user_id:0
+msgid "Owner"
+msgstr "Proprietário"
+
+#. module: note
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+"A empresa escolhida não está entre as empresas habilitadas para este usuário"
+
+#. module: note
+#: view:note.note:0
+#: field:note.note,stage_id:0
+msgid "Stage"
+msgstr "Estágio"
+
+#. module: note
+#: field:note.note,date_done:0
+msgid "Date done"
+msgstr "Data de conclusão"
+
+#. module: note
+#: field:note.stage,fold:0
+msgid "Folded by Default"
+msgstr "Dobrado por Padrão"

From 9114457d71891f844889461c887d216387804eb8 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 14 Nov 2012 10:07:31 +0100
Subject: [PATCH 074/143] [REV] Revision 3408
 revid:al@openerp.com-20121114005029-41tkuo2g93vbnz60 does not pass runbot
 tests

bzr revid: fme@openerp.com-20121114090731-hrw2eh6b1and8soc
---
 addons/web/controllers/main.py     | 13 ++++++-------
 addons/web/static/src/js/chrome.js |  3 +--
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 844ec5d0bc5..ffabe97661b 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -1001,6 +1001,10 @@ class Session(openerpweb.Controller):
 class Menu(openerpweb.Controller):
     _cp_path = "/web/menu"
 
+    @openerpweb.jsonrequest
+    def load(self, req):
+        return {'data': self.do_load(req)}
+
     @openerpweb.jsonrequest
     def get_user_roots(self, req):
         return self.do_get_user_roots(req)
@@ -1027,8 +1031,7 @@ class Menu(openerpweb.Controller):
 
         return Menus.search(menu_domain, 0, False, False, context)
 
-    @openerpweb.jsonrequest
-    def load(self, req, menu_id=None):
+    def do_load(self, req):
         """ Loads all menu items (all applications and their sub-menus).
 
         :param req: A request object, with an OpenERP session attribute
@@ -1044,11 +1047,7 @@ class Menu(openerpweb.Controller):
 
         # menus are loaded fully unlike a regular tree view, cause there are a
         # limited number of items (752 when all 6.1 addons are installed)
-        if menu_id:
-            # for load only one sub menu
-            menu_ids = Menus.search([['id', 'child_of', menu_id]], 0, False, False, context)
-        else:
-            menu_ids = Menus.search([], 0, False, False, context)
+        menu_ids = Menus.search([], 0, False, False, context)
         menu_items = Menus.read(menu_ids, ['name', 'sequence', 'parent_id', 'action', 'needaction_enabled', 'needaction_counter'], context)
         # adds roots at the end of the sequence, so that they will overwrite
         # equivalent menu items from full menu read when put into id:item
diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index aa6a7c19788..69dafa08c02 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -716,8 +716,7 @@ instance.web.Menu =  instance.web.Widget.extend({
     },
     menu_loaded: function(data) {
         var self = this;
-        // TODO remove data.data
-        this.data = {"data": data};
+        this.data = data;
         this.renderElement();
         this.limit_entries();
         // Hide toplevel item if there is only one

From 45f8c4adb793ee01060120eb07386dda621a8d83 Mon Sep 17 00:00:00 2001
From: Vo Minh Thu <vmt@openerp.com>
Date: Wed, 14 Nov 2012 11:31:40 +0100
Subject: [PATCH 075/143] [IMP] loading.py: be a bit more explicit about
 valid/invalid data/test files.

bzr revid: vmt@openerp.com-20121114103140-y0k40eb525ak99v1
---
 openerp/modules/loading.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/openerp/modules/loading.py b/openerp/modules/loading.py
index ceb87afc67f..1f9e1e034d5 100644
--- a/openerp/modules/loading.py
+++ b/openerp/modules/loading.py
@@ -124,8 +124,10 @@ def load_module_graph(cr, graph, status=None, perform_checks=True, skip_modules=
                     tools.convert_yaml_import(cr, module_name, fp, kind, idref, mode, noupdate, report)
                 elif ext == '.xml':
                     tools.convert_xml_import(cr, module_name, fp, idref, mode, noupdate, report)
+                elif ext == '.js':
+                    pass # .js files are valid but ignored here.
                 else:
-                    _logger.debug("Ignoring %s due to unknown type", filename)
+                    _logger.warning("Can't load unknown file type %s.", filename)
             finally:
                 fp.close()
 

From 729eb0ff4fcd1024c443a9c6c19fa7b41631164f Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Wed, 14 Nov 2012 11:31:56 +0100
Subject: [PATCH 076/143] [FIX] problem with list editable in o2m

bzr revid: nicolas.vanhoren@openerp.com-20121114103156-tzbz8sm4x54jgjvm
---
 .../web/static/src/js/view_list_editable.js   | 59 +++++++++----------
 1 file changed, 29 insertions(+), 30 deletions(-)

diff --git a/addons/web/static/src/js/view_list_editable.js b/addons/web/static/src/js/view_list_editable.js
index becadcadf39..8bcf8b5d036 100644
--- a/addons/web/static/src/js/view_list_editable.js
+++ b/addons/web/static/src/js/view_list_editable.js
@@ -157,13 +157,7 @@ openerp.web.list_editable = function (instance) {
          * @returns {$.Deferred}
          */
         ensure_saved: function () {
-            var self = this;
-            return this.saving_mutex.exec(function() {
-                if (!self.editor.is_editing()) {
-                    return $.when();
-                }
-                return self.save_edition();
-            });
+            return this.save_edition();
         },
         /**
          * Builds a record with the provided id (``false`` for a creation),
@@ -273,29 +267,34 @@ openerp.web.list_editable = function (instance) {
          */
         save_edition: function () {
             var self = this;
-            return this.with_event('save', {
-                editor: this.editor,
-                form: this.editor.form,
-                cancel: false
-            }, function () {
-                return this.editor.save().then(function (attrs) {
-                    var created = false;
-                    var record = self.records.get(attrs.id);
-                    if (!record) {
-                        // new record
-                        created = true;
-                        record = self.records.find(function (r) {
-                            return !r.get('id');
-                        }).set('id', attrs.id);
-                    }
-                    // onwrite callback could be altering & reloading the
-                    // record which has *just* been saved, so first perform all
-                    // onwrites then do a final reload of the record
-                    return self.handle_onwrite(record)
-                        .then(function () {
-                            return self.reload_record(record); })
-                        .then(function () {
-                            return { created: created, record: record }; });
+            return self.saving_mutex.exec(function() {
+                if (!self.editor.is_editing()) {
+                    return $.when();
+                }
+                return self.with_event('save', {
+                    editor: self.editor,
+                    form: self.editor.form,
+                    cancel: false
+                }, function () {
+                    return self.editor.save().then(function (attrs) {
+                        var created = false;
+                        var record = self.records.get(attrs.id);
+                        if (!record) {
+                            // new record
+                            created = true;
+                            record = self.records.find(function (r) {
+                                return !r.get('id');
+                            }).set('id', attrs.id);
+                        }
+                        // onwrite callback could be altering & reloading the
+                        // record which has *just* been saved, so first perform all
+                        // onwrites then do a final reload of the record
+                        return self.handle_onwrite(record)
+                            .then(function () {
+                                return self.reload_record(record); })
+                            .then(function () {
+                                return { created: created, record: record }; });
+                    });
                 });
             });
         },

From 7508a5c7243f7cdc17dd94866721555972a0d830 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 14 Nov 2012 11:38:17 +0100
Subject: [PATCH 077/143] [CLEAN] html_email_clean: cleaned a bit the code.

bzr revid: tde@openerp.com-20121114103817-t19i2sv817jsur41
---
 openerp/tools/mail.py | 34 ++++++++++++----------------------
 1 file changed, 12 insertions(+), 22 deletions(-)

diff --git a/openerp/tools/mail.py b/openerp/tools/mail.py
index 020ab2313b4..5f8c65c1d9b 100644
--- a/openerp/tools/mail.py
+++ b/openerp/tools/mail.py
@@ -121,17 +121,20 @@ def html_email_clean(html):
             be present in the html string. This method therefore takes as input
             html code coming from a sanitized source, like fields.html.
     """
+    def _replace_matching_regex(regex, source, replace=''):
+        dest = ''
+        idx = 0
+        for item in re.finditer(regex, source):
+            dest += source[idx:item.start()] + replace
+            idx = item.end()
+        dest += source[idx:]
+        return dest
+
     html = ustr(html)
-    modified_html = ''
 
     # 1. <br[ /]> -> \n, because otherwise the tree is obfuscated
     br_tags = re.compile(r'([<]\s*br\s*\/?[>])')
-    idx = 0
-    for item in re.finditer(br_tags, html):
-        modified_html += html[idx:item.start()] + '__BR_TAG__'
-        idx = item.end()
-    modified_html += html[idx:]
-    html = modified_html
+    html = _replace_matching_regex(br_tags, html, '__BR_TAG__')
     # TDE note: seems to have lots of <div><br></div> in emails... needs to be checks, could be cleaned
 
     # 2. form a tree, handle (currently ?) pure-text by enclosing them in a pre
@@ -145,14 +148,7 @@ def html_email_clean(html):
     for node in root.getiterator():
         if not node.text:
             continue
-        idx = 0
-        text = ''
-        for item in re.finditer(quote_tags, node.text):
-            print item
-            text += node.text[idx:item.start()]
-            idx = item.end()
-        text += node.text[idx:]
-        node.text = text
+        node.text = _replace_matching_regex(quote_tags, node.text)
 
     # 3. remove blockquotes
     quotes = [el for el in root.getiterator(tag='blockquote')]
@@ -182,14 +178,8 @@ def html_email_clean(html):
 
     # 6. Misc cleaning :
     # - ClEditor seems to love using <div><br /><div> -> replace with <br />
-    modified_html = ''
     br_div_tags = re.compile(r'(<div>\s*<br\s*\/>\s*<\/div>)')
-    idx = 0
-    for item in re.finditer(br_div_tags, html):
-        modified_html += html[idx:item.start()] + '<br />'
-        idx = item.end()
-    modified_html += html[idx:]
-    html = modified_html
+    html = _replace_matching_regex(br_div_tags, html, '<br />')
 
     return html
 

From cbf3c82e88c8dfb5b9829a60262caa35d085c241 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 14 Nov 2012 11:38:49 +0100
Subject: [PATCH 078/143] [IMP] tools: added a true test for html_sanitize,
 some function renaming.

bzr revid: tde@openerp.com-20121114103849-hbxni04dpog1fxju
---
 openerp/tests/test_mail.py | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/openerp/tests/test_mail.py b/openerp/tests/test_mail.py
index 0d6c72ff915..975a8b846ee 100755
--- a/openerp/tests/test_mail.py
+++ b/openerp/tests/test_mail.py
@@ -124,8 +124,7 @@ bert.tartopoils@miam.miam
 
 
 class TestSanitizer(unittest2.TestCase):
-    """ Test the html sanitizer """
-    # TDE note: could be improved by actually checking the output
+    """ Test the html sanitizer that filters html to remove unwanted attributes """
 
     def test_simple(self):
         x = "yop"
@@ -135,15 +134,19 @@ class TestSanitizer(unittest2.TestCase):
         x = 'lala<p>yop</p>xxx'
         self.assertEqual(x, html_sanitize(x))
 
-    def test_no_exception(self):
-        html_sanitize(HTML_SOURCE)
+    def test_html(self):
+        sanitized_html = html_sanitize(HTML_SOURCE)
+        for tag in ['<font>', '<div>', '<b>', '<i>', '<u>', '<strike>', '<li>', '<blockquote>', '<a href']:
+            self.assertIn(tag, sanitized_html, 'html_sanitize stripped too much of original html')
+        for attr in ['style', 'javascript']:
+            self.assertNotIn(attr, sanitized_html, 'html_sanitize did not remove enough unwanted attributes')
 
     def test_unicode(self):
         html_sanitize("Merci à l'intérêt pour notre produit.nous vous contacterons bientôt. Merci")
 
 
 class TestCleaner(unittest2.TestCase):
-    """ Test the email cleaner function that filter the content of incoming emails """
+    """ Test the email cleaner function that filters the content of incoming emails """
 
     def test_html_email_clean(self):
         # Test1: reply through gmail: quote in blockquote, signature --\nAdministrator
@@ -171,7 +174,7 @@ class TestCleaner(unittest2.TestCase):
         self.assertNotIn('quote', new_html, 'html_email_cleaner did not remove correctly plaintext quotes')
 
 
-class TestAppendContentToHtml(unittest2.TestCase):
+class TestHtmlTools(unittest2.TestCase):
     """ Test some of our generic utility functions about html """
 
     def test_plaintext2html(self):

From ae2e2298dc12290e8c06de24cc7e761475c351a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 14 Nov 2012 11:52:52 +0100
Subject: [PATCH 079/143] [REV] mail_followers: context in send email is
 commented, because not ready yet.

bzr revid: tde@openerp.com-20121114105252-3eberdfvobrtthk6
---
 addons/mail/mail_followers.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/addons/mail/mail_followers.py b/addons/mail/mail_followers.py
index 15cdd3b8b1f..2942dde9b92 100644
--- a/addons/mail/mail_followers.py
+++ b/addons/mail/mail_followers.py
@@ -151,14 +151,12 @@ class mail_notification(osv.Model):
 
         # add the context in the email
         # TDE FIXME: commented, to be improved in a future branch
-        quote_context = self.pool.get('mail.message').message_quote_context(cr, uid, msg_id, context=context)
+        # quote_context = self.pool.get('mail.message').message_quote_context(cr, uid, msg_id, context=context)
 
         mail_mail = self.pool.get('mail.mail')
         # add signature
         body_html = msg.body
-        if quote_context:
-            pass
-            # print quote_context
+        # if quote_context:
             # body_html = tools.append_content_to_html(body_html, quote_context, plaintext=False)
         signature = msg.author_id and msg.author_id.user_id and msg.author_id.user_ids[0].signature or ''
         if signature:

From 48e3bdb3322a743e1941f3d42dbccac5f0cf20ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 14 Nov 2012 11:53:23 +0100
Subject: [PATCH 080/143] [IMP] mail_thread: incoming messages without model
 that are reply to a private message shoudl not have any res_id. Assert it.

bzr revid: tde@openerp.com-20121114105323-5an5v6m7bdaaomy1
---
 addons/mail/mail_thread.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 6d498eab8ad..d18d056e439 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -339,7 +339,7 @@ class mail_thread(osv.AbstractModel):
         message_ids = self.pool.get('mail.message').search(cr, uid, [('message_id', '=', in_reply_to)], limit=1, context=context)
         if message_ids:
             message = self.pool.get('mail.message').browse(cr, uid, message_ids[0], context=context)
-            _logger.debug('Routing mail with Message-Id %s: reply to a private message: %s, custom_values: %s, uid: %s',
+            _logger.debug('Routing mail with Message-Id %s: direct reply to a private message: %s, custom_values: %s, uid: %s',
                             message_id, message.id, custom_values, uid)
             return [(False, 0, custom_values, uid)]
 
@@ -450,6 +450,7 @@ class mail_thread(osv.AbstractModel):
                 else:
                     thread_id = model_pool.message_new(cr, user_id, msg, custom_values, context=context)
             else:
+                assert thread_id == 0, "Posting a message without model should be with a null res_id, to create a private message."
                 model_pool = self.pool.get('mail.thread')
             model_pool.message_post_user_api(cr, uid, [thread_id], context=context, content_subtype='html', **msg)
         return thread_id

From a36748ebe44704aefc66a67920e3b437c288b6e4 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 14 Nov 2012 13:51:34 +0100
Subject: [PATCH 081/143] [FIX] disable min-width on select fields when inside
 editable list row

bzr revid: xmo@openerp.com-20121114125134-ojiupdhudxjtz6y5
---
 addons/web/static/src/css/base.css  | 2 ++
 addons/web/static/src/css/base.sass | 1 +
 2 files changed, 3 insertions(+)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 3e287dedde6..c7f648da8be 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -2594,6 +2594,8 @@
   border-radius: 0;
   border: 1px solid #aaaaff;
   margin: 0;
+}
+.openerp .oe_list.oe_list_editable.oe_editing .oe_form_field input, .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field textarea, .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field select {
   min-width: 0;
 }
 .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_field_float input, .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_view_integer input {
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 5e11ab56e04..19d8d8a0d81 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -2052,6 +2052,7 @@ $sheet-padding: 16px
                 @include radius(0)
                 border: 1px solid #aaf
                 margin: 0
+            input, textarea, select
                 min-width: 0
             &.oe_form_field_float,&.oe_form_view_integer
                 input

From 3f0f60faa9a657f207d7907069d4ba188a03a8b4 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 14 Nov 2012 13:57:15 +0100
Subject: [PATCH 082/143] [FIX] Even IE9 only exposes console object when the
 debug window is opened

bzr revid: fme@openerp.com-20121114125715-wgr0wxb91dvccuag
---
 addons/web/static/src/js/coresetup.js | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/addons/web/static/src/js/coresetup.js b/addons/web/static/src/js/coresetup.js
index 5ff47aa32fa..87f659340f6 100644
--- a/addons/web/static/src/js/coresetup.js
+++ b/addons/web/static/src/js/coresetup.js
@@ -3,10 +3,13 @@
  *--------------------------------------------------------*/
 var console;
 if (!console) {
-    console = {log: function () {}};
-}
-if (!console.debug) {
-    console.debug = console.log;
+    // Even IE9 only exposes console object if debug window opened
+    console = {};
+    ('log error debug info warn assert clear dir dirxml trace group'
+        + ' groupCollapsed groupEnd time timeEnd profile profileEnd count'
+        + ' exception').split(/\s+/).forEach(function(property) {
+            console[property] = _.identity;
+    });
 }
 
 openerp.web.coresetup = function(instance) {

From 9f89256ef350d158b2ccb52e22480475ea454ff6 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Wed, 14 Nov 2012 11:55:54 +0100
Subject: [PATCH 083/143] [IMP] css to make the m2o nicer

bzr revid: nicolas.vanhoren@openerp.com-20121114105554-ps21uqbrbremmjxb
---
 addons/web/static/src/css/base.css  | 3 +++
 addons/web/static/src/css/base.sass | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index c7f648da8be..7d40bbb6aeb 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -2374,6 +2374,9 @@
   float: right;
   padding-left: 2px;
 }
+.openerp .oe_form_field_many2one input {
+  padding-right: 13px;
+}
 .openerp.ui-autocomplete li.oe_m2o_dropdown_option a {
   font-style: italic;
   padding-left: 2em;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 19d8d8a0d81..26abdb8a4f1 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1899,6 +1899,8 @@ $sheet-padding: 16px
             line-height: 14px
             float: right
             padding-left: 2px
+        input
+            padding-right: 13px
     &.ui-autocomplete
         li.oe_m2o_dropdown_option a
             font-style: italic

From a219c013f115deedb0a5a0ea4c47e4cd0737ef0e Mon Sep 17 00:00:00 2001
From: Vo Minh Thu <vmt@openerp.com>
Date: Wed, 14 Nov 2012 12:00:53 +0100
Subject: [PATCH 084/143] [IMP] controllers/main.py: removed unneeded
 tupling/splatting.

bzr revid: vmt@openerp.com-20121114110053-9vovll5tvjobjuka
---
 addons/web/controllers/main.py | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 3980fc34aed..a331c121835 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -806,26 +806,20 @@ class Database(openerpweb.Controller):
     @openerpweb.jsonrequest
     def create(self, req, fields):
         params = dict(map(operator.itemgetter('name', 'value'), fields))
-        create_attrs = (
+        return req.session.proxy("db").create_database(
             params['super_admin_pwd'],
             params['db_name'],
             bool(params.get('demo_data')),
             params['db_lang'],
-            params['create_admin_pwd']
-        )
-
-        return req.session.proxy("db").create_database(*create_attrs)
+            params['create_admin_pwd'])
 
     @openerpweb.jsonrequest
     def duplicate(self, req, fields):
         params = dict(map(operator.itemgetter('name', 'value'), fields))
-        duplicate_attrs = (
+        return req.session.proxy("db").duplicate_database(
             params['super_admin_pwd'],
             params['db_original_name'],
-            params['db_name'],
-        )
-
-        return req.session.proxy("db").duplicate_database(*duplicate_attrs)
+            params['db_name'])
 
     @openerpweb.jsonrequest
     def drop(self, req, fields):

From 44bdf27363fb36b63d9c15e70416edc364f087fd Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Wed, 14 Nov 2012 12:05:58 +0100
Subject: [PATCH 085/143] [FIX] temporarily disabled a hack on res.users to use
 the partners view because it made a lot of views crash

bzr revid: nicolas.vanhoren@openerp.com-20121114110558-lylif3w917pjeu3y
---
 openerp/addons/base/res/res_users.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/openerp/addons/base/res/res_users.py b/openerp/addons/base/res/res_users.py
index f272b3712c6..f975d39b300 100644
--- a/openerp/addons/base/res/res_users.py
+++ b/openerp/addons/base/res/res_users.py
@@ -256,8 +256,9 @@ class res_users(osv.osv):
             - else: the default view is overrided and redirected to the partner
               view
         """
-        if not view_id and view_type == 'form':
-            return self.pool.get('res.partner').fields_view_get(cr, uid, view_id, view_type, context, toolbar, submenu)
+        #made a lot of views crash because methods of open chatter are not available on users
+        #if not view_id and view_type == 'form':
+        #    return self.pool.get('res.partner').fields_view_get(cr, uid, view_id, view_type, context, toolbar, submenu)
         return super(res_users, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar, submenu)
 
     # User can write on a few of his own fields (but not his groups for example)

From 5afe27095f09d13040e4dcb9d27be9419da1f246 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 14 Nov 2012 12:11:04 +0100
Subject: [PATCH 086/143] [FIX] mail_followes: signature addition is back,
 wrong var name.

bzr revid: tde@openerp.com-20121114111104-0jyqh2v0tk7zznc1
---
 addons/mail/mail_followers.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/mail/mail_followers.py b/addons/mail/mail_followers.py
index 2942dde9b92..8d3876ec91f 100644
--- a/addons/mail/mail_followers.py
+++ b/addons/mail/mail_followers.py
@@ -158,9 +158,9 @@ class mail_notification(osv.Model):
         body_html = msg.body
         # if quote_context:
             # body_html = tools.append_content_to_html(body_html, quote_context, plaintext=False)
-        signature = msg.author_id and msg.author_id.user_id and msg.author_id.user_ids[0].signature or ''
+        signature = msg.author_id and msg.author_id.user_ids and msg.author_id.user_ids[0].signature or ''
         if signature:
-            body_html = tools.append_content_to_html(body_html, tools.text2html(signature), plaintext=False)
+            body_html = tools.append_content_to_html(body_html, signature, plaintext=True, container_tag='div')
 
         mail_values = {
             'mail_message_id': msg.id,

From 17c2939ddc764f88797f1a2a3e4b72bc44468daf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 14 Nov 2012 12:11:29 +0100
Subject: [PATCH 087/143] [IMP] mail_thread: message_process: plaintext
 incoming messages are preserved in pre tags.

bzr revid: tde@openerp.com-20121114111129-8nkneu1h6ij2lk99
---
 addons/mail/mail_thread.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index d18d056e439..81120151de1 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -520,7 +520,7 @@ class mail_thread(osv.AbstractModel):
             body = tools.ustr(body, encoding, errors='replace')
             if message.get_content_type() == 'text/plain':
                 # text/plain -> <pre/>
-                body = tools.append_content_to_html(u'', body)
+                body = tools.append_content_to_html(u'', body, preserve=True)
         else:
             alternative = (message.get_content_type() == 'multipart/alternative')
             for part in message.walk():
@@ -535,7 +535,7 @@ class mail_thread(osv.AbstractModel):
                 # 2) text/plain -> <pre/>
                 if part.get_content_type() == 'text/plain' and (not alternative or not body):
                     body = tools.append_content_to_html(body, tools.ustr(part.get_payload(decode=True),
-                                                                         encoding, errors='replace'))
+                                                                         encoding, errors='replace'), preserve=True)
                 # 3) text/html -> raw
                 elif part.get_content_type() == 'text/html':
                     html = tools.ustr(part.get_payload(decode=True), encoding, errors='replace')

From 524c3d500dd865af04a98f52cdf4b9eec90bc465 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 14 Nov 2012 12:19:23 +0100
Subject: [PATCH 088/143] [FIX] chrome.js: leftover typo after renaming of URL
 `action_id` param, new `action` param was being ignored

bzr revid: odo@openerp.com-20121114111923-x2qs3zdfzmezt5z8
---
 addons/web/static/src/js/chrome.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 69dafa08c02..51e12a3a9dc 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -1106,7 +1106,7 @@ instance.web.WebClient = instance.web.Client.extend({
         var self = this;
         var state = event.getState(true);
         if (!_.isEqual(this._current_state, state)) {
-            if(state.action_id === undefined && state.menu_id) {
+            if(state.action === undefined && state.menu_id) {
                 self.menu.has_been_loaded.done(function() {
                     self.menu.do_reload().done(function() {
                         self.menu.menu_click(state.menu_id)

From 8b5a7c49a474162b8663a6d17500079651f5a998 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 14 Nov 2012 12:20:21 +0100
Subject: [PATCH 089/143] [REM] osv: removed temporary override of raise, added
 for debug purpose.

bzr revid: tde@openerp.com-20121114112021-trre94clvs8nuo43
---
 openerp/osv/osv.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/openerp/osv/osv.py b/openerp/osv/osv.py
index 4e875d29a21..7703406ec96 100644
--- a/openerp/osv/osv.py
+++ b/openerp/osv/osv.py
@@ -120,7 +120,6 @@ class object_proxy(object):
                     raise except_osv('Database not ready', 'Currently, this database is not fully loaded and can not be used.')
                 return f(self, dbname, *args, **kwargs)
             except orm.except_orm, inst:
-                raise
                 raise except_osv(inst.name, inst.value)
             except except_osv:
                 raise

From 7dcb31bcde3509d9ae57c7313f0f693185e6a0e2 Mon Sep 17 00:00:00 2001
From: Vo Minh Thu <vmt@openerp.com>
Date: Wed, 14 Nov 2012 12:25:21 +0100
Subject: [PATCH 090/143] [IMP] duplicate_database: better logging.

bzr revid: vmt@openerp.com-20121114112521-g9q2n88ql9qwvlum
---
 openerp/service/web_services.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/openerp/service/web_services.py b/openerp/service/web_services.py
index f4bcae81d03..731ccbe757e 100644
--- a/openerp/service/web_services.py
+++ b/openerp/service/web_services.py
@@ -152,13 +152,13 @@ class db(netsvc.ExportService):
 
         self.actions[id] = {'clean': False}
 
-        _logger.info('CREATE DATABASE %s', db_name.lower())
+        _logger.info('Create database `%s`.', db_name)
         self._create_empty_database(db_name)
         _initialize_db(self, id, db_name, demo, lang, user_password)
         return True
 
     def exp_duplicate_database(self, db_original_name, db_name):
-        _logger.info('Duplicate database %s', db_name.lower())
+        _logger.info('Duplicate database `%s` to `%s`.', db_original_name, db_name)
         db = sql_db.db_connect('postgres')
         cr = db.cursor()
         try:

From e1f5dfc388b1a5d8269b74cbde6b6f599a44f9ef Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Wed, 14 Nov 2012 12:33:35 +0100
Subject: [PATCH 091/143] [FIX] jsonp wasn't working on some browse due to
 security restriction that do not store the third parties cookies.

bzr revid: chs@openerp.com-20121114113335-nag3ljcwwx0yfdnu
---
 addons/web/http.py                  |  7 +++++++
 addons/web/static/src/js/corelib.js | 15 ++++++++++++---
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/addons/web/http.py b/addons/web/http.py
index 30fcf67ddd1..309bcb81135 100644
--- a/addons/web/http.py
+++ b/addons/web/http.py
@@ -227,6 +227,10 @@ class JsonRequest(WebRequest):
             _logger.debug("<--\n%s", pprint.pformat(response))
 
         if jsonp:
+            # If we use jsonp, that's mean we are called from another host
+            # Some browser (IE and Safari) do no allow third party cookies
+            # We need then to manage http sessions manually.
+            response['httpsessionid'] = self.httpsession.sid
             mime = 'application/javascript'
             body = "%s(%s);" % (jsonp, simplejson.dumps(response, cls=nonliterals.NonLiteralEncoder),)
         else:
@@ -364,6 +368,9 @@ def session_context(request, storage_path, session_cookie='httpsessionid'):
         STORES[storage_path] = session_store, session_lock
 
     sid = request.cookies.get(session_cookie)
+    if not sid:
+        sid = request.args.get('sid')
+
     with session_lock:
         if sid:
             request.session = session_store.get(sid)
diff --git a/addons/web/static/src/js/corelib.js b/addons/web/static/src/js/corelib.js
index 4012be526e6..5c4ef8b5cbb 100644
--- a/addons/web/static/src/js/corelib.js
+++ b/addons/web/static/src/js/corelib.js
@@ -1309,8 +1309,17 @@ instance.web.JsonRPC = instance.web.Class.extend(instance.web.PropertiesMixin, {
         // extracted from payload to set on the url
         var data = {
             session_id: this.session_id,
-            id: payload.id
+            id: payload.id,
+            sid: this.httpsessionid,
         };
+        
+        var set_sid = function (response, textStatus, jqXHR) {
+            // If response give us the http session id, we store it for next requests...
+            if (response.httpsessionid) {
+                self.httpsessionid = response.httpsessionid;
+            }
+        };
+
         url.url = this.get_url(url.url);
         var ajax = _.extend({
             type: "GET",
@@ -1326,7 +1335,7 @@ instance.web.JsonRPC = instance.web.Class.extend(instance.web.PropertiesMixin, {
         if(payload_url.length < 2000) {
             // Direct jsonp request
             ajax.data.r = payload_str;
-            return $.ajax(ajax);
+            return $.ajax(ajax).done(set_sid);
         } else {
             // Indirect jsonp request
             var ifid = _.uniqueId('oe_rpc_iframe');
@@ -1364,7 +1373,7 @@ instance.web.JsonRPC = instance.web.Class.extend(instance.web.PropertiesMixin, {
             });
             // append the iframe to the DOM (will trigger the first load)
             $form.after($iframe);
-            return deferred;
+            return deferred.done(set_sid);
         }
     },
     get_url: function (file) {

From 01630d6800ca4fbeb81feb60cc8e423835e55bcf Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 14 Nov 2012 12:45:08 +0100
Subject: [PATCH 092/143] [FIX] focus/blur in fieldm2mtags in case of tabbing
 in/out

bzr revid: xmo@openerp.com-20121114114508-g97xdgq4a4fhpmjz
---
 addons/web/static/src/js/view_form.js | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 2b578fc6a90..6527964da9d 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -3992,13 +3992,18 @@ instance.web.form.FieldMany2ManyTags = instance.web.form.AbstractField.extend(in
             self._drop_shown = true;
         });
         self.tags = self.$text.textext()[0].tags();
-        self.$text.focusout(function() {
-            self.$text.trigger("setInputData", "");
-        }).keydown(function(e) {
-            if (e.which === $.ui.keyCode.TAB && self._drop_shown) {
-                self.$text.textext()[0].autocomplete().selectFromDropdown();
-            }
-        });
+        self.$text
+            .focusin(function () {
+                self.trigger('focused');
+            })
+            .focusout(function() {
+                self.$text.trigger("setInputData", "");
+                self.trigger('blurred');
+            }).keydown(function(e) {
+                if (e.which === $.ui.keyCode.TAB && self._drop_shown) {
+                    self.$text.textext()[0].autocomplete().selectFromDropdown();
+                }
+            });
     },
     set_value: function(value_) {
         value_ = value_ || [];

From 64277d04c39767f6633c9406a393302c1924d9a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 14 Nov 2012 12:55:04 +0100
Subject: [PATCH 093/143] [IMP] Addons: messages when installing key apps is
 not of comment subtype, meaning they are effectively pushed.

bzr revid: tde@openerp.com-20121114115504-tvh0j9ks0jde12ed
---
 addons/account_accountant/account_accountant_data.xml | 8 +++-----
 addons/account_voucher/account_voucher_data.xml       | 8 +++-----
 addons/crm/crm_data.xml                               | 5 +++--
 addons/email_template/tests/test_mail.py              | 4 ++--
 addons/hr/hr_data.xml                                 | 8 ++++----
 addons/hr_evaluation/hr_evaluation_data.xml           | 4 ++--
 addons/hr_expense/hr_expense_data.xml                 | 6 +++---
 addons/hr_holidays/hr_holidays_data.xml               | 5 +++--
 addons/hr_recruitment/hr_recruitment_data.xml         | 6 +++---
 addons/hr_timesheet_sheet/hr_timesheet_sheet_data.xml | 3 ++-
 addons/mail/data/mail_group_data.xml                  | 1 +
 addons/mrp/mrp_data.xml                               | 8 ++++----
 addons/point_of_sale/point_of_sale_data.xml           | 6 +++---
 addons/project/project_data.xml                       | 8 ++++----
 addons/project_gtd/project_gtd_data.xml               | 5 +++--
 addons/project_issue/project_issue_data.xml           | 5 +++--
 addons/purchase/purchase_data.xml                     | 6 +++---
 addons/sale/sale_data.xml                             | 6 +++---
 addons/stock/stock_data.xml                           | 5 +++--
 19 files changed, 55 insertions(+), 52 deletions(-)

diff --git a/addons/account_accountant/account_accountant_data.xml b/addons/account_accountant/account_accountant_data.xml
index cf143b1bb58..14d8f59a5fe 100644
--- a/addons/account_accountant/account_accountant_data.xml
+++ b/addons/account_accountant/account_accountant_data.xml
@@ -26,12 +26,10 @@
             <field name="model">mail.group</field>
             <field name="res_id" ref="mail.group_all_employees"/>
             <field name="type">notification</field>
+            <field name="subtype_id" ref="mail.mt_comment"/>
             <field name="subject">Accounting and Finance application installed!</field>
-            <field name="body"><![CDATA[
-                With OpenERP's accounting, you get instant access to your financial  data, and can setup analytic accounting, forecast taxes, control  budgets, easily create and send invoices, record bank statements, etc.
-
-<p>The accounting features are fully integrated  with other OpenERP applications to automate all your processes:  creation of customer invoices, control of supplier invoices,  point-of-sale integration, automated follow-ups, etc.</p>
-            ]]></field>
+            <field name="body"><![CDATA[<p>With OpenERP's accounting, you get instant access to your financial  data, and can setup analytic accounting, forecast taxes, control  budgets, easily create and send invoices, record bank statements, etc.</p>
+<p>The accounting features are fully integrated  with other OpenERP applications to automate all your processes:  creation of customer invoices, control of supplier invoices,  point-of-sale integration, automated follow-ups, etc.</p>]]></field>
         </record>
     </data>
 </openerp>
diff --git a/addons/account_voucher/account_voucher_data.xml b/addons/account_voucher/account_voucher_data.xml
index 3d4252e697d..fc008e479e9 100644
--- a/addons/account_voucher/account_voucher_data.xml
+++ b/addons/account_voucher/account_voucher_data.xml
@@ -7,12 +7,10 @@
             <field name="model">mail.group</field>
             <field name="res_id" ref="mail.group_all_employees"/>
             <field name="type">notification</field>
+            <field name="subtype_id" ref="mail.mt_comment"/>
             <field name="subject">eInvoicing &amp; Payments application installed!</field>
-            <field name="body"><![CDATA[
-                OpenERP's electronic invoicing accelerates the creation of invoices and collection of customer payments. Invoices are created in a few clicks and your customers receive them by email. They can pay online and/or import them in their own system.  
-
-<p>You can track customer payments easily and automate follow-ups. You get an overview of the discussion with your customers on each invoice for easier traceability. For advanced accounting features, you should install the "Accounting and Finance" module.</p>
-            ]]></field>
+            <field name="body"><![CDATA[<p>OpenERP's electronic invoicing accelerates the creation of invoices and collection of customer payments. Invoices are created in a few clicks and your customers receive them by email. They can pay online and/or import them in their own system.</p>
+<p>You can track customer payments easily and automate follow-ups. You get an overview of the discussion with your customers on each invoice for easier traceability. For advanced accounting features, you should install the "Accounting and Finance" module.</p>]]></field>
         </record>
 
         <!-- mail: subtypes -->
diff --git a/addons/crm/crm_data.xml b/addons/crm/crm_data.xml
index 9dfbd5f9948..91117d2d83e 100644
--- a/addons/crm/crm_data.xml
+++ b/addons/crm/crm_data.xml
@@ -58,9 +58,10 @@
             <field name="model">mail.group</field>
             <field name="res_id" ref="mail.group_all_employees"/>
             <field name="type">notification</field>
+            <field name="subtype_id" ref="mail.mt_comment"/>
             <field name="subject">CRM application installed!</field>
-            <field name="body">From the top Sales menu you can track leads and opportunities, get accurate forecast on your sales pipeline, plan meetings and phonecalls, get realtime statistics and efficiently organize the communication with your prospects.
-To manage quotations and sale orders, install the "Sales Management" application.</field>
+            <field name="body"><![CDATA[<p>From the top Sales menu you can track leads and opportunities, get accurate forecast on your sales pipeline, plan meetings and phonecalls, get realtime statistics and efficiently organize the communication with your prospects.</p>
+<br />To manage quotations and sale orders, install the "Sales Management" application.</p>]]></field>
         </record>
 
         <record model="mail.alias" id="default_sales_alias">
diff --git a/addons/email_template/tests/test_mail.py b/addons/email_template/tests/test_mail.py
index 9a7b71a4e42..00dd6dc8727 100644
--- a/addons/email_template/tests/test_mail.py
+++ b/addons/email_template/tests/test_mail.py
@@ -20,10 +20,10 @@
 ##############################################################################
 
 import base64
-from openerp.addons.mail.tests import test_mail
+from openerp.addons.mail.tests import test_mail_mockup
 
 
-class test_message_compose(test_mail.TestMailMockups):
+class test_message_compose(test_mail_mockup.TestMailMockups):
 
     def setUp(self):
         super(test_message_compose, self).setUp()
diff --git a/addons/hr/hr_data.xml b/addons/hr/hr_data.xml
index 514cf1f80f6..25c882f2201 100644
--- a/addons/hr/hr_data.xml
+++ b/addons/hr/hr_data.xml
@@ -6,11 +6,11 @@
             <field name="model">mail.group</field>
             <field name="res_id" ref="mail.group_all_employees"/>
             <field name="type">notification</field>
+            <field name="subtype_id" ref="mail.mt_comment"/>
             <field name="subject">Employee Directory application installed!</field>
-            <field name="body">Manage your human resources with OpenERP: employees and their hierarchy, HR departments and job positions.
-
-More HR features are available via extra applications: Recruitment Process (manage job positions and recruitment), Timesheet Validation (record timesheets and attendance),
-Leave Management (keep track of employee leaves), Expense Management (manage employee expenses), Employee Appraisals (organize employee surveys, where employees evaluate their subordinates or their manager).</field>
+            <field name="body"><![CDATA[<p>Manage your human resources with OpenERP: employees and their hierarchy, HR departments and job positions.</p>
+<p>More HR features are available via extra applications: Recruitment Process (manage job positions and recruitment), Timesheet Validation (record timesheets and attendance),
+Leave Management (keep track of employee leaves), Expense Management (manage employee expenses), Employee Appraisals (organize employee surveys, where employees evaluate their subordinates or their manager).</p>]]></field>
         </record>
 
         <record id="employee" model="hr.employee">
diff --git a/addons/hr_evaluation/hr_evaluation_data.xml b/addons/hr_evaluation/hr_evaluation_data.xml
index 01915de76a0..45100b14e2a 100644
--- a/addons/hr_evaluation/hr_evaluation_data.xml
+++ b/addons/hr_evaluation/hr_evaluation_data.xml
@@ -11,9 +11,9 @@
             <field name="model">mail.group</field>
             <field name="res_id" ref="mail.group_all_employees"/>
             <field name="type">notification</field>
+            <field name="subtype_id" ref="mail.mt_comment"/>
             <field name="subject">Employee Appraisals application installed!</field>
-            <field name="body">Manage employee reviews: you can define an appraisal campaign with several steps, with specific evaluation surveys according to hierarchy levels.
-Evaluations filled by employees may be exported as pdf files.</field>
+            <field name="body"><![CDATA[<p>Manage employee reviews: you can define an appraisal campaign with several steps, with specific evaluation surveys according to hierarchy levels. Evaluations filled by employees may be exported as pdf files.</p>]]></field>
         </record>
 
         <record id="survey_2" model="survey">
diff --git a/addons/hr_expense/hr_expense_data.xml b/addons/hr_expense/hr_expense_data.xml
index 2a9f3ae0a56..f54156ac5ec 100644
--- a/addons/hr_expense/hr_expense_data.xml
+++ b/addons/hr_expense/hr_expense_data.xml
@@ -6,10 +6,10 @@
             <field name="model">mail.group</field>
             <field name="res_id" ref="mail.group_all_employees"/>
             <field name="type">notification</field>
+            <field name="subtype_id" ref="mail.mt_comment"/>
             <field name="subject">Expense Management application installed!</field>
-            <field name="body">Manage your employees' expenses, after due validation by their manager and the accountant, then generate and pay the corresponding invoices.
-
-This feature is also linked to analytic accounting and compatible with timesheet invoices, so you will be able to automatically re-invoice project-related expenses to your customers.</field>
+            <field name="body"><![CDATA[<p>Manage your employees' expenses, after due validation by their manager and the accountant, then generate and pay the corresponding invoices.</p>
+<p>This feature is also linked to analytic accounting and compatible with timesheet invoices, so you will be able to automatically re-invoice project-related expenses to your customers.</p>]]></field>
         </record>
 
         <!-- Resource: product.uom.categ -->
diff --git a/addons/hr_holidays/hr_holidays_data.xml b/addons/hr_holidays/hr_holidays_data.xml
index afe2e69e697..5af0c60fc44 100644
--- a/addons/hr_holidays/hr_holidays_data.xml
+++ b/addons/hr_holidays/hr_holidays_data.xml
@@ -11,9 +11,10 @@
             <field name="model">mail.group</field>
             <field name="res_id" ref="mail.group_all_employees"/>
             <field name="type">notification</field>
+            <field name="subtype_id" ref="mail.mt_comment"/>
             <field name="subject">Leave Management application installed!</field>
-            <field name="body">Manage employee leaves from the top menu "Human Resources". Employees can create leave requests that are validated by their manager and/or HR officers.
-Once validated, they are visible in the employee's calendar. HR officers can define leave types and allocate leaves to employees and employee categories.</field>
+            <field name="body"><![CDATA[<p>Manage employee leaves from the top menu "Human Resources". Employees can create leave requests that are validated by their manager and/or HR officers.</p>
+<p>Once validated, they are visible in the employee's calendar. HR officers can define leave types and allocate leaves to employees and employee categories.</p>]]></field>
         </record>
 
 
diff --git a/addons/hr_recruitment/hr_recruitment_data.xml b/addons/hr_recruitment/hr_recruitment_data.xml
index 330c86652dd..f1c8ed46aca 100644
--- a/addons/hr_recruitment/hr_recruitment_data.xml
+++ b/addons/hr_recruitment/hr_recruitment_data.xml
@@ -6,10 +6,10 @@
             <field name="model">mail.group</field>
             <field name="res_id" ref="mail.group_all_employees"/>
             <field name="type">notification</field>
+            <field name="subtype_id" ref="mail.mt_comment"/>
             <field name="subject">Recruitment Process application installed!</field>
-            <field name="body">Manage job positions and your company's recruitment process.  This application is integrated with the Survey application to help you define interviews for different jobs.
-
-You can automatically receive job application though an email gateway, see the Human Resources settings.</field>
+            <field name="body"><![CDATA[<p>Manage job positions and your company's recruitment process.  This application is integrated with the Survey application to help you define interviews for different jobs.</p>
+<p>You can automatically receive job application though an email gateway, see the Human Resources settings.</p>]]></field>
         </record>
 
     <!-- Meeting Types (for interview meetings) -->
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_data.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_data.xml
index 87edf949972..095a92c032d 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_data.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_data.xml
@@ -6,8 +6,9 @@
             <field name="model">mail.group</field>
             <field name="res_id" ref="mail.group_all_employees"/>
             <field name="type">notification</field>
+            <field name="subtype_id" ref="mail.mt_comment"/>
             <field name="subject">Timesheet Validation application installed!</field>
-            <field name="body">From the top menu "Human Resources", enter and validate timesheets and attendances.</field>
+            <field name="body"><![CDATA[<p>From the top menu "Human Resources", enter and validate timesheets and attendances.</p>]]></field>
         </record>
 
         <record id="ir_actions_server_timsheet_sheet" model="ir.actions.server">
diff --git a/addons/mail/data/mail_group_data.xml b/addons/mail/data/mail_group_data.xml
index 2c983d67758..aae30226bf2 100644
--- a/addons/mail/data/mail_group_data.xml
+++ b/addons/mail/data/mail_group_data.xml
@@ -17,6 +17,7 @@
             <field name="model">mail.group</field>
             <field name="res_id" ref="mail.group_all_employees"/>
             <field name="type">notification</field>
+            <field name="subtype_id" ref="mail.mt_comment"/>
             <field name="subject">Welcome to OpenERP!</field>
             <field name="body"><![CDATA[<p>Your homepage is a summary of messages you received and key information about documents you follow.<br />
 The top menu bar contains all applications you installed. You can use this &lt;i&gt;Settings&lt;/i&gt; menu to install more applications, activate others features or give access to new users.<br />
diff --git a/addons/mrp/mrp_data.xml b/addons/mrp/mrp_data.xml
index 3310bc98899..1d92609eb7e 100644
--- a/addons/mrp/mrp_data.xml
+++ b/addons/mrp/mrp_data.xml
@@ -6,11 +6,11 @@
             <field name="model">mail.group</field>
             <field name="res_id" ref="mail.group_all_employees"/>
             <field name="type">notification</field>
+            <field name="subtype_id" ref="mail.mt_comment"/>
             <field name="subject">MRP application installed!</field>
-            <field name="body">Manage your manufacturing process with OpenERP by defining your bills of materials (BoM), routings and work centers.
-This application supports complete integration and production scheduling for stockable goods, consumables, and services.
-
-From the Manufacturing Settings, you can choose to compute production schedules periodically or just-in-time.</field>
+            <field name="body"><![CDATA[<p>Manage your manufacturing process with OpenERP by defining your bills of materials (BoM), routings and work centers.<br />
+This application supports complete integration and production scheduling for stockable goods, consumables, and services.</p>
+<p>From the Manufacturing Settings, you can choose to compute production schedules periodically or just-in-time.</p>]]></field>
         </record>
         
         <record id="sequence_mrp_prod_type" model="ir.sequence.type">
diff --git a/addons/point_of_sale/point_of_sale_data.xml b/addons/point_of_sale/point_of_sale_data.xml
index 634d2606aa8..01d8dd9ff60 100644
--- a/addons/point_of_sale/point_of_sale_data.xml
+++ b/addons/point_of_sale/point_of_sale_data.xml
@@ -20,10 +20,10 @@
             <field name="model">mail.group</field>
             <field name="res_id" ref="mail.group_all_employees"/>
             <field name="type">notification</field>
+            <field name="subtype_id" ref="mail.mt_comment"/>
             <field name="subject">Point of Sale application installed!</field>
-            <field name="body">Record sale orders, register payments, compute change to return, create invoices, and manage refunds through a specific web touch-screen interface.
-
-If you install the PoS proxy you will be able to interface OpenERP with retail hardware: barcode scanners, printers, cash registers, weighing machines, credit card payment terminals.</field>
+            <field name="body"><![CDATA[<p>Record sale orders, register payments, compute change to return, create invoices, and manage refunds through a specific web touch-screen interface.</p>
+<p>If you install the PoS proxy you will be able to interface OpenERP with retail hardware: barcode scanners, printers, cash registers, weighing machines, credit card payment terminals.</p>]]></field>
         </record>
 
         <record id="unreferenced_product" model="product.product">
diff --git a/addons/project/project_data.xml b/addons/project/project_data.xml
index 4f467c89a29..c5980ecddd2 100644
--- a/addons/project/project_data.xml
+++ b/addons/project/project_data.xml
@@ -125,11 +125,11 @@
             <field name="model">mail.group</field>
             <field name="res_id" ref="mail.group_all_employees"/>
             <field name="type">notification</field>
+            <field name="subtype_id" ref="mail.mt_comment"/>
             <field name="subject">Project Management application installed!</field>
-            <field name="body">Manage multi-level projects and tasks.  You can delegate tasks, track task work, and review your planning.
-
-You can manage todo lists on tasks by installing the "Todo Lists" application, supporting the Getting Things Done (GTD) methodology.
-You can also manage issues/bugs in projects by installing the "Issue Tracker" application.</field>
+            <field name="body"><![CDATA[<p>Manage multi-level projects and tasks.  You can delegate tasks, track task work, and review your planning.</p>
+<p>You can manage todo lists on tasks by installing the "Todo Lists" application, supporting the Getting Things Done (GTD) methodology.</p>
+<p>You can also manage issues/bugs in projects by installing the "Issue Tracker" application.</p>]]></field>
         </record>
     </data>
 </openerp>
diff --git a/addons/project_gtd/project_gtd_data.xml b/addons/project_gtd/project_gtd_data.xml
index 61b2468329c..1536ac4be3f 100644
--- a/addons/project_gtd/project_gtd_data.xml
+++ b/addons/project_gtd/project_gtd_data.xml
@@ -30,9 +30,10 @@
             <field name="model">mail.group</field>
             <field name="res_id" ref="mail.group_all_employees"/>
             <field name="type">notification</field>
+            <field name="subtype_id" ref="mail.mt_comment"/>
             <field name="subject">Todo Lists application installed!</field>
-            <field name="body">Add todo items on project tasks, to help you organize your work.
-This application supports the Getting Things Done (GTD) methodology, based on David Allen's book.</field>
+            <field name="body"><![CDATA[<p>Add todo items on project tasks, to help you organize your work.
+This application supports the Getting Things Done (GTD) methodology, based on David Allen's book.</p>]]></field>
         </record>
 
     </data>
diff --git a/addons/project_issue/project_issue_data.xml b/addons/project_issue/project_issue_data.xml
index 72f824715a8..d70cd71e240 100644
--- a/addons/project_issue/project_issue_data.xml
+++ b/addons/project_issue/project_issue_data.xml
@@ -36,10 +36,11 @@
             <field name="model">mail.group</field>
             <field name="res_id" ref="mail.group_all_employees"/>
             <field name="type">notification</field>
+            <field name="subtype_id" ref="mail.mt_comment"/>
             <field name="subject">Issue Tracker application installed!</field>
-            <field name="body">Manage the issues you might face in a project, such as bugs in a system, client complaints or material breakdowns.
+            <field name="body"><![CDATA[<p>Manage the issues you might face in a project, such as bugs in a system, client complaints or material breakdowns.
 You can record issues, assign them to a responsible person, and keep track of their status as they evolve over time.
-Access all issues from the top Project menu, and access the issues of a specific project via the projects gallery view.</field>
+Access all issues from the top Project menu, and access the issues of a specific project via the projects gallery view.</p>]]></field>
         </record>
 
         <!-- Mail subtypes -->
diff --git a/addons/purchase/purchase_data.xml b/addons/purchase/purchase_data.xml
index 693d18eb1ba..fa701c1f179 100644
--- a/addons/purchase/purchase_data.xml
+++ b/addons/purchase/purchase_data.xml
@@ -7,10 +7,10 @@
             <field name="model">mail.group</field>
             <field name="res_id" ref="mail.group_all_employees"/>
             <field name="type">notification</field>
+            <field name="subtype_id" ref="mail.mt_comment"/>
             <field name="subject">Purchase Management application installed!</field>
-            <field name="body">From the top menu Purchases, create purchase orders to buy products from your suppliers, enter supplier invoices and manage payments.
-
-You can also manage purchase requisitions, see also the Purchase Settings.</field>
+            <field name="body"><![CDATA[<p>From the top menu Purchases, create purchase orders to buy products from your suppliers, enter supplier invoices and manage payments.</p>
+<p>You can also manage purchase requisitions, see also the Purchase Settings.</p>]]></field>
         </record>
 
         <record id="req_link_purchase_order" model="res.request.link">
diff --git a/addons/sale/sale_data.xml b/addons/sale/sale_data.xml
index 6f4ed76614e..d5ed8e810d6 100644
--- a/addons/sale/sale_data.xml
+++ b/addons/sale/sale_data.xml
@@ -38,10 +38,10 @@
             <field name="model">mail.group</field>
             <field name="res_id" ref="mail.group_all_employees"/>
             <field name="type">notification</field>
+            <field name="subtype_id" ref="mail.mt_comment"/>
             <field name="subject">Sales Management application installed!</field>
-            <field name="body">This application lets you create and send quotations and process your sales orders; from delivery to invoicing.
-
-If you need to manage your sales pipeline (leads, opportunities, phonecalls), the &lt;i&gt;CRM&lt;/i&gt; application may be useful. Use the Settings menu to install it.</field>
+            <field name="body"><![CDATA[<p>This application lets you create and send quotations and process your sales orders; from delivery to invoicing.</p>
+<p>If you need to manage your sales pipeline (leads, opportunities, phonecalls), the &lt;i&gt;CRM&lt;/i&gt; application may be useful. Use the Settings menu to install it.</p>]]></field>
         </record>
     </data>
 </openerp>
diff --git a/addons/stock/stock_data.xml b/addons/stock/stock_data.xml
index 77c82989a21..a1ce136e304 100644
--- a/addons/stock/stock_data.xml
+++ b/addons/stock/stock_data.xml
@@ -6,9 +6,10 @@
             <field name="model">mail.group</field>
             <field name="res_id" ref="mail.group_all_employees"/>
             <field name="type">notification</field>
+            <field name="subtype_id" ref="mail.mt_comment"/>
             <field name="subject">Warehouse Management application installed!</field>
-            <field name="body">Manage your product inventoy and stock locations: you can control stock moves history and planning,
-watch your stock valuation, and track production lots upstream and downstream (based on serial numbers).</field>
+            <field name="body"><![CDATA[<p>Manage your product inventoy and stock locations: you can control stock moves history and planning,
+watch your stock valuation, and track production lots upstream and downstream (based on serial numbers).</p>]]></field>
         </record>
 
         <record id="stock_journal_sequence" model="ir.sequence">

From a8a3b92c554bbe87ee6837151e4bf54c510f1263 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Wed, 14 Nov 2012 13:09:45 +0100
Subject: [PATCH 094/143] [IMP] rules

bzr revid: fp@tinyerp.com-20121114120945-in2c3eix7lqoxr2u
---
 addons/portal_claim/security/portal_security.xml         | 4 ++++
 addons/portal_project/security/portal_security.xml       | 4 ++++
 addons/portal_project_issue/security/portal_security.xml | 4 ++++
 addons/portal_sale/security/portal_security.xml          | 4 ++++
 4 files changed, 16 insertions(+)

diff --git a/addons/portal_claim/security/portal_security.xml b/addons/portal_claim/security/portal_security.xml
index e177b07eab9..3742765f795 100644
--- a/addons/portal_claim/security/portal_security.xml
+++ b/addons/portal_claim/security/portal_security.xml
@@ -7,6 +7,10 @@
             <field ref="crm_claim.model_crm_claim" name="model_id"/>
             <field name="domain_force">[('message_follower_ids','in', [user.partner_id.id])]</field>
             <field name="groups" eval="[(4, ref('portal.group_portal'))]"/>
+            <field eval="1" name="perm_unlink"/>
+            <field eval="1" name="perm_write"/>
+            <field eval="1" name="perm_read"/>
+            <field eval="0" name="perm_create"/>
         </record>
 
     </data>
diff --git a/addons/portal_project/security/portal_security.xml b/addons/portal_project/security/portal_security.xml
index 1247d25365a..ba686f72db4 100644
--- a/addons/portal_project/security/portal_security.xml
+++ b/addons/portal_project/security/portal_security.xml
@@ -7,6 +7,10 @@
             <field ref="project.model_project_task" name="model_id"/>
             <field name="domain_force">[('message_follower_ids','in', [user.partner_id.id])]</field>
             <field name="groups" eval="[(4, ref('portal.group_portal'))]"/>
+            <field eval="1" name="perm_unlink"/>
+            <field eval="1" name="perm_write"/>
+            <field eval="1" name="perm_read"/>
+            <field eval="0" name="perm_create"/>
         </record>
 
     </data>
diff --git a/addons/portal_project_issue/security/portal_security.xml b/addons/portal_project_issue/security/portal_security.xml
index 9527f1f9628..a121eeb593e 100644
--- a/addons/portal_project_issue/security/portal_security.xml
+++ b/addons/portal_project_issue/security/portal_security.xml
@@ -7,6 +7,10 @@
             <field ref="project_issue.model_project_issue" name="model_id"/>
             <field name="domain_force">[('message_follower_ids','in', [user.partner_id.id])]</field>
             <field name="groups" eval="[(4, ref('portal.group_portal'))]"/>
+            <field eval="1" name="perm_unlink"/>
+            <field eval="1" name="perm_write"/>
+            <field eval="1" name="perm_read"/>
+            <field eval="0" name="perm_create"/>
         </record>
 
     </data>
diff --git a/addons/portal_sale/security/portal_security.xml b/addons/portal_sale/security/portal_security.xml
index 39dabf754fe..19d44947f03 100644
--- a/addons/portal_sale/security/portal_security.xml
+++ b/addons/portal_sale/security/portal_security.xml
@@ -8,6 +8,10 @@
             <field name="model_id" ref="sale.model_sale_order"/>
             <field name="domain_force">[('message_follower_ids','in',[user.partner_id.id])]</field>
             <field name="groups" eval="[(4, ref('portal.group_portal'))]"/>
+            <field eval="1" name="perm_unlink"/>
+            <field eval="1" name="perm_write"/>
+            <field eval="1" name="perm_read"/>
+            <field eval="0" name="perm_create"/>
         </record>
 
         <record id="portal_stock_picking_user_rule" model="ir.rule">

From de39dccefb1bb8362204d84ccfaa44aac480a4bb Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Wed, 14 Nov 2012 13:59:22 +0100
Subject: [PATCH 095/143] [FIX] problem with invalid on*|do* refactoring

bzr revid: nicolas.vanhoren@openerp.com-20121114125922-cirvs06k133dwako
---
 addons/web/static/src/js/data.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/web/static/src/js/data.js b/addons/web/static/src/js/data.js
index dcdeb749672..9162d0066c2 100644
--- a/addons/web/static/src/js/data.js
+++ b/addons/web/static/src/js/data.js
@@ -721,10 +721,10 @@ instance.web.BufferedDataSet = instance.web.DataSetStatic.extend({
         this.last_default_get = {};
     },
     default_get: function(fields, options) {
-        return this._super(fields, options).done(this.on_default_get);
-    },
-    on_default_get: function(res) {
-        this.last_default_get = res;
+        var self = this;
+        return this._super(fields, options).done(function(res) {
+            self.last_default_get = res;
+        });
     },
     create: function(data) {
         var cached = {id:_.uniqueId(this.virtual_id_prefix), values: data,

From 67115184f8cadd7d1185c1aaa4c8f654909d058c Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 14 Nov 2012 14:06:00 +0100
Subject: [PATCH 096/143] [FIX] references to renamed/removed methods in event
 handler bindings

bzr revid: xmo@openerp.com-20121114130600-2qf8egm0r9bwno1n
---
 addons/web/static/src/js/corelib.js   | 2 +-
 addons/web/static/src/js/view_form.js | 3 ++-
 addons/web/static/src/js/views.js     | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/addons/web/static/src/js/corelib.js b/addons/web/static/src/js/corelib.js
index 5c4ef8b5cbb..879cf94dcdd 100644
--- a/addons/web/static/src/js/corelib.js
+++ b/addons/web/static/src/js/corelib.js
@@ -1276,7 +1276,7 @@ instance.web.JsonRPC = instance.web.Class.extend(instance.web.PropertiesMixin, {
                 };
                 deferred.reject(error, $.Event());
             });
-        // Allow deferred user to disable on_rpc_error in fail
+        // Allow deferred user to disable rpc_error call in fail
         deferred.fail(function() {
             deferred.fail(function(error, event) {
                 if (!event.isDefaultPrevented()) {
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 6527964da9d..3b95a619959 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -4839,6 +4839,7 @@ instance.web.form.FieldBinary = instance.web.form.AbstractField.extend(instance.
             link.href = "data:application/octet-stream;base64," + value;
         } else {
             instance.web.blockUI();
+            var c = instance.webclient.crashmanager;
             this.session.get_file({
                 url: '/web/binary/saveas_ajax',
                 data: {data: JSON.stringify({
@@ -4849,7 +4850,7 @@ instance.web.form.FieldBinary = instance.web.form.AbstractField.extend(instance.
                     context: this.view.dataset.get_context()
                 })},
                 complete: instance.web.unblockUI,
-                error: instance.webclient.crashmanager.on_rpc_error
+                error: c.rpc_error.bind(c)
             });
             ev.stopPropagation();
             return false;
diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 069707175b7..f39cb221a86 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -401,6 +401,7 @@ instance.web.ActionManager = instance.web.Widget.extend({
         }).done(function(res) {
             action = _.clone(action);
             action.context = res.context;
+            var c = instance.webclient.crashmanager;
             self.session.get_file({
                 url: '/web/report',
                 data: {action: JSON.stringify(action)},
@@ -411,7 +412,7 @@ instance.web.ActionManager = instance.web.Widget.extend({
                     }
                     self.dialog_stop();
                 },
-                error: instance.webclient.crashmanager.on_rpc_error
+                error: c.rpc_error.bind(c)
             })
         });
     },

From 8dce388719051edc69646212e19ebb4c139192e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 14 Nov 2012 14:34:22 +0100
Subject: [PATCH 097/143] [REV] portal demo data: demo portal user xml_id back
 to its former value.

bzr revid: tde@openerp.com-20121114133422-3tb28n9rfdyh80d0
---
 addons/portal/portal_demo.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/portal/portal_demo.xml b/addons/portal/portal_demo.xml
index 5ab4bdd7365..2a641867d83 100644
--- a/addons/portal/portal_demo.xml
+++ b/addons/portal/portal_demo.xml
@@ -3,14 +3,14 @@
     <data noupdate="1">
 
         <!-- Create a partner, that is also a portal user -->
-        <record id="partner_demo_portal" model="res.partner">
+        <record id="demo_user0" model="res.partner">
             <field name="name">Demo Portal User</field>
             <field name="email">demo@portal.example.com</field>
             <field name="supplier" eval="False"/>
             <field name="customer" eval="True"/>
         </record>
         <record id="user_demo_portal" model="res.users">
-            <field name="partner_id" ref="partner_demo_portal"/>
+            <field name="partner_id" ref="demo_user0"/>
             <field name="login">portal</field>
             <field name="password">portal</field>
             <field name="signature">--
@@ -44,7 +44,7 @@ Mr Demo Portal</field>
             <field name="parent_id" ref="message_company_news0"/>
             <field name="type">comment</field>
             <field name="subtype_id" ref="mail.mt_comment"/>
-            <field name="author_id" ref="partner_demo_portal"/>
+            <field name="author_id" ref="demo_user0"/>
         </record>
 
         <record id="message_company_news0_comment1" model="mail.message">

From 45eadceea6baa199a0ae0c1d975479f4c48526c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 14 Nov 2012 14:34:38 +0100
Subject: [PATCH 098/143] [FIX] email_template: udpated test according to new
 specs of append_content_to_html.

bzr revid: tde@openerp.com-20121114133438-8m1q0r02i4xory0e
---
 addons/email_template/tests/test_mail.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/email_template/tests/test_mail.py b/addons/email_template/tests/test_mail.py
index 00dd6dc8727..7c69295ce9f 100644
--- a/addons/email_template/tests/test_mail.py
+++ b/addons/email_template/tests/test_mail.py
@@ -52,8 +52,8 @@ class test_message_compose(test_mail_mockup.TestMailMockups):
         # Mail data
         _subject1 = 'Pigs'
         _subject2 = 'Bird'
-        _body_html1 = 'Fans of Pigs, unite !\n<pre>Admin</pre>\n'
-        _body_html2 = 'I am angry !\n<pre>Admin</pre>\n'
+        _body_html1 = 'Fans of Pigs, unite !\n<p>Admin</p>\n'
+        _body_html2 = 'I am angry !\n<p>Admin</p>\n'
         _attachments = [
             {'name': 'First', 'datas_fname': 'first.txt', 'datas': base64.b64encode('My first attachment')},
             {'name': 'Second', 'datas_fname': 'second.txt', 'datas': base64.b64encode('My second attachment')}

From c6bd2c0ee096b8f34e4a47c120c66ae78e02becb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 14 Nov 2012 14:48:03 +0100
Subject: [PATCH 099/143] [REV] mail.compose.message: some of the wizard fields
 back to invisible mode.

bzr revid: tde@openerp.com-20121114134803-hlbmmd14psdc2sk7
---
 addons/mail/wizard/mail_compose_message_view.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/mail/wizard/mail_compose_message_view.xml b/addons/mail/wizard/mail_compose_message_view.xml
index f9b79b7b282..86b1be6562f 100644
--- a/addons/mail/wizard/mail_compose_message_view.xml
+++ b/addons/mail/wizard/mail_compose_message_view.xml
@@ -8,11 +8,11 @@
                 <form string="Compose Email" version="7.0">
                     <group>
                         <!-- truly invisible fields for control and options -->
-                        <field name="composition_mode" invisible="0"/>
-                        <field name="model" invisible="0"/>
-                        <field name="res_id" invisible="0"/>
-                        <field name="parent_id" invisible="0"/>
-                        <field name="content_subtype" invisible="0"/>
+                        <field name="composition_mode" invisible="1"/>
+                        <field name="model" invisible="1"/>
+                        <field name="res_id" invisible="1"/>
+                        <field name="parent_id" invisible="1"/>
+                        <field name="content_subtype" invisible="1"/>
                         <!-- visible wizard -->
                         <label for="partner_ids" string="Recipients"/>
                         <div>

From 8e15ab0dff77edbb754732385872f8d30cad520e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 14 Nov 2012 14:51:59 +0100
Subject: [PATCH 100/143] [FIX] Typo in tests.

bzr revid: tde@openerp.com-20121114135159-nouaj72drtot5hiv
---
 openerp/tests/test_mail.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/tests/test_mail.py b/openerp/tests/test_mail.py
index 975a8b846ee..0ad6504a7ae 100755
--- a/openerp/tests/test_mail.py
+++ b/openerp/tests/test_mail.py
@@ -186,7 +186,7 @@ class TestHtmlTools(unittest2.TestCase):
         ]
         for content, container_tag, expected in cases:
             html = plaintext2html(content, container_tag)
-            self.assertEqual(html, expected, 'text2html is broken')
+            self.assertEqual(html, expected, 'plaintext2html is broken')
 
     def test_append_to_html(self):
         test_samples = [

From f7cb95db004c8d8a9da8c9e24e9a664f715534e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 14 Nov 2012 14:55:15 +0100
Subject: [PATCH 101/143] [FIX] email_template: fixed last revert. xml_id of
 user is now correct.

bzr revid: tde@openerp.com-20121114135515-y28jhsbmjcmln9gr
---
 addons/portal/portal_demo.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/portal/portal_demo.xml b/addons/portal/portal_demo.xml
index 2a641867d83..effbcd04fa6 100644
--- a/addons/portal/portal_demo.xml
+++ b/addons/portal/portal_demo.xml
@@ -3,14 +3,14 @@
     <data noupdate="1">
 
         <!-- Create a partner, that is also a portal user -->
-        <record id="demo_user0" model="res.partner">
+        <record id="partner_demo_portal" model="res.partner">
             <field name="name">Demo Portal User</field>
             <field name="email">demo@portal.example.com</field>
             <field name="supplier" eval="False"/>
             <field name="customer" eval="True"/>
         </record>
-        <record id="user_demo_portal" model="res.users">
-            <field name="partner_id" ref="demo_user0"/>
+        <record id="demo_user0" model="res.users">
+            <field name="partner_id" ref="partner_demo_portal"/>
             <field name="login">portal</field>
             <field name="password">portal</field>
             <field name="signature">--
@@ -44,7 +44,7 @@ Mr Demo Portal</field>
             <field name="parent_id" ref="message_company_news0"/>
             <field name="type">comment</field>
             <field name="subtype_id" ref="mail.mt_comment"/>
-            <field name="author_id" ref="demo_user0"/>
+            <field name="author_id" ref="partner_demo_portal"/>
         </record>
 
         <record id="message_company_news0_comment1" model="mail.message">

From 23743683ea0e0e0be74007f3e411b7847bcec179 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 14 Nov 2012 15:14:52 +0100
Subject: [PATCH 102/143] [IMP] tools: html_email_clean: a bit more robust.

bzr revid: tde@openerp.com-20121114141452-n5jy3yzbmlbd3811
---
 openerp/tools/mail.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/openerp/tools/mail.py b/openerp/tools/mail.py
index 5f8c65c1d9b..39d918da97b 100644
--- a/openerp/tools/mail.py
+++ b/openerp/tools/mail.py
@@ -133,9 +133,8 @@ def html_email_clean(html):
     html = ustr(html)
 
     # 1. <br[ /]> -> \n, because otherwise the tree is obfuscated
-    br_tags = re.compile(r'([<]\s*br\s*\/?[>])')
+    br_tags = re.compile(r'([<]\s*[bB][rR]\s*\/?[>])')
     html = _replace_matching_regex(br_tags, html, '__BR_TAG__')
-    # TDE note: seems to have lots of <div><br></div> in emails... needs to be checks, could be cleaned
 
     # 2. form a tree, handle (currently ?) pure-text by enclosing them in a pre
     root = lxml.html.fromstring(html)

From eb04795e28c33650160343e869cc83febd05e729 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 14 Nov 2012 15:15:59 +0100
Subject: [PATCH 103/143] [FIX] Fixed last fix...

bzr revid: tde@openerp.com-20121114141559-31w4389i22x7l7cd
---
 addons/portal/portal_demo.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/portal/portal_demo.xml b/addons/portal/portal_demo.xml
index effbcd04fa6..fc20bbccae7 100644
--- a/addons/portal/portal_demo.xml
+++ b/addons/portal/portal_demo.xml
@@ -21,7 +21,7 @@ Mr Demo Portal</field>
 
         <!-- Add the demo user to the portal (and therefore to the portal member group) -->
         <record id="group_portal" model="res.groups">
-            <field name="users" eval="[(4,ref('user_demo_portal'))]"/>
+            <field name="users" eval="[(4,ref('demo_user0'))]"/>
         </record>
 
         <!-- Company news and comments -->

From 13f9de3d7c660e041e3d876d7f8939e220ccbdd6 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Wed, 14 Nov 2012 15:34:54 +0100
Subject: [PATCH 104/143] [FIX] can not delete an analytic account having lines

bzr revid: fp@tinyerp.com-20121114143454-6bkldl0yk6ob8qmp
---
 addons/analytic/analytic.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py
index 1c9a095d6ed..4c883dc4f8a 100644
--- a/addons/analytic/analytic.py
+++ b/addons/analytic/analytic.py
@@ -327,7 +327,7 @@ class account_analytic_line(osv.osv):
         'date': fields.date('Date', required=True, select=True),
         'amount': fields.float('Amount', required=True, help='Calculated by multiplying the quantity and the price given in the Product\'s cost price. Always expressed in the company main currency.', digits_compute=dp.get_precision('Account')),
         'unit_amount': fields.float('Quantity', help='Specifies the amount of quantity to count.'),
-        'account_id': fields.many2one('account.analytic.account', 'Analytic Account', required=True, ondelete='cascade', select=True, domain=[('type','<>','view')]),
+        'account_id': fields.many2one('account.analytic.account', 'Analytic Account', required=True, ondelete='set null', select=True, domain=[('type','<>','view')]),
         'user_id': fields.many2one('res.users', 'User'),
         'company_id': fields.related('account_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True),
 

From 026a042e7b3b3470315b6e3f426db2ecd22ee47d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 14 Nov 2012 15:35:06 +0100
Subject: [PATCH 105/143] [FIX] mail_thread: fixed message_subtype wrongly
 taken into account when posting through Chatter or fetchmail.

bzr revid: tde@openerp.com-20121114143506-qcmhrcngfxm4tbvu
---
 addons/mail/mail_thread.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 81120151de1..99ce2bd595e 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -758,7 +758,7 @@ class mail_thread(osv.AbstractModel):
                 partner_ids.append((4, parent_message.author_id.id))
 
         message_type = kwargs.pop('type', 'comment')
-        message_subtype = kwargs.pop('type', 'mail.mt_comment')
+        message_subtype = kwargs.pop('subtype', 'mail.mt_comment')
 
         # 2. Post message
         new_message_id = self.message_post(cr, uid, thread_id=thread_id, body=body, subject=subject, type=message_type,

From 3b31bdd2951c9a43efd8e320de5bee5f3563af82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 14 Nov 2012 15:35:16 +0100
Subject: [PATCH 106/143] [IMP] mail: small css tweak.

bzr revid: tde@openerp.com-20121114143516-zs3k4s5tzvbftbzb
---
 addons/mail/static/src/css/mail.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index 4b19ab5e234..8f753ca76e9 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -88,8 +88,8 @@
     margin-top: 2px;
 }
 .openerp .oe_mail .oe_msg .oe_msg_content .oe_msg_body p{
-    margin-top: 2px;
-    margin-bottom: 2px;
+    margin-top: 0px;
+    margin-bottom: 0px;
 }
 
 /* a) Indented Messages */

From 8dcaac7f54c19d8be7b568e2318a5084169c5894 Mon Sep 17 00:00:00 2001
From: "Denis Ledoux dle@openerp.com" <>
Date: Wed, 14 Nov 2012 15:43:45 +0100
Subject: [PATCH 107/143] [FIX]Wrong date for datepicker, due to using
 self.value instead of self.get('value')

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

bzr revid: dle@openerp.com-20121114144345-boqe04siijwsuqor
---
 addons/web/static/src/js/view_form.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 3b95a619959..014a67157bb 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -2383,7 +2383,7 @@ instance.web.DateTimeWidget = instance.web.Widget.extend({
                 self.$input.focus();
                 return;
             }
-            self.picker('setDate', self.value ? instance.web.auto_str_to_date(self.value) : new Date());
+            self.picker('setDate', self.get('value') ? instance.web.auto_str_to_date(self.get('value')) : new Date());
             self.$input_picker.show();
             self.picker('show');
             self.$input_picker.hide();

From f76ac922421727ca67ed7ade636bb36fda081228 Mon Sep 17 00:00:00 2001
From: Cedric Snauwaert <csn@openerp.com>
Date: Wed, 14 Nov 2012 16:01:33 +0100
Subject: [PATCH 108/143] [FIX]fix problem when iterating on several ids in
 create_move (value_residual was not recomputed)

bzr revid: csn@openerp.com-20121114150133-8hvrdkrwor7v9i2m
---
 addons/account_asset/account_asset.py | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/addons/account_asset/account_asset.py b/addons/account_asset/account_asset.py
index 80be8f3ce91..a44226e76c8 100644
--- a/addons/account_asset/account_asset.py
+++ b/addons/account_asset/account_asset.py
@@ -377,6 +377,7 @@ class account_asset_depreciation_line(osv.osv):
         move_line_obj = self.pool.get('account.move.line')
         currency_obj = self.pool.get('res.currency')
         created_move_ids = []
+        asset_ids = []
         for line in self.browse(cr, uid, ids, context=context):
             depreciation_date = time.strftime('%Y-%m-%d')
             period_ids = period_obj.find(cr, uid, depreciation_date, context=context)
@@ -407,8 +408,8 @@ class account_asset_depreciation_line(osv.osv):
                 'period_id': period_ids and period_ids[0] or False,
                 'journal_id': journal_id,
                 'partner_id': partner_id,
-                'currency_id': company_currency <> current_currency and  current_currency or False,
-                'amount_currency': company_currency <> current_currency and - sign * line.amount or 0.0,
+                'currency_id': company_currency != current_currency and  current_currency or False,
+                'amount_currency': company_currency != current_currency and - sign * line.amount or 0.0,
                 'date': depreciation_date,
             })
             move_line_obj.create(cr, uid, {
@@ -421,18 +422,19 @@ class account_asset_depreciation_line(osv.osv):
                 'period_id': period_ids and period_ids[0] or False,
                 'journal_id': journal_id,
                 'partner_id': partner_id,
-                'currency_id': company_currency <> current_currency and  current_currency or False,
-                'amount_currency': company_currency <> current_currency and sign * line.amount or 0.0,
+                'currency_id': company_currency != current_currency and  current_currency or False,
+                'amount_currency': company_currency != current_currency and sign * line.amount or 0.0,
                 'analytic_account_id': line.asset_id.category_id.account_analytic_id.id,
                 'date': depreciation_date,
                 'asset_id': line.asset_id.id
             })
             self.write(cr, uid, line.id, {'move_id': move_id}, context=context)
             created_move_ids.append(move_id)
-            if currency_obj.is_zero(cr, uid, line.asset_id.currency_id, line.asset_id.value_residual):
-               can_close = True
-            if can_close:
-                asset_obj.write(cr, uid, [line.asset_id.id], {'state': 'close'}, context=context)
+            asset_ids.append(line.asset_id.id)
+        # we re-evaluate the assets to determine whether we can close them
+        for asset in asset_obj.browse(cr, uid, list(set(asset_ids)), context=context):
+            if currency_obj.is_zero(cr, uid, asset.currency_id, asset.value_residual):
+                asset.write({'state': 'close'})
         return created_move_ids
 
 account_asset_depreciation_line()

From 923f75eeef2e3b40b0697eaa8d95004b30fb3310 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 14 Nov 2012 16:07:17 +0100
Subject: [PATCH 109/143] [MEH] hardcode min-width for date fields in list view

bzr revid: xmo@openerp.com-20121114150717-sdf6ut4hbappaf8x
---
 addons/web/static/src/css/base.css  | 3 +++
 addons/web/static/src/css/base.sass | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 7d40bbb6aeb..85e0a7db719 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -2672,6 +2672,9 @@
   text-align: right !important;
   max-width: 100px;
 }
+.openerp .oe_list_content td.oe_list_field_date, .openerp .oe_list_content th.oe_list_header_date {
+  min-width: 6em;
+}
 .openerp .oe_list_content > thead {
   border-bottom: 2px solid #cacaca;
   background: #eeeeee;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 26abdb8a4f1..586bca407d0 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -2121,6 +2121,8 @@ $sheet-padding: 16px
         td.oe_number
             text-align: right !important
             max-width: 100px
+        td.oe_list_field_date, th.oe_list_header_date
+            min-width: 6em
         > thead
             border-bottom: 2px solid #cacaca
             background: #eee

From 36e4ed47b7b48ce619221f214340847ebd7be4cf Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Wed, 14 Nov 2012 16:17:14 +0100
Subject: [PATCH 110/143] [FIX] login params

bzr revid: al@openerp.com-20121114151714-i0hsz4lyfmps307x
---
 addons/web/static/src/js/chrome.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index e0bd18ad05f..7e4b9a46fe8 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -531,6 +531,9 @@ instance.web.Login =  instance.web.Widget.extend({
         this.selected_db = null;
         this.selected_login = null;
         this.params = action.params || {};
+        if (_.isEmpty(this.params)) {
+            this.params = $.bbq.getState(true);
+        }
 
         if (this.params.login_successful) {
             this.on('login_successful', this, this.params.login_successful);

From 9f0f87f82b604df59fc5fd39de94750cbc48bd1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 14 Nov 2012 17:16:07 +0100
Subject: [PATCH 111/143] [FIX] mail: removed demo data that should not have
 been merged at rev 8004.

bzr revid: tde@openerp.com-20121114161607-n14fzx8jxygyfy8g
---
 addons/mail/data/mail_demo.xml | 158 ---------------------------------
 1 file changed, 158 deletions(-)

diff --git a/addons/mail/data/mail_demo.xml b/addons/mail/data/mail_demo.xml
index 66dc47ad5b3..a5eaa63956a 100644
--- a/addons/mail/data/mail_demo.xml
+++ b/addons/mail/data/mail_demo.xml
@@ -88,163 +88,5 @@
             <field name="partner_ids" eval="[(6, 0, [ref('base.partner_demo')])]"/>
         </record>
 
-        <!-- External mail + reply with attachment conversation -->
-        <record id="message_video2" model="mail.message">
-            <field name="subject">Plan to install OpenERP</field>
-            <field name="model">mail.message</field>
-            <field name="body">
-                &lt;![CDATA[Email0 inquiry]]&gt;
-                &lt;div&gt;&lt;font size="2"&gt;Hello,&lt;/font&gt;&lt;/div&gt;&lt;div&gt;&lt;font size="2"&gt;&lt;br&gt;&lt;/font&gt;&lt;/div&gt;
-                &lt;div&gt;&lt;font size="2"&gt;I am interested in your company's product and I plan to install OpenERP for my company and affordable price.&lt;/font&gt;&lt;/div&gt;&lt;br/&gt;
-                &lt;div&gt;&lt;font size="2"&gt;Can you please send me services catalogue?&lt;/font&gt;&lt;/div&gt;&lt;br/&gt;
-                Sophie
-            </field>
-            <field name="type">email</field>
-            <field name="author_id" ref="base.res_partner_2"/>
-            <field name="partner_ids" eval="[(6, 0, [ref('base.partner_demo'), ref('base.partner_root')])]"/>
-        </record>
-        <record id="message_video2_attachment1" model="ir.attachment">
-            <field name="model">ir.attachment</field>
-            <field name="datas">bWlncmF0aW9uIHRlc3Q=</field>
-            <field name="datas_fname">catalogue 2012.pdf</field>
-            <field name="name">catalogue 2012.pdf</field>
-        </record>
-        <record id="message_video2_message1" model="mail.message">
-            <field name="subject">Re: Plan to install OpenERP</field>
-            <field name="body">
-                Dear Customer,&lt;br/&gt;
-                Thanks for showing interest in our products.&lt;br/&gt;
-                We have attached the catalogue,&lt;br/&gt;
-                We would like to know your interests, so let us know when we can call you for more details.&lt;br/&gt;
-                Regards
-            </field>
-            <field name="type">comment</field>
-            <field name="subtype_id" ref="mt_comment"/>
-            <field name="parent_id" ref="message_video2"/>
-            <field name="author_id" ref="base.partner_demo"/>
-            <field name="attachment_ids" eval="[(6, 0, [ref('message_video2_attachment1')])]"/>
-            <field name="partner_ids" eval="[(6, 0, [ref('base.partner_demo'),ref('base.partner_root'),ref('base.res_partner_2')])]"/>
-        </record>
-
-        <!-- Employee & other + attachments conversation -->
-        <record id="message_video1_attachment1" model="ir.attachment">
-            <field name="model">ir.attachment</field>
-            <field name="datas">bWlncmF0aW9uIHRlc3Q=</field>
-            <field name="datas_fname">migration.doc</field>
-            <field name="name">migration.doc</field>
-        </record>
-        <record id="message_video1_attachment2" model="ir.attachment">
-            <field name="model">ir.attachment</field>
-            <field name="datas">
-                /9j/4AAQSkZJRgABAQEASABIAAD/2wBDABALDA4MChAODQ4SERATGCgaGBYWGDEjJR0oOjM9PDkz
-                ODdASFxOQERXRTc4UG1RV19iZ2hnPk1xeXBkeFxlZ2P/2wBDARESEhgVGC8aGi9jQjhCY2NjY2Nj
-                Y2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2P/wAARCABkAGQDAREA
-                AhEBAxEB/8QAGgAAAwEBAQEAAAAAAAAAAAAAAAQFAwIBBv/EAD0QAAEDAgMDCAcHAwUAAAAAAAEA
-                AgMEEQUSsiExchMzNDVBUXFzIjJhkbGzwRQVJGKBwtElg6FCUlPh8P/EABoBAQADAQEBAAAAAAAA
-                AAAAAAADBAUBAgb/xAAwEQACAQIDBgYBBAMBAAAAAAAAAQIDBBEyMwUSMUFx8BMhNFGx0cEUgZGh
-                I0LhNf/aAAwDAQACEQMRAD8A+55QFzgA4lpsbDttf6qqoN8D0e5z/sf7l3w5HMQz/kd7k8OQxOJX
-                SOheIgWyFpDXFtwDbYV1U5DETLcVFwySnDQLNuHOO/Zc227LBevDGJ1kxE2DpYiA6+xrgSMzT3dw
-                d7wm4xiZtZiwLS+andZrb+g4XdcZuzdbNb22TcGINbi4YbzU7nZTuY7a6+zs3Af5HtTwxidPbihe
-                MksDWAvuCxxJF/R7O7f4puDE8DcVLiXSwZc7TZrHXDRa43du33puDEoZ/wAjvcvHhyGIZ/yO9yeH
-                IYgx4e27d1yP1BsvLWDwZ0Uyh9VVB2W4y5Mx2XLf+h7lIm1FYHBSsldTcoMkBIaXNsHG/d2+Kb7X
-                mzkvJNoq0ji6khcd5YCfcplwBtddAXQBdAF0AXQBdAF0AXQCWI17qIR5YhIX3vd+WwFvYe9V69wq
-                LimscSalR8TF48DWm5t3mP1FcnmIkZfZYqmSflWkjlG7jbc0W+JUkEnHzB6cMpizKWOItl9Y7QvW
-                5FjFoajYIo2xsFmtAA8F7OHSANqANqAEBnJPFE9jJJGtc82aCdpXUmzjkk8GabVw6Iy4i3NPFGwi
-                WJjnAuHom2z4leazdKm5ik41Km4FNVzS4Uahwj5UZ9wOW4cQNl/YvNtN1YRk+Z6uEqTaXIm108lR
-                SU8kuXOTKDlFhscB9FS2kt2pBL3+ixYycqcm++JYpubd5j9RVipmKyPafnKjzBpapafAM3Uhwxkq
-                oo6hkD3ESP8AVGU2O/t/Qrqi2sTy5pPd5my4eidh1RPNV1LJZM7WhrmjKBluXbPbuClqRUUsCClN
-                ybxGMQLhRvLXFpuNrTY7wvNNYy8z3VbUHgGHlzqGEucXEt2lxuSuTzM7T84oUxLpsHFF8wKSGRkN
-                TUR1RVM8mKVEMkmaNoJa3KBb0rb1mW9adSrOL4I0qtOMacWuLFH9Nq/Kk1BXLz0z6FK19QM0PUTv
-                GTW5Q2GlAsXuaXfInz9X0/FNrVfaerDr9Emz9KXfuXKbm3eY/UVNUzECFKwuEU+V7mEzja02PqBW
-                bdJ8SGu2o+Q5RFz6Gnc5xLnRNJPebLsuLPccqEq3rel4h8HKWOmyGWqipb2lQlgk4SL11XwR/F6n
-                q8EVqHGXfuOYgPwb9p3t1BR08xJWyMlGWRn2BrJHtb6FwDsN32P+FnXVWcbqME/Jl22hF27bXeA3
-                iXTYOKP5gWpDIzOqaiOMP65quF2pY1prVOr+TVr6Ue+Ri/p1X5MmoLSvfTPoZ9r6jv3GaLqJ3jJr
-                cobDSgWL3NLvkT5+r6fim1qvtPVh1+iTZ+lLv3LlNzbvMfqKmqZiBClZzU3njQFatiC4yjdAB930
-                1/8Aib8AkuLJIZUJ1vW9LxD4OUsdNkMtVFOwUJYJWF2FbVlxsAyPb+r1NV4IrUMz79xyvymieQbg
-                lu2/5gvFLMiStkZIf61B/a+Ysq89bDv3L9r6Z98h3Eh+Ng4o/mBbEMjMypqI4w/rmq4XaljWmtU6
-                v5NWvpR75GL+m1fkyagtK99M+hn2vqO/cYoR/QneMmtyhsNKBYvc0u+QhP1fT8U2tV9p6sOv0SbP
-                0pd+5cpubd5j9RU1TMQIUrebm88aArVsQXGU8wOpfPA6ORrAIWta0gb9ltvuVW3ruvjJor2VxKvF
-                4rgc4g9kWJ0z3uDWBzSSdw2OV1zjCk3J4ElWUYVE5PBFCCop6jNyMjH5bXt2KCFSM8rxLji0k2uJ
-                EADm14IBBbFsPG5c2l5W779iPZ+s+/cdYAMBi2D1W6gu2eSPQ9XnGXUSf61B/a+YqF562HfuWrX0
-                z75DmJW+2wW3Zo/mBbEMjMypqI5w+33zU7rZTqWNaa1Tq/k1a+lHvkYv6bV93IyagtK99M+hn2vq
-                Biit9xO3XvJrKhsNKBYvc0u+QhP1fT8U2tV9p6sOv0SbP0pd+5cpubd5j9RU1TMQIUrObm88aArV
-                sQXGUTwGojhkkjeSHSloZs37CsmwqRWMHxZT2VSm6Mp4eWJ1j22UeDfqrd/6b9/wyLaeX+Pya4Hz
-                1Tws/cqmzOEv2PpLz/UnzSvZUPY02bKGhwtvsSR8VLtWtJYUuWGP9/8ADGs60o3saa4PH4ZVZ1DH
-                wt1BXrPJHoXLzjLqThKyR9GGkkxuja7Z28oFmXNSM7yO6+H/AEmsqkZ20t3liv6KGJdNg4o/mBbc
-                MjKFTURxh/XNTwnUsa01qnV/JrV9KPfIxf02r8mTUFpXvpn0M619QMUR/oTvGTWVDYaUCxe5pd8h
-                Cfq+n4ptar7T1Ydfok2fpS79y5T827zH6ipqmYgQpWc1N540BWrYguMpJw3ptN5v7Svn7TXQ2R6G
-                XV/gcx7nR4D6rVv/AE37/hmdtPL/AB+TXA+eqeFn7lU2Zll+x9Jef6k2p6W3/wB2lNraq6flmBa/
-                +jT6P4ZXZ1DHwt1Badllh0NK74y6/kkU/SGefHrCwo+qXUj2R6ap1fwijjZIeHNJa4NaQR2EOut2
-                vOVO3lKPH/qKd7Jwi5R4pfk4wRznVz3OJc4xXJPacyy9ntynJs2HJytqbfsvgyqZhDWz5gTyjXsF
-                u8uH8K/tCtGFHcfFozaFaNO6jF82O0PUTvGTW5LDSgXr3NLvkT5+r6fim1qvtPVh1+iTZ+lLv3Ll
-                PzbvMfqKmnmIBarhmeJGxxhwdIHg5gP9IH0U1GoocSOrBzWCEKTDquCoikdE0hj8xs8dxH1WZQtn
-                TqKbYsYO3t3Slxbx+DfEqWqrHgshDdg3vHt/lXbnCtS3F74lW8tpV1hF9+Zph0FTSPlc+EHOGgAP
-                HZf+VBaUvAT3nxNWvVVTDAUlw6sknDxE0AdheEvaX6ialF8sDNo0JU7qNdvyWPw/sdEdQMNZTch6
-                QAF847DdW7eapKKfItV/8jeHMRhw2sZK1xibYSNf647HA/RZytmqyqY+WOJ5sYu3ozhLi23/AChr
-                Eaeqqz6EAHogbXjvutCtJVKMqa4v7RXuqEqsWlz+znDqWqpJnSPhBuwNADx3qpa0fBbcnxL29/hh
-                T5pJfwjKqoKuecyNhaBmJ2vHaV7vYfqN3dfAofp5fqIVcfJPEbp4qmLDjTGAFxzbQ8drifqprZql
-                CMXyL1w/Fba5k/7srM7rxtyuJIHKbrlU61CdSrvuXljiQ2MZW7qObx3sMP7+y3A1zY/TFiXOda97
-                XcT9Vbk8XiSDKsnAQAgBACAEAIAQAgBACAEAIAQAgBACAEAIAQAgBACAEAIAQAgBACAEAIAQAgBA
-                CAEAIAQAgP/Z
-            </field>
-            <field name="datas_fname">activity graph 2012.jpg</field>
-            <field name="name">activity graph 2012</field>
-        </record>
-        <record id="message_video1" model="mail.message">
-            <field name="model">mail.group</field>
-            <field name="body">
-                Hi,&lt;br/&gt;
-                The beta OpenERP 7 is scheduled for November 12.&lt;br/&gt;
-                You will find attached the document for migration from version 6 to 7, and the activity graph for the current year. Good reading.&lt;br/&gt;
-                Sincerely
-            </field>
-            <field name="type">comment</field>
-            <field name="subtype_id" ref="mt_comment"/>
-            <field name="author_id" ref="base.partner_demo"/>
-            <field name="attachment_ids" eval="[(6, 0, [ref('message_video1_attachment1'), ref('message_video1_attachment2')])]"/>
-            <field name="notified_partner_ids" eval="[(6, 0, [ref('base.partner_demo'), ref('base.partner_root')])]"/>
-        </record>
-        <record id="message_video1_message1" model="mail.message">
-            <field name="model">mail.group</field>
-            <field name="body">
-                Thank you,&lt;br/&gt;
-                Could you prepare and send us also the document for version 7.1 which will come soon?&lt;br/&gt;
-                Sincerely
-            </field>
-            <field name="type">comment</field>
-            <field name="subtype_id" ref="mt_comment"/>
-            <field name="parent_id" ref="message_video1"/>
-            <field name="author_id" ref="base.partner_root"/>
-            <field name="notified_partner_ids" eval="[(6, 0, [ref('base.partner_demo'), ref('base.partner_root')])]"/>
-        </record>
-
-        <!-- Network admin & employee conversation -->
-        <record id="message_video0" model="mail.message">
-            <field name="model">mail.group</field>
-            <field name="body">I changed the infrastructure of networks, if there are still changes to be made please do not hesitate to contact me.</field>
-            <field name="type">comment</field>
-            <field name="subtype_id" ref="mt_comment"/>
-            <field name="author_id" ref="base.partner_root"/>
-            <field name="notified_partner_ids" eval="[(6, 0, [ref('base.partner_demo'), ref('base.partner_root')])]"/>
-        </record>
-        <record id="message_video0_message1" model="mail.message">
-            <field name="model">mail.group</field>
-            <field name="body">Thank you, the networks is perfect now ! Could you add a IP phone for Jhon ?</field>
-            <field name="parent_id" ref="message_video0"/>
-            <field name="type">comment</field>
-            <field name="subtype_id" ref="mt_comment"/>
-            <field name="author_id" ref="base.partner_demo"/>
-            <field name="notified_partner_ids" eval="[(6, 0, [ref('base.partner_demo'), ref('base.partner_root')])]"/>
-        </record>
-        <record id="message_video0_message2" model="mail.message">
-            <field name="model">mail.group</field>
-            <field name="body">It's right, his internal phone number is 0093</field>
-            <field name="parent_id" ref="message_video0"/>
-            <field name="type">comment</field>
-            <field name="subtype_id" ref="mt_comment"/>
-            <field name="author_id" ref="base.partner_root"/>
-            <field name="notified_partner_ids" eval="[(6, 0, [ref('base.partner_demo'), ref('base.partner_root')])]"/>
-        </record>
-
     </data>
 </openerp>

From 53e1a01ee17f41e1b6772c2a6d3524022172d91c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 14 Nov 2012 17:32:52 +0100
Subject: [PATCH 112/143] [FIX] mail_thread: fixed function name from tools,
 text2html is plaintext2html.

bzr revid: tde@openerp.com-20121114163252-s0eqvjvdy953yyq2
---
 addons/mail/mail_thread.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 99ce2bd595e..ee1a015396b 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -747,7 +747,7 @@ class mail_thread(osv.AbstractModel):
 
         # 1. Pre-processing: body, partner_ids, type and subtype
         if content_subtype == 'plaintext':
-            body = tools.text2html(body)
+            body = tools.plaintext2html(body)
 
         partner_ids = kwargs.pop('partner_ids', [])
         if parent_id:

From 4fb15efb59afe8ce98bb962b54163d3d7cb35a39 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 14 Nov 2012 17:44:13 +0100
Subject: [PATCH 113/143] [FIX] IE does not accept custom button@type attribute

Added one more step in views serialization historic hell

bzr revid: fme@openerp.com-20121114164413-wrnxlbuh9zj924yk
---
 addons/web/static/src/js/view_form.js | 31 +++++++++++++++++++++++----
 addons/web/static/src/js/views.js     | 10 +++++----
 2 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 014a67157bb..8f5bb86e6b9 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -1191,14 +1191,36 @@ instance.web.form.FormRenderingEngine = instance.web.form.FormRenderingEngineInt
             });
         }
     },
+    view_arch_to_dom_node: function(arch) {
+        // Historic mess for views arch
+        //
+        // server:
+        //      -> got xml as string
+        //      -> parse to xml and manipulate domains and contexts
+        //      -> convert to json
+        //  client:
+        //      -> got view as json
+        //      -> convert back to xml as string
+        //      -> parse it as xml doc (manipulate button@type for IE)
+        //      -> convert back to string
+        //      -> parse it as dom element with jquery
+        //      -> for each widget, convert node to json
+        //
+        // Wow !!!
+        var xml = instance.web.json_node_to_xml(arch);
+
+        var doc = $.parseXML('<div class="oe_form">' + xml + '</div>');
+        $('button', doc).each(function() {
+            $(this).attr('data-button-type', $(this).attr('type'));
+        });
+        xml = instance.web.xml_to_str(doc);
+        return $(xml);
+    },
     render_to: function($target) {
         var self = this;
         this.$target = $target;
 
-        // TODO: I know this will save the world and all the kitten for a moment,
-        //       but one day, we will have to get rid of xml2json
-        var xml = instance.web.json_node_to_xml(this.fvg.arch);
-        this.$form = $('<div class="oe_form">' + xml + '</div>');
+        this.$form = this.view_arch_to_dom_node(this.fvg.arch);
 
         this.process_version();
 
@@ -1867,6 +1889,7 @@ instance.web.form.FormWidget = instance.web.Widget.extend(instance.web.form.Invi
 instance.web.form.WidgetButton = instance.web.form.FormWidget.extend({
     template: 'WidgetButton',
     init: function(field_manager, node) {
+        node.attrs.type = node.attrs['data-button-type'];
         this._super(field_manager, node);
         this.force_disabled = false;
         this.string = (this.node.attrs.string || '').replace(/_/g, '');
diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index f39cb221a86..19336ec3655 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -1409,14 +1409,16 @@ instance.web.json_node_to_xml = function(node, human_readable, indent) {
     } else {
         return r + '/>';
     }
-}
+};
 instance.web.xml_to_str = function(node) {
-    if (window.ActiveXObject) {
+    if (window.XMLSerializer) {
+        return (new XMLSerializer()).serializeToString(node);
+    } else if (window.ActiveXObject) {
         return node.xml;
     } else {
-        return (new XMLSerializer()).serializeToString(node);
+        throw new Error("Could not serialize XML");
     }
-}
+};
 instance.web.str_to_xml = function(s) {
     if (window.DOMParser) {
         var dp = new DOMParser();

From 127499354078fabd964aa1cdcde3a815a0ad7ab5 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Wed, 14 Nov 2012 17:54:46 +0100
Subject: [PATCH 114/143] [FIX] auth_signup + auth_anonymous: update to new api

bzr revid: chs@openerp.com-20121114165446-7f4xv1yb11pu50ya
---
 addons/auth_anonymous/static/src/js/auth_anonymous.js |  4 ++--
 addons/auth_signup/static/src/js/auth_signup.js       | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/addons/auth_anonymous/static/src/js/auth_anonymous.js b/addons/auth_anonymous/static/src/js/auth_anonymous.js
index 8a78aca479c..6768bc63ff9 100644
--- a/addons/auth_anonymous/static/src/js/auth_anonymous.js
+++ b/addons/auth_anonymous/static/src/js/auth_anonymous.js
@@ -4,11 +4,11 @@ openerp.auth_anonymous = function(instance) {
         start: function() {
             var self = this;
             return $.when(this._super()).then(function() {
-                var dblist = self._db_list || [];
+                var dblist = self.db_list || [];
                 if (!self.session.session_is_valid() && dblist.length === 1) {
                     self.remember_credentials = false;
                     // XXX get login/pass from server (via a rpc call) ?
-                    return self.do_login(dblist[0], 'anonymous', 'anonymous')
+                    return self.do_login(dblist[0], 'anonymous', 'anonymous');
                 }
 
             });
diff --git a/addons/auth_signup/static/src/js/auth_signup.js b/addons/auth_signup/static/src/js/auth_signup.js
index bb249429894..3025069dece 100644
--- a/addons/auth_signup/static/src/js/auth_signup.js
+++ b/addons/auth_signup/static/src/js/auth_signup.js
@@ -41,7 +41,7 @@ openerp.auth_signup = function(instance) {
         on_token_loaded: function(result) {
             // select the right the database
             this.selected_db = result.db;
-            this.on_db_loaded({db_list: [result.db]});
+            this.on_db_loaded([result.db]);
             if (result.token) {
                 // switch to signup mode, set user name and login
                 this.$el.addClass("oe_login_signup");
@@ -80,16 +80,16 @@ openerp.auth_signup = function(instance) {
                     this.do_warn("Login", "No database selected !");
                     return false;
                 } else if (!name) {
-                    this.do_warn("Login", "Please enter a name.")
+                    this.do_warn("Login", "Please enter a name.");
                     return false;
                 } else if (!login) {
-                    this.do_warn("Login", "Please enter a username.")
+                    this.do_warn("Login", "Please enter a username.");
                     return false;
                 } else if (!password || !confirm_password) {
-                    this.do_warn("Login", "Please enter a password and confirm it.")
+                    this.do_warn("Login", "Please enter a password and confirm it.");
                     return false;
                 } else if (password !== confirm_password) {
-                    this.do_warn("Login", "Passwords do not match; please retype them.")
+                    this.do_warn("Login", "Passwords do not match; please retype them.");
                     return false;
                 }
                 var params = {

From 1b2f4baede3cf2c71b3e49b04ad44cc543ee83cd Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 14 Nov 2012 17:59:02 +0100
Subject: [PATCH 115/143] [FIX] Calendar tabs disapear when clicking
 next/previous

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

bzr revid: fme@openerp.com-20121114165902-zizcpaemtq3mc21x
---
 addons/web_calendar/static/src/js/calendar.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/web_calendar/static/src/js/calendar.js b/addons/web_calendar/static/src/js/calendar.js
index 437059cbdad..30b14c32749 100644
--- a/addons/web_calendar/static/src/js/calendar.js
+++ b/addons/web_calendar/static/src/js/calendar.js
@@ -235,7 +235,6 @@ instance.web_calendar.CalendarView = instance.web.View.extend({
         if (!date.between(this.range_start, this.range_stop)) {
             this.update_range_dates(date);
             this.ranged_search();
-            this.$el.find(".dhx_cal_navline div").removeAttr('style');
         }
         this.ready.resolve();
     },

From 17c426870fb8c1c762271089857ebb68f11c5ea5 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Wed, 14 Nov 2012 18:07:58 +0100
Subject: [PATCH 116/143] [FIX] analytic account delete when lines exist

bzr revid: al@openerp.com-20121114170758-dgg378sgwx96w4av
---
 addons/analytic/analytic.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py
index 4c883dc4f8a..708f9b3b196 100644
--- a/addons/analytic/analytic.py
+++ b/addons/analytic/analytic.py
@@ -327,7 +327,7 @@ class account_analytic_line(osv.osv):
         'date': fields.date('Date', required=True, select=True),
         'amount': fields.float('Amount', required=True, help='Calculated by multiplying the quantity and the price given in the Product\'s cost price. Always expressed in the company main currency.', digits_compute=dp.get_precision('Account')),
         'unit_amount': fields.float('Quantity', help='Specifies the amount of quantity to count.'),
-        'account_id': fields.many2one('account.analytic.account', 'Analytic Account', required=True, ondelete='set null', select=True, domain=[('type','<>','view')]),
+        'account_id': fields.many2one('account.analytic.account', 'Analytic Account', required=True, ondelete='restrict', select=True, domain=[('type','<>','view')]),
         'user_id': fields.many2one('res.users', 'User'),
         'company_id': fields.related('account_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True),
 

From e6586d16313be9d7ddbca81c6e2472508682a904 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Wed, 14 Nov 2012 18:19:20 +0100
Subject: [PATCH 117/143] [FIX] wording

bzr revid: fp@tinyerp.com-20121114171920-pxyq9qp5vcjm79yc
---
 addons/account/account_invoice.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py
index 409551585fa..3e86c4963b7 100644
--- a/addons/account/account_invoice.py
+++ b/addons/account/account_invoice.py
@@ -432,7 +432,7 @@ class account_invoice(osv.osv):
             if t['state'] in ('draft', 'cancel') and t['internal_number']== False:
                 unlink_ids.append(t['id'])
             else:
-                raise osv.except_osv(_('Invalid Action!'), _('You cannot delete an invoice which is open or paid. You should refund it instead.'))
+                raise osv.except_osv(_('Invalid Action!'), _('You can not delete an invoice which is not cancelled. You should refund it instead.'))
         osv.osv.unlink(self, cr, uid, unlink_ids, context=context)
         return True
 

From eb5a5bf838fdeac8564802f3b08fbfad6066e8e7 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Wed, 14 Nov 2012 18:41:50 +0100
Subject: [PATCH 118/143] [IMP] add method session.url() to generate correct
 url

bzr revid: chs@openerp.com-20121114174150-9nhj50vftt4lrf0k
---
 addons/web/static/src/js/chrome.js        |  2 +-
 addons/web/static/src/js/corelib.js       | 15 ++++++++++++---
 addons/web/static/src/js/coresetup.js     |  6 +++---
 addons/web/static/src/js/view_form.js     | 10 +++++++---
 addons/web/static/src/js/view_list.js     |  4 +---
 addons/web/static/src/js/views.js         |  4 ++--
 addons/web_kanban/static/src/js/kanban.js |  2 +-
 7 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 7e4b9a46fe8..9c73ca33165 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -903,7 +903,7 @@ instance.web.UserMenu =  instance.web.Widget.extend({
                 if(res.company_id[0] > 1)
                     topbar_name = _.str.sprintf("%s (%s)", topbar_name, res.company_id[1]);
                 self.$el.find('.oe_topbar_name').text(topbar_name);
-                var avatar_src = _.str.sprintf('%s/web/binary/image?session_id=%s&model=res.users&field=image_small&id=%s', self.session.prefix, self.session.session_id, self.session.uid);
+                var avatar_src = self.session.url('/web/binary/image', {model:'res.users', field: 'image_small', id: self.session.uid});
                 $avatar.attr('src', avatar_src);
             });
         };
diff --git a/addons/web/static/src/js/corelib.js b/addons/web/static/src/js/corelib.js
index 879cf94dcdd..6ea0fd53372 100644
--- a/addons/web/static/src/js/corelib.js
+++ b/addons/web/static/src/js/corelib.js
@@ -1320,7 +1320,7 @@ instance.web.JsonRPC = instance.web.Class.extend(instance.web.PropertiesMixin, {
             }
         };
 
-        url.url = this.get_url(url.url);
+        url.url = this.url(url.url, null);
         var ajax = _.extend({
             type: "GET",
             dataType: 'jsonp', 
@@ -1376,8 +1376,17 @@ instance.web.JsonRPC = instance.web.Class.extend(instance.web.PropertiesMixin, {
             return deferred.done(set_sid);
         }
     },
-    get_url: function (file) {
-        return this.prefix + file;
+
+    url: function(path, params) {
+        var qs = '';
+        if (!_.isNull(params)) {
+            params = _.extend(params || {}, {session_id: this.session_id});
+            if (this.httpsessionid) {
+                params.sid = this.httpsessionid;
+            }
+            qs = '?' + $.param(params);
+        }
+        return this.prefix + path + qs;
     },
 });
 
diff --git a/addons/web/static/src/js/coresetup.js b/addons/web/static/src/js/coresetup.js
index 87f659340f6..f3166285fe7 100644
--- a/addons/web/static/src/js/coresetup.js
+++ b/addons/web/static/src/js/coresetup.js
@@ -201,7 +201,7 @@ instance.web.Session = instance.web.JsonRPC.extend( /** @lends instance.web.Sess
         var self = this;
         _.each(files, function (file) {
             $('head').append($('<link>', {
-                'href': self.get_url(file),
+                'href': self.url(file, null),
                 'rel': 'stylesheet',
                 'type': 'text/css'
             }));
@@ -210,11 +210,11 @@ instance.web.Session = instance.web.JsonRPC.extend( /** @lends instance.web.Sess
     load_js: function(files) {
         var self = this;
         var d = $.Deferred();
-        if(files.length != 0) {
+        if(files.length !== 0) {
             var file = files.shift();
             var tag = document.createElement('script');
             tag.type = 'text/javascript';
-            tag.src = self.get_url(file);
+            tag.src = self.url(file, null);
             tag.onload = tag.onreadystatechange = function() {
                 if ( (tag.readyState && tag.readyState != "loaded" && tag.readyState != "complete") || tag.onload_done )
                     return;
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 8f5bb86e6b9..867569e2ea5 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -4956,8 +4956,12 @@ instance.web.form.FieldBinaryImage = instance.web.form.FieldBinary.extend({
             var field = this.name;
             if (this.options.preview_image)
                 field = this.options.preview_image;
-            url = '/web/binary/image?session_id=' + this.session.session_id + '&model=' +
-                this.view.dataset.model +'&id=' + id + '&field=' + field + '&t=' + (new Date().getTime());
+            url = this.session.url('/web/binary/image', {
+                                        model: this.view.dataset.model,
+                                        id: id,
+                                        field: field,
+                                        t: (new Date().getTime()),
+            });
         } else {
             url = this.placeholder;
         }
@@ -5017,7 +5021,7 @@ instance.web.form.FieldOne2ManyBinaryMultiFiles = instance.web.form.AbstractFiel
         return _.map(this.get('value'), function (value) { return commands.link_to( value.id ); });
     },
     get_file_url: function (attachment) {
-        return instance.origin + '/web/binary/saveas?session_id=' + this.session.session_id + '&model=ir.attachment&field=datas&filename_field=datas_fname&id=' + attachment['id'];
+        return this.session.url('/web/binary/saveas', {model: 'ir.attachment', field: 'datas', filename_field: 'datas_fname', id: attachment['id']});
     },
     render_value: function () {
         var render = $(instance.web.qweb.render('FieldBinaryFileUploader.files', {'widget': this}));
diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js
index 700c126d68d..db8c962efc7 100644
--- a/addons/web/static/src/js/view_list.js
+++ b/addons/web/static/src/js/view_list.js
@@ -2173,9 +2173,7 @@ instance.web.list.Binary = instance.web.list.Column.extend({
         if (value && value.substr(0, 10).indexOf(' ') == -1) {
             download_url = "data:application/octet-stream;base64," + value;
         } else {
-            download_url = _.str.sprintf(
-                '/web/binary/saveas?session_id=%s&model=%s&field=%s&id=%d',
-                instance.session.session_id, options.model, this.id, options.id);
+            download_url = this.session.url('/web/binary/saveas', {model: options.model, field: this.id, id: options.id});
             if (this.filename) {
                 download_url += '&filename_field=' + this.filename;
             }
diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 19336ec3655..d29ac70bb5a 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -1102,11 +1102,11 @@ instance.web.Sidebar = instance.web.Widget.extend({
     on_attachments_loaded: function(attachments) {
         var self = this;
         var items = [];
-        var prefix = this.session.origin + '/web/binary/saveas?session_id=' + self.session.session_id + '&model=ir.attachment&field=datas&filename_field=name&id=';
+        var prefix = this.session.url('/web/binary/saveas', {model: 'ir.attachment', field: 'datas', filename_field: 'name'});
         _.each(attachments,function(a) {
             a.label = a.name;
             if(a.type === "binary") {
-                a.url = prefix  + a.id + '&t=' + (new Date().getTime());
+                a.url = prefix  + '&id=' + a.id + '&t=' + (new Date().getTime());
             }
         });
         self.items['files'] = attachments;
diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index 25379e946b6..8526dbdc8de 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -995,7 +995,7 @@ instance.web_kanban.KanbanRecord = instance.web.Widget.extend({
             id = escape(JSON.stringify(id));
             if (options.preview_image)
                 field = options.preview_image;
-            url = instance.session.prefix + '/web/binary/image?session_id=' + this.session.session_id + '&model=' + model + '&field=' + field + '&id=' + id;
+            url = this.session.url('/web/binary/image', {model: model, field: field, id: id});
             if (cache !== undefined) {
                 // Set the cache duration in seconds.
                 url += '&cache=' + parseInt(cache, 10);

From fa8463f804e085c25fb138843b001fe3fb0b3b68 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Wed, 14 Nov 2012 18:42:58 +0100
Subject: [PATCH 119/143] [FIX] use session.url()

bzr revid: chs@openerp.com-20121114174258-ly0dniub0k383045
---
 addons/mail/static/src/js/mail.js             | 6 ++++--
 addons/point_of_sale/static/src/js/models.js  | 2 +-
 addons/point_of_sale/static/src/js/widgets.js | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 9aed41c0708..e93a762981b 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -56,12 +56,14 @@ openerp.mail = function (session) {
 
         /* Get an image in /web/binary/image?... */
         get_image: function (session, model, field, id, resize) {
-            return session.prefix + '/web/binary/image?session_id=' + session.session_id + '&model=' + model + '&field=' + field + '&id=' + (id || '') + '&resize=' + (resize ? encodeURIComponent(resize) : '');
+            var r = resize ? encodeURIComponent(resize) : '';
+            id = id || '';
+            return session.url('/web/binary/image', {model: model, field: field, id: id, resize: r});
         },
 
         /* 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'];
+            return session.url('/web/binary/saveas', {model: 'ir.attachment', field: 'datas', filename_field: 'datas_fname', id: attachment['id']});
         },
 
         /**
diff --git a/addons/point_of_sale/static/src/js/models.js b/addons/point_of_sale/static/src/js/models.js
index 7301a85eb2d..f1462424f1e 100644
--- a/addons/point_of_sale/static/src/js/models.js
+++ b/addons/point_of_sale/static/src/js/models.js
@@ -320,7 +320,7 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
 
     module.Product = Backbone.Model.extend({
         get_image_url: function(){
-            return '/web/binary/image?session_id='+instance.session.session_id+'&model=product.product&field=image&id='+this.get('id');
+            return instance.session.url('/web/binary/image', {model: 'product.product', field: 'image', id: this.get('id')});
         },
     });
 
diff --git a/addons/point_of_sale/static/src/js/widgets.js b/addons/point_of_sale/static/src/js/widgets.js
index c7874a4bd5c..4728c584b21 100644
--- a/addons/point_of_sale/static/src/js/widgets.js
+++ b/addons/point_of_sale/static/src/js/widgets.js
@@ -474,7 +474,7 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
         },
 
         get_image_url: function(category){
-            return '/web/binary/image?session_id='+instance.session.session_id+'&model=pos.category&field=image&id='+category.id;
+            return instance.session.url('/web/binary/image', {model: 'pos.category', field: 'image', id: category.id});
         },
 
         renderElement: function(){

From 97cd288f6554e716fe879805a7efc42d880d3f66 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Wed, 14 Nov 2012 23:32:33 +0100
Subject: [PATCH 120/143] [IMP] removed unused demod data

bzr revid: fp@openerp.com-20121114223233-62upcr24xbm7r5cg
---
 addons/project/project_demo.xml | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/addons/project/project_demo.xml b/addons/project/project_demo.xml
index cd22bad67d4..acfdac6451a 100644
--- a/addons/project/project_demo.xml
+++ b/addons/project/project_demo.xml
@@ -21,23 +21,6 @@
             <field name="name">Usability</field>
         </record>
 
-        <!-- Projects -->
-        <record id="project_project_internal" model="project.project">
-            <field name="name">Internal Projects</field>
-            <field name="parent_id" ref="all_projects_account"/>
-            <field name="user_id" ref="base.user_root"/>
-            <field name="alias_model">project.task</field>
-            <field name="type_ids" eval="[(6, 0, [ref('project_tt_specification'),ref('project_tt_development'),ref('project_tt_testing'),ref('project_tt_merge'),ref('project_tt_deployment')])]"/>
-        </record>
-
-        <record id="project_project_customer" model="project.project">
-            <field name="name">Customer Projects</field>
-            <field name="parent_id" ref="all_projects_account"/>
-            <field name="user_id" ref="base.user_root"/>
-            <field name="alias_model">project.task</field>
-            <field name="type_ids" eval="[(6, 0, [ref('project_tt_analysis'),ref('project_tt_specification'),ref('project_tt_negotiation'),ref('project_tt_development'),ref('project_tt_testing'),ref('project_tt_deployment')])]"/>
-        </record>
-
         <record id="project_project_1" model="project.project">
             <field name="date_start" eval="time.strftime('%Y-%m-01 10:00:00')"/>
             <field name="state">open</field>

From 7e8ea7b35191dc25a792cdb81aad106a477b8119 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Wed, 14 Nov 2012 23:39:20 +0100
Subject: [PATCH 121/143] [IMP] better demo data for projects

bzr revid: fp@openerp.com-20121114223920-ps1j47ca5h8z3jtd
---
 addons/project/project_demo.xml                     | 5 ++++-
 addons/project_long_term/project_long_term_view.xml | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/addons/project/project_demo.xml b/addons/project/project_demo.xml
index acfdac6451a..698a1a99627 100644
--- a/addons/project/project_demo.xml
+++ b/addons/project/project_demo.xml
@@ -26,9 +26,10 @@
             <field name="state">open</field>
             <field name="type">normal</field>
             <field name="name">The Jackson Group's Project</field>
+            <field name="color">3</field>
             <field name="partner_id" ref="base.res_partner_10"/>
             <field name="parent_id" ref="all_projects_account"/>
-            <field name="privacy_visibility">followers</field>
+            <field name="privacy_visibility">public</field>
             <field name="members" eval="[(6, 0, [
                     ref('base.user_root'),
                     ref('base.user_demo')])]"/>
@@ -41,6 +42,7 @@
         <record id="project_project_2" model="project.project">
             <field name="name">Research &amp; Development</field>
             <field name="parent_id" ref="all_projects_account"/>
+            <field name="privacy_visibility">public</field>
             <field name="user_id" ref="base.user_demo"/>
             <field name="alias_model">project.task</field>
             <field name="type_ids" eval="[(6, 0, [ref('project_tt_specification'),ref('project_tt_development'),ref('project_tt_testing'),ref('project_tt_merge'),ref('project_tt_deployment')])]"/>
@@ -52,6 +54,7 @@
             <field name="name">E-Learning Integration</field>
             <field name="user_id" ref="base.user_demo"/>
             <field name="alias_model">project.task</field>
+            <field name="privacy_visibility">public</field>
             <field name="members" eval="[(6, 0, [
                     ref('base.user_root'),
                     ref('base.user_demo')])]"/>
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 52eb5d80a3a..18e471ddd40 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -121,8 +121,8 @@
                 <xpath expr="//div[contains(@class, 'oe_kanban_project_list')]" position="inside">
                     <a t-if="record.use_phases.raw_value"
                         name="%(act_project_phases)d" type="action">
-                        <span t-if="record.phase_count.raw_value gt 1">Phases(<field name="phase_count"/>)</span>
-                        <span t-if="record.phase_count.raw_value lt 2">Phase(<field name="phase_count"/>)</span>
+                        <span t-if="record.phase_count.raw_value gt 1"><field name="phase_count"/> Phases</span>
+                        <span t-if="record.phase_count.raw_value lt 2"><field name="phase_count"/> Phase</span>
                     </a>
                 </xpath>
             </field>

From 72f991f6315a7427f419df493d00cdafbe8c2a82 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Wed, 14 Nov 2012 23:44:52 +0100
Subject: [PATCH 122/143] [IMP] demo data: project issues

bzr revid: fp@openerp.com-20121114224452-4djljq2ny7f1lumx
---
 addons/project_issue/project_issue_demo.xml | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/addons/project_issue/project_issue_demo.xml b/addons/project_issue/project_issue_demo.xml
index 9759d15dabb..86e4c59b571 100644
--- a/addons/project_issue/project_issue_demo.xml
+++ b/addons/project_issue/project_issue_demo.xml
@@ -1,5 +1,24 @@
 <?xml version="1.0"?>
 <openerp>
+    <data>
+
+        <record id="project_project_1" model="project.project">
+            <field name="use_issues" eval="True"/>
+        </record>
+        <record id="project_project_2" model="project.project">
+            <field name="use_issues" eval="True"/>
+        </record>
+        <record id="project_project_3" model="project.project">
+            <field name="use_issues" eval="True"/>
+        </record>
+        <record id="project_project_4" model="project.project">
+            <field name="use_issues" eval="True"/>
+        </record>
+        <record id="project_project_5" model="project.project">
+            <field name="use_issues" eval="True"/>
+        </record>
+
+    </data>
     <data noupdate="1">
 
         <!-- Categories -->

From ba22c50e12c05f1d9969b9fff0edeb552db76eac Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Thu, 15 Nov 2012 00:00:42 +0100
Subject: [PATCH 123/143] doc remove dev_ internal_ dichotomy tutorial will
 replace dev_

bzr revid: al@openerp.com-20121114230042-ojzn4hr3fp0k15dz
---
 addons/web/doc/changelog-7.0.rst                  |  2 +-
 .../{dev_client_action.rst => client_action.rst}  |  0
 .../web/doc/{internal_form.rst => form_view.rst}  |  0
 addons/web/doc/index.rst                          | 15 +++++++--------
 .../web/doc/{internal_list.rst => list_view.rst}  |  2 +-
 addons/web/doc/{dev_qweb.rst => qweb.rst}         |  0
 addons/web/doc/{dev_rpc.rst => rpc.rst}           |  0
 .../doc/{internal_search.rst => search_view.rst}  |  0
 addons/web/doc/{dev_widget.rst => widget.rst}     |  0
 9 files changed, 9 insertions(+), 10 deletions(-)
 rename addons/web/doc/{dev_client_action.rst => client_action.rst} (100%)
 rename addons/web/doc/{internal_form.rst => form_view.rst} (100%)
 rename addons/web/doc/{internal_list.rst => list_view.rst} (99%)
 rename addons/web/doc/{dev_qweb.rst => qweb.rst} (100%)
 rename addons/web/doc/{dev_rpc.rst => rpc.rst} (100%)
 rename addons/web/doc/{internal_search.rst => search_view.rst} (100%)
 rename addons/web/doc/{dev_widget.rst => widget.rst} (100%)

diff --git a/addons/web/doc/changelog-7.0.rst b/addons/web/doc/changelog-7.0.rst
index 96ed1ae18a2..b801c11b945 100644
--- a/addons/web/doc/changelog-7.0.rst
+++ b/addons/web/doc/changelog-7.0.rst
@@ -15,7 +15,7 @@ DataSet -> Model
 ----------------
 
 The 6.1 ``DataSet`` API has been deprecated in favor of the smaller
-and more orthogonal :doc:`Model </dev_rpc>` API, which more closely
+and more orthogonal :doc:`Model </rpc>` API, which more closely
 matches the API in OpenERP Web's Python side and in OpenObject addons
 and removes most stateful behavior of DataSet.
 
diff --git a/addons/web/doc/dev_client_action.rst b/addons/web/doc/client_action.rst
similarity index 100%
rename from addons/web/doc/dev_client_action.rst
rename to addons/web/doc/client_action.rst
diff --git a/addons/web/doc/internal_form.rst b/addons/web/doc/form_view.rst
similarity index 100%
rename from addons/web/doc/internal_form.rst
rename to addons/web/doc/form_view.rst
diff --git a/addons/web/doc/index.rst b/addons/web/doc/index.rst
index b79762431fa..3e436200a8c 100644
--- a/addons/web/doc/index.rst
+++ b/addons/web/doc/index.rst
@@ -14,14 +14,13 @@ Contents:
     presentation
     async
 
-    dev_rpc
-    dev_widget
-    dev_qweb
-    dev_client_action
-
-    internal_form
-    internal_list
-    internal_search
+    widget
+    qweb
+    rpc
+    client_action
+    form_view
+    search_view
+    list_view
 
     changelog-7.0
 
diff --git a/addons/web/doc/internal_list.rst b/addons/web/doc/list_view.rst
similarity index 99%
rename from addons/web/doc/internal_list.rst
rename to addons/web/doc/list_view.rst
index c1ed4dcde89..51188d95f7b 100644
--- a/addons/web/doc/internal_list.rst
+++ b/addons/web/doc/list_view.rst
@@ -451,7 +451,7 @@ formview, delegating instead to its
         created.
 
         The result should be a valid form view, see :doc:`Form Notes
-        <internal_form>` for various peculiarities of the form view
+        <form_view>` for various peculiarities of the form view
         format.
 
         :param editor: editor object asking for the view
diff --git a/addons/web/doc/dev_qweb.rst b/addons/web/doc/qweb.rst
similarity index 100%
rename from addons/web/doc/dev_qweb.rst
rename to addons/web/doc/qweb.rst
diff --git a/addons/web/doc/dev_rpc.rst b/addons/web/doc/rpc.rst
similarity index 100%
rename from addons/web/doc/dev_rpc.rst
rename to addons/web/doc/rpc.rst
diff --git a/addons/web/doc/internal_search.rst b/addons/web/doc/search_view.rst
similarity index 100%
rename from addons/web/doc/internal_search.rst
rename to addons/web/doc/search_view.rst
diff --git a/addons/web/doc/dev_widget.rst b/addons/web/doc/widget.rst
similarity index 100%
rename from addons/web/doc/dev_widget.rst
rename to addons/web/doc/widget.rst

From 7629191431252f6feb777898a2626b7073775e21 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Thu, 15 Nov 2012 00:37:43 +0100
Subject: [PATCH 124/143] [MERGE] manual merge parts of chs owp

bzr revid: al@openerp.com-20121114233743-u9499fa3eugw94zi
---
 addons/web/__openerp__.py          |  1 +
 addons/web/static/src/js/chrome.js | 43 +++++++++++++++++++++++-------
 addons/web/static/src/js/views.js  |  2 +-
 3 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/addons/web/__openerp__.py b/addons/web/__openerp__.py
index 11b94353695..36e7ad2db27 100644
--- a/addons/web/__openerp__.py
+++ b/addons/web/__openerp__.py
@@ -1,6 +1,7 @@
 {
     'name': 'Web',
     'category': 'Hidden',
+    'version': '7.0.1.0',
     'description':
         """
 OpenERP Web core module.
diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 9c73ca33165..2753cb45d1e 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -635,9 +635,35 @@ instance.web.Login =  instance.web.Widget.extend({
 });
 instance.web.client_actions.add("login", "instance.web.Login");
 
+/**
+ * Redirect to url by replacing window.location
+ * If wait is true, sleep 1s and wait for the server i.e. after a restart.
+ */
+instance.web.redirect = function(url, wait) {
+    // Dont display a dialog if some xmlhttprequest are in progress
+    if (instance.client && instance.client.crashmanager) {
+        instance.client.crashmanager.destroy();
+    }
+
+    var wait_server = function() {
+        instance.session.rpc("/web/webclient/version_info", {}).done(function() {
+            window.location = url;
+        }).fail(function() {
+            setTimeout(wait_server, 250);
+        });
+    };
+
+    if (wait) {
+        setTimeout(wait_server, 1000);
+    } else {
+        window.location = url;
+    }
+}
+
 /**
  * Client action to reload the whole interface.
- * If params has an entry 'menu_id', it opens the given menu entry.
+ * If params.menu_id, it opens the given menu entry.
+ * If params.wait, reload will wait the openerp server to be reachable before reloading
  */
 instance.web.Reload = function(parent, action) {
     var params = action.params || {};
@@ -653,8 +679,8 @@ instance.web.Reload = function(parent, action) {
         hash = "#menu_id=" + menu_id;
     }
     var url = l.protocol + "//" + l.host + l.pathname + search + hash;
-    window.onerror = function() {};
-    window.location = url;
+
+    instance.web.redirect(url, params.wait);
 };
 instance.web.client_actions.add("reload", "instance.web.Reload");
 
@@ -664,7 +690,7 @@ instance.web.client_actions.add("reload", "instance.web.Reload");
  */
 instance.web.HistoryBack = function(parent) {
     if (!parent.history_back()) {
-        window.location = '/' + (window.location.search || '');
+        instance.web.Home(parent);
     }
 };
 instance.web.client_actions.add("history_back", "instance.web.HistoryBack");
@@ -672,11 +698,10 @@ instance.web.client_actions.add("history_back", "instance.web.HistoryBack");
 /**
  * Client action to go back home.
  */
-instance.web.Home = instance.web.Widget.extend({
-    init: function(parent) {
-        window.location = '/' + (window.location.search || '');
-    }
-});
+instance.web.Home = function(parent, action) {
+    var url = '/' + (window.location.search || '');
+    instance.web.redirect(url, action.params && action.params.wait);
+};
 instance.web.client_actions.add("home", "instance.web.Home");
 
 instance.web.ChangePassword =  instance.web.Widget.extend({
diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index d29ac70bb5a..c9c1f918114 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -1243,7 +1243,7 @@ instance.web.View = instance.web.Widget.extend({
             }
         };
 
-        if (action_data.special) {
+        if (action_data.special === 'cancel') {
             return handler({"type":"ir.actions.act_window_close"});
         } else if (action_data.type=="object") {
             var args = [[record_id]], additional_args = [];

From 9bf94f677d8e58f6c3cd089bb62d37e3687d8567 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Thu, 15 Nov 2012 02:18:53 +0100
Subject: [PATCH 125/143] [IMP] http session cleanup with gc

bzr revid: al@openerp.com-20121115011853-238vzfca9ssbiyi7
---
 addons/web/http.py | 53 ++++++++++++++++++++++++++--------------------
 1 file changed, 30 insertions(+), 23 deletions(-)

diff --git a/addons/web/http.py b/addons/web/http.py
index 309bcb81135..d702a5e5985 100644
--- a/addons/web/http.py
+++ b/addons/web/http.py
@@ -11,6 +11,7 @@ import logging
 import mimetypes
 import os
 import pprint
+import random
 import sys
 import tempfile
 import threading
@@ -357,26 +358,13 @@ class Controller(object):
 #----------------------------------------------------------
 # Session context manager
 #----------------------------------------------------------
-STORES = {}
-
 @contextlib.contextmanager
-def session_context(request, storage_path, session_cookie='httpsessionid'):
-    session_store, session_lock = STORES.get(storage_path, (None, None))
-    if not session_store:
-        session_store = werkzeug.contrib.sessions.FilesystemSessionStore( storage_path)
-        session_lock = threading.Lock()
-        STORES[storage_path] = session_store, session_lock
-
-    sid = request.cookies.get(session_cookie)
-    if not sid:
-        sid = request.args.get('sid')
-
+def session_context(request, session_store, session_lock, sid):
     with session_lock:
         if sid:
             request.session = session_store.get(sid)
         else:
             request.session = session_store.new()
-
     try:
         yield request.session
     finally:
@@ -428,6 +416,18 @@ def session_context(request, storage_path, session_cookie='httpsessionid'):
 
             session_store.save(request.session)
 
+def session_gc(session_store):
+    if random.random() < 0.001:
+        # we keep session one week
+        last_week = time.time() - 60*60*24*7
+        for fname in os.listdir(session_store.path):
+            path = os.path.join(session_store.path, fname)
+            try:
+                if os.path.getmtime(path) < last_week:
+                    os.unlink(path)
+            except OSError:
+                pass
+
 #----------------------------------------------------------
 # WSGI Application
 #----------------------------------------------------------
@@ -462,22 +462,23 @@ class Root(object):
     """Root WSGI application for the OpenERP Web Client.
     """
     def __init__(self):
-        self.httpsession_cookie = 'httpsessionid'
         self.addons = {}
 
         static_dirs = self._load_addons()
         app = werkzeug.wsgi.SharedDataMiddleware( self.dispatch, static_dirs)
         self.dispatch = DisableCacheMiddleware(app)
 
+        # Setup http sessions
         try:
             username = getpass.getuser()
         except Exception:
             username = "unknown"
-        self.session_storage = os.path.join(tempfile.gettempdir(), "oe-sessions-" + username)
-
-        if not os.path.exists(self.session_storage):
-            os.mkdir(self.session_storage, 0700)
-        _logger.debug('HTTP sessions stored in: %s', self.session_storage)
+        path = os.path.join(tempfile.gettempdir(), "oe-sessions-" + username)
+        if not os.path.exists(path):
+            os.mkdir(path, 0700)
+        self.session_store = werkzeug.contrib.sessions.FilesystemSessionStore(path)
+        self.session_lock = threading.Lock()
+        _logger.debug('HTTP sessions stored in: %s', path)
 
     def __call__(self, environ, start_response):
         """ Handle a WSGI request
@@ -500,8 +501,14 @@ class Root(object):
         if not handler:
             response = werkzeug.exceptions.NotFound()
         else:
-            with session_context(request, self.session_storage, self.httpsession_cookie) as session:
-                result = handler( request)
+            sid = request.cookies.get('sid')
+            if not sid:
+                sid = request.args.get('sid')
+
+            session_gc(self.session_store)
+
+            with session_context(request, self.session_store, self.session_lock, sid) as session:
+                result = handler(request)
 
                 if isinstance(result, basestring):
                     headers=[('Content-Type', 'text/html; charset=utf-8'), ('Content-Length', len(result))]
@@ -510,7 +517,7 @@ class Root(object):
                     response = result
 
                 if hasattr(response, 'set_cookie'):
-                    response.set_cookie(self.httpsession_cookie, session.sid)
+                    response.set_cookie('sid', session.sid)
 
         return response(environ, start_response)
 

From 9460e71cbe6f83ee6890c5b25661a6aad9ffa700 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Thu, 15 Nov 2012 05:09:25 +0000
Subject: [PATCH 126/143] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20121115044251-4ql7e59s542i5lu5
bzr revid: launchpad_translations_on_behalf_of_openerp-20121115050925-civsadyc1h0n4oew
---
 addons/note/i18n/pt_BR.po            |  4 +-
 addons/web/i18n/ar.po                |  4 +-
 addons/web/i18n/bg.po                |  4 +-
 addons/web/i18n/bn.po                |  4 +-
 addons/web/i18n/bs.po                |  4 +-
 addons/web/i18n/ca.po                |  4 +-
 addons/web/i18n/cs.po                |  4 +-
 addons/web/i18n/da.po                |  4 +-
 addons/web/i18n/de.po                |  4 +-
 addons/web/i18n/en_AU.po             |  4 +-
 addons/web/i18n/en_GB.po             |  4 +-
 addons/web/i18n/es.po                |  4 +-
 addons/web/i18n/es_CL.po             |  4 +-
 addons/web/i18n/es_CR.po             |  4 +-
 addons/web/i18n/es_EC.po             |  4 +-
 addons/web/i18n/et.po                |  4 +-
 addons/web/i18n/eu.po                |  4 +-
 addons/web/i18n/fi.po                |  4 +-
 addons/web/i18n/fr.po                |  4 +-
 addons/web/i18n/fr_CA.po             |  4 +-
 addons/web/i18n/gl.po                |  4 +-
 addons/web/i18n/gu.po                |  4 +-
 addons/web/i18n/hi.po                |  4 +-
 addons/web/i18n/hr.po                |  4 +-
 addons/web/i18n/hu.po                |  6 +--
 addons/web/i18n/id.po                |  4 +-
 addons/web/i18n/it.po                |  4 +-
 addons/web/i18n/ja.po                |  4 +-
 addons/web/i18n/ka.po                |  4 +-
 addons/web/i18n/lt.po                | 74 +++++++++++++++++-----------
 addons/web/i18n/mk.po                |  4 +-
 addons/web/i18n/mn.po                |  4 +-
 addons/web/i18n/nb.po                |  4 +-
 addons/web/i18n/nl.po                |  4 +-
 addons/web/i18n/nl_BE.po             |  4 +-
 addons/web/i18n/pl.po                | 10 ++--
 addons/web/i18n/pt.po                |  4 +-
 addons/web/i18n/pt_BR.po             |  4 +-
 addons/web/i18n/ro.po                |  4 +-
 addons/web/i18n/ru.po                |  4 +-
 addons/web/i18n/sk.po                |  4 +-
 addons/web/i18n/sl.po                |  4 +-
 addons/web/i18n/sq.po                |  4 +-
 addons/web/i18n/sr@latin.po          |  4 +-
 addons/web/i18n/sv.po                |  4 +-
 addons/web/i18n/tr.po                |  4 +-
 addons/web/i18n/uk.po                |  4 +-
 addons/web/i18n/zh_CN.po             |  4 +-
 addons/web/i18n/zh_TW.po             |  4 +-
 addons/web_calendar/i18n/ar.po       |  4 +-
 addons/web_calendar/i18n/bg.po       |  4 +-
 addons/web_calendar/i18n/bn.po       |  4 +-
 addons/web_calendar/i18n/bs.po       |  4 +-
 addons/web_calendar/i18n/ca.po       |  4 +-
 addons/web_calendar/i18n/cs.po       |  4 +-
 addons/web_calendar/i18n/da.po       |  4 +-
 addons/web_calendar/i18n/de.po       |  4 +-
 addons/web_calendar/i18n/en_AU.po    |  4 +-
 addons/web_calendar/i18n/en_GB.po    |  4 +-
 addons/web_calendar/i18n/es.po       |  4 +-
 addons/web_calendar/i18n/es_CL.po    |  4 +-
 addons/web_calendar/i18n/es_CR.po    |  4 +-
 addons/web_calendar/i18n/es_EC.po    |  4 +-
 addons/web_calendar/i18n/et.po       |  4 +-
 addons/web_calendar/i18n/eu.po       |  4 +-
 addons/web_calendar/i18n/fa.po       |  4 +-
 addons/web_calendar/i18n/fi.po       |  4 +-
 addons/web_calendar/i18n/fr.po       |  4 +-
 addons/web_calendar/i18n/fr_CA.po    |  4 +-
 addons/web_calendar/i18n/gl.po       |  4 +-
 addons/web_calendar/i18n/hr.po       |  4 +-
 addons/web_calendar/i18n/hu.po       |  4 +-
 addons/web_calendar/i18n/id.po       |  4 +-
 addons/web_calendar/i18n/it.po       |  4 +-
 addons/web_calendar/i18n/ja.po       |  4 +-
 addons/web_calendar/i18n/ka.po       |  4 +-
 addons/web_calendar/i18n/lt.po       |  4 +-
 addons/web_calendar/i18n/mk.po       |  4 +-
 addons/web_calendar/i18n/mn.po       |  4 +-
 addons/web_calendar/i18n/nb.po       |  4 +-
 addons/web_calendar/i18n/nl.po       |  4 +-
 addons/web_calendar/i18n/nl_BE.po    |  4 +-
 addons/web_calendar/i18n/pl.po       |  4 +-
 addons/web_calendar/i18n/pt.po       |  4 +-
 addons/web_calendar/i18n/pt_BR.po    |  4 +-
 addons/web_calendar/i18n/ro.po       |  4 +-
 addons/web_calendar/i18n/ru.po       |  4 +-
 addons/web_calendar/i18n/sk.po       |  4 +-
 addons/web_calendar/i18n/sl.po       |  4 +-
 addons/web_calendar/i18n/sq.po       |  4 +-
 addons/web_calendar/i18n/sr@latin.po |  4 +-
 addons/web_calendar/i18n/sv.po       |  4 +-
 addons/web_calendar/i18n/tr.po       |  4 +-
 addons/web_calendar/i18n/uk.po       |  4 +-
 addons/web_calendar/i18n/zh_CN.po    |  4 +-
 addons/web_diagram/i18n/ar.po        |  4 +-
 addons/web_diagram/i18n/bg.po        |  4 +-
 addons/web_diagram/i18n/bn.po        |  4 +-
 addons/web_diagram/i18n/bs.po        |  4 +-
 addons/web_diagram/i18n/ca.po        |  4 +-
 addons/web_diagram/i18n/cs.po        |  4 +-
 addons/web_diagram/i18n/da.po        |  4 +-
 addons/web_diagram/i18n/de.po        |  4 +-
 addons/web_diagram/i18n/en_GB.po     |  4 +-
 addons/web_diagram/i18n/es.po        |  4 +-
 addons/web_diagram/i18n/es_CL.po     |  4 +-
 addons/web_diagram/i18n/es_CR.po     |  4 +-
 addons/web_diagram/i18n/es_EC.po     |  4 +-
 addons/web_diagram/i18n/et.po        |  4 +-
 addons/web_diagram/i18n/fa.po        |  4 +-
 addons/web_diagram/i18n/fi.po        |  4 +-
 addons/web_diagram/i18n/fr.po        |  4 +-
 addons/web_diagram/i18n/gl.po        |  4 +-
 addons/web_diagram/i18n/hr.po        |  4 +-
 addons/web_diagram/i18n/id.po        |  4 +-
 addons/web_diagram/i18n/it.po        |  4 +-
 addons/web_diagram/i18n/ja.po        |  4 +-
 addons/web_diagram/i18n/ka.po        |  4 +-
 addons/web_diagram/i18n/lt.po        |  4 +-
 addons/web_diagram/i18n/mn.po        |  4 +-
 addons/web_diagram/i18n/nl.po        |  4 +-
 addons/web_diagram/i18n/nl_BE.po     |  4 +-
 addons/web_diagram/i18n/pl.po        |  4 +-
 addons/web_diagram/i18n/pt.po        |  4 +-
 addons/web_diagram/i18n/pt_BR.po     |  4 +-
 addons/web_diagram/i18n/ro.po        |  4 +-
 addons/web_diagram/i18n/ru.po        |  4 +-
 addons/web_diagram/i18n/sl.po        |  4 +-
 addons/web_diagram/i18n/sq.po        |  4 +-
 addons/web_diagram/i18n/sr@latin.po  |  4 +-
 addons/web_diagram/i18n/sv.po        |  4 +-
 addons/web_diagram/i18n/tr.po        |  4 +-
 addons/web_diagram/i18n/zh_CN.po     |  4 +-
 addons/web_gantt/i18n/ar.po          |  4 +-
 addons/web_gantt/i18n/bg.po          |  4 +-
 addons/web_gantt/i18n/bn.po          |  4 +-
 addons/web_gantt/i18n/bs.po          |  4 +-
 addons/web_gantt/i18n/ca.po          |  4 +-
 addons/web_gantt/i18n/cs.po          |  4 +-
 addons/web_gantt/i18n/da.po          |  4 +-
 addons/web_gantt/i18n/de.po          |  4 +-
 addons/web_gantt/i18n/en_AU.po       |  4 +-
 addons/web_gantt/i18n/en_GB.po       |  4 +-
 addons/web_gantt/i18n/es.po          |  4 +-
 addons/web_gantt/i18n/es_CL.po       |  4 +-
 addons/web_gantt/i18n/es_CR.po       |  4 +-
 addons/web_gantt/i18n/es_EC.po       |  4 +-
 addons/web_gantt/i18n/fa.po          |  4 +-
 addons/web_gantt/i18n/fi.po          |  4 +-
 addons/web_gantt/i18n/fr.po          |  4 +-
 addons/web_gantt/i18n/gl.po          |  4 +-
 addons/web_gantt/i18n/hr.po          |  4 +-
 addons/web_gantt/i18n/hu.po          |  4 +-
 addons/web_gantt/i18n/it.po          |  4 +-
 addons/web_gantt/i18n/ja.po          |  4 +-
 addons/web_gantt/i18n/ka.po          |  4 +-
 addons/web_gantt/i18n/lt.po          |  4 +-
 addons/web_gantt/i18n/mk.po          |  4 +-
 addons/web_gantt/i18n/mn.po          |  4 +-
 addons/web_gantt/i18n/nb.po          |  4 +-
 addons/web_gantt/i18n/nl.po          |  4 +-
 addons/web_gantt/i18n/nl_BE.po       |  4 +-
 addons/web_gantt/i18n/pl.po          |  4 +-
 addons/web_gantt/i18n/pt.po          |  4 +-
 addons/web_gantt/i18n/pt_BR.po       |  4 +-
 addons/web_gantt/i18n/ro.po          |  4 +-
 addons/web_gantt/i18n/ru.po          |  4 +-
 addons/web_gantt/i18n/sl.po          |  4 +-
 addons/web_gantt/i18n/sq.po          |  4 +-
 addons/web_gantt/i18n/sr@latin.po    |  4 +-
 addons/web_gantt/i18n/sv.po          |  4 +-
 addons/web_gantt/i18n/tr.po          |  4 +-
 addons/web_gantt/i18n/zh_CN.po       |  4 +-
 addons/web_graph/i18n/ar.po          |  4 +-
 addons/web_graph/i18n/bg.po          |  4 +-
 addons/web_graph/i18n/bn.po          |  4 +-
 addons/web_graph/i18n/bs.po          |  4 +-
 addons/web_graph/i18n/ca.po          |  4 +-
 addons/web_graph/i18n/cs.po          |  4 +-
 addons/web_graph/i18n/da.po          |  4 +-
 addons/web_graph/i18n/de.po          |  4 +-
 addons/web_graph/i18n/en_AU.po       |  4 +-
 addons/web_graph/i18n/en_GB.po       |  4 +-
 addons/web_graph/i18n/es.po          |  4 +-
 addons/web_graph/i18n/es_CL.po       |  4 +-
 addons/web_graph/i18n/es_CR.po       |  4 +-
 addons/web_graph/i18n/es_EC.po       |  4 +-
 addons/web_graph/i18n/fa.po          |  4 +-
 addons/web_graph/i18n/fi.po          |  4 +-
 addons/web_graph/i18n/fr.po          |  4 +-
 addons/web_graph/i18n/gl.po          |  4 +-
 addons/web_graph/i18n/hr.po          |  4 +-
 addons/web_graph/i18n/hu.po          |  4 +-
 addons/web_graph/i18n/it.po          |  4 +-
 addons/web_graph/i18n/ja.po          |  4 +-
 addons/web_graph/i18n/ka.po          |  4 +-
 addons/web_graph/i18n/lt.po          |  4 +-
 addons/web_graph/i18n/mk.po          |  4 +-
 addons/web_graph/i18n/mn.po          |  4 +-
 addons/web_graph/i18n/nl.po          |  4 +-
 addons/web_graph/i18n/nl_BE.po       |  4 +-
 addons/web_graph/i18n/pl.po          |  4 +-
 addons/web_graph/i18n/pt.po          |  4 +-
 addons/web_graph/i18n/pt_BR.po       |  4 +-
 addons/web_graph/i18n/ro.po          |  4 +-
 addons/web_graph/i18n/ru.po          |  4 +-
 addons/web_graph/i18n/sl.po          |  4 +-
 addons/web_graph/i18n/sq.po          |  4 +-
 addons/web_graph/i18n/sr@latin.po    |  4 +-
 addons/web_graph/i18n/sv.po          |  4 +-
 addons/web_graph/i18n/tr.po          |  4 +-
 addons/web_graph/i18n/zh_CN.po       |  4 +-
 addons/web_hello/i18n/ar.po          |  4 +-
 addons/web_hello/i18n/es_CR.po       |  4 +-
 addons/web_hello/i18n/fr.po          |  4 +-
 addons/web_hello/i18n/pt_BR.po       |  4 +-
 addons/web_kanban/i18n/ar.po         |  4 +-
 addons/web_kanban/i18n/bg.po         |  4 +-
 addons/web_kanban/i18n/bn.po         |  4 +-
 addons/web_kanban/i18n/bs.po         |  4 +-
 addons/web_kanban/i18n/ca.po         |  4 +-
 addons/web_kanban/i18n/cs.po         |  4 +-
 addons/web_kanban/i18n/da.po         |  4 +-
 addons/web_kanban/i18n/de.po         |  4 +-
 addons/web_kanban/i18n/en_GB.po      |  4 +-
 addons/web_kanban/i18n/es.po         |  4 +-
 addons/web_kanban/i18n/es_CL.po      |  4 +-
 addons/web_kanban/i18n/es_CR.po      |  4 +-
 addons/web_kanban/i18n/es_EC.po      |  4 +-
 addons/web_kanban/i18n/fa.po         |  4 +-
 addons/web_kanban/i18n/fi.po         |  4 +-
 addons/web_kanban/i18n/fr.po         |  4 +-
 addons/web_kanban/i18n/gl.po         |  4 +-
 addons/web_kanban/i18n/hr.po         |  4 +-
 addons/web_kanban/i18n/hu.po         |  4 +-
 addons/web_kanban/i18n/it.po         |  4 +-
 addons/web_kanban/i18n/ja.po         |  4 +-
 addons/web_kanban/i18n/ka.po         |  4 +-
 addons/web_kanban/i18n/lt.po         |  4 +-
 addons/web_kanban/i18n/mn.po         |  4 +-
 addons/web_kanban/i18n/nl.po         |  4 +-
 addons/web_kanban/i18n/nl_BE.po      |  4 +-
 addons/web_kanban/i18n/pl.po         |  9 ++--
 addons/web_kanban/i18n/pt.po         |  4 +-
 addons/web_kanban/i18n/pt_BR.po      |  4 +-
 addons/web_kanban/i18n/ro.po         |  4 +-
 addons/web_kanban/i18n/ru.po         |  4 +-
 addons/web_kanban/i18n/sr@latin.po   |  4 +-
 addons/web_kanban/i18n/sv.po         |  4 +-
 addons/web_kanban/i18n/tr.po         |  4 +-
 addons/web_kanban/i18n/zh_CN.po      |  6 +--
 addons/web_tests/i18n/es_CR.po       |  4 +-
 addons/web_tests/i18n/fr_CA.po       |  4 +-
 253 files changed, 559 insertions(+), 538 deletions(-)

diff --git a/addons/note/i18n/pt_BR.po b/addons/note/i18n/pt_BR.po
index fca285578ed..eea43f2275f 100644
--- a/addons/note/i18n/pt_BR.po
+++ b/addons/note/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-14 04:40+0000\n"
-"X-Generator: Launchpad (build 16251)\n"
+"X-Launchpad-Export-Date: 2012-11-15 04:42+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. module: note
 #: sql_constraint:res.users:0
diff --git a/addons/web/i18n/ar.po b/addons/web/i18n/ar.po
index e5d92071388..933e81f8772 100644
--- a/addons/web/i18n/ar.po
+++ b/addons/web/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:02+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:07+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176
diff --git a/addons/web/i18n/bg.po b/addons/web/i18n/bg.po
index cb1ffd2c5ab..3cc1bb77ec8 100644
--- a/addons/web/i18n/bg.po
+++ b/addons/web/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:02+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:07+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176
diff --git a/addons/web/i18n/bn.po b/addons/web/i18n/bn.po
index a1934f5346e..78d247805a3 100644
--- a/addons/web/i18n/bn.po
+++ b/addons/web/i18n/bn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:02+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:07+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176
diff --git a/addons/web/i18n/bs.po b/addons/web/i18n/bs.po
index 525a46053bd..4ca035262f7 100644
--- a/addons/web/i18n/bs.po
+++ b/addons/web/i18n/bs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:02+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:07+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176
diff --git a/addons/web/i18n/ca.po b/addons/web/i18n/ca.po
index 8082c37717d..88fc0e32653 100644
--- a/addons/web/i18n/ca.po
+++ b/addons/web/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:02+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:08+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176
diff --git a/addons/web/i18n/cs.po b/addons/web/i18n/cs.po
index a12beb474b9..ceb1015a763 100644
--- a/addons/web/i18n/cs.po
+++ b/addons/web/i18n/cs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:02+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:08+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 "X-Poedit-Language: Czech\n"
 
 #. openerp-web
diff --git a/addons/web/i18n/da.po b/addons/web/i18n/da.po
index 2f8d5ef4e36..a35bac7c918 100644
--- a/addons/web/i18n/da.po
+++ b/addons/web/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:02+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:08+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176
diff --git a/addons/web/i18n/de.po b/addons/web/i18n/de.po
index 078004291a0..552f1e30f1b 100644
--- a/addons/web/i18n/de.po
+++ b/addons/web/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:02+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:08+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176
diff --git a/addons/web/i18n/en_AU.po b/addons/web/i18n/en_AU.po
index bdcedadd13d..268be13bd10 100644
--- a/addons/web/i18n/en_AU.po
+++ b/addons/web/i18n/en_AU.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:08+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176
diff --git a/addons/web/i18n/en_GB.po b/addons/web/i18n/en_GB.po
index 59a4e42c925..48d5af11c8a 100644
--- a/addons/web/i18n/en_GB.po
+++ b/addons/web/i18n/en_GB.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:08+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176
diff --git a/addons/web/i18n/es.po b/addons/web/i18n/es.po
index 8a086ec3654..745ba60db93 100644
--- a/addons/web/i18n/es.po
+++ b/addons/web/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:02+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:08+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176
diff --git a/addons/web/i18n/es_CL.po b/addons/web/i18n/es_CL.po
index f52e92abcee..9c0839670f2 100644
--- a/addons/web/i18n/es_CL.po
+++ b/addons/web/i18n/es_CL.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:08+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176
diff --git a/addons/web/i18n/es_CR.po b/addons/web/i18n/es_CR.po
index c09f10df847..29b09fa3d6c 100644
--- a/addons/web/i18n/es_CR.po
+++ b/addons/web/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:08+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 "Language: es\n"
 
 #. openerp-web
diff --git a/addons/web/i18n/es_EC.po b/addons/web/i18n/es_EC.po
index 28de64fb3c2..2f834527232 100644
--- a/addons/web/i18n/es_EC.po
+++ b/addons/web/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:08+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176
diff --git a/addons/web/i18n/et.po b/addons/web/i18n/et.po
index bc1e88e7cf9..fc4fd35beac 100644
--- a/addons/web/i18n/et.po
+++ b/addons/web/i18n/et.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:02+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:08+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176
diff --git a/addons/web/i18n/eu.po b/addons/web/i18n/eu.po
index 2f724a53987..1e4526e67cc 100644
--- a/addons/web/i18n/eu.po
+++ b/addons/web/i18n/eu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:02+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:07+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176
diff --git a/addons/web/i18n/fi.po b/addons/web/i18n/fi.po
index 9301615a6f5..ce97bef4c44 100644
--- a/addons/web/i18n/fi.po
+++ b/addons/web/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:02+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:08+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176
diff --git a/addons/web/i18n/fr.po b/addons/web/i18n/fr.po
index bdcecc565d0..fdc3c87a399 100644
--- a/addons/web/i18n/fr.po
+++ b/addons/web/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:02+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:08+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176
diff --git a/addons/web/i18n/fr_CA.po b/addons/web/i18n/fr_CA.po
index 104237fcc96..63c777fed9c 100644
--- a/addons/web/i18n/fr_CA.po
+++ b/addons/web/i18n/fr_CA.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:08+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176
diff --git a/addons/web/i18n/gl.po b/addons/web/i18n/gl.po
index 82804e9a00b..e6a8a84970d 100644
--- a/addons/web/i18n/gl.po
+++ b/addons/web/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:02+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:08+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176
diff --git a/addons/web/i18n/gu.po b/addons/web/i18n/gu.po
index 0e9bb980006..eed6596d47d 100644
--- a/addons/web/i18n/gu.po
+++ b/addons/web/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:02+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:08+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176
diff --git a/addons/web/i18n/hi.po b/addons/web/i18n/hi.po
index 4ded6cef521..c3fec02900b 100644
--- a/addons/web/i18n/hi.po
+++ b/addons/web/i18n/hi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:02+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:08+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176
diff --git a/addons/web/i18n/hr.po b/addons/web/i18n/hr.po
index 6ce16f5bda3..774b006975c 100644
--- a/addons/web/i18n/hr.po
+++ b/addons/web/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:02+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:08+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176
diff --git a/addons/web/i18n/hu.po b/addons/web/i18n/hu.po
index cea5493c029..9587dbd3081 100644
--- a/addons/web/i18n/hu.po
+++ b/addons/web/i18n/hu.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-07-02 09:06+0200\n"
 "PO-Revision-Date: 2012-10-26 12:17+0000\n"
-"Last-Translator: Herczeg Péter <herczegp@gmail.com>\n"
+"Last-Translator: Herczeg Péter <hp@erp-cloud.hu>\n"
 "Language-Team: Hungarian <hu@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-27 05:15+0000\n"
-"X-Generator: Launchpad (build 16194)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:08+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176
diff --git a/addons/web/i18n/id.po b/addons/web/i18n/id.po
index b681859b55a..12509847ba3 100644
--- a/addons/web/i18n/id.po
+++ b/addons/web/i18n/id.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:02+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:08+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176
diff --git a/addons/web/i18n/it.po b/addons/web/i18n/it.po
index 7df8f4c27bb..6f0f9025e18 100644
--- a/addons/web/i18n/it.po
+++ b/addons/web/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-23 05:05+0000\n"
-"X-Generator: Launchpad (build 16179)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:08+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176
diff --git a/addons/web/i18n/ja.po b/addons/web/i18n/ja.po
index 3da4bb12ac5..ae6f58716ba 100644
--- a/addons/web/i18n/ja.po
+++ b/addons/web/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:02+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:08+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176
diff --git a/addons/web/i18n/ka.po b/addons/web/i18n/ka.po
index 1abd1880405..7c64ddb5ec9 100644
--- a/addons/web/i18n/ka.po
+++ b/addons/web/i18n/ka.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:02+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:08+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176
diff --git a/addons/web/i18n/lt.po b/addons/web/i18n/lt.po
index 195c0f3c82c..ecbe6ec4085 100644
--- a/addons/web/i18n/lt.po
+++ b/addons/web/i18n/lt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-22 04:46+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:08+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176
@@ -66,7 +66,7 @@ msgstr ""
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:499
 msgid "Restored"
-msgstr ""
+msgstr "Atkurta"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:499
@@ -253,7 +253,7 @@ msgstr ""
 #: addons/web/static/src/js/formats.js:139
 #, python-format
 msgid "(%d records)"
-msgstr ""
+msgstr "(%d įrašai(-ų))"
 
 #. openerp-web
 #: addons/web/static/src/js/formats.js:325
@@ -265,7 +265,7 @@ msgstr "Atsisiųsti"
 #: addons/web/static/src/js/formats.js:330
 #, python-format
 msgid "Download \"%s\""
-msgstr ""
+msgstr "Parsisiųsti \"%s\""
 
 #. openerp-web
 #: addons/web/static/src/js/search.js:437
@@ -527,12 +527,12 @@ msgstr "Forma"
 #: addons/web/static/src/xml/base.xml:763
 #: addons/web/static/src/xml/base.xml:1714
 msgid "Delete"
-msgstr ""
+msgstr "Ištrinti"
 
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:762
 msgid "Duplicate"
-msgstr ""
+msgstr "Sukurti kopiją"
 
 #. openerp-web
 #: addons/web/static/src/js/view_form.js:133
@@ -589,12 +589,12 @@ msgstr ""
 #: addons/web/static/src/js/view_form.js:2238
 #, python-format
 msgid "<em>   Create \"<strong>%s</strong>\"</em>"
-msgstr ""
+msgstr "<em>   Sukurti \"<strong>%s</strong>\"</em>"
 
 #. openerp-web
 #: addons/web/static/src/js/view_form.js:2244
 msgid "<em>   Create and Edit...</em>"
-msgstr ""
+msgstr "<em>   Sukurti ir redaguoti...</em>"
 
 #. openerp-web
 #: addons/web/static/src/js/view_form.js:2277
@@ -606,7 +606,7 @@ msgstr "Paieška: "
 #: addons/web/static/src/js/view_form.js:2277
 #: addons/web/static/src/js/view_form.js:2765
 msgid "Create: "
-msgstr ""
+msgstr "Sukurti "
 
 #. openerp-web
 #: addons/web/static/src/js/view_form.js:2062
@@ -668,7 +668,7 @@ msgstr "Grupė"
 #. openerp-web
 #: addons/web/static/src/js/view_list.js:549
 msgid "Do you really want to remove these records?"
-msgstr ""
+msgstr "Ar tikrai norite ištrinti šiuos įrašus?"
 
 #. openerp-web
 #: addons/web/static/src/js/views.js:925
@@ -813,25 +813,25 @@ msgstr ""
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:297
 msgid "Invalid username or password"
-msgstr ""
+msgstr "Neteisingas naudotojo vardas arba slaptažodis"
 
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:116
 #: addons/web/static/src/xml/base.xml:150
 #: addons/web/static/src/xml/base.xml:301
 msgid "Database:"
-msgstr ""
+msgstr "Duomenų bazė:"
 
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:306
 msgid "Username"
-msgstr ""
+msgstr "Naudotojas"
 
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:308
 #: addons/web/static/src/xml/base.xml:331
 msgid "Password"
-msgstr ""
+msgstr "Slaptažodis"
 
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:310
@@ -870,17 +870,17 @@ msgstr ""
 #: addons/web/static/src/xml/base.xml:195
 #: addons/web/static/src/xml/base.xml:330
 msgid "Restore"
-msgstr ""
+msgstr "Atkurti"
 
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:332
 msgid "Back to Login"
-msgstr ""
+msgstr "Grįžti į prisijungimo langą"
 
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:61
 msgid "CREATE DATABASE"
-msgstr ""
+msgstr "SUKURTI DUOMENŲ BAZĘ"
 
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:68 addons/web/static/src/xml/base.xml:211
@@ -922,7 +922,7 @@ msgstr ""
 #: addons/web/static/src/xml/base.xml:162
 #: addons/web/static/src/xml/base.xml:187
 msgid "Master Password:"
-msgstr ""
+msgstr "Pagrindinis slaptažodis"
 
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:143
@@ -932,7 +932,7 @@ msgstr ""
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:175
 msgid "RESTORE DATABASE"
-msgstr ""
+msgstr "ATKURTI DUOMENŲ BAZĘ"
 
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:182
@@ -1012,17 +1012,17 @@ msgstr "OpenERP.com"
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:1720
 msgid "Old Password:"
-msgstr ""
+msgstr "Esamas slaptažodis:"
 
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:1725
 msgid "New Password:"
-msgstr ""
+msgstr "Naujas slaptažodis:"
 
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:1730
 msgid "Confirm Password:"
-msgstr ""
+msgstr "Patvirtinti slaptažodį:"
 
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:390
@@ -1254,7 +1254,7 @@ msgstr ""
 #: addons/web/static/src/xml/base.xml:1222
 #: addons/web/static/src/xml/base.xml:1279
 msgid "Clear"
-msgstr ""
+msgstr "Išvalyti"
 
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:1179
@@ -1408,12 +1408,12 @@ msgstr ""
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:1509
 msgid "Save & New"
-msgstr ""
+msgstr "Išsaugoti ir sukurti naują"
 
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:1510
 msgid "Save & Close"
-msgstr ""
+msgstr "Išsaugoti ir uždaryti"
 
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:1617
@@ -1572,9 +1572,6 @@ msgstr ""
 #~ msgid "Advanced Filters"
 #~ msgstr "Išplėstiniai filtrai"
 
-#~ msgid "Other Options"
-#~ msgstr "Kiti nustatymai"
-
 #~ msgid "OK"
 #~ msgstr "Gerai"
 
@@ -1602,3 +1599,22 @@ msgstr ""
 
 #~ msgid "Reports"
 #~ msgstr "Ataskaitos"
+
+#~ msgid "Other Options"
+#~ msgstr "Kitos parinktys"
+
+#~ msgid "LOGOUT"
+#~ msgstr "ATSIJUNGTI"
+
+#~ msgid "Create..."
+#~ msgstr "Sukurti..."
+
+#~ msgid "Search"
+#~ msgstr "Ieškoti"
+
+#~ msgid "Search..."
+#~ msgstr "Ieškoti..."
+
+#, python-format
+#~ msgid "[%(first_record)d to %(last_record)d] of %(records_count)d"
+#~ msgstr "[%(first_record)d iki %(last_record)d] iš %(records_count)d"
diff --git a/addons/web/i18n/mk.po b/addons/web/i18n/mk.po
index 62bef3d0015..30db39b4dfc 100644
--- a/addons/web/i18n/mk.po
+++ b/addons/web/i18n/mk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:02+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:08+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176
diff --git a/addons/web/i18n/mn.po b/addons/web/i18n/mn.po
index a862954b815..3ee9a552022 100644
--- a/addons/web/i18n/mn.po
+++ b/addons/web/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:02+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:08+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176
diff --git a/addons/web/i18n/nb.po b/addons/web/i18n/nb.po
index f47de43b3cf..0b44af2712d 100644
--- a/addons/web/i18n/nb.po
+++ b/addons/web/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:02+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:08+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176
diff --git a/addons/web/i18n/nl.po b/addons/web/i18n/nl.po
index 49631585157..eb80e4586ba 100644
--- a/addons/web/i18n/nl.po
+++ b/addons/web/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:02+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:08+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176
diff --git a/addons/web/i18n/nl_BE.po b/addons/web/i18n/nl_BE.po
index b3be018903b..04e45611f2d 100644
--- a/addons/web/i18n/nl_BE.po
+++ b/addons/web/i18n/nl_BE.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:08+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176
diff --git a/addons/web/i18n/pl.po b/addons/web/i18n/pl.po
index d5d854768d0..25cf2862611 100644
--- a/addons/web/i18n/pl.po
+++ b/addons/web/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:02+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:08+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176
@@ -243,17 +243,19 @@ msgid ""
 "Destination fields should only be selected once, some fields are selected "
 "more than once:"
 msgstr ""
+"Pola docelowe muszą być wybierane tylko raz. niektóre inne pola mogą być "
+"wybierane więcej niż raz:"
 
 #. openerp-web
 #: addons/web/static/src/js/data_import.js:386
 msgid "*Required Fields are not selected :"
-msgstr ""
+msgstr "*Wymagane pola nie zostały wybrane :"
 
 #. openerp-web
 #: addons/web/static/src/js/formats.js:139
 #, python-format
 msgid "(%d records)"
-msgstr ""
+msgstr "(%d rekordów)"
 
 #. openerp-web
 #: addons/web/static/src/js/formats.js:325
diff --git a/addons/web/i18n/pt.po b/addons/web/i18n/pt.po
index 3bf3fa6062d..95f3c546400 100644
--- a/addons/web/i18n/pt.po
+++ b/addons/web/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:02+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:08+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176
diff --git a/addons/web/i18n/pt_BR.po b/addons/web/i18n/pt_BR.po
index d950e97938c..6f14bf1f547 100644
--- a/addons/web/i18n/pt_BR.po
+++ b/addons/web/i18n/pt_BR.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:08+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176
diff --git a/addons/web/i18n/ro.po b/addons/web/i18n/ro.po
index 934e2e77f63..6a77472b1e4 100644
--- a/addons/web/i18n/ro.po
+++ b/addons/web/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:02+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:08+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176
diff --git a/addons/web/i18n/ru.po b/addons/web/i18n/ru.po
index ed5735602d0..341f683e953 100644
--- a/addons/web/i18n/ru.po
+++ b/addons/web/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-02 05:20+0000\n"
-"X-Generator: Launchpad (build 16218)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:08+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176
diff --git a/addons/web/i18n/sk.po b/addons/web/i18n/sk.po
index 39bdd647453..12b5d5a1c56 100644
--- a/addons/web/i18n/sk.po
+++ b/addons/web/i18n/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:02+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:08+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176
diff --git a/addons/web/i18n/sl.po b/addons/web/i18n/sl.po
index 687742a1775..0c745f42d41 100644
--- a/addons/web/i18n/sl.po
+++ b/addons/web/i18n/sl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-02 05:20+0000\n"
-"X-Generator: Launchpad (build 16218)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:08+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176
diff --git a/addons/web/i18n/sq.po b/addons/web/i18n/sq.po
index df11fea07c0..357e83e2bcf 100644
--- a/addons/web/i18n/sq.po
+++ b/addons/web/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:02+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:07+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176
diff --git a/addons/web/i18n/sr@latin.po b/addons/web/i18n/sr@latin.po
index f52bea117d6..9fc0e685c54 100644
--- a/addons/web/i18n/sr@latin.po
+++ b/addons/web/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:08+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176
diff --git a/addons/web/i18n/sv.po b/addons/web/i18n/sv.po
index 64fc3c7e767..db6d9f7ae88 100644
--- a/addons/web/i18n/sv.po
+++ b/addons/web/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:08+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176
diff --git a/addons/web/i18n/tr.po b/addons/web/i18n/tr.po
index 2467938d84d..9c5554bc028 100644
--- a/addons/web/i18n/tr.po
+++ b/addons/web/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:08+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176
diff --git a/addons/web/i18n/uk.po b/addons/web/i18n/uk.po
index 2b981ebf178..553beb5d123 100644
--- a/addons/web/i18n/uk.po
+++ b/addons/web/i18n/uk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:08+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176
diff --git a/addons/web/i18n/zh_CN.po b/addons/web/i18n/zh_CN.po
index 09a7d041b88..e66a5742745 100644
--- a/addons/web/i18n/zh_CN.po
+++ b/addons/web/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-07 04:55+0000\n"
-"X-Generator: Launchpad (build 16232)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:08+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176
diff --git a/addons/web/i18n/zh_TW.po b/addons/web/i18n/zh_TW.po
index b803a5c04c3..b07bc75ae31 100644
--- a/addons/web/i18n/zh_TW.po
+++ b/addons/web/i18n/zh_TW.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:08+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176
diff --git a/addons/web_calendar/i18n/ar.po b/addons/web_calendar/i18n/ar.po
index ab2b44e8c0f..f9241ca23d3 100644
--- a/addons/web_calendar/i18n/ar.po
+++ b/addons/web_calendar/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:08+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:11
diff --git a/addons/web_calendar/i18n/bg.po b/addons/web_calendar/i18n/bg.po
index 1efca8799a5..3fb494c8f3f 100644
--- a/addons/web_calendar/i18n/bg.po
+++ b/addons/web_calendar/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:08+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:11
diff --git a/addons/web_calendar/i18n/bn.po b/addons/web_calendar/i18n/bn.po
index cf1540dcfc8..a520f497700 100644
--- a/addons/web_calendar/i18n/bn.po
+++ b/addons/web_calendar/i18n/bn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:08+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:11
diff --git a/addons/web_calendar/i18n/bs.po b/addons/web_calendar/i18n/bs.po
index 86271e95cf3..5c36cf3c0cc 100644
--- a/addons/web_calendar/i18n/bs.po
+++ b/addons/web_calendar/i18n/bs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:08+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:11
diff --git a/addons/web_calendar/i18n/ca.po b/addons/web_calendar/i18n/ca.po
index 72d9ef16031..af2d7ea63a4 100644
--- a/addons/web_calendar/i18n/ca.po
+++ b/addons/web_calendar/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:08+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:11
diff --git a/addons/web_calendar/i18n/cs.po b/addons/web_calendar/i18n/cs.po
index 66bc1beb88c..5ac3d5d34b3 100644
--- a/addons/web_calendar/i18n/cs.po
+++ b/addons/web_calendar/i18n/cs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:08+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 "X-Poedit-Language: Czech\n"
 
 #. openerp-web
diff --git a/addons/web_calendar/i18n/da.po b/addons/web_calendar/i18n/da.po
index 3e4b334c4c8..aefa989ec61 100644
--- a/addons/web_calendar/i18n/da.po
+++ b/addons/web_calendar/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:08+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:11
diff --git a/addons/web_calendar/i18n/de.po b/addons/web_calendar/i18n/de.po
index df4a364ff1a..384635c1f49 100644
--- a/addons/web_calendar/i18n/de.po
+++ b/addons/web_calendar/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:11
diff --git a/addons/web_calendar/i18n/en_AU.po b/addons/web_calendar/i18n/en_AU.po
index b4e653989a7..a06c829d2a8 100644
--- a/addons/web_calendar/i18n/en_AU.po
+++ b/addons/web_calendar/i18n/en_AU.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:11
diff --git a/addons/web_calendar/i18n/en_GB.po b/addons/web_calendar/i18n/en_GB.po
index 1c4d71479d2..220c92d2e4c 100644
--- a/addons/web_calendar/i18n/en_GB.po
+++ b/addons/web_calendar/i18n/en_GB.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:11
diff --git a/addons/web_calendar/i18n/es.po b/addons/web_calendar/i18n/es.po
index c475d7c85ab..5c8764d16e9 100644
--- a/addons/web_calendar/i18n/es.po
+++ b/addons/web_calendar/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:11
diff --git a/addons/web_calendar/i18n/es_CL.po b/addons/web_calendar/i18n/es_CL.po
index ddc28ac04e8..ed465fa1f9f 100644
--- a/addons/web_calendar/i18n/es_CL.po
+++ b/addons/web_calendar/i18n/es_CL.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:11
diff --git a/addons/web_calendar/i18n/es_CR.po b/addons/web_calendar/i18n/es_CR.po
index 22123fbf838..aa3315ad9ab 100644
--- a/addons/web_calendar/i18n/es_CR.po
+++ b/addons/web_calendar/i18n/es_CR.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 "Language: es\n"
 
 #. openerp-web
diff --git a/addons/web_calendar/i18n/es_EC.po b/addons/web_calendar/i18n/es_EC.po
index 0333a6ac721..120e1181970 100644
--- a/addons/web_calendar/i18n/es_EC.po
+++ b/addons/web_calendar/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:11
diff --git a/addons/web_calendar/i18n/et.po b/addons/web_calendar/i18n/et.po
index b51b759e47b..a6aa0042572 100644
--- a/addons/web_calendar/i18n/et.po
+++ b/addons/web_calendar/i18n/et.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:08+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:11
diff --git a/addons/web_calendar/i18n/eu.po b/addons/web_calendar/i18n/eu.po
index fb4ed997f5d..dbce60de184 100644
--- a/addons/web_calendar/i18n/eu.po
+++ b/addons/web_calendar/i18n/eu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:08+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:11
diff --git a/addons/web_calendar/i18n/fa.po b/addons/web_calendar/i18n/fa.po
index b0120f3ef10..d7c0d87a872 100644
--- a/addons/web_calendar/i18n/fa.po
+++ b/addons/web_calendar/i18n/fa.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:11
diff --git a/addons/web_calendar/i18n/fi.po b/addons/web_calendar/i18n/fi.po
index 01732824cb6..7f9a8163010 100644
--- a/addons/web_calendar/i18n/fi.po
+++ b/addons/web_calendar/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:08+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:11
diff --git a/addons/web_calendar/i18n/fr.po b/addons/web_calendar/i18n/fr.po
index de9875e1eb1..1c11cfc675a 100644
--- a/addons/web_calendar/i18n/fr.po
+++ b/addons/web_calendar/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:08+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:11
diff --git a/addons/web_calendar/i18n/fr_CA.po b/addons/web_calendar/i18n/fr_CA.po
index 97f3f6cba13..4397816f032 100644
--- a/addons/web_calendar/i18n/fr_CA.po
+++ b/addons/web_calendar/i18n/fr_CA.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:11
diff --git a/addons/web_calendar/i18n/gl.po b/addons/web_calendar/i18n/gl.po
index f6990a15bcd..1bbf185bdc2 100644
--- a/addons/web_calendar/i18n/gl.po
+++ b/addons/web_calendar/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:11
diff --git a/addons/web_calendar/i18n/hr.po b/addons/web_calendar/i18n/hr.po
index 3c50d92c7d6..420a7eb1c33 100644
--- a/addons/web_calendar/i18n/hr.po
+++ b/addons/web_calendar/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:11
diff --git a/addons/web_calendar/i18n/hu.po b/addons/web_calendar/i18n/hu.po
index 97ff16d5b51..a7711c4020a 100644
--- a/addons/web_calendar/i18n/hu.po
+++ b/addons/web_calendar/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:11
diff --git a/addons/web_calendar/i18n/id.po b/addons/web_calendar/i18n/id.po
index d1525772a40..e6de231635a 100644
--- a/addons/web_calendar/i18n/id.po
+++ b/addons/web_calendar/i18n/id.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:11
diff --git a/addons/web_calendar/i18n/it.po b/addons/web_calendar/i18n/it.po
index 28758fc6086..a857dee48f8 100644
--- a/addons/web_calendar/i18n/it.po
+++ b/addons/web_calendar/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:11
diff --git a/addons/web_calendar/i18n/ja.po b/addons/web_calendar/i18n/ja.po
index b13351a6d0e..65e1890e1c7 100644
--- a/addons/web_calendar/i18n/ja.po
+++ b/addons/web_calendar/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:11
diff --git a/addons/web_calendar/i18n/ka.po b/addons/web_calendar/i18n/ka.po
index 71f560182fc..c6639155ad4 100644
--- a/addons/web_calendar/i18n/ka.po
+++ b/addons/web_calendar/i18n/ka.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:08+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:11
diff --git a/addons/web_calendar/i18n/lt.po b/addons/web_calendar/i18n/lt.po
index b506033dd29..de38e7437c7 100644
--- a/addons/web_calendar/i18n/lt.po
+++ b/addons/web_calendar/i18n/lt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-22 04:46+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:11
diff --git a/addons/web_calendar/i18n/mk.po b/addons/web_calendar/i18n/mk.po
index f6121903251..83616520f79 100644
--- a/addons/web_calendar/i18n/mk.po
+++ b/addons/web_calendar/i18n/mk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:11
diff --git a/addons/web_calendar/i18n/mn.po b/addons/web_calendar/i18n/mn.po
index 5dbfd1146c5..f12b785fee7 100644
--- a/addons/web_calendar/i18n/mn.po
+++ b/addons/web_calendar/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:11
diff --git a/addons/web_calendar/i18n/nb.po b/addons/web_calendar/i18n/nb.po
index 1bfd031fdca..151abb46415 100644
--- a/addons/web_calendar/i18n/nb.po
+++ b/addons/web_calendar/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:11
diff --git a/addons/web_calendar/i18n/nl.po b/addons/web_calendar/i18n/nl.po
index f85a54d90a8..855f44d7ec8 100644
--- a/addons/web_calendar/i18n/nl.po
+++ b/addons/web_calendar/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:08+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:11
diff --git a/addons/web_calendar/i18n/nl_BE.po b/addons/web_calendar/i18n/nl_BE.po
index 25fc24a3121..6420eb49047 100644
--- a/addons/web_calendar/i18n/nl_BE.po
+++ b/addons/web_calendar/i18n/nl_BE.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:11
diff --git a/addons/web_calendar/i18n/pl.po b/addons/web_calendar/i18n/pl.po
index 75d984ec95a..53066f91e89 100644
--- a/addons/web_calendar/i18n/pl.po
+++ b/addons/web_calendar/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:11
diff --git a/addons/web_calendar/i18n/pt.po b/addons/web_calendar/i18n/pt.po
index 316e2886ebf..8c5762714de 100644
--- a/addons/web_calendar/i18n/pt.po
+++ b/addons/web_calendar/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:11
diff --git a/addons/web_calendar/i18n/pt_BR.po b/addons/web_calendar/i18n/pt_BR.po
index fd1c6800f69..075f9c3cc52 100644
--- a/addons/web_calendar/i18n/pt_BR.po
+++ b/addons/web_calendar/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:11
diff --git a/addons/web_calendar/i18n/ro.po b/addons/web_calendar/i18n/ro.po
index f2be8570780..0b1be890e7e 100644
--- a/addons/web_calendar/i18n/ro.po
+++ b/addons/web_calendar/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:11
diff --git a/addons/web_calendar/i18n/ru.po b/addons/web_calendar/i18n/ru.po
index c286c58bf1a..3f9cccf8b21 100644
--- a/addons/web_calendar/i18n/ru.po
+++ b/addons/web_calendar/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-24 05:20+0000\n"
-"X-Generator: Launchpad (build 16179)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:11
diff --git a/addons/web_calendar/i18n/sk.po b/addons/web_calendar/i18n/sk.po
index 10eaa327715..ccc7f62c3a3 100644
--- a/addons/web_calendar/i18n/sk.po
+++ b/addons/web_calendar/i18n/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:11
diff --git a/addons/web_calendar/i18n/sl.po b/addons/web_calendar/i18n/sl.po
index 550fafc22d4..0dce08c77f4 100644
--- a/addons/web_calendar/i18n/sl.po
+++ b/addons/web_calendar/i18n/sl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-02 05:20+0000\n"
-"X-Generator: Launchpad (build 16218)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:11
diff --git a/addons/web_calendar/i18n/sq.po b/addons/web_calendar/i18n/sq.po
index 6dc15299697..a53cf945075 100644
--- a/addons/web_calendar/i18n/sq.po
+++ b/addons/web_calendar/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:08+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:11
diff --git a/addons/web_calendar/i18n/sr@latin.po b/addons/web_calendar/i18n/sr@latin.po
index d798c8d29c0..d5229958f93 100644
--- a/addons/web_calendar/i18n/sr@latin.po
+++ b/addons/web_calendar/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:11
diff --git a/addons/web_calendar/i18n/sv.po b/addons/web_calendar/i18n/sv.po
index e6e72691141..fee033889cc 100644
--- a/addons/web_calendar/i18n/sv.po
+++ b/addons/web_calendar/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:11
diff --git a/addons/web_calendar/i18n/tr.po b/addons/web_calendar/i18n/tr.po
index d429fbde854..0b06085aed8 100644
--- a/addons/web_calendar/i18n/tr.po
+++ b/addons/web_calendar/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:11
diff --git a/addons/web_calendar/i18n/uk.po b/addons/web_calendar/i18n/uk.po
index 8ae70eb2f77..4f8c91ed43f 100644
--- a/addons/web_calendar/i18n/uk.po
+++ b/addons/web_calendar/i18n/uk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:11
diff --git a/addons/web_calendar/i18n/zh_CN.po b/addons/web_calendar/i18n/zh_CN.po
index 134091e9d64..eda04768775 100644
--- a/addons/web_calendar/i18n/zh_CN.po
+++ b/addons/web_calendar/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:11
diff --git a/addons/web_diagram/i18n/ar.po b/addons/web_diagram/i18n/ar.po
index b2854ec93c6..4830e2a9572 100644
--- a/addons/web_diagram/i18n/ar.po
+++ b/addons/web_diagram/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_diagram/static/src/js/diagram.js:11
diff --git a/addons/web_diagram/i18n/bg.po b/addons/web_diagram/i18n/bg.po
index cd73e4d4628..bbe9d04d00f 100644
--- a/addons/web_diagram/i18n/bg.po
+++ b/addons/web_diagram/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_diagram/static/src/js/diagram.js:11
diff --git a/addons/web_diagram/i18n/bn.po b/addons/web_diagram/i18n/bn.po
index cb8d8b712c4..7af98d96e18 100644
--- a/addons/web_diagram/i18n/bn.po
+++ b/addons/web_diagram/i18n/bn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_diagram/static/src/js/diagram.js:11
diff --git a/addons/web_diagram/i18n/bs.po b/addons/web_diagram/i18n/bs.po
index 78b776e129d..b2173f2d278 100644
--- a/addons/web_diagram/i18n/bs.po
+++ b/addons/web_diagram/i18n/bs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_diagram/static/src/js/diagram.js:11
diff --git a/addons/web_diagram/i18n/ca.po b/addons/web_diagram/i18n/ca.po
index f835a46149c..980bb73c187 100644
--- a/addons/web_diagram/i18n/ca.po
+++ b/addons/web_diagram/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_diagram/static/src/js/diagram.js:11
diff --git a/addons/web_diagram/i18n/cs.po b/addons/web_diagram/i18n/cs.po
index 59b05ca204c..e2beae2bc3e 100644
--- a/addons/web_diagram/i18n/cs.po
+++ b/addons/web_diagram/i18n/cs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 "X-Poedit-Language: Czech\n"
 
 #. openerp-web
diff --git a/addons/web_diagram/i18n/da.po b/addons/web_diagram/i18n/da.po
index 38cc3c33f5a..99d6694387e 100644
--- a/addons/web_diagram/i18n/da.po
+++ b/addons/web_diagram/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_diagram/static/src/js/diagram.js:11
diff --git a/addons/web_diagram/i18n/de.po b/addons/web_diagram/i18n/de.po
index 0572c893571..02f01c0a298 100644
--- a/addons/web_diagram/i18n/de.po
+++ b/addons/web_diagram/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_diagram/static/src/js/diagram.js:11
diff --git a/addons/web_diagram/i18n/en_GB.po b/addons/web_diagram/i18n/en_GB.po
index 9a1de1ff09a..f45a36ebfec 100644
--- a/addons/web_diagram/i18n/en_GB.po
+++ b/addons/web_diagram/i18n/en_GB.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_diagram/static/src/js/diagram.js:11
diff --git a/addons/web_diagram/i18n/es.po b/addons/web_diagram/i18n/es.po
index 57bee045a52..1127f66ac32 100644
--- a/addons/web_diagram/i18n/es.po
+++ b/addons/web_diagram/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_diagram/static/src/js/diagram.js:11
diff --git a/addons/web_diagram/i18n/es_CL.po b/addons/web_diagram/i18n/es_CL.po
index ca18b98d811..0cd2218ad58 100644
--- a/addons/web_diagram/i18n/es_CL.po
+++ b/addons/web_diagram/i18n/es_CL.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_diagram/static/src/js/diagram.js:11
diff --git a/addons/web_diagram/i18n/es_CR.po b/addons/web_diagram/i18n/es_CR.po
index cb952c8d76d..853ed64e10c 100644
--- a/addons/web_diagram/i18n/es_CR.po
+++ b/addons/web_diagram/i18n/es_CR.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 "Language: es\n"
 
 #. openerp-web
diff --git a/addons/web_diagram/i18n/es_EC.po b/addons/web_diagram/i18n/es_EC.po
index 64122e572d9..9d12b54ad84 100644
--- a/addons/web_diagram/i18n/es_EC.po
+++ b/addons/web_diagram/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_diagram/static/src/js/diagram.js:11
diff --git a/addons/web_diagram/i18n/et.po b/addons/web_diagram/i18n/et.po
index 3b16af5630b..a91455e4f4c 100644
--- a/addons/web_diagram/i18n/et.po
+++ b/addons/web_diagram/i18n/et.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_diagram/static/src/js/diagram.js:11
diff --git a/addons/web_diagram/i18n/fa.po b/addons/web_diagram/i18n/fa.po
index cf23a8270ef..5e11f131796 100644
--- a/addons/web_diagram/i18n/fa.po
+++ b/addons/web_diagram/i18n/fa.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_diagram/static/src/js/diagram.js:11
diff --git a/addons/web_diagram/i18n/fi.po b/addons/web_diagram/i18n/fi.po
index 43dd28e6408..313dc4df75a 100644
--- a/addons/web_diagram/i18n/fi.po
+++ b/addons/web_diagram/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_diagram/static/src/js/diagram.js:11
diff --git a/addons/web_diagram/i18n/fr.po b/addons/web_diagram/i18n/fr.po
index 775b01c4c79..28555736c81 100644
--- a/addons/web_diagram/i18n/fr.po
+++ b/addons/web_diagram/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_diagram/static/src/js/diagram.js:11
diff --git a/addons/web_diagram/i18n/gl.po b/addons/web_diagram/i18n/gl.po
index c4db0075c79..c09f8dcf150 100644
--- a/addons/web_diagram/i18n/gl.po
+++ b/addons/web_diagram/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_diagram/static/src/js/diagram.js:11
diff --git a/addons/web_diagram/i18n/hr.po b/addons/web_diagram/i18n/hr.po
index 416c3465db6..b2ecdefe05c 100644
--- a/addons/web_diagram/i18n/hr.po
+++ b/addons/web_diagram/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_diagram/static/src/js/diagram.js:11
diff --git a/addons/web_diagram/i18n/id.po b/addons/web_diagram/i18n/id.po
index 2754693c6ac..ad64db2b7dc 100644
--- a/addons/web_diagram/i18n/id.po
+++ b/addons/web_diagram/i18n/id.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_diagram/static/src/js/diagram.js:11
diff --git a/addons/web_diagram/i18n/it.po b/addons/web_diagram/i18n/it.po
index 6d0de20c705..d61a1bed790 100644
--- a/addons/web_diagram/i18n/it.po
+++ b/addons/web_diagram/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_diagram/static/src/js/diagram.js:11
diff --git a/addons/web_diagram/i18n/ja.po b/addons/web_diagram/i18n/ja.po
index ec31f0d22a0..df4aa38e9b4 100644
--- a/addons/web_diagram/i18n/ja.po
+++ b/addons/web_diagram/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_diagram/static/src/js/diagram.js:11
diff --git a/addons/web_diagram/i18n/ka.po b/addons/web_diagram/i18n/ka.po
index fd549ad47b6..23fe83c5ede 100644
--- a/addons/web_diagram/i18n/ka.po
+++ b/addons/web_diagram/i18n/ka.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_diagram/static/src/js/diagram.js:11
diff --git a/addons/web_diagram/i18n/lt.po b/addons/web_diagram/i18n/lt.po
index 0d7eb1b2f38..69e24c3d916 100644
--- a/addons/web_diagram/i18n/lt.po
+++ b/addons/web_diagram/i18n/lt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-22 04:46+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_diagram/static/src/js/diagram.js:11
diff --git a/addons/web_diagram/i18n/mn.po b/addons/web_diagram/i18n/mn.po
index 538bd4086ad..5f8eae9ae47 100644
--- a/addons/web_diagram/i18n/mn.po
+++ b/addons/web_diagram/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_diagram/static/src/js/diagram.js:11
diff --git a/addons/web_diagram/i18n/nl.po b/addons/web_diagram/i18n/nl.po
index f04fa3d2ad7..601d2bde471 100644
--- a/addons/web_diagram/i18n/nl.po
+++ b/addons/web_diagram/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_diagram/static/src/js/diagram.js:11
diff --git a/addons/web_diagram/i18n/nl_BE.po b/addons/web_diagram/i18n/nl_BE.po
index e612f2989b1..4b46f5eb164 100644
--- a/addons/web_diagram/i18n/nl_BE.po
+++ b/addons/web_diagram/i18n/nl_BE.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_diagram/static/src/js/diagram.js:11
diff --git a/addons/web_diagram/i18n/pl.po b/addons/web_diagram/i18n/pl.po
index 1050e73f775..0c6a4a21b1e 100644
--- a/addons/web_diagram/i18n/pl.po
+++ b/addons/web_diagram/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_diagram/static/src/js/diagram.js:11
diff --git a/addons/web_diagram/i18n/pt.po b/addons/web_diagram/i18n/pt.po
index e666dd56ae0..838ac158e93 100644
--- a/addons/web_diagram/i18n/pt.po
+++ b/addons/web_diagram/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_diagram/static/src/js/diagram.js:11
diff --git a/addons/web_diagram/i18n/pt_BR.po b/addons/web_diagram/i18n/pt_BR.po
index c3d2bf290bb..1cd50b59da6 100644
--- a/addons/web_diagram/i18n/pt_BR.po
+++ b/addons/web_diagram/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_diagram/static/src/js/diagram.js:11
diff --git a/addons/web_diagram/i18n/ro.po b/addons/web_diagram/i18n/ro.po
index 8c5dc473e43..e191e16675a 100644
--- a/addons/web_diagram/i18n/ro.po
+++ b/addons/web_diagram/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_diagram/static/src/js/diagram.js:11
diff --git a/addons/web_diagram/i18n/ru.po b/addons/web_diagram/i18n/ru.po
index 14062840b2f..274a99a3eb6 100644
--- a/addons/web_diagram/i18n/ru.po
+++ b/addons/web_diagram/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-26 05:19+0000\n"
-"X-Generator: Launchpad (build 16194)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_diagram/static/src/js/diagram.js:11
diff --git a/addons/web_diagram/i18n/sl.po b/addons/web_diagram/i18n/sl.po
index 37b554a2754..eafb11b74eb 100644
--- a/addons/web_diagram/i18n/sl.po
+++ b/addons/web_diagram/i18n/sl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_diagram/static/src/js/diagram.js:11
diff --git a/addons/web_diagram/i18n/sq.po b/addons/web_diagram/i18n/sq.po
index d8191d79db2..c6e8dd1536e 100644
--- a/addons/web_diagram/i18n/sq.po
+++ b/addons/web_diagram/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_diagram/static/src/js/diagram.js:11
diff --git a/addons/web_diagram/i18n/sr@latin.po b/addons/web_diagram/i18n/sr@latin.po
index 06bf0eccafb..7ff90bf1a58 100644
--- a/addons/web_diagram/i18n/sr@latin.po
+++ b/addons/web_diagram/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_diagram/static/src/js/diagram.js:11
diff --git a/addons/web_diagram/i18n/sv.po b/addons/web_diagram/i18n/sv.po
index 97fba58992f..de325566358 100644
--- a/addons/web_diagram/i18n/sv.po
+++ b/addons/web_diagram/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_diagram/static/src/js/diagram.js:11
diff --git a/addons/web_diagram/i18n/tr.po b/addons/web_diagram/i18n/tr.po
index a3c2b3f1ccb..ae6e8c92859 100644
--- a/addons/web_diagram/i18n/tr.po
+++ b/addons/web_diagram/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_diagram/static/src/js/diagram.js:11
diff --git a/addons/web_diagram/i18n/zh_CN.po b/addons/web_diagram/i18n/zh_CN.po
index a30f45d11c2..355d6bb98d9 100644
--- a/addons/web_diagram/i18n/zh_CN.po
+++ b/addons/web_diagram/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_diagram/static/src/js/diagram.js:11
diff --git a/addons/web_gantt/i18n/ar.po b/addons/web_gantt/i18n/ar.po
index e9ad745a76e..efc1fe00bec 100644
--- a/addons/web_gantt/i18n/ar.po
+++ b/addons/web_gantt/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_gantt/static/src/js/gantt.js:11
diff --git a/addons/web_gantt/i18n/bg.po b/addons/web_gantt/i18n/bg.po
index 23976f96791..21aab3a1f0c 100644
--- a/addons/web_gantt/i18n/bg.po
+++ b/addons/web_gantt/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_gantt/static/src/js/gantt.js:11
diff --git a/addons/web_gantt/i18n/bn.po b/addons/web_gantt/i18n/bn.po
index c2f60c8d625..c6bb1af2553 100644
--- a/addons/web_gantt/i18n/bn.po
+++ b/addons/web_gantt/i18n/bn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_gantt/static/src/js/gantt.js:11
diff --git a/addons/web_gantt/i18n/bs.po b/addons/web_gantt/i18n/bs.po
index 175bc84cf5c..e6434dc0b2e 100644
--- a/addons/web_gantt/i18n/bs.po
+++ b/addons/web_gantt/i18n/bs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_gantt/static/src/js/gantt.js:11
diff --git a/addons/web_gantt/i18n/ca.po b/addons/web_gantt/i18n/ca.po
index dd4c08c9b50..b7a907a44ad 100644
--- a/addons/web_gantt/i18n/ca.po
+++ b/addons/web_gantt/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_gantt/static/src/js/gantt.js:11
diff --git a/addons/web_gantt/i18n/cs.po b/addons/web_gantt/i18n/cs.po
index 6e57eebe539..1d1bca8db86 100644
--- a/addons/web_gantt/i18n/cs.po
+++ b/addons/web_gantt/i18n/cs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 "X-Poedit-Language: Czech\n"
 
 #. openerp-web
diff --git a/addons/web_gantt/i18n/da.po b/addons/web_gantt/i18n/da.po
index 92d9e8f6bb3..6096374d6ac 100644
--- a/addons/web_gantt/i18n/da.po
+++ b/addons/web_gantt/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_gantt/static/src/js/gantt.js:11
diff --git a/addons/web_gantt/i18n/de.po b/addons/web_gantt/i18n/de.po
index f8f5b69470a..29e8ae0b15f 100644
--- a/addons/web_gantt/i18n/de.po
+++ b/addons/web_gantt/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_gantt/static/src/js/gantt.js:11
diff --git a/addons/web_gantt/i18n/en_AU.po b/addons/web_gantt/i18n/en_AU.po
index 595d3fc734b..9b50d740fe2 100644
--- a/addons/web_gantt/i18n/en_AU.po
+++ b/addons/web_gantt/i18n/en_AU.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_gantt/static/src/js/gantt.js:11
diff --git a/addons/web_gantt/i18n/en_GB.po b/addons/web_gantt/i18n/en_GB.po
index 9c1d2cc5ec7..c211b69f7d3 100644
--- a/addons/web_gantt/i18n/en_GB.po
+++ b/addons/web_gantt/i18n/en_GB.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_gantt/static/src/js/gantt.js:11
diff --git a/addons/web_gantt/i18n/es.po b/addons/web_gantt/i18n/es.po
index fb6ed0101a1..0082b7c5548 100644
--- a/addons/web_gantt/i18n/es.po
+++ b/addons/web_gantt/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_gantt/static/src/js/gantt.js:11
diff --git a/addons/web_gantt/i18n/es_CL.po b/addons/web_gantt/i18n/es_CL.po
index a472a7a1485..532c5c7e70a 100644
--- a/addons/web_gantt/i18n/es_CL.po
+++ b/addons/web_gantt/i18n/es_CL.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_gantt/static/src/js/gantt.js:11
diff --git a/addons/web_gantt/i18n/es_CR.po b/addons/web_gantt/i18n/es_CR.po
index fe29c2995f5..668df147118 100644
--- a/addons/web_gantt/i18n/es_CR.po
+++ b/addons/web_gantt/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_gantt/static/src/js/gantt.js:11
diff --git a/addons/web_gantt/i18n/es_EC.po b/addons/web_gantt/i18n/es_EC.po
index c1735a3dd8b..239f4aaabdf 100644
--- a/addons/web_gantt/i18n/es_EC.po
+++ b/addons/web_gantt/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_gantt/static/src/js/gantt.js:11
diff --git a/addons/web_gantt/i18n/fa.po b/addons/web_gantt/i18n/fa.po
index 86a25319f47..e34e1f663a1 100644
--- a/addons/web_gantt/i18n/fa.po
+++ b/addons/web_gantt/i18n/fa.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_gantt/static/src/js/gantt.js:11
diff --git a/addons/web_gantt/i18n/fi.po b/addons/web_gantt/i18n/fi.po
index 268f133941d..1f9c20703e4 100644
--- a/addons/web_gantt/i18n/fi.po
+++ b/addons/web_gantt/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_gantt/static/src/js/gantt.js:11
diff --git a/addons/web_gantt/i18n/fr.po b/addons/web_gantt/i18n/fr.po
index 5b0fadbf06a..2c3ef92e2db 100644
--- a/addons/web_gantt/i18n/fr.po
+++ b/addons/web_gantt/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_gantt/static/src/js/gantt.js:11
diff --git a/addons/web_gantt/i18n/gl.po b/addons/web_gantt/i18n/gl.po
index 8624ee7a069..4ab201938cd 100644
--- a/addons/web_gantt/i18n/gl.po
+++ b/addons/web_gantt/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_gantt/static/src/js/gantt.js:11
diff --git a/addons/web_gantt/i18n/hr.po b/addons/web_gantt/i18n/hr.po
index 5d9863412ca..e9694fdb382 100644
--- a/addons/web_gantt/i18n/hr.po
+++ b/addons/web_gantt/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_gantt/static/src/js/gantt.js:11
diff --git a/addons/web_gantt/i18n/hu.po b/addons/web_gantt/i18n/hu.po
index 04343f07b7c..fd289446d7f 100644
--- a/addons/web_gantt/i18n/hu.po
+++ b/addons/web_gantt/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_gantt/static/src/js/gantt.js:11
diff --git a/addons/web_gantt/i18n/it.po b/addons/web_gantt/i18n/it.po
index 44392f14b66..17f5759ecfd 100644
--- a/addons/web_gantt/i18n/it.po
+++ b/addons/web_gantt/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_gantt/static/src/js/gantt.js:11
diff --git a/addons/web_gantt/i18n/ja.po b/addons/web_gantt/i18n/ja.po
index 251322ebf3d..9a02f165279 100644
--- a/addons/web_gantt/i18n/ja.po
+++ b/addons/web_gantt/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_gantt/static/src/js/gantt.js:11
diff --git a/addons/web_gantt/i18n/ka.po b/addons/web_gantt/i18n/ka.po
index 5e8bb8a4a5f..9d2f65285cd 100644
--- a/addons/web_gantt/i18n/ka.po
+++ b/addons/web_gantt/i18n/ka.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_gantt/static/src/js/gantt.js:11
diff --git a/addons/web_gantt/i18n/lt.po b/addons/web_gantt/i18n/lt.po
index 6310962c04e..99905322c04 100644
--- a/addons/web_gantt/i18n/lt.po
+++ b/addons/web_gantt/i18n/lt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-22 04:46+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_gantt/static/src/js/gantt.js:11
diff --git a/addons/web_gantt/i18n/mk.po b/addons/web_gantt/i18n/mk.po
index 2e7cb554db6..018a2a3b16c 100644
--- a/addons/web_gantt/i18n/mk.po
+++ b/addons/web_gantt/i18n/mk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_gantt/static/src/js/gantt.js:11
diff --git a/addons/web_gantt/i18n/mn.po b/addons/web_gantt/i18n/mn.po
index 6f42fb9e495..d2c8da8e22f 100644
--- a/addons/web_gantt/i18n/mn.po
+++ b/addons/web_gantt/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_gantt/static/src/js/gantt.js:11
diff --git a/addons/web_gantt/i18n/nb.po b/addons/web_gantt/i18n/nb.po
index b9f50c24a7c..501581bcb04 100644
--- a/addons/web_gantt/i18n/nb.po
+++ b/addons/web_gantt/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_gantt/static/src/js/gantt.js:11
diff --git a/addons/web_gantt/i18n/nl.po b/addons/web_gantt/i18n/nl.po
index 1f22a510595..795da258259 100644
--- a/addons/web_gantt/i18n/nl.po
+++ b/addons/web_gantt/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_gantt/static/src/js/gantt.js:11
diff --git a/addons/web_gantt/i18n/nl_BE.po b/addons/web_gantt/i18n/nl_BE.po
index ad943f78869..29639d63418 100644
--- a/addons/web_gantt/i18n/nl_BE.po
+++ b/addons/web_gantt/i18n/nl_BE.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_gantt/static/src/js/gantt.js:11
diff --git a/addons/web_gantt/i18n/pl.po b/addons/web_gantt/i18n/pl.po
index e92010a58c3..8861a13adfd 100644
--- a/addons/web_gantt/i18n/pl.po
+++ b/addons/web_gantt/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_gantt/static/src/js/gantt.js:11
diff --git a/addons/web_gantt/i18n/pt.po b/addons/web_gantt/i18n/pt.po
index 308b740582d..580380da267 100644
--- a/addons/web_gantt/i18n/pt.po
+++ b/addons/web_gantt/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_gantt/static/src/js/gantt.js:11
diff --git a/addons/web_gantt/i18n/pt_BR.po b/addons/web_gantt/i18n/pt_BR.po
index 361fab71df7..72b9f5724ee 100644
--- a/addons/web_gantt/i18n/pt_BR.po
+++ b/addons/web_gantt/i18n/pt_BR.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_gantt/static/src/js/gantt.js:11
diff --git a/addons/web_gantt/i18n/ro.po b/addons/web_gantt/i18n/ro.po
index 262084e175b..1fe6e2d2c72 100644
--- a/addons/web_gantt/i18n/ro.po
+++ b/addons/web_gantt/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_gantt/static/src/js/gantt.js:11
diff --git a/addons/web_gantt/i18n/ru.po b/addons/web_gantt/i18n/ru.po
index 43c6170f691..32d3b90e36b 100644
--- a/addons/web_gantt/i18n/ru.po
+++ b/addons/web_gantt/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_gantt/static/src/js/gantt.js:11
diff --git a/addons/web_gantt/i18n/sl.po b/addons/web_gantt/i18n/sl.po
index 007ef01e8ca..f26f72b7b43 100644
--- a/addons/web_gantt/i18n/sl.po
+++ b/addons/web_gantt/i18n/sl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_gantt/static/src/js/gantt.js:11
diff --git a/addons/web_gantt/i18n/sq.po b/addons/web_gantt/i18n/sq.po
index d9998290592..f514a0c2728 100644
--- a/addons/web_gantt/i18n/sq.po
+++ b/addons/web_gantt/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_gantt/static/src/js/gantt.js:11
diff --git a/addons/web_gantt/i18n/sr@latin.po b/addons/web_gantt/i18n/sr@latin.po
index c7049eb9c9f..12eae1b5924 100644
--- a/addons/web_gantt/i18n/sr@latin.po
+++ b/addons/web_gantt/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_gantt/static/src/js/gantt.js:11
diff --git a/addons/web_gantt/i18n/sv.po b/addons/web_gantt/i18n/sv.po
index 547c50ac571..1dd0aa4086e 100644
--- a/addons/web_gantt/i18n/sv.po
+++ b/addons/web_gantt/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_gantt/static/src/js/gantt.js:11
diff --git a/addons/web_gantt/i18n/tr.po b/addons/web_gantt/i18n/tr.po
index ce2779e23ae..70dea5797c2 100644
--- a/addons/web_gantt/i18n/tr.po
+++ b/addons/web_gantt/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_gantt/static/src/js/gantt.js:11
diff --git a/addons/web_gantt/i18n/zh_CN.po b/addons/web_gantt/i18n/zh_CN.po
index e8739bf81ac..7e0a75f9387 100644
--- a/addons/web_gantt/i18n/zh_CN.po
+++ b/addons/web_gantt/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_gantt/static/src/js/gantt.js:11
diff --git a/addons/web_graph/i18n/ar.po b/addons/web_graph/i18n/ar.po
index 3150b37d553..f4673c7eb0d 100644
--- a/addons/web_graph/i18n/ar.po
+++ b/addons/web_graph/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_graph/static/src/js/graph.js:19
diff --git a/addons/web_graph/i18n/bg.po b/addons/web_graph/i18n/bg.po
index 6aab3ad70b7..f53d8f2e766 100644
--- a/addons/web_graph/i18n/bg.po
+++ b/addons/web_graph/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_graph/static/src/js/graph.js:19
diff --git a/addons/web_graph/i18n/bn.po b/addons/web_graph/i18n/bn.po
index b19bfaf8fff..7ae977e2463 100644
--- a/addons/web_graph/i18n/bn.po
+++ b/addons/web_graph/i18n/bn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_graph/static/src/js/graph.js:19
diff --git a/addons/web_graph/i18n/bs.po b/addons/web_graph/i18n/bs.po
index d5bf94fc711..0ad1e813651 100644
--- a/addons/web_graph/i18n/bs.po
+++ b/addons/web_graph/i18n/bs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_graph/static/src/js/graph.js:19
diff --git a/addons/web_graph/i18n/ca.po b/addons/web_graph/i18n/ca.po
index 370b3190749..6e3328d6fa6 100644
--- a/addons/web_graph/i18n/ca.po
+++ b/addons/web_graph/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_graph/static/src/js/graph.js:19
diff --git a/addons/web_graph/i18n/cs.po b/addons/web_graph/i18n/cs.po
index 9f216542bc0..e2a375305c9 100644
--- a/addons/web_graph/i18n/cs.po
+++ b/addons/web_graph/i18n/cs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_graph/static/src/js/graph.js:19
diff --git a/addons/web_graph/i18n/da.po b/addons/web_graph/i18n/da.po
index 6c1a477a417..bce5117670f 100644
--- a/addons/web_graph/i18n/da.po
+++ b/addons/web_graph/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_graph/static/src/js/graph.js:19
diff --git a/addons/web_graph/i18n/de.po b/addons/web_graph/i18n/de.po
index ec6a4d249e3..004eaad2c94 100644
--- a/addons/web_graph/i18n/de.po
+++ b/addons/web_graph/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_graph/static/src/js/graph.js:19
diff --git a/addons/web_graph/i18n/en_AU.po b/addons/web_graph/i18n/en_AU.po
index f89a24e1332..23da37b7f15 100644
--- a/addons/web_graph/i18n/en_AU.po
+++ b/addons/web_graph/i18n/en_AU.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_graph/static/src/js/graph.js:19
diff --git a/addons/web_graph/i18n/en_GB.po b/addons/web_graph/i18n/en_GB.po
index 70e0a38837f..6ce1fd26bef 100644
--- a/addons/web_graph/i18n/en_GB.po
+++ b/addons/web_graph/i18n/en_GB.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_graph/static/src/js/graph.js:19
diff --git a/addons/web_graph/i18n/es.po b/addons/web_graph/i18n/es.po
index 0b23d1a7052..8ad576a49ea 100644
--- a/addons/web_graph/i18n/es.po
+++ b/addons/web_graph/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_graph/static/src/js/graph.js:19
diff --git a/addons/web_graph/i18n/es_CL.po b/addons/web_graph/i18n/es_CL.po
index 5588bd39e9b..f3235627451 100644
--- a/addons/web_graph/i18n/es_CL.po
+++ b/addons/web_graph/i18n/es_CL.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_graph/static/src/js/graph.js:19
diff --git a/addons/web_graph/i18n/es_CR.po b/addons/web_graph/i18n/es_CR.po
index 28cd92a1bdf..e26959c1b36 100644
--- a/addons/web_graph/i18n/es_CR.po
+++ b/addons/web_graph/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_graph/static/src/js/graph.js:19
diff --git a/addons/web_graph/i18n/es_EC.po b/addons/web_graph/i18n/es_EC.po
index e4b016a8a3d..9a137d32e74 100644
--- a/addons/web_graph/i18n/es_EC.po
+++ b/addons/web_graph/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_graph/static/src/js/graph.js:19
diff --git a/addons/web_graph/i18n/fa.po b/addons/web_graph/i18n/fa.po
index 1d9ba33c635..70e66f3bed7 100644
--- a/addons/web_graph/i18n/fa.po
+++ b/addons/web_graph/i18n/fa.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_graph/static/src/js/graph.js:19
diff --git a/addons/web_graph/i18n/fi.po b/addons/web_graph/i18n/fi.po
index 1588337b41c..ef55e2f3353 100644
--- a/addons/web_graph/i18n/fi.po
+++ b/addons/web_graph/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_graph/static/src/js/graph.js:19
diff --git a/addons/web_graph/i18n/fr.po b/addons/web_graph/i18n/fr.po
index 9e07304a87d..6d4cf6f63a1 100644
--- a/addons/web_graph/i18n/fr.po
+++ b/addons/web_graph/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_graph/static/src/js/graph.js:19
diff --git a/addons/web_graph/i18n/gl.po b/addons/web_graph/i18n/gl.po
index 5d89c5e7a7a..b83edaa0003 100644
--- a/addons/web_graph/i18n/gl.po
+++ b/addons/web_graph/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_graph/static/src/js/graph.js:19
diff --git a/addons/web_graph/i18n/hr.po b/addons/web_graph/i18n/hr.po
index f42d955f760..13c509d2824 100644
--- a/addons/web_graph/i18n/hr.po
+++ b/addons/web_graph/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_graph/static/src/js/graph.js:19
diff --git a/addons/web_graph/i18n/hu.po b/addons/web_graph/i18n/hu.po
index 7c401a38d11..b6ae8e819ea 100644
--- a/addons/web_graph/i18n/hu.po
+++ b/addons/web_graph/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_graph/static/src/js/graph.js:19
diff --git a/addons/web_graph/i18n/it.po b/addons/web_graph/i18n/it.po
index 3c297f69fea..c93b1893e9c 100644
--- a/addons/web_graph/i18n/it.po
+++ b/addons/web_graph/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_graph/static/src/js/graph.js:19
diff --git a/addons/web_graph/i18n/ja.po b/addons/web_graph/i18n/ja.po
index e2328b4107a..d79e3780ed2 100644
--- a/addons/web_graph/i18n/ja.po
+++ b/addons/web_graph/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_graph/static/src/js/graph.js:19
diff --git a/addons/web_graph/i18n/ka.po b/addons/web_graph/i18n/ka.po
index f01c0ae5f99..2ba2b591c5f 100644
--- a/addons/web_graph/i18n/ka.po
+++ b/addons/web_graph/i18n/ka.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_graph/static/src/js/graph.js:19
diff --git a/addons/web_graph/i18n/lt.po b/addons/web_graph/i18n/lt.po
index ad566156e26..3cb8e482d6e 100644
--- a/addons/web_graph/i18n/lt.po
+++ b/addons/web_graph/i18n/lt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-22 04:46+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_graph/static/src/js/graph.js:19
diff --git a/addons/web_graph/i18n/mk.po b/addons/web_graph/i18n/mk.po
index 502b1ccf3ff..279cfc26e1c 100644
--- a/addons/web_graph/i18n/mk.po
+++ b/addons/web_graph/i18n/mk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_graph/static/src/js/graph.js:19
diff --git a/addons/web_graph/i18n/mn.po b/addons/web_graph/i18n/mn.po
index 6f1a85b3526..c454eb74a17 100644
--- a/addons/web_graph/i18n/mn.po
+++ b/addons/web_graph/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_graph/static/src/js/graph.js:19
diff --git a/addons/web_graph/i18n/nl.po b/addons/web_graph/i18n/nl.po
index 66526cb0d63..19360ad4092 100644
--- a/addons/web_graph/i18n/nl.po
+++ b/addons/web_graph/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_graph/static/src/js/graph.js:19
diff --git a/addons/web_graph/i18n/nl_BE.po b/addons/web_graph/i18n/nl_BE.po
index 59a936a06b2..b8adf273d37 100644
--- a/addons/web_graph/i18n/nl_BE.po
+++ b/addons/web_graph/i18n/nl_BE.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_graph/static/src/js/graph.js:19
diff --git a/addons/web_graph/i18n/pl.po b/addons/web_graph/i18n/pl.po
index 06cee6ac833..cb77a0c8f84 100644
--- a/addons/web_graph/i18n/pl.po
+++ b/addons/web_graph/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_graph/static/src/js/graph.js:19
diff --git a/addons/web_graph/i18n/pt.po b/addons/web_graph/i18n/pt.po
index 3f8edebbf9b..eb00e9406fa 100644
--- a/addons/web_graph/i18n/pt.po
+++ b/addons/web_graph/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_graph/static/src/js/graph.js:19
diff --git a/addons/web_graph/i18n/pt_BR.po b/addons/web_graph/i18n/pt_BR.po
index a99a4819e09..96fd7730fcf 100644
--- a/addons/web_graph/i18n/pt_BR.po
+++ b/addons/web_graph/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_graph/static/src/js/graph.js:19
diff --git a/addons/web_graph/i18n/ro.po b/addons/web_graph/i18n/ro.po
index 395789af612..efcbc0afe63 100644
--- a/addons/web_graph/i18n/ro.po
+++ b/addons/web_graph/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_graph/static/src/js/graph.js:19
diff --git a/addons/web_graph/i18n/ru.po b/addons/web_graph/i18n/ru.po
index fcb97444257..5006d7c124f 100644
--- a/addons/web_graph/i18n/ru.po
+++ b/addons/web_graph/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-24 05:20+0000\n"
-"X-Generator: Launchpad (build 16179)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_graph/static/src/js/graph.js:19
diff --git a/addons/web_graph/i18n/sl.po b/addons/web_graph/i18n/sl.po
index 159b01142da..d8275c1dd29 100644
--- a/addons/web_graph/i18n/sl.po
+++ b/addons/web_graph/i18n/sl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_graph/static/src/js/graph.js:19
diff --git a/addons/web_graph/i18n/sq.po b/addons/web_graph/i18n/sq.po
index 5a9b63f8c35..dafb35d6d04 100644
--- a/addons/web_graph/i18n/sq.po
+++ b/addons/web_graph/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_graph/static/src/js/graph.js:19
diff --git a/addons/web_graph/i18n/sr@latin.po b/addons/web_graph/i18n/sr@latin.po
index 54fd7987d5e..8c41f4579da 100644
--- a/addons/web_graph/i18n/sr@latin.po
+++ b/addons/web_graph/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_graph/static/src/js/graph.js:19
diff --git a/addons/web_graph/i18n/sv.po b/addons/web_graph/i18n/sv.po
index e1a5d2f9032..3ff11c4d03d 100644
--- a/addons/web_graph/i18n/sv.po
+++ b/addons/web_graph/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_graph/static/src/js/graph.js:19
diff --git a/addons/web_graph/i18n/tr.po b/addons/web_graph/i18n/tr.po
index 720a4039a7b..2eb5c4651f7 100644
--- a/addons/web_graph/i18n/tr.po
+++ b/addons/web_graph/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_graph/static/src/js/graph.js:19
diff --git a/addons/web_graph/i18n/zh_CN.po b/addons/web_graph/i18n/zh_CN.po
index a2bc90c1827..db352a3e5d9 100644
--- a/addons/web_graph/i18n/zh_CN.po
+++ b/addons/web_graph/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_graph/static/src/js/graph.js:19
diff --git a/addons/web_hello/i18n/ar.po b/addons/web_hello/i18n/ar.po
index 067507856fe..933b9f8bd9f 100644
--- a/addons/web_hello/i18n/ar.po
+++ b/addons/web_hello/i18n/ar.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 
diff --git a/addons/web_hello/i18n/es_CR.po b/addons/web_hello/i18n/es_CR.po
index cc1a06469ec..4c93888641a 100644
--- a/addons/web_hello/i18n/es_CR.po
+++ b/addons/web_hello/i18n/es_CR.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 
diff --git a/addons/web_hello/i18n/fr.po b/addons/web_hello/i18n/fr.po
index 029ada82c70..1db28fcd669 100644
--- a/addons/web_hello/i18n/fr.po
+++ b/addons/web_hello/i18n/fr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 
diff --git a/addons/web_hello/i18n/pt_BR.po b/addons/web_hello/i18n/pt_BR.po
index d374091e09e..76a3d76ef42 100644
--- a/addons/web_hello/i18n/pt_BR.po
+++ b/addons/web_hello/i18n/pt_BR.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 
diff --git a/addons/web_kanban/i18n/ar.po b/addons/web_kanban/i18n/ar.po
index ba734cf3f82..2b41c88af20 100644
--- a/addons/web_kanban/i18n/ar.po
+++ b/addons/web_kanban/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_kanban/static/src/js/kanban.js:10
diff --git a/addons/web_kanban/i18n/bg.po b/addons/web_kanban/i18n/bg.po
index 000818fb9c7..060707f8971 100644
--- a/addons/web_kanban/i18n/bg.po
+++ b/addons/web_kanban/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_kanban/static/src/js/kanban.js:10
diff --git a/addons/web_kanban/i18n/bn.po b/addons/web_kanban/i18n/bn.po
index 2473660d416..545f20352c9 100644
--- a/addons/web_kanban/i18n/bn.po
+++ b/addons/web_kanban/i18n/bn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_kanban/static/src/js/kanban.js:10
diff --git a/addons/web_kanban/i18n/bs.po b/addons/web_kanban/i18n/bs.po
index 0d208a70b37..e7078c96433 100644
--- a/addons/web_kanban/i18n/bs.po
+++ b/addons/web_kanban/i18n/bs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_kanban/static/src/js/kanban.js:10
diff --git a/addons/web_kanban/i18n/ca.po b/addons/web_kanban/i18n/ca.po
index 93862e3d292..177a7d00799 100644
--- a/addons/web_kanban/i18n/ca.po
+++ b/addons/web_kanban/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_kanban/static/src/js/kanban.js:10
diff --git a/addons/web_kanban/i18n/cs.po b/addons/web_kanban/i18n/cs.po
index 9012c6f4560..f5d9f774a21 100644
--- a/addons/web_kanban/i18n/cs.po
+++ b/addons/web_kanban/i18n/cs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 "X-Poedit-Language: Czech\n"
 
 #. openerp-web
diff --git a/addons/web_kanban/i18n/da.po b/addons/web_kanban/i18n/da.po
index a14b5544337..48cc86e2236 100644
--- a/addons/web_kanban/i18n/da.po
+++ b/addons/web_kanban/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_kanban/static/src/js/kanban.js:10
diff --git a/addons/web_kanban/i18n/de.po b/addons/web_kanban/i18n/de.po
index 794169a3e0e..a88a66d3a77 100644
--- a/addons/web_kanban/i18n/de.po
+++ b/addons/web_kanban/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_kanban/static/src/js/kanban.js:10
diff --git a/addons/web_kanban/i18n/en_GB.po b/addons/web_kanban/i18n/en_GB.po
index e2a72bc19ca..38c82e62c7f 100644
--- a/addons/web_kanban/i18n/en_GB.po
+++ b/addons/web_kanban/i18n/en_GB.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_kanban/static/src/js/kanban.js:10
diff --git a/addons/web_kanban/i18n/es.po b/addons/web_kanban/i18n/es.po
index d562b6bf82e..c065470b00e 100644
--- a/addons/web_kanban/i18n/es.po
+++ b/addons/web_kanban/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_kanban/static/src/js/kanban.js:10
diff --git a/addons/web_kanban/i18n/es_CL.po b/addons/web_kanban/i18n/es_CL.po
index 55e598d7017..8a467e05508 100644
--- a/addons/web_kanban/i18n/es_CL.po
+++ b/addons/web_kanban/i18n/es_CL.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_kanban/static/src/js/kanban.js:10
diff --git a/addons/web_kanban/i18n/es_CR.po b/addons/web_kanban/i18n/es_CR.po
index b7b851f14c7..1d434969d8f 100644
--- a/addons/web_kanban/i18n/es_CR.po
+++ b/addons/web_kanban/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_kanban/static/src/js/kanban.js:10
diff --git a/addons/web_kanban/i18n/es_EC.po b/addons/web_kanban/i18n/es_EC.po
index afe3b25aeaf..ffdfc0083f8 100644
--- a/addons/web_kanban/i18n/es_EC.po
+++ b/addons/web_kanban/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_kanban/static/src/js/kanban.js:10
diff --git a/addons/web_kanban/i18n/fa.po b/addons/web_kanban/i18n/fa.po
index e24902448a1..8d97b5cd087 100644
--- a/addons/web_kanban/i18n/fa.po
+++ b/addons/web_kanban/i18n/fa.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_kanban/static/src/js/kanban.js:10
diff --git a/addons/web_kanban/i18n/fi.po b/addons/web_kanban/i18n/fi.po
index fdfeea871ad..ca1b51564e9 100644
--- a/addons/web_kanban/i18n/fi.po
+++ b/addons/web_kanban/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_kanban/static/src/js/kanban.js:10
diff --git a/addons/web_kanban/i18n/fr.po b/addons/web_kanban/i18n/fr.po
index d31357bad62..a4e8b026287 100644
--- a/addons/web_kanban/i18n/fr.po
+++ b/addons/web_kanban/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_kanban/static/src/js/kanban.js:10
diff --git a/addons/web_kanban/i18n/gl.po b/addons/web_kanban/i18n/gl.po
index 9ccd66c71eb..e03983179f6 100644
--- a/addons/web_kanban/i18n/gl.po
+++ b/addons/web_kanban/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_kanban/static/src/js/kanban.js:10
diff --git a/addons/web_kanban/i18n/hr.po b/addons/web_kanban/i18n/hr.po
index bfb80508047..4475b0596b9 100644
--- a/addons/web_kanban/i18n/hr.po
+++ b/addons/web_kanban/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_kanban/static/src/js/kanban.js:10
diff --git a/addons/web_kanban/i18n/hu.po b/addons/web_kanban/i18n/hu.po
index 6392fa227fd..febf19037aa 100644
--- a/addons/web_kanban/i18n/hu.po
+++ b/addons/web_kanban/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_kanban/static/src/js/kanban.js:10
diff --git a/addons/web_kanban/i18n/it.po b/addons/web_kanban/i18n/it.po
index 71da09eac6a..4aad60e6cf4 100644
--- a/addons/web_kanban/i18n/it.po
+++ b/addons/web_kanban/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_kanban/static/src/js/kanban.js:10
diff --git a/addons/web_kanban/i18n/ja.po b/addons/web_kanban/i18n/ja.po
index 61a6473fdb4..f054f40115f 100644
--- a/addons/web_kanban/i18n/ja.po
+++ b/addons/web_kanban/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_kanban/static/src/js/kanban.js:10
diff --git a/addons/web_kanban/i18n/ka.po b/addons/web_kanban/i18n/ka.po
index 4196dba39cb..d3ebdf522db 100644
--- a/addons/web_kanban/i18n/ka.po
+++ b/addons/web_kanban/i18n/ka.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_kanban/static/src/js/kanban.js:10
diff --git a/addons/web_kanban/i18n/lt.po b/addons/web_kanban/i18n/lt.po
index 04f788195ac..e0f087dd442 100644
--- a/addons/web_kanban/i18n/lt.po
+++ b/addons/web_kanban/i18n/lt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-22 04:46+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_kanban/static/src/js/kanban.js:10
diff --git a/addons/web_kanban/i18n/mn.po b/addons/web_kanban/i18n/mn.po
index 9afb4e45d93..573f278dd84 100644
--- a/addons/web_kanban/i18n/mn.po
+++ b/addons/web_kanban/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_kanban/static/src/js/kanban.js:10
diff --git a/addons/web_kanban/i18n/nl.po b/addons/web_kanban/i18n/nl.po
index ff3b7094b2b..3cb8c91034e 100644
--- a/addons/web_kanban/i18n/nl.po
+++ b/addons/web_kanban/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_kanban/static/src/js/kanban.js:10
diff --git a/addons/web_kanban/i18n/nl_BE.po b/addons/web_kanban/i18n/nl_BE.po
index b4b8fae14c9..347beeb76af 100644
--- a/addons/web_kanban/i18n/nl_BE.po
+++ b/addons/web_kanban/i18n/nl_BE.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_kanban/static/src/js/kanban.js:10
diff --git a/addons/web_kanban/i18n/pl.po b/addons/web_kanban/i18n/pl.po
index 6c42bc5571b..c040e1c7ba0 100644
--- a/addons/web_kanban/i18n/pl.po
+++ b/addons/web_kanban/i18n/pl.po
@@ -14,13 +14,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_kanban/static/src/js/kanban.js:10
 msgid "Kanban"
-msgstr ""
+msgstr "Kanban"
 
 #. openerp-web
 #: addons/web_kanban/static/src/js/kanban.js:293
@@ -64,3 +64,6 @@ msgstr ""
 
 #~ msgid "Create"
 #~ msgstr "Utwórz"
+
+#~ msgid "</tr><tr>"
+#~ msgstr "</tr><tr>"
diff --git a/addons/web_kanban/i18n/pt.po b/addons/web_kanban/i18n/pt.po
index c8e0196d7ba..4747266805c 100644
--- a/addons/web_kanban/i18n/pt.po
+++ b/addons/web_kanban/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_kanban/static/src/js/kanban.js:10
diff --git a/addons/web_kanban/i18n/pt_BR.po b/addons/web_kanban/i18n/pt_BR.po
index 1047c7e7725..c0b67986f3d 100644
--- a/addons/web_kanban/i18n/pt_BR.po
+++ b/addons/web_kanban/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_kanban/static/src/js/kanban.js:10
diff --git a/addons/web_kanban/i18n/ro.po b/addons/web_kanban/i18n/ro.po
index 27326621b10..acd190514b7 100644
--- a/addons/web_kanban/i18n/ro.po
+++ b/addons/web_kanban/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_kanban/static/src/js/kanban.js:10
diff --git a/addons/web_kanban/i18n/ru.po b/addons/web_kanban/i18n/ru.po
index a30f7c53997..03b3e9a9dfe 100644
--- a/addons/web_kanban/i18n/ru.po
+++ b/addons/web_kanban/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-27 05:15+0000\n"
-"X-Generator: Launchpad (build 16194)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_kanban/static/src/js/kanban.js:10
diff --git a/addons/web_kanban/i18n/sr@latin.po b/addons/web_kanban/i18n/sr@latin.po
index 4ba839580e8..63c0887990b 100644
--- a/addons/web_kanban/i18n/sr@latin.po
+++ b/addons/web_kanban/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_kanban/static/src/js/kanban.js:10
diff --git a/addons/web_kanban/i18n/sv.po b/addons/web_kanban/i18n/sv.po
index aff6a057656..77dd0d06cb2 100644
--- a/addons/web_kanban/i18n/sv.po
+++ b/addons/web_kanban/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_kanban/static/src/js/kanban.js:10
diff --git a/addons/web_kanban/i18n/tr.po b/addons/web_kanban/i18n/tr.po
index 4df30e4ee5e..80cb052e407 100644
--- a/addons/web_kanban/i18n/tr.po
+++ b/addons/web_kanban/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_kanban/static/src/js/kanban.js:10
diff --git a/addons/web_kanban/i18n/zh_CN.po b/addons/web_kanban/i18n/zh_CN.po
index 07c905699ad..1d543e0d06c 100644
--- a/addons/web_kanban/i18n/zh_CN.po
+++ b/addons/web_kanban/i18n/zh_CN.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-07-02 09:06+0200\n"
 "PO-Revision-Date: 2012-02-10 08:25+0000\n"
-"Last-Translator: Jeff Wang <wjfonhand@hotmail.com>\n"
+"Last-Translator: 开阖软件     Jeff Wang <jeff@osbzr.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 #. openerp-web
 #: addons/web_kanban/static/src/js/kanban.js:10
diff --git a/addons/web_tests/i18n/es_CR.po b/addons/web_tests/i18n/es_CR.po
index 8d2bfb39fe0..03a3decee15 100644
--- a/addons/web_tests/i18n/es_CR.po
+++ b/addons/web_tests/i18n/es_CR.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 
diff --git a/addons/web_tests/i18n/fr_CA.po b/addons/web_tests/i18n/fr_CA.po
index 41dc4167edd..e5e6713348f 100644
--- a/addons/web_tests/i18n/fr_CA.po
+++ b/addons/web_tests/i18n/fr_CA.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:03+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
 
 

From 0cca84f1f7e9daed0191626d9ff95d8b6de1ca3a Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 15 Nov 2012 09:34:00 +0100
Subject: [PATCH 127/143] [IMP] views

bzr revid: fp@tinyerp.com-20121115083400-i18b1yxfkq6j7y70
---
 addons/account/account_invoice_view.xml               | 2 +-
 addons/base_calendar/crm_meeting_view.xml             | 2 +-
 addons/crm_claim/crm_claim_view.xml                   | 2 +-
 addons/crm_helpdesk/crm_helpdesk_view.xml             | 2 +-
 addons/event/event_view.xml                           | 4 ++--
 addons/hr_holidays/hr_holidays_view.xml               | 4 ++--
 addons/hr_recruitment/hr_recruitment_view.xml         | 2 +-
 addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml | 2 +-
 addons/mail/mail_group_view.xml                       | 2 +-
 addons/mail/res_users.py                              | 6 ++++--
 addons/mail/static/src/css/mail.css                   | 2 +-
 addons/sale/sale_view.xml                             | 2 +-
 addons/stock/stock_view.xml                           | 4 ++--
 13 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 4feb97c2f5f..d3697b13ea9 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -436,7 +436,7 @@
                 </sheet>
                 <div class="oe_chatter">
                     <field name="message_follower_ids" widget="mail_followers"/>
-                    <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
+                    <field name="message_ids" widget="mail_thread" placeholder="Share a note..."/>
                 </div>
                 </form>
             </field>
diff --git a/addons/base_calendar/crm_meeting_view.xml b/addons/base_calendar/crm_meeting_view.xml
index 10c65ab850b..8590bcb8b49 100644
--- a/addons/base_calendar/crm_meeting_view.xml
+++ b/addons/base_calendar/crm_meeting_view.xml
@@ -221,7 +221,7 @@
                 </sheet>
                 <div class="oe_chatter">
                     <field name="message_follower_ids" widget="mail_followers"/>
-                    <field name="message_ids" widget="mail_thread"/>
+                    <field name="message_ids" widget="mail_thread" placeholder="Share a message..."/>
                 </div>
             </form>
         </field>
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index aa4243a6838..85507a32c0f 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -168,7 +168,7 @@
                 </sheet>
                 <div class="oe_chatter">
                     <field name="message_follower_ids" widget="mail_followers"/>
-                    <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
+                    <field name="message_ids" widget="mail_thread" placeholder="Share a note..."/>
                 </div>
                 </form>
             </field>
diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index 52f006ca7b2..1640b9d0318 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -95,7 +95,7 @@
                     </notebook>
                 </sheet>
                 <div class="oe_chatter">
-                    <field name="message_ids" widget="mail_thread"/>
+                    <field name="message_ids" widget="mail_thread" placeholder="Share a note..."/>
                     <field name="message_follower_ids" widget="mail_followers"/>
                 </div>
                 </form>
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 85e3020512e..696c0e2876b 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -205,7 +205,7 @@
                     </sheet>
                     <div class="oe_chatter">
                         <field name="message_follower_ids" widget="mail_followers"/>
-                        <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
+                        <field name="message_ids" widget="mail_thread" placeholder="Share a note..."/>
                     </div>
                 </form>
             </field>
@@ -473,7 +473,7 @@
                     </sheet>
                     <div class="oe_chatter">
                         <field name="message_follower_ids" widget="mail_followers"/>
-                        <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
+                        <field name="message_ids" widget="mail_thread" placeholder="Share a note..."/>
                     </div>
                 </form>
             </field>
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index ef300741139..752d278baed 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -122,7 +122,7 @@
                 </sheet>
                 <div class="oe_chatter">
                     <field name="message_follower_ids" widget="mail_followers"/>
-                    <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
+                    <field name="message_ids" widget="mail_thread"/>
                 </div>
                 </form>
             </field>
@@ -159,7 +159,7 @@
                 </sheet>
                 <div class="oe_chatter">
                     <field name="message_follower_ids" widget="mail_followers"/>
-                    <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
+                    <field name="message_ids" widget="mail_thread"/>
                 </div>
                 </form>
             </field>
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 0dd58937306..c3281b43b94 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -184,7 +184,7 @@
             </sheet>
             <div class="oe_chatter">
                 <field name="message_follower_ids" widget="mail_followers"/>
-                <field name="message_ids" widget="mail_thread"/>
+                <field name="message_ids" widget="mail_thread" placeholder="Share a message..."/>
             </div>
           </form>
         </field>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index ee5a329c800..6de6be6c08d 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -162,7 +162,7 @@
                     </notebook>
                 </sheet>
                 <div class="oe_chatter">
-                    <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
+                    <field name="message_ids" widget="mail_thread"/>
                     <field name="message_follower_ids" widget="mail_followers"/>
                 </div>
                 </form>
diff --git a/addons/mail/mail_group_view.xml b/addons/mail/mail_group_view.xml
index 214f6edf571..4a880a13c14 100644
--- a/addons/mail/mail_group_view.xml
+++ b/addons/mail/mail_group_view.xml
@@ -84,7 +84,7 @@
                     </sheet>
                     <div class="oe_chatter">
                         <field name="message_follower_ids" widget="mail_followers"/>
-                        <field name="message_ids" widget="mail_thread" options='{"thread_level": 1}'/>
+                        <field name="message_ids" widget="mail_thread" options='{"thread_level": 1}' placeholder="Send a message to the group..."/>
                     </div>
                 </form>
             </field>
diff --git a/addons/mail/res_users.py b/addons/mail/res_users.py
index 1b6388111ba..932c4dd9518 100644
--- a/addons/mail/res_users.py
+++ b/addons/mail/res_users.py
@@ -91,8 +91,10 @@ class res_users(osv.Model):
         return user_id
 
     def _create_welcome_message(self, cr, uid, user, context=None):
-        company_name = user.company_id.name if user.company_id else _('the company')
-        body = _('%s has joined %s.') % (user.name, company_name)
+        if not self.has_group(cr, uid, 'base.group_user'):
+            return False
+        company_name = user.company_id.name if user.company_id else ''
+        body = _('%s has joined the %s network.') % (user.name, company_name)
         # TODO change SUPERUSER_ID into user.id but catch errors
         return self.pool.get('res.partner').message_post(cr, SUPERUSER_ID, [user.partner_id.id],
             body=body, context=context)
diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index 8f753ca76e9..0bcfd0d3733 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -115,7 +115,7 @@
     padding-top:2px;
 }
 .openerp .oe_mail .oe_msg.oe_msg_indented .oe_msg_footer{
-    margin-bottom: 0px;
+    margin-bottom: 5px;
 }
 
 /* b) Votes (likes) */
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index da8d1b3b9c2..9f385339173 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -311,7 +311,7 @@
                 </sheet>
                 <div class="oe_chatter">
                     <field name="message_follower_ids" widget="mail_followers"/>
-                    <field name="message_ids" widget="mail_thread"/>
+                    <field name="message_ids" widget="mail_thread" placeholder="Share a message..."/>
                 </div>
                 </form>
             </field>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index cf22fb44b58..a08597df60b 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -914,7 +914,7 @@
                     <xpath expr="/form/sheet" position="after">
                         <div class="oe_chatter">
                             <field name="message_follower_ids" widget="mail_followers"/>
-                            <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
+                            <field name="message_ids" widget="mail_thread"/>
                         </div>
                     </xpath>
                 </data>
@@ -1040,7 +1040,7 @@
                     <xpath expr="/form/sheet" position="after">
                         <div class="oe_chatter">
                             <field name="message_follower_ids" widget="mail_followers"/>
-                            <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
+                            <field name="message_ids" widget="mail_thread"/>
                         </div>
                     </xpath>
                 </data>

From 9c5a9af60359d98325b19ffea93ad48fbc6bda3d Mon Sep 17 00:00:00 2001
From: Cedric Snauwaert <csn@openerp.com>
Date: Thu, 15 Nov 2012 09:52:50 +0100
Subject: [PATCH 128/143] [FIX]fix logo of fleet

bzr revid: csn@openerp.com-20121115085250-c3pkhoyli2jc2xbc
---
 addons/fleet/static/src/img/icon.png | Bin 11334 -> 23083 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/addons/fleet/static/src/img/icon.png b/addons/fleet/static/src/img/icon.png
index 3db7ae9fa4962307aae3d3e446abfa47329ecc39..5b41e43c5bddb80c5b13b6a9e04ae6f0725163f5 100644
GIT binary patch
literal 23083
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
KMNUMnLSTZY7g2)%

literal 11334
zcma)ig;QJ47jFUqf+x633dIX4?iRE_arYE&DemrCC|0~kf#U8CB~YMfkuNSqiWFMh
zUw(hUoA+k+-krI7Cv!7r&-uunSWOKjLOdEg002O!qKwc+&msT2z}V>fpp?}Zdct*4
zHgX35@Jau70Rh>$ROp9HNM&tx0KktG{c<<}aPx$oe**xXd;q|KB>*6n2>?*OPq7$M
z1OT|kRS>eeK1)Y|zR9)*p6e&M{_A&Zt>-T#R~sD#vZ---z;BuW8TAk$TmElCU+8GX
z<JC<+n5B6S<9;~)_A0B*B`g)TBjTDXVk5^&&bAge1SA0CT17yZSTd-86n(V)op0WI
z-0gqzo$+Ml{aV1mpWh5W5{$Px^;$d1_U_i)PTK7r^4ygXd^GD_;YzRgU?I~~&_4SF
zu%&<^h>zwO22~;yn1G4_C?XMnV)*}kc^gZ3Kk)AI-R-MD00c<duOx%3bt4bL=rdqX
z0DM8XzzVqjlK4FV`o7tbg#we|gTBP?c~F<fIl#02fx8Ewh$e*o6sC?zciNW_B*|CD
z-UkIz9FD&xaY>UC0TvBXPvdgI{yu<0o`p?&yQlBPmT}eK#y}9s04CV4+h72sW@<@d
z`x|NKc@K6-V4+r%F8BkWD&lmBb+2a~zP?JhnE}v*$bRMSNy>SS0U2^yaR6}p66?#^
zLRk=OJg0S7J(`$OTF*M9fntinS2sdO`0vhmpadcAYrPKeh^IPO!@6(MH~%-V5O8k3
zGVqi@d1b11J2n=f3Gl~SeASmjeNBnG@p5C5w(st+&!SXDT32Kv22iuLTekDN`m@KM
zrwQMuj_crduqhY}`$}3kl#m9-g=)j7ShGbi0K8#zGEfXW=sECQUWP%A!!af~ZENZh
zvDN|V62!VCERuF0dC<qBi-pN5f?Rfldle&kM%0J%{Of23L;xNNQ*Tfg4sm8iQRrct
z!UUyu!PEawf;(7Y2m#nYXvP#g3#$PyF<Y+rb4P{LfWyGru=7|)$&ZX?6gSgi(}ASp
z(grw>LhQ^5;0-+Ipcih-(?!>BEm)4@3lt-kodoHWNz|asaBLKn4-(Q9O-cQB)Of@`
zE)`4-&E~X*85rRL<C!fd{B!>X74Sm%GZ5x;myeA+MM)YY4~EzhTI^bZvrrk`@vSYh
zKa{6^e~=1)h0Rv)B~cqDhn`0*6y1=izYL%Pz3G5*w}X;@{KkAeMQk#lp0uYB$3wLU
zxUCv>IHpQi3B&~@n){ETEKi;}EP*;6w*DW5=u3t3<!!`?Y7aGT2xq)sd+iv)XQo}+
z1e$dezp*PY)VgqJ30Q@wI)zXNLeIOEAhLfXyBe;PbG5!VR!}x&Zl>?JN6OHQGYKwV
zcMXMb*dBeIb72SN{$&`>9sFCwu5MwQ3%%Ln>Pvdd=BE?CZ)MPag`W?glBsd4tHBQz
zRg{ZpWWJw}1AAY1oSjrJj1gk+(PHF#5yh_|hx`S^>65{DdyuF_SC;4V3e^1AyybIK
zFgYdM*8T+kiA`m#5a1g`9pbA3v_ApYmQGFQe}fAzfM?QGPI}#D?ILYt&ztXQK&WW_
zM{l_Y;NwUQZ+z?<Ro0UUtdrpSXJHTXTls$U9MIkF;X&UI=%E4L`Ar1mR|r+?CaNu4
zA~548Q2=hd%`c|K_~Rg8nZ8KTHT<ypqJx=<n#4{q)-sox6lJ+YW$MI3B$VUBJ^5F;
zHhKt>4ByrTpL~xs7jhUUj@~omZL3f%nEr8Mfn95m2uA0HKOCgSx4nGm*%Wh{=6-G8
z8m}{9l}n8rXYG#!aD}B&*Q7lK!tg|R_o!vm)BM$_!ui*>?X@;g0+9fb+`au+%kfO$
zCur_f86`~Qm`+0s=T*dTmg~FhEp*U4Rl;yO%mO4QKSHdCt_xui-QqFk@{`O^Q$dWF
z8R>=}cJcrYXokGcvNm{~8nB{OX;s_ovm_eub++FcoXLj`k<Ght$=jbL8yF<*+ZNpA
zUrsPGf{3<aDAO0b2%%x(A1956B?8_a#@%bs`t0OhL0Fe;<~UF>Qrw7W=7#VPNvyiD
zc+<mJ?(*OeRXef?kIrkw{B71|8uM9u%i89)+GPbOMn<TA<o+4|c&z};*Qd}u#7DKL
z$diMYt~xdnvepd2a8}b<F|M={1qBo>56OY;Ulz-H1VlGWn?AcG!`$~x(zOYwn3wsg
zhMf#_9|Mp8)QehqN$HL7fbC#6Xp_PeOspk!pRf^t@@VYb;a9&>Fh7X-GpevQPu|XD
zrHEHRk0JHn?+rt(jk!eZ#}Dvp<<3MeFl6_W3i$Jy!nqr9Oy@w{X5E&rUU8@zs0^{8
z$FXwsMVq46X5wzyWZcK0I_f!8YT<D6tGhj<Q02Vdsd`m<;+~^6hw_B_N0+7%c&3*!
zeVy6|_RO!XY@N_AkId&MK)E<||GsFVv~T!%%;N>Y*_iiBi`Kk-VJAeqKKVDKLa4Nv
zxgy|H5{X>2CGcamRQNT)4`Wn$g%09?4kz7B1xX0ODxX%jWurSh;<FJE5GMu1t4b2k
z&3-y0p@e6d1OF_V#<K44YH}m0EkW0`PcA|xA{VUYG2wI+GQkxn382!6M-ko-<9YHK
zZ7i}(*B;sA=UP4L73(8}LH9$Wc<2poV$Ac_0A@($dt5cbNUN8*gZJaBhuhG7_d)ni
z#agKmMO)PfXE5*Qvqy1bL>q?+6QJkkNwLo8!zIC)NgmjbJo<+sHyI>-O9hvo=Y%?{
zI}F2+`gYlIu<|z-EE5!j6h2c+-7lp1^y;zDixz)vyVHb6jjxyyV;AxG*fmlsj7W}S
zYL{zdz({G6n#2Ou<)=wRoawfQ;zGxLpC*PNE@mkkQ36BTz8~1)FbHj%VuD%#`BIb^
z8S*mXQGpBpvE!rxVMX@zrhViUrgEcC-c^$%h~(IUmJhYk?933p&eZ)0m7?{e+sUUx
zj}63Whd#bKYnahT3nR-%b31~L@qM$<|7;YasaNrAH!JQ=2&ZL;`4A;eUU?3$07K()
z;P<a$UD#D*01O7RZ)wl$UhY2q)T49;OwA@13Bueokl3m6(|vX>+&eIB^D&b^hDzvA
zlpCQ@^fKaUnC$HJTejQPs-`!mu^Kq3<85WrGI9|$V2${IJ|NC4Vbxe;-lP#9`_gn^
z;uoM(v^uiSZtadygi;Rqxw%bB-SrE*%Ydjr794rpoBKvl>X$PGpc|sUnoI+I&h;-R
zI)FmpTv@jxC=e<~P5HGeJ}L@mey4`TTI5h<0kJf(e4Hko*u?K<_*1dq>YuUMKQpbH
zgY&pRa7NEyAe4KbYlTrVkiA`6&3ae-y#+Gx+VA2v5x(uBWyt}0%fCD8xiL7lR?IlS
zUz!+~4wuOQs)P~reR1wGQF7>z(c<=u3}FFQ(W^~={=pJzgYxtIgishDI}=C6FbE)g
zBqm)O*j-*_Zw)om;6b_LR-}0U<?FW3re{z3ie&0ChAdrK5q^Gh1HaEbdn~0!y2xj5
zIqbQNi~fwQOT3YOet1nz5MrFt*R-6>_8E}_{=G;QKt9_x>R@(kM6YEyBQsrbLW(hC
z$N7QMw2`<k!}@Ue7G{x43|wc&OK`fkTJxv#Cc-^E+eR?{h>^;)V1DY$=)<Ifo$F>b
zRMtsg)NMSxZjtZ%VH71fzxC)$X_q(X?DTmNb-!+t=i&~~Y^7*u0<9kwqRUu-by31@
zWZm;=$h2=vCYS&k2dSGnsU6J-jHUke1-_vwBI*XG)_%#q@oG6U7^(2fAfFo#%>@$p
zw?A+XT9<`;fko8MaXPbVqm|ctlM#K6RrNGqVmJS5YTA3BOT77m$Cj>%Vin?2#m)pM
zO}Hs;BFQLWuD0N$>7>FOeVNI^anktxv}ylLFTGDB3rx+A%7Vf}2Q}CzfWO~d@HWM)
zN%jYLF@whak^q(o)V!5*XwuAV+DJCwpQ4^QmXl=?1u*0ZGkwi)sP?M$M0~<GNfKol
zoU+k|!TUT>Hg*4@8?xacyPZ&4Z2Ij6DMa-hG!3|YA<xg5T+K-qkm#?+hB<-|Ln4B8
z0h#V4@OC<k8g&xW&!uQ^GXItLVLv~rW_Typ1doK`0aMp1FLLBO_e$C-2A#VFS{O2Q
zR2W1?cl`<bF1>Ck<pY<(ocuqA<bG;35kTcuRuJ{khYA;8ws1?B{|aDt^(vgdwnOJO
zh)U4vef6Bnyy$pzh*43n@Zdd9H)RF*YqoKq<WLm2k-5uBDq`LliB3)zls_FW-Wx<F
z-)^v*g6SzI%rd;|0mD`Ezc2U^5tOoy1h$TXY9$;khja#M$-OZRT!65+$_o36Scw^!
zp9d?*L%?vJQZ^jiYD-PkS2Xf&40bZk3H#+X&Vz%O$QGPHE%~u?()X!R1GG@a(Lx)p
zbQ_4~Jvyjd24qlhkf^0Cg2^m_0Z>+ogjmH9F~Pw6i~cp<oi2WU_{e;ysc{mxz&cid
zZ+GtaZD_6kM@q^HyX3h4F_JGR@r>9Y|1vlu6^<=0<*3gqh|JHF#8FM=fdKG($(@JK
zRS_Zd^INwpvadmQT}l=p((&L?n6HKC&<;!jKO{kRfPf>;b>`4tvYts*;dTA2dVtW$
zJLJ9WFWqsan0Y15k3R0zQ931yPI<7~9}Y#qDbg0;0=%{aQP=Oud1^A+fV)oSt~P-A
zG^y{HD!5gQaC42K-WQEVvec>LCw8_h%x~jXUqw#oyF<(N2Iu|nVBT-yZcL_Af5&>^
z%$*lzAXs8JDL0t4zLER-hho>n83J15PngMv4V6GT<33u|QPKXA<I$(v9A~}4eZ@hQ
zXnyOaCOD$mAc5ES_+f;Btw9{XA334{yrk??*Z8FnIpP(4rjpVl5bC0ov8fnow(#>m
zdBAR0uTscliOlR_zuC5?#Xf1w_e{X|168fsz3v>s&8sEmMW@s^$qKr5C{^(K{Bu8~
z;`t`v=t>3#@L!!A6^tCE*8Ox^bWO@xrkoWc){C(+L*Z*yp}|WnCPNRUQzb!fpxiSC
zbozQm-JF;a{k7xW;}GtU4g8qn54)m(U6H|r#Vx%dS*{)X%+IZex@A1ZP~cUrMuJv5
z>W)#|6g*RZsfcxBqRj>B5gSr5i&KV{^<l5Q%*@IUOj>~!63IRxB_98UUHGCh>o+9x
z@iuu=-Q-FC`z5w10ai()+6Zalk<%Hc61Lr-PJBk$FT(GvOcH?d&&A)oV+*;m?ZX^$
zR|n|7_9t%hU2A7NiMwCTA6e5BeK$wW&{s!B43P|_4x!*T9$$1OxHO8VM->#u<nF)h
zky1JJ$uFkIcnN#P`U1Ia8V8;^DV{$poOkT^?>$g#mhba&a^+K>p8mRN?&Mm<o*ZA-
z>46_-(Aaa!Y-y2QBpXq}JoPpp|8RzkEq5?=!s^4mfj6{!TG{|4bD+E*Rrj7bV%>sZ
zQ(a-FA3ygsDAsB=JAX^fu0q=6K-LLfToXL0P)9a^70~r8%mI0N;73n<=@(7|82tEc
zE|+g^?{e+giI)~5V{p_e1HJg{{MH1wylR9O_!PGInZ=L@Xfb&f`l4RNV5>p|6K4Zu
zOc*^wmM7>zQyce>&>;@Zq*Z<qk|MkpLhe@Qo`>w$n4La;((rxyBPR^o`eQtvsjYnZ
z#rdt!QRoc2LBM|_xBl6QjZ3zUJ<>I=NYrS<v250Jnt@@>%89bY`tnn!JbJl;x*eHT
zo@dB?F=8OEhR)H;(r@s$TWbvyCj^$AaLfeeYGx_4L~LzdMDlzPjaDeK$Ys8jda4q+
zW(7F|Hr{C6&!JP-+Fp<dW}3>fXvbrl&`$+*<diP<)lt~I<bqi?7FXkK3ZhK4t4wFe
zjwD|e5d5wwQrl6D(c7@s)oyh%?`zcRk6P%ijkfE4h=FvV6<sPT<@MS-MC(GVRB*Xz
z->tf4o#Mg%7x$~l=u_2Nwo93mjZ%Rj24pg46Nl}jdHF}D$Hx+}pfAgjCmxpB>M`!L
zOJCZ4cXR3DzIpcHix+qi{beR(BD-|x>eC~8F8?Xp+d-W6-Wp_+@A{_}t-(i4LDbMc
z&H^qvDc?rOm$G9!OK_my{3C)Gy#fN%F&5*V?aOw(P#MjP86o}<eL6-!*PXVFYEboX
z^1;?yqmcKR47+-N6mK~|)zv;XQ0)-cvitr0b3h|`)X9Zvl1cucXXk0RxoGEV3cLMb
zxB4%P&Z;2|r+O-kYQWP7ifQh7S+&J4)@KawMI%l`w^t@x75IK6oHz@h6?|^~_1-K>
zezjYh%w=p0a$=RE9+MsMji9vwg9!M1Y#x*-VHbg4pc3IENbgL29m`SVZBo!`Bx}j5
zUnetL;yZu0Zl)Fe?J!4OAQN7j)jByWJ3g|vn|!<)PaAym>7$x@f9o<J<c%9ie3C>M
z+uD`Xbr54Ni^&Ik4+R(XlnpdJf=AGgA)YLA_lbonDgTSFZ*LlJduVoFV|)qdsWu-L
zvK^O95|%yyJ~Y}*i+O-&uh!xpkB)qcUh4=DGknWR3IN3uODA~v`He{i6-NK1adPcg
zA8r_t&Lz9SZ2W#$)frtX@cI%RhF50Lm6TGEG!{djp7%iky^5H}#Y&rZfh?q?8v<Bm
z94UWY&+~(59%jq>jameM8}JlL&RZ8%sd#uN?N7XE^aVO)5f{a+JDjZhzKB>NLY_8o
z(|+-o#t#8FihEi9j<@*sDR|dzO2h@=Y*WILU`u*j8%TJwLU(k1T@e&k&36k!YZEV;
z@Y-~rP{xTEsaERY<Q-4LaLj{v=6mJB9fRkY@XGW$b8vWdBvtq<<2}>Sw{LxPWP6sz
zJU?x1TXHelmKL3O^4amYf$u+)-Po}-SlLX?(1^(-g6+D3hjXvQuMFem4{(B+^*&`l
z0Je+u@Sj(I6xd%RRL8F0UP$@lWoE&#-I>Rm5`CAcra!+GP#rlGrOS}J?$1XR4JXPz
zVjKx*p!&Q!PamX4GWS-`hNo_vou-L_?>2A};Fh}=b_nxla(SGy8FPFm5_=D;^^02G
zsUx&u89Lp{TRZxEIP$&3y$u)*lRR=S^x64yO!wqK;?)Y3psKE()1cQR7(VF^=WMVx
z55bdU4&L*Q5=h<TQbSBXwnp#%U=qCeJApm-I>f4od->({%Dgr<RnKbA!9S@Qc~DL!
z9;&X~X@u6WHYm$B$^ltNCN~51m8{iaDoP~D8%NYtI<ysf2=`<FkJdKIA!$|{fDL7>
zjW6zoV5{Uv@gE6Jsi4lZOuuxD1QS_mk7FUZGR&HVTGh8qeujcQVP)OJVOJv;kVJmu
zCpbEzA=Nr+ho)T20~&;+yqND9pWPN)$q*HSzJ2@p%qrcU33ESIttw^(Ug-MpsG!jc
z$kd$Nz+8Qi??D9IbGr10(qW$3=Wk~S4CNVNzlun&F485D%?)>I)pBaC5dnhIYD|eY
z3eAaMr?Ed{fszw$G`WjlSSGn&XBZPA#|_Pu2=-u$Rs?8#gZ(=Qv!^7@!%Gjm`1{M?
zAB8Bz3#tO+F&LINZzNyOm~mBxyL8u0>bTF0=>5$oo`y)Y+D=d*F2hIsx}MYMrQ?^p
zHDNWYB%>RnqvXUGSZN$@0-*s7v;Et?M8(lV@dUP2U%ZOgPwO>s8rP5szUr>Y@s=x8
z<5b~0kdznGCQhh6zGqg7OmhC@PlP#f9FSB>e^~1dUI3M1IZ^L8h+o4uDak`DW`qgo
z5}2|<ZWQ(Y$IBJ-N~<zssHZKRJ5liJZyDXkcUXBLRp<h`vHb3oTpN4)jso!K(93n+
z|IL!BT{OI{S$}Y>fq?h>%cJHNf(MeqGMinBE+r>I7?|DaN}Rm<C+_CODT8JSufexD
zzTsxU)sPtcub<L<rqXui=YM!QvC}?f&UZiocPSw6dB;q+ZQq14c{*}pv)`PUs1J9~
zCAc--VBv6NL1n9JDJaz1q5S;OjG0H8c>o<X+wN$+2_KX0537EQa*<|}V$r;Nq7!1#
zrXV!HwzW>jbVKujpT-pUYzR<e5>fvCh;3}c(Rwc{#}7}NWLBwZ?YF!YPOHn-dB(TY
z{89@i+qwF)T^#CvQHq%23H_>ILoo1F9J$MZdVqUlEbg2$<D@$s2VO$$;8G1Ir83EN
zI(dZiRYOjMmWq@%nMmnSaVvHBiM^0(UNa`-t;s@FB~iXV+O(W?v~OJ7o(^Jc7UZl}
zyuKDf)^Wf56H3zD{DEVlJ}sMhDJOn~pK{=E2`1bcGi7Nmc%kz1r?@fMwW2vT6EQ1p
zPq8`gSPns<Z}Fh@gufbmn=ldEIPN|W5ih}N0tk>D2m5}o_PuEkkA!txS3XGLK@;HH
zdWqOHHn(>bkzAiHPP`Wm7mGnR2(68TEBh)p`y#<QGk5$Y*m`Zc0(<Efwgab_qP}cx
zl<8HPd(tI>X6qp&{fkqYW^C0%y~MB^xb3;hX@wtspk>H@;t)Ny@6+wo4TNtfq4Ur)
zplP;Wg{S;+#+VS_pxkq5C{4DtE5XB2br$ifA@@-X+LN{?Qkmnel#wn9sQ7P~q^-Wl
zuh6=lE9^NGEz0XxoRRbXbQA7scK=m4k&}t7GYwRYh?8vKRE=PSYy&9#VP*g&yO^Lc
zfO`w+K+g?it)5Cw-u>qkG4L$`fqrf9!W)$9yBJM76n*m&)_%c0C|jqqrR4N9AAAc#
zM-c57No18?o7P4TDumL`c%1(GUm+PAQ!Xuq+&<U^s^b^%gr!dOW1`K5`ql_{!h0Yt
zl%iY7pt4l`05?f8?s=9gTEd5#6SL(Fz6CFqI{AfCX)?;CQje`Yg9zRs)YI}NRJn?O
zkyXDN?{)5kwW7VZe)3^ZUC<0Brid09`WspuEb<jr?^SHkl8N}jPo$FdwIc$}?%JM>
zP3aER*ItLAot?6-VU9iQSjx$6lMqer7qG0{E^gC;i3IeL-B^<somz@4^>XQf(f@v+
zWHg_3AdMm+Tk|fM6?F8Pgl;y9oGl)M-{>;I&K+iN?={zTWfR$KXx|8Xz65*U#4KUo
z3F9@!-PBZ!SP-DGckC}U9DIL0SB$yWl+B0Jyru!Pq~*_dBVzpHF{L$+)y&6maN#oH
z-=%+24-2E_x%u}Wy6lNYAGUzc<5ED*HdsUdUZSBlLLzt`hAxBq_SWA){26lW>T=MP
zh2I+vdsCV_i?L|K(Q-mGz`rr}`;1^x6vLNoRW&og&ggbqY0yeqX&Y*(;Z3#Q8~pA|
z9fi=Iku@Th<W88s`$u{nTQ&aT(xBge1#<<Aa7p?d_UeX>(e^(VGn&=dKm)3l>2+J}
z`H-EL`%b?(d<qt5_pyPjUF|~&scT4%2(B5!gBdUN4GN0<3!A2I^t(SlHZB|ctcn!t
zO}zF`Dy^CQ0w0OdT+kOJMi)WIea$Vtmtnl<3A~o|)F2*Gidb|YxO5EKMiXq4Su$@M
zqbhBU_7Sg37!NS}%fI4UH!%x&W`4kgUlKX=sF4Cm)Atp+dDhLa+pT1Fc(ansg2tjY
zy-NR|S%2pwhBu4)sQAU0Eu-O!HUztAfSGC%MrD$=ogEVTT=QF<5`@T}<ZjpS3#a-Y
zR37Q-jNjeSQtYR$doOxN%6BFow@`RK{6RY2lH2IP)%cM{KTvZBPl3Zu*#1|C|McP7
zi3iwy4IFp$=Lnm*Ot?KKn_;!Ng~gAq>nUhaz>Gh-X1y5~NoM&<x>@P_f%oc8M4zlp
zzg@usl(Z)r7w1*==he7xuct`JJcN59&)@445L;|A4US1GWgv7SnASOKEKyD|JzXRd
zPwn3%)bF~-cOvOXQ=Qj9L1Ckm@<Zs?hnr~ATWqmhXx>PS23k*TN({q~-2{8_&bdaP
zj85S12wEHp*qH}h_3&z&DWbp@6K4&TrDA*xWA5X8$Y?m)jnAFQ1OgYWcnCs7)AgFt
z+xlimR{s5Cbq)0)`P5YLJtA&SjeG}<bjGrI7L)GW74p?wVYR!W+OVSr3bduFvS%Hx
zrsm+?fOTxzG0nYW=p+BEULkRxPB@d%>18nb<=0-F|2udfZdtw#=#`GqApAugLJsBj
zNpkq{Na(ngd&#h!y%snl8Z+9CtMHjSGQ^$PvaH!~epfZNp&5SswZ2H|kOxy_4n{F_
zf6v+(g#7SEr|}CC?}1})${;6j?XICS%g>@X$O9$Xlt%km?@6txB6}$Swk~5Rxh3#C
zA(XOT`@6cvLac^M>i#44^!m5l#zj4T3TPVsN|ZpGL%i=so8i292S3fB^dTK8vEN%T
z$H%=g5`Cm*2pi`_Ip<Q_H81LD!XXx4r=k)T9ZfAAa7`=Ujk2&1-k&!)cvjhGJ7HG1
z+Jd0tmHYnXLK%Jv-5>n^BPR?b9Odzo?t7zH(ouPv-9ECb^z~Y2ViUeIPFNJ}gdlbe
z_jO*%Twit`FE$=wW=lI(A5Uh0(8{1rU;G}T9PJUd|B9=EXyY2ITQ>$lyClZYb`xJ^
z4+a*WwE}rc)!WOE77T?JvIuVHrK7jFBsObgIP8cid?4Z6zxITmRw}qmC;(9jhjaPd
z#@x#ez2GG1&kt@SmGkmC?RHl%oac)EjK42V7mkHKRODwsS3kuCgq~?fd6Z>YNWCNY
zL3K9!@kf;q41bLC!uL}*Z#)ra<+>BkB~7^d8Zn;KN<rLagZ{vgfu^iJ`ILR&TftxO
zN{c=o?zE0R>~<M4V0(?hdB3-=c&*dxK{5VIHr$R1?iW5u-SgIE*mGN}w|;F~g&*VM
z110%A;2;TV&zc6#G1b)lUZODBgOd}rbX~ENCNHyBt^uw>T#<P&aniJ%$>OXA5)7~M
z7TQWPkFo5>OgQ#CLYEj+88S+>XcC&1tY3NGzSNZs4-0T6(k7$*K<2iSXMIIHuj#zf
z;swssUJvZmX69k0$xNsZFl|n7*4BC{Toi-S^uV{Dgghj(ifzYO`rq=!X1sHSjX7kI
zhCC}7ws$F1fN~#>A%5_Gqh<f5^0V705nHiNu5^OX<c5I|D>GqqRIXN<?u=mqX;>XI
zXpE1B$K(#<G{R;Yxz_k!E23XIy+4)jv?+fg)eFIV!OgbKMVs}B9+CXDtmd{$5C)q2
zR~)U$d5dL*B>Z}OBiZ&I=d4xfs;*xXhx@qD{cSGwYbQZY{wnnfjD|JX`!`w!I+@zA
zfWr0RZQ}@BdA7W$1H9=eYrrHoN+db*HfwIQM5$;?ug9)31H$ieD}bUUT=b)7p2S(F
ze`MfNIx>5)vaR{ivBLg}db(hK`ZP!&#^pu!0)oEWW%nhW1l{jveoYhit@L|;jCmA!
z>p65-k19Pqaqy|Q%=AneamdM`$0Ub;UhQNnsxw}3gB`jjr-p(ou<YTckE?s4*~3Z5
zJI{swJ>S?`i+B^g*Z&}JRI`fS4G-rb*?J+Ps1sRYdLr=wgVc_s)ZA}C`azj4vs~p@
zq-O`c6JadVGJOhjsfWP5snz&!cMLtM1SjpcvgnJWy@dtBcYNDTOI2{qj}FThMtgPg
zJ9`E3QBrDe-m7_piu;_($+IPLS|g%F2OQTKNf`BDYv7Lr^K9zVMusv%!qM~R0;aXX
zQ}I!i!FpqZl<9XR>4|Ucsk)0FlWUwk3P&yVq0M>$wuOh?za%GWw#8%jk7%F=FviP+
zw=^zob*fB-8XoJO^Uh~|M8Gh>e7qq{tb=5LH}CAx!i&r8t=h2>Zy1_rOhpkz3#hHI
z3|Q^ekzf#&53<=P>i@2p=1K1j=xy#*><hzuj>QMFmdCYd#c%<L#JHqY3L*(YXhMu3
zDxQJw*u_KHFcz6!Ue~0}sYU{y7hT_gZjH#}|9U^W&Eu5JWKrp`o5)lwmUYO6Ri(;P
zz4kLN$C%fQHbTgu5g=6|RJ?&;!aspF9L>6B*N{ogHcmNlTlCfVykUq}r_+#rr6ysH
z%|vM63!BIFLBYZ!NAB10BsDC3s?9YHczw`7AdNLy$xqzf2A+zBk^%rq?ctvI;_lin
zAK5ujW!pVWgq)h8JgB@#hDvs?W_p{jB5H|G&c6&xg-41d(9oF0&o!HskmW6$_@?cw
zZwp#u{ejyaO}UgyuWQe-*VE!q89ct>m18IX+kAEuNHMRqqg{2@elPTnIRykGRfX}(
zMo7wFY2_%ChFt}(;aa`4exjv$XEp<vrsD6(*t3Uk7f=M>TGt9g7|jT=hF`X4w_(1J
ztY);_Xrs)Exk%E>b%Uk&6>-=;qCnHV{{Z*NnT>~9&dn$4;}?yvVba9C;jItw&^P+8
z9};eBrHj;|lRimupw8+@cG&*BF=5tii}=B8zNOS0zE#0bJzS=qwo1)bovqkS6AK3#
z>R#ddyaUrn8~?n@1E|*Pa?;Rho{tivxPw!kSTgFMZ9oU&wI|{^GU;0y7>U}5aBoxW
zXDn+DwoE8LpOdJ9ZmJ|wCzP)<?T4zwtO!g`if;Ut8m(e1yZt5-;s6kZc8nHc=Hue`
zehs7P)t%MRXS-F6_w~|{AAn-C$OkTo@&Wk7s!x)9+!Fe$tZ}^9gCwT`I%U5Y)?>Oo
zYq3?^jN7z@M2goo5u+{c=sY723wM^&uUSQ!T?8l&d6!wg*y|b=LTc)`iX1-lsjWEh
zh;<0@s}j`n*>$p%rt1H4plvU9cH@@LF_2+$8W<2Jk!?uFYD7FxoDJe1JWc*w4}6zm
z8Ad%EkMZTf+4|zt6^TA)vwi`}ePPmV)e7IQpc37d{BqRkE{(+ZYU%)iG<k|DRI#?L
zaMJ$z>lJw$$2%Zh^aJmOpW|k$f;gbgRdeW*(Wa|ROB6%o2V&C`n~>jD#Xopx4u83r
zjvF=CaM*C>@b3M{<|TuLJ2K}%ToRi_GFj}SL)db|N&6F3!YIo)h*)sZvbrocoOK}4
zK}@FM9N{vLrhr<QQpcQEK~fooxD_8!EW~<iJ;{#uQrVVS1D)1yTr~LW-z)2weqtF>
zKzB#%JK@wj5H>l~M*Ne4F?z2(TX5d^jy?LrISx?O6GMHFBs_7yx!7H4#zFSbz&#iN
z3+yQj45aKDHaH7_Ja)-`l;fgdLjU)PG~J-CiF;)MtnwM5KR4PLu$VN4*SoSB`5c3N
zjI?(7lE;!1sy3AG2mxlrY<CInBF1Efmkel)Q(q(_3{s;B&v9x78aB~m*yhQng3Fsf
z<EmiPQ}i1rlyH#fkqN7U=%U_O<!aS)MBV<qP<0tpVoMZtRjm)@v2B_Ib+t|det$RD
zKehk)&zm;<edPkqXff6(B~S029mj<CY}jt2(!=(R49KJBVGQdwg!w=yQ+l2dSVo4k
zd2V)smWAqfu=DgvF9G&6$YweX%{=7AgdZcR0wZJXoK(&i4o8PL0d=j~IlgiuM8kB5
zp5P)Wrj(JwpIVB5@^tt^uM141ie4gdv@LLct20OaC_b*h?c@9Mxzk%)ez}xs?SMY5
zJwEfWSC3@rQ6F7X#NbD)qivO}XUHcRJYc`SvJLj$6xof8d}BEU8I+DzYelDaJBlS#
zua*(mhB97Rwzo7!H<$@X>66J&|GdHf?V(v!)z`f2axCPBmX?0qFE0YZGx2h2&SZ^-
zc_qK!OFz#F{^z2#;kV~9Wt=-Ja`nRLuNcxraj>5>PA6$U)2E_0WiRuJ;ja3@E&S%a
zpA$<gYV!RKje=g%&S@N{^S>uGfRcu9@M&yO-?33t&y_tFysOK6xXW0d8rs5->Bubm
ztTDRz6cqut#|Sp8(so-1+GFg$Pj;%|z?kPx{5SK_ZM~_P(G7rZ;wUWR#*2d-#9Kx;
zqh&$(7B)QICWTswJg<nydd+EmL&U@UBWIqPiN{%W{z|jlygrB&@zkynQCq3;b0#WP
z@*)!LFVGAbqk3f@i0GjK3XN&cW7jO~9xJM}?{VXPI%3cob9H*emQ0DUdOftVWv!!|
zu~ya(H=7f&!<>UO>H7GTve>x{H)fXtTyf5}ai<wy5Zrt<F!@z&SfFh(Zbmk?$l)1!
z)sng1zVVPB?I+n)Ivo?4hs`j(37thT9C@K#a+GRt-$~P4W$T*XoNxib%XbY;_PI3t
z*S~~zr9b#Qq51yT%A7_{xuPdOV<0o5V{3gu@>d6B5VLLdwPz`9+?RLsSTd`V<H??-
zyheWBDf?#Xw&VUucLKkWa-yLGv1@Rw2&u0O0|{VK#L24|hTj%%y4~h5U&N6Y*!5qU
z-keG|lMHwR7avN37>^+?{ux%CJ-SosWAc5%|LD*L6sC@S4*aP^@!WtmGW4C`9;942
zS=V)K#2)(4$}nw0H@%Ejk4fHQZPogN8j+}IJQ3Ro|A3P9VU@k)m&GdQa~vCG@?gsD
z&$<VIYGMjsinw%Mo3pKEm4Dqzaa*z&*x&PUs)y3xJG)M{M}La|mHN{C_kBdjHLb+5
z_um|#cX!UL_?C@MLhr_x@i#t_f6U3~9xfB7KT;tXr_zzz)-0X=Jhi1IXv=~KirT+3
z{Dv>2|B6o^%j6Rvd$Iu%Rw^8PX_>NehR_NqlAsDxI=c^R>(;`F<;ACyu3KO7uTu=M
zo;9!JDR_9FmU?iv+nIGDvGagAHqL7WKsym^=OF|xm^-LvnEGDOZcb*uszuP7e6scW
zKiSR#;D-5xKPwbxWi_u;4xeW+##xOUmk3+FC2bwc3~pRs>cn+<BssZyEAAz^04g>d
zxisHhZXtar1X^Z|5h}&9s%2TJCO*w}W)ZXWJu@isS+(JcnB^iRPqIKB=W)T_o8oN_
z=Z?e!)ks{5CIW&}_t)oR^G`X8_l;cg_WaxZj>Xye$De!%d``5%(s}@1$|5H~u6hV>
zOH5ENFhD}_vId01;tQk*VMrW<5YYU8wzmF1I$!^{{I`qdDH!mF?Aag9PQ7(>4=_MQ
MK?6}EXBqZ?0O=Vi(*OVf


From edb1e07948416d12351dbc9e5d4b9896a53f0de7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 15 Nov 2012 10:53:09 +0100
Subject: [PATCH 129/143] [FIX] composer: default content subtype is html (note
 that plaintext management will be removed asap), name_get is now using an id
 list instead of a single id.

bzr revid: tde@openerp.com-20121115095309-zu4m6nzndlpmfe5b
---
 addons/mail/wizard/mail_compose_message.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py
index 45082b9be4d..839a3a6970e 100644
--- a/addons/mail/wizard/mail_compose_message.py
+++ b/addons/mail/wizard/mail_compose_message.py
@@ -114,7 +114,7 @@ class mail_compose_message(osv.TransientModel):
 
     _defaults = {
         'composition_mode': 'comment',
-        'content_subtype': lambda self, cr, uid, ctx={}: 'plain',
+        'content_subtype': lambda self, cr, uid, ctx={}: 'html',
         'body_text': lambda self, cr, uid, ctx={}: False,
         'body': lambda self, cr, uid, ctx={}: '',
         'subject': lambda self, cr, uid, ctx={}: False,
@@ -135,7 +135,7 @@ class mail_compose_message(osv.TransientModel):
                 related to.
             :param int res_id: id of the document record this mail is related to
         """
-        doc_name_get = self.pool.get(model).name_get(cr, uid, res_id, context=context)
+        doc_name_get = self.pool.get(model).name_get(cr, uid, [res_id], context=context)
         if doc_name_get:
             record_name = doc_name_get[0][1]
         else:

From 71c2be227cd1a8188db6f961d7d358099873e37a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 15 Nov 2012 10:53:29 +0100
Subject: [PATCH 130/143] [IMP] mail: updated tests to fit the new composer
 behavior.

bzr revid: tde@openerp.com-20121115095329-whh6z7ckto87yven
---
 addons/mail/tests/test_mail.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/mail/tests/test_mail.py b/addons/mail/tests/test_mail.py
index 1cdb966ccbc..02b55cef9f7 100644
--- a/addons/mail/tests/test_mail.py
+++ b/addons/mail/tests/test_mail.py
@@ -463,7 +463,8 @@ class test_mail(test_mail_mockup.TestMailMockups):
         # 1. Comment group_pigs with body_text and subject
         compose_id = mail_compose.create(cr, uid,
             {'subject': _subject, 'body_text': _body_text, 'partner_ids': [(4, p_c_id), (4, p_d_id)]},
-            {'default_composition_mode': 'comment', 'default_model': 'mail.group', 'default_res_id': self.group_pigs_id})
+            {'default_composition_mode': 'comment', 'default_model': 'mail.group', 'default_res_id': self.group_pigs_id,
+                'default_content_subtype': 'plaintext'})
         compose = mail_compose.browse(cr, uid, compose_id)
         # Test: mail.compose.message: composition_mode, model, res_id
         self.assertEqual(compose.composition_mode,  'comment', 'mail.compose.message incorrect composition_mode')

From 25c684b1712796fad879596d19fa27cafbe03846 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 15 Nov 2012 10:54:00 +0100
Subject: [PATCH 131/143] [FIX] Chatter: fixed posting on user/partner. Cleaned
 a bit default options of mail.js.

bzr revid: tde@openerp.com-20121115095400-u7h6rw8ltp0xprtt
---
 addons/mail/mail_thread_view.xml  |  2 +-
 addons/mail/res_partner.py        |  3 ++-
 addons/mail/res_users.py          | 11 ++++-------
 addons/mail/static/src/js/mail.js |  8 ++------
 4 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/addons/mail/mail_thread_view.xml b/addons/mail/mail_thread_view.xml
index cdeade04d84..3a37218c813 100644
--- a/addons/mail/mail_thread_view.xml
+++ b/addons/mail/mail_thread_view.xml
@@ -7,7 +7,7 @@
             <field name="res_model">mail.message</field>
             <field name="context">{
               'default_model': 'res.users', 
-              'default_res_id': uid
+              'default_res_id': uid,
             }</field>
             <field name="params" eval="&quot;{
                 'domain': [
diff --git a/addons/mail/res_partner.py b/addons/mail/res_partner.py
index df85ac3f17f..157699bd330 100644
--- a/addons/mail/res_partner.py
+++ b/addons/mail/res_partner.py
@@ -57,7 +57,8 @@ class res_partner_mail(osv.Model):
             if thread_id not in partner_ids:
                 partner_ids.append(thread_id)
             kwargs['partner_ids'] = partner_ids
-            return super(res_partner_mail, self).message_post(cr, uid, False, body=body, subject=subject,
+            thread_id = False
+        return super(res_partner_mail, self).message_post(cr, uid, thread_id, body=body, subject=subject,
                 type=type, subtype=subtype, parent_id=parent_id, attachments=attachments, context=context, **kwargs)
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mail/res_users.py b/addons/mail/res_users.py
index 932c4dd9518..fcca12024b7 100644
--- a/addons/mail/res_users.py
+++ b/addons/mail/res_users.py
@@ -113,7 +113,8 @@ class res_users(osv.Model):
         alias_pool.unlink(cr, uid, alias_ids, context=context)
         return res
 
-    def message_post_api(self, cr, uid, thread_id, body='', subject=False, parent_id=False, attachment_ids=None, context=None):
+    def message_post_user_api(self, cr, uid, thread_id, body='', subject=False, parent_id=False,
+                                attachment_ids=None, context=None, content_subtype='plaintext', **kwargs):
         """ Redirect the posting of message on res.users to the related partner.
             This is done because when giving the context of Chatter on the
             various mailboxes, we do not have access to the current partner_id.
@@ -124,8 +125,8 @@ class res_users(osv.Model):
         if isinstance(thread_id, (list, tuple)):
             thread_id = thread_id[0]
         partner_id = self.pool.get('res.users').read(cr, uid, thread_id, ['partner_id'], context=context)['partner_id'][0]
-        return self.pool.get('res.partner').message_post_api(cr, uid, partner_id, body=body, subject=subject,
-            parent_id=parent_id, attachment_ids=attachment_ids, context=context)
+        return self.pool.get('res.partner').message_post_user_api(cr, uid, partner_id, body=body, subject=subject,
+            parent_id=parent_id, attachment_ids=attachment_ids, context=context, content_subtype=content_subtype, **kwargs)
 
     def message_post(self, cr, uid, thread_id, context=None, **kwargs):
         """ Redirect the posting of message on res.users to the related partner.
@@ -140,10 +141,6 @@ class res_users(osv.Model):
         partner_id = self.pool.get('res.users').read(cr, uid, thread_id, ['partner_id'], context=context)['partner_id'][0]
         return self.pool.get('res.partner').message_post(cr, uid, partner_id, context=context, **kwargs)
 
-    def message_update(self, cr, uid, ids, msg_dict, update_vals=None, context=None):
-        partner_id = self.pool.get('res.users').browse(cr, uid, ids)[0].partner_id.id
-        return self.pool.get('res.partner').message_update(cr, uid, [partner_id], msg_dict,
-            update_vals=update_vals, context=context)
 
 class res_users_mail_group(osv.Model):
     """ Update of res.users class
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index e93a762981b..75852a9d9b1 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -24,7 +24,7 @@ openerp.mail = function (session) {
                  */
                 var context_keys = ['default_template_id', 'default_composition_mode', 
                     'default_use_template', 'default_partner_ids', 'default_model',
-                    'default_res_id', 'default_content_subtype', , 'default_subject',
+                    'default_res_id', 'default_content_subtype', 'default_subject',
                     'default_body', 'active_id', 'lang', 'bin_raw', 'tz',
                     'active_model', 'edi_web_url_view', 'active_ids', 
                     'default_attachment_ids']
@@ -521,8 +521,6 @@ openerp.mail = function (session) {
         on_compose_fullmail: function (default_composition_mode) {
             if (default_composition_mode == 'reply') {
                 var context = {
-                    'default_model': this.context.default_model,
-                    'default_res_id': this.context.default_res_id,
                     'default_composition_mode': default_composition_mode,
                     'default_parent_id': this.id,
                     'default_body': mail.ChatterUtils.get_text2html(this.$el ? (this.$el.find('textarea:not(.oe_compact)').val() || '') : ''),
@@ -532,7 +530,6 @@ openerp.mail = function (session) {
                 var context = {
                     'default_model': this.context.default_model,
                     'default_res_id': this.context.default_res_id,
-                    'default_content_subtype': 'html',
                     'default_composition_mode': default_composition_mode,
                     'default_parent_id': this.id,
                     'default_body': mail.ChatterUtils.get_text2html(this.$el ? (this.$el.find('textarea:not(.oe_compact)').val() || '') : ''),
@@ -1699,7 +1696,6 @@ openerp.mail = function (session) {
                     views: [[false, 'form']],
                     target: 'new',
                     context: {
-                        'default_content_subtype': 'html',
                     },
                 };
                 session.client.action_manager.do_action(action);
@@ -1733,7 +1729,7 @@ openerp.mail = function (session) {
                 view_type: 'form',
                 views: [[false, 'form']],
                 target: 'new',
-                context: { 'default_content_subtype': 'html' },
+                context: {},
             };
             session.client.action_manager.do_action(action);
         },

From 9aec899257f99c3567e9b9b96495e086cc274258 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 15 Nov 2012 11:05:33 +0100
Subject: [PATCH 132/143] [FIX] Chatter: fixed rpely to a lonely message, that
 was badly indented.

bzr revid: tde@openerp.com-20121115100533-ly99op6fpfrzp9jw
---
 addons/mail/static/src/js/mail.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 75852a9d9b1..37090543b8c 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -598,16 +598,15 @@ openerp.mail = function (session) {
                         this.parent_thread.context
                     ]).done(function (record) {
                         var thread = self.parent_thread;
-
                         if (self.options.display_indented_thread < self.thread_level && thread.parent_message) {
-                            thread = thread.parent_message.parent_thread;
+                            var hread = thread.parent_message.parent_thread;
                         }
+                        var root = thread == self.options.root_thread;
                         // create object and attach to the thread object
                         thread.message_fetch([['id', 'child_of', [self.id]]], false, [record], function (arg, data) {
-                            data[0].no_sorted = true;
                             var message = thread.create_message_object( data[0] );
                             // insert the message on dom
-                            thread.insert_message( message, self.$el );
+                            thread.insert_message( message, root ? undefined : self.$el, root );
                             if (thread.parent_message) {
                                 self.$el.remove();
                                 self.parent_thread.compose_message = null;
@@ -1272,7 +1271,7 @@ openerp.mail = function (session) {
          * The sort is define by the thread_level (O for newer on top).
          * @param : {object} ThreadMessage object
          */
-        insert_message: function (message, dom_insert_after) {
+        insert_message: function (message, dom_insert_after, prepend) {
             var self=this;
             if (this.options.show_compact_message > this.thread_level) {
                 this.instantiate_compose_message();
@@ -1284,6 +1283,8 @@ openerp.mail = function (session) {
 
             if (dom_insert_after) {
                 message.insertAfter(dom_insert_after);
+            }if (prepend) {
+                message.prependTo(self.$el);
             } else {
                 message.appendTo(self.$el);
             }

From 2cfef36846745dbd6b03288f9e223ce9977195ca Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 15 Nov 2012 11:07:40 +0100
Subject: [PATCH 133/143] [MERGE] improved welcome messages and mail css

bzr revid: fp@tinyerp.com-20121115100740-3pbot8zfu64s4ods
---
 addons/account_accountant/account_accountant_data.xml | 4 ++--
 addons/crm/crm_data.xml                               | 2 +-
 addons/hr_evaluation/hr_evaluation_data.xml           | 4 ++--
 addons/hr_recruitment/hr_recruitment_data.xml         | 2 +-
 addons/mail/data/mail_group_data.xml                  | 4 ++--
 addons/mail/static/src/css/mail.css                   | 5 ++++-
 addons/mrp/mrp_data.xml                               | 2 +-
 addons/project/project_data.xml                       | 2 +-
 addons/project_gtd/project_gtd_data.xml               | 2 +-
 addons/project_issue/project_issue_data.xml           | 4 ++--
 addons/sale/sale_data.xml                             | 2 +-
 11 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/addons/account_accountant/account_accountant_data.xml b/addons/account_accountant/account_accountant_data.xml
index 14d8f59a5fe..c7d6eb80bc6 100644
--- a/addons/account_accountant/account_accountant_data.xml
+++ b/addons/account_accountant/account_accountant_data.xml
@@ -28,8 +28,8 @@
             <field name="type">notification</field>
             <field name="subtype_id" ref="mail.mt_comment"/>
             <field name="subject">Accounting and Finance application installed!</field>
-            <field name="body"><![CDATA[<p>With OpenERP's accounting, you get instant access to your financial  data, and can setup analytic accounting, forecast taxes, control  budgets, easily create and send invoices, record bank statements, etc.</p>
-<p>The accounting features are fully integrated  with other OpenERP applications to automate all your processes:  creation of customer invoices, control of supplier invoices,  point-of-sale integration, automated follow-ups, etc.</p>]]></field>
+            <field name="body"><![CDATA[<p>With OpenERP's accounting, you get instant access to your financial data, and can setup analytic accounting, forecast taxes, control budgets, easily create and send invoices, record bank statements, etc.</p>
+<p>The accounting features are fully integrated with other OpenERP applications to automate all your processes: creation of customer invoices, control of supplier invoices, point-of-sale integration, automated follow-ups, etc.</p>]]></field>
         </record>
     </data>
 </openerp>
diff --git a/addons/crm/crm_data.xml b/addons/crm/crm_data.xml
index 91117d2d83e..f2bf56e34ac 100644
--- a/addons/crm/crm_data.xml
+++ b/addons/crm/crm_data.xml
@@ -61,7 +61,7 @@
             <field name="subtype_id" ref="mail.mt_comment"/>
             <field name="subject">CRM application installed!</field>
             <field name="body"><![CDATA[<p>From the top Sales menu you can track leads and opportunities, get accurate forecast on your sales pipeline, plan meetings and phonecalls, get realtime statistics and efficiently organize the communication with your prospects.</p>
-<br />To manage quotations and sale orders, install the "Sales Management" application.</p>]]></field>
+<p>To manage quotations and sale orders, install the "Sales Management" application.</p>]]></field>
         </record>
 
         <record model="mail.alias" id="default_sales_alias">
diff --git a/addons/hr_evaluation/hr_evaluation_data.xml b/addons/hr_evaluation/hr_evaluation_data.xml
index 45100b14e2a..2afb5200091 100644
--- a/addons/hr_evaluation/hr_evaluation_data.xml
+++ b/addons/hr_evaluation/hr_evaluation_data.xml
@@ -811,8 +811,8 @@ Once the form had been filled, the employee send it to his supervisor.
             <field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
             <field name="descriptive_text">* His direct reports will be invited through OpenERP to express a feedback on their supervisor's leadership and to give their opinion about their own engagement and effectiveness, the continuous improvement and openness in action in the company, ...
 
-* The employees will send back their anonymous answers to OpenERP. The data will be handled by the HR manager and a  brief summary of the data will be sent to the concerned supervisor, to his team and to the supervisor's supervisor.
-* The appraiser should rate the employee’s major work accomplishments and     performance according to the metric provided below :
+* The employees will send back their anonymous answers to OpenERP. The data will be handled by the HR manager and a brief summary of the data will be sent to the concerned supervisor, to his team and to the supervisor's supervisor.
+* The appraiser should rate the employee’s major work accomplishments and performance according to the metric provided below :
 
     1 - Significantly exceeds standards and expectations required of the position
     2 - Exceeds standards and expectations
diff --git a/addons/hr_recruitment/hr_recruitment_data.xml b/addons/hr_recruitment/hr_recruitment_data.xml
index f1c8ed46aca..adaeed81205 100644
--- a/addons/hr_recruitment/hr_recruitment_data.xml
+++ b/addons/hr_recruitment/hr_recruitment_data.xml
@@ -8,7 +8,7 @@
             <field name="type">notification</field>
             <field name="subtype_id" ref="mail.mt_comment"/>
             <field name="subject">Recruitment Process application installed!</field>
-            <field name="body"><![CDATA[<p>Manage job positions and your company's recruitment process.  This application is integrated with the Survey application to help you define interviews for different jobs.</p>
+            <field name="body"><![CDATA[<p>Manage job positions and your company's recruitment process. This application is integrated with the Survey application to help you define interviews for different jobs.</p>
 <p>You can automatically receive job application though an email gateway, see the Human Resources settings.</p>]]></field>
         </record>
 
diff --git a/addons/mail/data/mail_group_data.xml b/addons/mail/data/mail_group_data.xml
index aae30226bf2..6d3e5395eda 100644
--- a/addons/mail/data/mail_group_data.xml
+++ b/addons/mail/data/mail_group_data.xml
@@ -19,8 +19,8 @@
             <field name="type">notification</field>
             <field name="subtype_id" ref="mail.mt_comment"/>
             <field name="subject">Welcome to OpenERP!</field>
-            <field name="body"><![CDATA[<p>Your homepage is a summary of messages you received and key information about documents you follow.<br />
-The top menu bar contains all applications you installed. You can use this &lt;i&gt;Settings&lt;/i&gt; menu to install more applications, activate others features or give access to new users.<br />
+            <field name="body"><![CDATA[<p>Your homepage is a summary of messages you received and key information about documents you follow.</p><p>
+The top menu bar contains all applications you installed. You can use this <i>Settings</i> menu to install more applications, activate others features or give access to new users.</p><p>
 To setup your preferences (name, email signature, avatar), click on the top right corner.</p>]]></field>
         </record>
     </data>
diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index 0bcfd0d3733..b0ce6d499b5 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -87,8 +87,11 @@
     margin-bottom: 0px;
     margin-top: 2px;
 }
-.openerp .oe_mail .oe_msg .oe_msg_content .oe_msg_body p{
+.openerp .oe_mail .oe_msg .oe_msg_content .oe_msg_body p:first-of-type {
     margin-top: 0px;
+}
+
+.openerp .oe_mail .oe_msg .oe_msg_content .oe_msg_body p {
     margin-bottom: 0px;
 }
 
diff --git a/addons/mrp/mrp_data.xml b/addons/mrp/mrp_data.xml
index 1d92609eb7e..a6b65b7c475 100644
--- a/addons/mrp/mrp_data.xml
+++ b/addons/mrp/mrp_data.xml
@@ -8,7 +8,7 @@
             <field name="type">notification</field>
             <field name="subtype_id" ref="mail.mt_comment"/>
             <field name="subject">MRP application installed!</field>
-            <field name="body"><![CDATA[<p>Manage your manufacturing process with OpenERP by defining your bills of materials (BoM), routings and work centers.<br />
+            <field name="body"><![CDATA[<p>Manage your manufacturing process with OpenERP by defining your bills of materials (BoM), routings and work centers.</p><p>
 This application supports complete integration and production scheduling for stockable goods, consumables, and services.</p>
 <p>From the Manufacturing Settings, you can choose to compute production schedules periodically or just-in-time.</p>]]></field>
         </record>
diff --git a/addons/project/project_data.xml b/addons/project/project_data.xml
index c5980ecddd2..08981bd126a 100644
--- a/addons/project/project_data.xml
+++ b/addons/project/project_data.xml
@@ -128,7 +128,7 @@
             <field name="subtype_id" ref="mail.mt_comment"/>
             <field name="subject">Project Management application installed!</field>
             <field name="body"><![CDATA[<p>Manage multi-level projects and tasks.  You can delegate tasks, track task work, and review your planning.</p>
-<p>You can manage todo lists on tasks by installing the "Todo Lists" application, supporting the Getting Things Done (GTD) methodology.</p>
+<p>You can manage todo lists on tasks by installing the <i>Todo Lists</i> application, supporting the Getting Things Done (GTD) methodology.</p>
 <p>You can also manage issues/bugs in projects by installing the "Issue Tracker" application.</p>]]></field>
         </record>
     </data>
diff --git a/addons/project_gtd/project_gtd_data.xml b/addons/project_gtd/project_gtd_data.xml
index 1536ac4be3f..9d8c99f23ff 100644
--- a/addons/project_gtd/project_gtd_data.xml
+++ b/addons/project_gtd/project_gtd_data.xml
@@ -32,7 +32,7 @@
             <field name="type">notification</field>
             <field name="subtype_id" ref="mail.mt_comment"/>
             <field name="subject">Todo Lists application installed!</field>
-            <field name="body"><![CDATA[<p>Add todo items on project tasks, to help you organize your work.
+            <field name="body"><![CDATA[<p>Add todo items on project tasks, to help you organize your work.</p><p>
 This application supports the Getting Things Done (GTD) methodology, based on David Allen's book.</p>]]></field>
         </record>
 
diff --git a/addons/project_issue/project_issue_data.xml b/addons/project_issue/project_issue_data.xml
index d70cd71e240..c1460167097 100644
--- a/addons/project_issue/project_issue_data.xml
+++ b/addons/project_issue/project_issue_data.xml
@@ -38,8 +38,8 @@
             <field name="type">notification</field>
             <field name="subtype_id" ref="mail.mt_comment"/>
             <field name="subject">Issue Tracker application installed!</field>
-            <field name="body"><![CDATA[<p>Manage the issues you might face in a project, such as bugs in a system, client complaints or material breakdowns.
-You can record issues, assign them to a responsible person, and keep track of their status as they evolve over time.
+            <field name="body"><![CDATA[<p>Manage the issues you might face in a project, such as bugs in a system, client complaints or material breakdowns.</p><p>
+You can record issues, assign them to a responsible person, and keep track of their status as they evolve over time.</p><p>
 Access all issues from the top Project menu, and access the issues of a specific project via the projects gallery view.</p>]]></field>
         </record>
 
diff --git a/addons/sale/sale_data.xml b/addons/sale/sale_data.xml
index d5ed8e810d6..3fe03966da2 100644
--- a/addons/sale/sale_data.xml
+++ b/addons/sale/sale_data.xml
@@ -41,7 +41,7 @@
             <field name="subtype_id" ref="mail.mt_comment"/>
             <field name="subject">Sales Management application installed!</field>
             <field name="body"><![CDATA[<p>This application lets you create and send quotations and process your sales orders; from delivery to invoicing.</p>
-<p>If you need to manage your sales pipeline (leads, opportunities, phonecalls), the &lt;i&gt;CRM&lt;/i&gt; application may be useful. Use the Settings menu to install it.</p>]]></field>
+<p>If you need to manage your sales pipeline (leads, opportunities, phonecalls), the <i>CRM</i> application may be useful. Use the Settings menu to install it.</p>]]></field>
         </record>
     </data>
 </openerp>

From bd494ad7f41862662950d813f6b4aaea94277526 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Thu, 15 Nov 2012 11:13:29 +0100
Subject: [PATCH 134/143] [FIX] project_issue: missing module prefix when
 updating project demo data

Fixes test breakage by FP - commit 8045
revision-id: fp@openerp.com-20121114224452-4djljq2ny7f1lumx

bzr revid: odo@openerp.com-20121115101329-3d2epoctqwkq9mlq
---
 addons/project_issue/project_issue_demo.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/project_issue/project_issue_demo.xml b/addons/project_issue/project_issue_demo.xml
index 86e4c59b571..63fa37c84c3 100644
--- a/addons/project_issue/project_issue_demo.xml
+++ b/addons/project_issue/project_issue_demo.xml
@@ -2,19 +2,19 @@
 <openerp>
     <data>
 
-        <record id="project_project_1" model="project.project">
+        <record id="project.project_project_1" model="project.project">
             <field name="use_issues" eval="True"/>
         </record>
-        <record id="project_project_2" model="project.project">
+        <record id="project.project_project_2" model="project.project">
             <field name="use_issues" eval="True"/>
         </record>
-        <record id="project_project_3" model="project.project">
+        <record id="project.project_project_3" model="project.project">
             <field name="use_issues" eval="True"/>
         </record>
-        <record id="project_project_4" model="project.project">
+        <record id="project.project_project_4" model="project.project">
             <field name="use_issues" eval="True"/>
         </record>
-        <record id="project_project_5" model="project.project">
+        <record id="project.project_project_5" model="project.project">
             <field name="use_issues" eval="True"/>
         </record>
 

From d530905b93493430aaea0d359a52140659490f1d Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 15 Nov 2012 11:22:23 +0100
Subject: [PATCH 135/143] [IMP] Add default filter on groups

bzr revid: fp@tinyerp.com-20121115102223-i2jgjkgqf9pxez08
---
 addons/mail/mail_group.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mail/mail_group.py b/addons/mail/mail_group.py
index d4c9c565bf3..b163882577b 100644
--- a/addons/mail/mail_group.py
+++ b/addons/mail/mail_group.py
@@ -130,7 +130,7 @@ class mail_group(osv.Model):
             params = {
                 'search_view_id': search_ref and search_ref[1] or False,
                 'domain': [('model', '=', 'mail.group'), ('res_id', '=', mail_group_id)],
-                'context': {'default_model': 'mail.group', 'default_res_id': mail_group_id},
+                'context': {'default_model': 'mail.group', 'default_res_id': mail_group_id, 'search_default_message_unread': True},
                 'res_model': 'mail.message',
                 'thread_level': 1,
             }

From 8fe036423c78467c9edce38abbdd0acbf60d07d9 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 15 Nov 2012 11:25:22 +0100
Subject: [PATCH 136/143] [FIX] show of image groups

bzr revid: fp@tinyerp.com-20121115102522-jquurlypugesxu1e
---
 addons/mail/static/src/css/mail_group.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mail/static/src/css/mail_group.css b/addons/mail/static/src/css/mail_group.css
index 467bc53d80f..c1cefee9070 100644
--- a/addons/mail/static/src/css/mail_group.css
+++ b/addons/mail/static/src/css/mail_group.css
@@ -52,7 +52,7 @@
   border-collapse: separate;
   -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4);
   -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4);
-  box-shadow: 0 1px 4px 3px rgba(0, 0, 0, 0.4);
+  box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4);
   -o-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4);
 }
 

From d3cf004baeba4e1d0b26a6d4f0ce1cb0e2138575 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 15 Nov 2012 11:27:41 +0100
Subject: [PATCH 137/143] [IMP] web_linkedin: adapted to new linkedin api

bzr revid: nicolas.vanhoren@openerp.com-20121115102741-9vzb8qprvrh1lsmz
---
 addons/web_linkedin/static/src/js/linkedin.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/web_linkedin/static/src/js/linkedin.js b/addons/web_linkedin/static/src/js/linkedin.js
index ec58c3736f4..d6237e48d51 100644
--- a/addons/web_linkedin/static/src/js/linkedin.js
+++ b/addons/web_linkedin/static/src/js/linkedin.js
@@ -20,7 +20,7 @@ openerp.web_linkedin = function(instance) {
                 var tag = document.createElement('script');
                 tag.type = 'text/javascript';
                 tag.src = "http://platform.linkedin.com/in.js";
-                tag.innerHTML = 'api_key : ' + self.api_key + '\nauthorize : true';
+                tag.innerHTML = 'api_key : ' + self.api_key + '\nauthorize : true\nscope: r_network r_contactinfo';
                 document.getElementsByTagName('head')[0].appendChild(tag);
                 self.linkedin_added = true;
                 $(tag).load(function() {
@@ -107,7 +107,7 @@ openerp.web_linkedin = function(instance) {
                 }
                 to_change.website = entity.websiteUrl;
                 to_change.phone = false;
-                _.each(entity.locations.values || [], function(el) {
+                _.each((entity.locations || {}).values || [], function(el) {
                     to_change.phone = el.contactInfo.phone1;
                 });
                 var children_def = $.Deferred();

From 15b23a76aeded2cff747d1dedaeab6ae6357eb27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 15 Nov 2012 11:35:01 +0100
Subject: [PATCH 138/143] [REM] Chatter: removed unused template in xml.

bzr revid: tde@openerp.com-20121115103501-wt837acx8kj1ycht
---
 addons/mail/static/src/xml/mail.xml | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 2ba1733043a..89fbe45dc36 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -95,14 +95,6 @@
         </t>
     </t>
 
-    <t t-name="mail.thread.message.private">
-        <div>
-            <span class="oe_placeholder_checkbox_private"/>
-            <span class="oe_send_private">This email is private.</span>
-            <span class="oe_send_public">I wrote for contacts and all my followers.</span>
-        </div>
-    </t>
-
     <!--
         template to the recipients list
         -->

From c6b5ca0a078c83f211dc469f3ca764400f3586e6 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 15 Nov 2012 11:39:47 +0100
Subject: [PATCH 139/143] [FIX] typo in a message

bzr revid: fp@tinyerp.com-20121115103947-zre3ja8ghnojesd1
---
 addons/mail/data/mail_group_data.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mail/data/mail_group_data.xml b/addons/mail/data/mail_group_data.xml
index 6d3e5395eda..64d989f9e9d 100644
--- a/addons/mail/data/mail_group_data.xml
+++ b/addons/mail/data/mail_group_data.xml
@@ -20,7 +20,7 @@
             <field name="subtype_id" ref="mail.mt_comment"/>
             <field name="subject">Welcome to OpenERP!</field>
             <field name="body"><![CDATA[<p>Your homepage is a summary of messages you received and key information about documents you follow.</p><p>
-The top menu bar contains all applications you installed. You can use this <i>Settings</i> menu to install more applications, activate others features or give access to new users.</p><p>
+The top menu bar contains all applications you installed. You can use the <i>Settings</i> menu to install more applications, activate others features or give access to new users.</p><p>
 To setup your preferences (name, email signature, avatar), click on the top right corner.</p>]]></field>
         </record>
     </data>

From c2667f13adadbe9f0cbb0f65c7283dd5b1a71dfa Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 15 Nov 2012 11:43:45 +0100
Subject: [PATCH 140/143] [IMP] Inverting personnal tasks and notes
 importancies

bzr revid: fp@tinyerp.com-20121115104345-1dkpg3rrk2j84wnj
---
 addons/note/__openerp__.py        | 1 +
 addons/project_gtd/__openerp__.py | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/note/__openerp__.py b/addons/note/__openerp__.py
index d87ee70086d..797270637e2 100644
--- a/addons/note/__openerp__.py
+++ b/addons/note/__openerp__.py
@@ -38,6 +38,7 @@ Notes can be found in the 'Home' menu.
     'author': 'OpenERP SA',
     'website': 'http://openerp.com',
     'summary': 'Sticky notes, Collaborative, Memos',
+    'sequence': 9,
     'depends': [
         'mail',
     ],
diff --git a/addons/project_gtd/__openerp__.py b/addons/project_gtd/__openerp__.py
index 441f8859dc6..c99535f63fd 100644
--- a/addons/project_gtd/__openerp__.py
+++ b/addons/project_gtd/__openerp__.py
@@ -24,7 +24,7 @@
     'name': 'Todo Lists',
     'version': '1.0',
     'category': 'Project Management',
-    'sequence': 9,
+    'sequence': 100,
     'summary': 'Personal Tasks, Contexts, Timeboxes',
     'description': """
 Implement concepts of the "Getting Things Done" methodology 

From 6227e4b5c04b9ee861511a45f7b50806e27cf33c Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Thu, 15 Nov 2012 13:03:31 +0100
Subject: [PATCH 141/143] [FIX] CrashManager do not have destroy() method

bzr revid: chs@openerp.com-20121115120331-ltujwzobh19muygl
---
 addons/web/static/src/js/chrome.js | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 2753cb45d1e..f5fc7b8f632 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -190,7 +190,14 @@ instance.web.Dialog = instance.web.Widget.extend({
 });
 
 instance.web.CrashManager = instance.web.Class.extend({
+    init: function() {
+        this.active = true;
+    },
+
     rpc_error: function(error) {
+        if (!this.active) {
+            return;
+        }
         if (error.data.fault_code) {
             var split = ("" + error.data.fault_code).split('\n')[0].split(' -- ');
             if (split.length > 1) {
@@ -205,6 +212,9 @@ instance.web.CrashManager = instance.web.Class.extend({
         }
     },
     show_warning: function(error) {
+        if (!this.active) {
+            return;
+        }
         instance.web.dialog($('<div>' + QWeb.render('CrashManager.warning', {error: error}) + '</div>'), {
             title: "OpenERP " + _.str.capitalize(error.type),
             buttons: [
@@ -213,7 +223,9 @@ instance.web.CrashManager = instance.web.Class.extend({
         });
     },
     show_error: function(error) {
-        var self = this;
+        if (!this.active) {
+            return;
+        }
         var buttons = {};
         buttons[_t("Ok")] = function() {
             $(this).dialog("close");
@@ -642,7 +654,7 @@ instance.web.client_actions.add("login", "instance.web.Login");
 instance.web.redirect = function(url, wait) {
     // Dont display a dialog if some xmlhttprequest are in progress
     if (instance.client && instance.client.crashmanager) {
-        instance.client.crashmanager.destroy();
+        instance.client.crashmanager.active = false;
     }
 
     var wait_server = function() {
@@ -658,7 +670,7 @@ instance.web.redirect = function(url, wait) {
     } else {
         window.location = url;
     }
-}
+};
 
 /**
  * Client action to reload the whole interface.

From 81d4467c8fb4e15129d5dd6b8242fa1a8d4e5562 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 15 Nov 2012 13:24:06 +0100
Subject: [PATCH 142/143] [REV] mail.compose.message using email_template:
 _reopen is back, as the spec of a wizard should be that hitting a button
 close it. Therefore _reopen is necessaru to reopen the wizard with its
 previous value, to continue working on it.

bzr revid: tde@openerp.com-20121115122406-d88ozw5iclsqdyff
---
 .../wizard/mail_compose_message.py            | 28 ++++++++++++++-----
 .../wizard/mail_compose_message_view.xml      |  3 +-
 2 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/addons/email_template/wizard/mail_compose_message.py b/addons/email_template/wizard/mail_compose_message.py
index 129c32722f5..ba4cef83bdb 100644
--- a/addons/email_template/wizard/mail_compose_message.py
+++ b/addons/email_template/wizard/mail_compose_message.py
@@ -25,6 +25,21 @@ from osv import osv
 from osv import fields
 
 
+def _reopen(self, res_id, model):
+    return {'type': 'ir.actions.act_window',
+            'view_mode': 'form',
+            'view_type': 'form',
+            'res_id': res_id,
+            'res_model': self._name,
+            'target': 'new',
+            # save original model in context, because selecting the list of available
+            # templates requires a model in context
+            'context': {
+                'default_model': model,
+            },
+    }
+
+
 class mail_compose_message(osv.TransientModel):
     _inherit = 'mail.compose.message'
 
@@ -42,10 +57,8 @@ class mail_compose_message(osv.TransientModel):
         else:
             model = context.get('default_model', context.get('active_model'))
 
-        if model:
-            record_ids = email_template_obj.search(cr, uid, [('model', '=', model)], context=context)
-            return email_template_obj.name_get(cr, uid, record_ids, context) + [(False, '')]
-        return []
+        record_ids = email_template_obj.search(cr, uid, [('model', '=', model)], context=context)
+        return email_template_obj.name_get(cr, uid, record_ids, context) + [(False, '')]
 
     def default_get(self, cr, uid, fields, context=None):
         if context is None:
@@ -109,7 +122,7 @@ class mail_compose_message(osv.TransientModel):
             onchange_res['partner_ids'] = [(4, partner_id) for partner_id in onchange_res.pop('partner_ids', [])]
             onchange_res['attachment_ids'] = [(4, attachment_id) for attachment_id in onchange_res.pop('attachment_ids', [])]
             record.write(onchange_res)
-        return True
+            return _reopen(self, record.id, record.model)
 
     def onchange_use_template(self, cr, uid, ids, use_template, template_id, composition_mode, model, res_id, context=None):
         """ onchange_use_template (values: True or False).  If use_template is
@@ -141,8 +154,9 @@ class mail_compose_message(osv.TransientModel):
                 'attachment_ids': [(6, 0, [att.id for att in record.attachment_ids])]
             }
             template_id = email_template.create(cr, uid, values, context=context)
-            record.write({'template_id': template_id, 'use_template': True})
-        return True
+            # record.write({'template_id': template_id, 'use_template': True})
+            record.write(record.onchange_template_id(True, template_id, record.composition_mode, record.model, record.res_id)['value'])
+            return _reopen(self, record.id, record.model)
 
     #------------------------------------------------------
     # Wizard validation and send
diff --git a/addons/email_template/wizard/mail_compose_message_view.xml b/addons/email_template/wizard/mail_compose_message_view.xml
index 0a530299d4a..5afaf9745e1 100644
--- a/addons/email_template/wizard/mail_compose_message_view.xml
+++ b/addons/email_template/wizard/mail_compose_message_view.xml
@@ -14,12 +14,11 @@
                     </xpath>
                     <xpath expr="//footer" position="inside">
                         <group class="oe_right" col="1">
-                            <div>Use template
+                            <div attrs="{'invisible':[('use_template','=',False)]}">Use template
                                 <field name="template_id" attrs="{'invisible':[('use_template','=',False)]}"
                                     nolabel="1"
                                     on_change="onchange_template_id(use_template, template_id, composition_mode, model, res_id, context)"/>
                             </div>
-                            or
                             <button icon="/email_template/static/src/img/email_template_save.png"
                                 type="object" name="save_as_template" string="Save as new template" class="oe_link"
                                 help="Save as a new template"

From da9951baf9e8631e97ae0b8bde69eb03e6f34fdf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 15 Nov 2012 13:49:31 +0100
Subject: [PATCH 143/143] =?UTF-8?q?[CLEAN]=20removed=20a=20commented=20sta?=
 =?UTF-8?q?tement,=20fixed=20a=20var=20name=20in=20js.=C3=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

bzr revid: tde@openerp.com-20121115124931-w20igi8qk66uvnj0
---
 addons/email_template/wizard/mail_compose_message.py | 1 -
 addons/mail/static/src/js/mail.js                    | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/email_template/wizard/mail_compose_message.py b/addons/email_template/wizard/mail_compose_message.py
index ba4cef83bdb..9a995985687 100644
--- a/addons/email_template/wizard/mail_compose_message.py
+++ b/addons/email_template/wizard/mail_compose_message.py
@@ -154,7 +154,6 @@ class mail_compose_message(osv.TransientModel):
                 'attachment_ids': [(6, 0, [att.id for att in record.attachment_ids])]
             }
             template_id = email_template.create(cr, uid, values, context=context)
-            # record.write({'template_id': template_id, 'use_template': True})
             record.write(record.onchange_template_id(True, template_id, record.composition_mode, record.model, record.res_id)['value'])
             return _reopen(self, record.id, record.model)
 
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 37090543b8c..dc265a343d5 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -599,7 +599,7 @@ openerp.mail = function (session) {
                     ]).done(function (record) {
                         var thread = self.parent_thread;
                         if (self.options.display_indented_thread < self.thread_level && thread.parent_message) {
-                            var hread = thread.parent_message.parent_thread;
+                            var thread = thread.parent_message.parent_thread;
                         }
                         var root = thread == self.options.root_thread;
                         // create object and attach to the thread object